From 9270ff3bc6a6d5cd05f774436fcf38bb33cd0b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E4=BD=B3=E9=91=AB?= Date: Tue, 30 Jul 2024 01:32:21 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!475=20:?= =?UTF-8?q?=20=E6=9B=B4=E6=96=B0rk3568=E8=A1=A5=E4=B8=81=E6=96=87=E4=BB=B6?= =?UTF-8?q?'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- linux-6.6/rk3568_patch/kernel.patch | 4806 +++++++++++++-------------- 1 file changed, 2399 insertions(+), 2407 deletions(-) diff --git a/linux-6.6/rk3568_patch/kernel.patch b/linux-6.6/rk3568_patch/kernel.patch index 123b64f..c55bae2 100644 --- a/linux-6.6/rk3568_patch/kernel.patch +++ b/linux-6.6/rk3568_patch/kernel.patch @@ -1,6 +1,6 @@ diff --git a/Documentation/devicetree/bindings/arm/mali-bifrost.txt b/Documentation/devicetree/bindings/arm/mali-bifrost.txt new file mode 100644 -index 0000000000000000000000000000000000000000..85672c6c62580a2a7001b781e813e5be5f38cf0c +index 000000000..85672c6c6 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/mali-bifrost.txt @@ -0,0 +1,243 @@ @@ -249,7 +249,7 @@ index 0000000000000000000000000000000000000000..85672c6c62580a2a7001b781e813e5be +}; diff --git a/Documentation/devicetree/bindings/arm/mali-coresight-source.txt b/Documentation/devicetree/bindings/arm/mali-coresight-source.txt new file mode 100644 -index 0000000000000000000000000000000000000000..1018eafbccea9c740f1981b35783d69dd12fe832 +index 000000000..1018eafbc --- /dev/null +++ b/Documentation/devicetree/bindings/arm/mali-coresight-source.txt @@ -0,0 +1,116 @@ @@ -371,7 +371,7 @@ index 0000000000000000000000000000000000000000..1018eafbccea9c740f1981b35783d69d +shared JCN request and response channels. diff --git a/Documentation/devicetree/bindings/arm/mali-midgard.txt b/Documentation/devicetree/bindings/arm/mali-midgard.txt new file mode 100644 -index 0000000000000000000000000000000000000000..0722d0afce592f18564b4671697e31afabd1439c +index 000000000..0722d0afc --- /dev/null +++ b/Documentation/devicetree/bindings/arm/mali-midgard.txt @@ -0,0 +1,96 @@ @@ -473,7 +473,7 @@ index 0000000000000000000000000000000000000000..0722d0afce592f18564b4671697e31af +}; diff --git a/Documentation/devicetree/bindings/arm/mali-utgard.txt b/Documentation/devicetree/bindings/arm/mali-utgard.txt new file mode 100644 -index 0000000000000000000000000000000000000000..ea315345e16f8998f48475d86489672011c01dff +index 000000000..ea315345e --- /dev/null +++ b/Documentation/devicetree/bindings/arm/mali-utgard.txt @@ -0,0 +1,68 @@ @@ -547,7 +547,7 @@ index 0000000000000000000000000000000000000000..ea315345e16f8998f48475d864896720 +} diff --git a/Documentation/devicetree/bindings/crypto/rockchip,rk3588-crypto.yaml b/Documentation/devicetree/bindings/crypto/rockchip,rk3588-crypto.yaml new file mode 100644 -index 0000000000000000000000000000000000000000..c019634132603e214b93f9ee5b444b10209a8683 +index 000000000..c01963413 --- /dev/null +++ b/Documentation/devicetree/bindings/crypto/rockchip,rk3588-crypto.yaml @@ -0,0 +1,65 @@ @@ -618,7 +618,7 @@ index 0000000000000000000000000000000000000000..c019634132603e214b93f9ee5b444b10 + }; diff --git a/Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml b/Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml new file mode 100644 -index 0000000000000000000000000000000000000000..50d3fabe958d53640daf9e8d04ad321c4b22b056 +index 000000000..50d3fabe9 --- /dev/null +++ b/Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml @@ -0,0 +1,74 @@ @@ -698,7 +698,7 @@ index 0000000000000000000000000000000000000000..50d3fabe958d53640daf9e8d04ad321c + }; diff --git a/Documentation/devicetree/bindings/devfreq/event/rockchip-nocp.txt b/Documentation/devicetree/bindings/devfreq/event/rockchip-nocp.txt new file mode 100644 -index 0000000000000000000000000000000000000000..77c504ff883d601e23d349ac0a18e21cadca7c55 +index 000000000..77c504ff8 --- /dev/null +++ b/Documentation/devicetree/bindings/devfreq/event/rockchip-nocp.txt @@ -0,0 +1,24 @@ @@ -728,7 +728,7 @@ index 0000000000000000000000000000000000000000..77c504ff883d601e23d349ac0a18e21c + }; diff --git a/Documentation/devicetree/bindings/devfreq/rockchip_dmc.txt b/Documentation/devicetree/bindings/devfreq/rockchip_dmc.txt new file mode 100644 -index 0000000000000000000000000000000000000000..3f1f99c221a4f37161331bbabeed686c8434f9d8 +index 000000000..3f1f99c22 --- /dev/null +++ b/Documentation/devicetree/bindings/devfreq/rockchip_dmc.txt @@ -0,0 +1,120 @@ @@ -854,7 +854,7 @@ index 0000000000000000000000000000000000000000..3f1f99c221a4f37161331bbabeed686c + }; diff --git a/Documentation/devicetree/bindings/iommu/rockchip,rk32-iommu.txt b/Documentation/devicetree/bindings/iommu/rockchip,rk32-iommu.txt new file mode 100644 -index 0000000000000000000000000000000000000000..1b49e4d0f78429726db72db0e288e00428626212 +index 000000000..1b49e4d0f --- /dev/null +++ b/Documentation/devicetree/bindings/iommu/rockchip,rk32-iommu.txt @@ -0,0 +1,16 @@ @@ -876,7 +876,7 @@ index 0000000000000000000000000000000000000000..1b49e4d0f78429726db72db0e288e004 + }; diff --git a/Documentation/devicetree/bindings/media/rockchip-cif.txt b/Documentation/devicetree/bindings/media/rockchip-cif.txt new file mode 100644 -index 0000000000000000000000000000000000000000..6828b3630b73cb037e6fc4deece647e72eac00c3 +index 000000000..6828b3630 --- /dev/null +++ b/Documentation/devicetree/bindings/media/rockchip-cif.txt @@ -0,0 +1,116 @@ @@ -998,7 +998,7 @@ index 0000000000000000000000000000000000000000..6828b3630b73cb037e6fc4deece647e7 + }; diff --git a/Documentation/devicetree/bindings/media/rockchip-isp1.txt b/Documentation/devicetree/bindings/media/rockchip-isp1.txt new file mode 100644 -index 0000000000000000000000000000000000000000..bd83a6ad8e9c863b7d7f2e39dac197f365ac3a7f +index 000000000..bd83a6ad8 --- /dev/null +++ b/Documentation/devicetree/bindings/media/rockchip-isp1.txt @@ -0,0 +1,72 @@ @@ -1076,7 +1076,7 @@ index 0000000000000000000000000000000000000000..bd83a6ad8e9c863b7d7f2e39dac197f3 + }; diff --git a/Documentation/devicetree/bindings/media/rockchip-mipi-dphy.txt b/Documentation/devicetree/bindings/media/rockchip-mipi-dphy.txt new file mode 100644 -index 0000000000000000000000000000000000000000..0b9bed35bb3cec3123777bdf24fa87aa006556ab +index 000000000..0b9bed35b --- /dev/null +++ b/Documentation/devicetree/bindings/media/rockchip-mipi-dphy.txt @@ -0,0 +1,136 @@ @@ -1218,7 +1218,7 @@ index 0000000000000000000000000000000000000000..0b9bed35bb3cec3123777bdf24fa87aa +}; diff --git a/Documentation/devicetree/bindings/media/rockchip-tsp.txt b/Documentation/devicetree/bindings/media/rockchip-tsp.txt new file mode 100644 -index 0000000000000000000000000000000000000000..f4a24fa21f446a7cfadf82d65706aee32ad1bc63 +index 000000000..f4a24fa21 --- /dev/null +++ b/Documentation/devicetree/bindings/media/rockchip-tsp.txt @@ -0,0 +1,54 @@ @@ -1277,7 +1277,7 @@ index 0000000000000000000000000000000000000000..f4a24fa21f446a7cfadf82d65706aee3 + status = "disabled"; + }; diff --git a/Makefile b/Makefile -index c122a50e4b406010477acb0654d23278ad298af5..32674b0e54901ce3d7d2fe8a2a147c4a20e02d08 100644 +index c122a50e4..32674b0e5 100644 --- a/Makefile +++ b/Makefile @@ -1130,6 +1130,15 @@ ifdef CONFIG_TRIM_UNUSED_KSYMS @@ -1306,7 +1306,7 @@ index c122a50e4b406010477acb0654d23278ad298af5..32674b0e54901ce3d7d2fe8a2a147c4a prepare0: archprepare diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile -index 26b8c7630a2142c96cf47ab88f1e16f8d03b1802..76ab7e3e90f3d6c53182d60b0309e27855017a48 100644 +index 26b8c7630..76ab7e3e9 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -220,3 +220,16 @@ define archhelp @@ -1327,7 +1327,7 @@ index 26b8c7630a2142c96cf47ab88f1e16f8d03b1802..76ab7e3e90f3d6c53182d60b0309e278 +CLEAN_DIRS += out +CLEAN_FILES += boot.img kernel.img resource.img zboot.img diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile -index e7728007fd1bd8463d990f5424d0e355034e67dd..064f11d268034c24de15c1dddb7fc188325edca3 100644 +index e7728007f..064f11d26 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -101,7 +101,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6a-io.dtb @@ -1341,7 +1341,7 @@ index e7728007fd1bd8463d990f5424d0e355034e67dd..064f11d268034c24de15c1dddb7fc188 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5a.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-orangepi-5.dtb diff --git a/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts b/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts -index de0a1f2af983bee33e127f87e2cdba16b544e54c..7d4c5324c61bced0e082a366fbf8d27ea213bf14 100644 +index de0a1f2af..7d4c5324c 100644 --- a/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts @@ -86,7 +86,7 @@ simple-audio-card,cpu { @@ -1354,7 +1354,7 @@ index de0a1f2af983bee33e127f87e2cdba16b544e54c..7d4c5324c61bced0e082a366fbf8d27e dc_12v: dc-12v-regulator { diff --git a/arch/arm64/boot/dts/rockchip/px30.dtsi b/arch/arm64/boot/dts/rockchip/px30.dtsi -index 20955556b624d037cb49720926ff720aa54ec507..42ce78beb4134d15bdbbe80bcde366ab32b50c11 100644 +index 20955556b..42ce78beb 100644 --- a/arch/arm64/boot/dts/rockchip/px30.dtsi +++ b/arch/arm64/boot/dts/rockchip/px30.dtsi @@ -632,7 +632,6 @@ spi0: spi@ff1d0000 { @@ -1374,7 +1374,7 @@ index 20955556b624d037cb49720926ff720aa54ec507..42ce78beb4134d15bdbbe80bcde366ab pinctrl-0 = <&spi1_clk &spi1_csn0 &spi1_csn1 &spi1_miso &spi1_mosi>; #address-cells = <1>; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts -index 4237f2ee8fee3370711d376313c7f966ab597995..5d7d567283e525b664592d772d48ff7a9669c9aa 100644 +index 4237f2ee8..5d7d56728 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts @@ -26,11 +26,9 @@ yt8531c: ethernet-phy@0 { @@ -1391,7 +1391,7 @@ index 4237f2ee8fee3370711d376313c7f966ab597995..5d7d567283e525b664592d772d48ff7a pinctrl-0 = <ð_phy_reset_pin>; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi -index e47d1398aecac7bbb151cd9d542b57ff7c163b7f..083452c6771197f1f9114ea49a7a14d0e5aeb59b 100644 +index e47d1398a..083452c67 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi @@ -61,6 +61,7 @@ backlight: backlight { @@ -1403,7 +1403,7 @@ index e47d1398aecac7bbb151cd9d542b57ff7c163b7f..083452c6771197f1f9114ea49a7a14d0 emmc_pwrseq: emmc-pwrseq { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts b/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts -index 6464ef4d113ddd8613910ed24c6809cb016f8c0e..d1f343345f67499a737d83b3d791b47efce32deb 100644 +index 6464ef4d1..d1f343345 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts @@ -773,7 +773,7 @@ brcmf: wifi@1 { @@ -1416,7 +1416,7 @@ index 6464ef4d113ddd8613910ed24c6809cb016f8c0e..d1f343345f67499a737d83b3d791b47e pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_l>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi -index cacbad35cfc854ce6823fe9901165f42cfbd2aef..ee6095baba4d3a0679f1ce01106ae81c05920760 100644 +index cacbad35c..ee6095bab 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi @@ -198,6 +198,7 @@ backlight: backlight { @@ -1438,7 +1438,7 @@ index cacbad35cfc854ce6823fe9901165f42cfbd2aef..ee6095baba4d3a0679f1ce01106ae81c interrupts = <8 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi -index c5e7de60c12140c0dae9789cc338ef5f1b9fac3c..a47d9f758611e2dfc11894b0edc7ff0fc39445ce 100644 +index c5e7de60c..a47d9f758 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi @@ -167,6 +167,7 @@ backlight: backlight { @@ -1450,7 +1450,7 @@ index c5e7de60c12140c0dae9789cc338ef5f1b9fac3c..a47d9f758611e2dfc11894b0edc7ff0f dmic: dmic { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi -index 789fd0dcc88baadb05367b16d80b6c7019941160..23bfba86daabed74cb3af74b762196bf0161d15b 100644 +index 789fd0dcc..23bfba86d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi @@ -250,7 +250,7 @@ ppvar_sd_card_io: ppvar-sd-card-io { @@ -1471,7 +1471,7 @@ index 789fd0dcc88baadb05367b16d80b6c7019941160..23bfba86daabed74cb3af74b762196bf }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi -index fee5e71112799293b2e873d8fc1f5dbe12003301..ea403de13228b46372b4e9bcf9a946d982fb9844 100644 +index fee5e7111..ea403de13 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi @@ -3,35 +3,99 @@ @@ -1853,7 +1853,7 @@ index fee5e71112799293b2e873d8fc1f5dbe12003301..ea403de13228b46372b4e9bcf9a946d9 &gpu { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi -index 20e3f41efe97fa873aa3727aaf3e7597dffa0cef..aa3e21bd6c8f44ff5f9b249dd43b56316dbc2a60 100644 +index 20e3f41ef..aa3e21bd6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi @@ -27,7 +27,7 @@ module_led: led-0 { @@ -1866,7 +1866,7 @@ index 20e3f41efe97fa873aa3727aaf3e7597dffa0cef..aa3e21bd6c8f44ff5f9b249dd43b5631 pinctrl-0 = <&usb3_id>; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi -index f2279aa6ca9e129120018508191c0c68a926f801..1f76d3501bda31fdbb66636c3562cd9e7f291b5a 100644 +index f2279aa6c..1f76d3501 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi @@ -9,11 +9,12 @@ @@ -1914,7 +1914,7 @@ index f2279aa6ca9e129120018508191c0c68a926f801..1f76d3501bda31fdbb66636c3562cd9e status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -index 4a3d0af5ecfe2566c198a792ef3d385b60d77cc2..b132087973522eec3796702a34d477b296c94554 100644 +index 4a3d0af5e..b13208797 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -9,8 +9,13 @@ @@ -3218,7 +3218,7 @@ index 4a3d0af5ecfe2566c198a792ef3d385b60d77cc2..b132087973522eec3796702a34d477b2 + }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566.dtsi b/arch/arm64/boot/dts/rockchip/rk3566.dtsi -index 6c4b17d27bdc526ffacc1d991a09f3982434e9f3..4e2a2fb1daaad8c3f92754220323ee4762ab70be 100644 +index 6c4b17d27..4e2a2fb1d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566.dtsi @@ -1,4 +1,7 @@ @@ -3269,7 +3269,7 @@ index 6c4b17d27bdc526ffacc1d991a09f3982434e9f3..4e2a2fb1daaad8c3f92754220323ee47 + snps,usb2-lpm-disable; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts -index f9127ddfbb7dfdaa9b2bfd6040ef9ed2ab1986b3..26d7fda275edb69d4d0b11144320282b05c95655 100644 +index f9127ddfb..26d7fda27 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts @@ -66,13 +66,6 @@ hdmi_con_in: endpoint { @@ -3325,7 +3325,7 @@ index f9127ddfbb7dfdaa9b2bfd6040ef9ed2ab1986b3..26d7fda275edb69d4d0b11144320282b rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none_drv_level_5>; 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 100644 -index 0000000000000000000000000000000000000000..99247fb7921a98fe8c69753c57d4b7fb7cbb5176 +index 000000000..99247fb79 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-dram-default-timing.dtsi @@ -0,0 +1,400 @@ @@ -3730,7 +3730,7 @@ index 0000000000000000000000000000000000000000..99247fb7921a98fe8c69753c57d4b7fb + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts -index 19f8fc369b1308cdfe8bfaa3b49e6f6b5134bb27..674792567fa6e288c94169406cd69b0e2262d5b2 100644 +index 19f8fc369..674792567 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts @@ -293,6 +293,7 @@ vdd_logic: DCDC_REG1 { @@ -3759,7 +3759,7 @@ index 19f8fc369b1308cdfe8bfaa3b49e6f6b5134bb27..674792567fa6e288c94169406cd69b0e regulator-max-microvolt = <1350000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi new file mode 100644 -index 0000000000000000000000000000000000000000..df2bd19f93ba28717d26e0f3464a855609a394e7 +index 000000000..df2bd19f9 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi @@ -0,0 +1,60 @@ @@ -3824,7 +3824,7 @@ index 0000000000000000000000000000000000000000..df2bd19f93ba28717d26e0f3464a8556 + disable-afbc-win; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi -index 0a979bfb63d9d8770a685a2c135393a2421ca194..a78bdf986a252d95d887b30868a694ffde47e97c 100644 +index 0a979bfb6..a78bdf986 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi @@ -1,6 +1,6 @@ @@ -4201,7 +4201,7 @@ index 0a979bfb63d9d8770a685a2c135393a2421ca194..a78bdf986a252d95d887b30868a694ff - }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts -index e05ab11981f554ae6315267b3557b427b721bde8..bab46db2b18cdd2ee65cdb3add208f3d3134d8c1 100644 +index e05ab1198..bab46db2b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts @@ -13,8 +13,8 @@ / { @@ -4505,7 +4505,7 @@ index e05ab11981f554ae6315267b3557b427b721bde8..bab46db2b18cdd2ee65cdb3add208f3d }; 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 100644 -index 0000000000000000000000000000000000000000..0ef442123d05968880ec4b9daca820e60ad05f70 +index 000000000..0ef442123 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts @@ -0,0 +1,14 @@ @@ -4525,7 +4525,7 @@ index 0000000000000000000000000000000000000000..0ef442123d05968880ec4b9daca820e6 + 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 100644 -index 0000000000000000000000000000000000000000..459fc3b6d6a0eb4c8714d499af4d5340e719490c +index 000000000..459fc3b6d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-edp.dtsi @@ -0,0 +1,141 @@ @@ -4672,7 +4672,7 @@ index 0000000000000000000000000000000000000000..459fc3b6d6a0eb4c8714d499af4d5340 +}; 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 100644 -index 0000000000000000000000000000000000000000..5267b377d8fb0952a5345ee45e25494a4c7f536c +index 000000000..5267b377d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0-beiqicloud.dtsi @@ -0,0 +1,395 @@ @@ -5073,7 +5073,7 @@ index 0000000000000000000000000000000000000000..5267b377d8fb0952a5345ee45e25494a +}; 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 100644 -index 0000000000000000000000000000000000000000..bd32a4246df3e5d59baa795c7c13675635216dd2 +index 000000000..bd32a4246 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi @@ -0,0 +1,91 @@ @@ -5170,7 +5170,7 @@ index 0000000000000000000000000000000000000000..bd32a4246df3e5d59baa795c7c136756 +}; 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 100644 -index 0000000000000000000000000000000000000000..2bae1a60a8655d4aa3d81cfe3b28a509349a1002 +index 000000000..2bae1a60a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx1.dtsi @@ -0,0 +1,97 @@ @@ -5273,7 +5273,7 @@ index 0000000000000000000000000000000000000000..2bae1a60a8655d4aa3d81cfe3b28a509 +}; 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 100644 -index 0000000000000000000000000000000000000000..795506d6677c281eab70f68c17efafe002f2362e +index 000000000..795506d66 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-android.dts @@ -0,0 +1,13 @@ @@ -5292,7 +5292,7 @@ index 0000000000000000000000000000000000000000..795506d6677c281eab70f68c17efafe0 + 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 100644 -index 0000000000000000000000000000000000000000..16764d3899ad5554381a42345d0919e961527e8f +index 000000000..16764d389 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts @@ -0,0 +1,155 @@ @@ -5453,7 +5453,7 @@ index 0000000000000000000000000000000000000000..16764d3899ad5554381a42345d0919e9 + 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 100644 -index 0000000000000000000000000000000000000000..57ce9e21c0b41aa9f0e3f74520f0cbf1ec4ff0d4 +index 000000000..57ce9e21c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts @@ -0,0 +1,21 @@ @@ -5480,7 +5480,7 @@ index 0000000000000000000000000000000000000000..57ce9e21c0b41aa9f0e3f74520f0cbf1 +}; 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 100644 -index 0000000000000000000000000000000000000000..ce4bc9aebbe3ff184d0cbe8035fe1f88f35f074d +index 000000000..ce4bc9aeb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi @@ -0,0 +1,872 @@ @@ -6358,7 +6358,7 @@ index 0000000000000000000000000000000000000000..ce4bc9aebbe3ff184d0cbe8035fe1f88 +}; 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 100644 -index 0000000000000000000000000000000000000000..8dd494ce3a1f4e2c6c3d51827c2e798c36cf4d6d +index 000000000..8dd494ce3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10-linux.dts @@ -0,0 +1,13 @@ @@ -6377,7 +6377,7 @@ index 0000000000000000000000000000000000000000..8dd494ce3a1f4e2c6c3d51827c2e798c +}; 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 100644 -index 0000000000000000000000000000000000000000..775ed046a4c22e6d4aeb336a9eb45552b4094d2d +index 000000000..775ed046a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10.dtsi @@ -0,0 +1,816 @@ @@ -7199,7 +7199,7 @@ index 0000000000000000000000000000000000000000..775ed046a4c22e6d4aeb336a9eb45552 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi new file mode 100644 -index 0000000000000000000000000000000000000000..cf465047cdcf5e1694bae776c1a2a5f316cdf28f +index 000000000..cf465047c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi @@ -0,0 +1,1895 @@ @@ -9099,7 +9099,7 @@ index 0000000000000000000000000000000000000000..cf465047cdcf5e1694bae776c1a2a5f3 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi -index f1be76a54ceb0cb0730f444c69c3da73e07194c9..de92e744c51996412e4bd2a1c440f8427c8d3823 100644 +index f1be76a54..de92e744c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi @@ -8,6 +8,35 @@ @@ -9470,7 +9470,7 @@ index f1be76a54ceb0cb0730f444c69c3da73e07194c9..de92e744c51996412e4bd2a1c440f842 + }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi -index b7e2b475f07077880672cf9999e9f8bc23b66dd0..51ca0fd2ab9f28e97ca77840fbb383717cb177b4 100644 +index b7e2b475f..51ca0fd2a 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi @@ -10,7 +10,10 @@ @@ -12720,7 +12720,7 @@ index b7e2b475f07077880672cf9999e9f8bc23b66dd0..51ca0fd2ab9f28e97ca77840fbb38371 interrupt-controller; #interrupt-cells = <2>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts -index fa8286a325af74b7d11a09942cce6e1fdc9e43ba..50822c2def7d37f44d19318c5c76c40faef411cc 100644 +index 229a9111f..50822c2de 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts @@ -7,7 +7,10 @@ @@ -13093,15 +13093,7 @@ index fa8286a325af74b7d11a09942cce6e1fdc9e43ba..50822c2def7d37f44d19318c5c76c40f &sdhci { bus-width = <8>; no-sdio; -@@ -215,7 +481,6 @@ pmic@0 { - <&rk806_dvs2_null>, <&rk806_dvs3_null>; - pinctrl-names = "default"; - spi-max-frequency = <1000000>; -- system-power-controller; - - vcc1-supply = <&vcc5v0_sys>; - vcc2-supply = <&vcc5v0_sys>; -@@ -808,6 +1073,22 @@ &sata0 { +@@ -807,6 +1073,22 @@ &sata0 { status = "okay"; }; @@ -13124,7 +13116,7 @@ index fa8286a325af74b7d11a09942cce6e1fdc9e43ba..50822c2def7d37f44d19318c5c76c40f &u2phy2 { status = "okay"; }; -@@ -846,3 +1127,58 @@ &usb_host1_ehci { +@@ -845,3 +1127,58 @@ &usb_host1_ehci { &usb_host1_ohci { status = "okay"; }; @@ -13185,7 +13177,7 @@ index fa8286a325af74b7d11a09942cce6e1fdc9e43ba..50822c2def7d37f44d19318c5c76c40f +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts new file mode 100644 -index 0000000000000000000000000000000000000000..87803e6e0fa732311bbdcdbad72a50de008d9794 +index 000000000..87803e6e0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts @@ -0,0 +1,1044 @@ @@ -14234,7 +14226,7 @@ index 0000000000000000000000000000000000000000..87803e6e0fa732311bbdcdbad72a50de + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -index 8ab60968f27502b1107741f3a95c920a89cbefbd..76c546f5e4c8a02d398c5d4fdfb38f0c6086d061 100644 +index 8ab60968f..76c546f5e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -1,47 +1,153 @@ @@ -15898,7 +15890,7 @@ index 8ab60968f27502b1107741f3a95c920a89cbefbd..76c546f5e4c8a02d398c5d4fdfb38f0c + "", "", "", ""; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588.dtsi b/arch/arm64/boot/dts/rockchip/rk3588.dtsi -index 5519c1430cb7a92df91765243ac29fc7e1a2407b..fa4a7e35099e0d99f5d8d5f056b149747680d92e 100644 +index 5519c1430..fa4a7e350 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588.dtsi @@ -3,26 +3,193 @@ @@ -16885,7 +16877,7 @@ index 5519c1430cb7a92df91765243ac29fc7e1a2407b..fa4a7e35099e0d99f5d8d5f056b14974 + }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588j.dtsi b/arch/arm64/boot/dts/rockchip/rk3588j.dtsi -index 38b9dbf38a21853d3693813c0eb835ecb83c5cab..7b084b273b271ab0654bffe5ae8f37473ae75a69 100644 +index 38b9dbf38..7b084b273 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588j.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588j.dtsi @@ -5,3 +5,62 @@ @@ -16952,7 +16944,7 @@ index 38b9dbf38a21853d3693813c0eb835ecb83c5cab..7b084b273b271ab0654bffe5ae8f3747 + /delete-node/ opp-j-m-950000000; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts -index 9299fa7e3e2150a1474bf310ccfd978c2dcf0b30..60f00ceb630e14e5734c71c7e974712982265f2f 100644 +index 9299fa7e3..60f00ceb6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts @@ -3,6 +3,7 @@ @@ -17125,7 +17117,7 @@ index 9299fa7e3e2150a1474bf310ccfd978c2dcf0b30..60f00ceb630e14e5734c71c7e9747129 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts new file mode 100644 -index 0000000000000000000000000000000000000000..3a57425115ace9a45844ad3d112388829bd6ef6e +index 000000000..3a5742511 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts @@ -0,0 +1,894 @@ @@ -18025,7 +18017,7 @@ index 0000000000000000000000000000000000000000..3a57425115ace9a45844ad3d11238882 +}; \ No newline at end of file diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi -index 0933652bafc3015fec69d63ef7afa6366114af42..87736c19075a4d4e4dd9990b977c012935aad394 100644 +index 0933652ba..87736c190 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi @@ -4,7 +4,7 @@ @@ -18832,7 +18824,7 @@ index 0933652bafc3015fec69d63ef7afa6366114af42..87736c19075a4d4e4dd9990b977c0129 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts -index 8347adcbd00301770170571d11bb0f782956b18a..23c0b8f721af4ecd17590183a00ef72ba13910f1 100644 +index 8347adcbd..23c0b8f72 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts @@ -5,6 +5,7 @@ @@ -19032,7 +19024,7 @@ index 8347adcbd00301770170571d11bb0f782956b18a..23c0b8f721af4ecd17590183a00ef72b + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi -index 4aa516ff156dff37b21914c68de135f94ae83d65..c154a3a03f0ae89fb3a27d1762eb2a66e53e3f34 100644 +index 4aa516ff1..c154a3a03 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -3,13 +3,15 @@ @@ -26751,7 +26743,7 @@ index 4aa516ff156dff37b21914c68de135f94ae83d65..c154a3a03f0ae89fb3a27d1762eb2a66 }; }; diff --git a/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi b/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi -index 5c645437b50723480a9ec040ea3c21fae7cc5cf1..72d644575cf9371f194ee9b14ef0f214c645ccd6 100644 +index 5c645437b..72d644575 100644 --- a/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi +++ b/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi @@ -332,13 +332,84 @@ pcfg_pull_none_drv_level_0_smt: pcfg-pull-none-drv-level-0-smt { @@ -26841,7 +26833,7 @@ index 5c645437b50723480a9ec040ea3c21fae7cc5cf1..72d644575cf9371f194ee9b14ef0f214 }; diff --git a/arch/arm64/include/asm/system_info.h b/arch/arm64/include/asm/system_info.h new file mode 100644 -index 0000000000000000000000000000000000000000..a82fe791b2f6d93559bb8758b479542eb9082b4b +index 000000000..a82fe791b --- /dev/null +++ b/arch/arm64/include/asm/system_info.h @@ -0,0 +1,14 @@ @@ -26860,7 +26852,7 @@ index 0000000000000000000000000000000000000000..a82fe791b2f6d93559bb8758b479542e + +#endif /* __ASM_ARM_SYSTEM_INFO_H */ diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c -index 98fda8500535341a063d3ee308d77788602308d6..2078b98b34c6d735aaa2dc9b47a9a19bea86ee03 100644 +index 98fda8500..2078b98b3 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -25,6 +25,12 @@ @@ -26887,7 +26879,7 @@ index 98fda8500535341a063d3ee308d77788602308d6..2078b98b34c6d735aaa2dc9b47a9a19b } diff --git a/arch/arm64/mm/Makefile b/arch/arm64/mm/Makefile -index dbd1bc95967d00d364e27e27c1f5fff2bc48e81f..d29d7ef589a223a1cd04840194773534386087f0 100644 +index dbd1bc959..d29d7ef58 100644 --- a/arch/arm64/mm/Makefile +++ b/arch/arm64/mm/Makefile @@ -14,3 +14,5 @@ KASAN_SANITIZE_physaddr.o += n @@ -26897,7 +26889,7 @@ index dbd1bc95967d00d364e27e27c1f5fff2bc48e81f..d29d7ef589a223a1cd04840194773534 + +obj-$(CONFIG_ROCKCHIP_ARM64_ALIGN_FAULT_FIX) += fixup_fault.o diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c -index 2e5d1e238af958e8dcdd07b498f990421b27cc02..4b949cb32189c99eeb63837719335c040f1e237f 100644 +index 2e5d1e238..4b949cb32 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -713,9 +713,17 @@ static int __kprobes do_translation_fault(unsigned long far, @@ -26920,7 +26912,7 @@ index 2e5d1e238af958e8dcdd07b498f990421b27cc02..4b949cb32189c99eeb63837719335c04 return do_compat_alignment_fixup(far, regs); diff --git a/arch/arm64/mm/fixup_fault.S b/arch/arm64/mm/fixup_fault.S new file mode 100644 -index 0000000000000000000000000000000000000000..0e94564ae68dfdd12d16b6cdeefc39cc08f23bea +index 000000000..0e94564ae --- /dev/null +++ b/arch/arm64/mm/fixup_fault.S @@ -0,0 +1,3714 @@ @@ -30639,7 +30631,7 @@ index 0000000000000000000000000000000000000000..0e94564ae68dfdd12d16b6cdeefc39cc + .word 2 + .align 3 diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c -index 8a0f8604348b877e6cccd08a833638c50fa39ae7..6cd59a1e9f5d1119ea832b0dddd4e9658e8e1a32 100644 +index 8a0f86043..6cd59a1e9 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -31,6 +31,7 @@ @@ -30659,15 +30651,17 @@ index 8a0f8604348b877e6cccd08a833638c50fa39ae7..6cd59a1e9f5d1119ea832b0dddd4e965 /* * request_standard_resources() depends on crashkernel's memory being diff --git a/drivers/Kconfig b/drivers/Kconfig -index 4600b6ba5446aafefb460d6d27be936c1ab45803..ff95f1adf5d77dd06dd43d594170b30e875a7508 100644 +index fcb8151bb..6f055f3f9 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig -@@ -249,4 +249,13 @@ source "drivers/accesstokenid/Kconfig" +@@ -247,4 +247,15 @@ source "drivers/cdx/Kconfig" - source "drivers/hck/Kconfig" + source "drivers/accesstokenid/Kconfig" +source "drivers/hooks/Kconfig" + ++source "drivers/hck/Kconfig" ++ +source "drivers/auth_ctl/Kconfig" + +source "drivers/rkflash/Kconfig" @@ -30677,7 +30671,7 @@ index 4600b6ba5446aafefb460d6d27be936c1ab45803..ff95f1adf5d77dd06dd43d594170b30e +source "drivers/rk_nand/Kconfig" endmenu diff --git a/drivers/Makefile b/drivers/Makefile -index bf019ad70f5b1e0f2a65c1c323aa202b26d3f4a9..bd362c86b86f6618b4f8b638df8f906ed8266e27 100644 +index b341771cd..cb85c0244 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -190,6 +190,7 @@ obj-$(CONFIG_NVMEM) += nvmem/ @@ -30688,19 +30682,17 @@ index bf019ad70f5b1e0f2a65c1c323aa202b26d3f4a9..bd362c86b86f6618b4f8b638df8f906e obj-$(CONFIG_MULTIPLEXER) += mux/ obj-$(CONFIG_SIOX) += siox/ obj-$(CONFIG_GNSS) += gnss/ -@@ -204,4 +205,8 @@ obj-$(CONFIG_CDX_BUS) += cdx/ +@@ -204,3 +205,8 @@ obj-$(CONFIG_CDX_BUS) += cdx/ obj-$(CONFIG_S390) += s390/ obj-$(CONFIG_ACCESS_TOKENID) += accesstokenid/ --obj-$(CONFIG_HCK_VENDOR_HOOKS) += hck/ -\ No newline at end of file -+obj-$(CONFIG_HCK_VENDOR_HOOKS) += hck/ +obj-$(CONFIG_VENDOR_HOOKS) += hooks/ ++obj-$(CONFIG_HCK_VENDOR_HOOKS) += hck/ +obj-$(CONFIG_RK_FLASH) += rkflash/ +obj-$(CONFIG_TZDRIVER) += tzdriver/ +obj-$(CONFIG_RK_NAND) += rk_nand/ diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index 81fc63f6b00816171e4626afa2f22584c4c11365..07f5021037dcdd888341978bff02922dfb6d0aef 100644 +index 81fc63f6b..07f502103 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -13,10 +13,12 @@ @@ -30750,7 +30742,7 @@ index 81fc63f6b00816171e4626afa2f22584c4c11365..07f5021037dcdd888341978bff02922d }; MODULE_DEVICE_TABLE(of, ahci_of_match); diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c -index f1263364fa97fa5f37f878f5a16c376290fb9e18..2b7080560c23e41f48c17d08498ddad497a165ee 100644 +index f1263364f..2b7080560 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -1519,7 +1519,7 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class, @@ -30763,7 +30755,7 @@ index f1263364fa97fa5f37f878f5a16c376290fb9e18..2b7080560c23e41f48c17d08498ddad4 return 0; diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c -index a26367e9fb197c367059907d8a58760d90e81f76..72c2aa840cb4b44f319113a925b547a3057db2d5 100644 +index a26367e9f..72c2aa840 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c @@ -149,6 +149,11 @@ static void hci_uart_write_work(struct work_struct *work) @@ -30780,7 +30772,7 @@ index a26367e9fb197c367059907d8a58760d90e81f76..72c2aa840cb4b44f319113a925b547a3 */ diff --git a/drivers/bluetooth/rtk_btusb.c b/drivers/bluetooth/rtk_btusb.c new file mode 100644 -index 0000000000000000000000000000000000000000..5db188416009f560900f6b4b4538776a24aeb864 +index 000000000..5db188416 --- /dev/null +++ b/drivers/bluetooth/rtk_btusb.c @@ -0,0 +1,4563 @@ @@ -35349,7 +35341,7 @@ index 0000000000000000000000000000000000000000..5db188416009f560900f6b4b4538776a +MODULE_LICENSE("GPL"); diff --git a/drivers/bluetooth/rtk_btusb.h b/drivers/bluetooth/rtk_btusb.h new file mode 100644 -index 0000000000000000000000000000000000000000..7f6222ebba59438398d25b810a6f44051cd2eaa2 +index 000000000..7f6222ebb --- /dev/null +++ b/drivers/bluetooth/rtk_btusb.h @@ -0,0 +1,759 @@ @@ -36113,7 +36105,7 @@ index 0000000000000000000000000000000000000000..7f6222ebba59438398d25b810a6f4405 + +#endif /* CONFIG_BLUEDROID */ diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig -index 8de74dcfa18cf53bf9ad623264bd3d3d83669fe4..8ce7bc03eca160fd01e62bbf2d952ca761edf1f5 100644 +index 8de74dcfa..8ce7bc03e 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -538,6 +538,19 @@ config HW_RANDOM_XIPHERA @@ -36137,7 +36129,7 @@ index 8de74dcfa18cf53bf9ad623264bd3d3d83669fe4..8ce7bc03eca160fd01e62bbf2d952ca7 tristate "Arm SMCCC TRNG firmware interface support" depends on HAVE_ARM_SMCCC_DISCOVERY diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile -index 32549a1186dc57a26250d117a70820b328af62ac..fd3bbf6e08e1f605bed94901be0f62637f54826a 100644 +index 32549a118..fd3bbf6e0 100644 --- a/drivers/char/hw_random/Makefile +++ b/drivers/char/hw_random/Makefile @@ -35,6 +35,7 @@ obj-$(CONFIG_HW_RANDOM_IPROC_RNG200) += iproc-rng200.o @@ -36150,7 +36142,7 @@ index 32549a1186dc57a26250d117a70820b328af62ac..fd3bbf6e08e1f605bed94901be0f6263 obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o diff --git a/drivers/char/hw_random/rockchip-rng.c b/drivers/char/hw_random/rockchip-rng.c new file mode 100644 -index 0000000000000000000000000000000000000000..f7a3a7f52cca0aa0e0558de310d03e5b156590ff +index 000000000..f7a3a7f52 --- /dev/null +++ b/drivers/char/hw_random/rockchip-rng.c @@ -0,0 +1,574 @@ @@ -36729,7 +36721,7 @@ index 0000000000000000000000000000000000000000..f7a3a7f52cca0aa0e0558de310d03e5b +MODULE_AUTHOR("Lin Jinhan "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig -index c30099866174d3d9e20f425726180f9f49ea746f..f202d0d246dfb920504f6c7b5f517ffddec5d427 100644 +index c30099866..f202d0d24 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -33,6 +33,13 @@ menuconfig COMMON_CLK @@ -36756,7 +36748,7 @@ index c30099866174d3d9e20f425726180f9f49ea746f..f202d0d246dfb920504f6c7b5f517ffd This driver supports RK805, RK809 and RK817, RK808 and RK818 crystal oscillator clock. These multi-function devices have two fixed-rate oscillators, clocked at 32KHz each. diff --git a/drivers/clk/clk-fractional-divider.c b/drivers/clk/clk-fractional-divider.c -index 479297763e7042d6ec00eeef41a6a29ffc6a8f3a..8ba75101bcb50c937caa16fc4b1dd263a875d0ed 100644 +index 479297763..8ba75101b 100644 --- a/drivers/clk/clk-fractional-divider.c +++ b/drivers/clk/clk-fractional-divider.c @@ -150,7 +150,7 @@ static long clk_fd_round_rate(struct clk_hw *hw, unsigned long rate, @@ -36822,7 +36814,7 @@ index 479297763e7042d6ec00eeef41a6a29ffc6a8f3a..8ba75101bcb50c937caa16fc4b1dd263 clk_fd_writel(fd, val); diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c -index 64283807600b65149ef9290879b8da38f884ccad..5e3c95eed5155279bf40d0ac35450aa9ea7ac093 100644 +index 642838076..5e3c95eed 100644 --- a/drivers/clk/clk-gate.c +++ b/drivers/clk/clk-gate.c @@ -14,6 +14,10 @@ @@ -36847,7 +36839,7 @@ index 64283807600b65149ef9290879b8da38f884ccad..5e3c95eed5155279bf40d0ac35450aa9 if (gate->lock) diff --git a/drivers/clk/clk-rk808.c b/drivers/clk/clk-rk808.c -index f7412b137e5ef4766254729621e9ce82eae29cb1..32f833d732ed5655fdcd7419ea626cc2fa04654d 100644 +index f7412b137..32f833d73 100644 --- a/drivers/clk/clk-rk808.c +++ b/drivers/clk/clk-rk808.c @@ -12,9 +12,10 @@ @@ -36961,7 +36953,7 @@ index f7412b137e5ef4766254729621e9ce82eae29cb1..32f833d732ed5655fdcd7419ea626cc2 return ret; diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c -index 473563bc74960f3a472f9e6f7547f2e53459bd1f..a5f451b5078cef20653462d0881b78f30ea40180 100644 +index 473563bc7..a5f451b50 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -5431,3 +5431,274 @@ void __init of_clk_init(const struct of_device_id *matches) @@ -37240,7 +37232,7 @@ index 473563bc74960f3a472f9e6f7547f2e53459bd1f..a5f451b5078cef20653462d0881b78f3 +late_initcall_sync(clk_create_procfs); +#endif diff --git a/drivers/clk/rockchip/Kconfig b/drivers/clk/rockchip/Kconfig -index 9aad86925cd288f8abd94d98865e8dc0b1aca747..3a1840f5f0e2783f350bce0ea85cccdb1db9183e 100644 +index 9aad86925..3a1840f5f 100644 --- a/drivers/clk/rockchip/Kconfig +++ b/drivers/clk/rockchip/Kconfig @@ -2,7 +2,7 @@ @@ -37487,7 +37479,7 @@ index 9aad86925cd288f8abd94d98865e8dc0b1aca747..3a1840f5f0e2783f350bce0ea85cccdb + endif diff --git a/drivers/clk/rockchip/Makefile b/drivers/clk/rockchip/Makefile -index 36894f6a7022d8f4416e3f60ae16b9922571fa3f..d6aafb10646891d2028bf503957cb026124f2af6 100644 +index 36894f6a7..d6aafb106 100644 --- a/drivers/clk/rockchip/Makefile +++ b/drivers/clk/rockchip/Makefile @@ -4,20 +4,27 @@ @@ -37531,7 +37523,7 @@ index 36894f6a7022d8f4416e3f60ae16b9922571fa3f..d6aafb10646891d2028bf503957cb026 -obj-$(CONFIG_CLK_RK3588) += clk-rk3588.o rst-rk3588.o +obj-$(CONFIG_CLK_RK3588) += clk-rk3588.o diff --git a/drivers/clk/rockchip/clk-cpu.c b/drivers/clk/rockchip/clk-cpu.c -index 6ea7fba9f9e56f3c457113d242ce88b4bd8293de..9a9beeb8cfbcbe09116dae9e191fdfbdf9045b88 100644 +index 6ea7fba9f..9a9beeb8c 100644 --- a/drivers/clk/rockchip/clk-cpu.c +++ b/drivers/clk/rockchip/clk-cpu.c @@ -51,6 +51,7 @@ @@ -37817,7 +37809,7 @@ index 6ea7fba9f9e56f3c457113d242ce88b4bd8293de..9a9beeb8cfbcbe09116dae9e191fdfbd +} diff --git a/drivers/clk/rockchip/clk-dclk-divider.c b/drivers/clk/rockchip/clk-dclk-divider.c new file mode 100644 -index 0000000000000000000000000000000000000000..88cf7ab82a573ba1dea4910d2ec5bef35cac5334 +index 000000000..88cf7ab82 --- /dev/null +++ b/drivers/clk/rockchip/clk-dclk-divider.c @@ -0,0 +1,168 @@ @@ -37990,7 +37982,7 @@ index 0000000000000000000000000000000000000000..88cf7ab82a573ba1dea4910d2ec5bef3 + return ERR_PTR(-ENOMEM); +} diff --git a/drivers/clk/rockchip/clk-ddr.c b/drivers/clk/rockchip/clk-ddr.c -index 86718c54e56b3ff52ee6ea9f209159de91e9da39..46df75f1a29ca0a376ec7593f1057bf7a3ab2784 100644 +index 86718c54e..46df75f1a 100644 --- a/drivers/clk/rockchip/clk-ddr.c +++ b/drivers/clk/rockchip/clk-ddr.c @@ -8,8 +8,14 @@ @@ -38174,7 +38166,7 @@ index 86718c54e56b3ff52ee6ea9f209159de91e9da39..46df75f1a29ca0a376ec7593f1057bf7 ddrclk->mux_offset = mux_offset; ddrclk->mux_shift = mux_shift; diff --git a/drivers/clk/rockchip/clk-half-divider.c b/drivers/clk/rockchip/clk-half-divider.c -index 64f7faad2148f27099d1ace36da45207e2315a1c..9e0d0fc00f8b193ea48f976538fb6ac5b60d72dd 100644 +index 64f7faad2..9e0d0fc00 100644 --- a/drivers/clk/rockchip/clk-half-divider.c +++ b/drivers/clk/rockchip/clk-half-divider.c @@ -14,9 +14,9 @@ static bool _is_best_half_div(unsigned long rate, unsigned long now, @@ -38276,7 +38268,7 @@ index 64f7faad2148f27099d1ace36da45207e2315a1c..9e0d0fc00f8b193ea48f976538fb6ac5 div->lock = lock; diff --git a/drivers/clk/rockchip/clk-link.c b/drivers/clk/rockchip/clk-link.c new file mode 100644 -index 0000000000000000000000000000000000000000..78ff9b53c1655f99854c553f411149e51bc81a9c +index 000000000..78ff9b53c --- /dev/null +++ b/drivers/clk/rockchip/clk-link.c @@ -0,0 +1,244 @@ @@ -38526,7 +38518,7 @@ index 0000000000000000000000000000000000000000..78ff9b53c1655f99854c553f411149e5 +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-out.c b/drivers/clk/rockchip/clk-out.c new file mode 100644 -index 0000000000000000000000000000000000000000..22dcd98fbbefb0ab569bcdaa02ea6de09ceb0895 +index 000000000..22dcd98fb --- /dev/null +++ b/drivers/clk/rockchip/clk-out.c @@ -0,0 +1,99 @@ @@ -38630,7 +38622,7 @@ index 0000000000000000000000000000000000000000..22dcd98fbbefb0ab569bcdaa02ea6de0 +MODULE_LICENSE("GPL"); +MODULE_DEVICE_TABLE(of, rockchip_clk_out_match); diff --git a/drivers/clk/rockchip/clk-pll.c b/drivers/clk/rockchip/clk-pll.c -index 2d42eb6289267711c15f5e8275599e5c80995b76..8aa9c30147c9f906d2e3334fa593a52a7f9bab98 100644 +index 2d42eb628..8aa9c3014 100644 --- a/drivers/clk/rockchip/clk-pll.c +++ b/drivers/clk/rockchip/clk-pll.c @@ -15,6 +15,9 @@ @@ -40085,7 +40077,7 @@ index 2d42eb6289267711c15f5e8275599e5c80995b76..8aa9c30147c9f906d2e3334fa593a52a +#endif /* CONFIG_ROCKCHIP_CLK_BOOST */ diff --git a/drivers/clk/rockchip/clk-pvtm.c b/drivers/clk/rockchip/clk-pvtm.c new file mode 100644 -index 0000000000000000000000000000000000000000..c748589dd92276f6ae4338f687c7ebe105fc5a94 +index 000000000..c748589dd --- /dev/null +++ b/drivers/clk/rockchip/clk-pvtm.c @@ -0,0 +1,311 @@ @@ -40401,7 +40393,7 @@ index 0000000000000000000000000000000000000000..c748589dd92276f6ae4338f687c7ebe1 +MODULE_DESCRIPTION("Rockchip Clock Pvtm Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/clk/rockchip/clk-px30.c b/drivers/clk/rockchip/clk-px30.c -index b58619eb412bbc98da86f1a30cfdea11134dd8f1..d76aaf04b3e704699c048ecf7053295843f49fba 100644 +index b58619eb4..d76aaf04b 100644 --- a/drivers/clk/rockchip/clk-px30.c +++ b/drivers/clk/rockchip/clk-px30.c @@ -6,8 +6,11 @@ @@ -40953,7 +40945,7 @@ index b58619eb412bbc98da86f1a30cfdea11134dd8f1..d76aaf04b3e704699c048ecf70532958 +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rk1808.c b/drivers/clk/rockchip/clk-rk1808.c new file mode 100644 -index 0000000000000000000000000000000000000000..e177a3dd634ca2337f0cf9902580a318907df587 +index 000000000..e177a3dd6 --- /dev/null +++ b/drivers/clk/rockchip/clk-rk1808.c @@ -0,0 +1,1249 @@ @@ -42207,7 +42199,7 @@ index 0000000000000000000000000000000000000000..e177a3dd634ca2337f0cf9902580a318 +MODULE_DESCRIPTION("Rockchip RK1808 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3036.c b/drivers/clk/rockchip/clk-rk3036.c -index d644bc155ec6e5c8bc526a94df045922eaaa07ee..ed05eb6c51f379428ffe609672b6aa7c08da86ea 100644 +index d644bc155..ed05eb6c5 100644 --- a/drivers/clk/rockchip/clk-rk3036.c +++ b/drivers/clk/rockchip/clk-rk3036.c @@ -9,8 +9,10 @@ @@ -42509,7 +42501,7 @@ index d644bc155ec6e5c8bc526a94df045922eaaa07ee..ed05eb6c51f379428ffe609672b6aa7c +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 75071e0cd3216e94c279992c6c90800b5747cbac..1b1111e88089e81463f363ce0f0ce82cda974185 100644 +index 75071e0cd..1b1111e88 100644 --- a/drivers/clk/rockchip/clk-rk3128.c +++ b/drivers/clk/rockchip/clk-rk3128.c @@ -6,8 +6,11 @@ @@ -42840,7 +42832,7 @@ index 75071e0cd3216e94c279992c6c90800b5747cbac..1b1111e88089e81463f363ce0f0ce82c +MODULE_DESCRIPTION("Rockchip RK3128 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c -index 9c8af4d1dae04fd6986e9384da3ab2d0b6a5f740..d891b80d6c732207ef62cdb9873bc23848e481ad 100644 +index 9c8af4d1d..d891b80d6 100644 --- a/drivers/clk/rockchip/clk-rk3188.c +++ b/drivers/clk/rockchip/clk-rk3188.c @@ -5,10 +5,12 @@ @@ -43127,7 +43119,7 @@ index 9c8af4d1dae04fd6986e9384da3ab2d0b6a5f740..d891b80d6c732207ef62cdb9873bc238 +MODULE_DESCRIPTION("Rockchip RK3188 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3228.c b/drivers/clk/rockchip/clk-rk3228.c -index a24a35553e13499f3b4b0d98cd2968c0080a49cc..18c94343b6b6bc1815fac6c95a2f37f19ed9deec 100644 +index a24a35553..18c94343b 100644 --- a/drivers/clk/rockchip/clk-rk3228.c +++ b/drivers/clk/rockchip/clk-rk3228.c @@ -7,8 +7,10 @@ @@ -43529,7 +43521,7 @@ index a24a35553e13499f3b4b0d98cd2968c0080a49cc..18c94343b6b6bc1815fac6c95a2f37f1 +MODULE_DESCRIPTION("Rockchip RK3228 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c -index baa5aebd32771af9ec0cd4238c05c6501740538f..f9c4678fcd7397920a6467a4573baabe52418ecf 100644 +index baa5aebd3..f9c4678fc 100644 --- a/drivers/clk/rockchip/clk-rk3288.c +++ b/drivers/clk/rockchip/clk-rk3288.c @@ -6,11 +6,14 @@ @@ -44000,7 +43992,7 @@ index baa5aebd32771af9ec0cd4238c05c6501740538f..f9c4678fcd7397920a6467a4573baabe +MODULE_DESCRIPTION("Rockchip RK3288 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3308.c b/drivers/clk/rockchip/clk-rk3308.c -index db3396c3e6e9a56b092e9049a0b803888d88d3e1..6a8e38f11808c3285a97441cee613f30316b7639 100644 +index db3396c3e..6a8e38f11 100644 --- a/drivers/clk/rockchip/clk-rk3308.c +++ b/drivers/clk/rockchip/clk-rk3308.c @@ -8,6 +8,9 @@ @@ -44284,7 +44276,7 @@ index db3396c3e6e9a56b092e9049a0b803888d88d3e1..6a8e38f11808c3285a97441cee613f30 +MODULE_DESCRIPTION("Rockchip RK3308 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3328.c b/drivers/clk/rockchip/clk-rk3328.c -index 267ab54937d3dfda57afd5a6a98961155bf96654..8ec63aaae4f7673ff31b4d7c1de451df7085f9fb 100644 +index 267ab5493..8ec63aaae 100644 --- a/drivers/clk/rockchip/clk-rk3328.c +++ b/drivers/clk/rockchip/clk-rk3328.c @@ -6,8 +6,10 @@ @@ -44729,7 +44721,7 @@ index 267ab54937d3dfda57afd5a6a98961155bf96654..8ec63aaae4f7673ff31b4d7c1de451df +MODULE_DESCRIPTION("Rockchip RK3328 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3368.c b/drivers/clk/rockchip/clk-rk3368.c -index 2c50cc2cc6dbb5efd38c7fde17730334522383be..3ddff548ecba04d765b6a435040490795fc6c664 100644 +index 2c50cc2cc..3ddff548e 100644 --- a/drivers/clk/rockchip/clk-rk3368.c +++ b/drivers/clk/rockchip/clk-rk3368.c @@ -5,8 +5,10 @@ @@ -45057,7 +45049,7 @@ index 2c50cc2cc6dbb5efd38c7fde17730334522383be..3ddff548ecba04d765b6a43504049079 +MODULE_DESCRIPTION("Rockchip RK3368 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c -index 9ebd6c451b3dbf81698627a12310e64cfb6cc445..e1b6c526720f6d8914be1555076712b031bd0684 100644 +index 9ebd6c451..e1b6c5267 100644 --- a/drivers/clk/rockchip/clk-rk3399.c +++ b/drivers/clk/rockchip/clk-rk3399.c @@ -105,25 +105,95 @@ static struct rockchip_pll_rate_table rk3399_pll_rates[] = { @@ -46285,7 +46277,7 @@ index 9ebd6c451b3dbf81698627a12310e64cfb6cc445..e1b6c526720f6d8914be1555076712b0 +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rk3528.c b/drivers/clk/rockchip/clk-rk3528.c new file mode 100644 -index 0000000000000000000000000000000000000000..1b14cd57be0a62fdb118bf25173d74a4e502330d +index 000000000..1b14cd57b --- /dev/null +++ b/drivers/clk/rockchip/clk-rk3528.c @@ -0,0 +1,1174 @@ @@ -47465,7 +47457,7 @@ index 0000000000000000000000000000000000000000..1b14cd57be0a62fdb118bf25173d74a4 + diff --git a/drivers/clk/rockchip/clk-rk3562.c b/drivers/clk/rockchip/clk-rk3562.c new file mode 100644 -index 0000000000000000000000000000000000000000..3c6f78fecfa02bbd7833308fa9e2c43416cb1c74 +index 000000000..3c6f78fec --- /dev/null +++ b/drivers/clk/rockchip/clk-rk3562.c @@ -0,0 +1,1134 @@ @@ -48604,7 +48596,7 @@ index 0000000000000000000000000000000000000000..3c6f78fecfa02bbd7833308fa9e2c434 +MODULE_ALIAS("platform:clk-rk3562"); +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rk3568.c b/drivers/clk/rockchip/clk-rk3568.c -index db713e1526cdc3cc12298cdc72adb076acd9379b..3e695506652522e34416f5fc4b5fb2e76248dce8 100644 +index db713e152..3e6955066 100644 --- a/drivers/clk/rockchip/clk-rk3568.c +++ b/drivers/clk/rockchip/clk-rk3568.c @@ -7,13 +7,21 @@ @@ -49204,7 +49196,7 @@ index db713e1526cdc3cc12298cdc72adb076acd9379b..3e695506652522e34416f5fc4b5fb2e7 +MODULE_ALIAS("platform:clk-rk3568"); +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rk3588.c b/drivers/clk/rockchip/clk-rk3588.c -index 6994165e03957c89000addbf1479f18ebbbe26fc..c297e4e1e9db0bcc3ea6d07af3955c48ee459aef 100644 +index 6994165e0..c297e4e1e 100644 --- a/drivers/clk/rockchip/clk-rk3588.c +++ b/drivers/clk/rockchip/clk-rk3588.c @@ -5,37 +5,18 @@ @@ -49949,7 +49941,7 @@ index 6994165e03957c89000addbf1479f18ebbbe26fc..c297e4e1e9db0bcc3ea6d07af3955c48 +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rv1106.c b/drivers/clk/rockchip/clk-rv1106.c new file mode 100644 -index 0000000000000000000000000000000000000000..0833bf2adb8b8c3880dda189e2268f1c548ae15e +index 000000000..0833bf2ad --- /dev/null +++ b/drivers/clk/rockchip/clk-rv1106.c @@ -0,0 +1,1280 @@ @@ -51234,7 +51226,7 @@ index 0000000000000000000000000000000000000000..0833bf2adb8b8c3880dda189e2268f1c +MODULE_LICENSE("GPL"); +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rv1108.c b/drivers/clk/rockchip/clk-rv1108.c -index 5f49af3c970a0ef6f601ecc331c095926f4ee205..0a93b93338badb59361af65acce135976bdc14c4 100644 +index 5f49af3c9..0a93b9333 100644 --- a/drivers/clk/rockchip/clk-rv1108.c +++ b/drivers/clk/rockchip/clk-rv1108.c @@ -7,8 +7,10 @@ @@ -51467,7 +51459,7 @@ index 5f49af3c970a0ef6f601ecc331c095926f4ee205..0a93b93338badb59361af65acce13597 +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 -index fc19c5522490592b449580ea3c286f6d1f5b32cc..62b204d891011a882685561a6556fae2d0685667 100644 +index fc19c5522..62b204d89 100644 --- a/drivers/clk/rockchip/clk-rv1126.c +++ b/drivers/clk/rockchip/clk-rv1126.c @@ -8,7 +8,7 @@ @@ -52434,7 +52426,7 @@ index fc19c5522490592b449580ea3c286f6d1f5b32cc..62b204d891011a882685561a6556fae2 +MODULE_DESCRIPTION("Rockchip RV1126 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c -index 4059d9365ae642e3e967138e67b9e664c15b6851..96984dea0bc97d6fabe7a26b202e85f3f9bd4fbd 100644 +index 4059d9365..96984dea0 100644 --- a/drivers/clk/rockchip/clk.c +++ b/drivers/clk/rockchip/clk.c @@ -21,10 +21,15 @@ @@ -52796,7 +52788,7 @@ index 4059d9365ae642e3e967138e67b9e664c15b6851..96984dea0bc97d6fabe7a26b202e85f3 +EXPORT_SYMBOL_GPL(rockchip_clk_disable_unused); +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h -index 758ebaf2236bfa5ed50f9e7853cc16827a1a7105..82345742cb618d0f4d9b34f82727ddd05108dcfc 100644 +index 758ebaf22..82345742c 100644 --- a/drivers/clk/rockchip/clk.h +++ b/drivers/clk/rockchip/clk.h @@ -19,6 +19,7 @@ @@ -53336,7 +53328,7 @@ index 758ebaf2236bfa5ed50f9e7853cc16827a1a7105..82345742cb618d0f4d9b34f82727ddd0 #endif diff --git a/drivers/clk/rockchip/regmap/Kconfig b/drivers/clk/rockchip/regmap/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..65f691bc4141101aac451bfd054ed6ae3c08a867 +index 000000000..65f691bc4 --- /dev/null +++ b/drivers/clk/rockchip/regmap/Kconfig @@ -0,0 +1,16 @@ @@ -53358,7 +53350,7 @@ index 0000000000000000000000000000000000000000..65f691bc4141101aac451bfd054ed6ae + select COMMON_CLK_ROCKCHIP_REGMAP diff --git a/drivers/clk/rockchip/regmap/Makefile b/drivers/clk/rockchip/regmap/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..18d075d093d96c496739241614a89d02c66f7c0f +index 000000000..18d075d09 --- /dev/null +++ b/drivers/clk/rockchip/regmap/Makefile @@ -0,0 +1,13 @@ @@ -53377,7 +53369,7 @@ index 0000000000000000000000000000000000000000..18d075d093d96c496739241614a89d02 +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 100644 -index 0000000000000000000000000000000000000000..43d2b9a45aca0536f32716e24502f8c7cc1a11cc +index 000000000..43d2b9a45 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-composite.c @@ -0,0 +1,400 @@ @@ -53783,7 +53775,7 @@ index 0000000000000000000000000000000000000000..43d2b9a45aca0536f32716e24502f8c7 +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 100644 -index 0000000000000000000000000000000000000000..d57f2c7f8350fcb5709443ed8b217bd0b86554a2 +index 000000000..d57f2c7f8 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-divider.c @@ -0,0 +1,117 @@ @@ -53906,7 +53898,7 @@ index 0000000000000000000000000000000000000000..d57f2c7f8350fcb5709443ed8b217bd0 +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 100644 -index 0000000000000000000000000000000000000000..1acbc16e7aae22d78525edae8c043f54126435f1 +index 000000000..1acbc16e7 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c @@ -0,0 +1,167 @@ @@ -54079,7 +54071,7 @@ index 0000000000000000000000000000000000000000..1acbc16e7aae22d78525edae8c043f54 +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 100644 -index 0000000000000000000000000000000000000000..36549b912fa207bba51383bf8783d88be6378bbd +index 000000000..36549b912 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-gate.c @@ -0,0 +1,82 @@ @@ -54167,7 +54159,7 @@ index 0000000000000000000000000000000000000000..36549b912fa207bba51383bf8783d88b +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 100644 -index 0000000000000000000000000000000000000000..eb37b5f9503c572a163078adba2789f5adf06a94 +index 000000000..eb37b5f95 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-mux.c @@ -0,0 +1,81 @@ @@ -54254,7 +54246,7 @@ index 0000000000000000000000000000000000000000..eb37b5f9503c572a163078adba2789f5 +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 100644 -index 0000000000000000000000000000000000000000..24ad7eda9d9480df63ff16d03a910e336e220eb1 +index 000000000..24ad7eda9 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-pll.c @@ -0,0 +1,363 @@ @@ -54623,7 +54615,7 @@ index 0000000000000000000000000000000000000000..24ad7eda9d9480df63ff16d03a910e33 +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 100644 -index 0000000000000000000000000000000000000000..4626e1982bebddcf76120aedcf18925e230b7c36 +index 000000000..4626e1982 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap.h @@ -0,0 +1,308 @@ @@ -54937,7 +54929,7 @@ index 0000000000000000000000000000000000000000..4626e1982bebddcf76120aedcf18925e +#endif diff --git a/drivers/clk/rockchip/regmap/clk-rk618.c b/drivers/clk/rockchip/regmap/clk-rk618.c new file mode 100644 -index 0000000000000000000000000000000000000000..c780f502b3545ecf500b3982525b2aed76d1643d +index 000000000..c780f502b --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-rk618.c @@ -0,0 +1,408 @@ @@ -55351,7 +55343,7 @@ index 0000000000000000000000000000000000000000..c780f502b3545ecf500b3982525b2aed +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 100644 -index 0000000000000000000000000000000000000000..7f501db660e0be9672b566da9218aaf89c5829b9 +index 000000000..7f501db66 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-rk628.c @@ -0,0 +1,609 @@ @@ -55966,7 +55958,7 @@ index 0000000000000000000000000000000000000000..7f501db660e0be9672b566da9218aaf8 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/clk/rockchip/rst-rk3588.c b/drivers/clk/rockchip/rst-rk3588.c deleted file mode 100644 -index e855bb8d541360ff69c55663ee17e79e2c24b223..0000000000000000000000000000000000000000 +index e855bb8d5..000000000 --- a/drivers/clk/rockchip/rst-rk3588.c +++ /dev/null @@ -1,857 +0,0 @@ @@ -56828,7 +56820,7 @@ index e855bb8d541360ff69c55663ee17e79e2c24b223..00000000000000000000000000000000 - ROCKCHIP_SOFTRST_HIWORD_MASK); -} diff --git a/drivers/clk/rockchip/softrst.c b/drivers/clk/rockchip/softrst.c -index fd56aaefe6d14b25d0473c68d05ec991298d834d..5d07266745b890ec21c32c60ab0526bd393ae8a8 100644 +index fd56aaefe..5d0726674 100644 --- a/drivers/clk/rockchip/softrst.c +++ b/drivers/clk/rockchip/softrst.c @@ -12,7 +12,6 @@ @@ -56911,7 +56903,7 @@ index fd56aaefe6d14b25d0473c68d05ec991298d834d..5d07266745b890ec21c32c60ab0526bd -EXPORT_SYMBOL_GPL(rockchip_register_softrst_lut); +EXPORT_SYMBOL_GPL(rockchip_register_softrst); diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig -index 0ba0dc4ecf06201a0532d3af71194841a5167c64..93ad1b7180eded7a166de7f2c69009857da3d984 100644 +index 0ba0dc4ec..93ad1b718 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -92,7 +92,9 @@ config IXP4XX_TIMER @@ -56926,7 +56918,7 @@ index 0ba0dc4ecf06201a0532d3af71194841a5167c64..93ad1b7180eded7a166de7f2c6900985 select TIMER_OF select CLKSRC_MMIO diff --git a/drivers/clocksource/timer-rockchip.c b/drivers/clocksource/timer-rockchip.c -index 1f95d0aca08f2984cd8f2014e913c41018b71321..2f4e970d7433cf084a25e1655b880e557aa1bb6e 100644 +index 1f95d0aca..2f4e970d7 100644 --- a/drivers/clocksource/timer-rockchip.c +++ b/drivers/clocksource/timer-rockchip.c @@ -8,11 +8,13 @@ @@ -57020,7 +57012,7 @@ index 1f95d0aca08f2984cd8f2014e913c41018b71321..2f4e970d7433cf084a25e1655b880e55 +MODULE_LICENSE("GPL"); +#endif diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig -index f429b9b37b76c7e45e0c0cd9eb38980666ff597d..2533b01bde62fd537cbe6347abd9d3b8ca8ce366 100644 +index f429b9b37..2533b01bd 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -105,6 +105,17 @@ config CPU_FREQ_DEFAULT_GOV_SCHEDUTIL @@ -57077,7 +57069,7 @@ index f429b9b37b76c7e45e0c0cd9eb38980666ff597d..2533b01bde62fd537cbe6347abd9d3b8 help This adds a generic DT based cpufreq driver for frequency management. diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm -index 123b4bbfcfee19ccf419594f6cb3bde3a0457e99..6fdc2f0430bb3ec954220208fa34930a820b15c3 100644 +index 123b4bbfc..6fdc2f043 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -189,6 +189,16 @@ config ARM_RASPBERRYPI_CPUFREQ @@ -57098,7 +57090,7 @@ index 123b4bbfcfee19ccf419594f6cb3bde3a0457e99..6fdc2f0430bb3ec954220208fa34930a bool "Samsung S3C64XX" depends on CPU_S3C6410 diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile -index ef8510774913113b19f3ee9ee738bc228154d188..a77074f7cca158a0e643f91be749e2362eb8e2b2 100644 +index ef8510774..a77074f7c 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_CPU_FREQ_GOV_POWERSAVE) += cpufreq_powersave.o @@ -57118,7 +57110,7 @@ index ef8510774913113b19f3ee9ee738bc228154d188..a77074f7cca158a0e643f91be749e236 obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c -index fb2875ce1fdd57d409f2922dce5d05b1c7c30b8d..52cdde09e4487c0db5a28f95f21adca69f526aa0 100644 +index fb2875ce1..52cdde09e 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 allowlist[] __initconst = { @@ -57181,7 +57173,7 @@ index fb2875ce1fdd57d409f2922dce5d05b1c7c30b8d..52cdde09e4487c0db5a28f95f21adca6 { .compatible = "st,stih410", }, { .compatible = "st,stih418", }, diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c -index 8bd6e5e8f121ce89fdc80af0caa66fd6944ef593..6e48000582ea192daf57f976c433091f93621700 100644 +index 8bd6e5e8f..6e4800058 100644 --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c @@ -23,6 +23,9 @@ @@ -57219,7 +57211,7 @@ index 8bd6e5e8f121ce89fdc80af0caa66fd6944ef593..6e48000582ea192daf57f976c433091f dev_err(cpu_dev, "failed to init cpufreq table: %d\n", ret); diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c new file mode 100644 -index 0000000000000000000000000000000000000000..a128216fc288dc17ec40e4446d9e2a92a758897e +index 000000000..a128216fc --- /dev/null +++ b/drivers/cpufreq/cpufreq_interactive.c @@ -0,0 +1,1643 @@ @@ -58867,7 +58859,7 @@ index 0000000000000000000000000000000000000000..a128216fc288dc17ec40e4446d9e2a92 +MODULE_DESCRIPTION("'cpufreq_interactive' - A dynamic cpufreq governor for Latency sensitive workloads"); +MODULE_LICENSE("GPL"); diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c -index 50a4d784658009112d1d160e8b3bc8d9d9f2de0d..1f001d281718e3fdf72f92c01c9c81a898ce2526 100644 +index 50a4d7846..1f001d281 100644 --- a/drivers/cpufreq/cpufreq_userspace.c +++ b/drivers/cpufreq/cpufreq_userspace.c @@ -78,20 +78,18 @@ static int cpufreq_userspace_policy_start(struct cpufreq_policy *policy) @@ -58895,7 +58887,7 @@ index 50a4d784658009112d1d160e8b3bc8d9d9f2de0d..1f001d281718e3fdf72f92c01c9c81a8 diff --git a/drivers/cpufreq/rockchip-cpufreq.c b/drivers/cpufreq/rockchip-cpufreq.c new file mode 100644 -index 0000000000000000000000000000000000000000..dfed7d6b7841e60d0b00b324db093855c319ef58 +index 000000000..dfed7d6b7 --- /dev/null +++ b/drivers/cpufreq/rockchip-cpufreq.c @@ -0,0 +1,852 @@ @@ -59753,7 +59745,7 @@ index 0000000000000000000000000000000000000000..dfed7d6b7841e60d0b00b324db093855 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/cpufreq/rockchip-cpufreq.h b/drivers/cpufreq/rockchip-cpufreq.h new file mode 100644 -index 0000000000000000000000000000000000000000..2eb920606d2af9dc9058a03c4f750698f4542f1b +index 000000000..2eb920606 --- /dev/null +++ b/drivers/cpufreq/rockchip-cpufreq.h @@ -0,0 +1,24 @@ @@ -59782,7 +59774,7 @@ index 0000000000000000000000000000000000000000..2eb920606d2af9dc9058a03c4f750698 + +#endif diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig -index c761952f0dc6df92e1ee37ad5707bb7539c2cef3..5f1c9813b9e095002d277a8353fd13a6582324c7 100644 +index c761952f0..5f1c9813b 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -638,26 +638,27 @@ config CRYPTO_DEV_ROCKCHIP @@ -59824,7 +59816,7 @@ index c761952f0dc6df92e1ee37ad5707bb7539c2cef3..5f1c9813b9e095002d277a8353fd13a6 tristate "Support for Xilinx ZynqMP AES hw accelerator" diff --git a/drivers/crypto/rockchip/Kconfig b/drivers/crypto/rockchip/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..b7402e8a5e608d0fd066321d9a62173e7961a2dd +index 000000000..b7402e8a5 --- /dev/null +++ b/drivers/crypto/rockchip/Kconfig @@ -0,0 +1,25 @@ @@ -59854,7 +59846,7 @@ index 0000000000000000000000000000000000000000..b7402e8a5e608d0fd066321d9a62173e + access existing ciphers in kernel space from userspace, + thus enabling the re-use of a hardware implementation of a cipher. diff --git a/drivers/crypto/rockchip/Makefile b/drivers/crypto/rockchip/Makefile -index 785277aca71ed7c78835fedc4b859b3ab7eb7933..53e34aa47bc108b5f84d4a2b3096ae74152dd241 100644 +index 785277aca..53e34aa47 100644 --- a/drivers/crypto/rockchip/Makefile +++ b/drivers/crypto/rockchip/Makefile @@ -1,5 +1,30 @@ @@ -59893,7 +59885,7 @@ index 785277aca71ed7c78835fedc4b859b3ab7eb7933..53e34aa47bc108b5f84d4a2b3096ae74 +obj-$(CONFIG_CRYPTO_DEV_ROCKCHIP_DEV) += cryptodev_linux/ diff --git a/drivers/crypto/rockchip/cryptodev_linux/Makefile b/drivers/crypto/rockchip/cryptodev_linux/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..628262fb2e5008c0d6fedc011df5864ce59d7cf3 +index 000000000..628262fb2 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/Makefile @@ -0,0 +1,10 @@ @@ -59909,7 +59901,7 @@ index 0000000000000000000000000000000000000000..628262fb2e5008c0d6fedc011df5864c + diff --git a/drivers/crypto/rockchip/cryptodev_linux/authenc.c b/drivers/crypto/rockchip/cryptodev_linux/authenc.c new file mode 100644 -index 0000000000000000000000000000000000000000..afca7f76dcd264cc6fc34ddca26310fd250bcac6 +index 000000000..afca7f76d --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/authenc.c @@ -0,0 +1,1106 @@ @@ -61021,7 +61013,7 @@ index 0000000000000000000000000000000000000000..afca7f76dcd264cc6fc34ddca26310fd +} diff --git a/drivers/crypto/rockchip/cryptodev_linux/cipherapi.h b/drivers/crypto/rockchip/cryptodev_linux/cipherapi.h new file mode 100644 -index 0000000000000000000000000000000000000000..7073588e1ddcc18df52c815a00ab3a177e313d5f +index 000000000..7073588e1 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/cipherapi.h @@ -0,0 +1,58 @@ @@ -61085,7 +61077,7 @@ index 0000000000000000000000000000000000000000..7073588e1ddcc18df52c815a00ab3a17 +#endif diff --git a/drivers/crypto/rockchip/cryptodev_linux/cryptlib.c b/drivers/crypto/rockchip/cryptodev_linux/cryptlib.c new file mode 100644 -index 0000000000000000000000000000000000000000..8b2a28c7347b4844b04c4dda400bd3b02a940b8b +index 000000000..8b2a28c73 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/cryptlib.c @@ -0,0 +1,492 @@ @@ -61583,7 +61575,7 @@ index 0000000000000000000000000000000000000000..8b2a28c7347b4844b04c4dda400bd3b0 +#endif /* CIOCCPHASH */ diff --git a/drivers/crypto/rockchip/cryptodev_linux/cryptlib.h b/drivers/crypto/rockchip/cryptodev_linux/cryptlib.h new file mode 100644 -index 0000000000000000000000000000000000000000..b8867d91b9e01ccdd74006f5ff42e3bd1a760c37 +index 000000000..b8867d91b --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/cryptlib.h @@ -0,0 +1,111 @@ @@ -61700,7 +61692,7 @@ index 0000000000000000000000000000000000000000..b8867d91b9e01ccdd74006f5ff42e3bd +#endif diff --git a/drivers/crypto/rockchip/cryptodev_linux/cryptodev.h b/drivers/crypto/rockchip/cryptodev_linux/cryptodev.h new file mode 100644 -index 0000000000000000000000000000000000000000..fd8619db6156046f1ab6145657c1f9a00be24f70 +index 000000000..fd8619db6 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/cryptodev.h @@ -0,0 +1,188 @@ @@ -61894,7 +61886,7 @@ index 0000000000000000000000000000000000000000..fd8619db6156046f1ab6145657c1f9a0 +#endif /* CRYPTODEV_INT_H */ diff --git a/drivers/crypto/rockchip/cryptodev_linux/ioctl.c b/drivers/crypto/rockchip/cryptodev_linux/ioctl.c new file mode 100644 -index 0000000000000000000000000000000000000000..032b016e476bb0e9db58aa0e8cd5ce4a9c58d51b +index 000000000..032b016e4 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/ioctl.c @@ -0,0 +1,1329 @@ @@ -63229,7 +63221,7 @@ index 0000000000000000000000000000000000000000..032b016e476bb0e9db58aa0e8cd5ce4a + diff --git a/drivers/crypto/rockchip/cryptodev_linux/main.c b/drivers/crypto/rockchip/cryptodev_linux/main.c new file mode 100644 -index 0000000000000000000000000000000000000000..23efae186acd2fa9d795c731997ac435f49246ad +index 000000000..23efae186 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/main.c @@ -0,0 +1,266 @@ @@ -63501,7 +63493,7 @@ index 0000000000000000000000000000000000000000..23efae186acd2fa9d795c731997ac435 +} diff --git a/drivers/crypto/rockchip/cryptodev_linux/rk_cryptodev.c b/drivers/crypto/rockchip/cryptodev_linux/rk_cryptodev.c new file mode 100644 -index 0000000000000000000000000000000000000000..be36478f8178d6c5f1c5f7af6651f9173ac568ca +index 000000000..be36478f8 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/rk_cryptodev.c @@ -0,0 +1,1527 @@ @@ -65034,7 +65026,7 @@ index 0000000000000000000000000000000000000000..be36478f8178d6c5f1c5f7af6651f917 +} diff --git a/drivers/crypto/rockchip/cryptodev_linux/rk_cryptodev.h b/drivers/crypto/rockchip/cryptodev_linux/rk_cryptodev.h new file mode 100644 -index 0000000000000000000000000000000000000000..dff499be3ccb0c872138a53237c240af3b5b8d42 +index 000000000..dff499be3 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/rk_cryptodev.h @@ -0,0 +1,109 @@ @@ -65149,7 +65141,7 @@ index 0000000000000000000000000000000000000000..dff499be3ccb0c872138a53237c240af +#endif diff --git a/drivers/crypto/rockchip/cryptodev_linux/util.c b/drivers/crypto/rockchip/cryptodev_linux/util.c new file mode 100644 -index 0000000000000000000000000000000000000000..28c197eb58b9f27854c1d7cdefa886401a2e96ce +index 000000000..28c197eb5 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/util.c @@ -0,0 +1,80 @@ @@ -65235,7 +65227,7 @@ index 0000000000000000000000000000000000000000..28c197eb58b9f27854c1d7cdefa88640 + diff --git a/drivers/crypto/rockchip/cryptodev_linux/util.h b/drivers/crypto/rockchip/cryptodev_linux/util.h new file mode 100644 -index 0000000000000000000000000000000000000000..f7bf132428a8ccc23e64e13bf1e9dff5ed4413d1 +index 000000000..f7bf13242 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/util.h @@ -0,0 +1,8 @@ @@ -65249,7 +65241,7 @@ index 0000000000000000000000000000000000000000..f7bf132428a8ccc23e64e13bf1e9dff5 + diff --git a/drivers/crypto/rockchip/cryptodev_linux/version.h b/drivers/crypto/rockchip/cryptodev_linux/version.h new file mode 100644 -index 0000000000000000000000000000000000000000..be0490244f8c7874af84249cd861dc828034f6e6 +index 000000000..be0490244 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/version.h @@ -0,0 +1,9 @@ @@ -65264,7 +65256,7 @@ index 0000000000000000000000000000000000000000..be0490244f8c7874af84249cd861dc82 + diff --git a/drivers/crypto/rockchip/cryptodev_linux/zc.c b/drivers/crypto/rockchip/cryptodev_linux/zc.c new file mode 100644 -index 0000000000000000000000000000000000000000..7671c3131888ab63bb77c351fd5d063d9ecee711 +index 000000000..7671c3131 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/zc.c @@ -0,0 +1,235 @@ @@ -65505,7 +65497,7 @@ index 0000000000000000000000000000000000000000..7671c3131888ab63bb77c351fd5d063d +} diff --git a/drivers/crypto/rockchip/cryptodev_linux/zc.h b/drivers/crypto/rockchip/cryptodev_linux/zc.h new file mode 100644 -index 0000000000000000000000000000000000000000..808af48552a5108ebb98ff9dfd61e2801b4dfdc9 +index 000000000..808af4855 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/zc.h @@ -0,0 +1,27 @@ @@ -65538,7 +65530,7 @@ index 0000000000000000000000000000000000000000..808af48552a5108ebb98ff9dfd61e280 +#endif diff --git a/drivers/crypto/rockchip/procfs.c b/drivers/crypto/rockchip/procfs.c new file mode 100644 -index 0000000000000000000000000000000000000000..5689dc53073629c042ce0d3160d6e2dd915d4f46 +index 000000000..5689dc530 --- /dev/null +++ b/drivers/crypto/rockchip/procfs.c @@ -0,0 +1,160 @@ @@ -65704,7 +65696,7 @@ index 0000000000000000000000000000000000000000..5689dc53073629c042ce0d3160d6e2dd +#endif /* CONFIG_PROC_FS */ diff --git a/drivers/crypto/rockchip/procfs.h b/drivers/crypto/rockchip/procfs.h new file mode 100644 -index 0000000000000000000000000000000000000000..e491c53b4e04b0be6d3787b38c446b0db6cfc29a +index 000000000..e491c53b4 --- /dev/null +++ b/drivers/crypto/rockchip/procfs.h @@ -0,0 +1,23 @@ @@ -65732,7 +65724,7 @@ index 0000000000000000000000000000000000000000..e491c53b4e04b0be6d3787b38c446b0d + +#endif diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockchip/rk3288_crypto.c -index 77d5705a5d960dc639dd1c4cc96acf93657d9531..14a0aef18ab1367b672c2a2df7110f34068c291b 100644 +index 77d5705a5..14a0aef18 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.c +++ b/drivers/crypto/rockchip/rk3288_crypto.c @@ -10,155 +10,59 @@ @@ -66230,7 +66222,7 @@ index 77d5705a5d960dc639dd1c4cc96acf93657d9531..14a0aef18ab1367b672c2a2df7110f34 }, }; diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockchip/rk3288_crypto.h -index 3aa03cbfb6beba6ec258c3b9ea4c27a26ff08b8b..045e811b4af8484871ec186ba98758277e08e409 100644 +index 3aa03cbfb..045e811b4 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h @@ -3,18 +3,19 @@ @@ -66375,7 +66367,7 @@ index 3aa03cbfb6beba6ec258c3b9ea4c27a26ff08b8b..045e811b4af8484871ec186ba9875827 -struct rk_crypto_info *get_rk_crypto(void); #endif diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto/rockchip/rk3288_crypto_ahash.c -index 8c143180645e5bdd61d7a140838db295c9678b9c..edd40e16a3f0a765a78b8662a8a9166932097940 100644 +index 8c1431806..edd40e16a 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c +++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c @@ -8,15 +8,8 @@ @@ -66732,7 +66724,7 @@ index 8c143180645e5bdd61d7a140838db295c9678b9c..edd40e16a3f0a765a78b8662a8a91669 + } }; diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c -index da95747d973f0e168117562d402fe6f0c376c498..67a7e05d5ae31ef5bcb70eec2e1ceb449f9978dc 100644 +index da95747d9..67a7e05d5 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c @@ -8,14 +8,8 @@ @@ -67322,7 +67314,7 @@ index da95747d973f0e168117562d402fe6f0c376c498..67a7e05d5ae31ef5bcb70eec2e1ceb44 }; diff --git a/drivers/crypto/rockchip/rk_crypto_ahash_utils.c b/drivers/crypto/rockchip/rk_crypto_ahash_utils.c new file mode 100644 -index 0000000000000000000000000000000000000000..495c55485f143a195b0a33933a4da1eeff3f2c67 +index 000000000..495c55485 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_ahash_utils.c @@ -0,0 +1,450 @@ @@ -67778,7 +67770,7 @@ index 0000000000000000000000000000000000000000..495c55485f143a195b0a33933a4da1ee +} diff --git a/drivers/crypto/rockchip/rk_crypto_ahash_utils.h b/drivers/crypto/rockchip/rk_crypto_ahash_utils.h new file mode 100644 -index 0000000000000000000000000000000000000000..46afd98a02525077f0e6012ae0abbb3a4d4de930 +index 000000000..46afd98a0 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_ahash_utils.h @@ -0,0 +1,35 @@ @@ -67819,7 +67811,7 @@ index 0000000000000000000000000000000000000000..46afd98a02525077f0e6012ae0abbb3a +#endif diff --git a/drivers/crypto/rockchip/rk_crypto_bignum.c b/drivers/crypto/rockchip/rk_crypto_bignum.c new file mode 100644 -index 0000000000000000000000000000000000000000..690c2fdf58bafa809d5da4fbc0a8611c97b05bbd +index 000000000..690c2fdf5 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_bignum.c @@ -0,0 +1,130 @@ @@ -67955,7 +67947,7 @@ index 0000000000000000000000000000000000000000..690c2fdf58bafa809d5da4fbc0a8611c +} diff --git a/drivers/crypto/rockchip/rk_crypto_bignum.h b/drivers/crypto/rockchip/rk_crypto_bignum.h new file mode 100644 -index 0000000000000000000000000000000000000000..780aa87661eb4d21f0f25ee98fd8a1c821d3ab81 +index 000000000..780aa8766 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_bignum.h @@ -0,0 +1,27 @@ @@ -67988,7 +67980,7 @@ index 0000000000000000000000000000000000000000..780aa87661eb4d21f0f25ee98fd8a1c8 +#endif diff --git a/drivers/crypto/rockchip/rk_crypto_core.c b/drivers/crypto/rockchip/rk_crypto_core.c new file mode 100644 -index 0000000000000000000000000000000000000000..2a9cf2da6372c50cf37adfa67436c08a86905db7 +index 000000000..2a9cf2da6 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_core.c @@ -0,0 +1,945 @@ @@ -68939,7 +68931,7 @@ index 0000000000000000000000000000000000000000..2a9cf2da6372c50cf37adfa67436c08a +MODULE_LICENSE("GPL"); diff --git a/drivers/crypto/rockchip/rk_crypto_core.h b/drivers/crypto/rockchip/rk_crypto_core.h new file mode 100644 -index 0000000000000000000000000000000000000000..b2b059e917e92485213955a0ae34add3af7f086f +index 000000000..b2b059e91 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_core.h @@ -0,0 +1,464 @@ @@ -69409,7 +69401,7 @@ index 0000000000000000000000000000000000000000..b2b059e917e92485213955a0ae34add3 + diff --git a/drivers/crypto/rockchip/rk_crypto_skcipher_utils.c b/drivers/crypto/rockchip/rk_crypto_skcipher_utils.c new file mode 100644 -index 0000000000000000000000000000000000000000..7d8d0aafa5f4f27744cd9819b3b0f7881bd70451 +index 000000000..7d8d0aafa --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_skcipher_utils.c @@ -0,0 +1,478 @@ @@ -69893,7 +69885,7 @@ index 0000000000000000000000000000000000000000..7d8d0aafa5f4f27744cd9819b3b0f788 +} diff --git a/drivers/crypto/rockchip/rk_crypto_skcipher_utils.h b/drivers/crypto/rockchip/rk_crypto_skcipher_utils.h new file mode 100644 -index 0000000000000000000000000000000000000000..7d47f9719ac80e1fc7949f05af1061a2ac5882ae +index 000000000..7d47f9719 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_skcipher_utils.h @@ -0,0 +1,46 @@ @@ -69945,7 +69937,7 @@ index 0000000000000000000000000000000000000000..7d47f9719ac80e1fc7949f05af1061a2 + diff --git a/drivers/crypto/rockchip/rk_crypto_utils.c b/drivers/crypto/rockchip/rk_crypto_utils.c new file mode 100644 -index 0000000000000000000000000000000000000000..5758e0eede9796d2b2a4c9c19ea3aefaa3f295a9 +index 000000000..5758e0eed --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_utils.c @@ -0,0 +1,317 @@ @@ -70268,7 +70260,7 @@ index 0000000000000000000000000000000000000000..5758e0eede9796d2b2a4c9c19ea3aefa + diff --git a/drivers/crypto/rockchip/rk_crypto_utils.h b/drivers/crypto/rockchip/rk_crypto_utils.h new file mode 100644 -index 0000000000000000000000000000000000000000..26c931db86f8a31464b1b60afe437fe7aaabc7f4 +index 000000000..26c931db8 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_utils.h @@ -0,0 +1,63 @@ @@ -70337,7 +70329,7 @@ index 0000000000000000000000000000000000000000..26c931db86f8a31464b1b60afe437fe7 + diff --git a/drivers/crypto/rockchip/rk_crypto_v1.c b/drivers/crypto/rockchip/rk_crypto_v1.c new file mode 100644 -index 0000000000000000000000000000000000000000..14347c4900bccfb0243a266a97b2109118ca21e2 +index 000000000..14347c490 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v1.c @@ -0,0 +1,60 @@ @@ -70403,7 +70395,7 @@ index 0000000000000000000000000000000000000000..14347c4900bccfb0243a266a97b21091 + diff --git a/drivers/crypto/rockchip/rk_crypto_v1.h b/drivers/crypto/rockchip/rk_crypto_v1.h new file mode 100644 -index 0000000000000000000000000000000000000000..417ead57565e4df1931c4e5858a7ad4d42bde9b1 +index 000000000..417ead575 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v1.h @@ -0,0 +1,65 @@ @@ -70474,7 +70466,7 @@ index 0000000000000000000000000000000000000000..417ead57565e4df1931c4e5858a7ad4d + diff --git a/drivers/crypto/rockchip/rk_crypto_v1_ahash.c b/drivers/crypto/rockchip/rk_crypto_v1_ahash.c new file mode 100644 -index 0000000000000000000000000000000000000000..633961adfd4a6292c3f37959e5971a12305c602d +index 000000000..633961adf --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v1_ahash.c @@ -0,0 +1,382 @@ @@ -70862,7 +70854,7 @@ index 0000000000000000000000000000000000000000..633961adfd4a6292c3f37959e5971a12 + diff --git a/drivers/crypto/rockchip/rk_crypto_v1_reg.h b/drivers/crypto/rockchip/rk_crypto_v1_reg.h new file mode 100644 -index 0000000000000000000000000000000000000000..cf520527a1a8c271dc3434c1d544f8b5595c5e53 +index 000000000..cf520527a --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v1_reg.h @@ -0,0 +1,172 @@ @@ -71040,7 +71032,7 @@ index 0000000000000000000000000000000000000000..cf520527a1a8c271dc3434c1d544f8b5 +#endif diff --git a/drivers/crypto/rockchip/rk_crypto_v1_skcipher.c b/drivers/crypto/rockchip/rk_crypto_v1_skcipher.c new file mode 100644 -index 0000000000000000000000000000000000000000..dc7a57b80918ba94ec9345e30a8ffb577b5d03db +index 000000000..dc7a57b80 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v1_skcipher.c @@ -0,0 +1,424 @@ @@ -71470,7 +71462,7 @@ index 0000000000000000000000000000000000000000..dc7a57b80918ba94ec9345e30a8ffb57 + RK_CIPHER_ALGO_INIT(DES3_EDE, CBC, cbc(des3_ede), cbc-des3_ede-rk); diff --git a/drivers/crypto/rockchip/rk_crypto_v2.c b/drivers/crypto/rockchip/rk_crypto_v2.c new file mode 100644 -index 0000000000000000000000000000000000000000..e8f2a0a242a59321f6cd7d1bfe51809ff39b60df +index 000000000..e8f2a0a24 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v2.c @@ -0,0 +1,104 @@ @@ -71580,7 +71572,7 @@ index 0000000000000000000000000000000000000000..e8f2a0a242a59321f6cd7d1bfe51809f + diff --git a/drivers/crypto/rockchip/rk_crypto_v2.h b/drivers/crypto/rockchip/rk_crypto_v2.h new file mode 100644 -index 0000000000000000000000000000000000000000..9e82346d64403598edfaff7801351138450c0363 +index 000000000..9e82346d6 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v2.h @@ -0,0 +1,95 @@ @@ -71681,7 +71673,7 @@ index 0000000000000000000000000000000000000000..9e82346d64403598edfaff7801351138 +#endif /* end of __RK_CRYPTO_V2_H__ */ diff --git a/drivers/crypto/rockchip/rk_crypto_v2_ahash.c b/drivers/crypto/rockchip/rk_crypto_v2_ahash.c new file mode 100644 -index 0000000000000000000000000000000000000000..919603ff476859375d2ea75d4d2afc91fe79f431 +index 000000000..919603ff4 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v2_ahash.c @@ -0,0 +1,379 @@ @@ -72066,7 +72058,7 @@ index 0000000000000000000000000000000000000000..919603ff476859375d2ea75d4d2afc91 + diff --git a/drivers/crypto/rockchip/rk_crypto_v2_akcipher.c b/drivers/crypto/rockchip/rk_crypto_v2_akcipher.c new file mode 100644 -index 0000000000000000000000000000000000000000..1db5adde96ed5dd253f4926c93a4f2493fa13b0a +index 000000000..1db5adde9 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v2_akcipher.c @@ -0,0 +1,320 @@ @@ -72392,7 +72384,7 @@ index 0000000000000000000000000000000000000000..1db5adde96ed5dd253f4926c93a4f249 + diff --git a/drivers/crypto/rockchip/rk_crypto_v2_pka.c b/drivers/crypto/rockchip/rk_crypto_v2_pka.c new file mode 100644 -index 0000000000000000000000000000000000000000..d2c0a265b3ade94989b98f8d063f4359185d5df8 +index 000000000..d2c0a265b --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v2_pka.c @@ -0,0 +1,686 @@ @@ -73084,7 +73076,7 @@ index 0000000000000000000000000000000000000000..d2c0a265b3ade94989b98f8d063f4359 +} diff --git a/drivers/crypto/rockchip/rk_crypto_v2_pka.h b/drivers/crypto/rockchip/rk_crypto_v2_pka.h new file mode 100644 -index 0000000000000000000000000000000000000000..3c0b236f9d88f1f52327b4c0adcbff12edfbff29 +index 000000000..3c0b236f9 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v2_pka.h @@ -0,0 +1,17 @@ @@ -73107,7 +73099,7 @@ index 0000000000000000000000000000000000000000..3c0b236f9d88f1f52327b4c0adcbff12 +#endif diff --git a/drivers/crypto/rockchip/rk_crypto_v2_reg.h b/drivers/crypto/rockchip/rk_crypto_v2_reg.h new file mode 100644 -index 0000000000000000000000000000000000000000..a938ce3f69a7cd7b3a54c7afe93e745c01d349dd +index 000000000..a938ce3f6 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v2_reg.h @@ -0,0 +1,378 @@ @@ -73491,7 +73483,7 @@ index 0000000000000000000000000000000000000000..a938ce3f69a7cd7b3a54c7afe93e745c + diff --git a/drivers/crypto/rockchip/rk_crypto_v2_skcipher.c b/drivers/crypto/rockchip/rk_crypto_v2_skcipher.c new file mode 100644 -index 0000000000000000000000000000000000000000..2bfff0d2877124692dde76bf4d11fff361854a60 +index 000000000..2bfff0d28 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v2_skcipher.c @@ -0,0 +1,685 @@ @@ -74182,7 +74174,7 @@ index 0000000000000000000000000000000000000000..2bfff0d2877124692dde76bf4d11fff3 + diff --git a/drivers/crypto/rockchip/rk_crypto_v3.c b/drivers/crypto/rockchip/rk_crypto_v3.c new file mode 100644 -index 0000000000000000000000000000000000000000..7cd728599d88145ff9596b635bf863f1e43d84b2 +index 000000000..7cd728599 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v3.c @@ -0,0 +1,217 @@ @@ -74405,7 +74397,7 @@ index 0000000000000000000000000000000000000000..7cd728599d88145ff9596b635bf863f1 + diff --git a/drivers/crypto/rockchip/rk_crypto_v3.h b/drivers/crypto/rockchip/rk_crypto_v3.h new file mode 100644 -index 0000000000000000000000000000000000000000..a4b18141630044e3fbd454b0cb738725deef1018 +index 000000000..a4b181416 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v3.h @@ -0,0 +1,96 @@ @@ -74507,7 +74499,7 @@ index 0000000000000000000000000000000000000000..a4b18141630044e3fbd454b0cb738725 +#endif /* end of __RK_CRYPTO_V3_H__ */ diff --git a/drivers/crypto/rockchip/rk_crypto_v3_ahash.c b/drivers/crypto/rockchip/rk_crypto_v3_ahash.c new file mode 100644 -index 0000000000000000000000000000000000000000..0c91b45b2123a908508649e4e149a7562e14998b +index 000000000..0c91b45b2 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v3_ahash.c @@ -0,0 +1,468 @@ @@ -74981,7 +74973,7 @@ index 0000000000000000000000000000000000000000..0c91b45b2123a908508649e4e149a756 + diff --git a/drivers/crypto/rockchip/rk_crypto_v3_reg.h b/drivers/crypto/rockchip/rk_crypto_v3_reg.h new file mode 100644 -index 0000000000000000000000000000000000000000..1c4c45317a281838952ca0b7c3963378e877dd91 +index 000000000..1c4c45317 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v3_reg.h @@ -0,0 +1,80 @@ @@ -75067,7 +75059,7 @@ index 0000000000000000000000000000000000000000..1c4c45317a281838952ca0b7c3963378 + diff --git a/drivers/crypto/rockchip/rk_crypto_v3_skcipher.c b/drivers/crypto/rockchip/rk_crypto_v3_skcipher.c new file mode 100644 -index 0000000000000000000000000000000000000000..4220e6cbeb147473aa417767388bc4260c7caa1a +index 000000000..4220e6cbe --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v3_skcipher.c @@ -0,0 +1,684 @@ @@ -75756,7 +75748,7 @@ index 0000000000000000000000000000000000000000..4220e6cbeb147473aa417767388bc426 + RK_CIPHER_ALGO_INIT(DES3_EDE, OFB, ofb(des3_ede), ofb-des3_ede-rk); + diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig -index 3c4862a752b5a3b8186f34fab44325d1f8d78bb8..eeb1f12bc7f57cfc8fef1a21d6472ad18671aaf5 100644 +index 3c4862a75..eeb1f12bc 100644 --- a/drivers/devfreq/Kconfig +++ b/drivers/devfreq/Kconfig @@ -129,15 +129,20 @@ config ARM_MEDIATEK_CCI_DEVFREQ @@ -75785,7 +75777,7 @@ index 3c4862a752b5a3b8186f34fab44325d1f8d78bb8..eeb1f12bc7f57cfc8fef1a21d6472ad1 from hardware. diff --git a/drivers/devfreq/Makefile b/drivers/devfreq/Makefile -index bf40d04928d03d5dbd0c0267ef2269332c496535..92018ab6c1e4fdaf0dbf7a1469b1076a36d3b889 100644 +index bf40d0492..92018ab6c 100644 --- a/drivers/devfreq/Makefile +++ b/drivers/devfreq/Makefile @@ -12,7 +12,8 @@ obj-$(CONFIG_ARM_EXYNOS_BUS_DEVFREQ) += exynos-bus.o @@ -75799,7 +75791,7 @@ index bf40d04928d03d5dbd0c0267ef2269332c496535..92018ab6c1e4fdaf0dbf7a1469b1076a obj-$(CONFIG_ARM_TEGRA_DEVFREQ) += tegra30-devfreq.o diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c -index 49c542ecccde3b6ac4a21e18e72c59af63b9927f..4385e176340b90870fe9da7d66999c4871f3eceb 100644 +index 49c542ecc..4385e1763 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -1807,6 +1807,40 @@ static ssize_t trans_stat_store(struct device *dev, @@ -75852,7 +75844,7 @@ index 49c542ecccde3b6ac4a21e18e72c59af63b9927f..4385e176340b90870fe9da7d66999c48 }; ATTRIBUTE_GROUPS(devfreq); diff --git a/drivers/devfreq/event/Kconfig b/drivers/devfreq/event/Kconfig -index 878825372f6f7d7560e443fd794293450ea4ff3d..4526c69c602ec139e237e9548c918038e5e8a9c1 100644 +index 878825372..4526c69c6 100644 --- a/drivers/devfreq/event/Kconfig +++ b/drivers/devfreq/event/Kconfig @@ -39,4 +39,11 @@ config DEVFREQ_EVENT_ROCKCHIP_DFI @@ -75868,7 +75860,7 @@ index 878825372f6f7d7560e443fd794293450ea4ff3d..4526c69c602ec139e237e9548c918038 + endif # PM_DEVFREQ_EVENT diff --git a/drivers/devfreq/event/Makefile b/drivers/devfreq/event/Makefile -index 3c847e5d5a358270ad7a889cf4e388c18eecc624..03d67f06c22e0d1e7433d49467838a3dda5dceba 100644 +index 3c847e5d5..03d67f06c 100644 --- a/drivers/devfreq/event/Makefile +++ b/drivers/devfreq/event/Makefile @@ -4,3 +4,4 @@ @@ -75877,7 +75869,7 @@ index 3c847e5d5a358270ad7a889cf4e388c18eecc624..03d67f06c22e0d1e7433d49467838a3d 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 74893c06aa087f0be976aff02b5cdeff08a5f10d..6db7c494555f675f822e26f385b71e64b560a2f5 100644 +index 74893c06a..6db7c4945 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -20,26 +20,81 @@ @@ -76699,7 +76691,7 @@ index 74893c06aa087f0be976aff02b5cdeff08a5f10d..6db7c494555f675f822e26f385b71e64 diff --git a/drivers/devfreq/event/rockchip-nocp.c b/drivers/devfreq/event/rockchip-nocp.c new file mode 100644 -index 0000000000000000000000000000000000000000..954a27d3ff759c03e7bd995909bfa3e482b6d026 +index 000000000..954a27d3f --- /dev/null +++ b/drivers/devfreq/event/rockchip-nocp.c @@ -0,0 +1,210 @@ @@ -76914,7 +76906,7 @@ index 0000000000000000000000000000000000000000..954a27d3ff759c03e7bd995909bfa3e4 +MODULE_AUTHOR("Finley Xiao "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c -index daff407026157bf286214ad63e15acc9b40ac953..fd2c5ffedf41ee68332a438753bd11fb8382168a 100644 +index daff40702..fd2c5ffed 100644 --- a/drivers/devfreq/rk3399_dmc.c +++ b/drivers/devfreq/rk3399_dmc.c @@ -22,6 +22,7 @@ @@ -76949,7 +76941,7 @@ index daff407026157bf286214ad63e15acc9b40ac953..fd2c5ffedf41ee68332a438753bd11fb default: diff --git a/drivers/devfreq/rockchip_bus.c b/drivers/devfreq/rockchip_bus.c new file mode 100644 -index 0000000000000000000000000000000000000000..0f5487eaeb1ccf62deb167b9be1ae1d1b6d4b7de +index 000000000..0f5487eae --- /dev/null +++ b/drivers/devfreq/rockchip_bus.c @@ -0,0 +1,548 @@ @@ -77503,7 +77495,7 @@ index 0000000000000000000000000000000000000000..0f5487eaeb1ccf62deb167b9be1ae1d1 +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 100644 -index 0000000000000000000000000000000000000000..0fd3a50bbc325e2d3269e2314f82efd38a61e572 +index 000000000..0fd3a50bb --- /dev/null +++ b/drivers/devfreq/rockchip_dmc.c @@ -0,0 +1,3411 @@ @@ -80920,7 +80912,7 @@ index 0000000000000000000000000000000000000000..0fd3a50bbc325e2d3269e2314f82efd3 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/devfreq/rockchip_dmc_common.c b/drivers/devfreq/rockchip_dmc_common.c new file mode 100644 -index 0000000000000000000000000000000000000000..7765e7174ce244f6881040575ffaa09b24e63dec +index 000000000..7765e7174 --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_common.c @@ -0,0 +1,180 @@ @@ -81106,7 +81098,7 @@ index 0000000000000000000000000000000000000000..7765e7174ce244f6881040575ffaa09b +MODULE_LICENSE("GPL v2"); diff --git a/drivers/devfreq/rockchip_dmc_dbg.c b/drivers/devfreq/rockchip_dmc_dbg.c new file mode 100644 -index 0000000000000000000000000000000000000000..80b25e9046d1d6e258eb30f93efeaa4b9945bcb7 +index 000000000..80b25e904 --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_dbg.c @@ -0,0 +1,1061 @@ @@ -82173,7 +82165,7 @@ index 0000000000000000000000000000000000000000..80b25e9046d1d6e258eb30f93efeaa4b +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 100644 -index 0000000000000000000000000000000000000000..2f7b7774cf4d00bde0c3e6fdece2e49e89eac66b +index 000000000..2f7b7774c --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_timing.h @@ -0,0 +1,1231 @@ @@ -83409,7 +83401,7 @@ index 0000000000000000000000000000000000000000..2f7b7774cf4d00bde0c3e6fdece2e49e +#endif /* __ROCKCHIP_DMC_TIMING_H__ */ + diff --git a/drivers/dma-buf/Kconfig b/drivers/dma-buf/Kconfig -index e4dc53a364282457e6a85fbc9a09f27ad561c401..82c7df8e482bacb199bbb5231bec8ac6b419106c 100644 +index e4dc53a36..82c7df8e4 100644 --- a/drivers/dma-buf/Kconfig +++ b/drivers/dma-buf/Kconfig @@ -1,6 +1,39 @@ @@ -83494,7 +83486,7 @@ index e4dc53a364282457e6a85fbc9a09f27ad561c401..82c7df8e482bacb199bbb5231bec8ac6 endmenu diff --git a/drivers/dma-buf/Makefile b/drivers/dma-buf/Makefile -index 70ec901edf2c59f427e9b09e159426eb65405377..b1fffd5cfd85bef363d798265cafa14ab648c379 100644 +index 70ec901ed..b1fffd5cf 100644 --- a/drivers/dma-buf/Makefile +++ b/drivers/dma-buf/Makefile @@ -3,10 +3,13 @@ obj-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \ @@ -83520,7 +83512,7 @@ index 70ec901edf2c59f427e9b09e159426eb65405377..b1fffd5cfd85bef363d798265cafa14a +obj-$(CONFIG_DMABUF_PROCESS_INFO) += dma-buf-process-info.o diff --git a/drivers/dma-buf/dma-buf-cache.c b/drivers/dma-buf/dma-buf-cache.c new file mode 100644 -index 0000000000000000000000000000000000000000..5ec8896d3221601d9fd04e3ce2c5151beadcf15c +index 000000000..5ec8896d3 --- /dev/null +++ b/drivers/dma-buf/dma-buf-cache.c @@ -0,0 +1,198 @@ @@ -83724,7 +83716,7 @@ index 0000000000000000000000000000000000000000..5ec8896d3221601d9fd04e3ce2c5151b +EXPORT_SYMBOL(dma_buf_cache_map_attachment); diff --git a/drivers/dma-buf/dma-buf-process-info.c b/drivers/dma-buf/dma-buf-process-info.c new file mode 100644 -index 0000000000000000000000000000000000000000..ff528d0ca7584370190d0bef4e98628c48b125e9 +index 000000000..ff528d0ca --- /dev/null +++ b/drivers/dma-buf/dma-buf-process-info.c @@ -0,0 +1,165 @@ @@ -83895,7 +83887,7 @@ index 0000000000000000000000000000000000000000..ff528d0ca7584370190d0bef4e98628c +} diff --git a/drivers/dma-buf/dma-buf-process-info.h b/drivers/dma-buf/dma-buf-process-info.h new file mode 100644 -index 0000000000000000000000000000000000000000..1275c1c7e2aaa68503962f4d9daa77541141e840 +index 000000000..1275c1c7e --- /dev/null +++ b/drivers/dma-buf/dma-buf-process-info.h @@ -0,0 +1,83 @@ @@ -83983,7 +83975,7 @@ index 0000000000000000000000000000000000000000..1275c1c7e2aaa68503962f4d9daa7754 +#endif /* __DMA_BUF_PROCESS_INFO_H */ + diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c -index 21916bba77d58be342d2d82dc654c7df330f01fb..8acdece0541176dbc86c7b638f730fabe7737211 100644 +index 21916bba7..8acdece05 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -27,11 +27,13 @@ @@ -84483,7 +84475,7 @@ index 21916bba77d58be342d2d82dc654c7df330f01fb..8acdece0541176dbc86c7b638f730fab } __exitcall(dma_buf_deinit); diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c -index 84ae708fafe75ccd18b224bf485056ed1f87fa37..a777e9185cff5770f9f9acd5889d3d359ecf6c87 100644 +index 84ae708fa..a777e9185 100644 --- a/drivers/dma-buf/dma-heap.c +++ b/drivers/dma-buf/dma-heap.c @@ -105,9 +105,6 @@ static long dma_heap_ioctl_allocate(struct file *file, void *data) @@ -84530,7 +84522,7 @@ index 84ae708fafe75ccd18b224bf485056ed1f87fa37..a777e9185cff5770f9f9acd5889d3d35 ret = -ENOTTY; goto err; diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig -index a5eef06c422644e8aadaf5aff2bd9a33c49c1ba3..c6b35f28a70272ed08c391be20425065664a1ad4 100644 +index a5eef06c4..c6b35f28a 100644 --- a/drivers/dma-buf/heaps/Kconfig +++ b/drivers/dma-buf/heaps/Kconfig @@ -1,3 +1,13 @@ @@ -84559,7 +84551,7 @@ index a5eef06c422644e8aadaf5aff2bd9a33c49c1ba3..c6b35f28a70272ed08c391be20425065 + This driver allows the export of on-chip SRAM marked as exportable + to userspace using the DMA-Heaps interface. diff --git a/drivers/dma-buf/heaps/Makefile b/drivers/dma-buf/heaps/Makefile -index 974467791032ffb8a7aba17b1407d9a19b3f3b44..f373aa65dbcae5e0236034af6634e084706972cd 100644 +index 974467791..f373aa65d 100644 --- a/drivers/dma-buf/heaps/Makefile +++ b/drivers/dma-buf/heaps/Makefile @@ -1,3 +1,6 @@ @@ -84570,7 +84562,7 @@ index 974467791032ffb8a7aba17b1407d9a19b3f3b44..f373aa65dbcae5e0236034af6634e084 obj-$(CONFIG_DMABUF_HEAPS_CMA) += cma_heap.o +obj-$(CONFIG_DMABUF_HEAPS_SRAM) += sram_heap.o diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c -index ee899f8e67215f6036734795cb5b90ab77a293a3..16aa0cb5a84394aaecb557ac3d21b69c1e851533 100644 +index ee899f8e6..16aa0cb5a 100644 --- a/drivers/dma-buf/heaps/cma_heap.c +++ b/drivers/dma-buf/heaps/cma_heap.c @@ -351,6 +351,7 @@ static struct dma_buf *cma_heap_allocate(struct dma_heap *heap, @@ -84588,7 +84580,7 @@ index ee899f8e67215f6036734795cb5b90ab77a293a3..16aa0cb5a84394aaecb557ac3d21b69c +MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/heaps/deferred-free-helper.c b/drivers/dma-buf/heaps/deferred-free-helper.c new file mode 100644 -index 0000000000000000000000000000000000000000..d207eac5800b874a3089cbe0863c178798fea2c9 +index 000000000..d207eac58 --- /dev/null +++ b/drivers/dma-buf/heaps/deferred-free-helper.c @@ -0,0 +1,138 @@ @@ -84732,7 +84724,7 @@ index 0000000000000000000000000000000000000000..d207eac5800b874a3089cbe0863c1787 + diff --git a/drivers/dma-buf/heaps/deferred-free-helper.h b/drivers/dma-buf/heaps/deferred-free-helper.h new file mode 100644 -index 0000000000000000000000000000000000000000..11940328ce3f14500c684bc1d97696f6af2b6c6d +index 000000000..11940328c --- /dev/null +++ b/drivers/dma-buf/heaps/deferred-free-helper.h @@ -0,0 +1,55 @@ @@ -84793,7 +84785,7 @@ index 0000000000000000000000000000000000000000..11940328ce3f14500c684bc1d97696f6 +#endif diff --git a/drivers/dma-buf/heaps/page_pool.c b/drivers/dma-buf/heaps/page_pool.c new file mode 100644 -index 0000000000000000000000000000000000000000..f3e3598607fd439a35ea86ef0e2f3854eee2f2e1 +index 000000000..f3e359860 --- /dev/null +++ b/drivers/dma-buf/heaps/page_pool.c @@ -0,0 +1,247 @@ @@ -85046,7 +85038,7 @@ index 0000000000000000000000000000000000000000..f3e3598607fd439a35ea86ef0e2f3854 +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 100644 -index 0000000000000000000000000000000000000000..6b083b04f195c6e6c95a4916abf2b4bc6cad79e2 +index 000000000..6b083b04f --- /dev/null +++ b/drivers/dma-buf/heaps/page_pool.h @@ -0,0 +1,55 @@ @@ -85107,7 +85099,7 @@ index 0000000000000000000000000000000000000000..6b083b04f195c6e6c95a4916abf2b4bc +#endif /* _DMABUF_PAGE_POOL_H */ diff --git a/drivers/dma-buf/heaps/rk_cma_heap.c b/drivers/dma-buf/heaps/rk_cma_heap.c new file mode 100644 -index 0000000000000000000000000000000000000000..c93674c2a79c75b6c411271067917c37baf56a3a +index 000000000..c93674c2a --- /dev/null +++ b/drivers/dma-buf/heaps/rk_cma_heap.c @@ -0,0 +1,616 @@ @@ -85729,7 +85721,7 @@ index 0000000000000000000000000000000000000000..c93674c2a79c75b6c411271067917c37 +MODULE_LICENSE("GPL"); diff --git a/drivers/dma-buf/heaps/rk_system_heap.c b/drivers/dma-buf/heaps/rk_system_heap.c new file mode 100644 -index 0000000000000000000000000000000000000000..52dcfc2bb82ca6f89f1c10f81650f7ee13c15e68 +index 000000000..52dcfc2bb --- /dev/null +++ b/drivers/dma-buf/heaps/rk_system_heap.c @@ -0,0 +1,841 @@ @@ -86576,7 +86568,7 @@ index 0000000000000000000000000000000000000000..52dcfc2bb82ca6f89f1c10f81650f7ee +MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/heaps/sram_heap.c b/drivers/dma-buf/heaps/sram_heap.c new file mode 100644 -index 0000000000000000000000000000000000000000..d9a9b70a79d4f96ccfb55b7c49d0bd92ca71531a +index 000000000..d9a9b70a7 --- /dev/null +++ b/drivers/dma-buf/heaps/sram_heap.c @@ -0,0 +1,437 @@ @@ -87018,7 +87010,7 @@ index 0000000000000000000000000000000000000000..d9a9b70a79d4f96ccfb55b7c49d0bd92 +MODULE_DESCRIPTION("Rockchip DMA-BUF SRAM Heap"); +MODULE_LICENSE("GPL"); diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c -index 9076d47ed2ef46cdb2e300eca3303ee15eb14639..43cd4a5bf25cb1deaa83a5ebca0e6117b4191cf9 100644 +index 9076d47ed..43cd4a5bf 100644 --- a/drivers/dma-buf/heaps/system_heap.c +++ b/drivers/dma-buf/heaps/system_heap.c @@ -436,3 +436,4 @@ static int system_heap_create(void) @@ -87028,7 +87020,7 @@ index 9076d47ed2ef46cdb2e300eca3303ee15eb14639..43cd4a5bf25cb1deaa83a5ebca0e6117 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/rk_heaps/Kconfig b/drivers/dma-buf/rk_heaps/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..6ca3fbe765ee71911aaee6afd2dd041ef8b75dce +index 000000000..6ca3fbe76 --- /dev/null +++ b/drivers/dma-buf/rk_heaps/Kconfig @@ -0,0 +1,48 @@ @@ -87082,7 +87074,7 @@ index 0000000000000000000000000000000000000000..6ca3fbe765ee71911aaee6afd2dd041e + Choose this option to enable dma-buf RockChip heap debug. diff --git a/drivers/dma-buf/rk_heaps/Makefile b/drivers/dma-buf/rk_heaps/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..30d44bb7d801d15b14ffcb980109641e7daa104a +index 000000000..30d44bb7d --- /dev/null +++ b/drivers/dma-buf/rk_heaps/Makefile @@ -0,0 +1,6 @@ @@ -87094,7 +87086,7 @@ index 0000000000000000000000000000000000000000..30d44bb7d801d15b14ffcb980109641e +obj-$(CONFIG_DMABUF_HEAPS_ROCKCHIP_CMA_HEAP) += rk-cma-heap.o diff --git a/drivers/dma-buf/rk_heaps/rk-cma-heap.c b/drivers/dma-buf/rk_heaps/rk-cma-heap.c new file mode 100644 -index 0000000000000000000000000000000000000000..5b063f87bffe58b9de6388d89eb7412ed027e7a6 +index 000000000..5b063f87b --- /dev/null +++ b/drivers/dma-buf/rk_heaps/rk-cma-heap.c @@ -0,0 +1,687 @@ @@ -87787,7 +87779,7 @@ index 0000000000000000000000000000000000000000..5b063f87bffe58b9de6388d89eb7412e +MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/rk_heaps/rk-dma-cma.c b/drivers/dma-buf/rk_heaps/rk-dma-cma.c new file mode 100644 -index 0000000000000000000000000000000000000000..b6521f7dcc0620437e0420395a5fe4d6e353f21a +index 000000000..b6521f7dc --- /dev/null +++ b/drivers/dma-buf/rk_heaps/rk-dma-cma.c @@ -0,0 +1,77 @@ @@ -87870,7 +87862,7 @@ index 0000000000000000000000000000000000000000..b6521f7dcc0620437e0420395a5fe4d6 +} diff --git a/drivers/dma-buf/rk_heaps/rk-dma-heap.c b/drivers/dma-buf/rk_heaps/rk-dma-heap.c new file mode 100644 -index 0000000000000000000000000000000000000000..d0e76edf312826c7634f363032510cc9cdcf96d5 +index 000000000..d0e76edf3 --- /dev/null +++ b/drivers/dma-buf/rk_heaps/rk-dma-heap.c @@ -0,0 +1,731 @@ @@ -88607,7 +88599,7 @@ index 0000000000000000000000000000000000000000..d0e76edf312826c7634f363032510cc9 +subsys_initcall(rk_dma_heap_init); diff --git a/drivers/dma-buf/rk_heaps/rk-dma-heap.h b/drivers/dma-buf/rk_heaps/rk-dma-heap.h new file mode 100644 -index 0000000000000000000000000000000000000000..3bc750b020231251205a5023024a9a0b4a88c56d +index 000000000..3bc750b02 --- /dev/null +++ b/drivers/dma-buf/rk_heaps/rk-dma-heap.h @@ -0,0 +1,178 @@ @@ -88790,7 +88782,7 @@ index 0000000000000000000000000000000000000000..3bc750b020231251205a5023024a9a0b +struct cma *rk_dma_heap_get_cma(void); +#endif /* _DMA_HEAPS_H */ diff --git a/drivers/dma-buf/sw_sync.c b/drivers/dma-buf/sw_sync.c -index f0a35277fd844c2b12621e37315d1f14153e766d..3daa6c76b8ddf5ab1e10385bf7237b0f288f2894 100644 +index f0a35277f..3daa6c76b 100644 --- a/drivers/dma-buf/sw_sync.c +++ b/drivers/dma-buf/sw_sync.c @@ -7,6 +7,8 @@ @@ -88864,7 +88856,7 @@ index f0a35277fd844c2b12621e37315d1f14153e766d..3daa6c76b8ddf5ab1e10385bf7237b0f + +MODULE_LICENSE("GPL v2"); diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig -index 110e99b86a66a3a292c5f0bce9717728476e7dff..012a4acd04f04942bbbaf47b9651524e8507dc19 100644 +index 110e99b86..012a4acd0 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig @@ -561,4 +561,11 @@ config EDAC_NPCM @@ -88880,7 +88872,7 @@ index 110e99b86a66a3a292c5f0bce9717728476e7dff..012a4acd04f04942bbbaf47b9651524e + endif # EDAC diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile -index 61945d3113cc3299e3e92e075f71e0da90e3283d..146be451765ee564f69cd1c98e767f18e512ff83 100644 +index 61945d311..146be4517 100644 --- a/drivers/edac/Makefile +++ b/drivers/edac/Makefile @@ -86,3 +86,4 @@ obj-$(CONFIG_EDAC_BLUEFIELD) += bluefield_edac.o @@ -88890,7 +88882,7 @@ index 61945d3113cc3299e3e92e075f71e0da90e3283d..146be451765ee564f69cd1c98e767f18 +obj-$(CONFIG_EDAC_ROCKCHIP) += rockchip_edac.o diff --git a/drivers/edac/rockchip_edac.c b/drivers/edac/rockchip_edac.c new file mode 100644 -index 0000000000000000000000000000000000000000..4b1317bed1d00ce248485f2a340aefcb2a92a379 +index 000000000..4b1317bed --- /dev/null +++ b/drivers/edac/rockchip_edac.c @@ -0,0 +1,358 @@ @@ -89253,7 +89245,7 @@ index 0000000000000000000000000000000000000000..4b1317bed1d00ce248485f2a340aefcb +MODULE_AUTHOR("He Zhihuan \n"); +MODULE_DESCRIPTION("ROCKCHIP EDAC kernel module"); diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c -index e7f55c021e562fd455d4f77bafd75fd8564b6b43..fc0db77909ee60e9431da622fdf5069dbd90d2eb 100644 +index e7f55c021..fc0db7790 100644 --- a/drivers/extcon/extcon.c +++ b/drivers/extcon/extcon.c @@ -52,6 +52,11 @@ static const struct __extcon_info { @@ -89269,7 +89261,7 @@ index e7f55c021e562fd455d4f77bafd75fd8564b6b43..fc0db77909ee60e9431da622fdf5069d /* Charging external connector */ [EXTCON_CHG_USB_SDP] = { diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig -index b59e3041fd627585c4662f35c1fc34103df9730d..303d2f79e606f4a87c4cca40045e52e3af433c67 100644 +index b59e3041f..303d2f79e 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -226,6 +226,13 @@ config QCOM_SCM_DOWNLOAD_MODE_DEFAULT @@ -89287,7 +89279,7 @@ index b59e3041fd627585c4662f35c1fc34103df9730d..303d2f79e606f4a87c4cca40045e52e3 bool select BOOT_VESA_SUPPORT diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile -index 28fcddcd688fc2fd0f977df39126bf251808b970..f91d48e6e93035e40de2bd959513133f5405695d 100644 +index 28fcddcd6..f91d48e6e 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -17,6 +17,7 @@ obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o @@ -89299,7 +89291,7 @@ index 28fcddcd688fc2fd0f977df39126bf251808b970..f91d48e6e93035e40de2bd959513133f obj-$(CONFIG_QCOM_SCM) += qcom-scm.o qcom-scm-objs += qcom_scm.o qcom_scm-smc.o qcom_scm-legacy.o diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c -index 285fe7ad490d1ddd904e0dd73518350bc135ef8c..cfa9eec1adad63171ea55ea985205e921ab2821e 100644 +index 285fe7ad4..cfa9eec1a 100644 --- a/drivers/firmware/arm_sdei.c +++ b/drivers/firmware/arm_sdei.c @@ -920,6 +920,86 @@ int sdei_unregister_ghes(struct ghes *ghes) @@ -89391,7 +89383,7 @@ index 285fe7ad490d1ddd904e0dd73518350bc135ef8c..cfa9eec1adad63171ea55ea985205e92 const char *method; diff --git a/drivers/firmware/rockchip_sip.c b/drivers/firmware/rockchip_sip.c new file mode 100644 -index 0000000000000000000000000000000000000000..e483899d79fed9fe794d535cf912d7f638eace8f +index 000000000..e483899d7 --- /dev/null +++ b/drivers/firmware/rockchip_sip.c @@ -0,0 +1,715 @@ @@ -90111,7 +90103,7 @@ index 0000000000000000000000000000000000000000..e483899d79fed9fe794d535cf912d7f6 +MODULE_DESCRIPTION("Rockchip SIP Call"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig -index 673bafb8be5887611f10c09a067a6c90f2c03661..fa453718b26d6c10f4f7a9a1d80b01d33b3b1c1b 100644 +index 673bafb8b..fa453718b 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -1025,6 +1025,21 @@ config GPIO_ADNP @@ -90152,7 +90144,7 @@ index 673bafb8be5887611f10c09a067a6c90f2c03661..fa453718b26d6c10f4f7a9a1d80b01d3 tristate "PCA95[357]x, PCA9698, TCA64xx, and MAX7310 I/O ports" select REGMAP_I2C diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile -index eb73b5d633ebad2dc397d7894901421e845ee390..e34f8f222c7265709fbed22bf1ce0d46ce1c946c 100644 +index eb73b5d63..e34f8f222 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -36,6 +36,7 @@ obj-$(CONFIG_GPIO_ARIZONA) += gpio-arizona.o @@ -90173,7 +90165,7 @@ index eb73b5d633ebad2dc397d7894901421e845ee390..e34f8f222c7265709fbed22bf1ce0d46 obj-$(CONFIG_GPIO_PALMAS) += gpio-palmas.o diff --git a/drivers/gpio/gpio-aw9110.c b/drivers/gpio/gpio-aw9110.c new file mode 100644 -index 0000000000000000000000000000000000000000..ab97726fc7ce5706f8998514bb875e5f186b178c +index 000000000..ab97726fc --- /dev/null +++ b/drivers/gpio/gpio-aw9110.c @@ -0,0 +1,500 @@ @@ -90679,7 +90671,7 @@ index 0000000000000000000000000000000000000000..ab97726fc7ce5706f8998514bb875e5f + diff --git a/drivers/gpio/gpio-nca9539.c b/drivers/gpio/gpio-nca9539.c new file mode 100644 -index 0000000000000000000000000000000000000000..50fff6d90ddd6a03c46b68bb745a3b1a18a4c7bd +index 000000000..50fff6d90 --- /dev/null +++ b/drivers/gpio/gpio-nca9539.c @@ -0,0 +1,332 @@ @@ -91016,7 +91008,7 @@ index 0000000000000000000000000000000000000000..50fff6d90ddd6a03c46b68bb745a3b1a +MODULE_DESCRIPTION("GPIO expander driver for Novosense nca9539"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c -index b35b9604413f0864aaa90d09ceafd34c2e0b3c15..f251313c2606260c473bb33d621b33eda805ab6e 100644 +index b35b96044..f251313c2 100644 --- a/drivers/gpio/gpio-rockchip.c +++ b/drivers/gpio/gpio-rockchip.c @@ -6,6 +6,7 @@ @@ -91410,7 +91402,7 @@ index b35b9604413f0864aaa90d09ceafd34c2e0b3c15..f251313c2606260c473bb33d621b33ed return 0; diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c -index d9525d95e818d77d5800119a9e90071b572ef484..b3845291a0547cafa83fb30be7e94ee934698930 100644 +index d9525d95e..b3845291a 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -25,21 +25,6 @@ @@ -91457,7 +91449,7 @@ index d9525d95e818d77d5800119a9e90071b572ef484..b3845291a0547cafa83fb30be7e94ee9 static unsigned long of_convert_gpio_flags(enum of_gpio_flags flags) { diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile -index 8997f0096545e22363bb3b63ead71f0b145597dc..b37172366686f8d0eada808e8465ed822353f64c 100644 +index 8997f0096..b37172366 100644 --- a/drivers/gpu/Makefile +++ b/drivers/gpu/Makefile @@ -3,5 +3,6 @@ @@ -91469,7 +91461,7 @@ index 8997f0096545e22363bb3b63ead71f0b145597dc..b37172366686f8d0eada808e8465ed82 obj-$(CONFIG_TRACE_GPU_MEM) += trace/ diff --git a/drivers/gpu/arm/Kbuild b/drivers/gpu/arm/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..f747fc889b5b6fb224b30641c74059c0857bd0be +index 000000000..f747fc889 --- /dev/null +++ b/drivers/gpu/arm/Kbuild @@ -0,0 +1,25 @@ @@ -91500,7 +91492,7 @@ index 0000000000000000000000000000000000000000..f747fc889b5b6fb224b30641c74059c0 +obj-$(CONFIG_MALI_BIFROST) += bifrost/ diff --git a/drivers/gpu/arm/Kconfig b/drivers/gpu/arm/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..398a8e50a4cd54bfd0325904e7d2385e07157acd +index 000000000..398a8e50a --- /dev/null +++ b/drivers/gpu/arm/Kconfig @@ -0,0 +1,25 @@ @@ -91531,7 +91523,7 @@ index 0000000000000000000000000000000000000000..398a8e50a4cd54bfd0325904e7d2385e +source "drivers/gpu/arm/bifrost/Kconfig" diff --git a/drivers/gpu/arm/bifrost/Kbuild b/drivers/gpu/arm/bifrost/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..9cadda188fbcfcedc73076dccb7609b02ad42062 +index 000000000..9cadda188 --- /dev/null +++ b/drivers/gpu/arm/bifrost/Kbuild @@ -0,0 +1,243 @@ @@ -91780,7 +91772,7 @@ index 0000000000000000000000000000000000000000..9cadda188fbcfcedc73076dccb7609b0 +endif diff --git a/drivers/gpu/arm/bifrost/Kconfig b/drivers/gpu/arm/bifrost/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..ca3da57cffd34a41cee5f5b6817978e49d61431e +index 000000000..ca3da57cf --- /dev/null +++ b/drivers/gpu/arm/bifrost/Kconfig @@ -0,0 +1,389 @@ @@ -92175,7 +92167,7 @@ index 0000000000000000000000000000000000000000..ca3da57cffd34a41cee5f5b6817978e4 +endif diff --git a/drivers/gpu/arm/bifrost/Makefile b/drivers/gpu/arm/bifrost/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..39df298ff01c3f5f9db3d5bac3d1990ebf94d00e +index 000000000..39df298ff --- /dev/null +++ b/drivers/gpu/arm/bifrost/Makefile @@ -0,0 +1,279 @@ @@ -92460,7 +92452,7 @@ index 0000000000000000000000000000000000000000..39df298ff01c3f5f9db3d5bac3d1990e + $(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 -index 0000000000000000000000000000000000000000..2e6b111441caf9332f95b8af6f063e3ef028d7ad +index 000000000..2e6b11144 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/Kbuild @@ -0,0 +1,23 @@ @@ -92489,7 +92481,7 @@ index 0000000000000000000000000000000000000000..2e6b111441caf9332f95b8af6f063e3e + 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 100644 -index 0000000000000000000000000000000000000000..b5d3cd685ba5f45b4a45d97bf606ba828b74f19d +index 000000000..b5d3cd685 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.c @@ -0,0 +1,357 @@ @@ -92852,7 +92844,7 @@ index 0000000000000000000000000000000000000000..b5d3cd685ba5f45b4a45d97bf606ba82 +} 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 100644 -index 0000000000000000000000000000000000000000..701ffd42f6f7d7077aa1bdadaa4f6b174f226844 +index 000000000..701ffd42f --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.h @@ -0,0 +1,121 @@ @@ -92979,7 +92971,7 @@ index 0000000000000000000000000000000000000000..701ffd42f6f7d7077aa1bdadaa4f6b17 +#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 100644 -index 0000000000000000000000000000000000000000..1c4901b3b4d91d0f043c2e411ff1b6a6f9ae8e58 +index 000000000..1c4901b3b --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_defs.h @@ -0,0 +1,76 @@ @@ -93061,7 +93053,7 @@ index 0000000000000000000000000000000000000000..1c4901b3b4d91d0f043c2e411ff1b6a6 +#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 100644 -index 0000000000000000000000000000000000000000..667552c561fb164dad3bc6b90a63db41dc42b42c +index 000000000..667552c56 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c @@ -0,0 +1,1138 @@ @@ -94205,7 +94197,7 @@ index 0000000000000000000000000000000000000000..667552c561fb164dad3bc6b90a63db41 +}; 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 100644 -index 0000000000000000000000000000000000000000..f863f88601e6c32bce5e35429a0f31d871ccb7c3 +index 000000000..f863f8860 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h @@ -0,0 +1,196 @@ @@ -94407,7 +94399,7 @@ index 0000000000000000000000000000000000000000..f863f88601e6c32bce5e35429a0f31d8 +#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 -index 0000000000000000000000000000000000000000..efebc8a544d1608ece66512d2b9d7d41a5994e69 +index 000000000..efebc8a54 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/Kbuild @@ -0,0 +1,58 @@ @@ -94471,7 +94463,7 @@ index 0000000000000000000000000000000000000000..efebc8a544d1608ece66512d2b9d7d41 + 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 100644 -index 0000000000000000000000000000000000000000..6924fdb8a6085943075fbf11131455288f50c134 +index 000000000..6924fdb8a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_backend_config.h @@ -0,0 +1,30 @@ @@ -94507,7 +94499,7 @@ index 0000000000000000000000000000000000000000..6924fdb8a6085943075fbf1113145528 + 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 100644 -index 0000000000000000000000000000000000000000..7c0abbaf860ffa6620bbf9d7c98772e8ba7bf98b +index 000000000..7c0abbaf8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.c @@ -0,0 +1,92 @@ @@ -94605,7 +94597,7 @@ index 0000000000000000000000000000000000000000..7c0abbaf860ffa6620bbf9d7c98772e8 +} 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 100644 -index 0000000000000000000000000000000000000000..758e3be08c1609348835f7b6dfb1927cceb6eb21 +index 000000000..758e3be08 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.h @@ -0,0 +1,65 @@ @@ -94676,7 +94668,7 @@ index 0000000000000000000000000000000000000000..758e3be08c1609348835f7b6dfb1927c +#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 100644 -index 0000000000000000000000000000000000000000..ddd03ca23de6cc9d521862ee2876737840435136 +index 000000000..ddd03ca23 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.c @@ -0,0 +1,326 @@ @@ -95008,7 +95000,7 @@ index 0000000000000000000000000000000000000000..ddd03ca23de6cc9d521862ee28767378 +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 100644 -index 0000000000000000000000000000000000000000..35b3b8d06d96e7375bcc767252068fbeaa854f8d +index 000000000..35b3b8d06 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.h @@ -0,0 +1,154 @@ @@ -95168,7 +95160,7 @@ index 0000000000000000000000000000000000000000..35b3b8d06d96e7375bcc767252068fbe + 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 100644 -index 0000000000000000000000000000000000000000..e121b417f80dd251311d5df8166845d0ccceb067 +index 000000000..e121b417f --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_debug_job_fault_backend.c @@ -0,0 +1,163 @@ @@ -95337,7 +95329,7 @@ index 0000000000000000000000000000000000000000..e121b417f80dd251311d5df8166845d0 +#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 100644 -index 0000000000000000000000000000000000000000..e960f4602c3706fed3098a14670448e4ca49e318 +index 000000000..e960f4602 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c @@ -0,0 +1,741 @@ @@ -96084,7 +96076,7 @@ index 0000000000000000000000000000000000000000..e960f4602c3706fed3098a14670448e4 +} 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 100644 -index 0000000000000000000000000000000000000000..ac88b025a37e4958fa764be5fc917d0affe4eda0 +index 000000000..ac88b025a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.h @@ -0,0 +1,62 @@ @@ -96152,7 +96144,7 @@ index 0000000000000000000000000000000000000000..ac88b025a37e4958fa764be5fc917d0a +#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 100644 -index 0000000000000000000000000000000000000000..10e92ec94d3a1dc57114849c15859d9788c2961c +index 000000000..10e92ec94 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_gpuprops_backend.c @@ -0,0 +1,200 @@ @@ -96358,7 +96350,7 @@ index 0000000000000000000000000000000000000000..10e92ec94d3a1dc57114849c15859d97 +} 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 100644 -index 0000000000000000000000000000000000000000..53578ded58b97a557d529dac48eea4b22b275663 +index 000000000..53578ded5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_backend.c @@ -0,0 +1,481 @@ @@ -96845,7 +96837,7 @@ index 0000000000000000000000000000000000000000..53578ded58b97a557d529dac48eea4b2 +#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 100644 -index 0000000000000000000000000000000000000000..bd2eb8a12047c7ada124faebeb8be7ce74a09f56 +index 000000000..bd2eb8a12 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_defs.h @@ -0,0 +1,60 @@ @@ -96911,7 +96903,7 @@ index 0000000000000000000000000000000000000000..bd2eb8a12047c7ada124faebeb8be7ce +#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 100644 -index 0000000000000000000000000000000000000000..332cc6944d9490ff49b8e82ec3925ecace57c71d +index 000000000..332cc6944 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_internal.h @@ -0,0 +1,41 @@ @@ -96958,7 +96950,7 @@ index 0000000000000000000000000000000000000000..332cc6944d9490ff49b8e82ec3925eca +#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 100644 -index 0000000000000000000000000000000000000000..66cda8c0b6475131be9f58f2f97c0fc526f27b3e +index 000000000..66cda8c0b --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_internal.h @@ -0,0 +1,47 @@ @@ -97011,7 +97003,7 @@ index 0000000000000000000000000000000000000000..66cda8c0b6475131be9f58f2f97c0fc5 +#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 100644 -index 0000000000000000000000000000000000000000..eb63b2c56c3d034458b0be3f57c217dded840efc +index 000000000..eb63b2c56 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_linux.c @@ -0,0 +1,503 @@ @@ -97520,7 +97512,7 @@ index 0000000000000000000000000000000000000000..eb63b2c56c3d034458b0be3f57c217dd +#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 100644 -index 0000000000000000000000000000000000000000..258dc6dac6c5fc3493e9f8f209d58d301d0eacc1 +index 000000000..258dc6dac --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_as.c @@ -0,0 +1,241 @@ @@ -97767,7 +97759,7 @@ index 0000000000000000000000000000000000000000..258dc6dac6c5fc3493e9f8f209d58d30 +} 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 100644 -index 0000000000000000000000000000000000000000..136aa526d41ed699f564878124028357ac3ff20d +index 000000000..136aa526d --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_defs.h @@ -0,0 +1,135 @@ @@ -97908,7 +97900,7 @@ index 0000000000000000000000000000000000000000..136aa526d41ed699f564878124028357 +#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 100644 -index 0000000000000000000000000000000000000000..c7257117e98a81b5284a7b05bf2a078a8cc5e4bc +index 000000000..c7257117e --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_hw.c @@ -0,0 +1,1513 @@ @@ -99427,7 +99419,7 @@ index 0000000000000000000000000000000000000000..c7257117e98a81b5284a7b05bf2a078a +} 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 100644 -index 0000000000000000000000000000000000000000..bfd55a6e216045a5052bf37a9441ba3d14522924 +index 000000000..bfd55a6e2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_internal.h @@ -0,0 +1,148 @@ @@ -99581,7 +99573,7 @@ index 0000000000000000000000000000000000000000..bfd55a6e216045a5052bf37a9441ba3d +#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 100644 -index 0000000000000000000000000000000000000000..7db2b353b67a4b5a06877ae6ae23f021b0726e21 +index 000000000..7db2b353b --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.c @@ -0,0 +1,1873 @@ @@ -101460,7 +101452,7 @@ index 0000000000000000000000000000000000000000..7db2b353b67a4b5a06877ae6ae23f021 +} 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 100644 -index 0000000000000000000000000000000000000000..32be0bf446557673019d47fd3bb405543fcc6895 +index 000000000..32be0bf44 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.h @@ -0,0 +1,77 @@ @@ -101543,7 +101535,7 @@ index 0000000000000000000000000000000000000000..32be0bf446557673019d47fd3bb40554 +#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 100644 -index 0000000000000000000000000000000000000000..cbc88f91a4004832bf59a0565ee3cc5589b5a4c1 +index 000000000..cbc88f91a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_backend.c @@ -0,0 +1,377 @@ @@ -101926,7 +101918,7 @@ index 0000000000000000000000000000000000000000..cbc88f91a4004832bf59a0565ee3cc55 +} 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 100644 -index 0000000000000000000000000000000000000000..4f7c371a1f1a8296c3cc214edc886e74051824d8 +index 000000000..4f7c371a1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_internal.h @@ -0,0 +1,72 @@ @@ -102004,7 +101996,7 @@ index 0000000000000000000000000000000000000000..4f7c371a1f1a8296c3cc214edc886e74 +#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 100644 -index 0000000000000000000000000000000000000000..9ce50758c2401c613723f86e3db9383671c242e0 +index 000000000..9ce50758c --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.c @@ -0,0 +1,131 @@ @@ -102141,7 +102133,7 @@ index 0000000000000000000000000000000000000000..9ce50758c2401c613723f86e3db93836 +} 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 100644 -index 0000000000000000000000000000000000000000..07014ad360d8108371964b326417465c177f17a4 +index 000000000..07014ad36 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.h @@ -0,0 +1,36 @@ @@ -102183,7 +102175,7 @@ index 0000000000000000000000000000000000000000..07014ad360d8108371964b326417465c +#endif /* _KBASE_L2_MMU_CONFIG_H */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.c new file mode 100644 -index 0000000000000000000000000000000000000000..6db7031764eac01ba47ce610027afe937e816c3f +index 000000000..6db703176 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.c @@ -0,0 +1,2229 @@ @@ -104418,7 +104410,7 @@ index 0000000000000000000000000000000000000000..6db7031764eac01ba47ce610027afe93 +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.h new file mode 100644 -index 0000000000000000000000000000000000000000..84842291c0f7628809fdd42bb94e646f7d61623a +index 000000000..84842291c --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.h @@ -0,0 +1,224 @@ @@ -104648,7 +104640,7 @@ index 0000000000000000000000000000000000000000..84842291c0f7628809fdd42bb94e646f +#endif diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_error_generator.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_error_generator.c new file mode 100644 -index 0000000000000000000000000000000000000000..f310cc74cb24ec7674e1349fb4fcf824e72c5159 +index 000000000..f310cc74c --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_error_generator.c @@ -0,0 +1,183 @@ @@ -104837,7 +104829,7 @@ index 0000000000000000000000000000000000000000..f310cc74cb24ec7674e1349fb4fcf824 +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.c new file mode 100644 -index 0000000000000000000000000000000000000000..e90e4df2f494fae06841d9ba93f67b5b45dc9373 +index 000000000..e90e4df2f --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.c @@ -0,0 +1,244 @@ @@ -105087,7 +105079,7 @@ index 0000000000000000000000000000000000000000..e90e4df2f494fae06841d9ba93f67b5b +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.h new file mode 100644 -index 0000000000000000000000000000000000000000..8f09afe3d1ccf8788961aff93e5da867f28b3fe9 +index 000000000..8f09afe3d --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.h @@ -0,0 +1,151 @@ @@ -105244,7 +105236,7 @@ index 0000000000000000000000000000000000000000..8f09afe3d1ccf8788961aff93e5da867 +#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 100644 -index 0000000000000000000000000000000000000000..bbf629065877bd87b30c62d060bfbd9fde3a0f24 +index 000000000..bbf629065 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c @@ -0,0 +1,73 @@ @@ -105323,7 +105315,7 @@ index 0000000000000000000000000000000000000000..bbf629065877bd87b30c62d060bfbd9f +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 100644 -index 0000000000000000000000000000000000000000..98d35dabec8851cf0d3e33d2c908d3dededf3be8 +index 000000000..98d35dabe --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.h @@ -0,0 +1,78 @@ @@ -105407,7 +105399,7 @@ index 0000000000000000000000000000000000000000..98d35dabec8851cf0d3e33d2c908d3de + 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 100644 -index 0000000000000000000000000000000000000000..5c71fdf154b9425c107ed839c14cd89a67632c2d +index 000000000..5c71fdf15 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_backend.c @@ -0,0 +1,1238 @@ @@ -106651,7 +106643,7 @@ index 0000000000000000000000000000000000000000..5c71fdf154b9425c107ed839c14cd89a +#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 100644 -index 0000000000000000000000000000000000000000..e2b0a919282ef7ca444abbe53f4a535a99ab353a +index 000000000..e2b0a9192 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.c @@ -0,0 +1,150 @@ @@ -106807,7 +106799,7 @@ index 0000000000000000000000000000000000000000..e2b0a919282ef7ca444abbe53f4a535a +} 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 100644 -index 0000000000000000000000000000000000000000..90dcaf5b67db96ddecc3d83ba4a922bab3aceed1 +index 000000000..90dcaf5b6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.h @@ -0,0 +1,88 @@ @@ -106901,7 +106893,7 @@ index 0000000000000000000000000000000000000000..90dcaf5b67db96ddecc3d83ba4a922ba +#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 100644 -index 0000000000000000000000000000000000000000..d1e4b5327f8fec9e26c331f3e8eadd60ba8ce483 +index 000000000..d1e4b5327 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca_devfreq.h @@ -0,0 +1,59 @@ @@ -106966,7 +106958,7 @@ index 0000000000000000000000000000000000000000..d1e4b5327f8fec9e26c331f3e8eadd60 + 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 100644 -index 0000000000000000000000000000000000000000..f40b753850df875a7f4c34dd316119513883cd32 +index 000000000..f40b75385 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.c @@ -0,0 +1,67 @@ @@ -107039,7 +107031,7 @@ index 0000000000000000000000000000000000000000..f40b753850df875a7f4c34dd31611951 +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 100644 -index 0000000000000000000000000000000000000000..a947e8f5564300d3042894a4a3c71e99ad08e5af +index 000000000..a947e8f55 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.h @@ -0,0 +1,64 @@ @@ -107109,7 +107101,7 @@ index 0000000000000000000000000000000000000000..a947e8f5564300d3042894a4a3c71e99 +#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 100644 -index 0000000000000000000000000000000000000000..75d99a30efc0a8eaabdcca052d165d2000964a4d +index 000000000..75d99a30e --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_defs.h @@ -0,0 +1,649 @@ @@ -107764,7 +107756,7 @@ index 0000000000000000000000000000000000000000..75d99a30efc0a8eaabdcca052d165d20 +#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 100644 -index 0000000000000000000000000000000000000000..5be8acd75d0a61b93a40ad80e34fd1032623e4d4 +index 000000000..5be8acd75 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_driver.c @@ -0,0 +1,3417 @@ @@ -111187,7 +111179,7 @@ index 0000000000000000000000000000000000000000..5be8acd75d0a61b93a40ad80e34fd103 +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 100644 -index 0000000000000000000000000000000000000000..e66ce57d31203e1383c8a094998bf110b6375a62 +index 000000000..e66ce57d3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_internal.h @@ -0,0 +1,1021 @@ @@ -112214,7 +112206,7 @@ index 0000000000000000000000000000000000000000..e66ce57d31203e1383c8a094998bf110 +#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 100644 -index 0000000000000000000000000000000000000000..ef72f6083afde786a39b8aafda2110be6535e363 +index 000000000..ef72f6083 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_l2_states.h @@ -0,0 +1,50 @@ @@ -112270,7 +112262,7 @@ index 0000000000000000000000000000000000000000..ef72f6083afde786a39b8aafda2110be +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 100644 -index 0000000000000000000000000000000000000000..3b448e397e7222b9dab6351064380f34f3ca4bee +index 000000000..3b448e397 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_mcu_states.h @@ -0,0 +1,108 @@ @@ -112384,7 +112376,7 @@ index 0000000000000000000000000000000000000000..3b448e397e7222b9dab6351064380f34 +#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 100644 -index 0000000000000000000000000000000000000000..865f526f61f2d972fedd303ea62dbfb808ed5ec9 +index 000000000..865f526f6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_metrics.c @@ -0,0 +1,529 @@ @@ -112919,7 +112911,7 @@ index 0000000000000000000000000000000000000000..865f526f61f2d972fedd303ea62dbfb8 +#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 100644 -index 0000000000000000000000000000000000000000..4788f04132c1bc765c70356e826a9e196188d9e5 +index 000000000..4788f0413 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.c @@ -0,0 +1,426 @@ @@ -113351,7 +113343,7 @@ index 0000000000000000000000000000000000000000..4788f04132c1bc765c70356e826a9e19 +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 100644 -index 0000000000000000000000000000000000000000..e8113659b92eccf527660b5729a2107ae47b8b55 +index 000000000..e8113659b --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.h @@ -0,0 +1,105 @@ @@ -113462,7 +113454,7 @@ index 0000000000000000000000000000000000000000..e8113659b92eccf527660b5729a2107a +#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 100644 -index 0000000000000000000000000000000000000000..8622ef78d363aca7a74a128703ee1223fffad800 +index 000000000..8622ef78d --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_shader_states.h @@ -0,0 +1,79 @@ @@ -113547,7 +113539,7 @@ index 0000000000000000000000000000000000000000..8622ef78d363aca7a74a128703ee1223 +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 100644 -index 0000000000000000000000000000000000000000..1b33461796e2717fc36b7185f9d6d259c21a44a0 +index 000000000..1b3346179 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_time.c @@ -0,0 +1,279 @@ @@ -113832,7 +113824,7 @@ index 0000000000000000000000000000000000000000..1b33461796e2717fc36b7185f9d6d259 +} diff --git a/drivers/gpu/arm/bifrost/build.bp b/drivers/gpu/arm/bifrost/build.bp new file mode 100755 -index 0000000000000000000000000000000000000000..0a61a12d902a72de87ccbb9d5be6bdfff16d321e +index 000000000..0a61a12d9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/build.bp @@ -0,0 +1,280 @@ @@ -114118,7 +114110,7 @@ index 0000000000000000000000000000000000000000..0a61a12d902a72de87ccbb9d5be6bdff +} diff --git a/drivers/gpu/arm/bifrost/context/Kbuild b/drivers/gpu/arm/bifrost/context/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..156b46a128704ab1075c085f9096f22fb970118b +index 000000000..156b46a12 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/Kbuild @@ -0,0 +1,27 @@ @@ -114151,7 +114143,7 @@ index 0000000000000000000000000000000000000000..156b46a128704ab1075c085f9096f22f +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 100644 -index 0000000000000000000000000000000000000000..07d277b947d2200cd85d0a81b4605c5d3f356e77 +index 000000000..07d277b94 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_csf.c @@ -0,0 +1,207 @@ @@ -114364,7 +114356,7 @@ index 0000000000000000000000000000000000000000..07d277b947d2200cd85d0a81b4605c5d +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 100644 -index 0000000000000000000000000000000000000000..f49b4734ef1a413e65c69c3dc680bc38656e6575 +index 000000000..f49b4734e --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_jm.c @@ -0,0 +1,272 @@ @@ -114642,7 +114634,7 @@ index 0000000000000000000000000000000000000000..f49b4734ef1a413e65c69c3dc680bc38 +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 100644 -index 0000000000000000000000000000000000000000..88be6c2e7587ce01bb7e38f4cc4ebbe92dc5c045 +index 000000000..88be6c2e7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context.c @@ -0,0 +1,392 @@ @@ -115040,7 +115032,7 @@ index 0000000000000000000000000000000000000000..88be6c2e7587ce01bb7e38f4cc4ebbe9 +} 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 100644 -index 0000000000000000000000000000000000000000..7c90e2708fa3a59e8277db0af5e094bfbb31eac7 +index 000000000..7c90e2708 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context.h @@ -0,0 +1,141 @@ @@ -115187,7 +115179,7 @@ index 0000000000000000000000000000000000000000..7c90e2708fa3a59e8277db0af5e094bf +#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 100644 -index 0000000000000000000000000000000000000000..1cde7394c705539f775a81673e04bc9981352e18 +index 000000000..1cde7394c --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context_internal.h @@ -0,0 +1,54 @@ @@ -115247,7 +115239,7 @@ index 0000000000000000000000000000000000000000..1cde7394c705539f775a81673e04bc99 +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 -index 0000000000000000000000000000000000000000..44217dba10c0b06af77cfc53d634ce746ec86f5c +index 000000000..44217dba1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/Kbuild @@ -0,0 +1,58 @@ @@ -115311,7 +115303,7 @@ index 0000000000000000000000000000000000000000..44217dba10c0b06af77cfc53d634ce74 +endif diff --git a/drivers/gpu/arm/bifrost/csf/ipa_control/Kbuild b/drivers/gpu/arm/bifrost/csf/ipa_control/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..dc30281e478174706822fbd5313a741b9b33549e +index 000000000..dc30281e4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/ipa_control/Kbuild @@ -0,0 +1,22 @@ @@ -115339,7 +115331,7 @@ index 0000000000000000000000000000000000000000..dc30281e478174706822fbd5313a741b + csf/ipa_control/mali_kbase_csf_ipa_control.o diff --git a/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.c b/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.c new file mode 100644 -index 0000000000000000000000000000000000000000..c81d0a5a7236eb7130d69e8d8f9cd7c551b9fe06 +index 000000000..c81d0a5a7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.c @@ -0,0 +1,1063 @@ @@ -116408,7 +116400,7 @@ index 0000000000000000000000000000000000000000..c81d0a5a7236eb7130d69e8d8f9cd7c5 + diff --git a/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.h b/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.h new file mode 100644 -index 0000000000000000000000000000000000000000..69ff8973bac44c52116743c8ec101f193388eb32 +index 000000000..69ff8973b --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.h @@ -0,0 +1,271 @@ @@ -116685,7 +116677,7 @@ index 0000000000000000000000000000000000000000..69ff8973bac44c52116743c8ec101f19 +#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 100644 -index 0000000000000000000000000000000000000000..7a939fc3382dd2231916c413eb447b5fb98e9dee +index 000000000..7a939fc33 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c @@ -0,0 +1,3289 @@ @@ -119980,7 +119972,7 @@ index 0000000000000000000000000000000000000000..7a939fc3382dd2231916c413eb447b5f +} 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 100644 -index 0000000000000000000000000000000000000000..dd947dcbab1cca491b36b0a982d7080fad67fe9d +index 000000000..dd947dcba --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.h @@ -0,0 +1,506 @@ @@ -120492,7 +120484,7 @@ index 0000000000000000000000000000000000000000..dd947dcbab1cca491b36b0a982d7080f +#endif /* _KBASE_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.c new file mode 100644 -index 0000000000000000000000000000000000000000..516a33ff746571496430d9d65a8b5432060e53a3 +index 000000000..516a33ff7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.c @@ -0,0 +1,191 @@ @@ -120689,7 +120681,7 @@ index 0000000000000000000000000000000000000000..516a33ff746571496430d9d65a8b5432 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.h new file mode 100644 -index 0000000000000000000000000000000000000000..435a993955fe8c251cdae269212c9b6f347c060d +index 000000000..435a99395 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.h @@ -0,0 +1,90 @@ @@ -120785,7 +120777,7 @@ index 0000000000000000000000000000000000000000..435a993955fe8c251cdae269212c9b6f +#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 100644 -index 0000000000000000000000000000000000000000..e96044ae623978cce1134a36cfffc0d423a237d8 +index 000000000..e96044ae6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c @@ -0,0 +1,767 @@ @@ -121558,7 +121550,7 @@ index 0000000000000000000000000000000000000000..e96044ae623978cce1134a36cfffc0d4 +#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 100644 -index 0000000000000000000000000000000000000000..16a548bf8acbe4e95c8bcb5207b0e554db0f75fd +index 000000000..16a548bf8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.h @@ -0,0 +1,54 @@ @@ -121618,7 +121610,7 @@ index 0000000000000000000000000000000000000000..16a548bf8acbe4e95c8bcb5207b0e554 +#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 100644 -index 0000000000000000000000000000000000000000..6fa0e27d657fa5a96aa722ad4728659fb567b6ec +index 000000000..6fa0e27d6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_defs.h @@ -0,0 +1,1666 @@ @@ -123290,7 +123282,7 @@ index 0000000000000000000000000000000000000000..6fa0e27d657fa5a96aa722ad4728659f +#endif /* _KBASE_CSF_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.c new file mode 100644 -index 0000000000000000000000000000000000000000..49e52938499febcf8b20bc1418587546d0bfc7b8 +index 000000000..49e529384 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.c @@ -0,0 +1,265 @@ @@ -123561,7 +123553,7 @@ index 0000000000000000000000000000000000000000..49e52938499febcf8b20bc1418587546 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.h new file mode 100644 -index 0000000000000000000000000000000000000000..52122a9ef4d1e77f38daaa4f5c122f73bf17a18a +index 000000000..52122a9ef --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.h @@ -0,0 +1,171 @@ @@ -123738,7 +123730,7 @@ index 0000000000000000000000000000000000000000..52122a9ef4d1e77f38daaa4f5c122f73 +#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 100644 -index 0000000000000000000000000000000000000000..42bff1e91584c00b25f018acea27accaf1696b68 +index 000000000..42bff1e91 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.c @@ -0,0 +1,3144 @@ @@ -126888,7 +126880,7 @@ index 0000000000000000000000000000000000000000..42bff1e91584c00b25f018acea27acca +} 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 100644 -index 0000000000000000000000000000000000000000..714a140011895f00ee12bcb81b385443d82ade67 +index 000000000..714a14001 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.h @@ -0,0 +1,916 @@ @@ -127810,7 +127802,7 @@ index 0000000000000000000000000000000000000000..714a140011895f00ee12bcb81b385443 +#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 100644 -index 0000000000000000000000000000000000000000..c895b080143aea2d198ccf8049a90065da952452 +index 000000000..c895b0801 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.c @@ -0,0 +1,354 @@ @@ -128170,7 +128162,7 @@ index 0000000000000000000000000000000000000000..c895b080143aea2d198ccf8049a90065 +#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 100644 -index 0000000000000000000000000000000000000000..b227cf1589254f3646966adbab170ae8e148ecd4 +index 000000000..b227cf158 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.h @@ -0,0 +1,72 @@ @@ -128248,7 +128240,7 @@ index 0000000000000000000000000000000000000000..b227cf1589254f3646966adbab170ae8 +#endif /* _KBASE_CSF_FIRMWARE_CFG_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.c new file mode 100644 -index 0000000000000000000000000000000000000000..f0a10d197eec711811c7af180d8a2d7e761d0f5e +index 000000000..f0a10d197 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.c @@ -0,0 +1,807 @@ @@ -129061,7 +129053,7 @@ index 0000000000000000000000000000000000000000..f0a10d197eec711811c7af180d8a2d7e +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.h new file mode 100644 -index 0000000000000000000000000000000000000000..0537dca4f37f98259067996b011841822c5c10b6 +index 000000000..0537dca4f --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.h @@ -0,0 +1,65 @@ @@ -129132,7 +129124,7 @@ index 0000000000000000000000000000000000000000..0537dca4f37f98259067996b01184182 +#endif /* _KBASE_CSF_FIRMWARE_CORE_DUMP_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.c new file mode 100644 -index 0000000000000000000000000000000000000000..6e0d3c2f5071f4d813b80381a9f63784536baa5a +index 000000000..6e0d3c2f5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.c @@ -0,0 +1,451 @@ @@ -129589,7 +129581,7 @@ index 0000000000000000000000000000000000000000..6e0d3c2f5071f4d813b80381a9f63784 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.h new file mode 100644 -index 0000000000000000000000000000000000000000..1008320464a98272f8312a0b7f13662921e26a9e +index 000000000..100832046 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.h @@ -0,0 +1,77 @@ @@ -129672,7 +129664,7 @@ index 0000000000000000000000000000000000000000..1008320464a98272f8312a0b7f136629 +#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 100644 -index 0000000000000000000000000000000000000000..833947facce3261c34ea08537123d56edd050cb2 +index 000000000..833947fac --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c @@ -0,0 +1,1661 @@ @@ -131339,7 +131331,7 @@ index 0000000000000000000000000000000000000000..833947facce3261c34ea08537123d56e +} 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 100644 -index 0000000000000000000000000000000000000000..7c14b8eb554c2c5e654b3d2cc658137c844f9688 +index 000000000..7c14b8eb5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.c @@ -0,0 +1,236 @@ @@ -131581,7 +131573,7 @@ index 0000000000000000000000000000000000000000..7c14b8eb554c2c5e654b3d2cc658137c +} 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 100644 -index 0000000000000000000000000000000000000000..9aab7abfb64920021193ebfc3cf3a2e4e4b3e3d9 +index 000000000..9aab7abfb --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.h @@ -0,0 +1,75 @@ @@ -131662,7 +131654,7 @@ index 0000000000000000000000000000000000000000..9aab7abfb64920021193ebfc3cf3a2e4 +#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 100644 -index 0000000000000000000000000000000000000000..da8dde2399720618dc69f664eb8621a949441f3b +index 000000000..da8dde239 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.c @@ -0,0 +1,2595 @@ @@ -134263,7 +134255,7 @@ index 0000000000000000000000000000000000000000..da8dde2399720618dc69f664eb8621a9 +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 100644 -index 0000000000000000000000000000000000000000..5cad8b200c93528397b0743ea0d6f1602f62e7da +index 000000000..5cad8b200 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.h @@ -0,0 +1,384 @@ @@ -134653,7 +134645,7 @@ index 0000000000000000000000000000000000000000..5cad8b200c93528397b0743ea0d6f160 +#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 100644 -index 0000000000000000000000000000000000000000..fa877778ca798d94bb5786f2769fc24cbe1e0714 +index 000000000..fa877778c --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.c @@ -0,0 +1,193 @@ @@ -134852,7 +134844,7 @@ index 0000000000000000000000000000000000000000..fa877778ca798d94bb5786f2769fc24c +#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 100644 -index 0000000000000000000000000000000000000000..08f2fda034a2dde1524fa0e8f229663a9d9532b1 +index 000000000..08f2fda03 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.h @@ -0,0 +1,37 @@ @@ -134895,7 +134887,7 @@ index 0000000000000000000000000000000000000000..08f2fda034a2dde1524fa0e8f229663a +#endif /* _KBASE_CSF_KCPU_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.c new file mode 100644 -index 0000000000000000000000000000000000000000..4056a9d933d70a8823197b685b7500e98745d445 +index 000000000..4056a9d93 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.c @@ -0,0 +1,817 @@ @@ -135718,7 +135710,7 @@ index 0000000000000000000000000000000000000000..4056a9d933d70a8823197b685b7500e9 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.h new file mode 100644 -index 0000000000000000000000000000000000000000..61943cbbf083e412412526a8c8647e3582d7a220 +index 000000000..61943cbbf --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.h @@ -0,0 +1,139 @@ @@ -135863,7 +135855,7 @@ index 0000000000000000000000000000000000000000..61943cbbf083e412412526a8c8647e35 +#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 100644 -index 0000000000000000000000000000000000000000..bf1835b5be25b9f547298d665669bfa217b22149 +index 000000000..bf1835b5b --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.c @@ -0,0 +1,163 @@ @@ -136032,7 +136024,7 @@ index 0000000000000000000000000000000000000000..bf1835b5be25b9f547298d665669bfa2 +} 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 100644 -index 0000000000000000000000000000000000000000..8c1aa919fbb0024b8bf74d7d11c0f28cc42a490b +index 000000000..8c1aa919f --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.h @@ -0,0 +1,75 @@ @@ -136113,7 +136105,7 @@ index 0000000000000000000000000000000000000000..8c1aa919fbb0024b8bf74d7d11c0f28c +#endif diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_registers.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_registers.h new file mode 100644 -index 0000000000000000000000000000000000000000..b5bf7bbbc0563205ec257f1a2c8a09c55544aa87 +index 000000000..b5bf7bbbc --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_registers.h @@ -0,0 +1,1678 @@ @@ -137797,7 +137789,7 @@ index 0000000000000000000000000000000000000000..b5bf7bbbc0563205ec257f1a2c8a09c5 +#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 100644 -index 0000000000000000000000000000000000000000..fe3b91a4845d368650743b2e3f21cbb28233bec8 +index 000000000..fe3b91a48 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_reset_gpu.c @@ -0,0 +1,637 @@ @@ -138440,7 +138432,7 @@ index 0000000000000000000000000000000000000000..fe3b91a4845d368650743b2e3f21cbb2 +} 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 100644 -index 0000000000000000000000000000000000000000..edaa6d17e30458438e8e106a554e6e7ba7c48dc9 +index 000000000..edaa6d17e --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.c @@ -0,0 +1,6889 @@ @@ -145335,7 +145327,7 @@ index 0000000000000000000000000000000000000000..edaa6d17e30458438e8e106a554e6e7b +} 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 100644 -index 0000000000000000000000000000000000000000..d22d7c8b9dce1771d5519728f49544661b21e5da +index 000000000..d22d7c8b9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.h @@ -0,0 +1,681 @@ @@ -146022,7 +146014,7 @@ index 0000000000000000000000000000000000000000..d22d7c8b9dce1771d5519728f4954466 +#endif /* _KBASE_CSF_SCHEDULER_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.c new file mode 100644 -index 0000000000000000000000000000000000000000..a5e0ab5eaf175f46975b49967d087ca4176be704 +index 000000000..a5e0ab5ea --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.c @@ -0,0 +1,788 @@ @@ -146816,7 +146808,7 @@ index 0000000000000000000000000000000000000000..a5e0ab5eaf175f46975b49967d087ca4 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.h new file mode 100644 -index 0000000000000000000000000000000000000000..177e15d85341ca7c8a7f19c49e2b860805cdd889 +index 000000000..177e15d85 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.h @@ -0,0 +1,37 @@ @@ -146859,7 +146851,7 @@ index 0000000000000000000000000000000000000000..177e15d85341ca7c8a7f19c49e2b8608 +#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 100644 -index 0000000000000000000000000000000000000000..8072a8bd2c327290147e4b0799600bd31e2a4a81 +index 000000000..8072a8bd2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.c @@ -0,0 +1,1372 @@ @@ -148237,7 +148229,7 @@ index 0000000000000000000000000000000000000000..8072a8bd2c327290147e4b0799600bd3 +} 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 100644 -index 0000000000000000000000000000000000000000..1b5cb560894f69feec6e4876566ed955fd79982d +index 000000000..1b5cb5608 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.h @@ -0,0 +1,142 @@ @@ -148385,7 +148377,7 @@ index 0000000000000000000000000000000000000000..1b5cb560894f69feec6e4876566ed955 +#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 100644 -index 0000000000000000000000000000000000000000..96e0f2829854b2807190979c1c37fbd5643785a6 +index 000000000..96e0f2829 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.c @@ -0,0 +1,162 @@ @@ -148553,7 +148545,7 @@ index 0000000000000000000000000000000000000000..96e0f2829854b2807190979c1c37fbd5 + 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 100644 -index 0000000000000000000000000000000000000000..4a1b413eff6d7a5a21ac0cc3d85418da789a6ee3 +index 000000000..4a1b413ef --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.h @@ -0,0 +1,44 @@ @@ -148603,7 +148595,7 @@ index 0000000000000000000000000000000000000000..4a1b413eff6d7a5a21ac0cc3d85418da +#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 100644 -index 0000000000000000000000000000000000000000..96f2b03d2d31b0131aa49b7a8d4037a8bff0d690 +index 000000000..96f2b03d2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_def.h @@ -0,0 +1,140 @@ @@ -148749,7 +148741,7 @@ index 0000000000000000000000000000000000000000..96f2b03d2d31b0131aa49b7a8d4037a8 +#endif /* !_KBASE_CSF_TILER_HEAP_DEF_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.c new file mode 100644 -index 0000000000000000000000000000000000000000..6357e3518d875d9803aafa6c120e9794eccdbe5e +index 000000000..6357e3518 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.c @@ -0,0 +1,359 @@ @@ -149114,7 +149106,7 @@ index 0000000000000000000000000000000000000000..6357e3518d875d9803aafa6c120e9794 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.h new file mode 100644 -index 0000000000000000000000000000000000000000..b6e580e48df63a05b4d07804c7bc4f12d5fdb91e +index 000000000..b6e580e48 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.h @@ -0,0 +1,80 @@ @@ -149200,7 +149192,7 @@ index 0000000000000000000000000000000000000000..b6e580e48df63a05b4d07804c7bc4f12 +#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 100644 -index 0000000000000000000000000000000000000000..ea6c11624157305b994c58838f9c1b0f1ae1a57f +index 000000000..ea6c11624 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c @@ -0,0 +1,177 @@ @@ -149383,7 +149375,7 @@ index 0000000000000000000000000000000000000000..ea6c11624157305b994c58838f9c1b0f +} 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 100644 -index 0000000000000000000000000000000000000000..b406eaad2d516295dea62edb3d098ebf91232e08 +index 000000000..b406eaad2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.h @@ -0,0 +1,66 @@ @@ -149455,7 +149447,7 @@ index 0000000000000000000000000000000000000000..b406eaad2d516295dea62edb3d098ebf +#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 100644 -index 0000000000000000000000000000000000000000..6859d65295c423d781e9297b572dd9b60dea254d +index 000000000..6859d6529 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.c @@ -0,0 +1,441 @@ @@ -149902,7 +149894,7 @@ index 0000000000000000000000000000000000000000..6859d65295c423d781e9297b572dd9b6 +} 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 100644 -index 0000000000000000000000000000000000000000..2f8eb1dd4168a9f895b79fbba4eabdd7e2762b37 +index 000000000..2f8eb1dd4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.h @@ -0,0 +1,144 @@ @@ -150052,7 +150044,7 @@ index 0000000000000000000000000000000000000000..2f8eb1dd4168a9f895b79fbba4eabdd7 +#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 100644 -index 0000000000000000000000000000000000000000..46872f937dbff0df2d0adb6153e4385b98c62442 +index 000000000..46872f937 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c @@ -0,0 +1,555 @@ @@ -150613,7 +150605,7 @@ index 0000000000000000000000000000000000000000..46872f937dbff0df2d0adb6153e4385b +} 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 100644 -index 0000000000000000000000000000000000000000..0389d093a904ceaef4947d5c631c01f9042b6224 +index 000000000..0389d093a --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.h @@ -0,0 +1,187 @@ @@ -150806,7 +150798,7 @@ index 0000000000000000000000000000000000000000..0389d093a904ceaef4947d5c631c01f9 +#endif /* _KBASE_CSF_TRACE_BUFFER_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.c new file mode 100644 -index 0000000000000000000000000000000000000000..185779c16815b83eea31cce53143da116eef89ff +index 000000000..185779c16 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.c @@ -0,0 +1,271 @@ @@ -151083,7 +151075,7 @@ index 0000000000000000000000000000000000000000..185779c16815b83eea31cce53143da11 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.h new file mode 100644 -index 0000000000000000000000000000000000000000..6e9b1a9d51de10c060fe2af5848fb23d36950914 +index 000000000..6e9b1a9d5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.h @@ -0,0 +1,137 @@ @@ -151226,7 +151218,7 @@ index 0000000000000000000000000000000000000000..6e9b1a9d51de10c060fe2af5848fb23d +#endif /*_KBASE_DEBUG_CSF_FAULT_H*/ diff --git a/drivers/gpu/arm/bifrost/debug/Kbuild b/drivers/gpu/arm/bifrost/debug/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..ebf3ddb763a2c2380a80771b8705e8cffb5d0b24 +index 000000000..ebf3ddb76 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/Kbuild @@ -0,0 +1,28 @@ @@ -151260,7 +151252,7 @@ index 0000000000000000000000000000000000000000..ebf3ddb763a2c2380a80771b8705e8cf +endif diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_csf.c b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_csf.c new file mode 100644 -index 0000000000000000000000000000000000000000..ff5f947e2da57296fefe4524a40e9399790c2b6d +index 000000000..ff5f947e2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_csf.c @@ -0,0 +1,851 @@ @@ -152117,7 +152109,7 @@ index 0000000000000000000000000000000000000000..ff5f947e2da57296fefe4524a40e9399 +} diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_internal_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_internal_csf.h new file mode 100644 -index 0000000000000000000000000000000000000000..06d62dc701828b6dc492cd19fa4767b416f125c0 +index 000000000..06d62dc70 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_internal_csf.h @@ -0,0 +1,182 @@ @@ -152305,7 +152297,7 @@ index 0000000000000000000000000000000000000000..06d62dc701828b6dc492cd19fa4767b4 +#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 100644 -index 0000000000000000000000000000000000000000..41b2b00f18c89bce6aebcaf1a8055c15121c83df +index 000000000..41b2b00f1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_csf.h @@ -0,0 +1,322 @@ @@ -152633,7 +152625,7 @@ index 0000000000000000000000000000000000000000..41b2b00f18c89bce6aebcaf1a8055c15 + /* ***** 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 100644 -index 0000000000000000000000000000000000000000..6ba98b7c4a6c8c32e63ecbed240d11deb34be7b3 +index 000000000..6ba98b7c4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_jm.h @@ -0,0 +1,206 @@ @@ -152845,7 +152837,7 @@ index 0000000000000000000000000000000000000000..6ba98b7c4a6c8c32e63ecbed240d11de +/* ***** 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 100644 -index 0000000000000000000000000000000000000000..cff6f8959c35b588f2a1754df77ec0dc006d4fb6 +index 000000000..cff6f8959 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.c @@ -0,0 +1,199 @@ @@ -153050,7 +153042,7 @@ index 0000000000000000000000000000000000000000..cff6f8959c35b588f2a1754df77ec0dc +#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 100644 -index 0000000000000000000000000000000000000000..e3d03730734defe3da8eac294e1629e04c956962 +index 000000000..e3d037307 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.h @@ -0,0 +1,203 @@ @@ -153259,7 +153251,7 @@ index 0000000000000000000000000000000000000000..e3d03730734defe3da8eac294e1629e0 +#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 100644 -index 0000000000000000000000000000000000000000..1896e10ed4ab3ee60701142a3c64e5e55e845157 +index 000000000..1896e10ed --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_csf.h @@ -0,0 +1,116 @@ @@ -153381,7 +153373,7 @@ index 0000000000000000000000000000000000000000..1896e10ed4ab3ee60701142a3c64e5e5 +#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 100644 -index 0000000000000000000000000000000000000000..efa8ab05b1cdb4c29e705cbcd22e2cca80fd9550 +index 000000000..efa8ab05b --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_jm.h @@ -0,0 +1,112 @@ @@ -153499,7 +153491,7 @@ index 0000000000000000000000000000000000000000..efa8ab05b1cdb4c29e705cbcd22e2cca +#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 100644 -index 0000000000000000000000000000000000000000..6597a15e50000d572904bb3b506b754949df856f +index 000000000..6597a15e5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.c @@ -0,0 +1,121 @@ @@ -153626,7 +153618,7 @@ index 0000000000000000000000000000000000000000..6597a15e50000d572904bb3b506b7549 +#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 100644 -index 0000000000000000000000000000000000000000..41be7a120dcccf384551de99dc085166321a24e1 +index 000000000..41be7a120 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.h @@ -0,0 +1,309 @@ @@ -153941,7 +153933,7 @@ index 0000000000000000000000000000000000000000..41be7a120dcccf384551de99dc085166 +#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 100644 -index 0000000000000000000000000000000000000000..ddcac906c4925f5695d8088aa420fc50a7bea193 +index 000000000..ddcac906c --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_csf.h @@ -0,0 +1,267 @@ @@ -154214,7 +154206,7 @@ index 0000000000000000000000000000000000000000..ddcac906c4925f5695d8088aa420fc50 +#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 100644 -index 0000000000000000000000000000000000000000..8fa4e2a7c10be03d68da0b394d50ceee5eb66136 +index 000000000..8fa4e2a7c --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_jm.h @@ -0,0 +1,174 @@ @@ -154394,7 +154386,7 @@ index 0000000000000000000000000000000000000000..8fa4e2a7c10be03d68da0b394d50ceee +#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 100644 -index 0000000000000000000000000000000000000000..f521b47120fb122f0bbbddbf5c5832bea1b3bb5d +index 000000000..f521b4712 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.c @@ -0,0 +1,361 @@ @@ -154761,7 +154753,7 @@ index 0000000000000000000000000000000000000000..f521b47120fb122f0bbbddbf5c5832be +#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 100644 -index 0000000000000000000000000000000000000000..11f0b5c42c8936c1005a1d085cb0e682eae241b9 +index 000000000..11f0b5c42 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.h @@ -0,0 +1,238 @@ @@ -155005,7 +154997,7 @@ index 0000000000000000000000000000000000000000..11f0b5c42c8936c1005a1d085cb0e682 +#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 100644 -index 0000000000000000000000000000000000000000..6103c3ee04a8a4a896b97d831032caa70ee22456 +index 000000000..6103c3ee0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_codes.h @@ -0,0 +1,181 @@ @@ -155192,7 +155184,7 @@ index 0000000000000000000000000000000000000000..6103c3ee04a8a4a896b97d831032caa7 +/* ***** 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 100644 -index 0000000000000000000000000000000000000000..a0fc9e51d274ebd7f55f7fce9239c049d584e45c +index 000000000..a0fc9e51d --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_defs.h @@ -0,0 +1,187 @@ @@ -155385,7 +155377,7 @@ index 0000000000000000000000000000000000000000..a0fc9e51d274ebd7f55f7fce9239c049 +#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 100644 -index 0000000000000000000000000000000000000000..ba93f29fe5e640f0972ef046f35ec8efe57e94d7 +index 000000000..ba93f29fe --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_internal.h @@ -0,0 +1,90 @@ @@ -155481,7 +155473,7 @@ index 0000000000000000000000000000000000000000..ba93f29fe5e640f0972ef046f35ec8ef +#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 100644 -index 0000000000000000000000000000000000000000..6d96647161b402746406d1ce1e92f009a9660ebc +index 000000000..6d9664716 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_linux_ktrace.h @@ -0,0 +1,123 @@ @@ -155610,7 +155602,7 @@ index 0000000000000000000000000000000000000000..6d96647161b402746406d1ce1e92f009 +#endif /* !defined(_KBASE_DEBUG_LINUX_KTRACE_H_) || defined(TRACE_HEADER_MULTI_READ) */ diff --git a/drivers/gpu/arm/bifrost/device/Kbuild b/drivers/gpu/arm/bifrost/device/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..723ffd21569656ee4708b3adabed04844db2f411 +index 000000000..723ffd215 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/Kbuild @@ -0,0 +1,33 @@ @@ -155649,7 +155641,7 @@ index 0000000000000000000000000000000000000000..723ffd21569656ee4708b3adabed0484 +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 100644 -index 0000000000000000000000000000000000000000..f7054f5b0090dabe6a5a34df4280414ab5d7efcd +index 000000000..f7054f5b0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_csf.c @@ -0,0 +1,525 @@ @@ -156180,7 +156172,7 @@ index 0000000000000000000000000000000000000000..f7054f5b0090dabe6a5a34df4280414a +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 100644 -index 0000000000000000000000000000000000000000..2abd62aaa8b1a7adfac990cf073a42ebc8d616d4 +index 000000000..2abd62aaa --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_csf.c @@ -0,0 +1,252 @@ @@ -156438,7 +156430,7 @@ index 0000000000000000000000000000000000000000..2abd62aaa8b1a7adfac990cf073a42eb +#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 100644 -index 0000000000000000000000000000000000000000..38223af213d12c87cc4c3bce7792b32926838d1b +index 000000000..38223af21 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_jm.c @@ -0,0 +1,143 @@ @@ -156587,7 +156579,7 @@ index 0000000000000000000000000000000000000000..38223af213d12c87cc4c3bce7792b329 +#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 100644 -index 0000000000000000000000000000000000000000..2d3672383630778185204b125e7feab88be2c021 +index 000000000..2d3672383 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_jm.c @@ -0,0 +1,344 @@ @@ -156937,7 +156929,7 @@ index 0000000000000000000000000000000000000000..2d3672383630778185204b125e7feab8 +} 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 100644 -index 0000000000000000000000000000000000000000..b2b0cfd6cc9707266f272f73c631dc9f3936d16c +index 000000000..b2b0cfd6c --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device.c @@ -0,0 +1,611 @@ @@ -157554,7 +157546,7 @@ index 0000000000000000000000000000000000000000..b2b0cfd6cc9707266f272f73c631dc9f +} 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 100644 -index 0000000000000000000000000000000000000000..f025011009d57e9e4e098f680c9e79a164bb593f +index 000000000..f02501100 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device.h @@ -0,0 +1,227 @@ @@ -157787,7 +157779,7 @@ index 0000000000000000000000000000000000000000..f025011009d57e9e4e098f680c9e79a1 +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 100644 -index 0000000000000000000000000000000000000000..d5549504589262b9f9538db189de270160277942 +index 000000000..d55495045 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device_hw.c @@ -0,0 +1,291 @@ @@ -158084,7 +158076,7 @@ index 0000000000000000000000000000000000000000..d5549504589262b9f9538db189de2701 +} 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 100644 -index 0000000000000000000000000000000000000000..6f77592dfff239a7df4405cb13d04fa3763d1f86 +index 000000000..6f77592df --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device_internal.h @@ -0,0 +1,101 @@ @@ -158191,7 +158183,7 @@ index 0000000000000000000000000000000000000000..6f77592dfff239a7df4405cb13d04fa3 +#endif /* MALI_USE_CSF && !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ diff --git a/drivers/gpu/arm/bifrost/gpu/Kbuild b/drivers/gpu/arm/bifrost/gpu/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..f3a48caf6b2c5b519a16eae55f9df3f4092cbfdd +index 000000000..f3a48caf6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/Kbuild @@ -0,0 +1,27 @@ @@ -158224,7 +158216,7 @@ index 0000000000000000000000000000000000000000..f3a48caf6b2c5b519a16eae55f9df3f4 +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 100644 -index 0000000000000000000000000000000000000000..60ba9beab91c9e8cdfea0c7216c01f5a80af2848 +index 000000000..60ba9beab --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_csf.c @@ -0,0 +1,179 @@ @@ -158409,7 +158401,7 @@ index 0000000000000000000000000000000000000000..60ba9beab91c9e8cdfea0c7216c01f5a +} 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 100644 -index 0000000000000000000000000000000000000000..7f3743ca6432e9755388411d732c746b126eac21 +index 000000000..7f3743ca6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_jm.c @@ -0,0 +1,176 @@ @@ -158591,7 +158583,7 @@ index 0000000000000000000000000000000000000000..7f3743ca6432e9755388411d732c746b +} 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 100644 -index 0000000000000000000000000000000000000000..e7457ddb5534e90272a3f6b04fc8985f24e6e7e4 +index 000000000..e7457ddb5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h @@ -0,0 +1,381 @@ @@ -158978,7 +158970,7 @@ index 0000000000000000000000000000000000000000..e7457ddb5534e90272a3f6b04fc8985f +#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 100644 -index 0000000000000000000000000000000000000000..f86f493c7f7e68e5c0a7660d3b309a0cc264ad10 +index 000000000..f86f493c7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h @@ -0,0 +1,276 @@ @@ -159260,7 +159252,7 @@ index 0000000000000000000000000000000000000000..f86f493c7f7e68e5c0a7660d3b309a0c +#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 100644 -index 0000000000000000000000000000000000000000..8a84ef54100acc11f3a9c5a08070445468edb098 +index 000000000..8a84ef541 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.c @@ -0,0 +1,41 @@ @@ -159307,7 +159299,7 @@ index 0000000000000000000000000000000000000000..8a84ef54100acc11f3a9c5a080704454 +} 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 100644 -index 0000000000000000000000000000000000000000..6a937a5ed16deef976f24a249769d47635c50eb7 +index 000000000..6a937a5ed --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_fault.h @@ -0,0 +1,48 @@ @@ -159361,7 +159353,7 @@ index 0000000000000000000000000000000000000000..6a937a5ed16deef976f24a249769d476 +#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 100644 -index 0000000000000000000000000000000000000000..6cef2bdd11e07affcbc14d48b4bd2f6e93078bd0 +index 000000000..6cef2bdd1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h @@ -0,0 +1,637 @@ @@ -160004,7 +159996,7 @@ index 0000000000000000000000000000000000000000..6cef2bdd11e07affcbc14d48b4bd2f6e +#endif /* _KBASE_GPU_REGMAP_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/Kbuild b/drivers/gpu/arm/bifrost/hwcnt/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..c1a381b245938032bd97121960d28fe4d521192e +index 000000000..c1a381b24 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/Kbuild @@ -0,0 +1,37 @@ @@ -160047,7 +160039,7 @@ index 0000000000000000000000000000000000000000..c1a381b245938032bd97121960d28fe4 +endif diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend.h b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend.h new file mode 100644 -index 0000000000000000000000000000000000000000..6cfa6f5ee6f4755e73b93ee266115619634cfe2a +index 000000000..6cfa6f5ee --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend.h @@ -0,0 +1,225 @@ @@ -160278,7 +160270,7 @@ index 0000000000000000000000000000000000000000..6cfa6f5ee6f4755e73b93ee266115619 +#endif /* _KBASE_HWCNT_BACKEND_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.c b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.c new file mode 100644 -index 0000000000000000000000000000000000000000..4a429a6cd1aed3b88dacdcb07d43cbf59ba4b884 +index 000000000..4a429a6cd --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.c @@ -0,0 +1,1896 @@ @@ -162180,7 +162172,7 @@ index 0000000000000000000000000000000000000000..4a429a6cd1aed3b88dacdcb07d43cbf5 +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.h b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.h new file mode 100644 -index 0000000000000000000000000000000000000000..9c5a5c996ebda80a1d758291d58b57d956ad5d8e +index 000000000..9c5a5c996 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.h @@ -0,0 +1,153 @@ @@ -162339,7 +162331,7 @@ index 0000000000000000000000000000000000000000..9c5a5c996ebda80a1d758291d58b57d9 +#endif /* _KBASE_HWCNT_BACKEND_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if.h b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if.h new file mode 100644 -index 0000000000000000000000000000000000000000..382a3adaa1273f4efe2c249e16dcef5bad440cc4 +index 000000000..382a3adaa --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if.h @@ -0,0 +1,302 @@ @@ -162647,7 +162639,7 @@ index 0000000000000000000000000000000000000000..382a3adaa1273f4efe2c249e16dcef5b +#endif /* #define _KBASE_HWCNT_BACKEND_CSF_IF_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.c b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.c new file mode 100644 -index 0000000000000000000000000000000000000000..b11f3a4e50e242caaa6d3df4e6e9d0065e202cb2 +index 000000000..b11f3a4e5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.c @@ -0,0 +1,787 @@ @@ -163440,7 +163432,7 @@ index 0000000000000000000000000000000000000000..b11f3a4e50e242caaa6d3df4e6e9d006 +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.h b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.h new file mode 100644 -index 0000000000000000000000000000000000000000..71d1506694f4a75e1a5a48c77e1baedda1985b6e +index 000000000..71d150669 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.h @@ -0,0 +1,49 @@ @@ -163495,7 +163487,7 @@ index 0000000000000000000000000000000000000000..71d1506694f4a75e1a5a48c77e1baedd +#endif /* _KBASE_HWCNT_BACKEND_CSF_IF_FW_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.c b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.c new file mode 100644 -index 0000000000000000000000000000000000000000..669701c2915208de86f7a60414a60a328ba1d3bd +index 000000000..669701c29 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.c @@ -0,0 +1,860 @@ @@ -164361,7 +164353,7 @@ index 0000000000000000000000000000000000000000..669701c2915208de86f7a60414a60a32 +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.h b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.h new file mode 100644 -index 0000000000000000000000000000000000000000..4a6293c254734d7f0c535c5d0ed6a0812a7131a7 +index 000000000..4a6293c25 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.h @@ -0,0 +1,58 @@ @@ -164425,7 +164417,7 @@ index 0000000000000000000000000000000000000000..4a6293c254734d7f0c535c5d0ed6a081 +#endif /* _KBASE_HWCNT_BACKEND_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.c b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.c new file mode 100644 -index 0000000000000000000000000000000000000000..564700b2d97829a4118be5377376b38afd752c27 +index 000000000..564700b2d --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.c @@ -0,0 +1,829 @@ @@ -165260,7 +165252,7 @@ index 0000000000000000000000000000000000000000..564700b2d97829a4118be5377376b38a +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.h b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.h new file mode 100644 -index 0000000000000000000000000000000000000000..02a7952cced2373c6b42420e2d96646ba9a959de +index 000000000..02a7952cc --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.h @@ -0,0 +1,65 @@ @@ -165331,7 +165323,7 @@ index 0000000000000000000000000000000000000000..02a7952cced2373c6b42420e2d96646b +#endif /* _KBASE_HWCNT_BACKEND_JM_WATCHDOG_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt.c b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt.c new file mode 100644 -index 0000000000000000000000000000000000000000..34deb5d9e3fc28548d6fc606823d01a93845f56b +index 000000000..34deb5d9e --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt.c @@ -0,0 +1,775 @@ @@ -166112,7 +166104,7 @@ index 0000000000000000000000000000000000000000..34deb5d9e3fc28548d6fc606823d01a9 +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_accumulator.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_accumulator.h new file mode 100644 -index 0000000000000000000000000000000000000000..069e0206890252c18430c1e5998e8d7f5cd43b71 +index 000000000..069e02068 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_accumulator.h @@ -0,0 +1,139 @@ @@ -166257,7 +166249,7 @@ index 0000000000000000000000000000000000000000..069e0206890252c18430c1e5998e8d7f +#endif /* _KBASE_HWCNT_ACCUMULATOR_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_context.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_context.h new file mode 100644 -index 0000000000000000000000000000000000000000..89732a9087897e064b3f06a49b0991773fc576bf +index 000000000..89732a908 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_context.h @@ -0,0 +1,148 @@ @@ -166411,7 +166403,7 @@ index 0000000000000000000000000000000000000000..89732a9087897e064b3f06a49b099177 +#endif /* _KBASE_HWCNT_CONTEXT_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.c b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.c new file mode 100644 -index 0000000000000000000000000000000000000000..74916dab060d6ff659850ce861df3158dff7edd7 +index 000000000..74916dab0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.c @@ -0,0 +1,738 @@ @@ -167155,7 +167147,7 @@ index 0000000000000000000000000000000000000000..74916dab060d6ff659850ce861df3158 +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.h new file mode 100644 -index 0000000000000000000000000000000000000000..a49c31e52f981cef4c323eb6de5899078af74665 +index 000000000..a49c31e52 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.h @@ -0,0 +1,407 @@ @@ -167568,7 +167560,7 @@ index 0000000000000000000000000000000000000000..a49c31e52f981cef4c323eb6de589907 +#endif /* _KBASE_HWCNT_GPU_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.c b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.c new file mode 100644 -index 0000000000000000000000000000000000000000..0cf2f94cfb874e976f2b2b96415f901af962dc3d +index 000000000..0cf2f94cf --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.c @@ -0,0 +1,298 @@ @@ -167872,7 +167864,7 @@ index 0000000000000000000000000000000000000000..0cf2f94cfb874e976f2b2b96415f901a +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.h new file mode 100644 -index 0000000000000000000000000000000000000000..afd236d71a7c21dd230b481d3dd437385a21de44 +index 000000000..afd236d71 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.h @@ -0,0 +1,330 @@ @@ -168208,7 +168200,7 @@ index 0000000000000000000000000000000000000000..afd236d71a7c21dd230b481d3dd43738 +#endif /* _KBASE_HWCNT_GPU_NARROW_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.c b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.c new file mode 100644 -index 0000000000000000000000000000000000000000..763eb315d9a2ac9d21cf9d938a8baa9af8d48f0b +index 000000000..763eb315d --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.c @@ -0,0 +1,511 @@ @@ -168725,7 +168717,7 @@ index 0000000000000000000000000000000000000000..763eb315d9a2ac9d21cf9d938a8baa9a +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.h new file mode 100644 -index 0000000000000000000000000000000000000000..5c5ada4017682a6d421dc7078051f9043d39b640 +index 000000000..5c5ada401 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.h @@ -0,0 +1,1231 @@ @@ -169962,7 +169954,7 @@ index 0000000000000000000000000000000000000000..5c5ada4017682a6d421dc7078051f904 +#endif /* _KBASE_HWCNT_TYPES_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.c b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.c new file mode 100644 -index 0000000000000000000000000000000000000000..d618764d3b32f0c74bd91b46abace4769716a3ef +index 000000000..d618764d3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.c @@ -0,0 +1,744 @@ @@ -170712,7 +170704,7 @@ index 0000000000000000000000000000000000000000..d618764d3b32f0c74bd91b46abace476 +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.h new file mode 100644 -index 0000000000000000000000000000000000000000..485ba74960f6b7ede3cf2dc086870683b2a44dbd +index 000000000..485ba7496 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.h @@ -0,0 +1,151 @@ @@ -170869,7 +170861,7 @@ index 0000000000000000000000000000000000000000..485ba74960f6b7ede3cf2dc086870683 +#endif /* _KBASE_HWCNT_VIRTUALIZER_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if.h new file mode 100644 -index 0000000000000000000000000000000000000000..501c0087b7e60daca6450c9b720b6234e2fd26c7 +index 000000000..501c0087b --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if.h @@ -0,0 +1,89 @@ @@ -170964,7 +170956,7 @@ index 0000000000000000000000000000000000000000..501c0087b7e60daca6450c9b720b6234 +#endif /* _KBASE_HWCNT_WATCHDOG_IF_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.c b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.c new file mode 100644 -index 0000000000000000000000000000000000000000..4caa832cd5877829b315d1f920695abdf6631d32 +index 000000000..4caa832cd --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.c @@ -0,0 +1,157 @@ @@ -171127,7 +171119,7 @@ index 0000000000000000000000000000000000000000..4caa832cd5877829b315d1f920695abd +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.h new file mode 100644 -index 0000000000000000000000000000000000000000..a545ad3e39e35d3a1b7f92ae6f3788a7e81faaa6 +index 000000000..a545ad3e3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.h @@ -0,0 +1,48 @@ @@ -171181,7 +171173,7 @@ index 0000000000000000000000000000000000000000..a545ad3e39e35d3a1b7f92ae6f3788a7 +#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 -index 0000000000000000000000000000000000000000..0be664c47b544c4b7b94f5d47aa01ca3bd5e0648 +index 000000000..0be664c47 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/Kbuild @@ -0,0 +1,35 @@ @@ -171222,7 +171214,7 @@ index 0000000000000000000000000000000000000000..0be664c47b544c4b7b94f5d47aa01ca3 +endif diff --git a/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.c b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.c new file mode 100644 -index 0000000000000000000000000000000000000000..60b061ef623def8c6deceb4909f54d67df40e03d +index 000000000..60b061ef6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.c @@ -0,0 +1,457 @@ @@ -171685,7 +171677,7 @@ index 0000000000000000000000000000000000000000..60b061ef623def8c6deceb4909f54d67 +} diff --git a/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.h b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.h new file mode 100644 -index 0000000000000000000000000000000000000000..37d2efc59fcc90087a35bb2076e71ea8d102cebe +index 000000000..37d2efc59 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.h @@ -0,0 +1,159 @@ @@ -171850,7 +171842,7 @@ index 0000000000000000000000000000000000000000..37d2efc59fcc90087a35bb2076e71ea8 +#endif /* _KBASE_IPA_COUNTER_COMMON_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.c b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.c new file mode 100644 -index 0000000000000000000000000000000000000000..34515a934b336d8117a4b0ec80f4de4fcce19de1 +index 000000000..34515a934 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.c @@ -0,0 +1,355 @@ @@ -172211,7 +172203,7 @@ index 0000000000000000000000000000000000000000..34515a934b336d8117a4b0ec80f4de4f +} diff --git a/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.h b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.h new file mode 100644 -index 0000000000000000000000000000000000000000..6089610847b4242bc7e10e7172ff356c4cee1b4d +index 000000000..608961084 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.h @@ -0,0 +1,234 @@ @@ -172451,7 +172443,7 @@ index 0000000000000000000000000000000000000000..6089610847b4242bc7e10e7172ff356c +#endif /* _KBASE_IPA_COUNTER_COMMON_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_csf.c b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_csf.c new file mode 100644 -index 0000000000000000000000000000000000000000..21b4e52884c5673ae93cb5fbb324f333f677f7bf +index 000000000..21b4e5288 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_csf.c @@ -0,0 +1,280 @@ @@ -172737,7 +172729,7 @@ index 0000000000000000000000000000000000000000..21b4e52884c5673ae93cb5fbb324f333 +} diff --git a/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_jm.c b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_jm.c new file mode 100644 -index 0000000000000000000000000000000000000000..2092db042deccb1edc2e713eed7995fbc092bf33 +index 000000000..2092db042 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_jm.c @@ -0,0 +1,561 @@ @@ -173304,7 +173296,7 @@ index 0000000000000000000000000000000000000000..2092db042deccb1edc2e713eed7995fb +} 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 100644 -index 0000000000000000000000000000000000000000..b2e6bc459f22451052257bbc649fadfa5d85c11b +index 000000000..b2e6bc459 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c @@ -0,0 +1,778 @@ @@ -174088,7 +174080,7 @@ index 0000000000000000000000000000000000000000..b2e6bc459f22451052257bbc649fadfa +} 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 100644 -index 0000000000000000000000000000000000000000..c875ffb4990eb9312e0439d1b623ac5558c0d229 +index 000000000..c875ffb49 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h @@ -0,0 +1,304 @@ @@ -174398,7 +174390,7 @@ index 0000000000000000000000000000000000000000..c875ffb4990eb9312e0439d1b623ac55 +#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 100644 -index 0000000000000000000000000000000000000000..a0963bbb2068f86c63e3f7eb6ea9232ce418d9bc +index 000000000..a0963bbb2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c @@ -0,0 +1,324 @@ @@ -174728,7 +174720,7 @@ index 0000000000000000000000000000000000000000..a0963bbb2068f86c63e3f7eb6ea9232c +} 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 100644 -index 0000000000000000000000000000000000000000..f690367757c9c429a81a91a70218cc80433eb488 +index 000000000..f69036775 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h @@ -0,0 +1,70 @@ @@ -174804,7 +174796,7 @@ index 0000000000000000000000000000000000000000..f690367757c9c429a81a91a70218cc80 +#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 100644 -index 0000000000000000000000000000000000000000..8557fe8723cfce9210d1c01ff07c6fda0d8f2d21 +index 000000000..8557fe872 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c @@ -0,0 +1,370 @@ @@ -175180,7 +175172,7 @@ index 0000000000000000000000000000000000000000..8557fe8723cfce9210d1c01ff07c6fda +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 100644 -index 0000000000000000000000000000000000000000..dd17786a51d9b6ee8a8d47bbad7597ded98390b1 +index 000000000..dd17786a5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h @@ -0,0 +1,44 @@ @@ -175230,7 +175222,7 @@ index 0000000000000000000000000000000000000000..dd17786a51d9b6ee8a8d47bbad7597de +#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 100644 -index 0000000000000000000000000000000000000000..debc3ad25fd76736978ef165ee81a016accf1edb +index 000000000..debc3ad25 --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h @@ -0,0 +1,878 @@ @@ -176114,7 +176106,7 @@ index 0000000000000000000000000000000000000000..debc3ad25fd76736978ef165ee81a016 +#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 100644 -index 0000000000000000000000000000000000000000..53819caaf6166b82907e1837a10c950b79d8f8b3 +index 000000000..53819caaf --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h @@ -0,0 +1,1044 @@ @@ -177164,7 +177156,7 @@ index 0000000000000000000000000000000000000000..53819caaf6166b82907e1837a10c950b +#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 100644 -index 0000000000000000000000000000000000000000..465cf7ec05bd52d5fd715783ab24c8aac8768f77 +index 000000000..465cf7ec0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h @@ -0,0 +1,447 @@ @@ -177617,7 +177609,7 @@ index 0000000000000000000000000000000000000000..465cf7ec05bd52d5fd715783ab24c8aa +#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 100644 -index 0000000000000000000000000000000000000000..11aedef80109d0e95d2f1051399242c9ddc1b7fa +index 000000000..11aedef80 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h @@ -0,0 +1,185 @@ @@ -177808,7 +177800,7 @@ index 0000000000000000000000000000000000000000..11aedef80109d0e95d2f1051399242c9 +#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 100644 -index 0000000000000000000000000000000000000000..0fbdec0bb0b626bb31bd483df42c592f7d7f96ab +index 000000000..0fbdec0bb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h @@ -0,0 +1,835 @@ @@ -178649,7 +178641,7 @@ index 0000000000000000000000000000000000000000..0fbdec0bb0b626bb31bd483df42c592f +#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 100644 -index 0000000000000000000000000000000000000000..542e8f63fb5b7787b3f0a3d76e952fe4cd3c7efa +index 000000000..542e8f63f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase.h @@ -0,0 +1,752 @@ @@ -179407,7 +179399,7 @@ index 0000000000000000000000000000000000000000..542e8f63fb5b7787b3f0a3d76e952fe4 +#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 100644 -index 0000000000000000000000000000000000000000..10dbeee02e4018d48add7a9a00a763b98c2b8fa6 +index 000000000..10dbeee02 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c @@ -0,0 +1,109 @@ @@ -179522,7 +179514,7 @@ index 0000000000000000000000000000000000000000..10dbeee02e4018d48add7a9a00a763b9 +} 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 100644 -index 0000000000000000000000000000000000000000..59bbcf6f4ff73fe91e788f6093a4a928ccc907bb +index 000000000..59bbcf6f4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h @@ -0,0 +1,48 @@ @@ -179576,7 +179568,7 @@ index 0000000000000000000000000000000000000000..59bbcf6f4ff73fe91e788f6093a4a928 +#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 100644 -index 0000000000000000000000000000000000000000..a085fd86c488d4d32ec4995e1915ceecd2150992 +index 000000000..a085fd86c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_bits.h @@ -0,0 +1,31 @@ @@ -179613,7 +179605,7 @@ index 0000000000000000000000000000000000000000..a085fd86c488d4d32ec4995e1915ceec +#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 100644 -index 0000000000000000000000000000000000000000..4675025baaf8a3424264d727244dc1eefe8549a9 +index 000000000..4675025ba --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c @@ -0,0 +1,64 @@ @@ -179683,7 +179675,7 @@ index 0000000000000000000000000000000000000000..4675025baaf8a3424264d727244dc1ee +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 100644 -index 0000000000000000000000000000000000000000..598d245383fdd799acd8caaabb52934007c3855b +index 000000000..598d24538 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h @@ -0,0 +1,47 @@ @@ -179736,7 +179728,7 @@ index 0000000000000000000000000000000000000000..598d245383fdd799acd8caaabb529340 +#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 100644 -index 0000000000000000000000000000000000000000..a92569d31f065d5ea2e13181a83005a84f3dcbc9 +index 000000000..a92569d31 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_caps.h @@ -0,0 +1,70 @@ @@ -179812,7 +179804,7 @@ index 0000000000000000000000000000000000000000..a92569d31f065d5ea2e13181a83005a8 +#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 100644 -index 0000000000000000000000000000000000000000..6a1e7e4c5ff5e17d3d26d942d16256135569f9f9 +index 000000000..6a1e7e4c5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c @@ -0,0 +1,100 @@ @@ -179918,7 +179910,7 @@ index 0000000000000000000000000000000000000000..6a1e7e4c5ff5e17d3d26d942d1625613 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h new file mode 100644 -index 0000000000000000000000000000000000000000..f7fcf7780b35b309409893b10a47245d9b10ffab +index 000000000..f7fcf7780 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h @@ -0,0 +1,95 @@ @@ -180019,7 +180011,7 @@ index 0000000000000000000000000000000000000000..f7fcf7780b35b309409893b10a47245d +#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 100644 -index 0000000000000000000000000000000000000000..37dbca129f869703786981476b15132d9ea711bc +index 000000000..37dbca129 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_config.c @@ -0,0 +1,104 @@ @@ -180129,7 +180121,7 @@ index 0000000000000000000000000000000000000000..37dbca129f869703786981476b15132d +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_config.h b/drivers/gpu/arm/bifrost/mali_kbase_config.h new file mode 100644 -index 0000000000000000000000000000000000000000..ecfdb2876618f1059da9d592d2e6bc18dd72ca71 +index 000000000..ecfdb2876 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_config.h @@ -0,0 +1,583 @@ @@ -180718,7 +180710,7 @@ index 0000000000000000000000000000000000000000..ecfdb2876618f1059da9d592d2e6bc18 +#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 100644 -index 0000000000000000000000000000000000000000..14493a77e1ea7ad3a7e91ab857ce4a0e9788fab1 +index 000000000..14493a77e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h @@ -0,0 +1,278 @@ @@ -181002,7 +180994,7 @@ index 0000000000000000000000000000000000000000..14493a77e1ea7ad3a7e91ab857ce4a0e +#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 100644 -index 0000000000000000000000000000000000000000..68e4305afad162bd0abd47103856a7e4e92557a1 +index 000000000..68e4305af --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c @@ -0,0 +1,5856 @@ @@ -186864,7 +186856,7 @@ index 0000000000000000000000000000000000000000..68e4305afad162bd0abd47103856a7e4 +#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 100644 -index 0000000000000000000000000000000000000000..7e885ca46ce9002304df93186f45abeb6478fa5d +index 000000000..7e885ca46 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h @@ -0,0 +1,40 @@ @@ -186910,7 +186902,7 @@ index 0000000000000000000000000000000000000000..7e885ca46ce9002304df93186f45abeb + 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 100644 -index 0000000000000000000000000000000000000000..dc6feb95a3917ae10819595a445acd41a5f2cf2e +index 000000000..dc6feb95a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c @@ -0,0 +1,433 @@ @@ -187349,7 +187341,7 @@ index 0000000000000000000000000000000000000000..dc6feb95a3917ae10819595a445acd41 +#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 100644 -index 0000000000000000000000000000000000000000..5a8d17547b7b1b5ae565bd30f82c801246484c32 +index 000000000..5a8d17547 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h @@ -0,0 +1,247 @@ @@ -187602,7 +187594,7 @@ index 0000000000000000000000000000000000000000..5a8d17547b7b1b5ae565bd30f82c8012 +#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 100644 -index 0000000000000000000000000000000000000000..6d3b1093b442142a02e3377566bd103c12557d5b +index 000000000..6d3b1093b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug.c @@ -0,0 +1,41 @@ @@ -187649,7 +187641,7 @@ index 0000000000000000000000000000000000000000..6d3b1093b442142a02e3377566bd103c + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug.h b/drivers/gpu/arm/bifrost/mali_kbase_debug.h new file mode 100644 -index 0000000000000000000000000000000000000000..9d6ff73aa4e0947f3d0f01df9ec0a5f75a47022f +index 000000000..9d6ff73aa --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug.h @@ -0,0 +1,166 @@ @@ -187821,7 +187813,7 @@ index 0000000000000000000000000000000000000000..9d6ff73aa4e0947f3d0f01df9ec0a5f7 +#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 100644 -index 0000000000000000000000000000000000000000..d6518b476115cbdaf61d703b84053cdbc36efceb +index 000000000..d6518b476 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c @@ -0,0 +1,573 @@ @@ -188400,7 +188392,7 @@ index 0000000000000000000000000000000000000000..d6518b476115cbdaf61d703b84053cdb +#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 100644 -index 0000000000000000000000000000000000000000..059d9c4553bbbbcd467b5fa39ca021fa3eebb821 +index 000000000..059d9c455 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h @@ -0,0 +1,121 @@ @@ -188527,7 +188519,7 @@ index 0000000000000000000000000000000000000000..059d9c4553bbbbcd467b5fa39ca021fa +#endif /*_KBASE_DEBUG_JOB_FAULT_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.c b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.c new file mode 100644 -index 0000000000000000000000000000000000000000..418bb19086bbacfb95a0c4ec4bcc035d3de19913 +index 000000000..418bb1908 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.c @@ -0,0 +1,138 @@ @@ -188671,7 +188663,7 @@ index 0000000000000000000000000000000000000000..418bb19086bbacfb95a0c4ec4bcc035d +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.h b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.h new file mode 100644 -index 0000000000000000000000000000000000000000..8cf69c2cbaf98a07794e47a0b36aea18a902e5b1 +index 000000000..8cf69c2cb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.h @@ -0,0 +1,39 @@ @@ -188716,7 +188708,7 @@ index 0000000000000000000000000000000000000000..8cf69c2cbaf98a07794e47a0b36aea18 +#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 100644 -index 0000000000000000000000000000000000000000..ce87a0070b72b5a6a6be028fd6b82207246a6529 +index 000000000..ce87a0070 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c @@ -0,0 +1,410 @@ @@ -189132,7 +189124,7 @@ index 0000000000000000000000000000000000000000..ce87a0070b72b5a6a6be028fd6b82207 +#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 100644 -index 0000000000000000000000000000000000000000..cb8050d9b32c5d4a7193694d7416841d86670fa9 +index 000000000..cb8050d9b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h @@ -0,0 +1,39 @@ @@ -189177,7 +189169,7 @@ index 0000000000000000000000000000000000000000..cb8050d9b32c5d4a7193694d7416841d +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.c b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.c new file mode 100644 -index 0000000000000000000000000000000000000000..1f8db32aa16fd965a9f47ba26b0653a2ca348192 +index 000000000..1f8db32aa --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.c @@ -0,0 +1,116 @@ @@ -189299,7 +189291,7 @@ index 0000000000000000000000000000000000000000..1f8db32aa16fd965a9f47ba26b0653a2 +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.h b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.h new file mode 100644 -index 0000000000000000000000000000000000000000..acf349b608d501988c46a255816046623428ebb4 +index 000000000..acf349b60 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.h @@ -0,0 +1,39 @@ @@ -189344,7 +189336,7 @@ index 0000000000000000000000000000000000000000..acf349b608d501988c46a25581604662 +#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 100644 -index 0000000000000000000000000000000000000000..c846491e78fb31e243bad458740c3b30145c1832 +index 000000000..c846491e7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c @@ -0,0 +1,248 @@ @@ -189598,7 +189590,7 @@ index 0000000000000000000000000000000000000000..c846491e78fb31e243bad458740c3b30 +} 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 100644 -index 0000000000000000000000000000000000000000..cbb24d6e0acfdc579acae5edecebe3c00720a5d1 +index 000000000..cbb24d6e0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h @@ -0,0 +1,162 @@ @@ -189766,7 +189758,7 @@ index 0000000000000000000000000000000000000000..cbb24d6e0acfdc579acae5edecebe3c0 + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_defs.h new file mode 100644 -index 0000000000000000000000000000000000000000..809e73000c4d3ef3d5d69f85d592636441ae58fe +index 000000000..809e73000 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_defs.h @@ -0,0 +1,2105 @@ @@ -191877,7 +191869,7 @@ index 0000000000000000000000000000000000000000..809e73000c4d3ef3d5d69f85d5926364 +#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 100644 -index 0000000000000000000000000000000000000000..7d6e475585aed84457832877c3cf61f9a9fb724e +index 000000000..7d6e47558 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c @@ -0,0 +1,80 @@ @@ -191963,7 +191955,7 @@ index 0000000000000000000000000000000000000000..7d6e475585aed84457832877c3cf61f9 +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 100644 -index 0000000000000000000000000000000000000000..4e2713511857546e9012bddbf714ad3fb43eb2ba +index 000000000..4e2713511 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c @@ -0,0 +1,452 @@ @@ -192421,7 +192413,7 @@ index 0000000000000000000000000000000000000000..4e2713511857546e9012bddbf714ad3f +} 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 100644 -index 0000000000000000000000000000000000000000..8713ba1eaa6f4587dd1df5bc40cbda5732cdea7a +index 000000000..8713ba1ea --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h @@ -0,0 +1,73 @@ @@ -192500,7 +192492,7 @@ index 0000000000000000000000000000000000000000..8713ba1eaa6f4587dd1df5bc40cbda57 +#endif /* _KBASE_DUMMY_JOB_WORKAROUND_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.c new file mode 100644 -index 0000000000000000000000000000000000000000..e4cb71632aeedecf921b5f6d2cbf99dbb8acf819 +index 000000000..e4cb71632 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.c @@ -0,0 +1,94 @@ @@ -192600,7 +192592,7 @@ index 0000000000000000000000000000000000000000..e4cb71632aeedecf921b5f6d2cbf99db +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.h new file mode 100644 -index 0000000000000000000000000000000000000000..8334db7cc1ed2340726b218c36328d014906c64f +index 000000000..8334db7cc --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.h @@ -0,0 +1,35 @@ @@ -192641,7 +192633,7 @@ index 0000000000000000000000000000000000000000..8334db7cc1ed2340726b218c36328d01 +#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 100644 -index 0000000000000000000000000000000000000000..910c51170ae8e92002746117f851b62a44d12bb4 +index 000000000..910c51170 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_event.c @@ -0,0 +1,272 @@ @@ -192919,7 +192911,7 @@ index 0000000000000000000000000000000000000000..910c51170ae8e92002746117f851b62a +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 100644 -index 0000000000000000000000000000000000000000..b16b27659e612dcedf5b02cd820f331532556594 +index 000000000..b16b27659 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence.c @@ -0,0 +1,61 @@ @@ -192986,7 +192978,7 @@ index 0000000000000000000000000000000000000000..b16b27659e612dcedf5b02cd820f3315 + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence.h b/drivers/gpu/arm/bifrost/mali_kbase_fence.h new file mode 100644 -index 0000000000000000000000000000000000000000..f4507ac4309bd3197cd7f2422f486c614e768232 +index 000000000..f4507ac43 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence.h @@ -0,0 +1,259 @@ @@ -193251,7 +193243,7 @@ index 0000000000000000000000000000000000000000..f4507ac4309bd3197cd7f2422f486c61 +#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 100644 -index 0000000000000000000000000000000000000000..7a150bdf2947ae56b8482649e8cfd3522e3d97b5 +index 000000000..7a150bdf2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h @@ -0,0 +1,63 @@ @@ -193320,7 +193312,7 @@ index 0000000000000000000000000000000000000000..7a150bdf2947ae56b8482649e8cfd352 +#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 100644 -index 0000000000000000000000000000000000000000..25b4c9c03b53fe98c9a2fa81d8553b448a2f8d57 +index 000000000..25b4c9c03 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c @@ -0,0 +1,111 @@ @@ -193437,7 +193429,7 @@ index 0000000000000000000000000000000000000000..25b4c9c03b53fe98c9a2fa81d8553b44 +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 100644 -index 0000000000000000000000000000000000000000..dd7df874640a2d6cfa90bbd3601e547acfe3aad2 +index 000000000..dd7df8746 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gator.h @@ -0,0 +1,52 @@ @@ -193495,7 +193487,7 @@ index 0000000000000000000000000000000000000000..dd7df874640a2d6cfa90bbd3601e547a +#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 100644 -index 0000000000000000000000000000000000000000..bf5f259a0bb6c2dce0983e915de9889f1231c905 +index 000000000..bf5f259a0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c @@ -0,0 +1,112 @@ @@ -193613,7 +193605,7 @@ index 0000000000000000000000000000000000000000..bf5f259a0bb6c2dce0983e915de9889f +#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 100644 -index 0000000000000000000000000000000000000000..6d5423f379d412b38a6726dfd5f9961f2bb827c5 +index 000000000..6d5423f37 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h @@ -0,0 +1,50 @@ @@ -193669,7 +193661,7 @@ index 0000000000000000000000000000000000000000..6d5423f379d412b38a6726dfd5f9961f +#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 100644 -index 0000000000000000000000000000000000000000..7a7d17ea5f2644db05591e6b08c627a2643446d1 +index 000000000..7a7d17ea5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c @@ -0,0 +1,888 @@ @@ -194563,7 +194555,7 @@ index 0000000000000000000000000000000000000000..7a7d17ea5f2644db05591e6b08c627a2 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h new file mode 100644 -index 0000000000000000000000000000000000000000..f0a97312c0dd8467becfa886374cd1a41a97af5d +index 000000000..f0a97312c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h @@ -0,0 +1,154 @@ @@ -194723,7 +194715,7 @@ index 0000000000000000000000000000000000000000..f0a97312c0dd8467becfa886374cd1a4 +#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 100644 -index 0000000000000000000000000000000000000000..45cb603fab82e48d937f4bca52d82f789b32e47a +index 000000000..45cb603fa --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h @@ -0,0 +1,170 @@ @@ -194899,7 +194891,7 @@ index 0000000000000000000000000000000000000000..45cb603fab82e48d937f4bca52d82f78 +#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 100644 -index 0000000000000000000000000000000000000000..0eba889e5b19ad2923bebdc980dcc79856e65b19 +index 000000000..0eba889e5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gwt.c @@ -0,0 +1,275 @@ @@ -195180,7 +195172,7 @@ index 0000000000000000000000000000000000000000..0eba889e5b19ad2923bebdc980dcc798 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gwt.h b/drivers/gpu/arm/bifrost/mali_kbase_gwt.h new file mode 100644 -index 0000000000000000000000000000000000000000..9fdd68d62fb87992e6033a300ae3a58e8c5fd3d2 +index 000000000..9fdd68d62 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gwt.h @@ -0,0 +1,54 @@ @@ -195240,7 +195232,7 @@ index 0000000000000000000000000000000000000000..9fdd68d62fb87992e6033a300ae3a58e +#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 100644 -index 0000000000000000000000000000000000000000..b07327a55c0a27888322e964df81042a793d183a +index 000000000..b07327a55 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hw.c @@ -0,0 +1,437 @@ @@ -195683,7 +195675,7 @@ index 0000000000000000000000000000000000000000..b07327a55c0a27888322e964df81042a +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hw.h b/drivers/gpu/arm/bifrost/mali_kbase_hw.h new file mode 100644 -index 0000000000000000000000000000000000000000..ddcddaaa429d98d18885c0b811769fb86e12a42f +index 000000000..ddcddaaa4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hw.h @@ -0,0 +1,71 @@ @@ -195760,7 +195752,7 @@ index 0000000000000000000000000000000000000000..ddcddaaa429d98d18885c0b811769fb8 +#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 100644 -index 0000000000000000000000000000000000000000..0da4eb258a2445f6d9ab01424802d96161acfeba +index 000000000..0da4eb258 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h @@ -0,0 +1,43 @@ @@ -195809,7 +195801,7 @@ index 0000000000000000000000000000000000000000..0da4eb258a2445f6d9ab01424802d961 +#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 100644 -index 0000000000000000000000000000000000000000..62a6ec51b17f9e003ad949e6f64265f9fc6c771f +index 000000000..62a6ec51b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h @@ -0,0 +1,50 @@ @@ -195865,7 +195857,7 @@ index 0000000000000000000000000000000000000000..62a6ec51b17f9e003ad949e6f64265f9 +#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 100644 -index 0000000000000000000000000000000000000000..f537b7f0ac90bf3da20c668340a1c55cf48f3357 +index 000000000..f537b7f0a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h @@ -0,0 +1,88 @@ @@ -195959,7 +195951,7 @@ index 0000000000000000000000000000000000000000..f537b7f0ac90bf3da20c668340a1c55c +#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 100644 -index 0000000000000000000000000000000000000000..37663101a346166046eab4806403ff9ded6b88ed +index 000000000..37663101a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h @@ -0,0 +1,170 @@ @@ -196135,7 +196127,7 @@ index 0000000000000000000000000000000000000000..37663101a346166046eab4806403ff9d +#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 100644 -index 0000000000000000000000000000000000000000..ca77c192deeaef820d580e454087e736716ab5e5 +index 000000000..ca77c192d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h @@ -0,0 +1,318 @@ @@ -196459,7 +196451,7 @@ index 0000000000000000000000000000000000000000..ca77c192deeaef820d580e454087e736 +#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 100644 -index 0000000000000000000000000000000000000000..effb2ffeb349c397ec07b5713118c678491a9d2b +index 000000000..effb2ffeb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h @@ -0,0 +1,229 @@ @@ -196694,7 +196686,7 @@ index 0000000000000000000000000000000000000000..effb2ffeb349c397ec07b5713118c678 +#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 100644 -index 0000000000000000000000000000000000000000..ac2a26d28d895b6aef74bbfe6f7b462aca643781 +index 000000000..ac2a26d28 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h @@ -0,0 +1,126 @@ @@ -196826,7 +196818,7 @@ index 0000000000000000000000000000000000000000..ac2a26d28d895b6aef74bbfe6f7b462a +#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 100644 -index 0000000000000000000000000000000000000000..f44426a736ca3b7fee8f2d2b1e12f28d230a4f7f +index 000000000..f44426a73 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd.c @@ -0,0 +1,1660 @@ @@ -198492,7 +198484,7 @@ index 0000000000000000000000000000000000000000..f44426a736ca3b7fee8f2d2b1e12f28d +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 100644 -index 0000000000000000000000000000000000000000..6196c0985c7e47680f5ea3ad458ed33a0f396c07 +index 000000000..6196c0985 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.c @@ -0,0 +1,199 @@ @@ -198697,7 +198689,7 @@ index 0000000000000000000000000000000000000000..6196c0985c7e47680f5ea3ad458ed33a +#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 100644 -index 0000000000000000000000000000000000000000..8e6140c43538c32e4526b340a6dfff452e614633 +index 000000000..8e6140c43 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.h @@ -0,0 +1,43 @@ @@ -198746,7 +198738,7 @@ index 0000000000000000000000000000000000000000..8e6140c43538c32e4526b340a6dfff45 +#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 100644 -index 0000000000000000000000000000000000000000..1ac5cd3eafff29086e4024892a193370dd9e3cab +index 000000000..1ac5cd3ea --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jm.c @@ -0,0 +1,153 @@ @@ -198905,7 +198897,7 @@ index 0000000000000000000000000000000000000000..1ac5cd3eafff29086e4024892a193370 +#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 100644 -index 0000000000000000000000000000000000000000..eeafcb6b1a771308eab07dcd7e156115f38b6881 +index 000000000..eeafcb6b1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jm.h @@ -0,0 +1,117 @@ @@ -199028,7 +199020,7 @@ index 0000000000000000000000000000000000000000..eeafcb6b1a771308eab07dcd7e156115 +#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 100644 -index 0000000000000000000000000000000000000000..8ce09212a57eba4c4e12d8d5ad9f863c90d03bb5 +index 000000000..8ce09212a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js.c @@ -0,0 +1,4007 @@ @@ -203041,7 +203033,7 @@ index 0000000000000000000000000000000000000000..8ce09212a57eba4c4e12d8d5ad9f863c +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js.h b/drivers/gpu/arm/bifrost/mali_kbase_js.h new file mode 100644 -index 0000000000000000000000000000000000000000..89c3b45c735b17ab26c7c1d90823c5c25e07d882 +index 000000000..89c3b45c7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js.h @@ -0,0 +1,36 @@ @@ -203083,7 +203075,7 @@ index 0000000000000000000000000000000000000000..89c3b45c735b17ab26c7c1d90823c5c2 +#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 100644 -index 0000000000000000000000000000000000000000..04ea06b2f3816224d2dd98c3f50acf6c3b0c26a1 +index 000000000..04ea06b2f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.c @@ -0,0 +1,298 @@ @@ -203387,7 +203379,7 @@ index 0000000000000000000000000000000000000000..04ea06b2f3816224d2dd98c3f50acf6c +} 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 100644 -index 0000000000000000000000000000000000000000..2dc640d5ab82a5d34da1d3bfad47d02f1384d0d2 +index 000000000..2dc640d5a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.h @@ -0,0 +1,147 @@ @@ -203540,7 +203532,7 @@ index 0000000000000000000000000000000000000000..2dc640d5ab82a5d34da1d3bfad47d02f +#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 100644 -index 0000000000000000000000000000000000000000..14a730dc5a1266739bf461521a40cdc083deb1fb +index 000000000..14a730dc5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.c @@ -0,0 +1,896 @@ @@ -204442,7 +204434,7 @@ index 0000000000000000000000000000000000000000..14a730dc5a1266739bf461521a40cdc0 +} 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 100644 -index 0000000000000000000000000000000000000000..9451d4cd943dcf42904deb11d63b30b68e23b688 +index 000000000..9451d4cd9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.h @@ -0,0 +1,273 @@ @@ -204721,7 +204713,7 @@ index 0000000000000000000000000000000000000000..9451d4cd943dcf42904deb11d63b30b6 +#endif /* _KBASE_KINSTR_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.c b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.c new file mode 100644 -index 0000000000000000000000000000000000000000..823f9156e19ee8cdadd4a2add7a3b03d9c0d5e15 +index 000000000..823f9156e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.c @@ -0,0 +1,2021 @@ @@ -206748,7 +206740,7 @@ index 0000000000000000000000000000000000000000..823f9156e19ee8cdadd4a2add7a3b03d +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.h b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.h new file mode 100644 -index 0000000000000000000000000000000000000000..bbe33796e62f59106fc5e4af8ce3bf5f1abfdd21 +index 000000000..bbe33796e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.h @@ -0,0 +1,189 @@ @@ -206943,7 +206935,7 @@ index 0000000000000000000000000000000000000000..bbe33796e62f59106fc5e4af8ce3bf5f +#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 100644 -index 0000000000000000000000000000000000000000..e5c6f7a0b217f5b1c00cbe0ec8dadc6a7ee1f9ae +index 000000000..e5c6f7a0b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_linux.h @@ -0,0 +1,44 @@ @@ -206993,7 +206985,7 @@ index 0000000000000000000000000000000000000000..e5c6f7a0b217f5b1c00cbe0ec8dadc6a +#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 100644 -index 0000000000000000000000000000000000000000..800a4199d1df67a1882f1ef7c9bee0b588a6e189 +index 000000000..800a4199d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem.c @@ -0,0 +1,5533 @@ @@ -212532,7 +212524,7 @@ index 0000000000000000000000000000000000000000..800a4199d1df67a1882f1ef7c9bee0b5 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem.h b/drivers/gpu/arm/bifrost/mali_kbase_mem.h new file mode 100644 -index 0000000000000000000000000000000000000000..1118b96fceb3eaf9a0dc7c557129a6dc0320e2a6 +index 000000000..1118b96fc --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem.h @@ -0,0 +1,2560 @@ @@ -215098,7 +215090,7 @@ index 0000000000000000000000000000000000000000..1118b96fceb3eaf9a0dc7c557129a6dc +#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 100644 -index 0000000000000000000000000000000000000000..ad0c17b63f7d85d9961220d92bd31f5e56eedb5e +index 000000000..ad0c17b63 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.c @@ -0,0 +1,3818 @@ @@ -218922,7 +218914,7 @@ index 0000000000000000000000000000000000000000..ad0c17b63f7d85d9961220d92bd31f5e +#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 100644 -index 0000000000000000000000000000000000000000..6dda44b9f128eeb900257cc63aa0e76e28d372c2 +index 000000000..6dda44b9f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.h @@ -0,0 +1,533 @@ @@ -219461,7 +219453,7 @@ index 0000000000000000000000000000000000000000..6dda44b9f128eeb900257cc63aa0e76e +#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 100644 -index 0000000000000000000000000000000000000000..5a1bb16cca01614eec81152c8b93fddb745d8b50 +index 000000000..5a1bb16cc --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_lowlevel.h @@ -0,0 +1,179 @@ @@ -219646,7 +219638,7 @@ index 0000000000000000000000000000000000000000..5a1bb16cca01614eec81152c8b93fddb +#endif /* _KBASE_LOWLEVEL_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.c new file mode 100644 -index 0000000000000000000000000000000000000000..737f7da5595d3871f14e5b947b11110f7e7b9725 +index 000000000..737f7da55 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.c @@ -0,0 +1,641 @@ @@ -220293,7 +220285,7 @@ index 0000000000000000000000000000000000000000..737f7da5595d3871f14e5b947b11110f +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.h new file mode 100644 -index 0000000000000000000000000000000000000000..76bbc999e110af5b0faf5b831c7e4cf610b267e1 +index 000000000..76bbc999e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.h @@ -0,0 +1,108 @@ @@ -220407,7 +220399,7 @@ index 0000000000000000000000000000000000000000..76bbc999e110af5b0faf5b831c7e4cf6 +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 100644 -index 0000000000000000000000000000000000000000..fa8f34d86c246c79eed5a019aca42d329255640d +index 000000000..fa8f34d86 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool.c @@ -0,0 +1,1029 @@ @@ -221442,7 +221434,7 @@ index 0000000000000000000000000000000000000000..fa8f34d86c246c79eed5a019aca42d32 +} 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 100644 -index 0000000000000000000000000000000000000000..3b1b2bae15c8be5717b5de127071fda94394668e +index 000000000..3b1b2bae1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.c @@ -0,0 +1,184 @@ @@ -221632,7 +221624,7 @@ index 0000000000000000000000000000000000000000..3b1b2bae15c8be5717b5de127071fda9 +} 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 100644 -index 0000000000000000000000000000000000000000..207b58536a58b21da9957de386f4f68f9ca0e111 +index 000000000..207b58536 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.h @@ -0,0 +1,122 @@ @@ -221760,7 +221752,7 @@ index 0000000000000000000000000000000000000000..207b58536a58b21da9957de386f4f68f + 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 100644 -index 0000000000000000000000000000000000000000..49c4b041e13adbfe09e1aedb8b865f80666eb3cb +index 000000000..49c4b041e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.c @@ -0,0 +1,107 @@ @@ -221873,7 +221865,7 @@ index 0000000000000000000000000000000000000000..49c4b041e13adbfe09e1aedb8b865f80 +} 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 100644 -index 0000000000000000000000000000000000000000..fe8ce775258f8ff99f54242009b7f4a8a2be2621 +index 000000000..fe8ce7752 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.h @@ -0,0 +1,114 @@ @@ -221993,7 +221985,7 @@ index 0000000000000000000000000000000000000000..fe8ce775258f8ff99f54242009b7f4a8 +#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 100644 -index 0000000000000000000000000000000000000000..9317023b71bb8164bc19f877e45e6073d75d7971 +index 000000000..9317023b7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.c @@ -0,0 +1,131 @@ @@ -222130,7 +222122,7 @@ index 0000000000000000000000000000000000000000..9317023b71bb8164bc19f877e45e6073 +#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 100644 -index 0000000000000000000000000000000000000000..c30fca6652dc2fc20804315c836a34464f057294 +index 000000000..c30fca665 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.h @@ -0,0 +1,64 @@ @@ -222200,7 +222192,7 @@ index 0000000000000000000000000000000000000000..c30fca6652dc2fc20804315c836a3446 + 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 100644 -index 0000000000000000000000000000000000000000..951079d11ab6dec48eb32f4cd2d1e04554d7c9f2 +index 000000000..951079d11 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mipe_gen_header.h @@ -0,0 +1,229 @@ @@ -222435,7 +222427,7 @@ index 0000000000000000000000000000000000000000..951079d11ab6dec48eb32f4cd2d1e045 +/* 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 100644 -index 0000000000000000000000000000000000000000..c35ee61ce5aaad203d2450639d93d5b5345d6ad1 +index 000000000..c35ee61ce --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mipe_proto.h @@ -0,0 +1,126 @@ @@ -222567,7 +222559,7 @@ index 0000000000000000000000000000000000000000..c35ee61ce5aaad203d2450639d93d5b5 +/* 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 100644 -index 0000000000000000000000000000000000000000..10a7f506b1a4f2388d8658128bad59707e4aff94 +index 000000000..10a7f506b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.c @@ -0,0 +1,177 @@ @@ -222750,7 +222742,7 @@ index 0000000000000000000000000000000000000000..10a7f506b1a4f2388d8658128bad5970 +}; 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 100644 -index 0000000000000000000000000000000000000000..1eae2fcf98b6cee56fe2b9dc3d22217d744b2105 +index 000000000..1eae2fcf9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.h @@ -0,0 +1,38 @@ @@ -222794,7 +222786,7 @@ index 0000000000000000000000000000000000000000..1eae2fcf98b6cee56fe2b9dc3d22217d +#endif /* _KBASE_NATIVE_MGM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pbha.c b/drivers/gpu/arm/bifrost/mali_kbase_pbha.c new file mode 100644 -index 0000000000000000000000000000000000000000..b65f9e7b516287bdf2337124b6ab2c60f5189988 +index 000000000..b65f9e7b5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha.c @@ -0,0 +1,306 @@ @@ -223106,7 +223098,7 @@ index 0000000000000000000000000000000000000000..b65f9e7b516287bdf2337124b6ab2c60 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pbha.h b/drivers/gpu/arm/bifrost/mali_kbase_pbha.h new file mode 100644 -index 0000000000000000000000000000000000000000..79632194cabe1f1db1fe4f9c4729f197a2aef7cb +index 000000000..79632194c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha.h @@ -0,0 +1,77 @@ @@ -223189,7 +223181,7 @@ index 0000000000000000000000000000000000000000..79632194cabe1f1db1fe4f9c4729f197 +#endif /* _KBASE_PBHA_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.c new file mode 100644 -index 0000000000000000000000000000000000000000..1cc29c700e5a07a6d6937b35cf3075dbaec7b75f +index 000000000..1cc29c700 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.c @@ -0,0 +1,227 @@ @@ -223422,7 +223414,7 @@ index 0000000000000000000000000000000000000000..1cc29c700e5a07a6d6937b35cf3075db +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.h new file mode 100644 -index 0000000000000000000000000000000000000000..508ecdff9162f7891a9eca84ee047a0fc9cfb828 +index 000000000..508ecdff9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.h @@ -0,0 +1,34 @@ @@ -223462,7 +223454,7 @@ index 0000000000000000000000000000000000000000..508ecdff9162f7891a9eca84ee047a0f +#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 100644 -index 0000000000000000000000000000000000000000..265c676f13fa34c43239d578aece265fde5e86fb +index 000000000..265c676f1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_platform_fake.c @@ -0,0 +1,119 @@ @@ -223587,7 +223579,7 @@ index 0000000000000000000000000000000000000000..265c676f13fa34c43239d578aece265f +#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 100644 -index 0000000000000000000000000000000000000000..62a132816a42a2199014c692d3d7495f0dd20efa +index 000000000..62a132816 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pm.c @@ -0,0 +1,311 @@ @@ -223904,7 +223896,7 @@ index 0000000000000000000000000000000000000000..62a132816a42a2199014c692d3d7495f +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pm.h b/drivers/gpu/arm/bifrost/mali_kbase_pm.h new file mode 100644 -index 0000000000000000000000000000000000000000..4bb90a4f6542bee6fd2d06b637fe2e067fded305 +index 000000000..4bb90a4f6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pm.h @@ -0,0 +1,257 @@ @@ -224167,7 +224159,7 @@ index 0000000000000000000000000000000000000000..4bb90a4f6542bee6fd2d06b637fe2e06 +#endif /* _KBASE_PM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_refcount_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_refcount_defs.h new file mode 100644 -index 0000000000000000000000000000000000000000..c517a2d2ab83d3275e2d40e912de861d6695cc7d +index 000000000..c517a2d2a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_refcount_defs.h @@ -0,0 +1,57 @@ @@ -224230,7 +224222,7 @@ index 0000000000000000000000000000000000000000..c517a2d2ab83d3275e2d40e912de861d +#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 100644 -index 0000000000000000000000000000000000000000..147082c15fedd1c6bacffa46ff22329b6099a970 +index 000000000..147082c15 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.c @@ -0,0 +1,239 @@ @@ -224475,7 +224467,7 @@ index 0000000000000000000000000000000000000000..147082c15fedd1c6bacffa46ff22329b +#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 100644 -index 0000000000000000000000000000000000000000..ae327dd799a44f5f824a71f22408b72e420b230b +index 000000000..ae327dd79 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.h @@ -0,0 +1,84 @@ @@ -224565,7 +224557,7 @@ index 0000000000000000000000000000000000000000..ae327dd799a44f5f824a71f22408b72e +#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 100644 -index 0000000000000000000000000000000000000000..48ea9954b17c155776be99b9270f9c73b5c1a93a +index 000000000..48ea9954b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_reset_gpu.h @@ -0,0 +1,277 @@ @@ -224848,7 +224840,7 @@ index 0000000000000000000000000000000000000000..48ea9954b17c155776be99b9270f9c73 +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_smc.c b/drivers/gpu/arm/bifrost/mali_kbase_smc.c new file mode 100644 -index 0000000000000000000000000000000000000000..abbe8d56d082e106ab6eac8b98331415e17b160f +index 000000000..abbe8d56d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_smc.c @@ -0,0 +1,90 @@ @@ -224944,7 +224936,7 @@ index 0000000000000000000000000000000000000000..abbe8d56d082e106ab6eac8b98331415 + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_smc.h b/drivers/gpu/arm/bifrost/mali_kbase_smc.h new file mode 100644 -index 0000000000000000000000000000000000000000..40a348388598295cc30d83c72df22829868eb2b0 +index 000000000..40a348388 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_smc.h @@ -0,0 +1,69 @@ @@ -225019,7 +225011,7 @@ index 0000000000000000000000000000000000000000..40a348388598295cc30d83c72df22829 +#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 100644 -index 0000000000000000000000000000000000000000..a9312a0c433e6093197238447ecd17790e7d27bd +index 000000000..a9312a0c4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_softjobs.c @@ -0,0 +1,1770 @@ @@ -226795,7 +226787,7 @@ index 0000000000000000000000000000000000000000..a9312a0c433e6093197238447ecd1779 +#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 100644 -index 0000000000000000000000000000000000000000..84784be6f244cff079dac6c6d780fa9b50cda82a +index 000000000..84784be6f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_strings.c @@ -0,0 +1,28 @@ @@ -226829,7 +226821,7 @@ index 0000000000000000000000000000000000000000..84784be6f244cff079dac6c6d780fa9b +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 100644 -index 0000000000000000000000000000000000000000..c3f94f9267d5cc5397410ca44ff598cc40afad14 +index 000000000..c3f94f926 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_strings.h @@ -0,0 +1,23 @@ @@ -226858,7 +226850,7 @@ index 0000000000000000000000000000000000000000..c3f94f9267d5cc5397410ca44ff598cc +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 100644 -index 0000000000000000000000000000000000000000..3d2053bee08e8ad8d3dede7056cb72ae604d7819 +index 000000000..3d2053bee --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync.h @@ -0,0 +1,216 @@ @@ -227080,7 +227072,7 @@ index 0000000000000000000000000000000000000000..3d2053bee08e8ad8d3dede7056cb72ae +#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 100644 -index 0000000000000000000000000000000000000000..5ee7fc3ce72b53efa31ebe99dfa83026f05731d0 +index 000000000..5ee7fc3ce --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync_common.c @@ -0,0 +1,50 @@ @@ -227136,7 +227128,7 @@ index 0000000000000000000000000000000000000000..5ee7fc3ce72b53efa31ebe99dfa83026 +} 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 100644 -index 0000000000000000000000000000000000000000..9360324cfee6cd9ca18292e96d428ad97384b6de +index 000000000..9360324cf --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync_file.c @@ -0,0 +1,409 @@ @@ -227551,7 +227543,7 @@ index 0000000000000000000000000000000000000000..9360324cfee6cd9ca18292e96d428ad9 +#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 100644 -index 0000000000000000000000000000000000000000..7df7d79b6bc5ca9afcf539bc69d0a5e6988fc032 +index 000000000..7df7d79b6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.c @@ -0,0 +1,225 @@ @@ -227782,7 +227774,7 @@ index 0000000000000000000000000000000000000000..7df7d79b6bc5ca9afcf539bc69d0a5e6 +} 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 100644 -index 0000000000000000000000000000000000000000..fd871fcb352a3b39b19fd8d1160c6217256cff54 +index 000000000..fd871fcb3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.h @@ -0,0 +1,100 @@ @@ -227888,7 +227880,7 @@ index 0000000000000000000000000000000000000000..fd871fcb352a3b39b19fd8d1160c6217 +#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 100644 -index 0000000000000000000000000000000000000000..bd66f716720c98a93cd2d27e3d28dc398e968f3e +index 000000000..bd66f7167 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_utility.h @@ -0,0 +1,41 @@ @@ -227935,7 +227927,7 @@ index 0000000000000000000000000000000000000000..bd66f716720c98a93cd2d27e3d28dc39 +#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 100644 -index 0000000000000000000000000000000000000000..d770913e9da57b2466f2db73883621daf79d0940 +index 000000000..d770913e9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.c @@ -0,0 +1,1132 @@ @@ -229073,7 +229065,7 @@ index 0000000000000000000000000000000000000000..d770913e9da57b2466f2db73883621da +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_vinstr.h b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.h new file mode 100644 -index 0000000000000000000000000000000000000000..6747ec70a4061812ba1dd7645a45ee6831539599 +index 000000000..6747ec70a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.h @@ -0,0 +1,90 @@ @@ -229169,7 +229161,7 @@ index 0000000000000000000000000000000000000000..6747ec70a4061812ba1dd7645a45ee68 +#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 100644 -index 0000000000000000000000000000000000000000..52f17390c853258edde1f9ebfd5bf108adf9a852 +index 000000000..52f17390c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_linux_trace.h @@ -0,0 +1,547 @@ @@ -229722,7 +229714,7 @@ index 0000000000000000000000000000000000000000..52f17390c853258edde1f9ebfd5bf108 +#include diff --git a/drivers/gpu/arm/bifrost/mali_malisw.h b/drivers/gpu/arm/bifrost/mali_malisw.h new file mode 100644 -index 0000000000000000000000000000000000000000..d9db189e8684bc633557edb609f4534d98633657 +index 000000000..d9db189e8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_malisw.h @@ -0,0 +1,108 @@ @@ -229836,7 +229828,7 @@ index 0000000000000000000000000000000000000000..d9db189e8684bc633557edb609f4534d +#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 100644 -index 0000000000000000000000000000000000000000..1db3abe2f9f6fea74e576084c7ee59b5f3bb9e10 +index 000000000..1db3abe2f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.c @@ -0,0 +1,26 @@ @@ -229868,7 +229860,7 @@ index 0000000000000000000000000000000000000000..1db3abe2f9f6fea74e576084c7ee59b5 +#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 100644 -index 0000000000000000000000000000000000000000..f156650a40a3d001dc6f1f8a29100dfd7c0a5667 +index 000000000..f156650a4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.h @@ -0,0 +1,68 @@ @@ -229942,7 +229934,7 @@ index 0000000000000000000000000000000000000000..f156650a40a3d001dc6f1f8a29100dfd +#include diff --git a/drivers/gpu/arm/bifrost/mmu/Kbuild b/drivers/gpu/arm/bifrost/mmu/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..416432397b5c207d5a42c17049b829e90f48cca3 +index 000000000..416432397 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/Kbuild @@ -0,0 +1,30 @@ @@ -229978,7 +229970,7 @@ index 0000000000000000000000000000000000000000..416432397b5c207d5a42c17049b829e9 +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 100644 -index 0000000000000000000000000000000000000000..4cac7876f5f7a51cce4a52f79a165e34049d3910 +index 000000000..4cac7876f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_csf.c @@ -0,0 +1,572 @@ @@ -230556,7 +230548,7 @@ index 0000000000000000000000000000000000000000..4cac7876f5f7a51cce4a52f79a165e34 +} 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 100644 -index 0000000000000000000000000000000000000000..d716ce0068fd5d68a2a38928461acf2cce630c90 +index 000000000..d716ce006 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_jm.c @@ -0,0 +1,442 @@ @@ -231004,7 +230996,7 @@ index 0000000000000000000000000000000000000000..d716ce0068fd5d68a2a38928461acf2c +} 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 100644 -index 0000000000000000000000000000000000000000..d6d3fcdee6e7c93d405ad76a13ce422a226b34a3 +index 000000000..d6d3fcdee --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.c @@ -0,0 +1,3889 @@ @@ -234899,7 +234891,7 @@ index 0000000000000000000000000000000000000000..d6d3fcdee6e7c93d405ad76a13ce422a +} 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 100644 -index 0000000000000000000000000000000000000000..699b1f34048237b7801dd67e66b3ee20a88d3ef2 +index 000000000..699b1f340 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.h @@ -0,0 +1,341 @@ @@ -235246,7 +235238,7 @@ index 0000000000000000000000000000000000000000..699b1f34048237b7801dd67e66b3ee20 +#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 100644 -index 0000000000000000000000000000000000000000..50d2ea5d07c811c67794350faa8a129b7c56f33b +index 000000000..50d2ea5d0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw.h @@ -0,0 +1,214 @@ @@ -235466,7 +235458,7 @@ index 0000000000000000000000000000000000000000..50d2ea5d07c811c67794350faa8a129b +#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 100644 -index 0000000000000000000000000000000000000000..3f6da35d80f2586c0ee45b52fdfbf1874b181073 +index 000000000..3f6da35d8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw_direct.c @@ -0,0 +1,699 @@ @@ -236171,7 +236163,7 @@ index 0000000000000000000000000000000000000000..3f6da35d80f2586c0ee45b52fdfbf187 +} 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 100644 -index 0000000000000000000000000000000000000000..9d7ce48568e4d0c5ed19ac680acdc7f427dca418 +index 000000000..9d7ce4856 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_internal.h @@ -0,0 +1,72 @@ @@ -236249,7 +236241,7 @@ index 0000000000000000000000000000000000000000..9d7ce48568e4d0c5ed19ac680acdc7f4 +#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 100644 -index 0000000000000000000000000000000000000000..1464320cbe4484ffde35c342ce1a193acdf18e5f +index 000000000..1464320cb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_aarch64.c @@ -0,0 +1,209 @@ @@ -236464,7 +236456,7 @@ index 0000000000000000000000000000000000000000..1464320cbe4484ffde35c342ce1a193a +} diff --git a/drivers/gpu/arm/bifrost/platform/Kconfig b/drivers/gpu/arm/bifrost/platform/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..3e1bd235b842fb7ba9eef4d567eeb06fcb0ce808 +index 000000000..3e1bd235b --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/Kconfig @@ -0,0 +1,26 @@ @@ -236496,7 +236488,7 @@ index 0000000000000000000000000000000000000000..3e1bd235b842fb7ba9eef4d567eeb06f +# diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild b/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..60a52d80fa8e2df89cc0d78f9724574076567c18 +index 000000000..60a52d80f --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild @@ -0,0 +1,24 @@ @@ -236526,7 +236518,7 @@ index 0000000000000000000000000000000000000000..60a52d80fa8e2df89cc0d78f97245740 + 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 100644 -index 0000000000000000000000000000000000000000..4bcd5854d3a39e77b30f21cb3b78a8fcb511028e +index 000000000..4bcd5854d --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_clk_rate_trace.c @@ -0,0 +1,105 @@ @@ -236637,7 +236629,7 @@ index 0000000000000000000000000000000000000000..4bcd5854d3a39e77b30f21cb3b78a8fc +}; 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 100644 -index 0000000000000000000000000000000000000000..a0b4a434e2a76a1c6aa078484d8a7e2e3db0b9c6 +index 000000000..a0b4a434e --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_devicetree.c @@ -0,0 +1,53 @@ @@ -236696,7 +236688,7 @@ index 0000000000000000000000000000000000000000..a0b4a434e2a76a1c6aa078484d8a7e2e +#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 100644 -index 0000000000000000000000000000000000000000..584a7217d3001ad8e60374fb9fe159c310146fc9 +index 000000000..584a7217d --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_platform.h @@ -0,0 +1,47 @@ @@ -236749,7 +236741,7 @@ index 0000000000000000000000000000000000000000..584a7217d3001ad8e60374fb9fe159c3 +#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 100644 -index 0000000000000000000000000000000000000000..2687bee96ec9cb5e6b3e56832e3401126916f410 +index 000000000..2687bee96 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_runtime_pm.c @@ -0,0 +1,298 @@ @@ -237053,7 +237045,7 @@ index 0000000000000000000000000000000000000000..2687bee96ec9cb5e6b3e56832e340112 +}; diff --git a/drivers/gpu/arm/bifrost/platform/meson/Kbuild b/drivers/gpu/arm/bifrost/platform/meson/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..9b3de96bace8a75cd0529a315884b64882d827bd +index 000000000..9b3de96ba --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/meson/Kbuild @@ -0,0 +1,23 @@ @@ -237082,7 +237074,7 @@ index 0000000000000000000000000000000000000000..9b3de96bace8a75cd0529a315884b648 + platform/$(MALI_PLATFORM_DIR)/mali_kbase_runtime_pm.o diff --git a/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_meson.c b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_meson.c new file mode 100644 -index 0000000000000000000000000000000000000000..7b896b602e960502b52ce5054a5f295820ee3159 +index 000000000..7b896b602 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_meson.c @@ -0,0 +1,53 @@ @@ -237141,7 +237133,7 @@ index 0000000000000000000000000000000000000000..7b896b602e960502b52ce5054a5f2958 +#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_platform.h new file mode 100644 -index 0000000000000000000000000000000000000000..06279e2f62caf1d0d55f2146932bda5a0bde5b94 +index 000000000..06279e2f6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_platform.h @@ -0,0 +1,45 @@ @@ -237192,7 +237184,7 @@ index 0000000000000000000000000000000000000000..06279e2f62caf1d0d55f2146932bda5a +#define AUTO_SUSPEND_DELAY (100) diff --git a/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_runtime_pm.c b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_runtime_pm.c new file mode 100644 -index 0000000000000000000000000000000000000000..910d4b4fd3e1ca68e81ccc01b845e0e7e656de6b +index 000000000..910d4b4fd --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_runtime_pm.c @@ -0,0 +1,265 @@ @@ -237463,7 +237455,7 @@ index 0000000000000000000000000000000000000000..910d4b4fd3e1ca68e81ccc01b845e0e7 +}; diff --git a/drivers/gpu/arm/bifrost/platform/rk/Kbuild b/drivers/gpu/arm/bifrost/platform/rk/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..a1e78cfc4ae79564f3366e06e35e01e71e90c066 +index 000000000..a1e78cfc4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/Kbuild @@ -0,0 +1,16 @@ @@ -237485,7 +237477,7 @@ index 0000000000000000000000000000000000000000..a1e78cfc4ae79564f3366e06e35e01e7 + 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 100644 -index 0000000000000000000000000000000000000000..5de70ee13d25d8a6616e6d1f27b1c39779561320 +index 000000000..5de70ee13 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/custom_log.h @@ -0,0 +1,192 @@ @@ -237683,7 +237675,7 @@ index 0000000000000000000000000000000000000000..5de70ee13d25d8a6616e6d1f27b1c397 +#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 100644 -index 0000000000000000000000000000000000000000..ea01d502c98e65ed6a43e87714928c78e6e5ee21 +index 000000000..ea01d502c --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_platform.h @@ -0,0 +1,94 @@ @@ -237783,7 +237775,7 @@ index 0000000000000000000000000000000000000000..ea01d502c98e65ed6a43e87714928c78 +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 100644 -index 0000000000000000000000000000000000000000..3ac4aef79719471c6aa26ca95aa9734bc857bfcd +index 000000000..3ac4aef79 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c @@ -0,0 +1,724 @@ @@ -238513,7 +238505,7 @@ index 0000000000000000000000000000000000000000..3ac4aef79719471c6aa26ca95aa9734b +}; 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 100644 -index 0000000000000000000000000000000000000000..0a42559df2bf1d4e54fc15172c564305bc3daf62 +index 000000000..0a42559df --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_rk.h @@ -0,0 +1,67 @@ @@ -238586,7 +238578,7 @@ index 0000000000000000000000000000000000000000..0a42559df2bf1d4e54fc15172c564305 + diff --git a/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild b/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..e1398fde3976cb6d17cd91d9b0988e14ca1a4d1c +index 000000000..e1398fde3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild @@ -0,0 +1,23 @@ @@ -238615,7 +238607,7 @@ index 0000000000000000000000000000000000000000..e1398fde3976cb6d17cd91d9b0988e14 + 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 100644 -index 0000000000000000000000000000000000000000..28f453161358aa7d8f24916509de684059596eed +index 000000000..28f453161 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_platform.h @@ -0,0 +1,38 @@ @@ -238659,7 +238651,7 @@ index 0000000000000000000000000000000000000000..28f453161358aa7d8f24916509de6840 +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 100644 -index 0000000000000000000000000000000000000000..8add708d0f8ad43baec3cd0254e96e51fca07217 +index 000000000..8add708d0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_vexpress.c @@ -0,0 +1,79 @@ @@ -238744,7 +238736,7 @@ index 0000000000000000000000000000000000000000..8add708d0f8ad43baec3cd0254e96e51 +#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 -index 0000000000000000000000000000000000000000..e1398fde3976cb6d17cd91d9b0988e14ca1a4d1c +index 000000000..e1398fde3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/Kbuild @@ -0,0 +1,23 @@ @@ -238773,7 +238765,7 @@ index 0000000000000000000000000000000000000000..e1398fde3976cb6d17cd91d9b0988e14 + 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 100644 -index 0000000000000000000000000000000000000000..28f453161358aa7d8f24916509de684059596eed +index 000000000..28f453161 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h @@ -0,0 +1,38 @@ @@ -238817,7 +238809,7 @@ index 0000000000000000000000000000000000000000..28f453161358aa7d8f24916509de6840 +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 100644 -index 0000000000000000000000000000000000000000..835b7587cfbfdf041ec07f48835a8b8d405f2287 +index 000000000..835b7587c --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c @@ -0,0 +1,77 @@ @@ -238900,7 +238892,7 @@ index 0000000000000000000000000000000000000000..835b7587cfbfdf041ec07f48835a8b8d +#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 -index 0000000000000000000000000000000000000000..10f7dc8cf22c464ac65d7593fff542653c51ecc3 +index 000000000..10f7dc8cf --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/Kbuild @@ -0,0 +1,24 @@ @@ -238930,7 +238922,7 @@ index 0000000000000000000000000000000000000000..10f7dc8cf22c464ac65d7593fff54265 + 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 100644 -index 0000000000000000000000000000000000000000..28f453161358aa7d8f24916509de684059596eed +index 000000000..28f453161 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h @@ -0,0 +1,38 @@ @@ -238974,7 +238966,7 @@ index 0000000000000000000000000000000000000000..28f453161358aa7d8f24916509de6840 +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 100644 -index 0000000000000000000000000000000000000000..8be30fb25bba5fd7d12855a5ed90f6f309a1a4f5 +index 000000000..8be30fb25 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c @@ -0,0 +1,77 @@ @@ -239057,7 +239049,7 @@ index 0000000000000000000000000000000000000000..8be30fb25bba5fd7d12855a5ed90f6f3 +#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 100644 -index 0000000000000000000000000000000000000000..9dd9253c7e958c4de9025a841cb2e979105b41dc +index 000000000..9dd9253c7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/protected_mode_switcher.h @@ -0,0 +1,56 @@ @@ -239119,7 +239111,7 @@ index 0000000000000000000000000000000000000000..9dd9253c7e958c4de9025a841cb2e979 +#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 -index 0000000000000000000000000000000000000000..38e4dd4d712a0d36e589aab43c731b5d19692d99 +index 000000000..38e4dd4d7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/Kbuild @@ -0,0 +1,31 @@ @@ -239156,7 +239148,7 @@ index 0000000000000000000000000000000000000000..38e4dd4d712a0d36e589aab43c731b5d + diff --git a/drivers/gpu/arm/bifrost/tests/Kconfig b/drivers/gpu/arm/bifrost/tests/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..e9fe22771416f641303f06b65e0d8791a0cdf6f6 +index 000000000..e9fe22771 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/Kconfig @@ -0,0 +1,69 @@ @@ -239231,7 +239223,7 @@ index 0000000000000000000000000000000000000000..e9fe22771416f641303f06b65e0d8791 + depends on MALI_BIFROST && !MALI_BIFROST_DEBUG && MALI_KUTF diff --git a/drivers/gpu/arm/bifrost/tests/build.bp b/drivers/gpu/arm/bifrost/tests/build.bp new file mode 100755 -index 0000000000000000000000000000000000000000..5581ba934cd335f440645b62e92d37b9a984cdfa +index 000000000..5581ba934 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/build.bp @@ -0,0 +1,46 @@ @@ -239283,7 +239275,7 @@ index 0000000000000000000000000000000000000000..5581ba934cd335f440645b62e92d37b9 +} 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 100644 -index 0000000000000000000000000000000000000000..3f68efa4257d385ba273f3ae29fc9ca731dce346 +index 000000000..3f68efa42 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers.h @@ -0,0 +1,109 @@ @@ -239398,7 +239390,7 @@ index 0000000000000000000000000000000000000000..3f68efa4257d385ba273f3ae29fc9ca7 +#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 100644 -index 0000000000000000000000000000000000000000..e147cbb90154d23d79e1557da83ca02bbf399f89 +index 000000000..e147cbb90 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers_user.h @@ -0,0 +1,184 @@ @@ -239588,7 +239580,7 @@ index 0000000000000000000000000000000000000000..e147cbb90154d23d79e1557da83ca02b +#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 100644 -index 0000000000000000000000000000000000000000..5d4d96ef39b1c4f09402409280373d5c7c9ae2f8 +index 000000000..5d4d96ef3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_mem.h @@ -0,0 +1,72 @@ @@ -239666,7 +239658,7 @@ index 0000000000000000000000000000000000000000..5d4d96ef39b1c4f09402409280373d5c +#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 100644 -index 0000000000000000000000000000000000000000..2fb1a47a59b41d67b4f7f5939c59dca8b23ffb77 +index 000000000..2fb1a47a5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_resultset.h @@ -0,0 +1,180 @@ @@ -239852,7 +239844,7 @@ index 0000000000000000000000000000000000000000..2fb1a47a59b41d67b4f7f5939c59dca8 +#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 100644 -index 0000000000000000000000000000000000000000..9e459c55601359a9fa2c3473cb2e7f4a12c0b773 +index 000000000..9e459c556 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_suite.h @@ -0,0 +1,571 @@ @@ -240429,7 +240421,7 @@ index 0000000000000000000000000000000000000000..9e459c55601359a9fa2c3473cb2e7f4a +#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 100644 -index 0000000000000000000000000000000000000000..f6e758b80d98c8880ae9acbeb5b2664d8ee5b4a5 +index 000000000..f6e758b80 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_utils.h @@ -0,0 +1,60 @@ @@ -240495,7 +240487,7 @@ index 0000000000000000000000000000000000000000..f6e758b80d98c8880ae9acbeb5b2664d +#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 -index 0000000000000000000000000000000000000000..c4790bc66c234dfd2c6cdde2fb8fda4392f1e9e3 +index 000000000..c4790bc66 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/Kbuild @@ -0,0 +1,31 @@ @@ -240532,7 +240524,7 @@ index 0000000000000000000000000000000000000000..c4790bc66c234dfd2c6cdde2fb8fda43 +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 -index 0000000000000000000000000000000000000000..89edae9c5e6fe80a8ad06e8a85071b6f235dc84f +index 000000000..89edae9c5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/build.bp @@ -0,0 +1,42 @@ @@ -240580,7 +240572,7 @@ index 0000000000000000000000000000000000000000..89edae9c5e6fe80a8ad06e8a85071b6f +} 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 100644 -index 0000000000000000000000000000000000000000..42736195e071abac403a6a7c5f0e05a4708d826c +index 000000000..42736195e --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers.c @@ -0,0 +1,141 @@ @@ -240727,7 +240719,7 @@ index 0000000000000000000000000000000000000000..42736195e071abac403a6a7c5f0e05a4 +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 100644 -index 0000000000000000000000000000000000000000..c4e2943252629ff512c12097c2a5b890a4a260e8 +index 000000000..c4e294325 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers_user.c @@ -0,0 +1,474 @@ @@ -241207,7 +241199,7 @@ index 0000000000000000000000000000000000000000..c4e2943252629ff512c12097c2a5b890 +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 100644 -index 0000000000000000000000000000000000000000..716970abb8c4ffe7663004acbfd52c1d18e81700 +index 000000000..716970abb --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_mem.c @@ -0,0 +1,107 @@ @@ -241320,7 +241312,7 @@ index 0000000000000000000000000000000000000000..716970abb8c4ffe7663004acbfd52c1d +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 100644 -index 0000000000000000000000000000000000000000..3a7ade2831b3d86f1b2aacb70d57d88dea96b5d0 +index 000000000..3a7ade283 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_resultset.c @@ -0,0 +1,163 @@ @@ -241489,7 +241481,7 @@ index 0000000000000000000000000000000000000000..3a7ade2831b3d86f1b2aacb70d57d88d +} 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 100644 -index 0000000000000000000000000000000000000000..4468066f1b27eefb86fa1447b1813d86fe2627b1 +index 000000000..4468066f1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_suite.c @@ -0,0 +1,1216 @@ @@ -242711,7 +242703,7 @@ index 0000000000000000000000000000000000000000..4468066f1b27eefb86fa1447b1813d86 +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 100644 -index 0000000000000000000000000000000000000000..21f5fadcc5f6a6f2c29ec85817167bc5bc423206 +index 000000000..21f5fadcc --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_utils.c @@ -0,0 +1,75 @@ @@ -242792,7 +242784,7 @@ index 0000000000000000000000000000000000000000..21f5fadcc5f6a6f2c29ec85817167bc5 +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 -index 0000000000000000000000000000000000000000..027bc27c9d3ce7c2a31b9fa7b678518f0ef16c03 +index 000000000..027bc27c9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kbuild @@ -0,0 +1,25 @@ @@ -242823,7 +242815,7 @@ index 0000000000000000000000000000000000000000..027bc27c9d3ce7c2a31b9fa7b678518f +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 -index 0000000000000000000000000000000000000000..225ad69c5042ba180bf1bddb28921a77579b9238 +index 000000000..225ad69c5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/build.bp @@ -0,0 +1,43 @@ @@ -242872,7 +242864,7 @@ index 0000000000000000000000000000000000000000..225ad69c5042ba180bf1bddb28921a77 +} 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 100644 -index 0000000000000000000000000000000000000000..a6f54b61d4ad0026c908c2c3fe348b0eb4ba43e2 +index 000000000..a6f54b61d --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c @@ -0,0 +1,965 @@ @@ -243843,7 +243835,7 @@ index 0000000000000000000000000000000000000000..a6f54b61d4ad0026c908c2c3fe348b0e +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 100644 -index 0000000000000000000000000000000000000000..a716b9f701353cc87b1865a8157ea27d9ad39a08 +index 000000000..a716b9f70 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h @@ -0,0 +1,154 @@ @@ -244003,7 +243995,7 @@ index 0000000000000000000000000000000000000000..a716b9f701353cc87b1865a8157ea27d +#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 -index 0000000000000000000000000000000000000000..213d6d5ea31782ec8d2c3ee1dd2fa24a05539be7 +index 000000000..213d6d5ea --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kbuild @@ -0,0 +1,25 @@ @@ -244034,7 +244026,7 @@ index 0000000000000000000000000000000000000000..213d6d5ea31782ec8d2c3ee1dd2fa24a +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 -index 0000000000000000000000000000000000000000..155875b9d5cc4ff48c23642ae435839d2a3f1ea7 +index 000000000..155875b9d --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/build.bp @@ -0,0 +1,42 @@ @@ -244082,7 +244074,7 @@ index 0000000000000000000000000000000000000000..155875b9d5cc4ff48c23642ae435839d +} 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 100644 -index 0000000000000000000000000000000000000000..f2a014d9b5ca07b7fb62f5332c502e55d6be9ee8 +index 000000000..f2a014d9b --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c @@ -0,0 +1,283 @@ @@ -244371,7 +244363,7 @@ index 0000000000000000000000000000000000000000..f2a014d9b5ca07b7fb62f5332c502e55 +MODULE_VERSION("1.0"); diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/Kbuild b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..e9bff98b88b6f7d5be5bfcd8763a1a3488171487 +index 000000000..e9bff98b8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/Kbuild @@ -0,0 +1,25 @@ @@ -244402,7 +244394,7 @@ index 0000000000000000000000000000000000000000..e9bff98b88b6f7d5be5bfcd8763a1a34 +endif diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/build.bp b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/build.bp new file mode 100755 -index 0000000000000000000000000000000000000000..8b995f8a0a07c37f4b5b562a64b74c5c4ed0f9a2 +index 000000000..8b995f8a0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/build.bp @@ -0,0 +1,41 @@ @@ -244449,7 +244441,7 @@ index 0000000000000000000000000000000000000000..8b995f8a0a07c37f4b5b562a64b74c5c +} diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/mali_kutf_mgm_integration_test_main.c b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/mali_kutf_mgm_integration_test_main.c new file mode 100644 -index 0000000000000000000000000000000000000000..5a42bd675c2a79d1806685ff4fea65140421a919 +index 000000000..5a42bd675 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/mali_kutf_mgm_integration_test_main.c @@ -0,0 +1,210 @@ @@ -244665,7 +244657,7 @@ index 0000000000000000000000000000000000000000..5a42bd675c2a79d1806685ff4fea6514 +MODULE_VERSION("1.0"); diff --git a/drivers/gpu/arm/bifrost/thirdparty/Kbuild b/drivers/gpu/arm/bifrost/thirdparty/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..558be077d48353b863893da2775f71242e3b9e78 +index 000000000..558be077d --- /dev/null +++ b/drivers/gpu/arm/bifrost/thirdparty/Kbuild @@ -0,0 +1,21 @@ @@ -244692,7 +244684,7 @@ index 0000000000000000000000000000000000000000..558be077d48353b863893da2775f7124 +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 100644 -index 0000000000000000000000000000000000000000..1e636b9a775960faa7c604f79b7cbf66a67713fc +index 000000000..1e636b9a7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c @@ -0,0 +1,420 @@ @@ -245118,7 +245110,7 @@ index 0000000000000000000000000000000000000000..1e636b9a775960faa7c604f79b7cbf66 +} diff --git a/drivers/gpu/arm/bifrost/tl/Kbuild b/drivers/gpu/arm/bifrost/tl/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..1c684d489d6f59186029a4291a800abcd450a6af +index 000000000..1c684d489 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/Kbuild @@ -0,0 +1,32 @@ @@ -245156,7 +245148,7 @@ index 0000000000000000000000000000000000000000..1c684d489d6f59186029a4291a800abc +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 100644 -index 0000000000000000000000000000000000000000..a6062f170ff98c30b4acc71690b285138e837129 +index 000000000..a6062f170 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_csf.c @@ -0,0 +1,190 @@ @@ -245352,7 +245344,7 @@ index 0000000000000000000000000000000000000000..a6062f170ff98c30b4acc71690b28513 +} 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 100644 -index 0000000000000000000000000000000000000000..9ba89f59f03bb44620aec20ba7fe413d78d30553 +index 000000000..9ba89f59f --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_jm.c @@ -0,0 +1,96 @@ @@ -245454,7 +245446,7 @@ index 0000000000000000000000000000000000000000..9ba89f59f03bb44620aec20ba7fe413d +} 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 100644 -index 0000000000000000000000000000000000000000..930decf8fc278a21594b30e7d5b7058c0b61c421 +index 000000000..930decf8f --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.c @@ -0,0 +1,413 @@ @@ -245873,7 +245865,7 @@ index 0000000000000000000000000000000000000000..930decf8fc278a21594b30e7d5b7058c +#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 100644 -index 0000000000000000000000000000000000000000..62be6c64c8504159711cc152edb3f99edc9f5e7e +index 000000000..62be6c64c --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.h @@ -0,0 +1,128 @@ @@ -246007,7 +245999,7 @@ index 0000000000000000000000000000000000000000..62be6c64c8504159711cc152edb3f99e +#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 100644 -index 0000000000000000000000000000000000000000..ae570064e7d018c6ea658473620d417e59fb6ec6 +index 000000000..ae570064e --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_io.c @@ -0,0 +1,465 @@ @@ -246478,7 +246470,7 @@ index 0000000000000000000000000000000000000000..ae570064e7d018c6ea658473620d417e +} 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 100644 -index 0000000000000000000000000000000000000000..de30bccc7cca5fe05ced0aa64b2798ca43785de6 +index 000000000..de30bccc7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_priv.h @@ -0,0 +1,103 @@ @@ -246587,7 +246579,7 @@ index 0000000000000000000000000000000000000000..de30bccc7cca5fe05ced0aa64b2798ca +#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 100644 -index 0000000000000000000000000000000000000000..b6aaadedc6b92b8fa6c7d1d834ba5ca4d3bf683a +index 000000000..b6aaadedc --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tl_serialize.h @@ -0,0 +1,123 @@ @@ -246716,7 +246708,7 @@ index 0000000000000000000000000000000000000000..b6aaadedc6b92b8fa6c7d1d834ba5ca4 +#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 100644 -index 0000000000000000000000000000000000000000..47059deb4da2919e55f1603e75102968cc54383d +index 000000000..47059deb4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.c @@ -0,0 +1,313 @@ @@ -247035,7 +247027,7 @@ index 0000000000000000000000000000000000000000..47059deb4da2919e55f1603e75102968 +} 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 100644 -index 0000000000000000000000000000000000000000..c1428495b11c019c4cfac67daf5266724500939d +index 000000000..c1428495b --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.h @@ -0,0 +1,168 @@ @@ -247209,7 +247201,7 @@ index 0000000000000000000000000000000000000000..c1428495b11c019c4cfac67daf526672 +#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 100644 -index 0000000000000000000000000000000000000000..f62c755835669a7a09e2be17544908db924ceaf2 +index 000000000..f62c75583 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.c @@ -0,0 +1,4223 @@ @@ -251438,7 +251430,7 @@ index 0000000000000000000000000000000000000000..f62c755835669a7a09e2be17544908db +/* 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 100644 -index 0000000000000000000000000000000000000000..06e4ca4a6bc2b63f66ede34ab911dd6fad30c370 +index 000000000..06e4ca4a6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.h @@ -0,0 +1,4382 @@ @@ -255826,14 +255818,14 @@ index 0000000000000000000000000000000000000000..06e4ca4a6bc2b63f66ede34ab911dd6f +#endif diff --git a/drivers/gpu/arm/mali400/.gitignore b/drivers/gpu/arm/mali400/.gitignore new file mode 100755 -index 0000000000000000000000000000000000000000..d91c8078a009f4c5cb13f2994d8d71dcd9e4e5f4 +index 000000000..d91c8078a --- /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 -index 0000000000000000000000000000000000000000..dbb7ad3e5d85e21d94a9012394b9239ddaf05755 +index 000000000..dbb7ad3e5 --- /dev/null +++ b/drivers/gpu/arm/mali400/Kbuild @@ -0,0 +1,2 @@ @@ -255841,14 +255833,14 @@ index 0000000000000000000000000000000000000000..dbb7ad3e5d85e21d94a9012394b9239d +obj-y += mali/ diff --git a/drivers/gpu/arm/mali400/mali/.gitignore b/drivers/gpu/arm/mali400/mali/.gitignore new file mode 100755 -index 0000000000000000000000000000000000000000..6b1a3ed27a7ff39f74297b740a761f7a8b727320 +index 000000000..6b1a3ed27 --- /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 -index 0000000000000000000000000000000000000000..7390ab758f225ecc132bac0aa8532c9fbf9bc059 +index 000000000..7390ab758 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/Kbuild @@ -0,0 +1,254 @@ @@ -256108,7 +256100,7 @@ index 0000000000000000000000000000000000000000..7390ab758f225ecc132bac0aa8532c9f + @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 100644 -index 0000000000000000000000000000000000000000..082919d91825585b9e956951568ab1ed58bfeedd +index 000000000..082919d91 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/Kconfig @@ -0,0 +1,119 @@ @@ -256233,7 +256225,7 @@ index 0000000000000000000000000000000000000000..082919d91825585b9e956951568ab1ed + If unsure, say N. diff --git a/drivers/gpu/arm/mali400/mali/Makefile b/drivers/gpu/arm/mali400/mali/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..0b91321a5af15665c8de41111a00ff5ae27d5bab +index 000000000..0b91321a5 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/Makefile @@ -0,0 +1,206 @@ @@ -256445,7 +256437,7 @@ index 0000000000000000000000000000000000000000..0b91321a5af15665c8de41111a00ff5a +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 100644 -index 0000000000000000000000000000000000000000..79a418c36ccb26e2abff175d460249cbf96903e3 +index 000000000..79a418c36 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c @@ -0,0 +1,142 @@ @@ -256593,7 +256585,7 @@ index 0000000000000000000000000000000000000000..79a418c36ccb26e2abff175d460249cb +} 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 100644 -index 0000000000000000000000000000000000000000..0475b7171d8da31be8d39998841275a3a07c6d7d +index 000000000..0475b7171 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.h @@ -0,0 +1,57 @@ @@ -256656,7 +256648,7 @@ index 0000000000000000000000000000000000000000..0475b7171d8da31be8d39998841275a3 +#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 100644 -index 0000000000000000000000000000000000000000..5bed27a8c5c9536584ff839cb7a6275ef141749e +index 000000000..5bed27a8c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c @@ -0,0 +1,139 @@ @@ -256801,7 +256793,7 @@ index 0000000000000000000000000000000000000000..5bed27a8c5c9536584ff839cb7a6275e +} 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 100644 -index 0000000000000000000000000000000000000000..c9e6e058ea8e4b679b3f60e8ac36f8c419877257 +index 000000000..c9e6e058e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h @@ -0,0 +1,30 @@ @@ -256837,7 +256829,7 @@ index 0000000000000000000000000000000000000000..c9e6e058ea8e4b679b3f60e8ac36f8c4 + 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 100644 -index 0000000000000000000000000000000000000000..99b7f360768b09ad8c31dcea45b642a2664797eb +index 000000000..99b7f3607 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.c @@ -0,0 +1,213 @@ @@ -257056,7 +257048,7 @@ index 0000000000000000000000000000000000000000..99b7f360768b09ad8c31dcea45b642a2 +} 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 100644 -index 0000000000000000000000000000000000000000..a7ecf41471d8b0d9200cc6fe8cfa8a38099d7bbb +index 000000000..a7ecf4147 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h @@ -0,0 +1,45 @@ @@ -257107,7 +257099,7 @@ index 0000000000000000000000000000000000000000..a7ecf41471d8b0d9200cc6fe8cfa8a38 +#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 100644 -index 0000000000000000000000000000000000000000..55b21a410754e017d48bc12c72605e086dfafb9d +index 000000000..55b21a410 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c @@ -0,0 +1,308 @@ @@ -257421,7 +257413,7 @@ index 0000000000000000000000000000000000000000..55b21a410754e017d48bc12c72605e08 + 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 100644 -index 0000000000000000000000000000000000000000..662348c4e6ac4815f61590ccb7a73b805906a77d +index 000000000..662348c4e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.h @@ -0,0 +1,34 @@ @@ -257461,7 +257453,7 @@ index 0000000000000000000000000000000000000000..662348c4e6ac4815f61590ccb7a73b80 +#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 100644 -index 0000000000000000000000000000000000000000..0cf1ec0b0d028a927b3ea5c4f06190abd58ea687 +index 000000000..0cf1ec0b0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_executor.c @@ -0,0 +1,2707 @@ @@ -260174,7 +260166,7 @@ index 0000000000000000000000000000000000000000..0cf1ec0b0d028a927b3ea5c4f06190ab +} 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 100644 -index 0000000000000000000000000000000000000000..4224d6a6cdc4827dc8eac78d46b56487f341f0a0 +index 000000000..4224d6a6c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_executor.h @@ -0,0 +1,102 @@ @@ -260282,7 +260274,7 @@ index 0000000000000000000000000000000000000000..4224d6a6cdc4827dc8eac78d46b56487 +#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 100644 -index 0000000000000000000000000000000000000000..7d3d4aff7c3f6e005f6ba3ebec9cfd2b32c3beff +index 000000000..7d3d4aff7 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp.c @@ -0,0 +1,357 @@ @@ -260645,7 +260637,7 @@ index 0000000000000000000000000000000000000000..7d3d4aff7c3f6e005f6ba3ebec9cfd2b +} 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 100644 -index 0000000000000000000000000000000000000000..3156310f21c7fab316ebd5164d22c6da592c5bb8 +index 000000000..3156310f2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp.h @@ -0,0 +1,127 @@ @@ -260778,7 +260770,7 @@ index 0000000000000000000000000000000000000000..3156310f21c7fab316ebd5164d22c6da +#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 100644 -index 0000000000000000000000000000000000000000..5d4d9f2530d36002877543140d91f385897abebb +index 000000000..5d4d9f253 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c @@ -0,0 +1,306 @@ @@ -261090,7 +261082,7 @@ index 0000000000000000000000000000000000000000..5d4d9f2530d36002877543140d91f385 +} 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 100644 -index 0000000000000000000000000000000000000000..b84333f9f810e243ca7a575871fc11f74a85ef99 +index 000000000..b84333f9f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.h @@ -0,0 +1,324 @@ @@ -261420,7 +261412,7 @@ index 0000000000000000000000000000000000000000..b84333f9f810e243ca7a575871fc11f7 +#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 100644 -index 0000000000000000000000000000000000000000..47979a2f1a35e30c052e15d8a04ab7e375396e3e +index 000000000..47979a2f1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_group.c @@ -0,0 +1,1875 @@ @@ -263301,7 +263293,7 @@ index 0000000000000000000000000000000000000000..47979a2f1a35e30c052e15d8a04ab7e3 +#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 100644 -index 0000000000000000000000000000000000000000..32481e4a6748de486f0f124ddc3d494894f40312 +index 000000000..32481e4a6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_group.h @@ -0,0 +1,460 @@ @@ -263767,7 +263759,7 @@ index 0000000000000000000000000000000000000000..32481e4a6748de486f0f124ddc3d4948 +#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 100644 -index 0000000000000000000000000000000000000000..a813816e998d0cb3e0d32e6230ce62f39fdba3e1 +index 000000000..a813816e9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c @@ -0,0 +1,47 @@ @@ -263820,7 +263812,7 @@ index 0000000000000000000000000000000000000000..a813816e998d0cb3e0d32e6230ce62f3 +} 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 100644 -index 0000000000000000000000000000000000000000..38d96e240a20be58d352ae19fb8164f50eefa5fa +index 000000000..38d96e240 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.h @@ -0,0 +1,111 @@ @@ -263937,7 +263929,7 @@ index 0000000000000000000000000000000000000000..38d96e240a20be58d352ae19fb8164f5 +#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 100644 -index 0000000000000000000000000000000000000000..6a8f0f0116a45519124a5e5df97ccd2dbc7200d3 +index 000000000..6a8f0f011 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h @@ -0,0 +1,181 @@ @@ -264124,7 +264116,7 @@ index 0000000000000000000000000000000000000000..6a8f0f0116a45519124a5e5df97ccd2d +#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 100644 -index 0000000000000000000000000000000000000000..87f97b7102577997d616017b6fbaaf5b776b53cc +index 000000000..87f97b710 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c @@ -0,0 +1,1349 @@ @@ -265479,7 +265471,7 @@ index 0000000000000000000000000000000000000000..87f97b7102577997d616017b6fbaaf5b +#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 100644 -index 0000000000000000000000000000000000000000..c471fc95510795d2efe9bd1b82865d00e6362e1a +index 000000000..c471fc955 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h @@ -0,0 +1,57 @@ @@ -265542,7 +265534,7 @@ index 0000000000000000000000000000000000000000..c471fc95510795d2efe9bd1b82865d00 +#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 100644 -index 0000000000000000000000000000000000000000..d1b8dc3b0b0eafde6d37bff2b08d22ae1f2e54a8 +index 000000000..d1b8dc3b0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c @@ -0,0 +1,440 @@ @@ -265988,7 +265980,7 @@ index 0000000000000000000000000000000000000000..d1b8dc3b0b0eafde6d37bff2b08d22ae +} 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 100644 -index 0000000000000000000000000000000000000000..06f585dcb2388a12675c89db1685029c8344d2dc +index 000000000..06f585dcb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.h @@ -0,0 +1,72 @@ @@ -266066,7 +266058,7 @@ index 0000000000000000000000000000000000000000..06f585dcb2388a12675c89db1685029c +#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 100644 -index 0000000000000000000000000000000000000000..dd44e5e7fa0329fdebb6ff58c428300e0958f880 +index 000000000..dd44e5e7f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c @@ -0,0 +1,45 @@ @@ -266117,7 +266109,7 @@ index 0000000000000000000000000000000000000000..dd44e5e7fa0329fdebb6ff58c428300e + 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 100644 -index 0000000000000000000000000000000000000000..fe33f561b2aa52509cd27a03970cf7cbfc3b9057 +index 000000000..fe33f561b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c @@ -0,0 +1,534 @@ @@ -266657,7 +266649,7 @@ index 0000000000000000000000000000000000000000..fe33f561b2aa52509cd27a03970cf7cb +} 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 100644 -index 0000000000000000000000000000000000000000..c48a8844075f9fd0aa464412e59d944a5012d391 +index 000000000..c48a88440 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.h @@ -0,0 +1,124 @@ @@ -266787,7 +266779,7 @@ index 0000000000000000000000000000000000000000..c48a8844075f9fd0aa464412e59d944a +#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 100644 -index 0000000000000000000000000000000000000000..eb95998f1469640e821fcd198761d537d95e69a0 +index 000000000..eb95998f1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c @@ -0,0 +1,68 @@ @@ -266861,7 +266853,7 @@ index 0000000000000000000000000000000000000000..eb95998f1469640e821fcd198761d537 +} 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 100644 -index 0000000000000000000000000000000000000000..05013f46f9019d11daf6f0eb581dfeadeb9700f0 +index 000000000..05013f46f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.h @@ -0,0 +1,19 @@ @@ -266886,7 +266878,7 @@ index 0000000000000000000000000000000000000000..05013f46f9019d11daf6f0eb581dfead +#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 100644 -index 0000000000000000000000000000000000000000..b82486fa66c0f28974a5477b6e695906a42a976d +index 000000000..b82486fa6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu.c @@ -0,0 +1,433 @@ @@ -267325,7 +267317,7 @@ index 0000000000000000000000000000000000000000..b82486fa66c0f28974a5477b6e695906 +#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 100644 -index 0000000000000000000000000000000000000000..6ed48585f3d246d2ff4134c8e425ffa09f5ced9d +index 000000000..6ed48585f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu.h @@ -0,0 +1,124 @@ @@ -267455,7 +267447,7 @@ index 0000000000000000000000000000000000000000..6ed48585f3d246d2ff4134c8e425ffa0 +#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 100644 -index 0000000000000000000000000000000000000000..9ad3e8970b7d007a4743b0cc5e45e71fff08be94 +index 000000000..9ad3e8970 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c @@ -0,0 +1,495 @@ @@ -267956,7 +267948,7 @@ index 0000000000000000000000000000000000000000..9ad3e8970b7d007a4743b0cc5e45e71f +} 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 100644 -index 0000000000000000000000000000000000000000..3fdf07210259a386f97858d8de11667f5993c6ca +index 000000000..3fdf07210 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.h @@ -0,0 +1,110 @@ @@ -268072,7 +268064,7 @@ index 0000000000000000000000000000000000000000..3fdf07210259a386f97858d8de11667f +#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 100644 -index 0000000000000000000000000000000000000000..9ade362d6b2830787814c59ade1299a95824fcb3 +index 000000000..9ade362d6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk.h @@ -0,0 +1,1389 @@ @@ -269467,7 +269459,7 @@ index 0000000000000000000000000000000000000000..9ade362d6b2830787814c59ade1299a9 +#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 100644 -index 0000000000000000000000000000000000000000..bb1831753a40fb2f6a57d2890708a98627f945a7 +index 000000000..bb1831753 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h @@ -0,0 +1,162 @@ @@ -269635,7 +269627,7 @@ index 0000000000000000000000000000000000000000..bb1831753a40fb2f6a57d2890708a986 +#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 100644 -index 0000000000000000000000000000000000000000..9af2d7d4d621dd3d9f7c1fb85ee501f748bdc9c4 +index 000000000..9af2d7d4d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h @@ -0,0 +1,273 @@ @@ -269914,7 +269906,7 @@ index 0000000000000000000000000000000000000000..9af2d7d4d621dd3d9f7c1fb85ee501f7 +#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 100644 -index 0000000000000000000000000000000000000000..ebcc277fa393d922ff9f4f5558268a0b4fae7c59 +index 000000000..ebcc277fa --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h @@ -0,0 +1,157 @@ @@ -270077,7 +270069,7 @@ index 0000000000000000000000000000000000000000..ebcc277fa393d922ff9f4f5558268a0b +#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 100644 -index 0000000000000000000000000000000000000000..6e4583db1c80d90a5f20556810c7689592002101 +index 000000000..6e4583db1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h @@ -0,0 +1,146 @@ @@ -270229,7 +270221,7 @@ index 0000000000000000000000000000000000000000..6e4583db1c80d90a5f20556810c76895 + 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 100644 -index 0000000000000000000000000000000000000000..b6fa94ce16b3ceb87c54a1392f743a1354882175 +index 000000000..b6fa94ce1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h @@ -0,0 +1,471 @@ @@ -270706,7 +270698,7 @@ index 0000000000000000000000000000000000000000..b6fa94ce16b3ceb87c54a1392f743a13 +#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 100644 -index 0000000000000000000000000000000000000000..3989a33aeaef09557b9bab1dfdc7ce133073f568 +index 000000000..3989a33ae --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm.c @@ -0,0 +1,1362 @@ @@ -272074,7 +272066,7 @@ index 0000000000000000000000000000000000000000..3989a33aeaef09557b9bab1dfdc7ce13 +} 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 100644 -index 0000000000000000000000000000000000000000..dac69958e034f4ca4c488d6a564a4a5bd9c0bc55 +index 000000000..dac69958e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm.h @@ -0,0 +1,91 @@ @@ -272171,7 +272163,7 @@ index 0000000000000000000000000000000000000000..dac69958e034f4ca4c488d6a564a4a5b +#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 100644 -index 0000000000000000000000000000000000000000..8290f7d88f6a20e5e8f6e5fb80723c08baab780a +index 000000000..8290f7d88 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.c @@ -0,0 +1,209 @@ @@ -272386,7 +272378,7 @@ index 0000000000000000000000000000000000000000..8290f7d88f6a20e5e8f6e5fb80723c08 +#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 100644 -index 0000000000000000000000000000000000000000..5776abe39f3db9689b034bfab15834ab1cebac0c +index 000000000..5776abe39 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h @@ -0,0 +1,104 @@ @@ -272496,7 +272488,7 @@ index 0000000000000000000000000000000000000000..5776abe39f3db9689b034bfab15834ab +#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 100644 -index 0000000000000000000000000000000000000000..cf74823230f754f6e4a2835a31daccf22120b594 +index 000000000..cf7482323 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c @@ -0,0 +1,255 @@ @@ -272757,7 +272749,7 @@ index 0000000000000000000000000000000000000000..cf74823230f754f6e4a2835a31daccf2 +} 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 100644 -index 0000000000000000000000000000000000000000..2b136b0de4e38d70112b26fe76379060d1ecc984 +index 000000000..2b136b0de --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.h @@ -0,0 +1,74 @@ @@ -272837,7 +272829,7 @@ index 0000000000000000000000000000000000000000..2b136b0de4e38d70112b26fe76379060 +#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 100644 -index 0000000000000000000000000000000000000000..6f0af59f6fd472d5421168cedc256aa5c8777a7b +index 000000000..6f0af59f6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pmu.c @@ -0,0 +1,270 @@ @@ -273113,7 +273105,7 @@ index 0000000000000000000000000000000000000000..6f0af59f6fd472d5421168cedc256aa5 +} 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 100644 -index 0000000000000000000000000000000000000000..5b856240fdac99cae1be401ebfbf8b23c375a875 +index 000000000..5b856240f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pmu.h @@ -0,0 +1,123 @@ @@ -273242,7 +273234,7 @@ index 0000000000000000000000000000000000000000..5b856240fdac99cae1be401ebfbf8b23 +#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 100644 -index 0000000000000000000000000000000000000000..2dd8b8766f8ef81c21c2e0e7465da6680bf5cc1e +index 000000000..2dd8b8766 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp.c @@ -0,0 +1,502 @@ @@ -273750,7 +273742,7 @@ index 0000000000000000000000000000000000000000..2dd8b8766f8ef81c21c2e0e7465da668 +#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 100644 -index 0000000000000000000000000000000000000000..f98b29866ffa7807970299bc07c48f3702748b2d +index 000000000..f98b29866 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp.h @@ -0,0 +1,138 @@ @@ -273894,7 +273886,7 @@ index 0000000000000000000000000000000000000000..f98b29866ffa7807970299bc07c48f37 +#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 100644 -index 0000000000000000000000000000000000000000..b0216d4c1ac811d2b0c38b8a2ba3836114425f75 +index 000000000..b0216d4c1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c @@ -0,0 +1,316 @@ @@ -274216,7 +274208,7 @@ index 0000000000000000000000000000000000000000..b0216d4c1ac811d2b0c38b8a2ba38361 +} 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 100644 -index 0000000000000000000000000000000000000000..d0331f398ff98085444d5a2187dca521ffcb1612 +index 000000000..d0331f398 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.h @@ -0,0 +1,594 @@ @@ -274816,7 +274808,7 @@ index 0000000000000000000000000000000000000000..d0331f398ff98085444d5a2187dca521 +#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 100644 -index 0000000000000000000000000000000000000000..b5e6cfddbb0eb318567f866e2c18c0e77ed2c77c +index 000000000..b5e6cfddb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c @@ -0,0 +1,1548 @@ @@ -276370,7 +276362,7 @@ index 0000000000000000000000000000000000000000..b5e6cfddbb0eb318567f866e2c18c0e7 +} 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 100644 -index 0000000000000000000000000000000000000000..de81a421ea9a6a34b6a6129204e38f66406a0bb1 +index 000000000..de81a421e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.h @@ -0,0 +1,131 @@ @@ -276507,7 +276499,7 @@ index 0000000000000000000000000000000000000000..de81a421ea9a6a34b6a6129204e38f66 +#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 100644 -index 0000000000000000000000000000000000000000..ba1d71d01d460c9d2bb787093280c7b383a737a9 +index 000000000..ba1d71d01 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h @@ -0,0 +1,29 @@ @@ -276542,7 +276534,7 @@ index 0000000000000000000000000000000000000000..ba1d71d01d460c9d2bb787093280c7b3 +#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 100644 -index 0000000000000000000000000000000000000000..7504fb108779fe3d6515b23a4b2813af0fe1b0b3 +index 000000000..7504fb108 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_session.c @@ -0,0 +1,155 @@ @@ -276703,7 +276695,7 @@ index 0000000000000000000000000000000000000000..7504fb108779fe3d6515b23a4b2813af +} 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 100644 -index 0000000000000000000000000000000000000000..da8b9927ee60c8baa3d8ef0da808dfed9b5f7824 +index 000000000..da8b9927e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_session.h @@ -0,0 +1,136 @@ @@ -276845,7 +276837,7 @@ index 0000000000000000000000000000000000000000..da8b9927ee60c8baa3d8ef0da808dfed +#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 100644 -index 0000000000000000000000000000000000000000..35cd830bc83ac3dab1a27e2465d8b916dcaa4be5 +index 000000000..35cd830bc --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c @@ -0,0 +1,438 @@ @@ -277289,7 +277281,7 @@ index 0000000000000000000000000000000000000000..35cd830bc83ac3dab1a27e2465d8b916 +} 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 100644 -index 0000000000000000000000000000000000000000..018ef4c527d950c47a48ac05e47f16e05d55f8d2 +index 000000000..018ef4c52 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h @@ -0,0 +1,190 @@ @@ -277485,7 +277477,7 @@ index 0000000000000000000000000000000000000000..018ef4c527d950c47a48ac05e47f16e0 +#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 100644 -index 0000000000000000000000000000000000000000..f829e99f02ab4ba061f13eeeed1e0f62faee274b +index 000000000..f829e99f0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c @@ -0,0 +1,77 @@ @@ -277568,7 +277560,7 @@ index 0000000000000000000000000000000000000000..f829e99f02ab4ba061f13eeeed1e0f62 +} 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 100644 -index 0000000000000000000000000000000000000000..4d788ec1bbe40e27fb1c361de74c89f3821a5284 +index 000000000..4d788ec1b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h @@ -0,0 +1,70 @@ @@ -277644,7 +277636,7 @@ index 0000000000000000000000000000000000000000..4d788ec1bbe40e27fb1c361de74c89f3 +#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 100644 -index 0000000000000000000000000000000000000000..ffffee9306ce87120c8475795f7e6952b8da0807 +index 000000000..ffffee930 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline.c @@ -0,0 +1,1964 @@ @@ -279614,7 +279606,7 @@ index 0000000000000000000000000000000000000000..ffffee9306ce87120c8475795f7e6952 +#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 100644 -index 0000000000000000000000000000000000000000..3e8bfc8fb7331c875c723615312546f3f341cf4d +index 000000000..3e8bfc8fb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline.h @@ -0,0 +1,587 @@ @@ -280207,7 +280199,7 @@ index 0000000000000000000000000000000000000000..3e8bfc8fb7331c875c723615312546f3 +#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 100644 -index 0000000000000000000000000000000000000000..1ab13f50997f3746848d9fdc9410cb87b427d4f1 +index 000000000..1ab13f509 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c @@ -0,0 +1,218 @@ @@ -280431,7 +280423,7 @@ index 0000000000000000000000000000000000000000..1ab13f50997f3746848d9fdc9410cb87 +} 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 100644 -index 0000000000000000000000000000000000000000..9da12baeef1accd799c616d0653341ba4e93b709 +index 000000000..9da12baee --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h @@ -0,0 +1,67 @@ @@ -280504,7 +280496,7 @@ index 0000000000000000000000000000000000000000..9da12baeef1accd799c616d0653341ba +#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 100644 -index 0000000000000000000000000000000000000000..bb7f6a04e8bddf5039d3809082786a9dc6a48613 +index 000000000..bb7f6a04e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c @@ -0,0 +1,179 @@ @@ -280689,7 +280681,7 @@ index 0000000000000000000000000000000000000000..bb7f6a04e8bddf5039d3809082786a9d +#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 100644 -index 0000000000000000000000000000000000000000..65e368ae7c9e4cb0bf2048e8a043b770f93dc825 +index 000000000..65e368ae7 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h @@ -0,0 +1,51 @@ @@ -280746,7 +280738,7 @@ index 0000000000000000000000000000000000000000..65e368ae7c9e4cb0bf2048e8a043b770 +#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 100644 -index 0000000000000000000000000000000000000000..55a05c50436a4e380af65c81f4c4362a6ff42dc2 +index 000000000..55a05c504 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_ukk.h @@ -0,0 +1,551 @@ @@ -281303,7 +281295,7 @@ index 0000000000000000000000000000000000000000..55a05c50436a4e380af65c81f4c4362a +#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 100644 -index 0000000000000000000000000000000000000000..1911eff87a72148ea696193413ed0055bf123baf +index 000000000..1911eff87 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c @@ -0,0 +1,147 @@ @@ -281456,7 +281448,7 @@ index 0000000000000000000000000000000000000000..1911eff87a72148ea696193413ed0055 +} 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 100644 -index 0000000000000000000000000000000000000000..da9c0630e37139a54f2fd35196a5a265b7ae9245 +index 000000000..da9c0630e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.h @@ -0,0 +1,39 @@ @@ -281501,7 +281493,7 @@ index 0000000000000000000000000000000000000000..da9c0630e37139a54f2fd35196a5a265 +#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 100644 -index 0000000000000000000000000000000000000000..7df55c951d6ffad3c6855e50ad184b7e5a0e8632 +index 000000000..7df55c951 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard.h @@ -0,0 +1,526 @@ @@ -282033,7 +282025,7 @@ index 0000000000000000000000000000000000000000..7df55c951d6ffad3c6855e50ad184b7e +#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 100644 -index 0000000000000000000000000000000000000000..686708eaef75c740117b35ddce589f3ca69eca39 +index 000000000..686708eae --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h @@ -0,0 +1,97 @@ @@ -282136,7 +282128,7 @@ index 0000000000000000000000000000000000000000..686708eaef75c740117b35ddce589f3c +#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 100644 -index 0000000000000000000000000000000000000000..17d31de931d0aa5e27cd7f32ecab775979a0e07e +index 000000000..17d31de93 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h @@ -0,0 +1,190 @@ @@ -282332,7 +282324,7 @@ index 0000000000000000000000000000000000000000..17d31de931d0aa5e27cd7f32ecab7759 +#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 100644 -index 0000000000000000000000000000000000000000..c1927d1450dc8601dfed7e616bf2c2a30dc9e81c +index 000000000..c1927d145 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h @@ -0,0 +1,305 @@ @@ -282643,7 +282635,7 @@ index 0000000000000000000000000000000000000000..c1927d1450dc8601dfed7e616bf2c2a3 +#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 100644 -index 0000000000000000000000000000000000000000..34656f09b2abba22cb5abaa7e37dd870cebcab15 +index 000000000..34656f09b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h @@ -0,0 +1,1108 @@ @@ -283757,7 +283749,7 @@ index 0000000000000000000000000000000000000000..34656f09b2abba22cb5abaa7e37dd870 +#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 100644 -index 0000000000000000000000000000000000000000..6fafc6777e487103ce807d050b29cc7a957e6846 +index 000000000..6fafc6777 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h @@ -0,0 +1,30 @@ @@ -283793,7 +283785,7 @@ index 0000000000000000000000000000000000000000..6fafc6777e487103ce807d050b29cc7a +#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 100644 -index 0000000000000000000000000000000000000000..7abd1532a29da5f91cf56a0f731e10830fdfdca2 +index 000000000..7abd1532a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c @@ -0,0 +1,368 @@ @@ -284167,7 +284159,7 @@ index 0000000000000000000000000000000000000000..7abd1532a29da5f91cf56a0f731e1083 +} 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 100644 -index 0000000000000000000000000000000000000000..ba7c017d88dcab02b007ed728375c1ecdaf4b5f0 +index 000000000..ba7c017d8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h @@ -0,0 +1,17 @@ @@ -284190,7 +284182,7 @@ index 0000000000000000000000000000000000000000..ba7c017d88dcab02b007ed728375c1ec +#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 100644 -index 0000000000000000000000000000000000000000..95c3ea12d6456e4b31a765bec4c818145190c7fe +index 000000000..95c3ea12d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c @@ -0,0 +1,36 @@ @@ -284232,7 +284224,7 @@ index 0000000000000000000000000000000000000000..95c3ea12d6456e4b31a765bec4c81814 +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 100644 -index 0000000000000000000000000000000000000000..e026e11e4bc57e4fac710c22a4211436533d8faf +index 000000000..e026e11e4 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c @@ -0,0 +1,439 @@ @@ -284677,7 +284669,7 @@ index 0000000000000000000000000000000000000000..e026e11e4bc57e4fac710c22a4211436 +} 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 100644 -index 0000000000000000000000000000000000000000..d44f6d1a892630ea4a91268107c5b84ede60a390 +index 000000000..d44f6d1a8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.h @@ -0,0 +1,124 @@ @@ -284807,7 +284799,7 @@ index 0000000000000000000000000000000000000000..d44f6d1a892630ea4a91268107c5b84e +#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 100644 -index 0000000000000000000000000000000000000000..e13cbad3e513bb925213fa4f9c33918994935fc3 +index 000000000..e13cbad3e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.c @@ -0,0 +1,783 @@ @@ -285596,7 +285588,7 @@ index 0000000000000000000000000000000000000000..e13cbad3e513bb925213fa4f9c339189 +#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 100644 -index 0000000000000000000000000000000000000000..dbb29222ba98e64838db715f9022d239b3629e08 +index 000000000..dbb29222b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h @@ -0,0 +1,191 @@ @@ -285793,7 +285785,7 @@ index 0000000000000000000000000000000000000000..dbb29222ba98e64838db715f9022d239 +#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 100644 -index 0000000000000000000000000000000000000000..10ee220285ffb8be0f26d3dfe1e447d47e8f6ff5 +index 000000000..10ee22028 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c @@ -0,0 +1,1168 @@ @@ -286967,7 +286959,7 @@ index 0000000000000000000000000000000000000000..10ee220285ffb8be0f26d3dfe1e447d4 +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 100644 -index 0000000000000000000000000000000000000000..be754cb15646915ae6905ab27dba4934634ada06 +index 000000000..be754cb15 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h @@ -0,0 +1,36 @@ @@ -287009,7 +287001,7 @@ index 0000000000000000000000000000000000000000..be754cb15646915ae6905ab27dba4934 +#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 100644 -index 0000000000000000000000000000000000000000..7bda438fef50a48596d53bdff30e010379ea4357 +index 000000000..7bda438fe --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c @@ -0,0 +1,1410 @@ @@ -288425,7 +288417,7 @@ index 0000000000000000000000000000000000000000..7bda438fef50a48596d53bdff30e0103 +#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 100644 -index 0000000000000000000000000000000000000000..91580a87c1e1a42f494abc8cd086414c26c38c95 +index 000000000..91580a87c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h @@ -0,0 +1,29 @@ @@ -288460,7 +288452,7 @@ index 0000000000000000000000000000000000000000..91580a87c1e1a42f494abc8cd086414c +#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 100644 -index 0000000000000000000000000000000000000000..222260823c81756616cfcaeb1ff5965beb1013f0 +index 000000000..222260823 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h @@ -0,0 +1,161 @@ @@ -288627,7 +288619,7 @@ index 0000000000000000000000000000000000000000..222260823c81756616cfcaeb1ff5965b + 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 100644 -index 0000000000000000000000000000000000000000..cf3851490d0702d6078dadde94344b9747f8c2d2 +index 000000000..cf3851490 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory.c @@ -0,0 +1,528 @@ @@ -289161,7 +289153,7 @@ index 0000000000000000000000000000000000000000..cf3851490d0702d6078dadde94344b97 + 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 100644 -index 0000000000000000000000000000000000000000..efebbef235d81bdd45046de6f04d715e0f456c6b +index 000000000..efebbef23 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory.h @@ -0,0 +1,143 @@ @@ -289310,7 +289302,7 @@ index 0000000000000000000000000000000000000000..efebbef235d81bdd45046de6f04d715e +#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 100644 -index 0000000000000000000000000000000000000000..bccef35769140d5481cf48d60edadbdea9730cd5 +index 000000000..bccef3576 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c @@ -0,0 +1,362 @@ @@ -289678,7 +289670,7 @@ index 0000000000000000000000000000000000000000..bccef35769140d5481cf48d60edadbde +} 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 100644 -index 0000000000000000000000000000000000000000..70fd9ec25f505bae59d01dca2e5542598cbc2c0c +index 000000000..70fd9ec25 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.h @@ -0,0 +1,58 @@ @@ -289742,7 +289734,7 @@ index 0000000000000000000000000000000000000000..70fd9ec25f505bae59d01dca2e554259 +#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 100644 -index 0000000000000000000000000000000000000000..cd9b6d2f7b67b06aeb61db1cfc64cb244d5931d8 +index 000000000..cd9b6d2f7 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c @@ -0,0 +1,776 @@ @@ -290524,7 +290516,7 @@ index 0000000000000000000000000000000000000000..cd9b6d2f7b67b06aeb61db1cfc64cb24 +} 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 100644 -index 0000000000000000000000000000000000000000..5f83a37fc8f86ce5c3b120ffd546765aae2e2ad6 +index 000000000..5f83a37fc --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h @@ -0,0 +1,48 @@ @@ -290578,7 +290570,7 @@ index 0000000000000000000000000000000000000000..5f83a37fc8f86ce5c3b120ffd546765a + 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 100644 -index 0000000000000000000000000000000000000000..a9db577cb8518cdfd7e12723c3dd72808775c3ec +index 000000000..a9db577cb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.c @@ -0,0 +1,262 @@ @@ -290846,7 +290838,7 @@ index 0000000000000000000000000000000000000000..a9db577cb8518cdfd7e12723c3dd7280 + 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 100644 -index 0000000000000000000000000000000000000000..defa08d52a4689ebb419925869bef463db83a1a5 +index 000000000..defa08d52 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h @@ -0,0 +1,64 @@ @@ -290916,7 +290908,7 @@ index 0000000000000000000000000000000000000000..defa08d52a4689ebb419925869bef463 +#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 100644 -index 0000000000000000000000000000000000000000..1f4565127a6bf2fcaaa33d8068586899c22f6ee9 +index 000000000..1f4565127 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c @@ -0,0 +1,369 @@ @@ -291291,7 +291283,7 @@ index 0000000000000000000000000000000000000000..1f4565127a6bf2fcaaa33d8068586899 +} 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 100644 -index 0000000000000000000000000000000000000000..a9b2870389ffb1cf24d512151a9ef90a403f5e61 +index 000000000..a9b287038 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.h @@ -0,0 +1,53 @@ @@ -291350,7 +291342,7 @@ index 0000000000000000000000000000000000000000..a9b2870389ffb1cf24d512151a9ef90a +#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 100644 -index 0000000000000000000000000000000000000000..76018b7ab90bed2e564eb80150cff351dd954279 +index 000000000..76018b7ab --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c @@ -0,0 +1,89 @@ @@ -291445,7 +291437,7 @@ index 0000000000000000000000000000000000000000..76018b7ab90bed2e564eb80150cff351 + 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 100644 -index 0000000000000000000000000000000000000000..2db178d96233d4a498918ee6701dc20182535cb4 +index 000000000..2db178d96 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h @@ -0,0 +1,29 @@ @@ -291480,7 +291472,7 @@ index 0000000000000000000000000000000000000000..2db178d96233d4a498918ee6701dc201 +#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 100644 -index 0000000000000000000000000000000000000000..6c0a2e9a8a14c13734a0f54ebc91a3ca3e15d259 +index 000000000..6c0a2e9a8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c @@ -0,0 +1,992 @@ @@ -292478,7 +292470,7 @@ index 0000000000000000000000000000000000000000..6c0a2e9a8a14c13734a0f54ebc91a3ca +} 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 100644 -index 0000000000000000000000000000000000000000..23d8cde753a114c2b24a0cd9256ae30d7bbdfe38 +index 000000000..23d8cde75 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h @@ -0,0 +1,51 @@ @@ -292535,7 +292527,7 @@ index 0000000000000000000000000000000000000000..23d8cde753a114c2b24a0cd9256ae30d + 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 100644 -index 0000000000000000000000000000000000000000..277534fc1b49e8205a56def504d975063a7b9b0d +index 000000000..277534fc1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c @@ -0,0 +1,810 @@ @@ -293351,7 +293343,7 @@ index 0000000000000000000000000000000000000000..277534fc1b49e8205a56def504d97506 +} 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 100644 -index 0000000000000000000000000000000000000000..8c9b35d0b2308e76ef0c001d71dace47d14d0740 +index 000000000..8c9b35d0b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h @@ -0,0 +1,54 @@ @@ -293411,7 +293403,7 @@ index 0000000000000000000000000000000000000000..8c9b35d0b2308e76ef0c001d71dace47 +#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 100644 -index 0000000000000000000000000000000000000000..63506bfbe9fec182aad5e1a61e2e6f311951cb1f +index 000000000..63506bfbe --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c @@ -0,0 +1,170 @@ @@ -293587,7 +293579,7 @@ index 0000000000000000000000000000000000000000..63506bfbe9fec182aad5e1a61e2e6f31 + 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 100644 -index 0000000000000000000000000000000000000000..48691d4790fe8895fb8660e422acfedcfb14da1d +index 000000000..48691d479 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h @@ -0,0 +1,30 @@ @@ -293623,7 +293615,7 @@ index 0000000000000000000000000000000000000000..48691d4790fe8895fb8660e422acfedc +#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 100644 -index 0000000000000000000000000000000000000000..d682785b9673f0eea8f2a75894e1a5b7a6966510 +index 000000000..d682785b9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c @@ -0,0 +1,943 @@ @@ -294572,7 +294564,7 @@ index 0000000000000000000000000000000000000000..d682785b9673f0eea8f2a75894e1a5b7 +#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 100644 -index 0000000000000000000000000000000000000000..5810960e204aac293bf2556ea32dffe92e4c7f1b +index 000000000..5810960e2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h @@ -0,0 +1,121 @@ @@ -294699,7 +294691,7 @@ index 0000000000000000000000000000000000000000..5810960e204aac293bf2556ea32dffe9 + 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 100644 -index 0000000000000000000000000000000000000000..33db40929642014a04afa552650635a8db8ed599 +index 000000000..33db40929 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_types.h @@ -0,0 +1,219 @@ @@ -294924,7 +294916,7 @@ index 0000000000000000000000000000000000000000..33db40929642014a04afa552650635a8 +#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 100644 -index 0000000000000000000000000000000000000000..666d4b0fb1cdec328a35e9a825c2a78ff0ee3b0f +index 000000000..666d4b0fb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.c @@ -0,0 +1,154 @@ @@ -295084,7 +295076,7 @@ index 0000000000000000000000000000000000000000..666d4b0fb1cdec328a35e9a825c2a78f + 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 100644 -index 0000000000000000000000000000000000000000..c314c8dcbf1c3b9b81fcd4f7cba4f2c5fc5da001 +index 000000000..c314c8dcb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h @@ -0,0 +1,29 @@ @@ -295119,7 +295111,7 @@ index 0000000000000000000000000000000000000000..c314c8dcbf1c3b9b81fcd4f7cba4f2c5 +#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 100644 -index 0000000000000000000000000000000000000000..8e13e923c3fbb6f1fb772135865cd16a24e2b7c6 +index 000000000..8e13e923c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c @@ -0,0 +1,158 @@ @@ -295283,7 +295275,7 @@ index 0000000000000000000000000000000000000000..8e13e923c3fbb6f1fb772135865cd16a +} 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 100644 -index 0000000000000000000000000000000000000000..33ac99509740a177c206b1ea60111fc36b25f174 +index 000000000..33ac99509 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h @@ -0,0 +1,20 @@ @@ -295309,7 +295301,7 @@ index 0000000000000000000000000000000000000000..33ac99509740a177c206b1ea60111fc3 +#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 100644 -index 0000000000000000000000000000000000000000..0b31e3a234325bd5f71cb416412747f5e6e19dc1 +index 000000000..0b31e3a23 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c @@ -0,0 +1,127 @@ @@ -295442,7 +295434,7 @@ index 0000000000000000000000000000000000000000..0b31e3a234325bd5f71cb416412747f5 + 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 100644 -index 0000000000000000000000000000000000000000..fd03ed9f2bbb4e2b931c2a0112b8b2cd2be1b6b9 +index 000000000..fd03ed9f2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h @@ -0,0 +1,35 @@ @@ -295483,7 +295475,7 @@ index 0000000000000000000000000000000000000000..fd03ed9f2bbb4e2b931c2a0112b8b2cd +#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 100644 -index 0000000000000000000000000000000000000000..5bc0e52ebe239535aee9ca1a81d4a384966777e6 +index 000000000..5bc0e52eb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c @@ -0,0 +1,59 @@ @@ -295548,7 +295540,7 @@ index 0000000000000000000000000000000000000000..5bc0e52ebe239535aee9ca1a81d4a384 +} 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 100644 -index 0000000000000000000000000000000000000000..fb9ccd2ad1e24e79c7db9f3fccafa25effc2cef3 +index 000000000..fb9ccd2ad --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_bitmap.c @@ -0,0 +1,152 @@ @@ -295706,7 +295698,7 @@ index 0000000000000000000000000000000000000000..fb9ccd2ad1e24e79c7db9f3fccafa25e + 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 100644 -index 0000000000000000000000000000000000000000..5c8b9ceab9ab4b1b5eff960456368a2368698b78 +index 000000000..5c8b9ceab --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c @@ -0,0 +1,200 @@ @@ -295912,7 +295904,7 @@ index 0000000000000000000000000000000000000000..5c8b9ceab9ab4b1b5eff960456368a23 +} 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 100644 -index 0000000000000000000000000000000000000000..ed5f0b0da7cb541f79fdc8208c56d0b90b22d241 +index 000000000..ed5f0b0da --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.c @@ -0,0 +1,287 @@ @@ -296205,7 +296197,7 @@ index 0000000000000000000000000000000000000000..ed5f0b0da7cb541f79fdc8208c56d0b9 +#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 100644 -index 0000000000000000000000000000000000000000..6fd5af95285b49b81287745a474393afb2368af0 +index 000000000..6fd5af952 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.h @@ -0,0 +1,326 @@ @@ -296537,7 +296529,7 @@ index 0000000000000000000000000000000000000000..6fd5af95285b49b81287745a474393af +#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 100644 -index 0000000000000000000000000000000000000000..994b04dad745ead60b27e774a2899fddbbd554fc +index 000000000..994b04dad --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c @@ -0,0 +1,146 @@ @@ -296689,7 +296681,7 @@ index 0000000000000000000000000000000000000000..994b04dad745ead60b27e774a2899fdd +} 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 100644 -index 0000000000000000000000000000000000000000..a729d04998692366822c28343b89a260ab37a016 +index 000000000..a729d0499 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_mali.c @@ -0,0 +1,505 @@ @@ -297200,7 +297192,7 @@ index 0000000000000000000000000000000000000000..a729d04998692366822c28343b89a260 + 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 100644 -index 0000000000000000000000000000000000000000..0b2d0076277150bfb694bfee16445d471549c61e +index 000000000..0b2d00762 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c @@ -0,0 +1,27 @@ @@ -297233,7 +297225,7 @@ index 0000000000000000000000000000000000000000..0b2d0076277150bfb694bfee16445d47 +} 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 100644 -index 0000000000000000000000000000000000000000..174616b566c4d3211ba1bf35d4cabee8bb5713d3 +index 000000000..174616b56 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_memory.c @@ -0,0 +1,61 @@ @@ -297300,7 +297292,7 @@ index 0000000000000000000000000000000000000000..174616b566c4d3211ba1bf35d4cabee8 +} 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 100644 -index 0000000000000000000000000000000000000000..9845187f81223e61e889a747580905df55650b0a +index 000000000..9845187f8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_misc.c @@ -0,0 +1,81 @@ @@ -297387,7 +297379,7 @@ index 0000000000000000000000000000000000000000..9845187f81223e61e889a747580905df +} 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 100644 -index 0000000000000000000000000000000000000000..a05f8f066964500e0ae5e25b5e8631dd95ae89a5 +index 000000000..a05f8f066 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_notification.c @@ -0,0 +1,182 @@ @@ -297575,7 +297567,7 @@ index 0000000000000000000000000000000000000000..a05f8f066964500e0ae5e25b5e8631dd +} 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 100644 -index 0000000000000000000000000000000000000000..e28e2eb21fe2224f65a923b0fa2602280f56a124 +index 000000000..e28e2eb21 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_pm.c @@ -0,0 +1,83 @@ @@ -297664,7 +297656,7 @@ index 0000000000000000000000000000000000000000..e28e2eb21fe2224f65a923b0fa260228 +} 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 100644 -index 0000000000000000000000000000000000000000..9e977ea4d0ff72824c883e137fa3773421fb2ec1 +index 000000000..9e977ea4d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_profiling.c @@ -0,0 +1,1282 @@ @@ -298952,7 +298944,7 @@ index 0000000000000000000000000000000000000000..9e977ea4d0ff72824c883e137fa37734 +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 100644 -index 0000000000000000000000000000000000000000..af51161f9da13cd9cb953aea2161e206dc0f9b4b +index 000000000..af51161f9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_specific.h @@ -0,0 +1,74 @@ @@ -299032,7 +299024,7 @@ index 0000000000000000000000000000000000000000..af51161f9da13cd9cb953aea2161e206 +#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 100644 -index 0000000000000000000000000000000000000000..d295e712ac7ade814422c05b324b6d3430220caa +index 000000000..d295e712a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c @@ -0,0 +1,59 @@ @@ -299097,7 +299089,7 @@ index 0000000000000000000000000000000000000000..d295e712ac7ade814422c05b324b6d34 +} 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 100644 -index 0000000000000000000000000000000000000000..d01c1148272a42d095c68708c361fea0a985c181 +index 000000000..d01c11482 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_timers.c @@ -0,0 +1,76 @@ @@ -299179,7 +299171,7 @@ index 0000000000000000000000000000000000000000..d01c1148272a42d095c68708c361fea0 +} 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 100644 -index 0000000000000000000000000000000000000000..fa12abd3f5dce9f987f77c3d6a2c7be18748447b +index 000000000..fa12abd3f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wait_queue.c @@ -0,0 +1,78 @@ @@ -299263,7 +299255,7 @@ index 0000000000000000000000000000000000000000..fa12abd3f5dce9f987f77c3d6a2c7be1 +} 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 100644 -index 0000000000000000000000000000000000000000..d5e258a83a297c4205ff87c99090492ad6702aaa +index 000000000..d5e258a83 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wq.c @@ -0,0 +1,240 @@ @@ -299509,7 +299501,7 @@ index 0000000000000000000000000000000000000000..d5e258a83a297c4205ff87c99090492a +} 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 100644 -index 0000000000000000000000000000000000000000..931d7f07a1d2a2c64e158200821d171ff805838c +index 000000000..931d7f07a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c @@ -0,0 +1,23 @@ @@ -299538,7 +299530,7 @@ index 0000000000000000000000000000000000000000..931d7f07a1d2a2c64e158200821d171f +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 100644 -index 0000000000000000000000000000000000000000..4661cac42b3f968becc71930c1e71d7878f35019 +index 000000000..4661cac42 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h @@ -0,0 +1,17 @@ @@ -299561,7 +299553,7 @@ index 0000000000000000000000000000000000000000..4661cac42b3f968becc71930c1e71d78 +#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 100644 -index 0000000000000000000000000000000000000000..6fdaa427c4cf1ddb3a081a19c6eda6ee45c74362 +index 000000000..6fdaa427c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h @@ -0,0 +1,17 @@ @@ -299584,7 +299576,7 @@ index 0000000000000000000000000000000000000000..6fdaa427c4cf1ddb3a081a19c6eda6ee +#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 100644 -index 0000000000000000000000000000000000000000..c3a526f0ad9095bb39f03926d28bc0c76776d993 +index 000000000..c3a526f0a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c @@ -0,0 +1,275 @@ @@ -299865,7 +299857,7 @@ index 0000000000000000000000000000000000000000..c3a526f0ad9095bb39f03926d28bc0c7 +} 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 100644 -index 0000000000000000000000000000000000000000..f17b4583307a2ba0dbff71f8ba905e609d797e01 +index 000000000..f17b45833 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.h @@ -0,0 +1,35 @@ @@ -299906,7 +299898,7 @@ index 0000000000000000000000000000000000000000..f17b4583307a2ba0dbff71f8ba905e60 +#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 100644 -index 0000000000000000000000000000000000000000..0d98b518f1ac9bd652687d9bbb8e5773899754bb +index 000000000..0d98b518f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_sync.c @@ -0,0 +1,665 @@ @@ -300577,7 +300569,7 @@ index 0000000000000000000000000000000000000000..0d98b518f1ac9bd652687d9bbb8e5773 + 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 100644 -index 0000000000000000000000000000000000000000..91be8b9cf31491bb72289cec89ae3b81dcb76511 +index 000000000..91be8b9cf --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_sync.h @@ -0,0 +1,169 @@ @@ -300752,7 +300744,7 @@ index 0000000000000000000000000000000000000000..91be8b9cf31491bb72289cec89ae3b81 +#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 100644 -index 0000000000000000000000000000000000000000..68b27b8be067dd0051bfc2a1ca0b85b7b279102f +index 000000000..68b27b8be --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h @@ -0,0 +1,17 @@ @@ -300775,7 +300767,7 @@ index 0000000000000000000000000000000000000000..68b27b8be067dd0051bfc2a1ca0b85b7 +#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 100644 -index 0000000000000000000000000000000000000000..0bd1cddb10c616ca13c92bb210546b7f38f5529d +index 000000000..0bd1cddb1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c @@ -0,0 +1,171 @@ @@ -300952,7 +300944,7 @@ index 0000000000000000000000000000000000000000..0bd1cddb10c616ca13c92bb210546b7f +} 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 100644 -index 0000000000000000000000000000000000000000..68fcd971938a53c9e7aeadf7b11453068d5380ac +index 000000000..68fcd9719 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_gp.c @@ -0,0 +1,91 @@ @@ -301049,7 +301041,7 @@ index 0000000000000000000000000000000000000000..68fcd971938a53c9e7aeadf7b1145306 +} 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 100644 -index 0000000000000000000000000000000000000000..baea4c688db92ebe1f28cf57179843dff59c8f5c +index 000000000..baea4c688 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_mem.c @@ -0,0 +1,333 @@ @@ -301388,7 +301380,7 @@ index 0000000000000000000000000000000000000000..baea4c688db92ebe1f28cf57179843df + 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 100644 -index 0000000000000000000000000000000000000000..a9b0958c06aa5ca247b15ad1730c47fe564c1542 +index 000000000..a9b0958c0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c @@ -0,0 +1,105 @@ @@ -301499,7 +301491,7 @@ index 0000000000000000000000000000000000000000..a9b0958c06aa5ca247b15ad1730c47fe +} 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 100644 -index 0000000000000000000000000000000000000000..8b49ebc50b958101e79a40e66656a79b49c501c8 +index 000000000..8b49ebc50 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_profiling.c @@ -0,0 +1,183 @@ @@ -301688,7 +301680,7 @@ index 0000000000000000000000000000000000000000..8b49ebc50b958101e79a40e66656a79b +} 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 100644 -index 0000000000000000000000000000000000000000..1dd4a7c6fb1e4f82bb02a155291eaa0106f1bfb5 +index 000000000..1dd4a7c6f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_soft_job.c @@ -0,0 +1,90 @@ @@ -301784,7 +301776,7 @@ index 0000000000000000000000000000000000000000..1dd4a7c6fb1e4f82bb02a155291eaa01 +} 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 100644 -index 0000000000000000000000000000000000000000..ff0c909393a4fd9eb41010b162e190bd09d6d759 +index 000000000..ff0c90939 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_timeline.c @@ -0,0 +1,88 @@ @@ -301878,7 +301870,7 @@ index 0000000000000000000000000000000000000000..ff0c909393a4fd9eb41010b162e190bd +} 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 100644 -index 0000000000000000000000000000000000000000..52519d1f96e06f188854fa8942e48aee5d309937 +index 000000000..52519d1f9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_vsync.c @@ -0,0 +1,39 @@ @@ -301923,7 +301915,7 @@ index 0000000000000000000000000000000000000000..52519d1f96e06f188854fa8942e48aee + 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 100644 -index 0000000000000000000000000000000000000000..1add628fe3237bb7e97c764e24849839754fdbfc +index 000000000..1add628fe --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h @@ -0,0 +1,82 @@ @@ -302011,7 +302003,7 @@ index 0000000000000000000000000000000000000000..1add628fe3237bb7e97c764e24849839 +#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 100644 -index 0000000000000000000000000000000000000000..fc7017bbfe0856d2a0df95fcf2511f62bfcb19c9 +index 000000000..fc7017bbf --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm.c @@ -0,0 +1,629 @@ @@ -302646,7 +302638,7 @@ index 0000000000000000000000000000000000000000..fc7017bbfe0856d2a0df95fcf2511f62 +} 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 100644 -index 0000000000000000000000000000000000000000..7a2fc8107b4f6f0442c49c54d34d74f43ccb39fd +index 000000000..7a2fc8107 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c @@ -0,0 +1,122 @@ @@ -302774,7 +302766,7 @@ index 0000000000000000000000000000000000000000..7a2fc8107b4f6f0442c49c54d34d74f4 +} 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 100644 -index 0000000000000000000000000000000000000000..8e010183074967cbda450ecd07e7bb5e12c3dd52 +index 000000000..8e0101830 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h @@ -0,0 +1,44 @@ @@ -302824,7 +302816,7 @@ index 0000000000000000000000000000000000000000..8e010183074967cbda450ecd07e7bb5e +#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 100644 -index 0000000000000000000000000000000000000000..e4e7ab8b2c2e4117417d9d37d2b11fefb5ae3f73 +index 000000000..e4e7ab8b2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c @@ -0,0 +1,127 @@ @@ -302957,7 +302949,7 @@ index 0000000000000000000000000000000000000000..e4e7ab8b2c2e4117417d9d37d2b11fef +#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 100644 -index 0000000000000000000000000000000000000000..fe5e1224149e2cf4707e70283359a4900d235afb +index 000000000..fe5e12241 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/rk/custom_log.h @@ -0,0 +1,209 @@ @@ -303172,7 +303164,7 @@ index 0000000000000000000000000000000000000000..fe5e1224149e2cf4707e70283359a490 +#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 100644 -index 0000000000000000000000000000000000000000..c937e4678ddf9872f18a787775193051ff829fd7 +index 000000000..c937e4678 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/rk/rk.c @@ -0,0 +1,726 @@ @@ -303904,7 +303896,7 @@ index 0000000000000000000000000000000000000000..c937e4678ddf9872f18a787775193051 +} 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 100644 -index 0000000000000000000000000000000000000000..bd939350c425c3e77ed79ce22552a03ec6a9f37a +index 000000000..bd939350c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h @@ -0,0 +1,37 @@ @@ -303947,7 +303939,7 @@ index 0000000000000000000000000000000000000000..bd939350c425c3e77ed79ce22552a03e + diff --git a/drivers/gpu/arm/mali400/mali/readme.txt b/drivers/gpu/arm/mali400/mali/readme.txt new file mode 100755 -index 0000000000000000000000000000000000000000..6785ac933b38b1f605f34c08a848d87cf3314260 +index 000000000..6785ac933 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/readme.txt @@ -0,0 +1,28 @@ @@ -303981,7 +303973,7 @@ index 0000000000000000000000000000000000000000..6785ac933b38b1f605f34c08a848d87c +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 100644 -index 0000000000000000000000000000000000000000..0345fb169a95f548d13847330800d38c994d60f8 +index 000000000..0345fb169 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/regs/mali_200_regs.h @@ -0,0 +1,131 @@ @@ -304118,7 +304110,7 @@ index 0000000000000000000000000000000000000000..0345fb169a95f548d13847330800d38c +#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 100644 -index 0000000000000000000000000000000000000000..7f8b58fd6c49341054ad5574de57b8ee6c878454 +index 000000000..7f8b58fd6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h @@ -0,0 +1,172 @@ @@ -304296,7 +304288,7 @@ index 0000000000000000000000000000000000000000..7f8b58fd6c49341054ad5574de57b8ee +#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 100644 -index 0000000000000000000000000000000000000000..7df934c12122779ef409a8e50189472deb49d171 +index 000000000..7df934c12 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c @@ -0,0 +1,13 @@ @@ -304315,7 +304307,7 @@ index 0000000000000000000000000000000000000000..7df934c12122779ef409a8e50189472d +/* 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 100644 -index 0000000000000000000000000000000000000000..f52097c1901b209ab0250204e10890441406b858 +index 000000000..f52097c19 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h @@ -0,0 +1,48 @@ @@ -304369,7 +304361,7 @@ index 0000000000000000000000000000000000000000..f52097c1901b209ab0250204e1089044 +#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 100644 -index 0000000000000000000000000000000000000000..7df934c12122779ef409a8e50189472deb49d171 +index 000000000..7df934c12 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c @@ -0,0 +1,13 @@ @@ -304388,7 +304380,7 @@ index 0000000000000000000000000000000000000000..7df934c12122779ef409a8e50189472d +/* 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 100644 -index 0000000000000000000000000000000000000000..709a16a82f31a98022c8453b9c7b8de98ebf56c6 +index 000000000..709a16a82 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h @@ -0,0 +1,26 @@ @@ -304420,7 +304412,7 @@ index 0000000000000000000000000000000000000000..709a16a82f31a98022c8453b9c7b8de9 +#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 -index 0000000000000000000000000000000000000000..2a6cbbbb5a97712d939995de0479587ac8525adb +index 000000000..2a6cbbbb5 --- /dev/null +++ b/drivers/gpu/arm/mali400/rk_ver_info.txt @@ -0,0 +1,11 @@ @@ -304437,7 +304429,7 @@ index 0000000000000000000000000000000000000000..2a6cbbbb5a97712d939995de0479587a + diff --git a/drivers/gpu/arm/mali400/ump/Kbuild b/drivers/gpu/arm/mali400/ump/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..a3067ba724590fa19769ab0b73c1b8d440baf18a +index 000000000..a3067ba72 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Kbuild @@ -0,0 +1,92 @@ @@ -304535,7 +304527,7 @@ index 0000000000000000000000000000000000000000..a3067ba724590fa19769ab0b73c1b8d4 + diff --git a/drivers/gpu/arm/mali400/ump/Kconfig b/drivers/gpu/arm/mali400/ump/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..ec3509057732ddf8311a96627f3928e316cf625b +index 000000000..ec3509057 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Kconfig @@ -0,0 +1,17 @@ @@ -304558,7 +304550,7 @@ index 0000000000000000000000000000000000000000..ec3509057732ddf8311a96627f3928e3 + diff --git a/drivers/gpu/arm/mali400/ump/Makefile b/drivers/gpu/arm/mali400/ump/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..88b02a22fce50887d39ad5b45b84e769eb05f176 +index 000000000..88b02a22f --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Makefile @@ -0,0 +1,67 @@ @@ -304631,7 +304623,7 @@ index 0000000000000000000000000000000000000000..88b02a22fce50887d39ad5b45b84e769 + $(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 -index 0000000000000000000000000000000000000000..ad2c18da98a0fd488b319c511eff5d1cbc44dcf9 +index 000000000..ad2c18da9 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Makefile.common @@ -0,0 +1,20 @@ @@ -304657,7 +304649,7 @@ index 0000000000000000000000000000000000000000..ad2c18da98a0fd488b319c511eff5d1c +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 100644 -index 0000000000000000000000000000000000000000..d4aef9dd09c765fb4a303aa9b1c3ca118852e146 +index 000000000..d4aef9dd0 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/arch-default/config.h @@ -0,0 +1,24 @@ @@ -304687,7 +304679,7 @@ index 0000000000000000000000000000000000000000..d4aef9dd09c765fb4a303aa9b1c3ca11 +#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 100644 -index 0000000000000000000000000000000000000000..182e90c1d64f854f56c983032670e3c861a61007 +index 000000000..182e90c1d --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h @@ -0,0 +1,18 @@ @@ -304711,7 +304703,7 @@ index 0000000000000000000000000000000000000000..182e90c1d64f854f56c983032670e3c8 +#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 100644 -index 0000000000000000000000000000000000000000..d4aef9dd09c765fb4a303aa9b1c3ca118852e146 +index 000000000..d4aef9dd0 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/arch/config.h @@ -0,0 +1,24 @@ @@ -304741,7 +304733,7 @@ index 0000000000000000000000000000000000000000..d4aef9dd09c765fb4a303aa9b1c3ca11 +#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 100644 -index 0000000000000000000000000000000000000000..36adb2f5383e67e06cd75694148310943d5cc3bc +index 000000000..36adb2f53 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c @@ -0,0 +1,455 @@ @@ -305202,7 +305194,7 @@ index 0000000000000000000000000000000000000000..36adb2f5383e67e06cd7569414831094 +} 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 100644 -index 0000000000000000000000000000000000000000..73aa9e4c49f9c0de42a7c6461bf03a2dc0d64521 +index 000000000..73aa9e4c4 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.c @@ -0,0 +1,358 @@ @@ -305566,7 +305558,7 @@ index 0000000000000000000000000000000000000000..73aa9e4c49f9c0de42a7c6461bf03a2d +} 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 100644 -index 0000000000000000000000000000000000000000..aa65f1cb6c88896e1d99b624f9685c12aefb133d +index 000000000..aa65f1cb6 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.h @@ -0,0 +1,125 @@ @@ -305697,7 +305689,7 @@ index 0000000000000000000000000000000000000000..aa65f1cb6c88896e1d99b624f9685c12 +#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 100644 -index 0000000000000000000000000000000000000000..e4642f0394c266e0bf0e40931b54693f790ab185 +index 000000000..e4642f039 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c @@ -0,0 +1,155 @@ @@ -305858,7 +305850,7 @@ index 0000000000000000000000000000000000000000..e4642f0394c266e0bf0e40931b54693f + 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 100644 -index 0000000000000000000000000000000000000000..a888ba833fbb1dd38dce67d91a4d91e959666848 +index 000000000..a888ba833 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h @@ -0,0 +1,89 @@ @@ -305953,7 +305945,7 @@ index 0000000000000000000000000000000000000000..a888ba833fbb1dd38dce67d91a4d91e9 +#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 100644 -index 0000000000000000000000000000000000000000..2b69f68e87acb4a9e5078176e243528918ca5bca +index 000000000..2b69f68e8 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h @@ -0,0 +1,48 @@ @@ -306007,7 +305999,7 @@ index 0000000000000000000000000000000000000000..2b69f68e87acb4a9e5078176e2435289 + 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 100644 -index 0000000000000000000000000000000000000000..0b6434bee00f503e39deddf55451490cd0a68005 +index 000000000..0b6434bee --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_ref_drv.c @@ -0,0 +1,181 @@ @@ -306194,7 +306186,7 @@ index 0000000000000000000000000000000000000000..0b6434bee00f503e39deddf55451490c +} 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 100644 -index 0000000000000000000000000000000000000000..32f32ccbe9fc7991e8a63349218f27a0b3f9849d +index 000000000..32f32ccbe --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_types.h @@ -0,0 +1,58 @@ @@ -306258,7 +306250,7 @@ index 0000000000000000000000000000000000000000..32f32ccbe9fc7991e8a63349218f27a0 +#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 100644 -index 0000000000000000000000000000000000000000..9adc4d3df3f58ee2e03d9eb24844ad8d2efec1d7 +index 000000000..9adc4d3df --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_osk.h @@ -0,0 +1,48 @@ @@ -306312,7 +306304,7 @@ index 0000000000000000000000000000000000000000..9adc4d3df3f58ee2e03d9eb24844ad8d +#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 100644 -index 0000000000000000000000000000000000000000..db842cdcbeff1bbe194fce46f1843bd36832d894 +index 000000000..db842cdcb --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h @@ -0,0 +1,202 @@ @@ -306520,7 +306512,7 @@ index 0000000000000000000000000000000000000000..db842cdcbeff1bbe194fce46f1843bd3 +#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 100644 -index 0000000000000000000000000000000000000000..f2906768c37fb307dd9ff8eef71c15d768039173 +index 000000000..f2906768c --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_ukk.h @@ -0,0 +1,60 @@ @@ -306586,7 +306578,7 @@ index 0000000000000000000000000000000000000000..f2906768c37fb307dd9ff8eef71c15d7 +#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 100644 -index 0000000000000000000000000000000000000000..d0174055aa283ad620a8cb40b222006d4cabb4cd +index 000000000..d0174055a --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h @@ -0,0 +1,30 @@ @@ -306622,7 +306614,7 @@ index 0000000000000000000000000000000000000000..d0174055aa283ad620a8cb40b222006d +#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 100644 -index 0000000000000000000000000000000000000000..bfb4e8d648859118501671816b7470d52375ac54 +index 000000000..bfb4e8d64 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h @@ -0,0 +1,54 @@ @@ -306682,7 +306674,7 @@ index 0000000000000000000000000000000000000000..bfb4e8d648859118501671816b7470d5 +#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 100644 -index 0000000000000000000000000000000000000000..71b30830c308ba073b58e9cc2b47a74413ae1f9c +index 000000000..71b30830c --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c @@ -0,0 +1,449 @@ @@ -307137,7 +307129,7 @@ index 0000000000000000000000000000000000000000..71b30830c308ba073b58e9cc2b47a744 +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 100644 -index 0000000000000000000000000000000000000000..8d32ddbb544992617079ee8c9ee00cab4390d3f2 +index 000000000..8d32ddbb5 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.h @@ -0,0 +1,18 @@ @@ -307161,7 +307153,7 @@ index 0000000000000000000000000000000000000000..8d32ddbb544992617079ee8c9ee00cab +#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 100644 -index 0000000000000000000000000000000000000000..5a1257a25b82eca618c329364e08bf105c6d9d35 +index 000000000..5a1257a25 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c @@ -0,0 +1,271 @@ @@ -307438,7 +307430,7 @@ index 0000000000000000000000000000000000000000..5a1257a25b82eca618c329364e08bf10 +} 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 100644 -index 0000000000000000000000000000000000000000..949fd245c6af20aeac813eb4003cdc0ff7cde31e +index 000000000..949fd245c --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.h @@ -0,0 +1,23 @@ @@ -307467,7 +307459,7 @@ index 0000000000000000000000000000000000000000..949fd245c6af20aeac813eb4003cdc0f + 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 100644 -index 0000000000000000000000000000000000000000..7cd8d5d381cf0873d988f34bfc14886ea452f032 +index 000000000..7cd8d5d38 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.c @@ -0,0 +1,235 @@ @@ -307708,7 +307700,7 @@ index 0000000000000000000000000000000000000000..7cd8d5d381cf0873d988f34bfc14886e +} 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 100644 -index 0000000000000000000000000000000000000000..d21d503512ec965516434a7e544363c18b038204 +index 000000000..d21d50351 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.h @@ -0,0 +1,23 @@ @@ -307737,7 +307729,7 @@ index 0000000000000000000000000000000000000000..d21d503512ec965516434a7e544363c1 + 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 100644 -index 0000000000000000000000000000000000000000..6be0f86440de9af8b83e6472f8f592a31dd14d59 +index 000000000..6be0f8644 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.c @@ -0,0 +1,222 @@ @@ -307965,7 +307957,7 @@ index 0000000000000000000000000000000000000000..6be0f86440de9af8b83e6472f8f592a3 +} 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 100644 -index 0000000000000000000000000000000000000000..2cea6cedc3803e1beaf80e801c98b8bdc40868ec +index 000000000..2cea6cedc --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.h @@ -0,0 +1,84 @@ @@ -308055,7 +308047,7 @@ index 0000000000000000000000000000000000000000..2cea6cedc3803e1beaf80e801c98b8bd +#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 100644 -index 0000000000000000000000000000000000000000..e41931e1ea75a1d478b8794c36e5e183f563a584 +index 000000000..e41931e1e --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c @@ -0,0 +1,65 @@ @@ -308126,7 +308118,7 @@ index 0000000000000000000000000000000000000000..e41931e1ea75a1d478b8794c36e5e183 +} 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 100644 -index 0000000000000000000000000000000000000000..2b634ba79c6e1744591ce0b23eff25c8d897d95a +index 000000000..2b634ba79 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c @@ -0,0 +1,27 @@ @@ -308159,7 +308151,7 @@ index 0000000000000000000000000000000000000000..2b634ba79c6e1744591ce0b23eff25c8 +} 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 100644 -index 0000000000000000000000000000000000000000..e08bf25257b04adfd0c8b6ce6c79f77b7361837a +index 000000000..e08bf2525 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_low_level_mem.c @@ -0,0 +1,314 @@ @@ -308479,7 +308471,7 @@ index 0000000000000000000000000000000000000000..e08bf25257b04adfd0c8b6ce6c79f77b +} 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 100644 -index 0000000000000000000000000000000000000000..58c9f1bf27b875e685a53cfe782ae55685cd06ef +index 000000000..58c9f1bf2 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_misc.c @@ -0,0 +1,36 @@ @@ -308521,7 +308513,7 @@ index 0000000000000000000000000000000000000000..58c9f1bf27b875e685a53cfe782ae556 +} 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 100644 -index 0000000000000000000000000000000000000000..56a787ff64dcf65f8b55c28a083e4c075d14038f +index 000000000..56a787ff6 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.c @@ -0,0 +1,230 @@ @@ -308757,7 +308749,7 @@ index 0000000000000000000000000000000000000000..56a787ff64dcf65f8b55c28a083e4c07 +#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 100644 -index 0000000000000000000000000000000000000000..61a7095a692019de8c0cc6859733e41662b9ce58 +index 000000000..61a7095a6 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h @@ -0,0 +1,36 @@ @@ -308799,7 +308791,7 @@ index 0000000000000000000000000000000000000000..61a7095a692019de8c0cc6859733e416 +#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 100644 -index 0000000000000000000000000000000000000000..4d6b69608fd4cd081c0fab6abaa27a8c8a5f68d4 +index 000000000..4d6b69608 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c @@ -0,0 +1,280 @@ @@ -309085,7 +309077,7 @@ index 0000000000000000000000000000000000000000..4d6b69608fd4cd081c0fab6abaa27a8c +} 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 100644 -index 0000000000000000000000000000000000000000..5f8fc683c8f51bcc28cef0d51c4426aa45ede9f8 +index 000000000..5f8fc683c --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.h @@ -0,0 +1,46 @@ @@ -309137,7 +309129,7 @@ index 0000000000000000000000000000000000000000..5f8fc683c8f51bcc28cef0d51c4426aa +#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 -index 0000000000000000000000000000000000000000..c238cf0f2b1f0b3e4e89b4beea2af5e2ecca7adf +index 000000000..c238cf0f2 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/readme.txt @@ -0,0 +1,28 @@ @@ -309171,7 +309163,7 @@ index 0000000000000000000000000000000000000000..c238cf0f2b1f0b3e4e89b4beea2af5e2 +kernel itself. diff --git a/drivers/gpu/arm/mali400/umplock/Makefile b/drivers/gpu/arm/mali400/umplock/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..e5549a33f91d34a345333155575a820512c1d5e8 +index 000000000..e5549a33f --- /dev/null +++ b/drivers/gpu/arm/mali400/umplock/Makefile @@ -0,0 +1,69 @@ @@ -309246,7 +309238,7 @@ index 0000000000000000000000000000000000000000..e5549a33f91d34a345333155575a8205 +endif diff --git a/drivers/gpu/arm/mali400/umplock/umplock_driver.c b/drivers/gpu/arm/mali400/umplock/umplock_driver.c new file mode 100644 -index 0000000000000000000000000000000000000000..173f4d9bb5c7e9fc4e05c9b9e4b5b1384f7daf5c +index 000000000..173f4d9bb --- /dev/null +++ b/drivers/gpu/arm/mali400/umplock/umplock_driver.c @@ -0,0 +1,618 @@ @@ -309870,7 +309862,7 @@ index 0000000000000000000000000000000000000000..173f4d9bb5c7e9fc4e05c9b9e4b5b138 +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 100644 -index 0000000000000000000000000000000000000000..8afdaad7000f72d0b185fc559d064651f37bedc2 +index 000000000..8afdaad70 --- /dev/null +++ b/drivers/gpu/arm/mali400/umplock/umplock_ioctl.h @@ -0,0 +1,66 @@ @@ -309942,7 +309934,7 @@ index 0000000000000000000000000000000000000000..8afdaad7000f72d0b185fc559d064651 + diff --git a/drivers/gpu/arm/midgard/Kbuild b/drivers/gpu/arm/midgard/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..b2c2bbcda668c1f3e632967642e2cf5547043a8f +index 000000000..b2c2bbcda --- /dev/null +++ b/drivers/gpu/arm/midgard/Kbuild @@ -0,0 +1,221 @@ @@ -310169,7 +310161,7 @@ index 0000000000000000000000000000000000000000..b2c2bbcda668c1f3e632967642e2cf55 +obj-$(CONFIG_MALI_KUTF) += tests/ diff --git a/drivers/gpu/arm/midgard/Kconfig b/drivers/gpu/arm/midgard/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..043bfc0021cc6fd185046342c6cb62d2738154f2 +index 000000000..043bfc002 --- /dev/null +++ b/drivers/gpu/arm/midgard/Kconfig @@ -0,0 +1,249 @@ @@ -310424,7 +310416,7 @@ index 0000000000000000000000000000000000000000..043bfc0021cc6fd185046342c6cb62d2 +source "drivers/gpu/arm/midgard/tests/Kconfig" diff --git a/drivers/gpu/arm/midgard/Makefile b/drivers/gpu/arm/midgard/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..9aa242c4f8c4145520f73db5daa23523d1036dea +index 000000000..9aa242c4f --- /dev/null +++ b/drivers/gpu/arm/midgard/Makefile @@ -0,0 +1,42 @@ @@ -310472,7 +310464,7 @@ index 0000000000000000000000000000000000000000..9aa242c4f8c4145520f73db5daa23523 + $(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 -index 0000000000000000000000000000000000000000..2bef9c25eaeb89307738e77ed2a1f7fc5602639b +index 000000000..2bef9c25e --- /dev/null +++ b/drivers/gpu/arm/midgard/Makefile.kbase @@ -0,0 +1,17 @@ @@ -310495,7 +310487,7 @@ index 0000000000000000000000000000000000000000..2bef9c25eaeb89307738e77ed2a1f7fc + diff --git a/drivers/gpu/arm/midgard/backend/gpu/Kbuild b/drivers/gpu/arm/midgard/backend/gpu/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..5f700e9b6b44fb802e88216095a0e84231fc1d85 +index 000000000..5f700e9b6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/Kbuild @@ -0,0 +1,60 @@ @@ -310561,7 +310553,7 @@ index 0000000000000000000000000000000000000000..5f700e9b6b44fb802e88216095a0e842 +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 100644 -index 0000000000000000000000000000000000000000..c8ae87eb84a2831196938f309078991940a3326e +index 000000000..c8ae87eb8 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_backend_config.h @@ -0,0 +1,29 @@ @@ -310596,7 +310588,7 @@ index 0000000000000000000000000000000000000000..c8ae87eb84a2831196938f3090789919 + 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 100644 -index 0000000000000000000000000000000000000000..fef9a2cb743ebdb317dd0aeb504067b6529797c5 +index 000000000..fef9a2cb7 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.c @@ -0,0 +1,29 @@ @@ -310631,7 +310623,7 @@ index 0000000000000000000000000000000000000000..fef9a2cb743ebdb317dd0aeb504067b6 + 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 100644 -index 0000000000000000000000000000000000000000..fe9869109a82576070b21ad2ec36bbe5fddf8308 +index 000000000..fe9869109 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h @@ -0,0 +1,34 @@ @@ -310671,7 +310663,7 @@ index 0000000000000000000000000000000000000000..fe9869109a82576070b21ad2ec36bbe5 +#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 100644 -index 0000000000000000000000000000000000000000..7851ea6466c78e539fcae3fac9dbb50add77cbff +index 000000000..7851ea646 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c @@ -0,0 +1,157 @@ @@ -310834,7 +310826,7 @@ index 0000000000000000000000000000000000000000..7851ea6466c78e539fcae3fac9dbb50a +#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 100644 -index 0000000000000000000000000000000000000000..4e8e56e9baf28d8839c117eb277dff73027f3726 +index 000000000..4e8e56e9b --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c @@ -0,0 +1,474 @@ @@ -311314,7 +311306,7 @@ index 0000000000000000000000000000000000000000..4e8e56e9baf28d8839c117eb277dff73 +} 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 100644 -index 0000000000000000000000000000000000000000..c0bf8b15b3bcd6f5748c26ad60360e898cf93b90 +index 000000000..c0bf8b15b --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h @@ -0,0 +1,24 @@ @@ -311344,7 +311336,7 @@ index 0000000000000000000000000000000000000000..c0bf8b15b3bcd6f5748c26ad60360e89 +#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 100644 -index 0000000000000000000000000000000000000000..dcdf15cdc3e8d83a1561ca48bab03632dfd15df1 +index 000000000..dcdf15cdc --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c @@ -0,0 +1,255 @@ @@ -311605,7 +311597,7 @@ index 0000000000000000000000000000000000000000..dcdf15cdc3e8d83a1561ca48bab03632 +} 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 100644 -index 0000000000000000000000000000000000000000..5b20445932fb62dacc2ac49846f7350fef774bdb +index 000000000..5b2044593 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_internal.h @@ -0,0 +1,67 @@ @@ -311678,7 +311670,7 @@ index 0000000000000000000000000000000000000000..5b20445932fb62dacc2ac49846f7350f +#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 100644 -index 0000000000000000000000000000000000000000..d578fd78e82597cc845bd9813129eaa44bfcb0f4 +index 000000000..d578fd78e --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c @@ -0,0 +1,123 @@ @@ -311807,7 +311799,7 @@ index 0000000000000000000000000000000000000000..d578fd78e82597cc845bd9813129eaa4 + 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 100644 -index 0000000000000000000000000000000000000000..b395325b556bb262cc67bbd9b4e9dcb1f3a36fdb +index 000000000..b395325b5 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c @@ -0,0 +1,110 @@ @@ -311923,7 +311915,7 @@ index 0000000000000000000000000000000000000000..b395325b556bb262cc67bbd9b4e9dcb1 + 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 100644 -index 0000000000000000000000000000000000000000..7ad309e8d7f456160a278f18b2af5ebafc5c8c40 +index 000000000..7ad309e8d --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c @@ -0,0 +1,492 @@ @@ -312421,7 +312413,7 @@ index 0000000000000000000000000000000000000000..7ad309e8d7f456160a278f18b2af5eba + 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 100644 -index 0000000000000000000000000000000000000000..4794672da8f09891d385a904eed6047d0134db82 +index 000000000..4794672da --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h @@ -0,0 +1,58 @@ @@ -312485,7 +312477,7 @@ index 0000000000000000000000000000000000000000..4794672da8f09891d385a904eed6047d + 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 100644 -index 0000000000000000000000000000000000000000..e96aeae786e1e5f3a154649a4980610e3040a96a +index 000000000..e96aeae78 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_internal.h @@ -0,0 +1,45 @@ @@ -312536,7 +312528,7 @@ index 0000000000000000000000000000000000000000..e96aeae786e1e5f3a154649a4980610e +#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 100644 -index 0000000000000000000000000000000000000000..8781561e73d0011f5d4cb246f8e0217236e3588f +index 000000000..8781561e7 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h @@ -0,0 +1,39 @@ @@ -312581,7 +312573,7 @@ index 0000000000000000000000000000000000000000..8781561e73d0011f5d4cb246f8e02172 +#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 100644 -index 0000000000000000000000000000000000000000..8416b80e8b77d98925ad860e3c6942fec95c4bb1 +index 000000000..8416b80e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c @@ -0,0 +1,469 @@ @@ -313056,7 +313048,7 @@ index 0000000000000000000000000000000000000000..8416b80e8b77d98925ad860e3c6942fe +#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 100644 -index 0000000000000000000000000000000000000000..92358f2bf29801c040092df17998811b3319af09 +index 000000000..92358f2bf --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c @@ -0,0 +1,237 @@ @@ -313299,7 +313291,7 @@ index 0000000000000000000000000000000000000000..92358f2bf29801c040092df17998811b + 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 100644 -index 0000000000000000000000000000000000000000..08a7400e66d588a58d7ec4b9175eb0e0597d957d +index 000000000..08a7400e6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h @@ -0,0 +1,123 @@ @@ -313428,7 +313420,7 @@ index 0000000000000000000000000000000000000000..08a7400e66d588a58d7ec4b9175eb0e0 +#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 100644 -index 0000000000000000000000000000000000000000..a6fb097b94f95ad30ae9958b613143a9877b1d6b +index 000000000..a6fb097b9 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c @@ -0,0 +1,1518 @@ @@ -314952,7 +314944,7 @@ index 0000000000000000000000000000000000000000..a6fb097b94f95ad30ae9958b613143a9 +#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 100644 -index 0000000000000000000000000000000000000000..1f382b3c1af41f5c6f97e234c93ba440967bea7a +index 000000000..1f382b3c1 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h @@ -0,0 +1,164 @@ @@ -315122,7 +315114,7 @@ index 0000000000000000000000000000000000000000..1f382b3c1af41f5c6f97e234c93ba440 +#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 100644 -index 0000000000000000000000000000000000000000..4b4541660ec44f6ea1757cae9eda03a6a1b80e58 +index 000000000..4b4541660 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c @@ -0,0 +1,1952 @@ @@ -317080,7 +317072,7 @@ index 0000000000000000000000000000000000000000..4b4541660ec44f6ea1757cae9eda03a6 + 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 100644 -index 0000000000000000000000000000000000000000..1e0e05ad3ea450075448bd96dad124e283b77112 +index 000000000..1e0e05ad3 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h @@ -0,0 +1,76 @@ @@ -317162,7 +317154,7 @@ index 0000000000000000000000000000000000000000..1e0e05ad3ea450075448bd96dad124e2 +#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 100644 -index 0000000000000000000000000000000000000000..54d8ddd800976045ab8cd050e92547f374f4791c +index 000000000..54d8ddd80 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c @@ -0,0 +1,303 @@ @@ -317471,7 +317463,7 @@ index 0000000000000000000000000000000000000000..54d8ddd800976045ab8cd050e92547f3 +#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 100644 -index 0000000000000000000000000000000000000000..35d9781ae092c60c9bae4d8a4320e883ded0ea8a +index 000000000..35d9781ae --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h @@ -0,0 +1,129 @@ @@ -317606,7 +317598,7 @@ index 0000000000000000000000000000000000000000..35d9781ae092c60c9bae4d8a4320e883 +#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 100644 -index 0000000000000000000000000000000000000000..a8c1af23a36955b81e04591a01c8b0f6d16802f2 +index 000000000..a8c1af23a --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c @@ -0,0 +1,356 @@ @@ -317968,7 +317960,7 @@ index 0000000000000000000000000000000000000000..a8c1af23a36955b81e04591a01c8b0f6 + 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 100644 -index 0000000000000000000000000000000000000000..3f53779c67471f5ad102d46b7022aea7a7adc33f +index 000000000..3f53779c6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h @@ -0,0 +1,69 @@ @@ -318043,7 +318035,7 @@ index 0000000000000000000000000000000000000000..3f53779c67471f5ad102d46b7022aea7 +#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 100644 -index 0000000000000000000000000000000000000000..ba826184dd3feffe50933306fd2fa2cf789f0429 +index 000000000..ba826184d --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c @@ -0,0 +1,407 @@ @@ -318456,7 +318448,7 @@ index 0000000000000000000000000000000000000000..ba826184dd3feffe50933306fd2fa2cf +} 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 100644 -index 0000000000000000000000000000000000000000..c02253c6acc3017a3b4036231b87682e0284c6c7 +index 000000000..c02253c6a --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.h @@ -0,0 +1,42 @@ @@ -318504,7 +318496,7 @@ index 0000000000000000000000000000000000000000..c02253c6acc3017a3b4036231b87682e +#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 100644 -index 0000000000000000000000000000000000000000..0614348e935ac64df9eb436285a52ffdb7e0f38a +index 000000000..0614348e9 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c @@ -0,0 +1,63 @@ @@ -318573,7 +318565,7 @@ index 0000000000000000000000000000000000000000..0614348e935ac64df9eb436285a52ffd +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 100644 -index 0000000000000000000000000000000000000000..f9d244b01bc2355707af6d263a16532fc2092eff +index 000000000..f9d244b01 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h @@ -0,0 +1,77 @@ @@ -318656,7 +318648,7 @@ index 0000000000000000000000000000000000000000..f9d244b01bc2355707af6d263a16532f + 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 100644 -index 0000000000000000000000000000000000000000..146fd48bab927d8d0a68cf955373f4450bc1c58c +index 000000000..146fd48ba --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_backend.c @@ -0,0 +1,482 @@ @@ -319144,7 +319136,7 @@ index 0000000000000000000000000000000000000000..146fd48bab927d8d0a68cf955373f445 +} 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 100644 -index 0000000000000000000000000000000000000000..85890f1e85f54a43e8a5cd4cbe26326dcda01933 +index 000000000..85890f1e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.c @@ -0,0 +1,182 @@ @@ -319332,7 +319324,7 @@ index 0000000000000000000000000000000000000000..85890f1e85f54a43e8a5cd4cbe26326d +} 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 100644 -index 0000000000000000000000000000000000000000..ee9e751f2d79b6b68cd332e840fe646737d65319 +index 000000000..ee9e751f2 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.h @@ -0,0 +1,92 @@ @@ -319430,7 +319422,7 @@ index 0000000000000000000000000000000000000000..ee9e751f2d79b6b68cd332e840fe6467 +#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 100644 -index 0000000000000000000000000000000000000000..66bf660cffb6ef08bde48b1c18f4d14684fc031e +index 000000000..66bf660cf --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c @@ -0,0 +1,129 @@ @@ -319565,7 +319557,7 @@ index 0000000000000000000000000000000000000000..66bf660cffb6ef08bde48b1c18f4d146 + 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 100644 -index 0000000000000000000000000000000000000000..7ab3cd4d8460122f9fc02f8a20c1a442baf8a8e2 +index 000000000..7ab3cd4d8 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h @@ -0,0 +1,55 @@ @@ -319626,7 +319618,7 @@ index 0000000000000000000000000000000000000000..7ab3cd4d8460122f9fc02f8a20c1a442 + 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 100644 -index 0000000000000000000000000000000000000000..864612d31f9b361a6f748f6bacdced2effdce23d +index 000000000..864612d31 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.c @@ -0,0 +1,65 @@ @@ -319697,7 +319689,7 @@ index 0000000000000000000000000000000000000000..864612d31f9b361a6f748f6bacdced2e +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 100644 -index 0000000000000000000000000000000000000000..a763155cb703d868aa70050d9c6060923c113ff7 +index 000000000..a763155cb --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h @@ -0,0 +1,40 @@ @@ -319743,7 +319735,7 @@ index 0000000000000000000000000000000000000000..a763155cb703d868aa70050d9c606092 + 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 100644 -index 0000000000000000000000000000000000000000..f891fa225a89f10365bb4d47382ffcc4b75d0601 +index 000000000..f891fa225 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.c @@ -0,0 +1,70 @@ @@ -319819,7 +319811,7 @@ index 0000000000000000000000000000000000000000..f891fa225a89f10365bb4d47382ffcc4 +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 100644 -index 0000000000000000000000000000000000000000..749d305eee9a90d0800f2134f02911e34a37fec6 +index 000000000..749d305ee --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h @@ -0,0 +1,64 @@ @@ -319889,7 +319881,7 @@ index 0000000000000000000000000000000000000000..749d305eee9a90d0800f2134f02911e3 +#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 100644 -index 0000000000000000000000000000000000000000..352744ee6d730107781a316d4e930ac3ac4b442c +index 000000000..352744ee6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h @@ -0,0 +1,519 @@ @@ -320414,7 +320406,7 @@ index 0000000000000000000000000000000000000000..352744ee6d730107781a316d4e930ac3 +#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 100644 -index 0000000000000000000000000000000000000000..81322fd0dd1757fdd9f51b1546ed7c42ca0dd21e +index 000000000..81322fd0d --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c @@ -0,0 +1,73 @@ @@ -320493,7 +320485,7 @@ index 0000000000000000000000000000000000000000..81322fd0dd1757fdd9f51b1546ed7c42 +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 100644 -index 0000000000000000000000000000000000000000..c0c84b6e9189143d8308ae5ef689390f77d178e6 +index 000000000..c0c84b6e9 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h @@ -0,0 +1,64 @@ @@ -320563,7 +320555,7 @@ index 0000000000000000000000000000000000000000..c0c84b6e9189143d8308ae5ef689390f +#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 100644 -index 0000000000000000000000000000000000000000..82727937c54577e53819bfd88d5f263dea35f95d +index 000000000..82727937c --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_driver.c @@ -0,0 +1,1713 @@ @@ -322282,7 +322274,7 @@ index 0000000000000000000000000000000000000000..82727937c54577e53819bfd88d5f263d +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 100644 -index 0000000000000000000000000000000000000000..6804f45ac27b52bc7330a5521e4afb28af6dfc5e +index 000000000..6804f45ac --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_internal.h @@ -0,0 +1,548 @@ @@ -322836,7 +322828,7 @@ index 0000000000000000000000000000000000000000..6804f45ac27b52bc7330a5521e4afb28 +#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 100644 -index 0000000000000000000000000000000000000000..024248ca7123415c3c65bf0d225ca785e6463bfe +index 000000000..024248ca7 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_metrics.c @@ -0,0 +1,401 @@ @@ -323243,7 +323235,7 @@ index 0000000000000000000000000000000000000000..024248ca7123415c3c65bf0d225ca785 +} 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 100644 -index 0000000000000000000000000000000000000000..075f020c66e6b28a589ab5754cc5269e92cf55bd +index 000000000..075f020c6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.c @@ -0,0 +1,973 @@ @@ -324222,7 +324214,7 @@ index 0000000000000000000000000000000000000000..075f020c66e6b28a589ab5754cc5269e +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 100644 -index 0000000000000000000000000000000000000000..611a90e66e65939138249a929f842780ec6f25fb +index 000000000..611a90e66 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.h @@ -0,0 +1,227 @@ @@ -324455,7 +324447,7 @@ index 0000000000000000000000000000000000000000..611a90e66e65939138249a929f842780 +#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 100644 -index 0000000000000000000000000000000000000000..d08c628dd433f29f1c1a4edd57e14e6e2c403902 +index 000000000..d08c628dd --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c @@ -0,0 +1,103 @@ @@ -324564,7 +324556,7 @@ index 0000000000000000000000000000000000000000..d08c628dd433f29f1c1a4edd57e14e6e +#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 100644 -index 0000000000000000000000000000000000000000..433aa4b9cb5e143f04e98db431a85f8a4b09c583 +index 000000000..433aa4b9c --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.h @@ -0,0 +1,52 @@ @@ -324622,7 +324614,7 @@ index 0000000000000000000000000000000000000000..433aa4b9cb5e143f04e98db431a85f8a +#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 -index 0000000000000000000000000000000000000000..35ff2f1ce4a0680383b8461019294a865d808564 +index 000000000..35ff2f1ce --- /dev/null +++ b/drivers/gpu/arm/midgard/docs/Doxyfile @@ -0,0 +1,126 @@ @@ -324754,7 +324746,7 @@ index 0000000000000000000000000000000000000000..35ff2f1ce4a0680383b8461019294a86 + 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 -index 0000000000000000000000000000000000000000..7ae05c2f8ded45f753af74797084d8ef27369eb0 +index 000000000..7ae05c2f8 --- /dev/null +++ b/drivers/gpu/arm/midgard/docs/policy_operation_diagram.dot @@ -0,0 +1,112 @@ @@ -324872,7 +324864,7 @@ index 0000000000000000000000000000000000000000..7ae05c2f8ded45f753af74797084d8ef +} diff --git a/drivers/gpu/arm/midgard/docs/policy_overview.dot b/drivers/gpu/arm/midgard/docs/policy_overview.dot new file mode 100755 -index 0000000000000000000000000000000000000000..159b993b7d61f67e0d16ea4c245633b6e2404215 +index 000000000..159b993b7 --- /dev/null +++ b/drivers/gpu/arm/midgard/docs/policy_overview.dot @@ -0,0 +1,63 @@ @@ -324941,7 +324933,7 @@ index 0000000000000000000000000000000000000000..159b993b7d61f67e0d16ea4c245633b6 +} diff --git a/drivers/gpu/arm/midgard/ipa/Kbuild b/drivers/gpu/arm/midgard/ipa/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..602b15f5225ca79aeeb14b7ce798b01ae7bdf069 +index 000000000..602b15f52 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/Kbuild @@ -0,0 +1,24 @@ @@ -324971,7 +324963,7 @@ index 0000000000000000000000000000000000000000..602b15f5225ca79aeeb14b7ce798b01a +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 100644 -index 0000000000000000000000000000000000000000..0c91117008a52d8b02216e1f10b41c907de36983 +index 000000000..0c9111700 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c @@ -0,0 +1,589 @@ @@ -325566,7 +325558,7 @@ index 0000000000000000000000000000000000000000..0c91117008a52d8b02216e1f10b41c90 +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 100644 -index 0000000000000000000000000000000000000000..b2d3db149579fca397001913c8070725ef6b1471 +index 000000000..b2d3db149 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h @@ -0,0 +1,148 @@ @@ -325720,7 +325712,7 @@ index 0000000000000000000000000000000000000000..b2d3db149579fca397001913c8070725 +#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 100644 -index 0000000000000000000000000000000000000000..eafc14009ddcc2ca07936e2381a14d4e54daac5d +index 000000000..eafc14009 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.c @@ -0,0 +1,219 @@ @@ -325945,7 +325937,7 @@ index 0000000000000000000000000000000000000000..eafc14009ddcc2ca07936e2381a14d4e +} 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 100644 -index 0000000000000000000000000000000000000000..ec06e2096f94278cc59e621d7494bc82280435b8 +index 000000000..ec06e2096 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.h @@ -0,0 +1,49 @@ @@ -326000,7 +325992,7 @@ index 0000000000000000000000000000000000000000..ec06e2096f94278cc59e621d7494bc82 +#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 100644 -index 0000000000000000000000000000000000000000..da0a4d4a0e7e032ce6584df6fa70594a2e708c1d +index 000000000..da0a4d4a0 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_simple.c @@ -0,0 +1,222 @@ @@ -326228,7 +326220,7 @@ index 0000000000000000000000000000000000000000..da0a4d4a0e7e032ce6584df6fa70594a +}; 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 100644 -index 0000000000000000000000000000000000000000..6be0a334f99f671164dac25bb7b8171f2ddde3cc +index 000000000..6be0a334f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_hwconfig_features.h @@ -0,0 +1,311 @@ @@ -326545,7 +326537,7 @@ index 0000000000000000000000000000000000000000..6be0a334f99f671164dac25bb7b8171f +#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 100644 -index 0000000000000000000000000000000000000000..6d7e5c57e6a4ab9663d8a274b1ac562b090d1130 +index 000000000..6d7e5c57e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_hwconfig_issues.h @@ -0,0 +1,1098 @@ @@ -327649,7 +327641,7 @@ index 0000000000000000000000000000000000000000..6d7e5c57e6a4ab9663d8a274b1ac562b +#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 100644 -index 0000000000000000000000000000000000000000..ea5e473caef65f52d14c4d5cc238eeeca4fb9834 +index 000000000..ea5e473ca --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_kernel.h @@ -0,0 +1,1858 @@ @@ -329513,7 +329505,7 @@ index 0000000000000000000000000000000000000000..ea5e473caef65f52d14c4d5cc238eeec +#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 100644 -index 0000000000000000000000000000000000000000..4a98a72cc37a73a079bedbc569ff7b38937035b7 +index 000000000..4a98a72cc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_mem_priv.h @@ -0,0 +1,52 @@ @@ -329571,7 +329563,7 @@ index 0000000000000000000000000000000000000000..4a98a72cc37a73a079bedbc569ff7b38 +#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 100644 -index 0000000000000000000000000000000000000000..be454a216a39994991731be7451b76229272fc85 +index 000000000..be454a216 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_vendor_specific_func.h @@ -0,0 +1,24 @@ @@ -329601,7 +329593,7 @@ index 0000000000000000000000000000000000000000..be454a216a39994991731be7451b7622 +#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 100644 -index 0000000000000000000000000000000000000000..0d9bf23dc685bbe969f1043bf7f661ee8168c407 +index 000000000..0d9bf23dc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase.h @@ -0,0 +1,612 @@ @@ -330219,7 +330211,7 @@ index 0000000000000000000000000000000000000000..0d9bf23dc685bbe969f1043bf7f661ee + 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 100644 -index 0000000000000000000000000000000000000000..fde0f8ff85822a49d85b925e8026df33fa7dfc1e +index 000000000..fde0f8ff8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.c @@ -0,0 +1,209 @@ @@ -330434,7 +330426,7 @@ index 0000000000000000000000000000000000000000..fde0f8ff85822a49d85b925e8026df33 +} 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 100644 -index 0000000000000000000000000000000000000000..099a29861672e667cfc0a1369b7494c96d7e704e +index 000000000..099a29861 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.h @@ -0,0 +1,23 @@ @@ -330463,7 +330455,7 @@ index 0000000000000000000000000000000000000000..099a29861672e667cfc0a1369b7494c9 +#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 100644 -index 0000000000000000000000000000000000000000..f910fe970feb5f4e8489bbef4cd2d1f93a6d677b +index 000000000..f910fe970 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.c @@ -0,0 +1,102 @@ @@ -330571,7 +330563,7 @@ index 0000000000000000000000000000000000000000..f910fe970feb5f4e8489bbef4cd2d1f9 +} 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 100644 -index 0000000000000000000000000000000000000000..3ed2248897fc1b4f6423a0eb6688eb19a4cca7f6 +index 000000000..3ed224889 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.h @@ -0,0 +1,45 @@ @@ -330622,7 +330614,7 @@ index 0000000000000000000000000000000000000000..3ed2248897fc1b4f6423a0eb6688eb19 +#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 100644 -index 0000000000000000000000000000000000000000..c67b3e97f1af7843937b7577bb0b74ebd6f2bb4a +index 000000000..c67b3e97f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.c @@ -0,0 +1,64 @@ @@ -330692,7 +330684,7 @@ index 0000000000000000000000000000000000000000..c67b3e97f1af7843937b7577bb0b74eb +} 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 100644 -index 0000000000000000000000000000000000000000..0c18bdb357b0a6565ab70d62156b2558a5b1107a +index 000000000..0c18bdb35 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.h @@ -0,0 +1,45 @@ @@ -330743,7 +330735,7 @@ index 0000000000000000000000000000000000000000..0c18bdb357b0a6565ab70d62156b2558 +#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 100644 -index 0000000000000000000000000000000000000000..fb615ae02ead96b06146b17c58689cf55c73ccac +index 000000000..fb615ae02 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_config.c @@ -0,0 +1,51 @@ @@ -330800,7 +330792,7 @@ index 0000000000000000000000000000000000000000..fb615ae02ead96b06146b17c58689cf5 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_config.h b/drivers/gpu/arm/midgard/mali_kbase_config.h new file mode 100644 -index 0000000000000000000000000000000000000000..356d52bcd77464c5b24336199d7027a135df06ec +index 000000000..356d52bcd --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_config.h @@ -0,0 +1,345 @@ @@ -331151,7 +331143,7 @@ index 0000000000000000000000000000000000000000..356d52bcd77464c5b24336199d7027a1 +#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 100644 -index 0000000000000000000000000000000000000000..1cf44b3500cf1b48691a676427bba868353ac1b9 +index 000000000..1cf44b350 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h @@ -0,0 +1,227 @@ @@ -331384,7 +331376,7 @@ index 0000000000000000000000000000000000000000..1cf44b3500cf1b48691a676427bba868 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_context.c b/drivers/gpu/arm/midgard/mali_kbase_context.c new file mode 100644 -index 0000000000000000000000000000000000000000..6338a7e221ed1647fda862f2661471efb5f2be53 +index 000000000..6338a7e22 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_context.c @@ -0,0 +1,342 @@ @@ -331732,7 +331724,7 @@ index 0000000000000000000000000000000000000000..6338a7e221ed1647fda862f2661471ef +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 100644 -index 0000000000000000000000000000000000000000..a3f5bb0ce0da38a43ca5cef4f3151cac79351ab0 +index 000000000..a3f5bb0ce --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_context.h @@ -0,0 +1,90 @@ @@ -331828,7 +331820,7 @@ index 0000000000000000000000000000000000000000..a3f5bb0ce0da38a43ca5cef4f3151cac +#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 100644 -index 0000000000000000000000000000000000000000..738766f8813f1f5594f5e4405f8da579288ccae0 +index 000000000..738766f88 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c @@ -0,0 +1,5023 @@ @@ -336857,7 +336849,7 @@ index 0000000000000000000000000000000000000000..738766f8813f1f5594f5e4405f8da579 +#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 100644 -index 0000000000000000000000000000000000000000..ce004841403f4e54a4a3838c5d02889a53eaf2ec +index 000000000..ce0048414 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.c @@ -0,0 +1,208 @@ @@ -337071,7 +337063,7 @@ index 0000000000000000000000000000000000000000..ce004841403f4e54a4a3838c5d02889a +} 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 100644 -index 0000000000000000000000000000000000000000..47474fecc2a9db525bc04121a872fa950cafa728 +index 000000000..47474fecc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.h @@ -0,0 +1,134 @@ @@ -337211,7 +337203,7 @@ index 0000000000000000000000000000000000000000..47474fecc2a9db525bc04121a872fa95 +#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 100644 -index 0000000000000000000000000000000000000000..fb57ac2e31adb854743957aa2d5c0c3ca076fa21 +index 000000000..fb57ac2e3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug.c @@ -0,0 +1,39 @@ @@ -337256,7 +337248,7 @@ index 0000000000000000000000000000000000000000..fb57ac2e31adb854743957aa2d5c0c3c + diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug.h b/drivers/gpu/arm/midgard/mali_kbase_debug.h new file mode 100644 -index 0000000000000000000000000000000000000000..5fff2892bb5540f0d5f2bf5cc99d68c20c3df3e1 +index 000000000..5fff2892b --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug.h @@ -0,0 +1,164 @@ @@ -337426,7 +337418,7 @@ index 0000000000000000000000000000000000000000..5fff2892bb5540f0d5f2bf5cc99d68c2 +#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 100644 -index 0000000000000000000000000000000000000000..f29430ddf8f9bd5e551a61a588f16ec27a59a505 +index 000000000..f29430ddf --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.c @@ -0,0 +1,499 @@ @@ -337931,7 +337923,7 @@ index 0000000000000000000000000000000000000000..f29430ddf8f9bd5e551a61a588f16ec2 +#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 100644 -index 0000000000000000000000000000000000000000..a2bf8983c37c8eea76ad971c80d62605481b79e7 +index 000000000..a2bf8983c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.h @@ -0,0 +1,96 @@ @@ -338033,7 +338025,7 @@ index 0000000000000000000000000000000000000000..a2bf8983c37c8eea76ad971c80d62605 +#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 100644 -index 0000000000000000000000000000000000000000..6f2cbdf571cb3e060a3e2d622f65d8a947ca97f6 +index 000000000..6f2cbdf57 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c @@ -0,0 +1,306 @@ @@ -338345,7 +338337,7 @@ index 0000000000000000000000000000000000000000..6f2cbdf571cb3e060a3e2d622f65d8a9 +#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 100644 -index 0000000000000000000000000000000000000000..20ab51a776c6c9ebcb6b0855090ebf1f9fc52c9d +index 000000000..20ab51a77 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.h @@ -0,0 +1,25 @@ @@ -338376,7 +338368,7 @@ index 0000000000000000000000000000000000000000..20ab51a776c6c9ebcb6b0855090ebf1f +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_defs.h b/drivers/gpu/arm/midgard/mali_kbase_defs.h new file mode 100644 -index 0000000000000000000000000000000000000000..f8a6f33df2da8b0d068fc4e54776fbad3028e547 +index 000000000..f8a6f33df --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_defs.h @@ -0,0 +1,1602 @@ @@ -339984,7 +339976,7 @@ index 0000000000000000000000000000000000000000..f8a6f33df2da8b0d068fc4e54776fbad +#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 100644 -index 0000000000000000000000000000000000000000..b0eb67da8644c04f793fc36a65d7b3323f82f088 +index 000000000..b0eb67da8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_device.c @@ -0,0 +1,674 @@ @@ -340664,7 +340656,7 @@ index 0000000000000000000000000000000000000000..b0eb67da8644c04f793fc36a65d7b332 + 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 100644 -index 0000000000000000000000000000000000000000..f70bcccf4050f59ad8fd1302c3d1b946aca7c218 +index 000000000..f70bcccf4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_disjoint_events.c @@ -0,0 +1,76 @@ @@ -340746,7 +340738,7 @@ index 0000000000000000000000000000000000000000..f70bcccf4050f59ad8fd1302c3d1b946 +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 100644 -index 0000000000000000000000000000000000000000..9197743c81d427adda5546240f8918bd9a2c0560 +index 000000000..9197743c8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.c @@ -0,0 +1,449 @@ @@ -341201,7 +341193,7 @@ index 0000000000000000000000000000000000000000..9197743c81d427adda5546240f8918bd +} 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 100644 -index 0000000000000000000000000000000000000000..c9ab403504221e03344b8d18a5600b34974f0b64 +index 000000000..c9ab40350 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.h @@ -0,0 +1,131 @@ @@ -341338,7 +341330,7 @@ index 0000000000000000000000000000000000000000..c9ab403504221e03344b8d18a5600b34 +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_event.c b/drivers/gpu/arm/midgard/mali_kbase_event.c new file mode 100644 -index 0000000000000000000000000000000000000000..188148645f374b8cb3a2772837e9eac3448f18fa +index 000000000..188148645 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_event.c @@ -0,0 +1,259 @@ @@ -341603,7 +341595,7 @@ index 0000000000000000000000000000000000000000..188148645f374b8cb3a2772837e9eac3 +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 100644 -index 0000000000000000000000000000000000000000..3bcfb38c31c29af9f5626de6df0eb4b374bb6b84 +index 000000000..3bcfb38c3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_fence.c @@ -0,0 +1,200 @@ @@ -341809,7 +341801,7 @@ index 0000000000000000000000000000000000000000..3bcfb38c31c29af9f5626de6df0eb4b3 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_fence.h b/drivers/gpu/arm/midgard/mali_kbase_fence.h new file mode 100644 -index 0000000000000000000000000000000000000000..639cc2ef4348c43c53dca3c9dd6c70c5e6e70ee5 +index 000000000..639cc2ef4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_fence.h @@ -0,0 +1,275 @@ @@ -342090,7 +342082,7 @@ index 0000000000000000000000000000000000000000..639cc2ef4348c43c53dca3c9dd6c70c5 +#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 100644 -index 0000000000000000000000000000000000000000..fa2c6dfe999e36cbaa784bb104b874b0a6df5ea4 +index 000000000..fa2c6dfe9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h @@ -0,0 +1,51 @@ @@ -342147,7 +342139,7 @@ index 0000000000000000000000000000000000000000..fa2c6dfe999e36cbaa784bb104b874b0 +#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 100644 -index 0000000000000000000000000000000000000000..ce65b5562a2b5329fc7025fc041ead7a5c6967ed +index 000000000..ce65b5562 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator.h @@ -0,0 +1,45 @@ @@ -342198,7 +342190,7 @@ index 0000000000000000000000000000000000000000..ce65b5562a2b5329fc7025fc041ead7a +#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 100644 -index 0000000000000000000000000000000000000000..860e10159fb35d5ed1f1a12432d8d66c87c3b0b4 +index 000000000..860e10159 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_api.c @@ -0,0 +1,334 @@ @@ -342538,7 +342530,7 @@ index 0000000000000000000000000000000000000000..860e10159fb35d5ed1f1a12432d8d66c +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 100644 -index 0000000000000000000000000000000000000000..ef9ac0f7b633d93aacba71878695b4fa3af11de2 +index 000000000..ef9ac0f7b --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_api.h @@ -0,0 +1,219 @@ @@ -342763,7 +342755,7 @@ index 0000000000000000000000000000000000000000..ef9ac0f7b633d93aacba71878695b4fa +#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 100644 -index 0000000000000000000000000000000000000000..cad19b66200d6ce472d796b8e901ee9ae5cd0cfe +index 000000000..cad19b662 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names.h @@ -0,0 +1,2170 @@ @@ -344939,7 +344931,7 @@ index 0000000000000000000000000000000000000000..cad19b66200d6ce472d796b8e901ee9a +#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 100644 -index 0000000000000000000000000000000000000000..bcceef4fc9bcdbc334612488e35e38077a9c8cd5 +index 000000000..bcceef4fc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_thex.h @@ -0,0 +1,291 @@ @@ -345236,7 +345228,7 @@ index 0000000000000000000000000000000000000000..bcceef4fc9bcdbc334612488e35e3807 +#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 100644 -index 0000000000000000000000000000000000000000..5ea06770fdb2a2b65a1f80fa89494ae02394058d +index 000000000..5ea06770f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tmix.h @@ -0,0 +1,291 @@ @@ -345533,7 +345525,7 @@ index 0000000000000000000000000000000000000000..5ea06770fdb2a2b65a1f80fa89494ae0 +#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 100644 -index 0000000000000000000000000000000000000000..be09c4556735765c7161c19559b4b75e66e9220e +index 000000000..be09c4556 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tsix.h @@ -0,0 +1,291 @@ @@ -345830,7 +345822,7 @@ index 0000000000000000000000000000000000000000..be09c4556735765c7161c19559b4b75e +#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 100644 -index 0000000000000000000000000000000000000000..42f0111c474fccbc770186334cce89d0e9e392db +index 000000000..42f0111c4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h @@ -0,0 +1,123 @@ @@ -345959,7 +345951,7 @@ index 0000000000000000000000000000000000000000..42f0111c474fccbc770186334cce89d0 +#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 100644 -index 0000000000000000000000000000000000000000..6df0a1cb1264a2c1dee76704faa97d07d3fa0088 +index 000000000..6df0a1cb1 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.c @@ -0,0 +1,97 @@ @@ -346062,7 +346054,7 @@ index 0000000000000000000000000000000000000000..6df0a1cb1264a2c1dee76704faa97d07 +#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 100644 -index 0000000000000000000000000000000000000000..7045693eb9109654896a0eed2a5173d1ad6523bb +index 000000000..7045693eb --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.h @@ -0,0 +1,37 @@ @@ -346105,7 +346097,7 @@ index 0000000000000000000000000000000000000000..7045693eb9109654896a0eed2a5173d1 +#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 100644 -index 0000000000000000000000000000000000000000..a947a2e03a2fb824ed5e934748d35093f7dd2b9b +index 000000000..a947a2e03 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.c @@ -0,0 +1,510 @@ @@ -346621,7 +346613,7 @@ index 0000000000000000000000000000000000000000..a947a2e03a2fb824ed5e934748d35093 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpuprops.h b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.h new file mode 100644 -index 0000000000000000000000000000000000000000..57b3eaf9cd5326c62ae542c0f13ad0e8dd624ccf +index 000000000..57b3eaf9c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.h @@ -0,0 +1,84 @@ @@ -346711,7 +346703,7 @@ index 0000000000000000000000000000000000000000..57b3eaf9cd5326c62ae542c0f13ad0e8 +#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 100644 -index 0000000000000000000000000000000000000000..10794fc273186bd63283283e6ad8436d01d777f0 +index 000000000..10794fc27 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops_types.h @@ -0,0 +1,92 @@ @@ -346809,7 +346801,7 @@ index 0000000000000000000000000000000000000000..10794fc273186bd63283283e6ad8436d +#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 100644 -index 0000000000000000000000000000000000000000..9a390d2339391788ade1c6b7dffca89a0bba435e +index 000000000..9a390d233 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hw.c @@ -0,0 +1,453 @@ @@ -347268,7 +347260,7 @@ index 0000000000000000000000000000000000000000..9a390d2339391788ade1c6b7dffca89a +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_hw.h b/drivers/gpu/arm/midgard/mali_kbase_hw.h new file mode 100644 -index 0000000000000000000000000000000000000000..754250ce968d94a56e1c34071907add5adeac70d +index 000000000..754250ce9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hw.h @@ -0,0 +1,65 @@ @@ -347339,7 +347331,7 @@ index 0000000000000000000000000000000000000000..754250ce968d94a56e1c34071907add5 +#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 100644 -index 0000000000000000000000000000000000000000..b09be99e6b4e104a272e9fb6f1426b3d0934aec2 +index 000000000..b09be99e6 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_backend.h @@ -0,0 +1,54 @@ @@ -347399,7 +347391,7 @@ index 0000000000000000000000000000000000000000..b09be99e6b4e104a272e9fb6f1426b3d +#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 100644 -index 0000000000000000000000000000000000000000..0acf297192fdcf9b0508f4c542022e56b77b5963 +index 000000000..0acf29719 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_defs.h @@ -0,0 +1,36 @@ @@ -347441,7 +347433,7 @@ index 0000000000000000000000000000000000000000..0acf297192fdcf9b0508f4c542022e56 +#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 100644 -index 0000000000000000000000000000000000000000..cf8a8131c22ed29b846f8c3b28029ec0147b0e1c +index 000000000..cf8a8131c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_gpuprops.h @@ -0,0 +1,47 @@ @@ -347494,7 +347486,7 @@ index 0000000000000000000000000000000000000000..cf8a8131c22ed29b846f8c3b28029ec0 +#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 100644 -index 0000000000000000000000000000000000000000..5de2b7535bb47c47677a4b955df9a64f54d0ec6b +index 000000000..5de2b7535 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_instr.h @@ -0,0 +1,116 @@ @@ -347616,7 +347608,7 @@ index 0000000000000000000000000000000000000000..5de2b7535bb47c47677a4b955df9a64f +#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 100644 -index 0000000000000000000000000000000000000000..750fda2cd81dec47769b3f5f6062479e6dd62c24 +index 000000000..750fda2cd --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_jm.h @@ -0,0 +1,381 @@ @@ -348003,7 +347995,7 @@ index 0000000000000000000000000000000000000000..750fda2cd81dec47769b3f5f6062479e +#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 100644 -index 0000000000000000000000000000000000000000..71c7d495c40ab924f6ec9fe01ffd2fd9d1263fd2 +index 000000000..71c7d495c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_pm.h @@ -0,0 +1,209 @@ @@ -348218,7 +348210,7 @@ index 0000000000000000000000000000000000000000..71c7d495c40ab924f6ec9fe01ffd2fd9 +#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 100644 -index 0000000000000000000000000000000000000000..10b65798e6cffe9d2c1f203aa94657cacd6e20fd +index 000000000..10b65798e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_time.h @@ -0,0 +1,53 @@ @@ -348277,7 +348269,7 @@ index 0000000000000000000000000000000000000000..10b65798e6cffe9d2c1f203aa94657ca +#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 100644 -index 0000000000000000000000000000000000000000..cf7bf1b35dc59e7c6c0a2aa1a3fcbb9f436150f8 +index 000000000..cf7bf1b35 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwcnt_reader.h @@ -0,0 +1,66 @@ @@ -348349,7 +348341,7 @@ index 0000000000000000000000000000000000000000..cf7bf1b35dc59e7c6c0a2aa1a3fcbb9f + diff --git a/drivers/gpu/arm/midgard/mali_kbase_ioctl.h b/drivers/gpu/arm/midgard/mali_kbase_ioctl.h new file mode 100644 -index 0000000000000000000000000000000000000000..dcbed9c774d67ddffe5a2f01f24672d433bc7f1c +index 000000000..dcbed9c77 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_ioctl.h @@ -0,0 +1,656 @@ @@ -349011,7 +349003,7 @@ index 0000000000000000000000000000000000000000..dcbed9c774d67ddffe5a2f01f24672d4 +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_jd.c b/drivers/gpu/arm/midgard/mali_kbase_jd.c new file mode 100644 -index 0000000000000000000000000000000000000000..d9d8658d31dc8b7c4b98a1f884a8c4bd11c5f8e7 +index 000000000..d9d8658d3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jd.c @@ -0,0 +1,1903 @@ @@ -350920,7 +350912,7 @@ index 0000000000000000000000000000000000000000..d9d8658d31dc8b7c4b98a1f884a8c4bd +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 100644 -index 0000000000000000000000000000000000000000..44643abf85aa0df9c34d5bd63a67fe938c42125d +index 000000000..44643abf8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c @@ -0,0 +1,233 @@ @@ -351159,7 +351151,7 @@ index 0000000000000000000000000000000000000000..44643abf85aa0df9c34d5bd63a67fe93 +#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 100644 -index 0000000000000000000000000000000000000000..0935f1db729674f1b54f08453027b3faf8545916 +index 000000000..0935f1db7 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.h @@ -0,0 +1,39 @@ @@ -351204,7 +351196,7 @@ index 0000000000000000000000000000000000000000..0935f1db729674f1b54f08453027b3fa +#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 100644 -index 0000000000000000000000000000000000000000..0c5c6a6f78cb39f1c2474cccf8c651f070b86204 +index 000000000..0c5c6a6f7 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jm.c @@ -0,0 +1,131 @@ @@ -351341,7 +351333,7 @@ index 0000000000000000000000000000000000000000..0c5c6a6f78cb39f1c2474cccf8c651f0 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_jm.h b/drivers/gpu/arm/midgard/mali_kbase_jm.h new file mode 100644 -index 0000000000000000000000000000000000000000..a74ee24c8058faa13f3767c05bbc8b1c3c86a561 +index 000000000..a74ee24c8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jm.h @@ -0,0 +1,110 @@ @@ -351457,7 +351449,7 @@ index 0000000000000000000000000000000000000000..a74ee24c8058faa13f3767c05bbc8b1c +#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 100644 -index 0000000000000000000000000000000000000000..10a1d5909bbe179281e2e1fca89e3827ef3f1ec7 +index 000000000..10a1d5909 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js.c @@ -0,0 +1,2834 @@ @@ -354297,7 +354289,7 @@ index 0000000000000000000000000000000000000000..10a1d5909bbe179281e2e1fca89e3827 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_js.h b/drivers/gpu/arm/midgard/mali_kbase_js.h new file mode 100644 -index 0000000000000000000000000000000000000000..ddada8e468a19b8f2645aaf88779e3615c8d9f94 +index 000000000..ddada8e46 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js.h @@ -0,0 +1,925 @@ @@ -355228,7 +355220,7 @@ index 0000000000000000000000000000000000000000..ddada8e468a19b8f2645aaf88779e361 +#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 100644 -index 0000000000000000000000000000000000000000..321506ada83597d189f2adc4884f1fd0298d7126 +index 000000000..321506ada --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.c @@ -0,0 +1,301 @@ @@ -355535,7 +355527,7 @@ index 0000000000000000000000000000000000000000..321506ada83597d189f2adc4884f1fd0 +} 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 100644 -index 0000000000000000000000000000000000000000..ce9183326a576fb3b4cf6bd0f128bfc35ac6349b +index 000000000..ce9183326 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.h @@ -0,0 +1,158 @@ @@ -355699,7 +355691,7 @@ index 0000000000000000000000000000000000000000..ce9183326a576fb3b4cf6bd0f128bfc3 +#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 100644 -index 0000000000000000000000000000000000000000..ba8b6441549bd8dcafdabeef999cc3e852a4761a +index 000000000..ba8b64415 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js_defs.h @@ -0,0 +1,386 @@ @@ -356091,7 +356083,7 @@ index 0000000000000000000000000000000000000000..ba8b6441549bd8dcafdabeef999cc3e8 +#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 100644 -index 0000000000000000000000000000000000000000..6d1e61fd41e038cfccc601b3d84d6d80d40157c8 +index 000000000..6d1e61fd4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_linux.h @@ -0,0 +1,43 @@ @@ -356140,7 +356132,7 @@ index 0000000000000000000000000000000000000000..6d1e61fd41e038cfccc601b3d84d6d80 +#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 100644 -index 0000000000000000000000000000000000000000..f372e02efd81dff59d6332820de5253cd207e6fd +index 000000000..f372e02ef --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem.c @@ -0,0 +1,2657 @@ @@ -358803,7 +358795,7 @@ index 0000000000000000000000000000000000000000..f372e02efd81dff59d6332820de5253c +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem.h b/drivers/gpu/arm/midgard/mali_kbase_mem.h new file mode 100644 -index 0000000000000000000000000000000000000000..3f3eaa3fda98aa50152bb0627ea7c2059505b420 +index 000000000..3f3eaa3fd --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem.h @@ -0,0 +1,1068 @@ @@ -359877,7 +359869,7 @@ index 0000000000000000000000000000000000000000..3f3eaa3fda98aa50152bb0627ea7c205 +#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 100644 -index 0000000000000000000000000000000000000000..de12cdf76cdfe0f299b3371d0a5eaeb23e4a4a5e +index 000000000..de12cdf76 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c @@ -0,0 +1,2574 @@ @@ -362457,7 +362449,7 @@ index 0000000000000000000000000000000000000000..de12cdf76cdfe0f299b3371d0a5eaeb2 + 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 100644 -index 0000000000000000000000000000000000000000..33b3554f9d82a814f58d820b0dfc5507c37ef11a +index 000000000..33b3554f9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.h @@ -0,0 +1,231 @@ @@ -362694,7 +362686,7 @@ index 0000000000000000000000000000000000000000..33b3554f9d82a814f58d820b0dfc5507 +#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 100644 -index 0000000000000000000000000000000000000000..9725fd3f05df9114cfeb59300944db3f44cff9d6 +index 000000000..9725fd3f0 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_lowlevel.h @@ -0,0 +1,45 @@ @@ -362745,7 +362737,7 @@ index 0000000000000000000000000000000000000000..9725fd3f05df9114cfeb59300944db3f +#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 100644 -index 0000000000000000000000000000000000000000..0cafb64eee2d9343e0103d75a2aeb6176647f325 +index 000000000..0cafb64ee --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool.c @@ -0,0 +1,573 @@ @@ -363324,7 +363316,7 @@ index 0000000000000000000000000000000000000000..0cafb64eee2d9343e0103d75a2aeb617 +} 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 100644 -index 0000000000000000000000000000000000000000..585fba036c9e6cf129bd8d122f8758604101a9f6 +index 000000000..585fba036 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.c @@ -0,0 +1,81 @@ @@ -363411,7 +363403,7 @@ index 0000000000000000000000000000000000000000..585fba036c9e6cf129bd8d122f875860 +#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 100644 -index 0000000000000000000000000000000000000000..1442854e8956ff72be9410a3965d4b2d1b520d5d +index 000000000..1442854e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.h @@ -0,0 +1,36 @@ @@ -363453,7 +363445,7 @@ index 0000000000000000000000000000000000000000..1442854e8956ff72be9410a3965d4b2d + 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 100644 -index 0000000000000000000000000000000000000000..d58fd8d62fdec99f6004b6995a0f77e87da9eb83 +index 000000000..d58fd8d62 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c @@ -0,0 +1,121 @@ @@ -363580,7 +363572,7 @@ index 0000000000000000000000000000000000000000..d58fd8d62fdec99f6004b6995a0f77e8 +#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 100644 -index 0000000000000000000000000000000000000000..a1dc2e0b165b9bb0eab1fe897b51adacbf0ecf41 +index 000000000..a1dc2e0b1 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.h @@ -0,0 +1,59 @@ @@ -363645,7 +363637,7 @@ index 0000000000000000000000000000000000000000..a1dc2e0b165b9bb0eab1fe897b51adac + 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 100644 -index 0000000000000000000000000000000000000000..82f0702974c20256d4eb12252dbdf3cb919764cc +index 000000000..82f070297 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs_buf_size.h @@ -0,0 +1,33 @@ @@ -363684,7 +363676,7 @@ index 0000000000000000000000000000000000000000..82f0702974c20256d4eb12252dbdf3cb + diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu.c b/drivers/gpu/arm/midgard/mali_kbase_mmu.c new file mode 100644 -index 0000000000000000000000000000000000000000..26144850a588498664c14c316de9a3bf198f5265 +index 000000000..26144850a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu.c @@ -0,0 +1,2088 @@ @@ -365778,7 +365770,7 @@ index 0000000000000000000000000000000000000000..26144850a588498664c14c316de9a3bf +} 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 100644 -index 0000000000000000000000000000000000000000..986e959e9a0c773a1654c5074ef31d5b89368b58 +index 000000000..986e959e9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_hw.h @@ -0,0 +1,123 @@ @@ -365907,7 +365899,7 @@ index 0000000000000000000000000000000000000000..986e959e9a0c773a1654c5074ef31d5b +#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 100644 -index 0000000000000000000000000000000000000000..b487c00426aea8cb1e3c1e7b4a2c74cbff0c5bb8 +index 000000000..b487c0042 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode.h @@ -0,0 +1,47 @@ @@ -365960,7 +365952,7 @@ index 0000000000000000000000000000000000000000..b487c00426aea8cb1e3c1e7b4a2c74cb +#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 100644 -index 0000000000000000000000000000000000000000..60df171164ff978e57fbec0fdb18463a3cc29846 +index 000000000..60df17116 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_aarch64.c @@ -0,0 +1,200 @@ @@ -366166,7 +366158,7 @@ index 0000000000000000000000000000000000000000..60df171164ff978e57fbec0fdb18463a +} 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 100644 -index 0000000000000000000000000000000000000000..53fbbc73af91e4e7ac33a2edbb5e8fbaa8b17a57 +index 000000000..53fbbc73a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_lpae.c @@ -0,0 +1,198 @@ @@ -366370,7 +366362,7 @@ index 0000000000000000000000000000000000000000..53fbbc73af91e4e7ac33a2edbb5e8fba +} 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 100644 -index 0000000000000000000000000000000000000000..1a44957fe44a59856aea91741a0ccab096fd8371 +index 000000000..1a44957fe --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_platform_fake.c @@ -0,0 +1,124 @@ @@ -366500,7 +366492,7 @@ index 0000000000000000000000000000000000000000..1a44957fe44a59856aea91741a0ccab0 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_pm.c b/drivers/gpu/arm/midgard/mali_kbase_pm.c new file mode 100644 -index 0000000000000000000000000000000000000000..97d543464c28bb1e20799c5b2104f0e343d43e7c +index 000000000..97d543464 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_pm.c @@ -0,0 +1,205 @@ @@ -366711,7 +366703,7 @@ index 0000000000000000000000000000000000000000..97d543464c28bb1e20799c5b2104f0e3 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_pm.h b/drivers/gpu/arm/midgard/mali_kbase_pm.h new file mode 100644 -index 0000000000000000000000000000000000000000..37fa2479df74ba85d0c3f9c48f6cb243d1c5d294 +index 000000000..37fa2479d --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_pm.h @@ -0,0 +1,171 @@ @@ -366888,7 +366880,7 @@ index 0000000000000000000000000000000000000000..37fa2479df74ba85d0c3f9c48f6cb243 +#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 100644 -index 0000000000000000000000000000000000000000..7fb674eded3734697b95690ee838e022b5d5e5df +index 000000000..7fb674ede --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_profiling_gator_api.h @@ -0,0 +1,40 @@ @@ -366934,7 +366926,7 @@ index 0000000000000000000000000000000000000000..7fb674eded3734697b95690ee838e022 +#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 100644 -index 0000000000000000000000000000000000000000..c970650069cd23ead75231f3ad5c22d6c082a0ef +index 000000000..c97065006 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.c @@ -0,0 +1,130 @@ @@ -367070,7 +367062,7 @@ index 0000000000000000000000000000000000000000..c970650069cd23ead75231f3ad5c22d6 +#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 100644 -index 0000000000000000000000000000000000000000..f1083700233094d3cee846da994319394e1e8d6b +index 000000000..f10837002 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.h @@ -0,0 +1,50 @@ @@ -367126,7 +367118,7 @@ index 0000000000000000000000000000000000000000..f1083700233094d3cee846da99431939 +#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 100644 -index 0000000000000000000000000000000000000000..84aa3316e43579176e4136f74c7f70a4021db1c4 +index 000000000..84aa3316e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_replay.c @@ -0,0 +1,1166 @@ @@ -368298,7 +368290,7 @@ index 0000000000000000000000000000000000000000..84aa3316e43579176e4136f74c7f70a4 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_smc.c b/drivers/gpu/arm/midgard/mali_kbase_smc.c new file mode 100644 -index 0000000000000000000000000000000000000000..6c8cf73ae58ce264888b2e26ac43def2881b5a3c +index 000000000..6c8cf73ae --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_smc.c @@ -0,0 +1,86 @@ @@ -368390,7 +368382,7 @@ index 0000000000000000000000000000000000000000..6c8cf73ae58ce264888b2e26ac43def2 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_smc.h b/drivers/gpu/arm/midgard/mali_kbase_smc.h new file mode 100644 -index 0000000000000000000000000000000000000000..9bff3d2e8b4d87e13833d5ca7f66d966991acef2 +index 000000000..9bff3d2e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_smc.h @@ -0,0 +1,67 @@ @@ -368463,7 +368455,7 @@ index 0000000000000000000000000000000000000000..9bff3d2e8b4d87e13833d5ca7f66d966 +#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 100644 -index 0000000000000000000000000000000000000000..396953e780a8795192c2c5c32844e5dac4fb79e0 +index 000000000..396953e78 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_softjobs.c @@ -0,0 +1,1549 @@ @@ -370018,7 +370010,7 @@ index 0000000000000000000000000000000000000000..396953e780a8795192c2c5c32844e5da +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_strings.c b/drivers/gpu/arm/midgard/mali_kbase_strings.c new file mode 100644 -index 0000000000000000000000000000000000000000..c98762cec24412d2cfd35eb1ba6e592a54639075 +index 000000000..c98762cec --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_strings.c @@ -0,0 +1,23 @@ @@ -370047,7 +370039,7 @@ index 0000000000000000000000000000000000000000..c98762cec24412d2cfd35eb1ba6e592a +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 100644 -index 0000000000000000000000000000000000000000..41b8fdbec6a43653d6d1cc515c281461f854c0b4 +index 000000000..41b8fdbec --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_strings.h @@ -0,0 +1,19 @@ @@ -370072,7 +370064,7 @@ index 0000000000000000000000000000000000000000..41b8fdbec6a43653d6d1cc515c281461 +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 100644 -index 0000000000000000000000000000000000000000..2cb8c182051ef1d87ad8b7d161563ce3e0829211 +index 000000000..2cb8c1820 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync.h @@ -0,0 +1,204 @@ @@ -370282,7 +370274,7 @@ index 0000000000000000000000000000000000000000..2cb8c182051ef1d87ad8b7d161563ce3 +#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 100644 -index 0000000000000000000000000000000000000000..d7349dcae69a07f949010e04d0e67bfd7f8f6e55 +index 000000000..d7349dcae --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync_android.c @@ -0,0 +1,537 @@ @@ -370825,7 +370817,7 @@ index 0000000000000000000000000000000000000000..d7349dcae69a07f949010e04d0e67bfd +#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 100644 -index 0000000000000000000000000000000000000000..457def296684781022380c7f2b546f2f6ec15105 +index 000000000..457def296 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync_common.c @@ -0,0 +1,43 @@ @@ -370874,7 +370866,7 @@ index 0000000000000000000000000000000000000000..457def296684781022380c7f2b546f2f +} 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 100644 -index 0000000000000000000000000000000000000000..60b5d74db33e5b35a823b136c966e96d12ae929c +index 000000000..60b5d74db --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync_file.c @@ -0,0 +1,359 @@ @@ -371239,7 +371231,7 @@ index 0000000000000000000000000000000000000000..60b5d74db33e5b35a823b136c966e96d +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_tlstream.c b/drivers/gpu/arm/midgard/mali_kbase_tlstream.c new file mode 100644 -index 0000000000000000000000000000000000000000..c8310c45f143c1c4e2beaff2bd1f03ca180cd8a6 +index 000000000..c8310c45f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_tlstream.c @@ -0,0 +1,2572 @@ @@ -373817,7 +373809,7 @@ index 0000000000000000000000000000000000000000..c8310c45f143c1c4e2beaff2bd1f03ca +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_tlstream.h b/drivers/gpu/arm/midgard/mali_kbase_tlstream.h new file mode 100644 -index 0000000000000000000000000000000000000000..c0a1117d5f25c174b4b46c9322a17f6f9e457d09 +index 000000000..c0a1117d5 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_tlstream.h @@ -0,0 +1,623 @@ @@ -374446,7 +374438,7 @@ index 0000000000000000000000000000000000000000..c0a1117d5f25c174b4b46c9322a17f6f + 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 100644 -index 0000000000000000000000000000000000000000..e2e0544208cea147292beae715b55eac88dea1af +index 000000000..e2e054420 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_defs.h @@ -0,0 +1,264 @@ @@ -374716,7 +374708,7 @@ index 0000000000000000000000000000000000000000..e2e0544208cea147292beae715b55eac +/* ***** 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 100644 -index 0000000000000000000000000000000000000000..5830e87f0818b62e46ce666cc3109ec785b3eab9 +index 000000000..5830e87f0 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c @@ -0,0 +1,236 @@ @@ -374958,7 +374950,7 @@ index 0000000000000000000000000000000000000000..5830e87f0818b62e46ce666cc3109ec7 +#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 100644 -index 0000000000000000000000000000000000000000..a04f7c1420e04f2b9973cb29052b8ea9d575186a +index 000000000..a04f7c142 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.h @@ -0,0 +1,363 @@ @@ -375327,7 +375319,7 @@ index 0000000000000000000000000000000000000000..a04f7c1420e04f2b9973cb29052b8ea9 + 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 100644 -index 0000000000000000000000000000000000000000..156a95a67f4aef2c8c305ffb24c46a06971ff347 +index 000000000..156a95a67 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline_defs.h @@ -0,0 +1,140 @@ @@ -375473,7 +375465,7 @@ index 0000000000000000000000000000000000000000..156a95a67f4aef2c8c305ffb24c46a06 +"_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 100644 -index 0000000000000000000000000000000000000000..c22a5932424859d7ab3e36cc9a819e1bf099d9f9 +index 000000000..c22a59324 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_uku.h @@ -0,0 +1,545 @@ @@ -376024,7 +376016,7 @@ index 0000000000000000000000000000000000000000..c22a5932424859d7ab3e36cc9a819e1b + diff --git a/drivers/gpu/arm/midgard/mali_kbase_utility.c b/drivers/gpu/arm/midgard/mali_kbase_utility.c new file mode 100644 -index 0000000000000000000000000000000000000000..be474ff8740124e39a83ec1b75e1b48c8d2a974f +index 000000000..be474ff87 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_utility.c @@ -0,0 +1,33 @@ @@ -376063,7 +376055,7 @@ index 0000000000000000000000000000000000000000..be474ff8740124e39a83ec1b75e1b48c +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_utility.h b/drivers/gpu/arm/midgard/mali_kbase_utility.h new file mode 100644 -index 0000000000000000000000000000000000000000..fd7252dab0de258d161ff0aa7328e6320fc5915b +index 000000000..fd7252dab --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_utility.h @@ -0,0 +1,37 @@ @@ -376106,7 +376098,7 @@ index 0000000000000000000000000000000000000000..fd7252dab0de258d161ff0aa7328e632 +#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 100644 -index 0000000000000000000000000000000000000000..8395568d0efa7bbeff56d2eb360bbddf271d1069 +index 000000000..8395568d0 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_vinstr.c @@ -0,0 +1,2070 @@ @@ -378182,7 +378174,7 @@ index 0000000000000000000000000000000000000000..8395568d0efa7bbeff56d2eb360bbddf +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_vinstr.h b/drivers/gpu/arm/midgard/mali_kbase_vinstr.h new file mode 100644 -index 0000000000000000000000000000000000000000..6207d25aef06ce0c3940b8b672cc3c0d15ff39cd +index 000000000..6207d25ae --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_vinstr.h @@ -0,0 +1,155 @@ @@ -378343,7 +378335,7 @@ index 0000000000000000000000000000000000000000..6207d25aef06ce0c3940b8b672cc3c0d + 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 100644 -index 0000000000000000000000000000000000000000..5d6b4021d626f8b7db4b73dd641b2f45a3f744b5 +index 000000000..5d6b4021d --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_linux_kbase_trace.h @@ -0,0 +1,201 @@ @@ -378550,7 +378542,7 @@ index 0000000000000000000000000000000000000000..5d6b4021d626f8b7db4b73dd641b2f45 +#include diff --git a/drivers/gpu/arm/midgard/mali_linux_trace.h b/drivers/gpu/arm/midgard/mali_linux_trace.h new file mode 100644 -index 0000000000000000000000000000000000000000..2be06a5527689cbd0b5b0ee08db9dfe7b3ee91ed +index 000000000..2be06a552 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_linux_trace.h @@ -0,0 +1,189 @@ @@ -378745,7 +378737,7 @@ index 0000000000000000000000000000000000000000..2be06a5527689cbd0b5b0ee08db9dfe7 +#include diff --git a/drivers/gpu/arm/midgard/mali_malisw.h b/drivers/gpu/arm/midgard/mali_malisw.h new file mode 100644 -index 0000000000000000000000000000000000000000..99452933eab480eb024780e4d9886edfc0e4b61c +index 000000000..99452933e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_malisw.h @@ -0,0 +1,131 @@ @@ -378882,7 +378874,7 @@ index 0000000000000000000000000000000000000000..99452933eab480eb024780e4d9886edf +#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 100644 -index 0000000000000000000000000000000000000000..a509cbd5f175982dae7016ef1ae4bfba6145220b +index 000000000..a509cbd5f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_midg_coherency.h @@ -0,0 +1,26 @@ @@ -378914,7 +378906,7 @@ index 0000000000000000000000000000000000000000..a509cbd5f175982dae7016ef1ae4bfba +#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 100644 -index 0000000000000000000000000000000000000000..7d7b7bcd3cc3a59bc4c0ba41542e65691385c3d6 +index 000000000..7d7b7bcd3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_midg_regmap.h @@ -0,0 +1,611 @@ @@ -379531,7 +379523,7 @@ index 0000000000000000000000000000000000000000..7d7b7bcd3cc3a59bc4c0ba41542e6569 +#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 100644 -index 0000000000000000000000000000000000000000..bd5f6614b6bb0897142bce5d76ccd8490c8eb2cb +index 000000000..bd5f6614b --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_timeline.h @@ -0,0 +1,396 @@ @@ -379933,7 +379925,7 @@ index 0000000000000000000000000000000000000000..bd5f6614b6bb0897142bce5d76ccd849 + diff --git a/drivers/gpu/arm/midgard/mali_uk.h b/drivers/gpu/arm/midgard/mali_uk.h new file mode 100644 -index 0000000000000000000000000000000000000000..841d03fb5873bff136b7039ec958dd53c9fba4fa +index 000000000..841d03fb5 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_uk.h @@ -0,0 +1,141 @@ @@ -380080,7 +380072,7 @@ index 0000000000000000000000000000000000000000..841d03fb5873bff136b7039ec958dd53 +#endif /* _UK_H_ */ diff --git a/drivers/gpu/arm/midgard/platform/Kconfig b/drivers/gpu/arm/midgard/platform/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..8fb4e917c4fa37407c5c11e707ba019910e0e184 +index 000000000..8fb4e917c --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/Kconfig @@ -0,0 +1,24 @@ @@ -380110,7 +380102,7 @@ index 0000000000000000000000000000000000000000..8fb4e917c4fa37407c5c11e707ba0199 + diff --git a/drivers/gpu/arm/midgard/platform/devicetree/Kbuild b/drivers/gpu/arm/midgard/platform/devicetree/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..e888a42fc69a7a8b4688e24d54950393bc7906f0 +index 000000000..e888a42fc --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/Kbuild @@ -0,0 +1,18 @@ @@ -380134,7 +380126,7 @@ index 0000000000000000000000000000000000000000..e888a42fc69a7a8b4688e24d54950393 + $(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 100644 -index 0000000000000000000000000000000000000000..b2a7c93f12a910ec0cfb700f1d4146806bcdebf4 +index 000000000..b2a7c93f1 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_devicetree.c @@ -0,0 +1,31 @@ @@ -380171,7 +380163,7 @@ index 0000000000000000000000000000000000000000..b2a7c93f12a910ec0cfb700f1d414680 +} 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 100644 -index 0000000000000000000000000000000000000000..49e107f98000b8bd0d6889752f38ff65ef277d3f +index 000000000..49e107f98 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_platform.h @@ -0,0 +1,73 @@ @@ -380250,7 +380242,7 @@ index 0000000000000000000000000000000000000000..49e107f98000b8bd0d6889752f38ff65 +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 100644 -index 0000000000000000000000000000000000000000..aa4376afd3ba368831f20bb29ca994d7c9d5cc90 +index 000000000..aa4376afd --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c @@ -0,0 +1,100 @@ @@ -380356,7 +380348,7 @@ index 0000000000000000000000000000000000000000..aa4376afd3ba368831f20bb29ca994d7 + 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 100644 -index 0000000000000000000000000000000000000000..c11085af5f24bed5f6cab084724b3c0600d6b505 +index 000000000..c11085af5 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_common.h @@ -0,0 +1,28 @@ @@ -380390,7 +380382,7 @@ index 0000000000000000000000000000000000000000..c11085af5f24bed5f6cab084724b3c06 +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 100644 -index 0000000000000000000000000000000000000000..01f9dfce93cc02269c79bc151de9afb3cbbb0950 +index 000000000..01f9dfce9 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_fake.h @@ -0,0 +1,38 @@ @@ -380434,7 +380426,7 @@ index 0000000000000000000000000000000000000000..01f9dfce93cc02269c79bc151de9afb3 +#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 -index 0000000000000000000000000000000000000000..db993487e3be5dbf666bce70e537d56a1109c4ce +index 000000000..db993487e --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/Kbuild @@ -0,0 +1,17 @@ @@ -380457,7 +380449,7 @@ index 0000000000000000000000000000000000000000..db993487e3be5dbf666bce70e537d56a + 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 100644 -index 0000000000000000000000000000000000000000..fe5e1224149e2cf4707e70283359a4900d235afb +index 000000000..fe5e12241 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/custom_log.h @@ -0,0 +1,209 @@ @@ -380672,7 +380664,7 @@ index 0000000000000000000000000000000000000000..fe5e1224149e2cf4707e70283359a490 +#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 100644 -index 0000000000000000000000000000000000000000..07c5b6f8a7605c8d6ec21a02bc246673fd6b4f38 +index 000000000..07c5b6f8a --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_platform.h @@ -0,0 +1,88 @@ @@ -380766,7 +380758,7 @@ index 0000000000000000000000000000000000000000..07c5b6f8a7605c8d6ec21a02bc246673 + 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 100644 -index 0000000000000000000000000000000000000000..8ad910c1256fb33a717a13edda0f460fd48993ec +index 000000000..8ad910c12 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c @@ -0,0 +1,492 @@ @@ -381264,7 +381256,7 @@ index 0000000000000000000000000000000000000000..8ad910c1256fb33a717a13edda0f460f +} 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 100644 -index 0000000000000000000000000000000000000000..6eab25014d2184f739dacc17749ea05b3af2a12a +index 000000000..6eab25014 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_rk.h @@ -0,0 +1,62 @@ @@ -381332,7 +381324,7 @@ index 0000000000000000000000000000000000000000..6eab25014d2184f739dacc17749ea05b + diff --git a/drivers/gpu/arm/midgard/platform/vexpress/Kbuild b/drivers/gpu/arm/midgard/platform/vexpress/Kbuild new file mode 100755 -index 0000000000000000000000000000000000000000..1caa293666d3ad500e586c85d5aaf70a05e93004 +index 000000000..1caa29366 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/Kbuild @@ -0,0 +1,18 @@ @@ -381356,7 +381348,7 @@ index 0000000000000000000000000000000000000000..1caa293666d3ad500e586c85d5aaf70a + $(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 100644 -index 0000000000000000000000000000000000000000..02835f129aa33ac32e9cb3c8d153966ae45de6f3 +index 000000000..02835f129 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_platform.h @@ -0,0 +1,75 @@ @@ -381437,7 +381429,7 @@ index 0000000000000000000000000000000000000000..02835f129aa33ac32e9cb3c8d153966a +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 100644 -index 0000000000000000000000000000000000000000..15ce2bc5eea5ee89bf03d4108788d6841a4958c3 +index 000000000..15ce2bc5e --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_vexpress.c @@ -0,0 +1,85 @@ @@ -381528,7 +381520,7 @@ index 0000000000000000000000000000000000000000..15ce2bc5eea5ee89bf03d4108788d684 +} 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 100644 -index 0000000000000000000000000000000000000000..4665f98cbbe488a60d25bf7ccacc04c8b09c9040 +index 000000000..4665f98cb --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.c @@ -0,0 +1,279 @@ @@ -381813,7 +381805,7 @@ index 0000000000000000000000000000000000000000..4665f98cbbe488a60d25bf7ccacc04c8 +} 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 100644 -index 0000000000000000000000000000000000000000..da865698133a34d8fac98fce9a548eb2864fcd9d +index 000000000..da8656981 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.h @@ -0,0 +1,38 @@ @@ -381857,7 +381849,7 @@ index 0000000000000000000000000000000000000000..da865698133a34d8fac98fce9a548eb2 +#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 -index 0000000000000000000000000000000000000000..7efe8fa4263b5d8d28753dcd644728d0ee239960 +index 000000000..7efe8fa42 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/Kbuild @@ -0,0 +1,16 @@ @@ -381879,7 +381871,7 @@ index 0000000000000000000000000000000000000000..7efe8fa4263b5d8d28753dcd644728d0 +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 100644 -index 0000000000000000000000000000000000000000..0efbf3962f984c4ac8d7c6b58505990904fd20f8 +index 000000000..0efbf3962 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h @@ -0,0 +1,73 @@ @@ -381958,7 +381950,7 @@ index 0000000000000000000000000000000000000000..0efbf3962f984c4ac8d7c6b585059909 +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 100644 -index 0000000000000000000000000000000000000000..3ff0930fb4a3c9cb9498358854a5ed5df97b8f41 +index 000000000..3ff0930fb --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c @@ -0,0 +1,79 @@ @@ -382043,7 +382035,7 @@ index 0000000000000000000000000000000000000000..3ff0930fb4a3c9cb9498358854a5ed5d +} 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 -index 0000000000000000000000000000000000000000..1caa293666d3ad500e586c85d5aaf70a05e93004 +index 000000000..1caa29366 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/Kbuild @@ -0,0 +1,18 @@ @@ -382067,7 +382059,7 @@ index 0000000000000000000000000000000000000000..1caa293666d3ad500e586c85d5aaf70a + $(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 100644 -index 0000000000000000000000000000000000000000..dbdf21e009f99459a572d408b44d6bade1007d0f +index 000000000..dbdf21e00 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h @@ -0,0 +1,75 @@ @@ -382148,7 +382140,7 @@ index 0000000000000000000000000000000000000000..dbdf21e009f99459a572d408b44d6bad +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 100644 -index 0000000000000000000000000000000000000000..76ffe4a1e59ea25345094fae69afa1cc1a31da38 +index 000000000..76ffe4a1e --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c @@ -0,0 +1,83 @@ @@ -382237,7 +382229,7 @@ index 0000000000000000000000000000000000000000..76ffe4a1e59ea25345094fae69afa1cc + 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 100644 -index 0000000000000000000000000000000000000000..816dff49835f3082c923242288bcf716d436db52 +index 000000000..816dff498 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c @@ -0,0 +1,71 @@ @@ -382314,7 +382306,7 @@ index 0000000000000000000000000000000000000000..816dff49835f3082c923242288bcf716 +} 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 100644 -index 0000000000000000000000000000000000000000..23647ccb087100722915c384776c487085b36471 +index 000000000..23647ccb0 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h @@ -0,0 +1,28 @@ @@ -382348,7 +382340,7 @@ index 0000000000000000000000000000000000000000..23647ccb087100722915c384776c4870 +#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 100644 -index 0000000000000000000000000000000000000000..5fa9b39c4bc0f135aaeaeab3934a973921948056 +index 000000000..5fa9b39c4 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform_dummy/mali_ukk_os.h @@ -0,0 +1,53 @@ @@ -382407,7 +382399,7 @@ index 0000000000000000000000000000000000000000..5fa9b39c4bc0f135aaeaeab3934a9739 +#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 100644 -index 0000000000000000000000000000000000000000..5dc2f3ba8cf62505561995869e933f676bd1e529 +index 000000000..5dc2f3ba8 --- /dev/null +++ b/drivers/gpu/arm/midgard/protected_mode_switcher.h @@ -0,0 +1,64 @@ @@ -382477,7 +382469,7 @@ index 0000000000000000000000000000000000000000..5dc2f3ba8cf62505561995869e933f67 +#endif /* _PROTECTED_MODE_SWITCH_H_ */ diff --git a/drivers/gpu/arm/midgard/rename.h b/drivers/gpu/arm/midgard/rename.h new file mode 100644 -index 0000000000000000000000000000000000000000..8218666183eafb81c269847db7a043a2bf4edfca +index 000000000..821866618 --- /dev/null +++ b/drivers/gpu/arm/midgard/rename.h @@ -0,0 +1,426 @@ @@ -382909,7 +382901,7 @@ index 0000000000000000000000000000000000000000..8218666183eafb81c269847db7a043a2 +#endif diff --git a/drivers/gpu/arm/midgard/sconscript b/drivers/gpu/arm/midgard/sconscript new file mode 100755 -index 0000000000000000000000000000000000000000..ff23d7aebe6e9914f5f5c7fe5ee0098a9d36bb50 +index 000000000..ff23d7aeb --- /dev/null +++ b/drivers/gpu/arm/midgard/sconscript @@ -0,0 +1,92 @@ @@ -383007,7 +382999,7 @@ index 0000000000000000000000000000000000000000..ff23d7aebe6e9914f5f5c7fe5ee0098a +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 -index 0000000000000000000000000000000000000000..b4bed04734391065442067e43ea71d16632cc6e0 +index 000000000..b4bed0473 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/Kbuild @@ -0,0 +1,17 @@ @@ -383030,7 +383022,7 @@ index 0000000000000000000000000000000000000000..b4bed04734391065442067e43ea71d16 +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 100644 -index 0000000000000000000000000000000000000000..da0515c065de900537804abdb3bc406151fa6a30 +index 000000000..da0515c06 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/Kconfig @@ -0,0 +1,17 @@ @@ -383053,7 +383045,7 @@ index 0000000000000000000000000000000000000000..da0515c065de900537804abdb3bc4061 +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 100644 -index 0000000000000000000000000000000000000000..0d145e42a0ca2288a62dc9d9a4a44ade7e3dbccf +index 000000000..0d145e42a --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_mem.h @@ -0,0 +1,65 @@ @@ -383124,7 +383116,7 @@ index 0000000000000000000000000000000000000000..0d145e42a0ca2288a62dc9d9a4a44ade +#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 100644 -index 0000000000000000000000000000000000000000..1cc85f1b7a46ad95ef073855c6886cc82c1fa62d +index 000000000..1cc85f1b7 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_resultset.h @@ -0,0 +1,121 @@ @@ -383251,7 +383243,7 @@ index 0000000000000000000000000000000000000000..1cc85f1b7a46ad95ef073855c6886cc8 +#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 100644 -index 0000000000000000000000000000000000000000..754c3adb1cca87fe3800530d0582c3374f6e6afe +index 000000000..754c3adb1 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_suite.h @@ -0,0 +1,508 @@ @@ -383765,7 +383757,7 @@ index 0000000000000000000000000000000000000000..754c3adb1cca87fe3800530d0582c337 +#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 100644 -index 0000000000000000000000000000000000000000..c458c1f73802b3c09fbd72796f8f20fbbed794f7 +index 000000000..c458c1f73 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_utils.h @@ -0,0 +1,55 @@ @@ -383826,7 +383818,7 @@ index 0000000000000000000000000000000000000000..c458c1f73802b3c09fbd72796f8f20fb +#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 -index 0000000000000000000000000000000000000000..6b840c2ef7b7e0269b925dc0823f2f12b110907c +index 000000000..6b840c2ef --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/Kbuild @@ -0,0 +1,20 @@ @@ -383852,7 +383844,7 @@ index 0000000000000000000000000000000000000000..6b840c2ef7b7e0269b925dc0823f2f12 +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 100644 -index 0000000000000000000000000000000000000000..84364716afe30203da5deba381c10207bdb40613 +index 000000000..84364716a --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/Kconfig @@ -0,0 +1,22 @@ @@ -383880,7 +383872,7 @@ index 0000000000000000000000000000000000000000..84364716afe30203da5deba381c10207 + 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 100644 -index 0000000000000000000000000000000000000000..010c92ca39b9fdeac4b635fd6d65d6d942f053fd +index 000000000..010c92ca3 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/Makefile @@ -0,0 +1,29 @@ @@ -383915,7 +383907,7 @@ index 0000000000000000000000000000000000000000..010c92ca39b9fdeac4b635fd6d65d6d9 + $(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 100644 -index 0000000000000000000000000000000000000000..5408e57d469afe2992544c9551837a52064e5776 +index 000000000..5408e57d4 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_mem.c @@ -0,0 +1,94 @@ @@ -384015,7 +384007,7 @@ index 0000000000000000000000000000000000000000..5408e57d469afe2992544c9551837a52 +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 100644 -index 0000000000000000000000000000000000000000..5bd04969fd55f7eb335d31ff3cfd07ae7a73c25c +index 000000000..5bd04969f --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_resultset.c @@ -0,0 +1,95 @@ @@ -384116,7 +384108,7 @@ index 0000000000000000000000000000000000000000..5bd04969fd55f7eb335d31ff3cfd07ae + 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 100644 -index 0000000000000000000000000000000000000000..a7cfd3be9c469b0e561df3415ee9fe965ad0bcdc +index 000000000..a7cfd3be9 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_suite.c @@ -0,0 +1,1041 @@ @@ -385163,7 +385155,7 @@ index 0000000000000000000000000000000000000000..a7cfd3be9c469b0e561df3415ee9fe96 +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 100644 -index 0000000000000000000000000000000000000000..a429a2dbf7880e437efdf8046388cfe454c4e3ef +index 000000000..a429a2dbf --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_utils.c @@ -0,0 +1,71 @@ @@ -385240,7 +385232,7 @@ index 0000000000000000000000000000000000000000..a429a2dbf7880e437efdf8046388cfe4 +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 -index 0000000000000000000000000000000000000000..d7f112448e42cc035575ebd21bf23f79099f4657 +index 000000000..d7f112448 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/sconscript @@ -0,0 +1,21 @@ @@ -385267,7 +385259,7 @@ index 0000000000000000000000000000000000000000..d7f112448e42cc035575ebd21bf23f79 +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 -index 0000000000000000000000000000000000000000..0cd9cebe9d8bd7176fdfde475e3f0662d426f41a +index 000000000..0cd9cebe9 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kbuild @@ -0,0 +1,20 @@ @@ -385293,7 +385285,7 @@ index 0000000000000000000000000000000000000000..0cd9cebe9d8bd7176fdfde475e3f0662 +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 100644 -index 0000000000000000000000000000000000000000..16f68d15c46e7b8952ceb6f4c586ef0bde7b1e07 +index 000000000..16f68d15c --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig @@ -0,0 +1,23 @@ @@ -385322,7 +385314,7 @@ index 0000000000000000000000000000000000000000..16f68d15c46e7b8952ceb6f4c586ef0b + 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 100644 -index 0000000000000000000000000000000000000000..4e948767a4ac5e8edc79c3c61eeafda7c52d8b7e +index 000000000..4e948767a --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Makefile @@ -0,0 +1,51 @@ @@ -385379,7 +385371,7 @@ index 0000000000000000000000000000000000000000..4e948767a4ac5e8edc79c3c61eeafda7 + $(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 100644 -index 0000000000000000000000000000000000000000..e2ff4432bf808e8a4cee2c8fb3624f066c43a19a +index 000000000..e2ff4432b --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c @@ -0,0 +1,257 @@ @@ -385642,7 +385634,7 @@ index 0000000000000000000000000000000000000000..e2ff4432bf808e8a4cee2c8fb3624f06 +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 -index 0000000000000000000000000000000000000000..ec837f16448d27c221b4fe1006342024bafa2222 +index 000000000..ec837f164 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/sconscript @@ -0,0 +1,30 @@ @@ -385678,7 +385670,7 @@ index 0000000000000000000000000000000000000000..ec837f16448d27c221b4fe1006342024 + 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 -index 0000000000000000000000000000000000000000..5337e1078e208df7c082f0a59301b3e5455dfc6e +index 000000000..5337e1078 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/sconscript @@ -0,0 +1,37 @@ @@ -385721,7 +385713,7 @@ index 0000000000000000000000000000000000000000..5337e1078e208df7c082f0a59301b3e5 + SConscript('mali_kutf_vinstr_test/sconscript') diff --git a/drivers/gpu/arm/sconscript b/drivers/gpu/arm/sconscript new file mode 100755 -index 0000000000000000000000000000000000000000..a06092bd5bf03c6087975aadc021b1ed3b26bb51 +index 000000000..a06092bd5 --- /dev/null +++ b/drivers/gpu/arm/sconscript @@ -0,0 +1,25 @@ @@ -385751,7 +385743,7 @@ index 0000000000000000000000000000000000000000..a06092bd5bf03c6087975aadc021b1ed + +SConscript('midgard/sconscript') diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig -index ec4abf9ff47b5f3b7efb1a89884e1567add4e36d..fd71712ecc1b6656a8a02197c73b59f4c0b4d07b 100644 +index 3caa02039..25f4aab7e 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -35,6 +35,18 @@ config DRM_MIPI_DBI @@ -385774,7 +385766,7 @@ index ec4abf9ff47b5f3b7efb1a89884e1567add4e36d..fd71712ecc1b6656a8a02197c73b59f4 bool depends on DRM diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c -index df9370e0ff2306c73d829a44b63eb5b0c1876850..1b701b1133cb8d7cfb47930547a578b751accf28 100644 +index df9370e0f..1b701b113 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -8,11 +8,13 @@ @@ -387877,7 +387869,7 @@ index df9370e0ff2306c73d829a44b63eb5b0c1876850..1b701b1133cb8d7cfb47930547a578b7 int analogix_dp_start_crc(struct drm_connector *connector) { diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h -index 433f2d7efa0cd79c8b2eccfd2df16dcdc44dae93..87c9cefbce1b347f828d517b8b10a43072d3935c 100644 +index 433f2d7ef..87c9cefbc 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h @@ -11,6 +11,7 @@ @@ -388043,7 +388035,7 @@ index 433f2d7efa0cd79c8b2eccfd2df16dcdc44dae93..87c9cefbce1b347f828d517b8b10a430 #endif /* _ANALOGIX_DP_CORE_H */ diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c -index 6a4f20fccf84170ea5525d723361a157c15f7b45..e756d7cd3d414c057d9a3adc5b9eb89d7aee0441 100644 +index 6a4f20fcc..e756d7cd3 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c @@ -11,30 +11,44 @@ @@ -389654,7 +389646,7 @@ index 6a4f20fccf84170ea5525d723361a157c15f7b45..e756d7cd3d414c057d9a3adc5b9eb89d + analogix_dp_init_aux(dp); +} diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h -index e284ee8da58ba4cc39b41f87834502327546150a..0a368b1722ec117a99baf355d485e01c71d35eb9 100644 +index e284ee8da..0a368b172 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h @@ -15,9 +15,27 @@ @@ -389846,7 +389838,7 @@ index e284ee8da58ba4cc39b41f87834502327546150a..0a368b1722ec117a99baf355d485e01c + #endif /* _ANALOGIX_DP_REG_H */ diff --git a/drivers/gpu/drm/bridge/display-connector.c b/drivers/gpu/drm/bridge/display-connector.c -index 08bd5695ddae0f59bdb104b588876a41110e7ff4..38bc694a6b34ae58398e015a2f6095f082189782 100644 +index 08bd5695d..38bc694a6 100644 --- a/drivers/gpu/drm/bridge/display-connector.c +++ b/drivers/gpu/drm/bridge/display-connector.c @@ -190,18 +190,6 @@ static irqreturn_t display_connector_hpd_irq(int irq, void *arg) @@ -389946,7 +389938,7 @@ index 08bd5695ddae0f59bdb104b588876a41110e7ff4..38bc694a6b34ae58398e015a2f6095f0 conn->bridge.funcs = &display_connector_bridge_funcs; diff --git a/drivers/gpu/drm/bridge/synopsys/Makefile b/drivers/gpu/drm/bridge/synopsys/Makefile -index ce715562e9e522e8036d0efc6943f5c0799c2af6..f4c6cf6289d8f92ddb536390f78d094210472eab 100644 +index ce715562e..f4c6cf628 100644 --- a/drivers/gpu/drm/bridge/synopsys/Makefile +++ b/drivers/gpu/drm/bridge/synopsys/Makefile @@ -1,8 +1,9 @@ @@ -389963,7 +389955,7 @@ index ce715562e9e522e8036d0efc6943f5c0799c2af6..f4c6cf6289d8f92ddb536390f78d0942 obj-$(CONFIG_DRM_DW_MIPI_DSI) += dw-mipi-dsi.o diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h -index f72d27208ebef5fb14825df3afa11a772be32ce5..966d297ef41d33b42cf403847623d0341200cd78 100644 +index f72d27208..966d297ef 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h @@ -17,6 +17,7 @@ struct dw_hdmi_i2s_audio_data { @@ -389975,7 +389967,7 @@ index f72d27208ebef5fb14825df3afa11a772be32ce5..966d297ef41d33b42cf403847623d034 }; diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c -index be21c11de1f2a135c8cce534e9cea85b4af3b613..414d601bf216849247dd950f4f750bd228608c76 100644 +index be21c11de..414d601bf 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c @@ -4,14 +4,17 @@ @@ -390403,7 +390395,7 @@ index be21c11de1f2a135c8cce534e9cea85b4af3b613..414d601bf216849247dd950f4f750bd2 }; module_platform_driver(dw_hdmi_cec_driver); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h -index cf4dc121a2c43cb805ad7bd27edc68a515b1b1e6..ec10660a7e53ea1a28ef5ab7511776db335b7e5a 100644 +index cf4dc121a..ec10660a7 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h @@ -3,17 +3,24 @@ @@ -390433,7 +390425,7 @@ index cf4dc121a2c43cb805ad7bd27edc68a515b1b1e6..ec10660a7e53ea1a28ef5ab7511776db #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 100644 -index 0000000000000000000000000000000000000000..5906b7cac3b464103be3dbbf5f5e5109ab4b4e94 +index 000000000..5906b7cac --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.c @@ -0,0 +1,748 @@ @@ -391187,7 +391179,7 @@ index 0000000000000000000000000000000000000000..5906b7cac3b464103be3dbbf5f5e5109 +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 100644 -index 0000000000000000000000000000000000000000..d138f91f34229b379f3b8ecc34e8214eb2a08163 +index 000000000..d138f91f3 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h @@ -0,0 +1,54 @@ @@ -391246,7 +391238,7 @@ index 0000000000000000000000000000000000000000..d138f91f34229b379f3b8ecc34e8214e + +#endif diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c -index 26c187d20d973dc65801a3baa59ecf57d20072eb..194c96faa6c32ee00208e66db9072edb5faa8566 100644 +index 26c187d20..194c96faa 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c @@ -34,6 +34,14 @@ static inline u8 hdmi_read(struct dw_hdmi_i2s_audio_data *audio, int offset) @@ -391343,7 +391335,7 @@ index 26c187d20d973dc65801a3baa59ecf57d20072eb..194c96faa6c32ee00208e66db9072edb pdata.max_i2s_channels = 8; 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 100644 -index 0000000000000000000000000000000000000000..93f1a42954e7376707a40f1207d6cdd3bc045503 +index 000000000..93f1a4295 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-audio.h @@ -0,0 +1,29 @@ @@ -391378,7 +391370,7 @@ index 0000000000000000000000000000000000000000..93f1a42954e7376707a40f1207d6cdd3 +#endif diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.c new file mode 100644 -index 0000000000000000000000000000000000000000..2d2320ed0769d57b1c20ff4e489d2c66f1df031e +index 000000000..2d2320ed0 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.c @@ -0,0 +1,336 @@ @@ -391720,7 +391712,7 @@ index 0000000000000000000000000000000000000000..2d2320ed0769d57b1c20ff4e489d2c66 +MODULE_ALIAS(PLATFORM_MODULE_PREFIX "dw-hdmi-qp-cec"); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.h new file mode 100644 -index 0000000000000000000000000000000000000000..c0977c612e34f367aafa4d5c534d1af34f651d29 +index 000000000..c0977c612 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.h @@ -0,0 +1,25 @@ @@ -391751,7 +391743,7 @@ index 0000000000000000000000000000000000000000..c0977c612e34f367aafa4d5c534d1af3 +#endif diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.c new file mode 100644 -index 0000000000000000000000000000000000000000..388890d60c4638a59cbc54d19dcb6a9f47be0dfe +index 000000000..388890d60 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.c @@ -0,0 +1,650 @@ @@ -392407,7 +392399,7 @@ index 0000000000000000000000000000000000000000..388890d60c4638a59cbc54d19dcb6a9f +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.h new file mode 100644 -index 0000000000000000000000000000000000000000..48c3a4843ac0dfe8f523f7e759391d5602d62472 +index 000000000..48c3a4843 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.h @@ -0,0 +1,55 @@ @@ -392468,7 +392460,7 @@ index 0000000000000000000000000000000000000000..48c3a4843ac0dfe8f523f7e759391d56 +#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 100644 -index 0000000000000000000000000000000000000000..e07c2b4237a28bf7668f7a9a43743e4f87d7e679 +index 000000000..e07c2b423 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c @@ -0,0 +1,188 @@ @@ -392662,7 +392654,7 @@ index 0000000000000000000000000000000000000000..e07c2b4237a28bf7668f7a9a43743e4f +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 100644 -index 0000000000000000000000000000000000000000..f6803bc2aec32feef12fa4547bc1b2d1713ee02f +index 000000000..f6803bc2a --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c @@ -0,0 +1,4121 @@ @@ -396789,7 +396781,7 @@ index 0000000000000000000000000000000000000000..f6803bc2aec32feef12fa4547bc1b2d1 +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 100644 -index 0000000000000000000000000000000000000000..e9b5e19a3be5a5629c350334777957d1f102243f +index 000000000..e9b5e19a3 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h @@ -0,0 +1,850 @@ @@ -397644,7 +397636,7 @@ index 0000000000000000000000000000000000000000..e9b5e19a3be5a5629c350334777957d1 + +#endif /* __DW_HDMI_QP_H__ */ diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c -index 6c1d7947450545916befc09ce2fc3127d9654c99..70d35c683633fdf5c2855f36a83e2570320ab0a7 100644 +index 6c1d79474..70d35c683 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -9,16 +9,19 @@ @@ -400718,7 +400710,7 @@ index 6c1d7947450545916befc09ce2fc3127d9654c99..70d35c683633fdf5c2855f36a83e2570 EXPORT_SYMBOL_GPL(dw_hdmi_resume); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h -index af43a0414b78f402dceb82ee3fdac8638823feab..5432d0246257833eb74aa003d2080c561375aba2 100644 +index af43a0414..5432d0246 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h @@ -518,6 +518,51 @@ @@ -400841,7 +400833,7 @@ index af43a0414b78f402dceb82ee3fdac8638823feab..5432d0246257833eb74aa003d2080c56 /* diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c -index 04d4a1a10698103cb88ab41f11f8f75b048ec039..bd99f785e86c7adbbeea55a54f43a175f9c0755c 100644 +index 04d4a1a10..bd99f785e 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c @@ -14,6 +14,7 @@ @@ -401468,7 +401460,7 @@ index 04d4a1a10698103cb88ab41f11f8f75b048ec039..bd99f785e86c7adbbeea55a54f43a175 MODULE_AUTHOR("Philippe Cornu "); MODULE_DESCRIPTION("DW MIPI DSI host controller driver"); diff --git a/drivers/gpu/drm/display/Kconfig b/drivers/gpu/drm/display/Kconfig -index 09712b88a5b83e3235c017f027833ff03566c6b2..6f10a437bf667cf909c53c92ab14578e058f39d4 100644 +index 09712b88a..6f10a437b 100644 --- a/drivers/gpu/drm/display/Kconfig +++ b/drivers/gpu/drm/display/Kconfig @@ -1,5 +1,14 @@ @@ -401487,7 +401479,7 @@ index 09712b88a5b83e3235c017f027833ff03566c6b2..6f10a437bf667cf909c53c92ab14578e tristate depends on DRM diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c -index 77590b0f38fa382d7c03ea34491f3d0793eb6206..0dc2a587c93ffb5c45a71f62fa74107e1341da02 100644 +index 77590b0f3..0dc2a587c 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -245,7 +245,8 @@ static int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_ @@ -401530,7 +401522,7 @@ index 77590b0f38fa382d7c03ea34491f3d0793eb6206..0dc2a587c93ffb5c45a71f62fa74107e DRM_IOCTL_DEF(DRM_IOCTL_MODE_OBJ_SETPROPERTY, drm_mode_obj_set_property_ioctl, DRM_MASTER), DRM_IOCTL_DEF(DRM_IOCTL_MODE_CURSOR2, drm_mode_cursor2_ioctl, DRM_MASTER), diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c -index 51f838befb321ca326e57af501b7e7abff868c47..06d5c91db45a52ab03031953b3a4de2f5441f21d 100644 +index 51f838bef..06d5c91db 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -21,6 +21,7 @@ @@ -402503,7 +402495,7 @@ index 51f838befb321ca326e57af501b7e7abff868c47..06d5c91db45a52ab03031953b3a4de2f module_exit(panel_simple_exit); diff --git a/drivers/gpu/drm/panel/panel-simple.h b/drivers/gpu/drm/panel/panel-simple.h new file mode 100644 -index 0000000000000000000000000000000000000000..7349c35e3cb24d71d6c32546568df494222cde23 +index 000000000..7349c35e3 --- /dev/null +++ b/drivers/gpu/drm/panel/panel-simple.h @@ -0,0 +1,19 @@ @@ -402527,7 +402519,7 @@ index 0000000000000000000000000000000000000000..7349c35e3cb24d71d6c32546568df494 +#endif +#endif diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig -index 1bf3e2829cd07b6b0023a2f1e4ca6d75846fb44e..95550a983898df953ba4c08b1bdd2b97c1bd113c 100644 +index 1bf3e2829..95550a983 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -1,7 +1,7 @@ @@ -402672,7 +402664,7 @@ index 1bf3e2829cd07b6b0023a2f1e4ca6d75846fb44e..95550a983898df953ba4c08b1bdd2b97 + endif diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile -index 3ff7b21c041498913b80edb4b31b1054e2e9ba2e..7aa90fa2002cd82575c091ab2910830f2aaf39e3 100644 +index 3ff7b21c0..7aa90fa20 100644 --- a/drivers/gpu/drm/rockchip/Makefile +++ b/drivers/gpu/drm/rockchip/Makefile @@ -4,17 +4,31 @@ @@ -402712,7 +402704,7 @@ index 3ff7b21c041498913b80edb4b31b1054e2e9ba2e..7aa90fa2002cd82575c091ab2910830f +obj-$(CONFIG_DRM_ROCKCHIP_RK618) += rk618/ +obj-$(CONFIG_DRM_ROCKCHIP_RK628) += rk628/ diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c -index 84aa811ca1e9cf74b5a1ac7feca225db2c5d0b3a..dc10a0ced2040c62e6aefebbe809d54d120c6812 100644 +index 84aa811ca..dc10a0ced 100644 --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c @@ -10,13 +10,13 @@ @@ -403526,7 +403518,7 @@ index 84aa811ca1e9cf74b5a1ac7feca225db2c5d0b3a..dc10a0ced2040c62e6aefebbe809d54d .name = "rockchip-dp", .pm = &rockchip_dp_pm_ops, diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c -index 3793863c210ebd4413864a08cda2b44f26ed5c40..4d8c81447013939df4448474a68a348113e5be5b 100644 +index 3793863c2..4d8c81447 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c @@ -6,7 +6,6 @@ @@ -403964,7 +403956,7 @@ index 3793863c210ebd4413864a08cda2b44f26ed5c40..4d8c81447013939df4448474a68a3481 .driver = { .name = "cdn-dp", diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.h b/drivers/gpu/drm/rockchip/cdn-dp-core.h -index 5b2fed1f5f552a2bb58026d9f8cdbba49240a8fc..b4c9e4b6001300c707eef30c995f23d2f17b5d2d 100644 +index 5b2fed1f5..b4c9e4b60 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.h +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.h @@ -54,8 +54,6 @@ struct cdn_firmware_header { @@ -404003,7 +403995,7 @@ index 5b2fed1f5f552a2bb58026d9f8cdbba49240a8fc..b4c9e4b6001300c707eef30c995f23d2 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 100644 -index 0000000000000000000000000000000000000000..85e1182e16573a2f496e8d2485f1fc6d71c61339 +index 000000000..85e1182e1 --- /dev/null +++ b/drivers/gpu/drm/rockchip/cdn-dp-link-training.c @@ -0,0 +1,447 @@ @@ -404455,7 +404447,7 @@ index 0000000000000000000000000000000000000000..85e1182e16573a2f496e8d2485f1fc6d + return ret; +} diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/rockchip/cdn-dp-reg.c -index 33fb4d05c5065730b6eb4966c6fa9da305a5868c..2a544869e8de2c15125539a7a16ea88a3104bfab 100644 +index 33fb4d05c..2a544869e 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-reg.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.c @@ -181,7 +181,7 @@ static int cdn_dp_mailbox_send(struct cdn_dp_device *dp, u8 module_id, @@ -404628,7 +404620,7 @@ index 33fb4d05c5065730b6eb4966c6fa9da305a5868c..2a544869e8de2c15125539a7a16ea88a ret = cdn_dp_reg_write(dp, BND_HSYNC2VSYNC, VIF_BYPASS_INTERLACE); if (ret) diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.h b/drivers/gpu/drm/rockchip/cdn-dp-reg.h -index 441248b7a79e9d4a2ed4efc00983684e65d0a23f..656ec69be66da8faa0c7896e4ae2e8e29c3af5f2 100644 +index 441248b7a..656ec69be 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-reg.h +++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.h @@ -8,6 +8,7 @@ @@ -404726,7 +404718,7 @@ index 441248b7a79e9d4a2ed4efc00983684e65d0a23f..656ec69be66da8faa0c7896e4ae2e8e2 #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 100644 -index 0000000000000000000000000000000000000000..30da373959fd23f82b59f9c1545594deda7cfe1a +index 000000000..30da37395 --- /dev/null +++ b/drivers/gpu/drm/rockchip/dw-dp.c @@ -0,0 +1,4247 @@ @@ -408978,7 +408970,7 @@ index 0000000000000000000000000000000000000000..30da373959fd23f82b59f9c1545594de + }, +}; diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c -index 0100162a73b295bb796f3b1b3106136fce3f810d..40ac5d894e08b021265fcb10fae4efd4c9670567 100644 +index 0100162a7..40ac5d894 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c @@ -12,14 +12,12 @@ @@ -410464,7 +410456,7 @@ index 0100162a73b295bb796f3b1b3106136fce3f810d..40ac5d894e08b021265fcb10fae4efd4 .pm = &dw_mipi_dsi_rockchip_pm_ops, 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 100644 -index 0000000000000000000000000000000000000000..b1816c4f147e978169538c2854fc001deb4e3e79 +index 000000000..b1816c4f1 --- /dev/null +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c @@ -0,0 +1,1867 @@ @@ -412337,7 +412329,7 @@ index 0000000000000000000000000000000000000000..b1816c4f147e978169538c2854fc001d +}; diff --git a/drivers/gpu/drm/rockchip/dw_hdcp2.c b/drivers/gpu/drm/rockchip/dw_hdcp2.c new file mode 100644 -index 0000000000000000000000000000000000000000..f8362ddea171ba4fca478d75563bff5c826974aa +index 000000000..f8362ddea --- /dev/null +++ b/drivers/gpu/drm/rockchip/dw_hdcp2.c @@ -0,0 +1,642 @@ @@ -412984,7 +412976,7 @@ index 0000000000000000000000000000000000000000..f8362ddea171ba4fca478d75563bff5c +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Rockchip HDCP Host Library Driver"); diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c -index 341550199111f9813d53df7a3b1ba8b7fe0c42df..f4909102db1f171b338beacc8a941650d2efcf10 100644 +index 341550199..f4909102d 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -4,22 +4,35 @@ @@ -417171,7 +417163,7 @@ index 341550199111f9813d53df7a3b1ba8b7fe0c42df..f4909102db1f171b338beacc8a941650 .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 100644 -index 0000000000000000000000000000000000000000..949c8e4b7b57f1640951183cb21c473df7843917 +index 000000000..949c8e4b7 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/Kconfig @@ -0,0 +1,14 @@ @@ -417191,7 +417183,7 @@ index 0000000000000000000000000000000000000000..949c8e4b7b57f1640951183cb21c473d +endchoice diff --git a/drivers/gpu/drm/rockchip/ebc-dev/Makefile b/drivers/gpu/drm/rockchip/ebc-dev/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..848ac22fd0b20896a952447ca672d37f747665e3 +index 000000000..848ac22fd --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/Makefile @@ -0,0 +1,9 @@ @@ -417206,7 +417198,7 @@ index 0000000000000000000000000000000000000000..848ac22fd0b20896a952447ca672d37f +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 100644 -index 0000000000000000000000000000000000000000..a63ef49dea04bb21c105495b07000116ca095171 +index 000000000..a63ef49de --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/Makefile @@ -0,0 +1,3 @@ @@ -417215,7 +417207,7 @@ index 0000000000000000000000000000000000000000..a63ef49dea04bb21c105495b07000116 +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 100644 -index 0000000000000000000000000000000000000000..90f350110b703b7053e375cbf340c6aa6cd8b4ea +index 000000000..90f350110 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.c @@ -0,0 +1,171 @@ @@ -417392,7 +417384,7 @@ index 0000000000000000000000000000000000000000..90f350110b703b7053e375cbf340c6aa +} 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 100644 -index 0000000000000000000000000000000000000000..eaf504560fb851f52c177a725fe73ca493388a62 +index 000000000..eaf504560 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.h @@ -0,0 +1,95 @@ @@ -417493,7 +417485,7 @@ index 0000000000000000000000000000000000000000..eaf504560fb851f52c177a725fe73ca4 +#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 100644 -index 0000000000000000000000000000000000000000..a2e47b45c148f33d5ae27a5a257eaccd51505454 +index 000000000..a2e47b45c --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.c @@ -0,0 +1,327 @@ @@ -417826,7 +417818,7 @@ index 0000000000000000000000000000000000000000..a2e47b45c148f33d5ae27a5a257eaccd +} 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 100644 -index 0000000000000000000000000000000000000000..745cdbf9cfdeb01bbda7bf23f7fd643ec1ece81d +index 000000000..745cdbf9c --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.h @@ -0,0 +1,49 @@ @@ -417881,7 +417873,7 @@ index 0000000000000000000000000000000000000000..745cdbf9cfdeb01bbda7bf23f7fd643e + 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 100644 -index 0000000000000000000000000000000000000000..5fc2fecd22cbe558caaa6c0b0667a29f48798ce6 +index 000000000..5fc2fecd2 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev.h @@ -0,0 +1,114 @@ @@ -418001,7 +417993,7 @@ index 0000000000000000000000000000000000000000..5fc2fecd22cbe558caaa6c0b0667a29f +#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 -index 0000000000000000000000000000000000000000..65be1fdee09f8707c6739d6d7139f61bce46c455 +index 000000000..65be1fdee --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev_v8.S @@ -0,0 +1,55302 @@ @@ -473309,7 +473301,7 @@ index 0000000000000000000000000000000000000000..65be1fdee09f8707c6739d6d7139f61b + .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 100644 -index 0000000000000000000000000000000000000000..dc0a72b11b2196cbbf9fed13b7508f09c6c6d923 +index 000000000..dc0a72b11 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_panel.h @@ -0,0 +1,50 @@ @@ -473365,7 +473357,7 @@ index 0000000000000000000000000000000000000000..dc0a72b11b2196cbbf9fed13b7508f09 +#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 100644 -index 0000000000000000000000000000000000000000..8ecccb7f64031729ee457d0d8e151c9749a086f3 +index 000000000..8ecccb7f6 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_public.c @@ -0,0 +1,36 @@ @@ -473407,7 +473399,7 @@ index 0000000000000000000000000000000000000000..8ecccb7f64031729ee457d0d8e151c97 +} diff --git a/drivers/gpu/drm/rockchip/ebc-dev/epdlut/Makefile b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..6b99702b7a6f4bf578039f4c05b412065166ccd3 +index 000000000..6b99702b7 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/Makefile @@ -0,0 +1,5 @@ @@ -473418,7 +473410,7 @@ index 0000000000000000000000000000000000000000..6b99702b7a6f4bf578039f4c05b41206 +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 100644 -index 0000000000000000000000000000000000000000..8871b37d52cc370b82442d96fc9d6918d664b896 +index 000000000..8871b37d5 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.c @@ -0,0 +1,72 @@ @@ -473496,7 +473488,7 @@ index 0000000000000000000000000000000000000000..8871b37d52cc370b82442d96fc9d6918 +} 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 100644 -index 0000000000000000000000000000000000000000..8d2210603a2921244890c5b874ae4b19c59ce6a9 +index 000000000..8d2210603 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.h @@ -0,0 +1,66 @@ @@ -473568,7 +473560,7 @@ index 0000000000000000000000000000000000000000..8d2210603a2921244890c5b874ae4b19 +#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 -index 0000000000000000000000000000000000000000..849c81dcfc71c7ae750df60d879963189fe248bd +index 000000000..849c81dcf --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/pvi_waveform_v8.S @@ -0,0 +1,18656 @@ @@ -492230,7 +492222,7 @@ index 0000000000000000000000000000000000000000..849c81dcfc71c7ae750df60d87996318 + .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 -index 0000000000000000000000000000000000000000..8a17822240c51dd722e3bc0fe9e59bbc824f3c3f +index 000000000..8a1782224 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/rkf_waveform_v8.S @@ -0,0 +1,19357 @@ @@ -511593,7 +511585,7 @@ index 0000000000000000000000000000000000000000..8a17822240c51dd722e3bc0fe9e59bbc + .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 100644 -index 0000000000000000000000000000000000000000..a05717f1ce98a344c73868006dceb97326721693 +index 000000000..a05717f1c --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/Makefile @@ -0,0 +1,4 @@ @@ -511603,7 +511595,7 @@ index 0000000000000000000000000000000000000000..a05717f1ce98a344c73868006dceb973 +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 100644 -index 0000000000000000000000000000000000000000..c24db23dc47d2e4fedbaafc4a04b84068d31b9b9 +index 000000000..c24db23dc --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.c @@ -0,0 +1,70 @@ @@ -511679,7 +511671,7 @@ index 0000000000000000000000000000000000000000..c24db23dc47d2e4fedbaafc4a04b8406 +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 100644 -index 0000000000000000000000000000000000000000..f95192094ba76ce64e1ec9d0b742f430cb5ffde6 +index 000000000..f95192094 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.h @@ -0,0 +1,60 @@ @@ -511745,7 +511737,7 @@ index 0000000000000000000000000000000000000000..f95192094ba76ce64e1ec9d0b742f430 +#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 100644 -index 0000000000000000000000000000000000000000..e46d9b08fc164a4b5f508d1837ac33d5d7633faf +index 000000000..e46d9b08f --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/tps65185.c @@ -0,0 +1,671 @@ @@ -512422,7 +512414,7 @@ index 0000000000000000000000000000000000000000..e46d9b08fc164a4b5f508d1837ac33d5 +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 100644 -index 0000000000000000000000000000000000000000..913d4813773b21dbb9627bfc52310f83c6d92d7b +index 000000000..913d48137 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/Makefile @@ -0,0 +1,3 @@ @@ -512431,7 +512423,7 @@ index 0000000000000000000000000000000000000000..913d4813773b21dbb9627bfc52310f83 +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 100644 -index 0000000000000000000000000000000000000000..23c82751bb1be31d64a1807e92caf281cc18964e +index 000000000..23c82751b --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.c @@ -0,0 +1,416 @@ @@ -512853,7 +512845,7 @@ index 0000000000000000000000000000000000000000..23c82751bb1be31d64a1807e92caf281 +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 100644 -index 0000000000000000000000000000000000000000..9a9ea56f3cdb6992e389cef58a07882a785ed8b6 +index 000000000..9a9ea56f3 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.h @@ -0,0 +1,119 @@ @@ -512978,7 +512970,7 @@ index 0000000000000000000000000000000000000000..9a9ea56f3cdb6992e389cef58a07882a +#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 100644 -index 0000000000000000000000000000000000000000..01b2b9629c35c43d24a54ab887f48ea1bc53ccd5 +index 000000000..01b2b9629 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/eink_tcon.c @@ -0,0 +1,301 @@ @@ -513284,7 +513276,7 @@ index 0000000000000000000000000000000000000000..01b2b9629c35c43d24a54ab887f48ea1 +MODULE_DESCRIPTION("ROCKCHIP EINK tcon driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c -index 6e5b922a121e243c733d7e88032f33d095354f15..1cd82e1f2d8a909a1a81e113ee961fc0d413465f 100644 +index 6e5b922a1..1cd82e1f2 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -11,10 +11,9 @@ @@ -513875,7 +513867,7 @@ index 6e5b922a121e243c733d7e88032f33d095354f15..1cd82e1f2d8a909a1a81e113ee961fc0 .name = "innohdmi-rockchip", .of_match_table = inno_hdmi_dt_ids, diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.h b/drivers/gpu/drm/rockchip/inno_hdmi.h -index 93245b55f967009acf6256f74819b3afb413a214..b722afc4e41f70b033167640a9cfecf4a60f37ca 100644 +index 93245b55f..b722afc4e 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.h +++ b/drivers/gpu/drm/rockchip/inno_hdmi.h @@ -96,11 +96,13 @@ enum { @@ -513894,7 +513886,7 @@ index 93245b55f967009acf6256f74819b3afb413a214..b722afc4e41f70b033167640a9cfecf4 #define HDMI_VIDEO_TIMING_CTL 0x08 diff --git a/drivers/gpu/drm/rockchip/kernel_logo_img.h b/drivers/gpu/drm/rockchip/kernel_logo_img.h new file mode 100644 -index 0000000000000000000000000000000000000000..98c4443ec1bd6fa9fa5a86e4d9eb0156eb01a11b +index 000000000..98c4443ec --- /dev/null +++ b/drivers/gpu/drm/rockchip/kernel_logo_img.h @@ -0,0 +1,21855 @@ @@ -535754,7 +535746,7 @@ index 0000000000000000000000000000000000000000..98c4443ec1bd6fa9fa5a86e4d9eb0156 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; diff --git a/drivers/gpu/drm/rockchip/rk3066_hdmi.c b/drivers/gpu/drm/rockchip/rk3066_hdmi.c -index fa6e592e0276c3458bf815d9d4e27a100a6b65c8..0d42dd8091ebe120eb9faef1f31b078de101eaee 100644 +index fa6e592e0..0d42dd809 100644 --- a/drivers/gpu/drm/rockchip/rk3066_hdmi.c +++ b/drivers/gpu/drm/rockchip/rk3066_hdmi.c @@ -553,7 +553,7 @@ rk3066_hdmi_register(struct drm_device *drm, struct rk3066_hdmi *hdmi) @@ -535799,7 +535791,7 @@ index fa6e592e0276c3458bf815d9d4e27a100a6b65c8..0d42dd8091ebe120eb9faef1f31b078d .of_match_table = rk3066_hdmi_dt_ids, diff --git a/drivers/gpu/drm/rockchip/rk618/Kconfig b/drivers/gpu/drm/rockchip/rk618/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..03ae305a93c18b0ac83a25b3ab761d131d18a7cb +index 000000000..03ae305a9 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/Kconfig @@ -0,0 +1,10 @@ @@ -535815,7 +535807,7 @@ index 0000000000000000000000000000000000000000..03ae305a93c18b0ac83a25b3ab761d13 + 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 100644 -index 0000000000000000000000000000000000000000..ad3ac27b36ad09b5199604343a627437864c0133 +index 000000000..ad3ac27b3 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/Makefile @@ -0,0 +1,12 @@ @@ -535833,7 +535825,7 @@ index 0000000000000000000000000000000000000000..ad3ac27b36ad09b5199604343a627437 + 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 100644 -index 0000000000000000000000000000000000000000..a9bc0c37c2d64f5260084b55608acc98f4616410 +index 000000000..a9bc0c37c --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dither.c @@ -0,0 +1,53 @@ @@ -535892,7 +535884,7 @@ index 0000000000000000000000000000000000000000..a9bc0c37c2d64f5260084b55608acc98 +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 100644 -index 0000000000000000000000000000000000000000..c74bb95f0ce43c022c8483f1cee9cc07ecff5b81 +index 000000000..c74bb95f0 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dither.h @@ -0,0 +1,17 @@ @@ -535915,7 +535907,7 @@ index 0000000000000000000000000000000000000000..c74bb95f0ce43c022c8483f1cee9cc07 +#endif diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c b/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c new file mode 100644 -index 0000000000000000000000000000000000000000..1fe20e9dc3c8e418b53ac83aa7dec9485a39d689 +index 000000000..1fe20e9dc --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c @@ -0,0 +1,1195 @@ @@ -537116,7 +537108,7 @@ index 0000000000000000000000000000000000000000..1fe20e9dc3c8e418b53ac83aa7dec948 +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 100644 -index 0000000000000000000000000000000000000000..d8ce7b6214886d1e3ef93d1422b99d5d7d5364b7 +index 000000000..d8ce7b621 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c @@ -0,0 +1,1608 @@ @@ -538730,7 +538722,7 @@ index 0000000000000000000000000000000000000000..d8ce7b6214886d1e3ef93d1422b99d5d +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 100644 -index 0000000000000000000000000000000000000000..b652e19a6a344112381032cac37a60fdfd8156dd +index 000000000..b652e19a6 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c @@ -0,0 +1,303 @@ @@ -539039,7 +539031,7 @@ index 0000000000000000000000000000000000000000..b652e19a6a344112381032cac37a60fd +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 100644 -index 0000000000000000000000000000000000000000..76efc25aa216692e165d8e5ec8f63a2da82566d5 +index 000000000..76efc25aa --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c @@ -0,0 +1,301 @@ @@ -539346,7 +539338,7 @@ index 0000000000000000000000000000000000000000..76efc25aa216692e165d8e5ec8f63a2d +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 100644 -index 0000000000000000000000000000000000000000..2c3a67664699f7da2977a772c53dac9a54d602aa +index 000000000..2c3a67664 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_scaler.c @@ -0,0 +1,425 @@ @@ -539777,7 +539769,7 @@ index 0000000000000000000000000000000000000000..2c3a67664699f7da2977a772c53dac9a +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 100644 -index 0000000000000000000000000000000000000000..9dc9e10e2d3abd930d5685a84c995ff0cefc647c +index 000000000..9dc9e10e2 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_vif.c @@ -0,0 +1,261 @@ @@ -540044,7 +540036,7 @@ index 0000000000000000000000000000000000000000..9dc9e10e2d3abd930d5685a84c995ff0 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/Kconfig b/drivers/gpu/drm/rockchip/rk628/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..41e1fbbe1e615f4309f1553fe39eb79fa0d81f9d +index 000000000..41e1fbbe1 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/Kconfig @@ -0,0 +1,8 @@ @@ -540058,7 +540050,7 @@ index 0000000000000000000000000000000000000000..41e1fbbe1e615f4309f1553fe39eb79f + 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 100644 -index 0000000000000000000000000000000000000000..76d768d29776147f393339bc65a803ea032688c2 +index 000000000..76d768d29 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/Makefile @@ -0,0 +1,14 @@ @@ -540078,7 +540070,7 @@ index 0000000000000000000000000000000000000000..76d768d29776147f393339bc65a803ea + 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 100644 -index 0000000000000000000000000000000000000000..a83eeeaf935fb7d2090547fb7e45aaeb4bcf9ce8 +index 000000000..a83eeeaf9 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_combrxphy.c @@ -0,0 +1,1030 @@ @@ -541114,7 +541106,7 @@ index 0000000000000000000000000000000000000000..a83eeeaf935fb7d2090547fb7e45aaeb +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 100644 -index 0000000000000000000000000000000000000000..cbe7923139b7a1e25abe072b7718bb3473f2a761 +index 000000000..cbe792313 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c @@ -0,0 +1,520 @@ @@ -541640,7 +541632,7 @@ index 0000000000000000000000000000000000000000..cbe7923139b7a1e25abe072b7718bb34 +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 100644 -index 0000000000000000000000000000000000000000..40d785eecd67a797e39243d4751635ba5b1c669d +index 000000000..40d785eec --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.h @@ -0,0 +1,13 @@ @@ -541659,7 +541651,7 @@ index 0000000000000000000000000000000000000000..40d785eecd67a797e39243d4751635ba +#endif diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c b/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c new file mode 100644 -index 0000000000000000000000000000000000000000..766f156efb98a0ca46fce954f50767912bc39a2e +index 000000000..766f156ef --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c @@ -0,0 +1,1395 @@ @@ -543060,7 +543052,7 @@ index 0000000000000000000000000000000000000000..766f156efb98a0ca46fce954f5076791 +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 100644 -index 0000000000000000000000000000000000000000..9065e30a5774e9ed2304d81c366f36d682f0e3a3 +index 000000000..9065e30a5 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_gvi.c @@ -0,0 +1,666 @@ @@ -543732,7 +543724,7 @@ index 0000000000000000000000000000000000000000..9065e30a5774e9ed2304d81c366f36d6 +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 100644 -index 0000000000000000000000000000000000000000..4a8ce4f1a3b8657007166a62b4ec5d503ee85d26 +index 000000000..4a8ce4f1a --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_hdmi.c @@ -0,0 +1,1623 @@ @@ -545361,7 +545353,7 @@ index 0000000000000000000000000000000000000000..4a8ce4f1a3b8657007166a62b4ec5d50 +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 100644 -index 0000000000000000000000000000000000000000..b74ea238dc00ed20536fa6a886d1da8afdf1e4db +index 000000000..b74ea238d --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c @@ -0,0 +1,980 @@ @@ -546347,7 +546339,7 @@ index 0000000000000000000000000000000000000000..b74ea238dc00ed20536fa6a886d1da8a +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 100644 -index 0000000000000000000000000000000000000000..57496ff9dec70a9a22da0cfeaa1bf788ea92ad24 +index 000000000..57496ff9d --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c @@ -0,0 +1,320 @@ @@ -546673,7 +546665,7 @@ index 0000000000000000000000000000000000000000..57496ff9dec70a9a22da0cfeaa1bf788 +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 100644 -index 0000000000000000000000000000000000000000..80fd257a647186300c89bf0ab76ceb936406a1ed +index 000000000..80fd257a6 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_post_process.c @@ -0,0 +1,495 @@ @@ -547174,7 +547166,7 @@ index 0000000000000000000000000000000000000000..80fd257a647186300c89bf0ab76ceb93 +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 100644 -index 0000000000000000000000000000000000000000..df8cc3cee8604e5619971a21b71d16db3c251b1d +index 000000000..df8cc3cee --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_rgb.c @@ -0,0 +1,378 @@ @@ -547558,7 +547550,7 @@ index 0000000000000000000000000000000000000000..df8cc3cee8604e5619971a21b71d16db +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 100644 -index 0000000000000000000000000000000000000000..adbc11679f53f1be42a024a9f4e401cf93af33e9 +index 000000000..adbc11679 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.c @@ -0,0 +1,1403 @@ @@ -548967,7 +548959,7 @@ index 0000000000000000000000000000000000000000..adbc11679f53f1be42a024a9f4e401cf +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 100644 -index 0000000000000000000000000000000000000000..a4330df85b334d059638b09f62d32e4647c9fc8c +index 000000000..a4330df85 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.h @@ -0,0 +1,289 @@ @@ -549262,7 +549254,7 @@ index 0000000000000000000000000000000000000000..a4330df85b334d059638b09f62d32e46 +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_backlight.c b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.c new file mode 100644 -index 0000000000000000000000000000000000000000..2f0a987496832ada48fad723c2a2b69396e67dc3 +index 000000000..2f0a98749 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.c @@ -0,0 +1,514 @@ @@ -549782,7 +549774,7 @@ index 0000000000000000000000000000000000000000..2f0a987496832ada48fad723c2a2b693 +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 100644 -index 0000000000000000000000000000000000000000..4c8dc6348354c5b939caf8664cc01998bd7b81ca +index 000000000..4c8dc6348 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.h @@ -0,0 +1,64 @@ @@ -549852,7 +549844,7 @@ index 0000000000000000000000000000000000000000..4c8dc6348354c5b939caf8664cc01998 +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_clk.c b/drivers/gpu/drm/rockchip/rockchip_drm_clk.c new file mode 100644 -index 0000000000000000000000000000000000000000..f606377aeb07a2bfdc9f2fda6fcab24b48fe181f +index 000000000..f606377ae --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_clk.c @@ -0,0 +1,284 @@ @@ -550142,7 +550134,7 @@ index 0000000000000000000000000000000000000000..f606377aeb07a2bfdc9f2fda6fcab24b +} diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.c b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.c new file mode 100644 -index 0000000000000000000000000000000000000000..cd7b08f704d369d312a4dafae01e88cafdc7047c +index 000000000..cd7b08f70 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.c @@ -0,0 +1,283 @@ @@ -550431,7 +550423,7 @@ index 0000000000000000000000000000000000000000..cd7b08f704d369d312a4dafae01e88ca +} diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.h b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.h new file mode 100644 -index 0000000000000000000000000000000000000000..5bb39c0447f0c598ee665a517d87eea57c34b936 +index 000000000..5bb39c044 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.h @@ -0,0 +1,79 @@ @@ -550516,7 +550508,7 @@ index 0000000000000000000000000000000000000000..5bb39c0447f0c598ee665a517d87eea5 +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_direct_show.c b/drivers/gpu/drm/rockchip/rockchip_drm_direct_show.c new file mode 100644 -index 0000000000000000000000000000000000000000..007d21f79f40ae40c4a0f414662c1ecd5f1e4001 +index 000000000..007d21f79 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_direct_show.c @@ -0,0 +1,333 @@ @@ -550855,7 +550847,7 @@ index 0000000000000000000000000000000000000000..007d21f79f40ae40c4a0f414662c1ecd + diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_direct_show.h b/drivers/gpu/drm/rockchip/rockchip_drm_direct_show.h new file mode 100644 -index 0000000000000000000000000000000000000000..fcdee49564e8de69d1a451d5917f811f70541df6 +index 000000000..fcdee4956 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_direct_show.h @@ -0,0 +1,67 @@ @@ -550928,7 +550920,7 @@ index 0000000000000000000000000000000000000000..fcdee49564e8de69d1a451d5917f811f +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_display_pattern.c b/drivers/gpu/drm/rockchip/rockchip_drm_display_pattern.c new file mode 100644 -index 0000000000000000000000000000000000000000..58a907b6c81614165131e469eed45229c8f38d4e +index 000000000..58a907b6c --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_display_pattern.c @@ -0,0 +1,419 @@ @@ -551353,7 +551345,7 @@ index 0000000000000000000000000000000000000000..58a907b6c81614165131e469eed45229 +} diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_display_pattern.h b/drivers/gpu/drm/rockchip/rockchip_drm_display_pattern.h new file mode 100644 -index 0000000000000000000000000000000000000000..4368f3397dbeb80c27fed887174118000104d3ae +index 000000000..4368f3397 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_display_pattern.h @@ -0,0 +1,51 @@ @@ -551409,7 +551401,7 @@ index 0000000000000000000000000000000000000000..4368f3397dbeb80c27fed88717411800 + +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c -index ab55d71325500d84461c7bd1c1ceb1db12cd6222..4184bb8a0dd43c13193a1bd6796e3a15d8048055 100644 +index ab55d7132..4184bb8a0 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -6,18 +6,26 @@ @@ -553435,7 +553427,7 @@ index ab55d71325500d84461c7bd1c1ceb1db12cd6222..4184bb8a0dd43c13193a1bd6796e3a15 MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(DMA_BUF); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h -index aeb03a57240fd9fb704858e4915e2aa139264484..0854b965671fac7d332cd4cc58143d3284a5b0d6 100644 +index aeb03a572..0854b9656 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h @@ -10,34 +10,472 @@ @@ -554056,7 +554048,7 @@ index aeb03a57240fd9fb704858e4915e2aa139264484..0854b965671fac7d332cd4cc58143d32 static inline struct rockchip_encoder *to_rockchip_encoder(struct drm_encoder *encoder) { diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c -index cfe8b793d344670c16329b08aeef6f9e1edd1f3b..d99eef43fa428c848ada7f643127f1c55bf03baa 100644 +index cfe8b793d..d99eef43f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -5,27 +5,277 @@ @@ -554409,7 +554401,7 @@ index cfe8b793d344670c16329b08aeef6f9e1edd1f3b..d99eef43fa428c848ada7f643127f1c5 dev->mode_config.funcs = &rockchip_drm_mode_config_funcs; dev->mode_config.helper_private = &rockchip_mode_config_helpers; diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.h b/drivers/gpu/drm/rockchip/rockchip_drm_fb.h -index bae4e079dfb119f4d98c631922adfef5244be904..6c4294d78a83fec32c7210f84986c1976a1cd58b 100644 +index bae4e079d..6c4294d78 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.h @@ -7,5 +7,29 @@ @@ -554443,7 +554435,7 @@ index bae4e079dfb119f4d98c631922adfef5244be904..6c4294d78a83fec32c7210f84986c197 + #endif /* _ROCKCHIP_DRM_FB_H */ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c -index 93ed841f5dceae79cb335e456735e92fbab93b29..a9dd8939e98ffbaef97180f53c5072de068b7f06 100644 +index 93ed841f5..a9dd8939e 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c @@ -4,20 +4,35 @@ @@ -555317,7 +555309,7 @@ index 93ed841f5dceae79cb335e456735e92fbab93b29..a9dd8939e98ffbaef97180f53c5072de + return 0; +} diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.h b/drivers/gpu/drm/rockchip/rockchip_drm_gem.h -index 72f59ac6d258faf0f0d10a1282a1bec421e8f23a..3d015fed67e66986edbf4a56d1c94e031fc3990d 100644 +index 72f59ac6d..3d015fed6 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.h @@ -7,14 +7,24 @@ @@ -555393,7 +555385,7 @@ index 72f59ac6d258faf0f0d10a1282a1bec421e8f23a..3d015fed67e66986edbf4a56d1c94e03 #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 100644 -index 0000000000000000000000000000000000000000..5ee412da6fb5b3707ef516585561362088278ea6 +index 000000000..5ee412da6 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_logo.c @@ -0,0 +1,1234 @@ @@ -556633,7 +556625,7 @@ index 0000000000000000000000000000000000000000..5ee412da6fb5b3707ef5165855613620 +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_logo.h b/drivers/gpu/drm/rockchip/rockchip_drm_logo.h new file mode 100644 -index 0000000000000000000000000000000000000000..7e1b1d2dfdf4b045ea92c8c7b74075ea81cf42f3 +index 000000000..7e1b1d2df --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_logo.h @@ -0,0 +1,46 @@ @@ -556685,7 +556677,7 @@ index 0000000000000000000000000000000000000000..7e1b1d2dfdf4b045ea92c8c7b74075ea +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_self_test.c b/drivers/gpu/drm/rockchip/rockchip_drm_self_test.c new file mode 100644 -index 0000000000000000000000000000000000000000..7c764fca154d622b3b70bb44590a44d037ed301e +index 000000000..7c764fca1 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_self_test.c @@ -0,0 +1,269 @@ @@ -556960,7 +556952,7 @@ index 0000000000000000000000000000000000000000..7c764fca154d622b3b70bb44590a44d0 +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 100644 -index 0000000000000000000000000000000000000000..6fbd17c1b00329ee526dfd1236e5206b55d41030 +index 000000000..6fbd17c1b --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_tve.c @@ -0,0 +1,1067 @@ @@ -558033,7 +558025,7 @@ index 0000000000000000000000000000000000000000..6fbd17c1b00329ee526dfd1236e5206b +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 100644 -index 0000000000000000000000000000000000000000..376b2ff0f42245be574348b1a1ca17bc3fbd8d4f +index 000000000..376b2ff0f --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_tve.h @@ -0,0 +1,285 @@ @@ -558324,7 +558316,7 @@ index 0000000000000000000000000000000000000000..376b2ff0f42245be574348b1a1ca17bc +#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 100644 -index 0000000000000000000000000000000000000000..f0fab09d386b12db5d3366b4c69fac0286d27cdb +index 000000000..f0fab09d3 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vconn.c @@ -0,0 +1,587 @@ @@ -558916,7 +558908,7 @@ index 0000000000000000000000000000000000000000..f0fab09d386b12db5d3366b4c69fac02 + }, +}; diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c -index 4b338cb89d32d4486c18d129e13e4eda1cd8ba0b..9dcd7c6b285c888d8fb99691f31849b4b3e01556 100644 +index 4b338cb89..9dcd7c6b2 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -6,22 +6,30 @@ @@ -564612,7 +564604,7 @@ index 4b338cb89d32d4486c18d129e13e4eda1cd8ba0b..9dcd7c6b285c888d8fb99691f31849b4 const struct component_ops vop_component_ops = { diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h -index 5f56e0597df84a9f2a00ba63e6ab127a5b03cde9..ff646fe0fc5a6093278477da858e818ead4acde9 100644 +index 5f56e0597..ff646fe0f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -7,52 +7,218 @@ @@ -566156,7 +566148,7 @@ index 5f56e0597df84a9f2a00ba63e6ab127a5b03cde9..ff646fe0fc5a6093278477da858e818e +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 -index c306806aa3dea7377d01779a31edd40ec2f9eaf2..44cc35be11981add5217f537ca7bee0199973b02 100644 +index c306806aa..44cc35be1 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -3,71 +3,170 @@ @@ -580534,7 +580526,7 @@ index c306806aa3dea7377d01779a31edd40ec2f9eaf2..44cc35be11981add5217f537ca7bee01 const struct component_ops vop2_component_ops = { diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h -index f1234a151130fa3e9fef469fa80156c380988e4f..c727093a06d687f5a844862b0b1d65e4094004e4 100644 +index f1234a151..c727093a0 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h @@ -27,6 +27,11 @@ enum win_dly_mode { @@ -580551,7 +580543,7 @@ index f1234a151130fa3e9fef469fa80156c380988e4f..c727093a06d687f5a844862b0b1d65e4 VOP2_SCALE_UP_BIL, diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c new file mode 100644 -index 0000000000000000000000000000000000000000..3f4432ad596ceddc87fba057bf47505e0ffba803 +index 000000000..3f4432ad5 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c @@ -0,0 +1,679 @@ @@ -581235,7 +581227,7 @@ index 0000000000000000000000000000000000000000..3f4432ad596ceddc87fba057bf47505e +MODULE_AUTHOR("Andy Yan "); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c -index 5828593877923f2157ee6444c3fb17a8cd13e044..805027ab6c601070c660a0a3d4e972c72fdad9dd 100644 +index 582859387..805027ab6 100644 --- a/drivers/gpu/drm/rockchip/rockchip_lvds.c +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c @@ -6,105 +6,252 @@ @@ -582569,7 +582561,7 @@ index 5828593877923f2157ee6444c3fb17a8cd13e044..805027ab6c601070c660a0a3d4e972c7 .of_match_table = of_match_ptr(rockchip_lvds_dt_ids), diff --git a/drivers/gpu/drm/rockchip/rockchip_post_csc.c b/drivers/gpu/drm/rockchip/rockchip_post_csc.c new file mode 100644 -index 0000000000000000000000000000000000000000..212a4b4b89e6d5bd12c8dcccbdecf1d536549ff2 +index 000000000..212a4b4b8 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_post_csc.c @@ -0,0 +1,1573 @@ @@ -584148,7 +584140,7 @@ index 0000000000000000000000000000000000000000..212a4b4b89e6d5bd12c8dcccbdecf1d5 +} diff --git a/drivers/gpu/drm/rockchip/rockchip_post_csc.h b/drivers/gpu/drm/rockchip/rockchip_post_csc.h new file mode 100644 -index 0000000000000000000000000000000000000000..1215a5cd1c874ddeb9adb3d3c333bd14bffd2d8b +index 000000000..1215a5cd1 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_post_csc.h @@ -0,0 +1,18 @@ @@ -584171,7 +584163,7 @@ index 0000000000000000000000000000000000000000..1215a5cd1c874ddeb9adb3d3c333bd14 + +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_rgb.c b/drivers/gpu/drm/rockchip/rockchip_rgb.c -index c677b71ae516beabef7ab18ca7d94daa721b9d18..67b53a0b9f1aefb624e07eaf3c074c065857b04c 100644 +index c677b71ae..67b53a0b9 100644 --- a/drivers/gpu/drm/rockchip/rockchip_rgb.c +++ b/drivers/gpu/drm/rockchip/rockchip_rgb.c @@ -6,31 +6,256 @@ @@ -585404,7 +585396,7 @@ index c677b71ae516beabef7ab18ca7d94daa721b9d18..67b53a0b9f1aefb624e07eaf3c074c06 + }, +}; diff --git a/drivers/gpu/drm/rockchip/rockchip_rgb.h b/drivers/gpu/drm/rockchip/rockchip_rgb.h -index 1bd4e20e91eb4d6d0a2bc8e8177e6e3843b5949d..8973232e0caa528e439df72629ea60ff61e09c8b 100644 +index 1bd4e20e9..8973232e0 100644 --- a/drivers/gpu/drm/rockchip/rockchip_rgb.h +++ b/drivers/gpu/drm/rockchip/rockchip_rgb.h @@ -9,13 +9,13 @@ @@ -585425,7 +585417,7 @@ index 1bd4e20e91eb4d6d0a2bc8e8177e6e3843b5949d..8973232e0caa528e439df72629ea60ff } diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_clk.c b/drivers/gpu/drm/rockchip/rockchip_vop2_clk.c new file mode 100644 -index 0000000000000000000000000000000000000000..b670e3d38a640af493507909aeca6aadc9fd41b9 +index 000000000..b670e3d38 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_clk.c @@ -0,0 +1,332 @@ @@ -585762,7 +585754,7 @@ index 0000000000000000000000000000000000000000..b670e3d38a640af493507909aeca6aad + return 0; +} diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c -index 62b573f282a7ae00bb72ded614e86a0946f0b42b..9854a23f545b18be0fe7be4cafec61c3d8c37e24 100644 +index 62b573f28..9854a23f5 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c @@ -6,16 +6,35 @@ @@ -589903,7 +589895,7 @@ index 62b573f282a7ae00bb72ded614e86a0946f0b42b..9854a23f545b18be0fe7be4cafec61c3 .name = "rockchip-vop2", .of_match_table = of_match_ptr(vop2_dt_match), diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c -index 7b28050067769d96baac6c8e6d05a944c61ed676..a4ca0737fb1bd572f5511a5e24685020eabe9503 100644 +index 7b2805006..a4ca0737f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -5,36 +5,36 @@ @@ -592832,7 +592824,7 @@ index 7b28050067769d96baac6c8e6d05a944c61ed676..a4ca0737fb1bd572f5511a5e24685020 }, }; diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h -index 406e981c75bd73df2f2350e1704030abd1b585f3..a33f6fcecb78a41575279ce0166ef657682758cf 100644 +index 406e981c7..a33f6fcec 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h @@ -113,6 +113,11 @@ @@ -593853,7 +593845,7 @@ index 406e981c75bd73df2f2350e1704030abd1b585f3..a33f6fcecb78a41575279ce0166ef657 +#define RK3528_ACM_YHS_DEL_HGAIN_SEG64 0x07d8 #endif /* _ROCKCHIP_VOP_REG_H */ diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c -index 257dd73e37bf5756d18e05ad46c9476c2baa1554..4e26a40b3369dc66dd85e4bdad12928db041f831 100644 +index 257dd73e3..4e26a40b3 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -1189,6 +1189,9 @@ static int usbhid_start(struct hid_device *hid) @@ -593868,7 +593860,7 @@ index 257dd73e37bf5756d18e05ad46c9476c2baa1554..4e26a40b3369dc66dd85e4bdad12928d diff --git a/drivers/hooks/Kconfig b/drivers/hooks/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..bff298adaf8e14e397db67a348bbfbd4255c59df +index 000000000..bff298ada --- /dev/null +++ b/drivers/hooks/Kconfig @@ -0,0 +1,16 @@ @@ -593890,7 +593882,7 @@ index 0000000000000000000000000000000000000000..bff298adaf8e14e397db67a348bbfbd4 +endmenu diff --git a/drivers/hooks/Makefile b/drivers/hooks/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..533f270e09204415b03ca91c6d00bc1bb7a72aa7 +index 000000000..533f270e0 --- /dev/null +++ b/drivers/hooks/Makefile @@ -0,0 +1,5 @@ @@ -593901,7 +593893,7 @@ index 0000000000000000000000000000000000000000..533f270e09204415b03ca91c6d00bc1b +obj-$(CONFIG_VENDOR_HOOKS) += vendor_hooks.o diff --git a/drivers/hooks/vendor_hooks.c b/drivers/hooks/vendor_hooks.c new file mode 100644 -index 0000000000000000000000000000000000000000..939146da879cf3fcd9576cb7a7d227773b096513 +index 000000000..939146da8 --- /dev/null +++ b/drivers/hooks/vendor_hooks.c @@ -0,0 +1,23 @@ @@ -593929,7 +593921,7 @@ index 0000000000000000000000000000000000000000..939146da879cf3fcd9576cb7a7d22777 +EXPORT_TRACEPOINT_SYMBOL_GPL(vendor_do_mmap); +EXPORT_TRACEPOINT_SYMBOL_GPL(vendor_do_mprotect_pkey); diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c -index 6e4516c2ab894f4a10195af076e532bb8ba1093a..8a2df84e7e2735297654a3ddeffe7f29cabe400d 100644 +index 6e4516c2a..8a2df84e7 100644 --- a/drivers/hwmon/pwm-fan.c +++ b/drivers/hwmon/pwm-fan.c @@ -18,6 +18,7 @@ @@ -594074,7 +594066,7 @@ index 6e4516c2ab894f4a10195af076e532bb8ba1093a..8a2df84e7e2735297654a3ddeffe7f29 cdev = devm_thermal_of_cooling_device_register(dev, dev->of_node, "pwm-fan", ctx, &pwm_fan_cooling_ops); diff --git a/drivers/hwspinlock/Kconfig b/drivers/hwspinlock/Kconfig -index 3874d15b0e9b71bb42bbea2eb2dac213e513e1e5..1c8c8e5a75742975c9c8a3beeea14e6efe8a731e 100644 +index 3874d15b0..1c8c8e5a7 100644 --- a/drivers/hwspinlock/Kconfig +++ b/drivers/hwspinlock/Kconfig @@ -28,6 +28,16 @@ config HWSPINLOCK_QCOM @@ -594095,7 +594087,7 @@ index 3874d15b0e9b71bb42bbea2eb2dac213e513e1e5..1c8c8e5a75742975c9c8a3beeea14e6e tristate "SPRD Hardware Spinlock device" depends on ARCH_SPRD || COMPILE_TEST diff --git a/drivers/hwspinlock/Makefile b/drivers/hwspinlock/Makefile -index a0f16c9aaa82124e86cc5387e1308d0680248013..8e47f5f693476aa30f903caffbdcc1709454e63d 100644 +index a0f16c9aa..8e47f5f69 100644 --- a/drivers/hwspinlock/Makefile +++ b/drivers/hwspinlock/Makefile @@ -6,6 +6,7 @@ @@ -594108,7 +594100,7 @@ index a0f16c9aaa82124e86cc5387e1308d0680248013..8e47f5f693476aa30f903caffbdcc170 obj-$(CONFIG_HWSPINLOCK_SUN6I) += sun6i_hwspinlock.o diff --git a/drivers/hwspinlock/rockchip_hwspinlock.c b/drivers/hwspinlock/rockchip_hwspinlock.c new file mode 100644 -index 0000000000000000000000000000000000000000..26ba8ec31f01ff52f0df3d79d0cb9e84a0483cae +index 000000000..26ba8ec31 --- /dev/null +++ b/drivers/hwspinlock/rockchip_hwspinlock.c @@ -0,0 +1,111 @@ @@ -594224,7 +594216,7 @@ index 0000000000000000000000000000000000000000..26ba8ec31f01ff52f0df3d79d0cb9e84 +MODULE_DESCRIPTION("Rockchip Hardware spinlock driver"); +MODULE_AUTHOR("Frank Wang "); diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c -index 086fdf262e7b60e26c48727f6f8f586615674117..8357f8e30ca080e0819ecb1bce19850aacff7960 100644 +index 086fdf262..8357f8e30 100644 --- a/drivers/i2c/busses/i2c-rk3x.c +++ b/drivers/i2c/busses/i2c-rk3x.c @@ -6,6 +6,7 @@ @@ -595312,7 +595304,7 @@ index 086fdf262e7b60e26c48727f6f8f586615674117..8357f8e30ca080e0819ecb1bce19850a 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 7f30bcceebaed3380ce0b3325e5e48ca0dba8807..b8ca8441fa8ceb4c62669c37f602d01470b3e087 100644 +index 7f30bccee..b8ca8441f 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -62,6 +62,7 @@ @@ -595445,7 +595437,7 @@ index 7f30bcceebaed3380ce0b3325e5e48ca0dba8807..b8ca8441fa8ceb4c62669c37f602d014 unsigned cmd; void *arg; diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig -index 3bdbd34314b3495ab39e8b0212c0cc643bd8406c..d61c9262b861468e29ce8fb56f7d4b835cc5615e 100644 +index 3bdbd3431..d61c9262b 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig @@ -200,6 +200,8 @@ source "drivers/input/tablet/Kconfig" @@ -595458,7 +595450,7 @@ index 3bdbd34314b3495ab39e8b0212c0cc643bd8406c..d61c9262b861468e29ce8fb56f7d4b83 source "drivers/input/rmi4/Kconfig" diff --git a/drivers/input/Makefile b/drivers/input/Makefile -index c787532749214cc1fee3b4f9a6ddb713143e71cf..7b79653e93531ed9e70362a39703fe8c432e701c 100644 +index c78753274..7b79653e9 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -25,6 +25,7 @@ obj-$(CONFIG_INPUT_MOUSE) += mouse/ @@ -595470,7 +595462,7 @@ index c787532749214cc1fee3b4f9a6ddb713143e71cf..7b79653e93531ed9e70362a39703fe8c obj-$(CONFIG_INPUT_KUNIT_TEST) += tests/ diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig -index 6ba984d7f0b18694f48160c4628575af1c8ea252..6e91298143a8ef243fefdbf5ef1336d6e95e3882 100644 +index 6ba984d7f..6e9129814 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -609,7 +609,7 @@ config INPUT_PWM_VIBRA @@ -595484,7 +595476,7 @@ index 6ba984d7f0b18694f48160c4628575af1c8ea252..6e91298143a8ef243fefdbf5ef1336d6 diff --git a/drivers/input/remotectl/Kconfig b/drivers/input/remotectl/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..67558b48869e935462db036f20954b951be0cc1b +index 000000000..67558b488 --- /dev/null +++ b/drivers/input/remotectl/Kconfig @@ -0,0 +1,19 @@ @@ -595509,7 +595501,7 @@ index 0000000000000000000000000000000000000000..67558b48869e935462db036f20954b95 +endif diff --git a/drivers/input/remotectl/Makefile b/drivers/input/remotectl/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..209472b4a356088c0214d9dacc9f2b3771beea45 +index 000000000..209472b4a --- /dev/null +++ b/drivers/input/remotectl/Makefile @@ -0,0 +1,8 @@ @@ -595523,7 +595515,7 @@ index 0000000000000000000000000000000000000000..209472b4a356088c0214d9dacc9f2b37 +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 100644 -index 0000000000000000000000000000000000000000..889e0d58e733638583443fd741a249ee666d12ad +index 000000000..889e0d58e --- /dev/null +++ b/drivers/input/remotectl/rockchip_pwm_remotectl.c @@ -0,0 +1,898 @@ @@ -596427,7 +596419,7 @@ index 0000000000000000000000000000000000000000..889e0d58e733638583443fd741a249ee +MODULE_LICENSE("GPL"); diff --git a/drivers/input/remotectl/rockchip_pwm_remotectl.h b/drivers/input/remotectl/rockchip_pwm_remotectl.h new file mode 100644 -index 0000000000000000000000000000000000000000..5126a3edb5d5d950e28fab09a1a2b445f2a17506 +index 000000000..5126a3edb --- /dev/null +++ b/drivers/input/remotectl/rockchip_pwm_remotectl.h @@ -0,0 +1,160 @@ @@ -596592,7 +596584,7 @@ index 0000000000000000000000000000000000000000..5126a3edb5d5d950e28fab09a1a2b445 + +#endif diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig -index 2b12b583ef4b1edb8c296f59e7e6d4dcc4ca095e..3bbdf4e469175ddc077733794ede6049589b732a 100644 +index 2b12b583e..3bbdf4e46 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -216,7 +216,8 @@ config OMAP_IOMMU_DEBUG @@ -596606,7 +596598,7 @@ index 2b12b583ef4b1edb8c296f59e7e6d4dcc4ca095e..3bbdf4e469175ddc077733794ede6049 select IOMMU_API select ARM_DMA_USE_IOMMU diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile -index 769e43d780ce89810033064bfd3baa8420889bed..2a6c2dce557ae541c9fe96f74924e86b9410c98c 100644 +index 769e43d78..2a6c2dce5 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -18,7 +18,9 @@ obj-$(CONFIG_MTK_IOMMU) += mtk_iommu.o @@ -596621,7 +596613,7 @@ index 769e43d780ce89810033064bfd3baa8420889bed..2a6c2dce557ae541c9fe96f74924e86b obj-$(CONFIG_TEGRA_IOMMU_GART) += tegra-gart.o obj-$(CONFIG_TEGRA_IOMMU_SMMU) += tegra-smmu.o diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index 3a67e636287a79684d2dd3c8e080481dd65d1db5..b859d5220ff164330b5a9391c420cf7350035299 100644 +index 3a67e6362..b859d5220 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -2075,7 +2075,9 @@ int iommu_attach_device(struct iommu_domain *domain, struct device *dev) @@ -596637,7 +596629,7 @@ index 3a67e636287a79684d2dd3c8e080481dd65d1db5..b859d5220ff164330b5a9391c420cf73 ret = __iommu_attach_group(domain, group); diff --git a/drivers/iommu/rockchip-iommu-av1d.c b/drivers/iommu/rockchip-iommu-av1d.c new file mode 100644 -index 0000000000000000000000000000000000000000..6286e2cac08dc838050512da46c890b8d6d4cb4f +index 000000000..6286e2cac --- /dev/null +++ b/drivers/iommu/rockchip-iommu-av1d.c @@ -0,0 +1,795 @@ @@ -597437,7 +597429,7 @@ index 0000000000000000000000000000000000000000..6286e2cac08dc838050512da46c890b8 + return &av1d_iommu_ops; +} diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c -index 8ff69fbf9f65db876964a7a90ca9abe1d27f65d2..ea18c63da9a56747fffc271f43d1fca91eb50a4c 100644 +index 8ff69fbf9..ea18c63da 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -18,6 +18,7 @@ @@ -598711,7 +598703,7 @@ index 8ff69fbf9f65db876964a7a90ca9abe1d27f65d2..ea18c63da9a56747fffc271f43d1fca9 +MODULE_ALIAS("platform:rockchip-iommu"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/irqchip/irq-gic-common.c b/drivers/irqchip/irq-gic-common.c -index afd6a1841715a152afd572dac15e4366bfd96d1f..6d8d96b84293e1f463b1868754d822ea8897f3b1 100644 +index afd6a1841..6d8d96b84 100644 --- a/drivers/irqchip/irq-gic-common.c +++ b/drivers/irqchip/irq-gic-common.c @@ -10,6 +10,10 @@ @@ -598752,7 +598744,7 @@ index afd6a1841715a152afd572dac15e4366bfd96d1f..6d8d96b84293e1f463b1868754d822ea /* * Deactivate and disable all SPIs. Leave the PPI and SGIs diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c -index 676c9250d3f28af2a416b542ba963f55debd6fd9..b702d4db3642fbe95a56d590f6ff26331d4accee 100644 +index 676c9250d..b702d4db3 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -163,6 +163,7 @@ struct its_device { @@ -598985,7 +598977,7 @@ index 676c9250d3f28af2a416b542ba963f55debd6fd9..b702d4db3642fbe95a56d590f6ff2633 if ((tmp ^ baser) & GITS_CBASER_SHAREABILITY_MASK) { diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c -index 412196a7dad587dca5773dcd71e6b2f9d3d95b5f..988494e279de9efd38c477cd1d8686cc52b72f03 100644 +index 412196a7d..988494e27 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -49,6 +49,10 @@ @@ -599129,7 +599121,7 @@ index 412196a7dad587dca5773dcd71e6b2f9d3d95b5f..988494e279de9efd38c477cd1d8686cc ret = gic_cpu_init(gic); if (ret) diff --git a/drivers/mailbox/Makefile b/drivers/mailbox/Makefile -index fc93761171113ea94d079de1b4772722467247e7..5bbdb5478d97a9b8b4fe1db0556e126d12370bc8 100644 +index fc9376117..5bbdb5478 100644 --- a/drivers/mailbox/Makefile +++ b/drivers/mailbox/Makefile @@ -21,6 +21,8 @@ obj-$(CONFIG_OMAP2PLUS_MBOX) += omap-mailbox.o @@ -599142,7 +599134,7 @@ index fc93761171113ea94d079de1b4772722467247e7..5bbdb5478d97a9b8b4fe1db0556e126d obj-$(CONFIG_ALTERA_MBOX) += mailbox-altera.o diff --git a/drivers/mailbox/rockchip-mailbox.c b/drivers/mailbox/rockchip-mailbox.c -index 8ffad059e8984ecc0585974ae364c82e5e080ca6..66ebea28009246d0a3c5d8d71959c1ca87343a65 100644 +index 8ffad059e..66ebea280 100644 --- a/drivers/mailbox/rockchip-mailbox.c +++ b/drivers/mailbox/rockchip-mailbox.c @@ -8,9 +8,11 @@ @@ -599506,7 +599498,7 @@ index 8ffad059e8984ecc0585974ae364c82e5e080ca6..66ebea28009246d0a3c5d8d71959c1ca MODULE_AUTHOR("Caesar Wang "); diff --git a/drivers/mailbox/rockchip-mbox-demo.c b/drivers/mailbox/rockchip-mbox-demo.c new file mode 100644 -index 0000000000000000000000000000000000000000..17a313b7e0ab24530d18b8d61098fb21f47e10ee +index 000000000..17a313b7e --- /dev/null +++ b/drivers/mailbox/rockchip-mbox-demo.c @@ -0,0 +1,138 @@ @@ -599649,7 +599641,7 @@ index 0000000000000000000000000000000000000000..17a313b7e0ab24530d18b8d61098fb21 +MODULE_DESCRIPTION("Rockchip MBOX Demo"); +MODULE_AUTHOR("Jiahang Zheng "); diff --git a/drivers/media/common/videobuf2/Kconfig b/drivers/media/common/videobuf2/Kconfig -index d2223a12c95fca3eacdae0eef65d77bc79fe4e5c..0484c469cd22c1d95eca65e8839ad2b78ffffdd5 100644 +index d2223a12c..0484c469c 100644 --- a/drivers/media/common/videobuf2/Kconfig +++ b/drivers/media/common/videobuf2/Kconfig @@ -10,20 +10,29 @@ config VIDEOBUF2_V4L2 @@ -599683,7 +599675,7 @@ index d2223a12c95fca3eacdae0eef65d77bc79fe4e5c..0484c469cd22c1d95eca65e8839ad2b7 select VIDEOBUF2_MEMOPS diff --git a/drivers/media/common/videobuf2/Makefile b/drivers/media/common/videobuf2/Makefile -index a6fe3f304685e9946738fdbaf77d45b967e7205a..3c3f25eaee3530946ab7c018c2efdeb8ac4d7d65 100644 +index a6fe3f304..3c3f25eae 100644 --- a/drivers/media/common/videobuf2/Makefile +++ b/drivers/media/common/videobuf2/Makefile @@ -9,6 +9,7 @@ endif @@ -599696,7 +599688,7 @@ index a6fe3f304685e9946738fdbaf77d45b967e7205a..3c3f25eaee3530946ab7c018c2efdeb8 obj-$(CONFIG_VIDEOBUF2_DVB) += videobuf2-dvb.o diff --git a/drivers/media/common/videobuf2/videobuf2-cma-sg.c b/drivers/media/common/videobuf2/videobuf2-cma-sg.c new file mode 100644 -index 0000000000000000000000000000000000000000..9c8847ecbfd84b2f1836a83e0370828893463076 +index 000000000..9c8847ecb --- /dev/null +++ b/drivers/media/common/videobuf2/videobuf2-cma-sg.c @@ -0,0 +1,726 @@ @@ -600427,7 +600419,7 @@ index 0000000000000000000000000000000000000000..9c8847ecbfd84b2f1836a83e03708288 +MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(DMA_BUF); diff --git a/drivers/media/common/videobuf2/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c -index 6975a71d740f6d70c139eca739ae665d51007af2..50ff34243bc5839bf66cdf67c642c301f12905cb 100644 +index 6975a71d7..50ff34243 100644 --- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c +++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c @@ -311,7 +311,7 @@ static void *vb2_dma_sg_vaddr(struct vb2_buffer *vb, void *buf_priv) @@ -600497,7 +600489,7 @@ index 6975a71d740f6d70c139eca739ae665d51007af2..50ff34243bc5839bf66cdf67c642c301 buf->dma_sgt = NULL; } diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c -index c7a54d82a55e5b79bf11f8d87c16458b9f863c86..8b4eaa74f4cd3714931cbaa0565f549d776c877c 100644 +index c7a54d82a..8b4eaa74f 100644 --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c @@ -295,6 +295,12 @@ static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b @@ -600514,7 +600506,7 @@ index c7a54d82a55e5b79bf11f8d87c16458b9f863c86..8b4eaa74f4cd3714931cbaa0565f549d if (b->bytesused == 0) vb2_warn_zero_bytesused(vb); diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index 53b443be5a59ee7a43834438eb2c68f2b1991cee..200071c6f8ecb67a85b10f142a684c85be1c85cd 100644 +index 53b443be5..200071c6f 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -50,6 +50,19 @@ config VIDEO_AR0521 @@ -600538,7 +600530,7 @@ index 53b443be5a59ee7a43834438eb2c68f2b1991cee..200071c6f8ecb67a85b10f142a684c85 tristate "Hynix Hi-556 sensor support" help diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile -index 80b00d39b48f0c764f1d1c874e5cd7750220ed45..dc1506e6eec9f979358e71fa91dc1faf41bca4fa 100644 +index 80b00d39b..dc1506e6e 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -36,6 +36,7 @@ obj-$(CONFIG_VIDEO_DW9719) += dw9719.o @@ -600551,7 +600543,7 @@ index 80b00d39b48f0c764f1d1c874e5cd7750220ed45..dc1506e6eec9f979358e71fa91dc1faf obj-$(CONFIG_VIDEO_HI847) += hi847.o diff --git a/drivers/media/i2c/gc8034.c b/drivers/media/i2c/gc8034.c new file mode 100644 -index 0000000000000000000000000000000000000000..afc8fa23ea5b889ea9339cec90eb82bad86af607 +index 000000000..afc8fa23e --- /dev/null +++ b/drivers/media/i2c/gc8034.c @@ -0,0 +1,2817 @@ @@ -603373,7 +603365,7 @@ index 0000000000000000000000000000000000000000..afc8fa23ea5b889ea9339cec90eb82ba +MODULE_DESCRIPTION("GalaxyCore gc8034 sensor driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/Kconfig b/drivers/media/platform/rockchip/Kconfig -index b41d3960c1b414d942c719da4a5ab7cde62fff84..817b4cb2dc9e68ea3a5714eb74ade3beffa0ce3b 100644 +index b41d3960c..817b4cb2d 100644 --- a/drivers/media/platform/rockchip/Kconfig +++ b/drivers/media/platform/rockchip/Kconfig @@ -2,5 +2,10 @@ @@ -603388,7 +603380,7 @@ index b41d3960c1b414d942c719da4a5ab7cde62fff84..817b4cb2dc9e68ea3a5714eb74ade3be source "drivers/media/platform/rockchip/rga/Kconfig" source "drivers/media/platform/rockchip/rkisp1/Kconfig" diff --git a/drivers/media/platform/rockchip/Makefile b/drivers/media/platform/rockchip/Makefile -index 4f782b876ac9bee8b78b92a703ed05213d6b2198..fe41a2e2fde0698f2a1904129b14e9eea743f37c 100644 +index 4f782b876..fe41a2e2f 100644 --- a/drivers/media/platform/rockchip/Makefile +++ b/drivers/media/platform/rockchip/Makefile @@ -1,3 +1,8 @@ @@ -603402,7 +603394,7 @@ index 4f782b876ac9bee8b78b92a703ed05213d6b2198..fe41a2e2fde0698f2a1904129b14e9ee obj-y += rkisp1/ diff --git a/drivers/media/platform/rockchip/cif/Kconfig b/drivers/media/platform/rockchip/cif/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..78a46df4f3384c15e9c6409293965dc5bfb550c3 +index 000000000..78a46df4f --- /dev/null +++ b/drivers/media/platform/rockchip/cif/Kconfig @@ -0,0 +1,80 @@ @@ -603488,7 +603480,7 @@ index 0000000000000000000000000000000000000000..78a46df4f3384c15e9c6409293965dc5 + diff --git a/drivers/media/platform/rockchip/cif/Makefile b/drivers/media/platform/rockchip/cif/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..d43cad36a27224fe5737aaf23a14a7b2dce83259 +index 000000000..d43cad36a --- /dev/null +++ b/drivers/media/platform/rockchip/cif/Makefile @@ -0,0 +1,13 @@ @@ -603507,7 +603499,7 @@ index 0000000000000000000000000000000000000000..d43cad36a27224fe5737aaf23a14a7b2 + cif-rockit.o diff --git a/drivers/media/platform/rockchip/cif/capture.c b/drivers/media/platform/rockchip/cif/capture.c new file mode 100644 -index 0000000000000000000000000000000000000000..442ee5a86df5a17adfa5700e3d032587503b62e2 +index 000000000..442ee5a86 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/capture.c @@ -0,0 +1,11718 @@ @@ -615231,7 +615223,7 @@ index 0000000000000000000000000000000000000000..442ee5a86df5a17adfa5700e3d032587 +EXPORT_SYMBOL(rkcif_sditf_disconnect); diff --git a/drivers/media/platform/rockchip/cif/cif-luma.c b/drivers/media/platform/rockchip/cif/cif-luma.c new file mode 100644 -index 0000000000000000000000000000000000000000..5a3c228cf76cf463cebf239188a2f562a52459fb +index 000000000..5a3c228cf --- /dev/null +++ b/drivers/media/platform/rockchip/cif/cif-luma.c @@ -0,0 +1,520 @@ @@ -615757,7 +615749,7 @@ index 0000000000000000000000000000000000000000..5a3c228cf76cf463cebf239188a2f562 +} diff --git a/drivers/media/platform/rockchip/cif/cif-luma.h b/drivers/media/platform/rockchip/cif/cif-luma.h new file mode 100644 -index 0000000000000000000000000000000000000000..40a5787e1d0e500d5412e2efec795733a4d2cf26 +index 000000000..40a5787e1 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/cif-luma.h @@ -0,0 +1,83 @@ @@ -615846,7 +615838,7 @@ index 0000000000000000000000000000000000000000..40a5787e1d0e500d5412e2efec795733 +#endif /* _RKCIF_LUMA_H */ diff --git a/drivers/media/platform/rockchip/cif/cif-rockit.c b/drivers/media/platform/rockchip/cif/cif-rockit.c new file mode 100644 -index 0000000000000000000000000000000000000000..adeeab707296a7e8ba847ba9f52cb31cff8566b7 +index 000000000..adeeab707 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/cif-rockit.c @@ -0,0 +1,420 @@ @@ -616272,7 +616264,7 @@ index 0000000000000000000000000000000000000000..adeeab707296a7e8ba847ba9f52cb31c +EXPORT_SYMBOL(rkcif_rockit_get_cifdev); diff --git a/drivers/media/platform/rockchip/cif/cif-scale.c b/drivers/media/platform/rockchip/cif/cif-scale.c new file mode 100644 -index 0000000000000000000000000000000000000000..a9b97a6e21adc150f71ff28e9d60d18cada1c118 +index 000000000..a9b97a6e2 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/cif-scale.c @@ -0,0 +1,1194 @@ @@ -617472,7 +617464,7 @@ index 0000000000000000000000000000000000000000..a9b97a6e21adc150f71ff28e9d60d18c + diff --git a/drivers/media/platform/rockchip/cif/cif-tools.c b/drivers/media/platform/rockchip/cif/cif-tools.c new file mode 100644 -index 0000000000000000000000000000000000000000..60103bf7140286f652365a11cbe127c60ef3ccf9 +index 000000000..60103bf71 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/cif-tools.c @@ -0,0 +1,926 @@ @@ -618404,7 +618396,7 @@ index 0000000000000000000000000000000000000000..60103bf7140286f652365a11cbe127c6 +} diff --git a/drivers/media/platform/rockchip/cif/common.c b/drivers/media/platform/rockchip/cif/common.c new file mode 100644 -index 0000000000000000000000000000000000000000..27f2c1425b19873c3f48aa7f2e8d7aa18cebde89 +index 000000000..27f2c1425 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/common.c @@ -0,0 +1,405 @@ @@ -618815,7 +618807,7 @@ index 0000000000000000000000000000000000000000..27f2c1425b19873c3f48aa7f2e8d7aa1 + diff --git a/drivers/media/platform/rockchip/cif/common.h b/drivers/media/platform/rockchip/cif/common.h new file mode 100644 -index 0000000000000000000000000000000000000000..7bdfe4f402239a3246b32a4c2811ba557efcad7b +index 000000000..7bdfe4f40 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/common.h @@ -0,0 +1,30 @@ @@ -618851,7 +618843,7 @@ index 0000000000000000000000000000000000000000..7bdfe4f402239a3246b32a4c2811ba55 + diff --git a/drivers/media/platform/rockchip/cif/dev.c b/drivers/media/platform/rockchip/cif/dev.c new file mode 100644 -index 0000000000000000000000000000000000000000..e5c731ab037a12154843e941aa9a0fbd72a0f9fc +index 000000000..e5c731ab0 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/dev.c @@ -0,0 +1,2334 @@ @@ -621191,7 +621183,7 @@ index 0000000000000000000000000000000000000000..e5c731ab037a12154843e941aa9a0fbd +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 100644 -index 0000000000000000000000000000000000000000..31316c003a1619f904577d38ba94af335bab01fc +index 000000000..31316c003 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/dev.h @@ -0,0 +1,1035 @@ @@ -622232,7 +622224,7 @@ index 0000000000000000000000000000000000000000..31316c003a1619f904577d38ba94af33 +#endif diff --git a/drivers/media/platform/rockchip/cif/hw.c b/drivers/media/platform/rockchip/cif/hw.c new file mode 100644 -index 0000000000000000000000000000000000000000..2acf45a7d1045dee15b8c651ea6b6ff46eb02277 +index 000000000..2acf45a7d --- /dev/null +++ b/drivers/media/platform/rockchip/cif/hw.c @@ -0,0 +1,1628 @@ @@ -623866,7 +623858,7 @@ index 0000000000000000000000000000000000000000..2acf45a7d1045dee15b8c651ea6b6ff4 +MODULE_IMPORT_NS(DMA_BUF); diff --git a/drivers/media/platform/rockchip/cif/hw.h b/drivers/media/platform/rockchip/cif/hw.h new file mode 100644 -index 0000000000000000000000000000000000000000..06ca088c4ce5acda08213381f83b549dcc2af1bc +index 000000000..06ca088c4 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/hw.h @@ -0,0 +1,163 @@ @@ -624035,7 +624027,7 @@ index 0000000000000000000000000000000000000000..06ca088c4ce5acda08213381f83b549d +#endif diff --git a/drivers/media/platform/rockchip/cif/mipi-csi2.c b/drivers/media/platform/rockchip/cif/mipi-csi2.c new file mode 100644 -index 0000000000000000000000000000000000000000..ac5224bd7b2a6fef0e53d4153b63d3e1158d966a +index 000000000..ac5224bd7 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/mipi-csi2.c @@ -0,0 +1,1354 @@ @@ -625395,7 +625387,7 @@ index 0000000000000000000000000000000000000000..ac5224bd7b2a6fef0e53d4153b63d3e1 +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 100644 -index 0000000000000000000000000000000000000000..3306c53d13368ba82c5c2a6eee10246053e15e51 +index 000000000..3306c53d1 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/mipi-csi2.h @@ -0,0 +1,205 @@ @@ -625606,7 +625598,7 @@ index 0000000000000000000000000000000000000000..3306c53d13368ba82c5c2a6eee102460 +#endif diff --git a/drivers/media/platform/rockchip/cif/procfs.c b/drivers/media/platform/rockchip/cif/procfs.c new file mode 100644 -index 0000000000000000000000000000000000000000..ef229fa2a3a4ad7b79c1faf9672b82af09942885 +index 000000000..ef229fa2a --- /dev/null +++ b/drivers/media/platform/rockchip/cif/procfs.c @@ -0,0 +1,426 @@ @@ -626038,7 +626030,7 @@ index 0000000000000000000000000000000000000000..ef229fa2a3a4ad7b79c1faf9672b82af +#endif diff --git a/drivers/media/platform/rockchip/cif/procfs.h b/drivers/media/platform/rockchip/cif/procfs.h new file mode 100644 -index 0000000000000000000000000000000000000000..798533849cd931a0ce8dd72e86ac003afef5b17c +index 000000000..798533849 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/procfs.h @@ -0,0 +1,25 @@ @@ -626069,7 +626061,7 @@ index 0000000000000000000000000000000000000000..798533849cd931a0ce8dd72e86ac003a +#endif diff --git a/drivers/media/platform/rockchip/cif/regs.h b/drivers/media/platform/rockchip/cif/regs.h new file mode 100644 -index 0000000000000000000000000000000000000000..68bc6ef30a79f5051ff86942fb40c158120cc378 +index 000000000..68bc6ef30 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/regs.h @@ -0,0 +1,1075 @@ @@ -627150,7 +627142,7 @@ index 0000000000000000000000000000000000000000..68bc6ef30a79f5051ff86942fb40c158 +#endif diff --git a/drivers/media/platform/rockchip/cif/rkcif-externel.h b/drivers/media/platform/rockchip/cif/rkcif-externel.h new file mode 100644 -index 0000000000000000000000000000000000000000..fe21f5f27fb4e780836b33aa39f552e620f70f32 +index 000000000..fe21f5f27 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/rkcif-externel.h @@ -0,0 +1,13 @@ @@ -627169,7 +627161,7 @@ index 0000000000000000000000000000000000000000..fe21f5f27fb4e780836b33aa39f552e6 +#endif diff --git a/drivers/media/platform/rockchip/cif/subdev-itf.c b/drivers/media/platform/rockchip/cif/subdev-itf.c new file mode 100644 -index 0000000000000000000000000000000000000000..12387515c0601b97827c584e8bc8d51eeda561c0 +index 000000000..12387515c --- /dev/null +++ b/drivers/media/platform/rockchip/cif/subdev-itf.c @@ -0,0 +1,1304 @@ @@ -628479,7 +628471,7 @@ index 0000000000000000000000000000000000000000..12387515c0601b97827c584e8bc8d51e +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 100644 -index 0000000000000000000000000000000000000000..58c63094a3c8c8efd169ac62d726dec4447b5d52 +index 000000000..58c63094a --- /dev/null +++ b/drivers/media/platform/rockchip/cif/subdev-itf.h @@ -0,0 +1,89 @@ @@ -628574,7 +628566,7 @@ index 0000000000000000000000000000000000000000..58c63094a3c8c8efd169ac62d726dec4 +#endif diff --git a/drivers/media/platform/rockchip/cif/version.h b/drivers/media/platform/rockchip/cif/version.h new file mode 100644 -index 0000000000000000000000000000000000000000..dbebed0ca0ef8f90e28b41899cd6c5ddd8b8660f +index 000000000..dbebed0ca --- /dev/null +++ b/drivers/media/platform/rockchip/cif/version.h @@ -0,0 +1,76 @@ @@ -628656,7 +628648,7 @@ index 0000000000000000000000000000000000000000..dbebed0ca0ef8f90e28b41899cd6c5dd +#endif diff --git a/drivers/media/platform/rockchip/hdmirx/Kconfig b/drivers/media/platform/rockchip/hdmirx/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..94037575b14535d8f0d7cf395b582ca1c220cac0 +index 000000000..94037575b --- /dev/null +++ b/drivers/media/platform/rockchip/hdmirx/Kconfig @@ -0,0 +1,30 @@ @@ -628692,7 +628684,7 @@ index 0000000000000000000000000000000000000000..94037575b14535d8f0d7cf395b582ca1 + will be called rockchip_hdmirx. diff --git a/drivers/media/platform/rockchip/hdmirx/Makefile b/drivers/media/platform/rockchip/hdmirx/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..9e7fb30d1880a6ea87304e549794e32461f2781b +index 000000000..9e7fb30d1 --- /dev/null +++ b/drivers/media/platform/rockchip/hdmirx/Makefile @@ -0,0 +1,6 @@ @@ -628704,7 +628696,7 @@ index 0000000000000000000000000000000000000000..9e7fb30d1880a6ea87304e549794e324 +obj-$(CONFIG_VIDEO_ROCKCHIP_HDMIRX) += rockchip-hdmirx.o diff --git a/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.c b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.c new file mode 100644 -index 0000000000000000000000000000000000000000..d3c54ba16e9ffa527c68e0833f1d64e940dae1b5 +index 000000000..d3c54ba16 --- /dev/null +++ b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.c @@ -0,0 +1,4921 @@ @@ -633631,7 +633623,7 @@ index 0000000000000000000000000000000000000000..d3c54ba16e9ffa527c68e0833f1d64e9 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.h b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.h new file mode 100644 -index 0000000000000000000000000000000000000000..d49f7c4fe266efbb45911a2f8d039bad021348aa +index 000000000..d49f7c4fe --- /dev/null +++ b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.h @@ -0,0 +1,465 @@ @@ -634102,7 +634094,7 @@ index 0000000000000000000000000000000000000000..d49f7c4fe266efbb45911a2f8d039bad +#endif diff --git a/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_cec.c b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_cec.c new file mode 100644 -index 0000000000000000000000000000000000000000..70f1ff66d9f70aa95a9a653706a6c3049742226a +index 000000000..70f1ff66d --- /dev/null +++ b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_cec.c @@ -0,0 +1,289 @@ @@ -634397,7 +634389,7 @@ index 0000000000000000000000000000000000000000..70f1ff66d9f70aa95a9a653706a6c304 +} diff --git a/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_cec.h b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_cec.h new file mode 100644 -index 0000000000000000000000000000000000000000..ce6331a09d5d5d319a9de8ed74364d829382a7cc +index 000000000..ce6331a09 --- /dev/null +++ b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_cec.h @@ -0,0 +1,46 @@ @@ -634449,7 +634441,7 @@ index 0000000000000000000000000000000000000000..ce6331a09d5d5d319a9de8ed74364d82 +#endif /* __DW_HDMI_RX_CEC_H__ */ diff --git a/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_class.c b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_class.c new file mode 100644 -index 0000000000000000000000000000000000000000..1aa66d3c080c98c30dc11b5461db4de19763728d +index 000000000..1aa66d3c0 --- /dev/null +++ b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_class.c @@ -0,0 +1,37 @@ @@ -634492,7 +634484,7 @@ index 0000000000000000000000000000000000000000..1aa66d3c080c98c30dc11b5461db4de1 +MODULE_LICENSE("GPL"); diff --git a/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_hdcp.c b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_hdcp.c new file mode 100644 -index 0000000000000000000000000000000000000000..7cda8d87fb2c93d2d0e4844bc42e700686672b53 +index 000000000..7cda8d87f --- /dev/null +++ b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_hdcp.c @@ -0,0 +1,447 @@ @@ -634945,7 +634937,7 @@ index 0000000000000000000000000000000000000000..7cda8d87fb2c93d2d0e4844bc42e7006 +} diff --git a/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_hdcp.h b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_hdcp.h new file mode 100644 -index 0000000000000000000000000000000000000000..32fb102cc48844917281e835ba7bfc2f42b79d37 +index 000000000..32fb102cc --- /dev/null +++ b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_hdcp.h @@ -0,0 +1,68 @@ @@ -635019,7 +635011,7 @@ index 0000000000000000000000000000000000000000..32fb102cc48844917281e835ba7bfc2f +#endif /* __RK_HDMIRX_HDCP_H__ */ diff --git a/drivers/media/platform/rockchip/isp/Kconfig b/drivers/media/platform/rockchip/isp/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..77e29d5c050037d74718889971f533b94acb9cc4 +index 000000000..77e29d5c0 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/Kconfig @@ -0,0 +1,44 @@ @@ -635069,7 +635061,7 @@ index 0000000000000000000000000000000000000000..77e29d5c050037d74718889971f533b9 +endif diff --git a/drivers/media/platform/rockchip/isp/Makefile b/drivers/media/platform/rockchip/isp/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..d168ffde50d19c19bc12b95cbf3fa081d8104806 +index 000000000..d168ffde5 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/Makefile @@ -0,0 +1,50 @@ @@ -635125,7 +635117,7 @@ index 0000000000000000000000000000000000000000..d168ffde50d19c19bc12b95cbf3fa081 +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 100644 -index 0000000000000000000000000000000000000000..c3d975cd1bb7f2281eafa0a0d66270629276dead +index 000000000..c3d975cd1 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge.c @@ -0,0 +1,624 @@ @@ -635755,7 +635747,7 @@ index 0000000000000000000000000000000000000000..c3d975cd1bb7f2281eafa0a0d6627062 +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 100644 -index 0000000000000000000000000000000000000000..cc1a7e936f622403d32cae6ff74c8ac61cffa8a3 +index 000000000..cc1a7e936 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge.h @@ -0,0 +1,105 @@ @@ -635866,7 +635858,7 @@ index 0000000000000000000000000000000000000000..cc1a7e936f622403d32cae6ff74c8ac6 +#endif diff --git a/drivers/media/platform/rockchip/isp/bridge_v20.c b/drivers/media/platform/rockchip/isp/bridge_v20.c new file mode 100644 -index 0000000000000000000000000000000000000000..6128d66b04ff5ee76e769236aed95434c26df71e +index 000000000..6128d66b0 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge_v20.c @@ -0,0 +1,1102 @@ @@ -636974,7 +636966,7 @@ index 0000000000000000000000000000000000000000..6128d66b04ff5ee76e769236aed95434 +} diff --git a/drivers/media/platform/rockchip/isp/bridge_v30.c b/drivers/media/platform/rockchip/isp/bridge_v30.c new file mode 100644 -index 0000000000000000000000000000000000000000..d5191273fd0242f2df37850ceea26c18216218d1 +index 000000000..d5191273f --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge_v30.c @@ -0,0 +1,235 @@ @@ -637215,7 +637207,7 @@ index 0000000000000000000000000000000000000000..d5191273fd0242f2df37850ceea26c18 +} diff --git a/drivers/media/platform/rockchip/isp/capture.c b/drivers/media/platform/rockchip/isp/capture.c new file mode 100644 -index 0000000000000000000000000000000000000000..a43e6e4f9963035164306326c9d395f93119df48 +index 000000000..a43e6e4f9 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture.c @@ -0,0 +1,1794 @@ @@ -639015,7 +639007,7 @@ index 0000000000000000000000000000000000000000..a43e6e4f9963035164306326c9d395f9 +} diff --git a/drivers/media/platform/rockchip/isp/capture.h b/drivers/media/platform/rockchip/isp/capture.h new file mode 100644 -index 0000000000000000000000000000000000000000..bbdcf1e6df6ed46f56831ff1a77d48fd39c8f179 +index 000000000..bbdcf1e6d --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture.h @@ -0,0 +1,345 @@ @@ -639366,7 +639358,7 @@ index 0000000000000000000000000000000000000000..bbdcf1e6df6ed46f56831ff1a77d48fd +#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 100644 -index 0000000000000000000000000000000000000000..45d1881548af240ade2c872f6d08401bc65fd729 +index 000000000..45d188154 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v1x.c @@ -0,0 +1,1268 @@ @@ -640640,7 +640632,7 @@ index 0000000000000000000000000000000000000000..45d1881548af240ade2c872f6d08401b +} diff --git a/drivers/media/platform/rockchip/isp/capture_v1x.h b/drivers/media/platform/rockchip/isp/capture_v1x.h new file mode 100644 -index 0000000000000000000000000000000000000000..f26f1bde0010a5ed16a6673f567a6c038ba1fc6f +index 000000000..f26f1bde0 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v1x.h @@ -0,0 +1,17 @@ @@ -640663,7 +640655,7 @@ index 0000000000000000000000000000000000000000..f26f1bde0010a5ed16a6673f567a6c03 +#endif diff --git a/drivers/media/platform/rockchip/isp/capture_v20.c b/drivers/media/platform/rockchip/isp/capture_v20.c new file mode 100644 -index 0000000000000000000000000000000000000000..9cf3ee746d64f8ffe606d07cf1240075dce8c9b1 +index 000000000..9cf3ee746 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v20.c @@ -0,0 +1,2316 @@ @@ -642985,7 +642977,7 @@ index 0000000000000000000000000000000000000000..9cf3ee746d64f8ffe606d07cf1240075 +} diff --git a/drivers/media/platform/rockchip/isp/capture_v21.c b/drivers/media/platform/rockchip/isp/capture_v21.c new file mode 100644 -index 0000000000000000000000000000000000000000..9ca0e2956e3cb3603e8712b861bcbcbb67143d30 +index 000000000..9ca0e2956 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v21.c @@ -0,0 +1,2211 @@ @@ -645202,7 +645194,7 @@ index 0000000000000000000000000000000000000000..9ca0e2956e3cb3603e8712b861bcbcbb +} diff --git a/drivers/media/platform/rockchip/isp/capture_v2x.h b/drivers/media/platform/rockchip/isp/capture_v2x.h new file mode 100644 -index 0000000000000000000000000000000000000000..8ec036998a4af15ddc6dac6e9c549eb0d2339952 +index 000000000..8ec036998 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v2x.h @@ -0,0 +1,48 @@ @@ -645256,7 +645248,7 @@ index 0000000000000000000000000000000000000000..8ec036998a4af15ddc6dac6e9c549eb0 +#endif diff --git a/drivers/media/platform/rockchip/isp/capture_v30.c b/drivers/media/platform/rockchip/isp/capture_v30.c new file mode 100644 -index 0000000000000000000000000000000000000000..4f24f65a56d08d01b83afd7bf159ae778c3f81c5 +index 000000000..4f24f65a5 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v30.c @@ -0,0 +1,1772 @@ @@ -647034,7 +647026,7 @@ index 0000000000000000000000000000000000000000..4f24f65a56d08d01b83afd7bf159ae77 +} diff --git a/drivers/media/platform/rockchip/isp/capture_v32.c b/drivers/media/platform/rockchip/isp/capture_v32.c new file mode 100644 -index 0000000000000000000000000000000000000000..0d701bdb36d8e6bcfb28ad3ae8763213a6a0aa8a +index 000000000..0d701bdb3 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v32.c @@ -0,0 +1,2367 @@ @@ -649407,7 +649399,7 @@ index 0000000000000000000000000000000000000000..0d701bdb36d8e6bcfb28ad3ae8763213 +} diff --git a/drivers/media/platform/rockchip/isp/capture_v3x.h b/drivers/media/platform/rockchip/isp/capture_v3x.h new file mode 100644 -index 0000000000000000000000000000000000000000..746290312de28d6967438f986c284bb9fa4fb6cf +index 000000000..746290312 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v3x.h @@ -0,0 +1,65 @@ @@ -649478,7 +649470,7 @@ index 0000000000000000000000000000000000000000..746290312de28d6967438f986c284bb9 +#endif diff --git a/drivers/media/platform/rockchip/isp/common.c b/drivers/media/platform/rockchip/isp/common.c new file mode 100644 -index 0000000000000000000000000000000000000000..4feef3d3d96e03226847e224632584a93e07d572 +index 000000000..4feef3d3d --- /dev/null +++ b/drivers/media/platform/rockchip/isp/common.c @@ -0,0 +1,481 @@ @@ -649965,7 +649957,7 @@ index 0000000000000000000000000000000000000000..4feef3d3d96e03226847e224632584a9 +} diff --git a/drivers/media/platform/rockchip/isp/common.h b/drivers/media/platform/rockchip/isp/common.h new file mode 100644 -index 0000000000000000000000000000000000000000..c6568715a7336400f903a64a537eaffc34f81382 +index 000000000..c6568715a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/common.h @@ -0,0 +1,202 @@ @@ -650173,7 +650165,7 @@ index 0000000000000000000000000000000000000000..c6568715a7336400f903a64a537eaffc +#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 100644 -index 0000000000000000000000000000000000000000..bd469c40604f28740987cccf31a852b73afafb59 +index 000000000..bd469c406 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/csi.c @@ -0,0 +1,747 @@ @@ -650926,7 +650918,7 @@ index 0000000000000000000000000000000000000000..bd469c40604f28740987cccf31a852b7 +} diff --git a/drivers/media/platform/rockchip/isp/csi.h b/drivers/media/platform/rockchip/isp/csi.h new file mode 100644 -index 0000000000000000000000000000000000000000..9fbdc35b4405479017721ba39d5c122818c0cb04 +index 000000000..9fbdc35b4 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/csi.h @@ -0,0 +1,85 @@ @@ -651017,7 +651009,7 @@ index 0000000000000000000000000000000000000000..9fbdc35b4405479017721ba39d5c1228 +#endif diff --git a/drivers/media/platform/rockchip/isp/dev.c b/drivers/media/platform/rockchip/isp/dev.c new file mode 100644 -index 0000000000000000000000000000000000000000..244fe7016d62a1446f1d056f1fd5e4b69aa9c8a0 +index 000000000..244fe7016 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dev.c @@ -0,0 +1,1216 @@ @@ -652239,7 +652231,7 @@ index 0000000000000000000000000000000000000000..244fe7016d62a1446f1d056f1fd5e4b6 +MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver); diff --git a/drivers/media/platform/rockchip/isp/dev.h b/drivers/media/platform/rockchip/isp/dev.h new file mode 100644 -index 0000000000000000000000000000000000000000..1c726a63cad397023710a3295a6934dc10d1cf08 +index 000000000..1c726a63c --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dev.h @@ -0,0 +1,321 @@ @@ -652566,7 +652558,7 @@ index 0000000000000000000000000000000000000000..1c726a63cad397023710a3295a6934dc +#endif diff --git a/drivers/media/platform/rockchip/isp/dmarx.c b/drivers/media/platform/rockchip/isp/dmarx.c new file mode 100644 -index 0000000000000000000000000000000000000000..e610f19351bc83789c124e09174662d775f33594 +index 000000000..e610f1935 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dmarx.c @@ -0,0 +1,1245 @@ @@ -653817,7 +653809,7 @@ index 0000000000000000000000000000000000000000..e610f19351bc83789c124e09174662d7 +} diff --git a/drivers/media/platform/rockchip/isp/dmarx.h b/drivers/media/platform/rockchip/isp/dmarx.h new file mode 100644 -index 0000000000000000000000000000000000000000..f8d8f230268bfdc39a7d916da5b5f6b957cd152a +index 000000000..f8d8f2302 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dmarx.h @@ -0,0 +1,75 @@ @@ -653898,7 +653890,7 @@ index 0000000000000000000000000000000000000000..f8d8f230268bfdc39a7d916da5b5f6b9 +#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 100644 -index 0000000000000000000000000000000000000000..ebf538ada1502a57dbad68f67f71259fc5467c86 +index 000000000..ebf538ada --- /dev/null +++ b/drivers/media/platform/rockchip/isp/hw.c @@ -0,0 +1,1343 @@ @@ -655247,7 +655239,7 @@ index 0000000000000000000000000000000000000000..ebf538ada1502a57dbad68f67f71259f +module_exit(rkisp_hw_drv_exit); diff --git a/drivers/media/platform/rockchip/isp/hw.h b/drivers/media/platform/rockchip/isp/hw.h new file mode 100644 -index 0000000000000000000000000000000000000000..657c77c0f9374f9d420f35892db7a35b8ffedbdb +index 000000000..657c77c0f --- /dev/null +++ b/drivers/media/platform/rockchip/isp/hw.h @@ -0,0 +1,115 @@ @@ -655368,7 +655360,7 @@ index 0000000000000000000000000000000000000000..657c77c0f9374f9d420f35892db7a35b +#endif diff --git a/drivers/media/platform/rockchip/isp/isp_dvbm.c b/drivers/media/platform/rockchip/isp/isp_dvbm.c new file mode 100644 -index 0000000000000000000000000000000000000000..fe597add1f644c57bbaccfc068c711cd112e1a97 +index 000000000..fe597add1 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_dvbm.c @@ -0,0 +1,93 @@ @@ -655467,7 +655459,7 @@ index 0000000000000000000000000000000000000000..fe597add1f644c57bbaccfc068c711cd +} diff --git a/drivers/media/platform/rockchip/isp/isp_external.h b/drivers/media/platform/rockchip/isp/isp_external.h new file mode 100644 -index 0000000000000000000000000000000000000000..6d4907483830c4ebde5f90dad925336e4ca39960 +index 000000000..6d4907483 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_external.h @@ -0,0 +1,72 @@ @@ -655545,7 +655537,7 @@ index 0000000000000000000000000000000000000000..6d4907483830c4ebde5f90dad925336e +#endif diff --git a/drivers/media/platform/rockchip/isp/isp_ispp.h b/drivers/media/platform/rockchip/isp/isp_ispp.h new file mode 100644 -index 0000000000000000000000000000000000000000..16f106c396a8ef13d0b15e454c2e65867d69d26a +index 000000000..16f106c39 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_ispp.h @@ -0,0 +1,137 @@ @@ -655688,7 +655680,7 @@ index 0000000000000000000000000000000000000000..16f106c396a8ef13d0b15e454c2e6586 +#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 100644 -index 0000000000000000000000000000000000000000..1e2039e01dce74eaf335bf852a59a0881c2d338b +index 000000000..1e2039e01 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_mipi_luma.c @@ -0,0 +1,527 @@ @@ -656221,7 +656213,7 @@ index 0000000000000000000000000000000000000000..1e2039e01dce74eaf335bf852a59a088 +} 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 100644 -index 0000000000000000000000000000000000000000..681a8b6ac0c66b1103bc6775b55c552984f6cd40 +index 000000000..681a8b6ac --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_mipi_luma.h @@ -0,0 +1,79 @@ @@ -656306,7 +656298,7 @@ index 0000000000000000000000000000000000000000..681a8b6ac0c66b1103bc6775b55c5529 +#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 100644 -index 0000000000000000000000000000000000000000..03fd7fce0d7e55c1b3e66c6f2046791861cddd30 +index 000000000..03fd7fce0 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params.c @@ -0,0 +1,563 @@ @@ -656875,7 +656867,7 @@ index 0000000000000000000000000000000000000000..03fd7fce0d7e55c1b3e66c6f20467918 + diff --git a/drivers/media/platform/rockchip/isp/isp_params.h b/drivers/media/platform/rockchip/isp/isp_params.h new file mode 100644 -index 0000000000000000000000000000000000000000..2d58aba98d165916a98ed8729f2c5980cbfadcde +index 000000000..2d58aba98 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params.h @@ -0,0 +1,150 @@ @@ -657031,7 +657023,7 @@ index 0000000000000000000000000000000000000000..2d58aba98d165916a98ed8729f2c5980 +#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 100644 -index 0000000000000000000000000000000000000000..4ca6c6dbbd2cb7bb475af1408c441c1353dfdb58 +index 000000000..4ca6c6dbb --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v1x.c @@ -0,0 +1,2352 @@ @@ -659389,7 +659381,7 @@ index 0000000000000000000000000000000000000000..4ca6c6dbbd2cb7bb475af1408c441c13 + 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 100644 -index 0000000000000000000000000000000000000000..b6e4a2c6a9bc38a9113b2877bfeb4bafb6e8d9ac +index 000000000..b6e4a2c6a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v1x.h @@ -0,0 +1,87 @@ @@ -659482,7 +659474,7 @@ index 0000000000000000000000000000000000000000..b6e4a2c6a9bc38a9113b2877bfeb4baf +#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 100644 -index 0000000000000000000000000000000000000000..e13e97ca53d0d1c873c7cb8eb5f13e769952b5c5 +index 000000000..e13e97ca5 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v21.c @@ -0,0 +1,4410 @@ @@ -663898,7 +663890,7 @@ index 0000000000000000000000000000000000000000..e13e97ca53d0d1c873c7cb8eb5f13e76 + 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 100644 -index 0000000000000000000000000000000000000000..7b374e2020a73fbca0f760e2bc12e5d5a7d70fdd +index 000000000..7b374e202 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v21.h @@ -0,0 +1,172 @@ @@ -664076,7 +664068,7 @@ index 0000000000000000000000000000000000000000..7b374e2020a73fbca0f760e2bc12e5d5 +#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 100644 -index 0000000000000000000000000000000000000000..c1497a92ffd1e82cca3242d602de01c2ec5b3834 +index 000000000..c1497a92f --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v2x.c @@ -0,0 +1,4497 @@ @@ -668579,7 +668571,7 @@ index 0000000000000000000000000000000000000000..c1497a92ffd1e82cca3242d602de01c2 + 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 100644 -index 0000000000000000000000000000000000000000..dd2a1d33f370bf97f4ad1792e660aa4ef95afd35 +index 000000000..dd2a1d33f --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v2x.h @@ -0,0 +1,359 @@ @@ -668944,7 +668936,7 @@ index 0000000000000000000000000000000000000000..dd2a1d33f370bf97f4ad1792e660aa4e +#endif /* _RKISP_ISP_PARAM_V2X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params_v32.c b/drivers/media/platform/rockchip/isp/isp_params_v32.c new file mode 100644 -index 0000000000000000000000000000000000000000..23072b4628de3b876821e340a50497598184cd23 +index 000000000..23072b462 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v32.c @@ -0,0 +1,5576 @@ @@ -674526,7 +674518,7 @@ index 0000000000000000000000000000000000000000..23072b4628de3b876821e340a5049759 +} diff --git a/drivers/media/platform/rockchip/isp/isp_params_v32.h b/drivers/media/platform/rockchip/isp/isp_params_v32.h new file mode 100644 -index 0000000000000000000000000000000000000000..e1d91488d1774ad7b1bb3d7ac70081b563d7a2c5 +index 000000000..e1d91488d --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v32.h @@ -0,0 +1,225 @@ @@ -674757,7 +674749,7 @@ index 0000000000000000000000000000000000000000..e1d91488d1774ad7b1bb3d7ac70081b5 +#endif /* _RKISP_ISP_PARAM_V32_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 100644 -index 0000000000000000000000000000000000000000..0491cc9bd8baeccae8912de2d103e26dae05580d +index 000000000..0491cc9bd --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v3x.c @@ -0,0 +1,4905 @@ @@ -679668,7 +679660,7 @@ index 0000000000000000000000000000000000000000..0491cc9bd8baeccae8912de2d103e26d +} 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 100644 -index 0000000000000000000000000000000000000000..0d5041ddf6f49b0be30fc24261c1c89e603418f1 +index 000000000..0d5041ddf --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v3x.h @@ -0,0 +1,206 @@ @@ -679880,7 +679872,7 @@ index 0000000000000000000000000000000000000000..0d5041ddf6f49b0be30fc24261c1c89e +#endif /* _RKISP_ISP_PARAM_V3X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_rockit.c b/drivers/media/platform/rockchip/isp/isp_rockit.c new file mode 100644 -index 0000000000000000000000000000000000000000..7914ea12cad0cf76bba0d1368efb61e9e618b911 +index 000000000..7914ea12c --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_rockit.c @@ -0,0 +1,744 @@ @@ -680630,7 +680622,7 @@ index 0000000000000000000000000000000000000000..7914ea12cad0cf76bba0d1368efb61e9 +EXPORT_SYMBOL(rkisp_rockit_get_isp_mode); diff --git a/drivers/media/platform/rockchip/isp/isp_stats.c b/drivers/media/platform/rockchip/isp/isp_stats.c new file mode 100644 -index 0000000000000000000000000000000000000000..d95315ee6d6d30b6e8cdc18f571cc75ca6ce2e0c +index 000000000..d95315ee6 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats.c @@ -0,0 +1,429 @@ @@ -681065,7 +681057,7 @@ index 0000000000000000000000000000000000000000..d95315ee6d6d30b6e8cdc18f571cc75c + diff --git a/drivers/media/platform/rockchip/isp/isp_stats.h b/drivers/media/platform/rockchip/isp/isp_stats.h new file mode 100644 -index 0000000000000000000000000000000000000000..5e10d8f3d5459ea5293eff5f8bf90c2a953342ba +index 000000000..5e10d8f3d --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats.h @@ -0,0 +1,95 @@ @@ -681166,7 +681158,7 @@ index 0000000000000000000000000000000000000000..5e10d8f3d5459ea5293eff5f8bf90c2a +#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 100644 -index 0000000000000000000000000000000000000000..dce904b5f7c561eb0531a4cb01461805331caa73 +index 000000000..dce904b5f --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v1x.c @@ -0,0 +1,420 @@ @@ -681592,7 +681584,7 @@ index 0000000000000000000000000000000000000000..dce904b5f7c561eb0531a4cb01461805 + 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 100644 -index 0000000000000000000000000000000000000000..6dc2790c58d50bf3a1d8f9882da230f708e60187 +index 000000000..6dc2790c5 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v1x.h @@ -0,0 +1,42 @@ @@ -681640,7 +681632,7 @@ index 0000000000000000000000000000000000000000..6dc2790c58d50bf3a1d8f9882da230f7 +#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 100644 -index 0000000000000000000000000000000000000000..c6308645ac53eca6e2cd4b573857cd8a6de1767a +index 000000000..c6308645a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v21.c @@ -0,0 +1,1177 @@ @@ -682823,7 +682815,7 @@ index 0000000000000000000000000000000000000000..c6308645ac53eca6e2cd4b573857cd8a + 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 100644 -index 0000000000000000000000000000000000000000..6fccd014db2b4e18f1bd80dcfa45dadc429ec5f3 +index 000000000..6fccd014d --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v21.h @@ -0,0 +1,52 @@ @@ -682881,7 +682873,7 @@ index 0000000000000000000000000000000000000000..6fccd014db2b4e18f1bd80dcfa45dadc +#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 100644 -index 0000000000000000000000000000000000000000..b69b48f770b53736dcaaefa79a7d22a541fe9b67 +index 000000000..b69b48f77 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v2x.c @@ -0,0 +1,1526 @@ @@ -684413,7 +684405,7 @@ index 0000000000000000000000000000000000000000..b69b48f770b53736dcaaefa79a7d22a5 + 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 100644 -index 0000000000000000000000000000000000000000..37d7988f70137a85cdf5cb0af6ab8e3764f5e909 +index 000000000..37d7988f7 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v2x.h @@ -0,0 +1,70 @@ @@ -684489,7 +684481,7 @@ index 0000000000000000000000000000000000000000..37d7988f70137a85cdf5cb0af6ab8e37 +#endif /* _RKISP_ISP_STATS_V2X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v32.c b/drivers/media/platform/rockchip/isp/isp_stats_v32.c new file mode 100644 -index 0000000000000000000000000000000000000000..6e73379ab154314e95bc727fe908290e1e4171d1 +index 000000000..6e73379ab --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v32.c @@ -0,0 +1,1131 @@ @@ -685626,7 +685618,7 @@ index 0000000000000000000000000000000000000000..6e73379ab154314e95bc727fe908290e +} diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v32.h b/drivers/media/platform/rockchip/isp/isp_stats_v32.h new file mode 100644 -index 0000000000000000000000000000000000000000..b598c8734478c333b6e93d9ab3ef75a3c98b465f +index 000000000..b598c8734 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v32.h @@ -0,0 +1,54 @@ @@ -685686,7 +685678,7 @@ index 0000000000000000000000000000000000000000..b598c8734478c333b6e93d9ab3ef75a3 +#endif /* _RKISP_ISP_STATS_V32_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 100644 -index 0000000000000000000000000000000000000000..b74736d721ce583bd56a2db03bce91d97b82c16c +index 000000000..b74736d72 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v3x.c @@ -0,0 +1,1236 @@ @@ -686928,7 +686920,7 @@ index 0000000000000000000000000000000000000000..b74736d721ce583bd56a2db03bce91d9 +} 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 100644 -index 0000000000000000000000000000000000000000..042f11c70a36dcdff8c7a498bd972eb3b597a53b +index 000000000..042f11c70 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v3x.h @@ -0,0 +1,52 @@ @@ -686986,7 +686978,7 @@ index 0000000000000000000000000000000000000000..042f11c70a36dcdff8c7a498bd972eb3 +#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 100644 -index 0000000000000000000000000000000000000000..d35a7c705106c882755ad05b89927e84692d4617 +index 000000000..d35a7c705 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/procfs.c @@ -0,0 +1,1157 @@ @@ -688149,7 +688141,7 @@ index 0000000000000000000000000000000000000000..d35a7c705106c882755ad05b89927e84 +#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 100644 -index 0000000000000000000000000000000000000000..38b1f666664d2849958eae80e3131490c3b7d5a7 +index 000000000..38b1f6666 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/procfs.h @@ -0,0 +1,38 @@ @@ -688193,7 +688185,7 @@ index 0000000000000000000000000000000000000000..38b1f666664d2849958eae80e3131490 +#endif diff --git a/drivers/media/platform/rockchip/isp/regs.c b/drivers/media/platform/rockchip/isp/regs.c new file mode 100644 -index 0000000000000000000000000000000000000000..17af5ef7349b48f0965972ed4ae6b82258276202 +index 000000000..17af5ef73 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs.c @@ -0,0 +1,411 @@ @@ -688610,7 +688602,7 @@ index 0000000000000000000000000000000000000000..17af5ef7349b48f0965972ed4ae6b822 +} diff --git a/drivers/media/platform/rockchip/isp/regs.h b/drivers/media/platform/rockchip/isp/regs.h new file mode 100644 -index 0000000000000000000000000000000000000000..d263a640a1542d6ea801f86b0e9a0122fbfab2d4 +index 000000000..d263a640a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs.h @@ -0,0 +1,2050 @@ @@ -690666,7 +690658,7 @@ index 0000000000000000000000000000000000000000..d263a640a1542d6ea801f86b0e9a0122 +#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 100644 -index 0000000000000000000000000000000000000000..2f3c1009ae4e13184de231319f08d4e3cfde39d1 +index 000000000..2f3c1009a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs_v2x.h @@ -0,0 +1,2717 @@ @@ -693389,7 +693381,7 @@ index 0000000000000000000000000000000000000000..2f3c1009ae4e13184de231319f08d4e3 +#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 100644 -index 0000000000000000000000000000000000000000..5e4c85710ee17ad74037c438813341bc26a4dfa6 +index 000000000..5e4c85710 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs_v3x.h @@ -0,0 +1,2304 @@ @@ -695699,7 +695691,7 @@ index 0000000000000000000000000000000000000000..5e4c85710ee17ad74037c438813341bc +#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 100644 -index 0000000000000000000000000000000000000000..d1233cfc0f09c61f92b219dcf64e99ed5743436f +index 000000000..d1233cfc0 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp.c @@ -0,0 +1,4338 @@ @@ -700043,7 +700035,7 @@ index 0000000000000000000000000000000000000000..d1233cfc0f09c61f92b219dcf64e99ed + diff --git a/drivers/media/platform/rockchip/isp/rkisp.h b/drivers/media/platform/rockchip/isp/rkisp.h new file mode 100644 -index 0000000000000000000000000000000000000000..76f8ce05e424a1f30d15e5e405ac0628e8514577 +index 000000000..76f8ce05e --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp.h @@ -0,0 +1,208 @@ @@ -700257,7 +700249,7 @@ index 0000000000000000000000000000000000000000..76f8ce05e424a1f30d15e5e405ac0628 +#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 100644 -index 0000000000000000000000000000000000000000..c78493f0144c7fd5b22984d4adb51c8bfb8cad92 +index 000000000..c78493f01 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.c @@ -0,0 +1,306 @@ @@ -700569,7 +700561,7 @@ index 0000000000000000000000000000000000000000..c78493f0144c7fd5b22984d4adb51c8b +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 100644 -index 0000000000000000000000000000000000000000..a4b4a59bc7f7cc80668add28b0f9988a6492eaca +index 000000000..a4b4a59bc --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.h @@ -0,0 +1,33 @@ @@ -700608,7 +700600,7 @@ index 0000000000000000000000000000000000000000..a4b4a59bc7f7cc80668add28b0f9988a +#endif diff --git a/drivers/media/platform/rockchip/isp/version.h b/drivers/media/platform/rockchip/isp/version.h new file mode 100644 -index 0000000000000000000000000000000000000000..8981e4709131d42fbe413590bfa0c07ff8382f5e +index 000000000..8981e4709 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/version.h @@ -0,0 +1,490 @@ @@ -701104,7 +701096,7 @@ index 0000000000000000000000000000000000000000..8981e4709131d42fbe413590bfa0c07f +#endif diff --git a/drivers/media/platform/rockchip/isp1/Kconfig b/drivers/media/platform/rockchip/isp1/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..67ba21852bf779429356dcc6201840b4bff132a5 +index 000000000..67ba21852 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/Kconfig @@ -0,0 +1,15 @@ @@ -701125,7 +701117,7 @@ index 0000000000000000000000000000000000000000..67ba21852bf779429356dcc6201840b4 + 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 100644 -index 0000000000000000000000000000000000000000..3c9283f98a42fbde85e1835c1b1c89d82820cf06 +index 000000000..3c9283f98 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/Makefile @@ -0,0 +1,10 @@ @@ -701141,7 +701133,7 @@ index 0000000000000000000000000000000000000000..3c9283f98a42fbde85e1835c1b1c89d8 + dmarx.o diff --git a/drivers/media/platform/rockchip/isp1/capture.c b/drivers/media/platform/rockchip/isp1/capture.c new file mode 100644 -index 0000000000000000000000000000000000000000..c6ab5453c4b85daabaa8af0b330fb480d745a17f +index 000000000..c6ab5453c --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/capture.c @@ -0,0 +1,2313 @@ @@ -703460,7 +703452,7 @@ index 0000000000000000000000000000000000000000..c6ab5453c4b85daabaa8af0b330fb480 +} diff --git a/drivers/media/platform/rockchip/isp1/capture.h b/drivers/media/platform/rockchip/isp1/capture.h new file mode 100644 -index 0000000000000000000000000000000000000000..8613618352e90e74d76d08054a11f482d41dd35d +index 000000000..861361835 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/capture.h @@ -0,0 +1,219 @@ @@ -703685,7 +703677,7 @@ index 0000000000000000000000000000000000000000..8613618352e90e74d76d08054a11f482 +#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 100644 -index 0000000000000000000000000000000000000000..de2885d45c6874b6dd962ce5f550d665d88686f5 +index 000000000..de2885d45 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/common.h @@ -0,0 +1,134 @@ @@ -703825,7 +703817,7 @@ index 0000000000000000000000000000000000000000..de2885d45c6874b6dd962ce5f550d665 +#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 100644 -index 0000000000000000000000000000000000000000..8bdee0a75dc31b08b12d289810c8e778d9c609d1 +index 000000000..8bdee0a75 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dev.c @@ -0,0 +1,1174 @@ @@ -705005,7 +704997,7 @@ index 0000000000000000000000000000000000000000..8bdee0a75dc31b08b12d289810c8e778 +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 100644 -index 0000000000000000000000000000000000000000..0d0d6fd52fc6649bbb978093ae82e13678e6e788 +index 000000000..0d0d6fd52 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dev.h @@ -0,0 +1,173 @@ @@ -705184,7 +705176,7 @@ index 0000000000000000000000000000000000000000..0d0d6fd52fc6649bbb978093ae82e136 +#endif diff --git a/drivers/media/platform/rockchip/isp1/dmarx.c b/drivers/media/platform/rockchip/isp1/dmarx.c new file mode 100644 -index 0000000000000000000000000000000000000000..b94d500241cc98391b57524031909768c4b75c05 +index 000000000..b94d50024 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dmarx.c @@ -0,0 +1,686 @@ @@ -705876,7 +705868,7 @@ index 0000000000000000000000000000000000000000..b94d500241cc98391b57524031909768 +} diff --git a/drivers/media/platform/rockchip/isp1/dmarx.h b/drivers/media/platform/rockchip/isp1/dmarx.h new file mode 100644 -index 0000000000000000000000000000000000000000..abc3b39aa0b50f56f62121cfcb09f1e587a170d7 +index 000000000..abc3b39aa --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dmarx.h @@ -0,0 +1,29 @@ @@ -705911,7 +705903,7 @@ index 0000000000000000000000000000000000000000..abc3b39aa0b50f56f62121cfcb09f1e5 +#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 100644 -index 0000000000000000000000000000000000000000..02e6de0969e5ff78127b33a220e0876e2f04c5cb +index 000000000..02e6de096 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_params.c @@ -0,0 +1,2655 @@ @@ -708572,7 +708564,7 @@ index 0000000000000000000000000000000000000000..02e6de0969e5ff78127b33a220e0876e +} diff --git a/drivers/media/platform/rockchip/isp1/isp_params.h b/drivers/media/platform/rockchip/isp1/isp_params.h new file mode 100644 -index 0000000000000000000000000000000000000000..fe7065dcfe41183c30ae7812ade3da24764b771c +index 000000000..fe7065dcf --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_params.h @@ -0,0 +1,151 @@ @@ -708729,7 +708721,7 @@ index 0000000000000000000000000000000000000000..fe7065dcfe41183c30ae7812ade3da24 +#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 100644 -index 0000000000000000000000000000000000000000..4f74071836e311736b1699dab972f1d36f19595f +index 000000000..4f7407183 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_stats.c @@ -0,0 +1,684 @@ @@ -709419,7 +709411,7 @@ index 0000000000000000000000000000000000000000..4f74071836e311736b1699dab972f1d3 +} diff --git a/drivers/media/platform/rockchip/isp1/isp_stats.h b/drivers/media/platform/rockchip/isp1/isp_stats.h new file mode 100644 -index 0000000000000000000000000000000000000000..183b48e6c0987e58bc6e94969c511b0fced9a422 +index 000000000..183b48e6c --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_stats.h @@ -0,0 +1,112 @@ @@ -709537,7 +709529,7 @@ index 0000000000000000000000000000000000000000..183b48e6c0987e58bc6e94969c511b0f +#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 100644 -index 0000000000000000000000000000000000000000..82f6cd92475e54d0ef0176a0b609fbbd0e00f2ee +index 000000000..82f6cd924 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/regs.c @@ -0,0 +1,244 @@ @@ -709787,7 +709779,7 @@ index 0000000000000000000000000000000000000000..82f6cd92475e54d0ef0176a0b609fbbd +} diff --git a/drivers/media/platform/rockchip/isp1/regs.h b/drivers/media/platform/rockchip/isp1/regs.h new file mode 100644 -index 0000000000000000000000000000000000000000..d31ef1b127f587d596bc7e53fe8abb5956263486 +index 000000000..d31ef1b12 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/regs.h @@ -0,0 +1,1994 @@ @@ -711787,7 +711779,7 @@ index 0000000000000000000000000000000000000000..d31ef1b127f587d596bc7e53fe8abb59 +#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 100644 -index 0000000000000000000000000000000000000000..273c6b5a987e64553a0ea9f2f26604468a76bdf7 +index 000000000..273c6b5a9 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/rkisp1.c @@ -0,0 +1,1863 @@ @@ -713656,7 +713648,7 @@ index 0000000000000000000000000000000000000000..273c6b5a987e64553a0ea9f2f2660446 + diff --git a/drivers/media/platform/rockchip/isp1/rkisp1.h b/drivers/media/platform/rockchip/isp1/rkisp1.h new file mode 100644 -index 0000000000000000000000000000000000000000..afafc2c0f78fc7cfe47e06dc4f91c38d72883347 +index 000000000..afafc2c0f --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/rkisp1.h @@ -0,0 +1,163 @@ @@ -713825,7 +713817,7 @@ index 0000000000000000000000000000000000000000..afafc2c0f78fc7cfe47e06dc4f91c38d +#endif /* _RKISP1_H */ diff --git a/drivers/media/platform/rockchip/isp1/version.h b/drivers/media/platform/rockchip/isp1/version.h new file mode 100644 -index 0000000000000000000000000000000000000000..3bfb0c98fd6eb89cf9df97df85cf2bccf8f3b836 +index 000000000..3bfb0c98f --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/version.h @@ -0,0 +1,61 @@ @@ -713892,7 +713884,7 @@ index 0000000000000000000000000000000000000000..3bfb0c98fd6eb89cf9df97df85cf2bcc +#endif diff --git a/drivers/media/platform/rockchip/ispp/Kconfig b/drivers/media/platform/rockchip/ispp/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..b978430421297e6e69a43f867c01bbf0ff6d57ac +index 000000000..b97843042 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/Kconfig @@ -0,0 +1,31 @@ @@ -713929,7 +713921,7 @@ index 0000000000000000000000000000000000000000..b978430421297e6e69a43f867c01bbf0 +endif diff --git a/drivers/media/platform/rockchip/ispp/Makefile b/drivers/media/platform/rockchip/ispp/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..6148f70ff50a5967879c38448714e3c8fe27ba95 +index 000000000..6148f70ff --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/Makefile @@ -0,0 +1,23 @@ @@ -713958,7 +713950,7 @@ index 0000000000000000000000000000000000000000..6148f70ff50a5967879c38448714e3c8 +endif diff --git a/drivers/media/platform/rockchip/ispp/common.c b/drivers/media/platform/rockchip/ispp/common.c new file mode 100644 -index 0000000000000000000000000000000000000000..3ae45edf49f1bb5708b261adb75162e6228d0b75 +index 000000000..3ae45edf4 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/common.c @@ -0,0 +1,614 @@ @@ -714578,7 +714570,7 @@ index 0000000000000000000000000000000000000000..3ae45edf49f1bb5708b261adb75162e6 +} diff --git a/drivers/media/platform/rockchip/ispp/common.h b/drivers/media/platform/rockchip/ispp/common.h new file mode 100644 -index 0000000000000000000000000000000000000000..fb36a4e0b5149ff116b00c556fc270e0ad92579b +index 000000000..fb36a4e0b --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/common.h @@ -0,0 +1,148 @@ @@ -714732,7 +714724,7 @@ index 0000000000000000000000000000000000000000..fb36a4e0b5149ff116b00c556fc270e0 +#endif diff --git a/drivers/media/platform/rockchip/ispp/dev.c b/drivers/media/platform/rockchip/ispp/dev.c new file mode 100644 -index 0000000000000000000000000000000000000000..776d2f6bf86b9083d571f29253459628f2d38b09 +index 000000000..776d2f6bf --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/dev.c @@ -0,0 +1,399 @@ @@ -715137,7 +715129,7 @@ index 0000000000000000000000000000000000000000..776d2f6bf86b9083d571f29253459628 +MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver); diff --git a/drivers/media/platform/rockchip/ispp/dev.h b/drivers/media/platform/rockchip/ispp/dev.h new file mode 100644 -index 0000000000000000000000000000000000000000..065ce848435ec6133f1789dbd759b1558afa7aab +index 000000000..065ce8484 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/dev.h @@ -0,0 +1,60 @@ @@ -715203,7 +715195,7 @@ index 0000000000000000000000000000000000000000..065ce848435ec6133f1789dbd759b155 +#endif diff --git a/drivers/media/platform/rockchip/ispp/fec.c b/drivers/media/platform/rockchip/ispp/fec.c new file mode 100644 -index 0000000000000000000000000000000000000000..bb16d557e5e6accc988ba935cbb06009bea51151 +index 000000000..bb16d557e --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/fec.c @@ -0,0 +1,459 @@ @@ -715668,7 +715660,7 @@ index 0000000000000000000000000000000000000000..bb16d557e5e6accc988ba935cbb06009 +} diff --git a/drivers/media/platform/rockchip/ispp/fec.h b/drivers/media/platform/rockchip/ispp/fec.h new file mode 100644 -index 0000000000000000000000000000000000000000..d7bb4196dd252da4bdfb1b297e9056337408c923 +index 000000000..d7bb4196d --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/fec.h @@ -0,0 +1,28 @@ @@ -715702,7 +715694,7 @@ index 0000000000000000000000000000000000000000..d7bb4196dd252da4bdfb1b297e905633 +#endif diff --git a/drivers/media/platform/rockchip/ispp/hw.c b/drivers/media/platform/rockchip/ispp/hw.c new file mode 100644 -index 0000000000000000000000000000000000000000..e132610936ad8523937ef2f2dd16e6eab7a1bd7b +index 000000000..e13261093 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/hw.c @@ -0,0 +1,501 @@ @@ -716209,7 +716201,7 @@ index 0000000000000000000000000000000000000000..e132610936ad8523937ef2f2dd16e6ea +#endif diff --git a/drivers/media/platform/rockchip/ispp/hw.h b/drivers/media/platform/rockchip/ispp/hw.h new file mode 100644 -index 0000000000000000000000000000000000000000..8eb2585ecb71cf68dd762e5ea4126d9aa7f785cd +index 000000000..8eb2585ec --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/hw.h @@ -0,0 +1,67 @@ @@ -716282,7 +716274,7 @@ index 0000000000000000000000000000000000000000..8eb2585ecb71cf68dd762e5ea4126d9a +#endif diff --git a/drivers/media/platform/rockchip/ispp/ispp.c b/drivers/media/platform/rockchip/ispp/ispp.c new file mode 100644 -index 0000000000000000000000000000000000000000..f3f17ebb2e4b6561dad6b914c87fdcc02747873f +index 000000000..f3f17ebb2 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/ispp.c @@ -0,0 +1,500 @@ @@ -716788,7 +716780,7 @@ index 0000000000000000000000000000000000000000..f3f17ebb2e4b6561dad6b914c87fdcc0 +} diff --git a/drivers/media/platform/rockchip/ispp/ispp.h b/drivers/media/platform/rockchip/ispp/ispp.h new file mode 100644 -index 0000000000000000000000000000000000000000..baa07a09352ceac9fe9dd8fcedb40a3fc020177b +index 000000000..baa07a093 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/ispp.h @@ -0,0 +1,50 @@ @@ -716844,7 +716836,7 @@ index 0000000000000000000000000000000000000000..baa07a09352ceac9fe9dd8fcedb40a3f +#endif diff --git a/drivers/media/platform/rockchip/ispp/params.c b/drivers/media/platform/rockchip/ispp/params.c new file mode 100644 -index 0000000000000000000000000000000000000000..af5fdddb2fad5b95dbb3c31eeac1d790273226b2 +index 000000000..af5fdddb2 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params.c @@ -0,0 +1,496 @@ @@ -717346,7 +717338,7 @@ index 0000000000000000000000000000000000000000..af5fdddb2fad5b95dbb3c31eeac1d790 +} diff --git a/drivers/media/platform/rockchip/ispp/params.h b/drivers/media/platform/rockchip/ispp/params.h new file mode 100644 -index 0000000000000000000000000000000000000000..912e20159efd3001fbb45683df2510f96a9bfb54 +index 000000000..912e20159 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params.h @@ -0,0 +1,75 @@ @@ -717427,7 +717419,7 @@ index 0000000000000000000000000000000000000000..912e20159efd3001fbb45683df2510f9 +#endif diff --git a/drivers/media/platform/rockchip/ispp/params_v10.c b/drivers/media/platform/rockchip/ispp/params_v10.c new file mode 100644 -index 0000000000000000000000000000000000000000..5778acd20988336aeea19a2e34955030a7d2f199 +index 000000000..5778acd20 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params_v10.c @@ -0,0 +1,768 @@ @@ -718201,7 +718193,7 @@ index 0000000000000000000000000000000000000000..5778acd20988336aeea19a2e34955030 +} diff --git a/drivers/media/platform/rockchip/ispp/params_v20.c b/drivers/media/platform/rockchip/ispp/params_v20.c new file mode 100644 -index 0000000000000000000000000000000000000000..03c944c8af0d943883193ddd8e68f6330f26bc4b +index 000000000..03c944c8a --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params_v20.c @@ -0,0 +1,209 @@ @@ -718416,7 +718408,7 @@ index 0000000000000000000000000000000000000000..03c944c8af0d943883193ddd8e68f633 +} diff --git a/drivers/media/platform/rockchip/ispp/procfs.c b/drivers/media/platform/rockchip/ispp/procfs.c new file mode 100644 -index 0000000000000000000000000000000000000000..8d4d11f1b1e02a5de01ceb1e9eb0035ca673111d +index 000000000..8d4d11f1b --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/procfs.c @@ -0,0 +1,143 @@ @@ -718565,7 +718557,7 @@ index 0000000000000000000000000000000000000000..8d4d11f1b1e02a5de01ceb1e9eb0035c +#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 100644 -index 0000000000000000000000000000000000000000..21ea0c471b58e72c8a24fb34b086c339c60b9d6e +index 000000000..21ea0c471 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/procfs.h @@ -0,0 +1,21 @@ @@ -718592,7 +718584,7 @@ index 0000000000000000000000000000000000000000..21ea0c471b58e72c8a24fb34b086c339 +#endif diff --git a/drivers/media/platform/rockchip/ispp/regs.h b/drivers/media/platform/rockchip/ispp/regs.h new file mode 100644 -index 0000000000000000000000000000000000000000..b9afecd67d1369e25b7bf3547bb48d0efa493e7f +index 000000000..b9afecd67 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/regs.h @@ -0,0 +1,524 @@ @@ -719122,7 +719114,7 @@ index 0000000000000000000000000000000000000000..b9afecd67d1369e25b7bf3547bb48d0e +#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 100644 -index 0000000000000000000000000000000000000000..94e14deb3cdc9880b75e7c1c1d71c64e18c5edb9 +index 000000000..94e14deb3 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stats.c @@ -0,0 +1,452 @@ @@ -719580,7 +719572,7 @@ index 0000000000000000000000000000000000000000..94e14deb3cdc9880b75e7c1c1d71c64e +} diff --git a/drivers/media/platform/rockchip/ispp/stats.h b/drivers/media/platform/rockchip/ispp/stats.h new file mode 100644 -index 0000000000000000000000000000000000000000..8ca1bd540f5c48bb447192ba243e590fc7b18749 +index 000000000..8ca1bd540 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stats.h @@ -0,0 +1,60 @@ @@ -719646,7 +719638,7 @@ index 0000000000000000000000000000000000000000..8ca1bd540f5c48bb447192ba243e590f +#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 100644 -index 0000000000000000000000000000000000000000..ab029f00e306ef7c920b475b74d8fbf05243e993 +index 000000000..ab029f00e --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream.c @@ -0,0 +1,2040 @@ @@ -721692,7 +721684,7 @@ index 0000000000000000000000000000000000000000..ab029f00e306ef7c920b475b74d8fbf0 +} diff --git a/drivers/media/platform/rockchip/ispp/stream.h b/drivers/media/platform/rockchip/ispp/stream.h new file mode 100644 -index 0000000000000000000000000000000000000000..d0269e8c5b2193a99f2ad0bbcf5d33258eb394f4 +index 000000000..d0269e8c5 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream.h @@ -0,0 +1,282 @@ @@ -721980,7 +721972,7 @@ index 0000000000000000000000000000000000000000..d0269e8c5b2193a99f2ad0bbcf5d3325 +#endif diff --git a/drivers/media/platform/rockchip/ispp/stream_v10.c b/drivers/media/platform/rockchip/ispp/stream_v10.c new file mode 100644 -index 0000000000000000000000000000000000000000..5567fe6c92d97caf5a25142af0c2d3a79b133369 +index 000000000..5567fe6c9 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream_v10.c @@ -0,0 +1,1753 @@ @@ -723739,7 +723731,7 @@ index 0000000000000000000000000000000000000000..5567fe6c92d97caf5a25142af0c2d3a7 +} diff --git a/drivers/media/platform/rockchip/ispp/stream_v20.c b/drivers/media/platform/rockchip/ispp/stream_v20.c new file mode 100644 -index 0000000000000000000000000000000000000000..a7f37d7d571e6378da35279f6dcbdbcfb8078e60 +index 000000000..a7f37d7d5 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream_v20.c @@ -0,0 +1,462 @@ @@ -724207,7 +724199,7 @@ index 0000000000000000000000000000000000000000..a7f37d7d571e6378da35279f6dcbdbcf +} diff --git a/drivers/media/platform/rockchip/ispp/version.h b/drivers/media/platform/rockchip/ispp/version.h new file mode 100644 -index 0000000000000000000000000000000000000000..398f500a22acca4895b1d9dacbc89942947f834a +index 000000000..398f500a2 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/version.h @@ -0,0 +1,138 @@ @@ -724350,7 +724342,7 @@ index 0000000000000000000000000000000000000000..398f500a22acca4895b1d9dacbc89942 + +#endif diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c -index 25f5b5eebf13ff6f1a05937ed7742116459f826c..67dcf22e5ba3101ed41d84242e51148cbe08274e 100644 +index 25f5b5eeb..67dcf22e5 100644 --- a/drivers/media/platform/rockchip/rga/rga.c +++ b/drivers/media/platform/rockchip/rga/rga.c @@ -76,7 +76,10 @@ static irqreturn_t rga_isr(int irq, void *prv) @@ -724417,7 +724409,7 @@ index 25f5b5eebf13ff6f1a05937ed7742116459f826c..67dcf22e5ba3101ed41d84242e51148c } diff --git a/drivers/media/platform/rockchip/tsp/Kconfig b/drivers/media/platform/rockchip/tsp/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..5394bfa7c63c254884c0d930982b9ae882a9563e +index 000000000..5394bfa7c --- /dev/null +++ b/drivers/media/platform/rockchip/tsp/Kconfig @@ -0,0 +1,12 @@ @@ -724435,7 +724427,7 @@ index 0000000000000000000000000000000000000000..5394bfa7c63c254884c0d930982b9ae8 + diff --git a/drivers/media/platform/rockchip/tsp/Makefile b/drivers/media/platform/rockchip/tsp/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..ca555d0ef9e9968eefdc3f0295c3cb6c1aea0012 +index 000000000..ca555d0ef --- /dev/null +++ b/drivers/media/platform/rockchip/tsp/Makefile @@ -0,0 +1,6 @@ @@ -724447,7 +724439,7 @@ index 0000000000000000000000000000000000000000..ca555d0ef9e9968eefdc3f0295c3cb6c +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 100644 -index 0000000000000000000000000000000000000000..830147909eebaa64e512d9a10b586682cb71df4c +index 000000000..830147909 --- /dev/null +++ b/drivers/media/platform/rockchip/tsp/rockchip_tsp.c @@ -0,0 +1,1182 @@ @@ -725635,7 +725627,7 @@ index 0000000000000000000000000000000000000000..830147909eebaa64e512d9a10b586682 +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 100644 -index 0000000000000000000000000000000000000000..bafe641cdf9fc8d8552f3c0dbd5f3127ba0c2c4e +index 000000000..bafe641cd --- /dev/null +++ b/drivers/media/platform/rockchip/tsp/rockchip_tsp.h @@ -0,0 +1,230 @@ @@ -725870,7 +725862,7 @@ index 0000000000000000000000000000000000000000..bafe641cdf9fc8d8552f3c0dbd5f3127 + +#endif diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c -index bbd90123a4e76d7a67e11a655ab51021b1650191..ed06e7fcde1f7eefc1db1f4273b979cd998f1f6d 100644 +index bbd90123a..ed06e7fcd 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -14,6 +14,7 @@ @@ -725895,7 +725887,7 @@ index bbd90123a4e76d7a67e11a655ab51021b1650191..ed06e7fcde1f7eefc1db1f4273b979cd error: diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c -index 28dde08ec6c5d9d595ceb559437617637fb3e86b..59c07eb34e0b22e38da1b26fe8988ba963e6a01f 100644 +index 28dde08ec..59c07eb34 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -23,6 +23,7 @@ @@ -725930,7 +725922,7 @@ index 28dde08ec6c5d9d595ceb559437617637fb3e86b..59c07eb34e0b22e38da1b26fe8988ba9 + rockchip_clear_system_status(SYS_STATUS_PERFORMANCE); } diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c -index 8cfd593d293d10d754b21ef828da1dd9bcacc30a..8223769b7eccf93fa71f83178a7801be9f915d38 100644 +index 8cfd593d2..8223769b7 100644 --- a/drivers/media/v4l2-core/v4l2-async.c +++ b/drivers/media/v4l2-core/v4l2-async.c @@ -616,6 +616,58 @@ static int __v4l2_async_nf_register(struct v4l2_async_notifier *notifier) @@ -726090,7 +726082,7 @@ index 8cfd593d293d10d754b21ef828da1dd9bcacc30a..8223769b7eccf93fa71f83178a7801be v4l2_async_connection_unique(struct v4l2_subdev *sd) { diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig -index 68d71b4b55bd350af0e5cefbd1713ca206d131ca..2da458bd3c551dba58506aa23d67fdd9e3b5df02 100644 +index 68d71b4b5..2da458bd3 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -1220,6 +1220,99 @@ config MFD_RC5T583 @@ -726194,7 +726186,7 @@ index 68d71b4b55bd350af0e5cefbd1713ca206d131ca..2da458bd3c551dba58506aa23d67fdd9 tristate select MFD_CORE diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile -index c66f07edcd0e6273ef1a9eac702bc674eb1cbb32..9f76f965ab136e19c3ea76388b40585816126904 100644 +index c66f07edc..9f76f965a 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -221,6 +221,16 @@ obj-$(CONFIG_MFD_PALMAS) += palmas.o @@ -726216,7 +726208,7 @@ index c66f07edcd0e6273ef1a9eac702bc674eb1cbb32..9f76f965ab136e19c3ea76388b405858 obj-$(CONFIG_MFD_RK8XX_SPI) += rk8xx-spi.o diff --git a/drivers/mfd/rk1000-core.c b/drivers/mfd/rk1000-core.c new file mode 100644 -index 0000000000000000000000000000000000000000..987b9f2b51e02a03dd50842af5c21939407adb9c +index 000000000..987b9f2b5 --- /dev/null +++ b/drivers/mfd/rk1000-core.c @@ -0,0 +1,175 @@ @@ -726397,7 +726389,7 @@ index 0000000000000000000000000000000000000000..987b9f2b51e02a03dd50842af5c21939 +MODULE_LICENSE("GPL"); diff --git a/drivers/mfd/rk618.c b/drivers/mfd/rk618.c new file mode 100644 -index 0000000000000000000000000000000000000000..ac7d5d38a0979ca4a3b8d38ecd1eae40d3ab5546 +index 000000000..ac7d5d38a --- /dev/null +++ b/drivers/mfd/rk618.c @@ -0,0 +1,232 @@ @@ -726635,7 +726627,7 @@ index 0000000000000000000000000000000000000000..ac7d5d38a0979ca4a3b8d38ecd1eae40 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/mfd/rk628.c b/drivers/mfd/rk628.c new file mode 100644 -index 0000000000000000000000000000000000000000..733442fd286a9dc536aadb4eecb40d3c1ae74a49 +index 000000000..733442fd2 --- /dev/null +++ b/drivers/mfd/rk628.c @@ -0,0 +1,482 @@ @@ -727123,7 +727115,7 @@ index 0000000000000000000000000000000000000000..733442fd286a9dc536aadb4eecb40d3c +MODULE_LICENSE("GPL v2"); diff --git a/drivers/mfd/rk630-i2c.c b/drivers/mfd/rk630-i2c.c new file mode 100644 -index 0000000000000000000000000000000000000000..9636458e137a5516c5d19e3b60c9622e74fd7551 +index 000000000..9636458e1 --- /dev/null +++ b/drivers/mfd/rk630-i2c.c @@ -0,0 +1,88 @@ @@ -727217,7 +727209,7 @@ index 0000000000000000000000000000000000000000..9636458e137a5516c5d19e3b60c9622e +MODULE_LICENSE("GPL v2"); diff --git a/drivers/mfd/rk630-spi.c b/drivers/mfd/rk630-spi.c new file mode 100644 -index 0000000000000000000000000000000000000000..b12843c583de10d9cf16886fe6d9da1a11ebfbeb +index 000000000..b12843c58 --- /dev/null +++ b/drivers/mfd/rk630-spi.c @@ -0,0 +1,259 @@ @@ -727482,7 +727474,7 @@ index 0000000000000000000000000000000000000000..b12843c583de10d9cf16886fe6d9da1a +MODULE_LICENSE("GPL v2"); diff --git a/drivers/mfd/rk630.c b/drivers/mfd/rk630.c new file mode 100644 -index 0000000000000000000000000000000000000000..b8b853826d531c0bd26d93f2be7e783300c3a61c +index 000000000..b8b853826 --- /dev/null +++ b/drivers/mfd/rk630.c @@ -0,0 +1,292 @@ @@ -727780,7 +727772,7 @@ index 0000000000000000000000000000000000000000..b8b853826d531c0bd26d93f2be7e7833 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/mfd/rk806-core.c b/drivers/mfd/rk806-core.c new file mode 100644 -index 0000000000000000000000000000000000000000..1ab83fbf397c25bb1e051f835c31d99c520c7492 +index 000000000..1ab83fbf3 --- /dev/null +++ b/drivers/mfd/rk806-core.c @@ -0,0 +1,836 @@ @@ -728622,7 +728614,7 @@ index 0000000000000000000000000000000000000000..1ab83fbf397c25bb1e051f835c31d99c +MODULE_LICENSE("GPL v2"); diff --git a/drivers/mfd/rk806-i2c.c b/drivers/mfd/rk806-i2c.c new file mode 100644 -index 0000000000000000000000000000000000000000..3627af87a4ebae1fa4bf6a4501583ad50824b5de +index 000000000..3627af87a --- /dev/null +++ b/drivers/mfd/rk806-i2c.c @@ -0,0 +1,60 @@ @@ -728688,7 +728680,7 @@ index 0000000000000000000000000000000000000000..3627af87a4ebae1fa4bf6a4501583ad5 +MODULE_LICENSE("GPL"); diff --git a/drivers/mfd/rk806-spi.c b/drivers/mfd/rk806-spi.c new file mode 100644 -index 0000000000000000000000000000000000000000..c1053078558a45048bc73c8095a73886af7179b6 +index 000000000..c10530785 --- /dev/null +++ b/drivers/mfd/rk806-spi.c @@ -0,0 +1,134 @@ @@ -728828,7 +728820,7 @@ index 0000000000000000000000000000000000000000..c1053078558a45048bc73c8095a73886 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c new file mode 100644 -index 0000000000000000000000000000000000000000..cbeb67a08d156da39b6cce4d20e7dc6586df203b +index 000000000..cbeb67a08 --- /dev/null +++ b/drivers/mfd/rk808.c @@ -0,0 +1,1629 @@ @@ -730462,7 +730454,7 @@ index 0000000000000000000000000000000000000000..cbeb67a08d156da39b6cce4d20e7dc65 +MODULE_AUTHOR("Wadim Egorov "); +MODULE_DESCRIPTION("RK808/RK818 PMIC driver"); diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c -index 32d49100dff5161407f8c811d6fd12657f25700a..50b41a23e5a27b457373001ced5a22e7a695f5ea 100644 +index 32d49100d..50b41a23e 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -3002,6 +3002,9 @@ static void mmc_blk_remove_debugfs(struct mmc_card *card, @@ -730501,7 +730493,7 @@ index 32d49100dff5161407f8c811d6fd12657f25700a..50b41a23e5a27b457373001ced5a22e7 pm_runtime_get_sync(&card->dev); if (md->part_curr != md->part_type) { diff --git a/drivers/mmc/core/block.h b/drivers/mmc/core/block.h -index 31153f656f412917bd91a0dd5caf42ab4673b2c5..0ce5d97d49d95df3cc0d0c0fe8b7fb4900d916ac 100644 +index 31153f656..0ce5d97d4 100644 --- a/drivers/mmc/core/block.h +++ b/drivers/mmc/core/block.h @@ -17,4 +17,6 @@ struct work_struct; @@ -730512,7 +730504,7 @@ index 31153f656f412917bd91a0dd5caf42ab4673b2c5..0ce5d97d49d95df3cc0d0c0fe8b7fb49 + #endif diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile -index a693fa3d3f1cc6fc6703c16beda8e8bd0f9374cc..d16a6e7b5ad3b03ba703ab7bdd1e0dcb2ac91fc4 100644 +index a693fa3d3..d16a6e7b5 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -55,6 +55,7 @@ obj-$(CONFIG_MMC_DW_K3) += dw_mmc-k3.o @@ -730525,7 +730517,7 @@ index a693fa3d3f1cc6fc6703c16beda8e8bd0f9374cc..d16a6e7b5ad3b03ba703ab7bdd1e0dcb obj-$(CONFIG_MMC_VUB300) += vub300.o diff --git a/drivers/mmc/host/rk_sdmmc.h b/drivers/mmc/host/rk_sdmmc.h new file mode 100644 -index 0000000000000000000000000000000000000000..cad989246002c4cf1954004962017c014470d880 +index 000000000..cad989246 --- /dev/null +++ b/drivers/mmc/host/rk_sdmmc.h @@ -0,0 +1,387 @@ @@ -730918,7 +730910,7 @@ index 0000000000000000000000000000000000000000..cad989246002c4cf1954004962017c01 +#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 100644 -index 0000000000000000000000000000000000000000..d0ef613ae60e07f681014e984ae63e0ee92456ac +index 000000000..d0ef613ae --- /dev/null +++ b/drivers/mmc/host/rk_sdmmc_ops.c @@ -0,0 +1,208 @@ @@ -731132,7 +731124,7 @@ index 0000000000000000000000000000000000000000..d0ef613ae60e07f681014e984ae63e0e +MODULE_LICENSE("GPL"); diff --git a/drivers/mmc/host/rk_sdmmc_ops.h b/drivers/mmc/host/rk_sdmmc_ops.h new file mode 100644 -index 0000000000000000000000000000000000000000..81890ab6a94eb08a71a12fa96cb66f67ef730eeb +index 000000000..81890ab6a --- /dev/null +++ b/drivers/mmc/host/rk_sdmmc_ops.h @@ -0,0 +1,11 @@ @@ -731149,7 +731141,7 @@ index 0000000000000000000000000000000000000000..81890ab6a94eb08a71a12fa96cb66f67 +#endif diff --git a/drivers/mtd/rknand/Kconfig b/drivers/mtd/rknand/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..0abd524a6febd9e50781a36e65f45856b3dfa2e6 +index 000000000..0abd524a6 --- /dev/null +++ b/drivers/mtd/rknand/Kconfig @@ -0,0 +1,47 @@ @@ -731202,7 +731194,7 @@ index 0000000000000000000000000000000000000000..0abd524a6febd9e50781a36e65f45856 + diff --git a/drivers/mtd/rknand/Makefile b/drivers/mtd/rknand/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..5ddcdf1a7c2879e8c6ee20fc290271515c955857 +index 000000000..5ddcdf1a7 --- /dev/null +++ b/drivers/mtd/rknand/Makefile @@ -0,0 +1,9 @@ @@ -731217,7 +731209,7 @@ index 0000000000000000000000000000000000000000..5ddcdf1a7c2879e8c6ee20fc29027151 + diff --git a/drivers/mtd/rknand/api_flash.h b/drivers/mtd/rknand/api_flash.h new file mode 100644 -index 0000000000000000000000000000000000000000..3ca267b1146e874485fc50e6d20b81ff8f8e76b4 +index 000000000..3ca267b11 --- /dev/null +++ b/drivers/mtd/rknand/api_flash.h @@ -0,0 +1,203 @@ @@ -731426,7 +731418,7 @@ index 0000000000000000000000000000000000000000..3ca267b1146e874485fc50e6d20b81ff +#endif diff --git a/drivers/mtd/rknand/rknand_base.h b/drivers/mtd/rknand/rknand_base.h new file mode 100644 -index 0000000000000000000000000000000000000000..6460e9eace4631aefdf849ea89e94a1337919063 +index 000000000..6460e9eac --- /dev/null +++ b/drivers/mtd/rknand/rknand_base.h @@ -0,0 +1,93 @@ @@ -731525,7 +731517,7 @@ index 0000000000000000000000000000000000000000..6460e9eace4631aefdf849ea89e94a13 +#endif diff --git a/drivers/mtd/rknand/rknand_base_ko.c b/drivers/mtd/rknand/rknand_base_ko.c new file mode 100644 -index 0000000000000000000000000000000000000000..5a462b76dc424f17f32333c20c1f9c7e03ab61fa +index 000000000..5a462b76d --- /dev/null +++ b/drivers/mtd/rknand/rknand_base_ko.c @@ -0,0 +1,699 @@ @@ -732229,7 +732221,7 @@ index 0000000000000000000000000000000000000000..5a462b76dc424f17f32333c20c1f9c7e + + diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig -index f8cde9f9f554d5a0f7d0c48c81aef7793d9555fd..5d7ace2e5883f3a804b04f47f6d4b593edf84377 100644 +index f8cde9f9f..5d7ace2e5 100644 --- a/drivers/net/can/Kconfig +++ b/drivers/net/can/Kconfig @@ -222,6 +222,7 @@ source "drivers/net/can/m_can/Kconfig" @@ -732241,7 +732233,7 @@ index f8cde9f9f554d5a0f7d0c48c81aef7793d9555fd..5d7ace2e5883f3a804b04f47f6d4b593 source "drivers/net/can/softing/Kconfig" source "drivers/net/can/spi/Kconfig" diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile -index ff8f76295d13bcbb95f9816dee68afcbe19523f1..5140da19fc9514e79d90fce5dd3fbb24c4528b36 100644 +index ff8f76295..5140da19f 100644 --- a/drivers/net/can/Makefile +++ b/drivers/net/can/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_CAN_SLCAN) += slcan/ @@ -732254,7 +732246,7 @@ index ff8f76295d13bcbb95f9816dee68afcbe19523f1..5140da19fc9514e79d90fce5dd3fbb24 obj-y += softing/ diff --git a/drivers/net/can/rockchip/Kconfig b/drivers/net/can/rockchip/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..97d9bec19cf13d035436bb06936ea3be57df78ea +index 000000000..97d9bec19 --- /dev/null +++ b/drivers/net/can/rockchip/Kconfig @@ -0,0 +1,18 @@ @@ -732278,7 +732270,7 @@ index 0000000000000000000000000000000000000000..97d9bec19cf13d035436bb06936ea3be + be called rockchip_canfd. diff --git a/drivers/net/can/rockchip/Makefile b/drivers/net/can/rockchip/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..08c3ba52e603ae7f530be7c51b5f85031cae63e6 +index 000000000..08c3ba52e --- /dev/null +++ b/drivers/net/can/rockchip/Makefile @@ -0,0 +1,7 @@ @@ -732291,7 +732283,7 @@ index 0000000000000000000000000000000000000000..08c3ba52e603ae7f530be7c51b5f8503 +obj-$(CONFIG_CANFD_ROCKCHIP) += rockchip_canfd.o diff --git a/drivers/net/can/rockchip/rockchip_can.c b/drivers/net/can/rockchip/rockchip_can.c new file mode 100644 -index 0000000000000000000000000000000000000000..29b5fbedf994271450b0eaeaa339434e90dc38fb +index 000000000..29b5fbedf --- /dev/null +++ b/drivers/net/can/rockchip/rockchip_can.c @@ -0,0 +1,813 @@ @@ -733110,7 +733102,7 @@ index 0000000000000000000000000000000000000000..29b5fbedf994271450b0eaeaa339434e +MODULE_DESCRIPTION("Rockchip CAN Drivers"); diff --git a/drivers/net/can/rockchip/rockchip_canfd.c b/drivers/net/can/rockchip/rockchip_canfd.c new file mode 100644 -index 0000000000000000000000000000000000000000..dba7f14c45f32c24ee122a049da5641a3402d6b0 +index 000000000..dba7f14c4 --- /dev/null +++ b/drivers/net/can/rockchip/rockchip_canfd.c @@ -0,0 +1,1226 @@ @@ -734341,7 +734333,7 @@ index 0000000000000000000000000000000000000000..dba7f14c45f32c24ee122a049da5641a +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Rockchip CANFD Drivers"); diff --git a/drivers/net/ethernet/arc/emac.h b/drivers/net/ethernet/arc/emac.h -index 0e244f0e25fd36c757ba80999a84a1249dee31cf..d820ae03a9660df1672ba6b51aa538cfd8265210 100644 +index 0e244f0e2..d820ae03a 100644 --- a/drivers/net/ethernet/arc/emac.h +++ b/drivers/net/ethernet/arc/emac.h @@ -220,6 +220,6 @@ static inline void arc_reg_clr(struct arc_emac_priv *priv, int reg, int mask) @@ -734353,7 +734345,7 @@ index 0e244f0e25fd36c757ba80999a84a1249dee31cf..d820ae03a9660df1672ba6b51aa538cf #endif /* ARC_EMAC_H */ diff --git a/drivers/net/ethernet/arc/emac_arc.c b/drivers/net/ethernet/arc/emac_arc.c -index ce3147e886a10ddb3c50b3df7b260a8e8ffa210b..800620b8f10d41e2094fb5c28d25bab24302a30d 100644 +index ce3147e88..800620b8f 100644 --- a/drivers/net/ethernet/arc/emac_arc.c +++ b/drivers/net/ethernet/arc/emac_arc.c @@ -61,11 +61,11 @@ static int emac_arc_probe(struct platform_device *pdev) @@ -734372,7 +734364,7 @@ index ce3147e886a10ddb3c50b3df7b260a8e8ffa210b..800620b8f10d41e2094fb5c28d25bab2 static const struct of_device_id emac_arc_dt_ids[] = { diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c -index 31ee477dd131e848a4eb4cae1dbc22c8ed250947..b8e503e34a1ae2cafe63d272bb57c6b646c5d18e 100644 +index 31ee477dd..b8e503e34 100644 --- a/drivers/net/ethernet/arc/emac_main.c +++ b/drivers/net/ethernet/arc/emac_main.c @@ -20,6 +20,7 @@ @@ -734529,7 +734521,7 @@ index 31ee477dd131e848a4eb4cae1dbc22c8ed250947..b8e503e34a1ae2cafe63d272bb57c6b6 EXPORT_SYMBOL_GPL(arc_emac_remove); diff --git a/drivers/net/ethernet/arc/emac_rockchip.c b/drivers/net/ethernet/arc/emac_rockchip.c -index 509101112279d7618e0d3fa631a3ca9920eff866..1c9ca3bcb87147d49811ca5cb2bcfafd1c5bda34 100644 +index 509101112..1c9ca3bcb 100644 --- a/drivers/net/ethernet/arc/emac_rockchip.c +++ b/drivers/net/ethernet/arc/emac_rockchip.c @@ -248,8 +248,9 @@ static int emac_rockchip_remove(struct platform_device *pdev) @@ -734553,7 +734545,7 @@ index 509101112279d7618e0d3fa631a3ca9920eff866..1c9ca3bcb87147d49811ca5cb2bcfafd static struct platform_driver emac_rockchip_driver = { diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig -index 25f2d42de406d698f00dbafd6d814ee14cd24829..791e32f8c52d70f1d5e7f5bb5720c598608898e8 100644 +index 25f2d42de..791e32f8c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig @@ -25,6 +25,26 @@ config STMMAC_SELFTESTS @@ -734601,7 +734593,7 @@ index 25f2d42de406d698f00dbafd6d814ee14cd24829..791e32f8c52d70f1d5e7f5bb5720c598 tristate "SOCFPGA dwmac support" default ARCH_INTEL_SOCFPGA diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile -index 5b57aee19267ff2dddc2e38fe61ed5c08f66c1e0..3a4fe1cd914a134e9513dd87b5e9eab66dd12582 100644 +index 5b57aee19..3a4fe1cd9 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Makefile +++ b/drivers/net/ethernet/stmicro/stmmac/Makefile @@ -1,15 +1,19 @@ @@ -734642,7 +734634,7 @@ index 5b57aee19267ff2dddc2e38fe61ed5c08f66c1e0..3a4fe1cd914a134e9513dd87b5e9eab6 obj-$(CONFIG_DWMAC_STARFIVE) += dwmac-starfive.o obj-$(CONFIG_DWMAC_STI) += dwmac-sti.o diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h -index b0dd8adce35604ea48a8efbf553f4a9b253c0bbb..9695e94213b9007ec3face407396aebe9bf4b0b6 100644 +index b0dd8adce..9695e9421 100644 --- a/drivers/net/ethernet/stmicro/stmmac/common.h +++ b/drivers/net/ethernet/stmicro/stmmac/common.h @@ -50,10 +50,18 @@ @@ -734666,7 +734658,7 @@ index b0dd8adce35604ea48a8efbf553f4a9b253c0bbb..9695e94213b9007ec3face407396aebe #undef FRAME_FILTER_DEBUG 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 100644 -index 0000000000000000000000000000000000000000..bf6281438af81243832118dab701e990cdf48c92 +index 000000000..bf6281438 --- /dev/null +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.c @@ -0,0 +1,1606 @@ @@ -736278,7 +736270,7 @@ index 0000000000000000000000000000000000000000..bf6281438af81243832118dab701e990 +} 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 100644 -index 0000000000000000000000000000000000000000..5b87c27af62c280b9646b453ca1311c5943f5491 +index 000000000..5b87c27af --- /dev/null +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.h @@ -0,0 +1,37 @@ @@ -736320,7 +736312,7 @@ index 0000000000000000000000000000000000000000..5b87c27af62c280b9646b453ca1311c5 +#endif /* __DWMAC_RK_TOOL_H__ */ + diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c -index d920a50dd16c7ce39b5e26a7b016ce2ceded95fd..f121c1b18cc2f81cf43248e65356fe28f484c49a 100644 +index d920a50dd..f121c1b18 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -11,52 +11,42 @@ @@ -738440,7 +738432,7 @@ index d920a50dd16c7ce39b5e26a7b016ce2ceded95fd..f121c1b18cc2f81cf43248e65356fe28 }; MODULE_DEVICE_TABLE(of, rk_gmac_dwmac_match); diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c -index c6ff1fa0e04d84f44e683894847f6226252c4450..4493d23ea693870758310c964be9b72824d7de9b 100644 +index c6ff1fa0e..4493d23ea 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c @@ -1134,6 +1134,7 @@ static int dwmac4_config_l4_filter(struct mac_device_info *hw, u32 filter_no, @@ -738498,7 +738490,7 @@ index c6ff1fa0e04d84f44e683894847f6226252c4450..4493d23ea693870758310c964be9b728 static u32 dwmac4_get_num_vlan(void __iomem *ioaddr) { diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.c b/drivers/net/ethernet/stmicro/stmmac/hwif.c -index b8ba8f2d8041ee4e150d6ddc4b9aec11621f6bcc..44f55e65b18a8e8dcb8af24ae83b3f60a4651fed 100644 +index b8ba8f2d8..44f55e65b 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.c +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.c @@ -35,6 +35,7 @@ static u32 stmmac_get_dev_id(struct stmmac_priv *priv, u32 id_reg) @@ -738562,7 +738554,7 @@ index b8ba8f2d8041ee4e150d6ddc4b9aec11621f6bcc..44f55e65b18a8e8dcb8af24ae83b3f60 int stmmac_hwif_init(struct stmmac_priv *priv) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h -index b8c93b881a6533835f8ce8840505bd6d26cc8360..a80dcb7ca93f4c427de267e0132d594c65ed38ad 100644 +index b8c93b881..a80dcb7ca 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -345,7 +345,14 @@ int stmmac_mdio_unregister(struct net_device *ndev); @@ -738581,7 +738573,7 @@ index b8c93b881a6533835f8ce8840505bd6d26cc8360..a80dcb7ca93f4c427de267e0132d594c int stmmac_init_tstamp_counter(struct stmmac_priv *priv, u32 systime_flags); void stmmac_ptp_register(struct stmmac_priv *priv); diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c -index 521b1b5ffebb4f784e6b479784d1b75da5a42cc7..c2829dbf4ae5879fa3d2e408b94085121384d7db 100644 +index 521b1b5ff..c2829dbf4 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c @@ -412,6 +412,11 @@ stmmac_ethtool_set_link_ksettings(struct net_device *dev, @@ -738597,7 +738589,7 @@ index 521b1b5ffebb4f784e6b479784d1b75da5a42cc7..c2829dbf4ae5879fa3d2e408b9408512 } diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -index d1adb102a1d49e89a652c29394aa388edf93dc0d..556f29f05f65714fb2f9e864dbce6288c523e754 100644 +index d1adb102a..556f29f05 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -147,6 +147,14 @@ static void stmmac_exit_fs(struct net_device *dev); @@ -738894,7 +738886,7 @@ index d1adb102a1d49e89a652c29394aa388edf93dc0d..556f29f05f65714fb2f9e864dbce6288 if (!(priv->plat->flags & STMMAC_FLAG_SERDES_UP_AFTER_PHY_LINKUP) && diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c -index 30d5e635190e66f6756f0fcfb6580db130c95bb0..ff2061b57247a617c381f5d6c09257bbc76c35f2 100644 +index 30d5e6351..ff2061b57 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -464,6 +464,9 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) @@ -738927,7 +738919,7 @@ index 30d5e635190e66f6756f0fcfb6580db130c95bb0..ff2061b57247a617c381f5d6c09257bb ret = plat->pclk; goto error_pclk_get; diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c -index 7b3739b29c8f72b7b108c5f4ae11fdfcf243237d..94c612da794345b427b053aadf190375f5f909de 100644 +index 7b3739b29..94c612da7 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c @@ -663,8 +663,10 @@ static const struct usb_device_id products [] = { @@ -738942,7 +738934,7 @@ index 7b3739b29c8f72b7b108c5f4ae11fdfcf243237d..94c612da794345b427b053aadf190375 /* Novatel Verizon USB730L */ USB_INTERFACE_INFO(USB_CLASS_MISC, 4, 1), diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig -index 7555af5195ec3f55ff83edbcdfe8f58072133295..c7d58118b7d7ade143923e61d70b108fa4ff2f0c 100644 +index 7555af519..c7d58118b 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -31,6 +31,7 @@ source "drivers/net/wireless/microchip/Kconfig" @@ -738954,7 +738946,7 @@ index 7555af5195ec3f55ff83edbcdfe8f58072133295..c7d58118b7d7ade143923e61d70b108f source "drivers/net/wireless/silabs/Kconfig" source "drivers/net/wireless/st/Kconfig" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile -index 4d7374d567d18c708e6396ed8870af7543a6c3d4..f578d32a7cea15d48230bd67bf7a2ca959856232 100644 +index 4d7374d56..f578d32a7 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -23,5 +23,6 @@ obj-$(CONFIG_WLAN_VENDOR_ST) += st/ @@ -738966,7 +738958,7 @@ index 4d7374d567d18c708e6396ed8870af7543a6c3d4..f578d32a7cea15d48230bd67bf7a2ca9 obj-$(CONFIG_WLAN) += virtual/ diff --git a/drivers/net/wireless/rockchip_wlan/Kconfig b/drivers/net/wireless/rockchip_wlan/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..d77741df5cc077832dfde80ece9c671efaa1293d +index 000000000..d77741df5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/Kconfig @@ -0,0 +1,39 @@ @@ -739011,7 +739003,7 @@ index 0000000000000000000000000000000000000000..d77741df5cc077832dfde80ece9c671e +endif # WL_ROCKCHIP diff --git a/drivers/net/wireless/rockchip_wlan/Makefile b/drivers/net/wireless/rockchip_wlan/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..8279a393719f497d683f8f42669f879824fb5cac +index 000000000..8279a3937 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/Makefile @@ -0,0 +1,3 @@ @@ -739020,7 +739012,7 @@ index 0000000000000000000000000000000000000000..8279a393719f497d683f8f42669f8798 +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 100644 -index 0000000000000000000000000000000000000000..edd10241a09a149082b6beff0696e278e5019656 +index 000000000..edd10241a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/Kconfig @@ -0,0 +1,32 @@ @@ -739058,7 +739050,7 @@ index 0000000000000000000000000000000000000000..edd10241a09a149082b6beff0696e278 + 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 100644 -index 0000000000000000000000000000000000000000..e4e2c6964a6b734cff0fe7d70b78ac626528b998 +index 000000000..e4e2c6964 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/Makefile @@ -0,0 +1,10 @@ @@ -739074,7 +739066,7 @@ index 0000000000000000000000000000000000000000..e4e2c6964a6b734cff0fe7d70b78ac62 + 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 -index 0000000000000000000000000000000000000000..cb1fe701533a3b44cad34276797744b83b5e190e +index 000000000..cb1fe7015 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Kconfig @@ -0,0 +1,82 @@ @@ -739162,7 +739154,7 @@ index 0000000000000000000000000000000000000000..cb1fe701533a3b44cad34276797744b8 +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 -index 0000000000000000000000000000000000000000..328afa7aefa290f8b6116877ed58f056a6c6ebfc +index 000000000..328afa7ae --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Makefile @@ -0,0 +1,501 @@ @@ -739669,7 +739661,7 @@ index 0000000000000000000000000000000000000000..328afa7aefa290f8b6116877ed58f056 + Module.symvers modules.order .tmp_versions modules.builtin 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 -index 0000000000000000000000000000000000000000..c3cb8bc2c062f0fb3afd2c002f99814eb891143f +index 000000000..c3cb8bc2c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/aiutils.c @@ -0,0 +1,2607 @@ @@ -742282,7 +742274,7 @@ index 0000000000000000000000000000000000000000..c3cb8bc2c062f0fb3afd2c002f99814e +#endif /* DONGLEBUILD */ 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 -index 0000000000000000000000000000000000000000..7f8d553b9988f5694034a5c720e343e3d508d458 +index 000000000..7f8d553b9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcm_app_utils.c @@ -0,0 +1,1252 @@ @@ -743540,7 +743532,7 @@ index 0000000000000000000000000000000000000000..7f8d553b9988f5694034a5c720e343e3 +} 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 -index 0000000000000000000000000000000000000000..a062531413b9d58cf5b59634030b176e1bf8b1ab +index 000000000..a06253141 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmbloom.c @@ -0,0 +1,232 @@ @@ -743778,7 +743770,7 @@ index 0000000000000000000000000000000000000000..a062531413b9d58cf5b59634030b176e +} 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 -index 0000000000000000000000000000000000000000..25054456f58e7f51624359669cba80c8ec41f5ef +index 000000000..25054456f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmevent.c @@ -0,0 +1,449 @@ @@ -744233,7 +744225,7 @@ index 0000000000000000000000000000000000000000..25054456f58e7f51624359669cba80c8 +} 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 -index 0000000000000000000000000000000000000000..f22350c030c26ac42cf167535d29a0731582eeb2 +index 000000000..f22350c03 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh.c @@ -0,0 +1,946 @@ @@ -745185,7 +745177,7 @@ index 0000000000000000000000000000000000000000..f22350c030c26ac42cf167535d29a073 +#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 -index 0000000000000000000000000000000000000000..88bf3469a5477e38ade02d6e7b9b1c5f841713d1 +index 000000000..88bf3469a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_linux.c @@ -0,0 +1,579 @@ @@ -745770,7 +745762,7 @@ index 0000000000000000000000000000000000000000..88bf3469a5477e38ade02d6e7b9b1c5f +#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 -index 0000000000000000000000000000000000000000..7f7362c97bf1e8f783a2abb88cdac0ba152e3f28 +index 000000000..7f7362c97 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc.c @@ -0,0 +1,2079 @@ @@ -747855,7 +747847,7 @@ index 0000000000000000000000000000000000000000..7f7362c97bf1e8f783a2abb88cdac0ba +} 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 -index 0000000000000000000000000000000000000000..a386b836cc57ef7df14e8e3156143ceeb026935e +index 000000000..a386b836c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc_linux.c @@ -0,0 +1,396 @@ @@ -748257,7 +748249,7 @@ index 0000000000000000000000000000000000000000..a386b836cc57ef7df14e8e3156143cee +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdstd.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdstd.c new file mode 100755 -index 0000000000000000000000000000000000000000..7783751d7ad5e94711964b92587022cc5dd90485 +index 000000000..7783751d7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdstd.c @@ -0,0 +1,5308 @@ @@ -753571,7 +753563,7 @@ index 0000000000000000000000000000000000000000..7783751d7ad5e94711964b92587022cc +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdstd.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdstd.h new file mode 100755 -index 0000000000000000000000000000000000000000..de742ed544a9f5658cc6aa19a47afd7e8f60682c +index 000000000..de742ed54 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdstd.h @@ -0,0 +1,298 @@ @@ -753875,7 +753867,7 @@ index 0000000000000000000000000000000000000000..de742ed544a9f5658cc6aa19a47afd7e +#endif /* _BCM_SD_STD_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdstd_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdstd_linux.c new file mode 100755 -index 0000000000000000000000000000000000000000..11d3f09f37d648b5e3b180203cdeb268c684feee +index 000000000..11d3f09f3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdstd_linux.c @@ -0,0 +1,697 @@ @@ -754578,7 +754570,7 @@ index 0000000000000000000000000000000000000000..11d3f09f37d648b5e3b180203cdeb268 +} 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 -index 0000000000000000000000000000000000000000..5a21d7c2f0fc44f917b6310d133222e3e00cd4ab +index 000000000..5a21d7c2f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmstdlib_s.c @@ -0,0 +1,305 @@ @@ -754889,7 +754881,7 @@ index 0000000000000000000000000000000000000000..5a21d7c2f0fc44f917b6310d133222e3 +} 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 -index 0000000000000000000000000000000000000000..6231b4b8f1f33d6350da3a1d9b3d075728e22bd7 +index 000000000..6231b4b8f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmutils.c @@ -0,0 +1,6509 @@ @@ -761404,7 +761396,7 @@ index 0000000000000000000000000000000000000000..6231b4b8f1f33d6350da3a1d9b3d0757 +} 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 -index 0000000000000000000000000000000000000000..9333915ea70387d73fee5b3d12cbc5b5cec0c2fd +index 000000000..9333915ea --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.c @@ -0,0 +1,3333 @@ @@ -764743,7 +764735,7 @@ index 0000000000000000000000000000000000000000..9333915ea70387d73fee5b3d12cbc5b5 +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_radiotap.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_radiotap.c new file mode 100755 -index 0000000000000000000000000000000000000000..acdb551fc046b4866c8457b1bb4506f877161e56 +index 000000000..acdb551fc --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_radiotap.c @@ -0,0 +1,1035 @@ @@ -765784,7 +765776,7 @@ index 0000000000000000000000000000000000000000..acdb551fc046b4866c8457b1bb4506f8 +} 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 -index 0000000000000000000000000000000000000000..33d02ae6a3c80da9bbc37c1a0915e0d33c2bd719 +index 000000000..33d02ae6a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmxtlv.c @@ -0,0 +1,644 @@ @@ -766434,7 +766426,7 @@ index 0000000000000000000000000000000000000000..33d02ae6a3c80da9bbc37c1a0915e0d3 +} 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 -index 0000000000000000000000000000000000000000..9b65c3c04ab8e848a45966bff040d275725e3954 +index 000000000..9b65c3c04 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus.c @@ -0,0 +1,3516 @@ @@ -769956,7 +769948,7 @@ index 0000000000000000000000000000000000000000..9b65c3c04ab8e848a45966bff040d275 +#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 -index 0000000000000000000000000000000000000000..28cf3f092f1ca8b22b5e726391301d0135797313 +index 000000000..28cf3f092 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb.c @@ -0,0 +1,1088 @@ @@ -771050,7 +771042,7 @@ index 0000000000000000000000000000000000000000..28cf3f092f1ca8b22b5e726391301d01 +#endif /* BCM_DNGL_EMBEDIMAGE */ 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 -index 0000000000000000000000000000000000000000..f113d5b8d6c5834e68012ae51a1d7569b9abc122 +index 000000000..f113d5b8d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb_linux.c @@ -0,0 +1,4807 @@ @@ -775863,7 +775855,7 @@ index 0000000000000000000000000000000000000000..f113d5b8d6c5834e68012ae51a1d7569 +#endif /* LINUX */ 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 -index 0000000000000000000000000000000000000000..923697417e42c20c0ff79e4af03444c187ba3aca +index 000000000..923697417 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd.h @@ -0,0 +1,4772 @@ @@ -780641,7 +780633,7 @@ index 0000000000000000000000000000000000000000..923697417e42c20c0ff79e4af03444c1 +#endif /* _dhd_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bitpack.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bitpack.h new file mode 100755 -index 0000000000000000000000000000000000000000..8332fb790a78e1e0841671d7e8f7b1f19226bac4 +index 000000000..8332fb790 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bitpack.h @@ -0,0 +1,33 @@ @@ -780680,7 +780672,7 @@ index 0000000000000000000000000000000000000000..8332fb790a78e1e0841671d7e8f7b1f1 +#endif /* __BITPACK_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 -index 0000000000000000000000000000000000000000..e5067ea47a130159ccb8c9785083b8df02ad192b +index 000000000..e5067ea47 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bus.h @@ -0,0 +1,432 @@ @@ -781118,7 +781110,7 @@ index 0000000000000000000000000000000000000000..e5067ea47a130159ccb8c9785083b8df +#endif /* _dhd_bus_h_ */ 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 -index 0000000000000000000000000000000000000000..90d6deaf9986674296856dbd2b85f5dbe21c2ee0 +index 000000000..90d6deaf9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ccode.c @@ -0,0 +1,276 @@ @@ -781400,7 +781392,7 @@ index 0000000000000000000000000000000000000000..90d6deaf9986674296856dbd2b85f5db +#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 -index 0000000000000000000000000000000000000000..668d11389e569cf57957a2af232878a750daf89a +index 000000000..668d11389 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cdc.c @@ -0,0 +1,994 @@ @@ -782400,7 +782392,7 @@ index 0000000000000000000000000000000000000000..668d11389e569cf57957a2af232878a7 +} 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 -index 0000000000000000000000000000000000000000..370510189ffe7515ce737ed3b7bc235bcba45159 +index 000000000..370510189 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.c @@ -0,0 +1,615 @@ @@ -783021,7 +783013,7 @@ index 0000000000000000000000000000000000000000..370510189ffe7515ce737ed3b7bc235b +#endif /* RPM_FAST_TRIGGER */ 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 -index 0000000000000000000000000000000000000000..ae24bce5503c5963359ab383e563b71cd0514f9e +index 000000000..ae24bce55 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.h @@ -0,0 +1,53 @@ @@ -783080,7 +783072,7 @@ index 0000000000000000000000000000000000000000..ae24bce5503c5963359ab383e563b71c +#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 -index 0000000000000000000000000000000000000000..ed4c32cd3ef8b39a5e96c51e7e235f79cdc2c0d4 +index 000000000..ed4c32cd3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_common.c @@ -0,0 +1,12014 @@ @@ -795100,7 +795092,7 @@ index 0000000000000000000000000000000000000000..ed4c32cd3ef8b39a5e96c51e7e235f79 +} 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 -index 0000000000000000000000000000000000000000..c1b93fac5f8e22e9b1d071a7cd9ed628ec664363 +index 000000000..c1b93fac5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.c @@ -0,0 +1,5653 @@ @@ -800759,7 +800751,7 @@ index 0000000000000000000000000000000000000000..c1b93fac5f8e22e9b1d071a7cd9ed628 +} 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 -index 0000000000000000000000000000000000000000..a6412a818bd36e81d15954b32af0c396c4961169 +index 000000000..a6412a818 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.h @@ -0,0 +1,466 @@ @@ -801231,7 +801223,7 @@ index 0000000000000000000000000000000000000000..a6412a818bd36e81d15954b32af0c396 +#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 -index 0000000000000000000000000000000000000000..aa243a3c2aa5ad77aa28fb70b25df34b9eb39140 +index 000000000..aa243a3c2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.c @@ -0,0 +1,827 @@ @@ -802064,7 +802056,7 @@ index 0000000000000000000000000000000000000000..aa243a3c2aa5ad77aa28fb70b25df34b +#endif /* CSI_SUPPORT */ 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 -index 0000000000000000000000000000000000000000..02ee564f65721ef83e0cdbeaed032387f7116821 +index 000000000..02ee564f6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.h @@ -0,0 +1,466 @@ @@ -802536,7 +802528,7 @@ index 0000000000000000000000000000000000000000..02ee564f65721ef83e0cdbeaed032387 +#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 -index 0000000000000000000000000000000000000000..21edfc12a9cbfd5df81ec68c622a15d9e4ea0216 +index 000000000..21edfc12a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_gpio.c @@ -0,0 +1,490 @@ @@ -803032,7 +803024,7 @@ index 0000000000000000000000000000000000000000..21edfc12a9cbfd5df81ec68c622a15d9 +} 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 -index 0000000000000000000000000000000000000000..070fc56959329ab2935ef73a33dcc0806befebc1 +index 000000000..070fc5695 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_hikey.c @@ -0,0 +1,342 @@ @@ -803380,7 +803372,7 @@ index 0000000000000000000000000000000000000000..070fc56959329ab2935ef73a33dcc080 +#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 -index 0000000000000000000000000000000000000000..fac72fe11be36fcc65d29b05acb4a4ed8790b66c +index 000000000..fac72fe11 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_memprealloc.c @@ -0,0 +1,476 @@ @@ -803862,7 +803854,7 @@ index 0000000000000000000000000000000000000000..fac72fe11be36fcc65d29b05acb4a4ed +#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 -index 0000000000000000000000000000000000000000..cac6787a00665b281abcb8a6b9206622b4e54cc4 +index 000000000..cac6787a0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg.h @@ -0,0 +1,573 @@ @@ -804441,7 +804433,7 @@ index 0000000000000000000000000000000000000000..cac6787a00665b281abcb8a6b9206622 +#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 -index 0000000000000000000000000000000000000000..b1c3d85c89fe5c67aa8386bd6ba6a4e6e3fd3691 +index 000000000..b1c3d85c8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.c @@ -0,0 +1,561 @@ @@ -805008,7 +805000,7 @@ index 0000000000000000000000000000000000000000..b1c3d85c89fe5c67aa8386bd6ba6a4e6 +} 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 -index 0000000000000000000000000000000000000000..cce8f15c64fc68210868a1fc1c86f968ad813c29 +index 000000000..cce8f15c6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.h @@ -0,0 +1,158 @@ @@ -805172,7 +805164,7 @@ index 0000000000000000000000000000000000000000..cce8f15c64fc68210868a1fc1c86f968 +#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 -index 0000000000000000000000000000000000000000..b99a6c5bf60fb9cffee4b970558f5303c5e88f93 +index 000000000..b99a6c5bf --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.c @@ -0,0 +1,3666 @@ @@ -808844,7 +808836,7 @@ index 0000000000000000000000000000000000000000..b99a6c5bf60fb9cffee4b970558f5303 +#endif /* DHD_DEBUGABILITY_LOG_DUMP_RING */ 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 -index 0000000000000000000000000000000000000000..6631c9830950c7d79c65340935a88def3a7a1ef7 +index 000000000..6631c9830 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.h @@ -0,0 +1,943 @@ @@ -809793,7 +809785,7 @@ index 0000000000000000000000000000000000000000..6631c9830950c7d79c65340935a88def +#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 -index 0000000000000000000000000000000000000000..8f2f21a26815cb19d803e0bfb94b9c71e61d96ee +index 000000000..8f2f21a26 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug_linux.c @@ -0,0 +1,630 @@ @@ -810429,7 +810421,7 @@ index 0000000000000000000000000000000000000000..8f2f21a26815cb19d803e0bfb94b9c71 +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_event_log_filter.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_event_log_filter.c new file mode 100755 -index 0000000000000000000000000000000000000000..b5417aece43dd52b54206bcdb71a53bee88a1c73 +index 000000000..b5417aece --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_event_log_filter.c @@ -0,0 +1,3258 @@ @@ -813693,7 +813685,7 @@ index 0000000000000000000000000000000000000000..b5417aece43dd52b54206bcdb71a53be +#endif /* WLADPS_ENERGY_GAIN */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_event_log_filter.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_event_log_filter.h new file mode 100755 -index 0000000000000000000000000000000000000000..37612db18fe2d092b43da1de58647dbb60a1d9c2 +index 000000000..37612db18 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_event_log_filter.h @@ -0,0 +1,56 @@ @@ -813755,7 +813747,7 @@ index 0000000000000000000000000000000000000000..37612db18fe2d092b43da1de58647dbb +#endif /* !dhd_event_log_filter_h */ 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 -index 0000000000000000000000000000000000000000..1b3b20c34f578e7648c974104f18c4e216a6e86f +index 000000000..1b3b20c34 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.c @@ -0,0 +1,1511 @@ @@ -815272,7 +815264,7 @@ index 0000000000000000000000000000000000000000..1b3b20c34f578e7648c974104f18c4e2 +} 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 -index 0000000000000000000000000000000000000000..1b1d1d0d20b9b28993d5c8e38579954f381b7403 +index 000000000..1b1d1d0d2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.h @@ -0,0 +1,310 @@ @@ -815588,7 +815580,7 @@ index 0000000000000000000000000000000000000000..1b1d1d0d20b9b28993d5c8e38579954f +#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 -index 0000000000000000000000000000000000000000..05984a978a69d278071fc77d4b7dfb1c8d2c8142 +index 000000000..05984a978 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_gpio.c @@ -0,0 +1,449 @@ @@ -816043,7 +816035,7 @@ index 0000000000000000000000000000000000000000..05984a978a69d278071fc77d4b7dfb1c +} 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 -index 0000000000000000000000000000000000000000..751a5c7b7220eeca30575f5ed2633e762560ae1c +index 000000000..751a5c7b7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.c @@ -0,0 +1,1436 @@ @@ -817485,7 +817477,7 @@ index 0000000000000000000000000000000000000000..751a5c7b7220eeca30575f5ed2633e76 +#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 -index 0000000000000000000000000000000000000000..efbf2d3f62a660f449934bd2c90337df32e00d6b +index 000000000..efbf2d3f6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.h @@ -0,0 +1,96 @@ @@ -817587,7 +817579,7 @@ index 0000000000000000000000000000000000000000..efbf2d3f62a660f449934bd2c90337df +#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 0000000000000000000000000000000000000000..639af0deb8fb4a1b603b51f7a1fd96ac5e94c611 +index 000000000..639af0deb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.c @@ -0,0 +1,24144 @@ @@ -841737,7 +841729,7 @@ index 0000000000000000000000000000000000000000..639af0deb8fb4a1b603b51f7a1fd96ac +#endif /* WLDWDS && 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 -index 0000000000000000000000000000000000000000..364aa8216201c6aef043b301f1c27cdb92ca5dc5 +index 000000000..364aa8216 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.h @@ -0,0 +1,609 @@ @@ -842352,7 +842344,7 @@ index 0000000000000000000000000000000000000000..364aa8216201c6aef043b301f1c27cdb +#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 -index 0000000000000000000000000000000000000000..adc0efd6c2c2ed296e02545892fce9e8ab0dc2cc +index 000000000..adc0efd6c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_exportfs.c @@ -0,0 +1,3290 @@ @@ -845648,7 +845640,7 @@ index 0000000000000000000000000000000000000000..adc0efd6c2c2ed296e02545892fce9e8 +#endif /* DHD_SUPPORT_HDM */ 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 -index 0000000000000000000000000000000000000000..dfb5ab6edb897894db4d1e2be59ba6c34995baf1 +index 000000000..dfb5ab6ed --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_lb.c @@ -0,0 +1,1526 @@ @@ -847180,7 +847172,7 @@ index 0000000000000000000000000000000000000000..dfb5ab6edb897894db4d1e2be59ba6c3 +#endif /* SET_PCIE_IRQ_CPU_CORE */ 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 -index 0000000000000000000000000000000000000000..6a521cab9f940921808da22ecba95ca30b48d422 +index 000000000..6a521cab9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.c @@ -0,0 +1,2006 @@ @@ -849192,7 +849184,7 @@ index 0000000000000000000000000000000000000000..6a521cab9f940921808da22ecba95ca3 +#endif /* BCMPCIE */ 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 -index 0000000000000000000000000000000000000000..53a856f04f4c8b1abe475c8a45a3bc50c90300cb +index 000000000..53a856f04 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.h @@ -0,0 +1,156 @@ @@ -849354,7 +849346,7 @@ index 0000000000000000000000000000000000000000..53a856f04f4c8b1abe475c8a45a3bc50 +#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 -index 0000000000000000000000000000000000000000..72a4f66877e20f705f59b3c8525f30619ed5bfa8 +index 000000000..72a4f6687 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_platdev.c @@ -0,0 +1,1293 @@ @@ -850653,7 +850645,7 @@ index 0000000000000000000000000000000000000000..72a4f66877e20f705f59b3c8525f3061 +} 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 -index 0000000000000000000000000000000000000000..029217a885f48799697dfb991ef11c004abfca93 +index 000000000..029217a88 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_priv.h @@ -0,0 +1,550 @@ @@ -851209,7 +851201,7 @@ index 0000000000000000000000000000000000000000..029217a885f48799697dfb991ef11c00 +#endif /* __DHD_LINUX_PRIV_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_rx.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_rx.c new file mode 100755 -index 0000000000000000000000000000000000000000..7b5fda9e8d4c834087f0e2411604ebf9c3960f71 +index 000000000..7b5fda9e8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_rx.c @@ -0,0 +1,1691 @@ @@ -852906,7 +852898,7 @@ index 0000000000000000000000000000000000000000..7b5fda9e8d4c834087f0e2411604ebf9 +#endif /* RX_PKT_POOL */ 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 -index 0000000000000000000000000000000000000000..4735c4bda897aeaefa596d4d347762ef2d8d6749 +index 000000000..4735c4bda --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sched.c @@ -0,0 +1,60 @@ @@ -852972,7 +852964,7 @@ index 0000000000000000000000000000000000000000..4735c4bda897aeaefa596d4d347762ef +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sock_qos.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sock_qos.h new file mode 100755 -index 0000000000000000000000000000000000000000..f6745d80c1c12d5ec3fd5bee0377da9258688468 +index 000000000..f6745d80c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sock_qos.h @@ -0,0 +1,76 @@ @@ -853054,7 +853046,7 @@ index 0000000000000000000000000000000000000000..f6745d80c1c12d5ec3fd5bee0377da92 +#endif /* _DHD_LINUX_TPA_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_tx.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_tx.c new file mode 100755 -index 0000000000000000000000000000000000000000..fc3b2e64bb07397a68c2a48fdf4bc6db54ab35e1 +index 000000000..fc3b2e64b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_tx.c @@ -0,0 +1,1290 @@ @@ -854350,7 +854342,7 @@ index 0000000000000000000000000000000000000000..fc3b2e64bb07397a68c2a48fdf4bc6db +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_tx.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_tx.h new file mode 100755 -index 0000000000000000000000000000000000000000..1484f7b5c31b7e61146e75f2fa1d6e72abab43e0 +index 000000000..1484f7b5c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_tx.h @@ -0,0 +1,49 @@ @@ -854405,7 +854397,7 @@ index 0000000000000000000000000000000000000000..1484f7b5c31b7e61146e75f2fa1d6e72 +#endif /* _dhd_linux_tx_h_ */ 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 -index 0000000000000000000000000000000000000000..c642853ff081bac98539ed63ef769f1e9d9a2b88 +index 000000000..c642853ff --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.c @@ -0,0 +1,413 @@ @@ -854824,7 +854816,7 @@ index 0000000000000000000000000000000000000000..c642853ff081bac98539ed63ef769f1e +} 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 -index 0000000000000000000000000000000000000000..2c097e6c5753b7789d48bce465d264c82d8c80a5 +index 000000000..2c097e6c5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.h @@ -0,0 +1,88 @@ @@ -854918,7 +854910,7 @@ index 0000000000000000000000000000000000000000..2c097e6c5753b7789d48bce465d264c8 +#endif /* _dhd_linux_wq_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_log_dump.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_log_dump.c new file mode 100755 -index 0000000000000000000000000000000000000000..cb8fd58838df2e0716c18e35c506fbee3aa946d2 +index 000000000..cb8fd5883 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_log_dump.c @@ -0,0 +1,2480 @@ @@ -857404,7 +857396,7 @@ index 0000000000000000000000000000000000000000..cb8fd58838df2e0716c18e35c506fbee +#endif /* DHD_LOG_DUMP */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_log_dump.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_log_dump.h new file mode 100755 -index 0000000000000000000000000000000000000000..8c42d3f4e01048f241fbfda3b02ee32df6c8ef6e +index 000000000..8c42d3f4e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_log_dump.h @@ -0,0 +1,402 @@ @@ -857812,7 +857804,7 @@ index 0000000000000000000000000000000000000000..8c42d3f4e01048f241fbfda3b02ee32d +#endif /* !__DHD_LOG_DUMP_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 -index 0000000000000000000000000000000000000000..167fa19e08fcc2a5301ac770933e57c687b52e0d +index 000000000..167fa19e0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.c @@ -0,0 +1,796 @@ @@ -858614,7 +858606,7 @@ index 0000000000000000000000000000000000000000..167fa19e08fcc2a5301ac770933e57c6 +#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 -index 0000000000000000000000000000000000000000..533b4ebd5119c5e4318e36fed0957769fb6901c9 +index 000000000..533b4ebd5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.h @@ -0,0 +1,36 @@ @@ -858656,7 +858648,7 @@ index 0000000000000000000000000000000000000000..533b4ebd5119c5e4318e36fed0957769 +#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 -index 0000000000000000000000000000000000000000..55773b2c9e13ad71482c188bc291de276c6bd166 +index 000000000..55773b2c9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_msgbuf.c @@ -0,0 +1,14788 @@ @@ -873450,7 +873442,7 @@ index 0000000000000000000000000000000000000000..55773b2c9e13ad71482c188bc291de27 +#endif /* DHD_FLOW_RING_STATUS_TRACE */ 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 -index 0000000000000000000000000000000000000000..b6dbf528d27d58b14b891f220e7b9b5d8e0987c2 +index 000000000..b6dbf528d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.c @@ -0,0 +1,18309 @@ @@ -891765,7 +891757,7 @@ index 0000000000000000000000000000000000000000..b6dbf528d27d58b14b891f220e7b9b5d +} 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 -index 0000000000000000000000000000000000000000..68a1009129609cb25343725180db6181ce0bc1d4 +index 000000000..68a100912 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.h @@ -0,0 +1,940 @@ @@ -892711,7 +892703,7 @@ index 0000000000000000000000000000000000000000..68a1009129609cb25343725180db6181 +#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 -index 0000000000000000000000000000000000000000..db604d27462d73970c8fb39103ad1683fe81f5dd +index 000000000..db604d274 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie_linux.c @@ -0,0 +1,3114 @@ @@ -895831,7 +895823,7 @@ index 0000000000000000000000000000000000000000..db604d27462d73970c8fb39103ad1683 +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pktlog.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pktlog.c new file mode 100755 -index 0000000000000000000000000000000000000000..f6d240d9884f94ae14094393dd176b2c092fd589 +index 000000000..f6d240d98 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pktlog.c @@ -0,0 +1,2047 @@ @@ -897884,7 +897876,7 @@ index 0000000000000000000000000000000000000000..f6d240d9884f94ae14094393dd176b2c +#endif /* DHD_PKT_LOGGING */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pktlog.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pktlog.h new file mode 100755 -index 0000000000000000000000000000000000000000..f4f9f26681f665db39a36e15f108d807762093cb +index 000000000..f4f9f2668 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pktlog.h @@ -0,0 +1,325 @@ @@ -898215,7 +898207,7 @@ index 0000000000000000000000000000000000000000..f4f9f26681f665db39a36e15f108d807 +#endif /* __DHD_PKTLOG_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_plat.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_plat.h new file mode 100755 -index 0000000000000000000000000000000000000000..ec19a28efc7808b6e7321fa3b7e27f655fd741ff +index 000000000..ec19a28ef --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_plat.h @@ -0,0 +1,103 @@ @@ -898324,7 +898316,7 @@ index 0000000000000000000000000000000000000000..ec19a28efc7808b6e7321fa3b7e27f65 +#endif /* __DHD_PLAT_H__ */ 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 -index 0000000000000000000000000000000000000000..cfd7e4e01b2ae98e13fdc69fd01db20ebda22392 +index 000000000..cfd7e4e01 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.c @@ -0,0 +1,4905 @@ @@ -903235,7 +903227,7 @@ index 0000000000000000000000000000000000000000..cfd7e4e01b2ae98e13fdc69fd01db20e +#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 -index 0000000000000000000000000000000000000000..bec41c3ea32540272835ae14bdf64ad9ce25713f +index 000000000..bec41c3ea --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.h @@ -0,0 +1,581 @@ @@ -903822,7 +903814,7 @@ index 0000000000000000000000000000000000000000..bec41c3ea32540272835ae14bdf64ad9 +#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 -index 0000000000000000000000000000000000000000..6241da7dc067031753f8a8f01ae20cfdc74f5ae8 +index 000000000..6241da7dc --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_proto.h @@ -0,0 +1,272 @@ @@ -904100,7 +904092,7 @@ index 0000000000000000000000000000000000000000..6241da7dc067031753f8a8f01ae20cfd +#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 -index 0000000000000000000000000000000000000000..d3bcbdf3fe58f82ee16b382bf4d9152a1f2c7687 +index 000000000..d3bcbdf3f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.c @@ -0,0 +1,5560 @@ @@ -909666,7 +909658,7 @@ index 0000000000000000000000000000000000000000..d3bcbdf3fe58f82ee16b382bf4d9152a +} 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 -index 0000000000000000000000000000000000000000..6fb3500771d7e865b1ea8b33ae2b4f8ac5604151 +index 000000000..6fb350077 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.h @@ -0,0 +1,563 @@ @@ -910235,7 +910227,7 @@ index 0000000000000000000000000000000000000000..6fb3500771d7e865b1ea8b33ae2b4f8a +#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 -index 0000000000000000000000000000000000000000..b0fd358e7b04767ee3e34ea88a2c5e19540ee5bb +index 000000000..b0fd358e7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_sdio.c @@ -0,0 +1,12428 @@ @@ -922669,7 +922661,7 @@ index 0000000000000000000000000000000000000000..b0fd358e7b04767ee3e34ea88a2c5e19 +} 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 -index 0000000000000000000000000000000000000000..edb2a4a92fa67ea39adac0e4c98ccd6ed157d190 +index 000000000..edb2a4a92 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_static_buf.c @@ -0,0 +1,654 @@ @@ -923329,7 +923321,7 @@ index 0000000000000000000000000000000000000000..edb2a4a92fa67ea39adac0e4c98ccd6e +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_statlog.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_statlog.c new file mode 100755 -index 0000000000000000000000000000000000000000..396cbcd0edf6aa11685a0b6fa054d449a11079bf +index 000000000..396cbcd0e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_statlog.c @@ -0,0 +1,1081 @@ @@ -924416,7 +924408,7 @@ index 0000000000000000000000000000000000000000..396cbcd0edf6aa11685a0b6fa054d449 +#endif /* DHD_STATUS_LOGGING */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_statlog.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_statlog.h new file mode 100755 -index 0000000000000000000000000000000000000000..04e7340fef8f4365c74471032f5181cc50c59eea +index 000000000..04e7340fe --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_statlog.h @@ -0,0 +1,221 @@ @@ -924643,7 +924635,7 @@ index 0000000000000000000000000000000000000000..04e7340fef8f4365c74471032f5181cc +#endif /* __DHD_STATLOG_H_ */ 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 -index 0000000000000000000000000000000000000000..a27156026ff1436dadf111fbe0ec7947d42fe836 +index 000000000..a27156026 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.c @@ -0,0 +1,4783 @@ @@ -929432,7 +929424,7 @@ index 0000000000000000000000000000000000000000..a27156026ff1436dadf111fbe0ec7947 +#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 -index 0000000000000000000000000000000000000000..aac58fe89e031f43520981e989ec1a1a68d0e3cb +index 000000000..aac58fe89 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.h @@ -0,0 +1,585 @@ @@ -930023,7 +930015,7 @@ index 0000000000000000000000000000000000000000..aac58fe89e031f43520981e989ec1a1a +#endif /* __wlfc_host_driver_definitions_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 -index 0000000000000000000000000000000000000000..e11b78a27d1607c459c0f6495ad2a90a75afe62b +index 000000000..e11b78a27 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.c @@ -0,0 +1,183 @@ @@ -930212,7 +930204,7 @@ index 0000000000000000000000000000000000000000..e11b78a27d1607c459c0f6495ad2a90a +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/fwpkg_utils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/fwpkg_utils.c new file mode 100755 -index 0000000000000000000000000000000000000000..0855780562c54b272503f14f61eafda65dd1fb62 +index 000000000..085578056 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/fwpkg_utils.c @@ -0,0 +1,391 @@ @@ -930609,7 +930601,7 @@ index 0000000000000000000000000000000000000000..0855780562c54b272503f14f61eafda6 +} 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 -index 0000000000000000000000000000000000000000..57a330d735ec89d430fa6ef52d8ab65e1521f54a +index 000000000..57a330d73 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktpool.c @@ -0,0 +1,2341 @@ @@ -932956,7 +932948,7 @@ index 0000000000000000000000000000000000000000..57a330d735ec89d430fa6ef52d8ab65e +#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 -index 0000000000000000000000000000000000000000..2248c57c74fa655e3ad841a69ff16ac84c4c4fe2 +index 000000000..2248c57c7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktq.c @@ -0,0 +1,1650 @@ @@ -934612,7 +934604,7 @@ index 0000000000000000000000000000000000000000..2248c57c74fa655e3ad841a69ff16ac8 +#endif /* HND_PKTQ_THREAD_SAFE */ 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 -index 0000000000000000000000000000000000000000..d8b0c954a91e4c472ebb6ce15c0d72ac56decaba +index 000000000..d8b0c954a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndpmu.c @@ -0,0 +1,9955 @@ @@ -944573,7 +944565,7 @@ index 0000000000000000000000000000000000000000..d8b0c954a91e4c472ebb6ce15c0d72ac +} 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 -index 0000000000000000000000000000000000000000..3404aac0a397b5fae7828d738489efb5aa2fde3f +index 000000000..3404aac0a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11.h @@ -0,0 +1,2489 @@ @@ -947068,7 +947060,7 @@ index 0000000000000000000000000000000000000000..3404aac0a397b5fae7828d738489efb5 +#endif /* _802_11_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11ac.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11ac.h new file mode 100755 -index 0000000000000000000000000000000000000000..8d40684ace42e58d56bd915d4ef19c5b1da96ee8 +index 000000000..8d40684ac --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11ac.h @@ -0,0 +1,487 @@ @@ -947561,7 +947553,7 @@ index 0000000000000000000000000000000000000000..8d40684ace42e58d56bd915d4ef19c5b +#endif /* _802_11ac_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11ah.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11ah.h new file mode 100755 -index 0000000000000000000000000000000000000000..6e30f3a2121862e6d5fb19b87dd5e93e24a3fa99 +index 000000000..6e30f3a21 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11ah.h @@ -0,0 +1,281 @@ @@ -947848,7 +947840,7 @@ index 0000000000000000000000000000000000000000..6e30f3a2121862e6d5fb19b87dd5e93e +#endif /* _802_11ah_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11ax.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11ax.h new file mode 100755 -index 0000000000000000000000000000000000000000..15672ade9e3444bf0d6ccc3225c292279e1945a2 +index 000000000..15672ade9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11ax.h @@ -0,0 +1,1201 @@ @@ -949055,7 +949047,7 @@ index 0000000000000000000000000000000000000000..15672ade9e3444bf0d6ccc3225c29227 +#endif /* _802_11ax_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11az.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11az.h new file mode 100755 -index 0000000000000000000000000000000000000000..d9fdf0e3ab610aa53927df756400aa66449bd84c +index 000000000..d9fdf0e3a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11az.h @@ -0,0 +1,637 @@ @@ -949698,7 +949690,7 @@ index 0000000000000000000000000000000000000000..d9fdf0e3ab610aa53927df756400aa66 +#endif /* _802_11az_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11brcm.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11brcm.h new file mode 100755 -index 0000000000000000000000000000000000000000..040d1c25a1d0aa9929ce255f42532626ab70439b +index 000000000..040d1c25a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11brcm.h @@ -0,0 +1,348 @@ @@ -950052,7 +950044,7 @@ index 0000000000000000000000000000000000000000..040d1c25a1d0aa9929ce255f42532626 +#endif /* _802_11brcm_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11cust.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11cust.h new file mode 100755 -index 0000000000000000000000000000000000000000..7cbe2fc4f6ba4396af4aa8a6031ccc1b5d67189c +index 000000000..7cbe2fc4f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11cust.h @@ -0,0 +1,76 @@ @@ -950134,7 +950126,7 @@ index 0000000000000000000000000000000000000000..7cbe2fc4f6ba4396af4aa8a6031ccc1b +#endif /* _802_11cust_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11k.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11k.h new file mode 100755 -index 0000000000000000000000000000000000000000..7439c8206dca555db48fce6e94c5863d00ebd3cb +index 000000000..7439c8206 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11k.h @@ -0,0 +1,928 @@ @@ -951068,7 +951060,7 @@ index 0000000000000000000000000000000000000000..7439c8206dca555db48fce6e94c5863d +#endif /* _802_11k_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11n.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11n.h new file mode 100755 -index 0000000000000000000000000000000000000000..e86dd0f644e1074a79dbaa7831b540a7a4b9027c +index 000000000..e86dd0f64 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11n.h @@ -0,0 +1,384 @@ @@ -951458,7 +951450,7 @@ index 0000000000000000000000000000000000000000..e86dd0f644e1074a79dbaa7831b540a7 +#endif /* _802_11n_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11owe.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11owe.h new file mode 100755 -index 0000000000000000000000000000000000000000..2af77fbef570a458f5169688d8c4a4abfee984a8 +index 000000000..2af77fbef --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11owe.h @@ -0,0 +1,62 @@ @@ -951526,7 +951518,7 @@ index 0000000000000000000000000000000000000000..2af77fbef570a458f5169688d8c4a4ab +#endif /* _802_11owe_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 -index 0000000000000000000000000000000000000000..6ddbde466a66d32aa1fb809d31be88ecd6e09bcc +index 000000000..6ddbde466 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11s.h @@ -0,0 +1,316 @@ @@ -951848,7 +951840,7 @@ index 0000000000000000000000000000000000000000..6ddbde466a66d32aa1fb809d31be88ec +#endif /* #ifndef _802_11s_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11u.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11u.h new file mode 100755 -index 0000000000000000000000000000000000000000..11852217d6adef885d3bc11966eb084fd26e3728 +index 000000000..11852217d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11u.h @@ -0,0 +1,200 @@ @@ -952054,7 +952046,7 @@ index 0000000000000000000000000000000000000000..11852217d6adef885d3bc11966eb084f +#endif /* _802_11u_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11v.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11v.h new file mode 100755 -index 0000000000000000000000000000000000000000..88b407fdb3fadb5f9b31edf0d19ba7587eae0dee +index 000000000..88b407fdb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11v.h @@ -0,0 +1,794 @@ @@ -952854,7 +952846,7 @@ index 0000000000000000000000000000000000000000..88b407fdb3fadb5f9b31edf0d19ba758 +#endif /* _802_11v_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11w.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11w.h new file mode 100755 -index 0000000000000000000000000000000000000000..1d46d71b7d9e063474f4a7c7ea66f34394b9e4b3 +index 000000000..1d46d71b7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11w.h @@ -0,0 +1,50 @@ @@ -952910,7 +952902,7 @@ index 0000000000000000000000000000000000000000..1d46d71b7d9e063474f4a7c7ea66f343 +#endif /* _802_11w_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11wapi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11wapi.h new file mode 100755 -index 0000000000000000000000000000000000000000..4f089907861956ac7d49459edfff1c2fccbe3e47 +index 000000000..4f0899078 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11wapi.h @@ -0,0 +1,70 @@ @@ -952986,7 +952978,7 @@ index 0000000000000000000000000000000000000000..4f089907861956ac7d49459edfff1c2f +#endif /* _802_11wapi_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11wfa.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11wfa.h new file mode 100755 -index 0000000000000000000000000000000000000000..39d91e610963877af95c7bd56e2c117ff6d4d050 +index 000000000..39d91e610 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11wfa.h @@ -0,0 +1,245 @@ @@ -953237,7 +953229,7 @@ index 0000000000000000000000000000000000000000..39d91e610963877af95c7bd56e2c117f +#endif /* _802_11wfa_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11z.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11z.h new file mode 100755 -index 0000000000000000000000000000000000000000..125f4ccd1810bcba69056ac03c06885783fa0ab4 +index 000000000..125f4ccd1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11z.h @@ -0,0 +1,142 @@ @@ -953385,7 +953377,7 @@ index 0000000000000000000000000000000000000000..125f4ccd1810bcba69056ac03c068857 +#endif /* _802_11z_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 -index 0000000000000000000000000000000000000000..45a94c0f98a88d7bc923a9c385fc21f160bdeccb +index 000000000..45a94c0f9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.1d.h @@ -0,0 +1,47 @@ @@ -953438,7 +953430,7 @@ index 0000000000000000000000000000000000000000..45a94c0f98a88d7bc923a9c385fc21f1 +#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 -index 0000000000000000000000000000000000000000..263e9e793f9cc03d966c5b67b8a894441384fb0c +index 000000000..263e9e793 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.3.h @@ -0,0 +1,49 @@ @@ -953493,7 +953485,7 @@ index 0000000000000000000000000000000000000000..263e9e793f9cc03d966c5b67b8a89444 +#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 -index 0000000000000000000000000000000000000000..d76c8881e8e13665576a396011d0e60406b335c1 +index 000000000..d76c8881e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/aidmp.h @@ -0,0 +1,438 @@ @@ -953937,7 +953929,7 @@ index 0000000000000000000000000000000000000000..d76c8881e8e13665576a396011d0e604 +#endif /* _AIDMP_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 -index 0000000000000000000000000000000000000000..a19fc20052f0a070b37da135ee22e55e31a6cd3d +index 000000000..a19fc2005 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_mpool_pub.h @@ -0,0 +1,344 @@ @@ -954287,7 +954279,7 @@ index 0000000000000000000000000000000000000000..a19fc20052f0a070b37da135ee22e55e +#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 -index 0000000000000000000000000000000000000000..fc45bf48f3b2353a7165453bac2126c4bdd4e468 +index 000000000..fc45bf48f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_ring.h @@ -0,0 +1,585 @@ @@ -954878,7 +954870,7 @@ index 0000000000000000000000000000000000000000..fc45bf48f3b2353a7165453bac2126c4 +#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 -index 0000000000000000000000000000000000000000..21f5e2463ec4bd3b53be4283de42796cf83cc315 +index 000000000..21f5e2463 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmarp.h @@ -0,0 +1,84 @@ @@ -954968,7 +954960,7 @@ index 0000000000000000000000000000000000000000..21f5e2463ec4bd3b53be4283de42796c +#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 -index 0000000000000000000000000000000000000000..a978d4d45d01354e349cd48dad198670543ad18f +index 000000000..a978d4d45 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmbloom.h @@ -0,0 +1,73 @@ @@ -955047,7 +955039,7 @@ index 0000000000000000000000000000000000000000..a978d4d45d01354e349cd48dad198670 +#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 -index 0000000000000000000000000000000000000000..ed029055f99017e257f43446df5f0105745d510d +index 000000000..ed029055f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmcdc.h @@ -0,0 +1,115 @@ @@ -955168,7 +955160,7 @@ index 0000000000000000000000000000000000000000..ed029055f99017e257f43446df5f0105 +#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 -index 0000000000000000000000000000000000000000..19b907f44225bcb3bb12ed4238379a5fa7cb7cd1 +index 000000000..19b907f44 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdefs.h @@ -0,0 +1,1063 @@ @@ -956237,7 +956229,7 @@ index 0000000000000000000000000000000000000000..19b907f44225bcb3bb12ed4238379a5f +#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 -index 0000000000000000000000000000000000000000..8dddde5024ae98044f5b42064a20a32e27b50c25 +index 000000000..8dddde502 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdevs.h @@ -0,0 +1,660 @@ @@ -956903,7 +956895,7 @@ index 0000000000000000000000000000000000000000..8dddde5024ae98044f5b42064a20a32e +#endif /* _BCMDEVS_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdevs_legacy.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdevs_legacy.h new file mode 100755 -index 0000000000000000000000000000000000000000..11632968fb513d457356eb68e476294c29740a37 +index 000000000..11632968f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdevs_legacy.h @@ -0,0 +1,164 @@ @@ -957073,7 +957065,7 @@ index 0000000000000000000000000000000000000000..11632968fb513d457356eb68e476294c +#endif /* _bcmdevs_legacy_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 -index 0000000000000000000000000000000000000000..6f89292fab6d0e5ad43dbff4ed7559fa351f0b1f +index 000000000..6f89292fa --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdhcp.h @@ -0,0 +1,88 @@ @@ -957167,7 +957159,7 @@ index 0000000000000000000000000000000000000000..6f89292fab6d0e5ad43dbff4ed7559fa +#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 -index 0000000000000000000000000000000000000000..82968b4592c2b643c0744705145ce0dbc6131523 +index 000000000..82968b459 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmendian.h @@ -0,0 +1,451 @@ @@ -957624,7 +957616,7 @@ index 0000000000000000000000000000000000000000..82968b4592c2b643c0744705145ce0db +#endif /* !_BCMENDIAN_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmerror.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmerror.h new file mode 100755 -index 0000000000000000000000000000000000000000..836e6ce59730eed2828d96c2e1cd943e7095f6ab +index 000000000..836e6ce59 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmerror.h @@ -0,0 +1,911 @@ @@ -958541,7 +958533,7 @@ index 0000000000000000000000000000000000000000..836e6ce59730eed2828d96c2e1cd943e +#endif /* _bcmerror_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 -index 0000000000000000000000000000000000000000..814691053572f08fe68c14540272aee4c757448b +index 000000000..814691053 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmeth.h @@ -0,0 +1,109 @@ @@ -958656,7 +958648,7 @@ index 0000000000000000000000000000000000000000..814691053572f08fe68c14540272aee4 +#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 -index 0000000000000000000000000000000000000000..6ff269d01ac076734758df8fb3a096b5b5ffc6c2 +index 000000000..6ff269d01 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmevent.h @@ -0,0 +1,1794 @@ @@ -960456,7 +960448,7 @@ index 0000000000000000000000000000000000000000..6ff269d01ac076734758df8fb3a096b5 +#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 -index 0000000000000000000000000000000000000000..3a58a850617a5a387508227cfc69baf11a357227 +index 000000000..3a58a8506 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmicmp.h @@ -0,0 +1,83 @@ @@ -960545,7 +960537,7 @@ index 0000000000000000000000000000000000000000..3a58a850617a5a387508227cfc69baf1 +#endif /* #ifndef _bcmicmp_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmigmp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmigmp.h new file mode 100755 -index 0000000000000000000000000000000000000000..559c964b86cbafff42aac9a73767cd8abd9632c5 +index 000000000..559c964b8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmigmp.h @@ -0,0 +1,74 @@ @@ -960625,7 +960617,7 @@ index 0000000000000000000000000000000000000000..559c964b86cbafff42aac9a73767cd8a +#endif /* #ifndef _bcmigmp_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 -index 0000000000000000000000000000000000000000..3e5a6fa2ad6f5b884c571b08395d25955d020848 +index 000000000..3e5a6fa2a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmiov.h @@ -0,0 +1,439 @@ @@ -961070,7 +961062,7 @@ index 0000000000000000000000000000000000000000..3e5a6fa2ad6f5b884c571b08395d2595 +#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 -index 0000000000000000000000000000000000000000..7eb5736f5ab2d57cd162fc8ac3fad406aa7e9669 +index 000000000..7eb5736f5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmip.h @@ -0,0 +1,299 @@ @@ -961375,7 +961367,7 @@ index 0000000000000000000000000000000000000000..7eb5736f5ab2d57cd162fc8ac3fad406 +#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 -index 0000000000000000000000000000000000000000..fbeb8ce3c36909650a5f2ea063d92ef1145109f5 +index 000000000..fbeb8ce3c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmipv6.h @@ -0,0 +1,160 @@ @@ -961541,7 +961533,7 @@ index 0000000000000000000000000000000000000000..fbeb8ce3c36909650a5f2ea063d92ef1 +#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 -index 0000000000000000000000000000000000000000..884d79506a4192fabdaf40d68d2801493ad8f075 +index 000000000..884d79506 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmmsgbuf.h @@ -0,0 +1,1705 @@ @@ -963252,7 +963244,7 @@ index 0000000000000000000000000000000000000000..884d79506a4192fabdaf40d68d280149 +#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 -index 0000000000000000000000000000000000000000..0ad290aa6c0b454758eb1de3e8986323132484ea +index 000000000..0ad290aa6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmnvram.h @@ -0,0 +1,162 @@ @@ -963420,7 +963412,7 @@ index 0000000000000000000000000000000000000000..0ad290aa6c0b454758eb1de3e8986323 +#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 -index 0000000000000000000000000000000000000000..b0796d96a042cc551270d291d4b4bbce36c80ba6 +index 000000000..b0796d96a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcie.h @@ -0,0 +1,614 @@ @@ -964040,7 +964032,7 @@ index 0000000000000000000000000000000000000000..b0796d96a042cc551270d291d4b4bbce +#endif /* _bcmpcie_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 -index 0000000000000000000000000000000000000000..8bc2d0ebbbe78f95e2da3f145d6bf0cda270cfed +index 000000000..8bc2d0ebb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmperf.h @@ -0,0 +1,33 @@ @@ -964079,7 +964071,7 @@ index 0000000000000000000000000000000000000000..8bc2d0ebbbe78f95e2da3f145d6bf0cd +#endif /* _BCMPERF_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmproto.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmproto.h new file mode 100755 -index 0000000000000000000000000000000000000000..afc4616a30da0878d6423da44a7204e284b138fe +index 000000000..afc4616a3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmproto.h @@ -0,0 +1,275 @@ @@ -964360,7 +964352,7 @@ index 0000000000000000000000000000000000000000..afc4616a30da0878d6423da44a7204e2 +#endif /* _bcmproto_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmrand.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmrand.h new file mode 100755 -index 0000000000000000000000000000000000000000..b2fdf820ff647883bfbd7bfd414d3a59288f1921 +index 000000000..b2fdf820f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmrand.h @@ -0,0 +1,65 @@ @@ -964431,7 +964423,7 @@ index 0000000000000000000000000000000000000000..b2fdf820ff647883bfbd7bfd414d3a59 +#endif /* _bcmrand_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 -index 0000000000000000000000000000000000000000..6f265a8f1c1d4cd5ff32a17578806b241a3ea673 +index 000000000..6f265a8f1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdbus.h @@ -0,0 +1,187 @@ @@ -964624,7 +964616,7 @@ index 0000000000000000000000000000000000000000..6f265a8f1c1d4cd5ff32a17578806b24 +#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 -index 0000000000000000000000000000000000000000..27417dcb1b0baf1a54297383f262c5998c2c4c23 +index 000000000..27417dcb1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh.h @@ -0,0 +1,298 @@ @@ -964928,7 +964920,7 @@ index 0000000000000000000000000000000000000000..27417dcb1b0baf1a54297383f262c599 +#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 -index 0000000000000000000000000000000000000000..989e0a4eda5bf8429ea67be74afee1d5208a364e +index 000000000..989e0a4ed --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh_sdmmc.h @@ -0,0 +1,135 @@ @@ -965069,7 +965061,7 @@ index 0000000000000000000000000000000000000000..989e0a4eda5bf8429ea67be74afee1d5 +#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 -index 0000000000000000000000000000000000000000..173e100a2b3dfa22d3c51907f9672fe1d55ff449 +index 000000000..173e100a2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdpcm.h @@ -0,0 +1,304 @@ @@ -965379,7 +965371,7 @@ index 0000000000000000000000000000000000000000..173e100a2b3dfa22d3c51907f9672fe1 +#endif /* _bcmsdpcm_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 -index 0000000000000000000000000000000000000000..a9fd1695efdc3c43ea2628176b764bba1e03e6af +index 000000000..a9fd1695e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_fmt.h @@ -0,0 +1,1028 @@ @@ -966413,7 +966405,7 @@ index 0000000000000000000000000000000000000000..a9fd1695efdc3c43ea2628176b764bba +#endif /* _bcmsrom_fmt_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 -index 0000000000000000000000000000000000000000..c70493353a9cf33341592eae7a6f6706d667b8c3 +index 000000000..c70493353 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmstdlib_s.h @@ -0,0 +1,54 @@ @@ -966473,7 +966465,7 @@ index 0000000000000000000000000000000000000000..c70493353a9cf33341592eae7a6f6706 +#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 -index 0000000000000000000000000000000000000000..804026bd14f68ae4d543cae0f3caffc34b66b442 +index 000000000..804026bd1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtcp.h @@ -0,0 +1,86 @@ @@ -966565,7 +966557,7 @@ index 0000000000000000000000000000000000000000..804026bd14f68ae4d543cae0f3caffc3 +#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 -index 0000000000000000000000000000000000000000..7a9fbab17ae41e2cd08e554a34e3577a7f633268 +index 000000000..7a9fbab17 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtlv.h @@ -0,0 +1,382 @@ @@ -966953,7 +966945,7 @@ index 0000000000000000000000000000000000000000..7a9fbab17ae41e2cd08e554a34e3577a +#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 -index 0000000000000000000000000000000000000000..8e4405afa85d85d7c698898502e9475f30adb024 +index 000000000..8e4405afa --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmudp.h @@ -0,0 +1,54 @@ @@ -967013,7 +967005,7 @@ index 0000000000000000000000000000000000000000..8e4405afa85d85d7c698898502e9475f +#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 -index 0000000000000000000000000000000000000000..558345d57f09ae360909975cf095c8937458b120 +index 000000000..558345d57 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmutils.h @@ -0,0 +1,1613 @@ @@ -968632,7 +968624,7 @@ index 0000000000000000000000000000000000000000..558345d57f09ae360909975cf095c893 +#endif /* _bcmutils_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_channels.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_channels.h new file mode 100755 -index 0000000000000000000000000000000000000000..ccbe138e93c79077067bf5e33c9964c213d6e8f6 +index 000000000..ccbe138e9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_channels.h @@ -0,0 +1,906 @@ @@ -969544,7 +969536,7 @@ index 0000000000000000000000000000000000000000..ccbe138e93c79077067bf5e33c9964c2 +#endif /* _bcmwifi_channels_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_radiotap.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_radiotap.h new file mode 100755 -index 0000000000000000000000000000000000000000..d90b5af7ec77157d0582ce545b0d47568e6be77c +index 000000000..d90b5af7e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_radiotap.h @@ -0,0 +1,382 @@ @@ -969932,7 +969924,7 @@ index 0000000000000000000000000000000000000000..d90b5af7ec77157d0582ce545b0d4756 +#endif /* _BCMWIFI_RADIOTAP_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_rates.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_rates.h new file mode 100755 -index 0000000000000000000000000000000000000000..36b6e72b8a474aa415f06cc5c707183cd8378a62 +index 000000000..36b6e72b8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_rates.h @@ -0,0 +1,1262 @@ @@ -971200,7 +971192,7 @@ index 0000000000000000000000000000000000000000..36b6e72b8a474aa415f06cc5c707183c +#endif /* _bcmwifi_rates_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_rspec.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_rspec.h new file mode 100755 -index 0000000000000000000000000000000000000000..7ab1f093ca48c2748347107995ddc4a592056699 +index 000000000..7ab1f093c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_rspec.h @@ -0,0 +1,286 @@ @@ -971492,7 +971484,7 @@ index 0000000000000000000000000000000000000000..7ab1f093ca48c2748347107995ddc4a5 +#endif /* _bcmwifi_rspec_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bootrommem.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bootrommem.h new file mode 100755 -index 0000000000000000000000000000000000000000..ebebdab936511553a6b69653ceb9ca23ea127f0d +index 000000000..ebebdab93 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bootrommem.h @@ -0,0 +1,97 @@ @@ -971595,7 +971587,7 @@ index 0000000000000000000000000000000000000000..ebebdab936511553a6b69653ceb9ca23 +#endif /* _BOOTROMMEM_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 -index 0000000000000000000000000000000000000000..fb61d4596eb09e1b47c9ee296d6ea64fa9cbccbf +index 000000000..fb61d4596 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/brcm_nl80211.h @@ -0,0 +1,79 @@ @@ -971680,7 +971672,7 @@ index 0000000000000000000000000000000000000000..fb61d4596eb09e1b47c9ee296d6ea64f +#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 -index 0000000000000000000000000000000000000000..64f0636b0960104dfd72d7be8f6f471440033fe5 +index 000000000..64f0636b0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dbus.h @@ -0,0 +1,640 @@ @@ -972326,7 +972318,7 @@ index 0000000000000000000000000000000000000000..64f0636b0960104dfd72d7be8f6f4714 +#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 -index 0000000000000000000000000000000000000000..f71d029075400e19b9f191086f7e50037b13a3a0 +index 000000000..f71d02907 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhd_daemon.h @@ -0,0 +1,55 @@ @@ -972387,7 +972379,7 @@ index 0000000000000000000000000000000000000000..f71d029075400e19b9f191086f7e5003 +#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 -index 0000000000000000000000000000000000000000..dc558e21d4b9a70b005383ad13a9831fdb957ef0 +index 000000000..dc558e21d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhdioctl.h @@ -0,0 +1,450 @@ @@ -972843,7 +972835,7 @@ index 0000000000000000000000000000000000000000..dc558e21d4b9a70b005383ad13a9831f +#endif /* _dhdioctl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dngl_rtlv.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dngl_rtlv.h new file mode 100755 -index 0000000000000000000000000000000000000000..a1a14add605e53858222be973ff64c1d34472c3b +index 000000000..a1a14add6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dngl_rtlv.h @@ -0,0 +1,83 @@ @@ -972932,7 +972924,7 @@ index 0000000000000000000000000000000000000000..a1a14add605e53858222be973ff64c1d +#endif /* _dngl_rtlv_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dngl_stats.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dngl_stats.h new file mode 100755 -index 0000000000000000000000000000000000000000..0d38086b0f367eb39fb75358a313bcdc759fd1bb +index 000000000..0d38086b0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dngl_stats.h @@ -0,0 +1,43 @@ @@ -972981,7 +972973,7 @@ index 0000000000000000000000000000000000000000..0d38086b0f367eb39fb75358a313bcdc +#endif /* _dngl_stats_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 -index 0000000000000000000000000000000000000000..5cff81d5cba41ade8d73fc391cd5b7162b1971c0 +index 000000000..5cff81d5c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglevent.h @@ -0,0 +1,188 @@ @@ -973175,7 +973167,7 @@ index 0000000000000000000000000000000000000000..5cff81d5cba41ade8d73fc391cd5b716 +#endif /* _DNGLEVENT_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglioctl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglioctl.h new file mode 100755 -index 0000000000000000000000000000000000000000..4a9769a620850331a50f01197e1bcfb880932b39 +index 000000000..4a9769a62 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglioctl.h @@ -0,0 +1,177 @@ @@ -973358,7 +973350,7 @@ index 0000000000000000000000000000000000000000..4a9769a620850331a50f01197e1bcfb8 +#endif /* _dngl_ioctl_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 -index 0000000000000000000000000000000000000000..e170a338c817026577d3bf87460312d6343a8061 +index 000000000..e170a338c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/eapol.h @@ -0,0 +1,345 @@ @@ -973709,7 +973701,7 @@ index 0000000000000000000000000000000000000000..e170a338c817026577d3bf87460312d6 +#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 -index 0000000000000000000000000000000000000000..b7f91141cc900027c76b411e549c9bd69df86e39 +index 000000000..b7f91141c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/epivers.h @@ -0,0 +1,55 @@ @@ -973770,7 +973762,7 @@ index 0000000000000000000000000000000000000000..b7f91141cc900027c76b411e549c9bd6 +#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 -index 0000000000000000000000000000000000000000..9c97574ef71c80c689aef2c93b569a6c86c71103 +index 000000000..9c97574ef --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/etd.h @@ -0,0 +1,701 @@ @@ -974477,7 +974469,7 @@ index 0000000000000000000000000000000000000000..9c97574ef71c80c689aef2c93b569a6c +#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 -index 0000000000000000000000000000000000000000..a8e13bc084e018d618fd092f901ba252beb2cce8 +index 000000000..a8e13bc08 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/ethernet.h @@ -0,0 +1,265 @@ @@ -974748,7 +974740,7 @@ index 0000000000000000000000000000000000000000..a8e13bc084e018d618fd092f901ba252 +#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 -index 0000000000000000000000000000000000000000..c2b0ee25a49e0f224c8f78b14ea1cc5ad4a74b05 +index 000000000..c2b0ee25a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log.h @@ -0,0 +1,761 @@ @@ -975515,7 +975507,7 @@ index 0000000000000000000000000000000000000000..c2b0ee25a49e0f224c8f78b14ea1cc5a +#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 -index 0000000000000000000000000000000000000000..9c17e079841ff44655d10c016bf82cd0234158b6 +index 000000000..9c17e0798 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_payload.h @@ -0,0 +1,1545 @@ @@ -977066,7 +977058,7 @@ index 0000000000000000000000000000000000000000..9c17e079841ff44655d10c016bf82cd0 +#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 -index 0000000000000000000000000000000000000000..08f048cbd25948f6bd484ba9380a1b6423b64939 +index 000000000..08f048cbd --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_set.h @@ -0,0 +1,409 @@ @@ -977481,7 +977473,7 @@ index 0000000000000000000000000000000000000000..08f048cbd25948f6bd484ba9380a1b64 +#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 -index 0000000000000000000000000000000000000000..6490a12ba4831d3b927975c046c100eb2847325e +index 000000000..6490a12ba --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_tag.h @@ -0,0 +1,667 @@ @@ -978154,7 +978146,7 @@ index 0000000000000000000000000000000000000000..6490a12ba4831d3b927975c046c100eb +#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 -index 0000000000000000000000000000000000000000..e760301763ea6fb992e8b4c9eed3025fa4cc1927 +index 000000000..e76030176 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_trace.h @@ -0,0 +1,187 @@ @@ -978347,7 +978339,7 @@ index 0000000000000000000000000000000000000000..e760301763ea6fb992e8b4c9eed3025f +#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 -index 0000000000000000000000000000000000000000..935cd30f218b4d16c08767a1cde470407bf08013 +index 000000000..935cd30f2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/fils.h @@ -0,0 +1,466 @@ @@ -978819,7 +978811,7 @@ index 0000000000000000000000000000000000000000..935cd30f218b4d16c08767a1cde47040 +#endif /* __FILSAUTH_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/frag.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/frag.h new file mode 100755 -index 0000000000000000000000000000000000000000..f2f8abda89ec994e7111bc512d8c0184a5a3ccee +index 000000000..f2f8abda8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/frag.h @@ -0,0 +1,46 @@ @@ -978871,7 +978863,7 @@ index 0000000000000000000000000000000000000000..f2f8abda89ec994e7111bc512d8c0184 +#endif /* __FRAG_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/fwpkg_utils.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/fwpkg_utils.h new file mode 100755 -index 0000000000000000000000000000000000000000..899b4fa09c19196687e3d3a8ce5b36258424003e +index 000000000..899b4fa09 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/fwpkg_utils.h @@ -0,0 +1,80 @@ @@ -978957,7 +978949,7 @@ index 0000000000000000000000000000000000000000..899b4fa09c19196687e3d3a8ce5b3625 +#endif /* _fwpkg_utils_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 -index 0000000000000000000000000000000000000000..370ded15ed0a72d1699d5f26b7bdaf03047831b7 +index 000000000..370ded15e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_armtrap.h @@ -0,0 +1,86 @@ @@ -979049,7 +979041,7 @@ index 0000000000000000000000000000000000000000..370ded15ed0a72d1699d5f26b7bdaf03 +#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 -index 0000000000000000000000000000000000000000..5482c27cb0e664e3279660a487985c11f2c6f004 +index 000000000..5482c27cb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_cons.h @@ -0,0 +1,98 @@ @@ -979153,7 +979145,7 @@ index 0000000000000000000000000000000000000000..5482c27cb0e664e3279660a487985c11 +#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 -index 0000000000000000000000000000000000000000..141fc31654da4562b33b27d67943cbbb4a27daa3 +index 000000000..141fc3165 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_debug.h @@ -0,0 +1,253 @@ @@ -979412,7 +979404,7 @@ index 0000000000000000000000000000000000000000..141fc31654da4562b33b27d67943cbbb +#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 -index 0000000000000000000000000000000000000000..dcaeb648b9c4984354ff8da352d6278b7fc15ef3 +index 000000000..dcaeb648b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktpool.h @@ -0,0 +1,329 @@ @@ -979747,7 +979739,7 @@ index 0000000000000000000000000000000000000000..dcaeb648b9c4984354ff8da352d6278b +#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 -index 0000000000000000000000000000000000000000..cea32415c0303bbfcfa2277725bce227034a8476 +index 000000000..cea32415c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktq.h @@ -0,0 +1,335 @@ @@ -980088,7 +980080,7 @@ index 0000000000000000000000000000000000000000..cea32415c0303bbfcfa2277725bce227 +#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 -index 0000000000000000000000000000000000000000..47d6e8515702da4ed1ecf4c117fe725368672b98 +index 000000000..47d6e8515 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_trap.h @@ -0,0 +1,33 @@ @@ -980127,7 +980119,7 @@ index 0000000000000000000000000000000000000000..47d6e8515702da4ed1ecf4c117fe7253 +#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 -index 0000000000000000000000000000000000000000..38664c9d9e37656ca087a4f77ef8d8cb21562006 +index 000000000..38664c9d9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndchipc.h @@ -0,0 +1,47 @@ @@ -980180,7 +980172,7 @@ index 0000000000000000000000000000000000000000..38664c9d9e37656ca087a4f77ef8d8cb +#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 -index 0000000000000000000000000000000000000000..558aee07ce8c6e75cd83052060d6770dcac0fb43 +index 000000000..558aee07c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndlhl.h @@ -0,0 +1,94 @@ @@ -980280,7 +980272,7 @@ index 0000000000000000000000000000000000000000..558aee07ce8c6e75cd83052060d6770d +#endif /* _hndlhl_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 -index 0000000000000000000000000000000000000000..1fbb8742146229f640181c8f24ae6a3c3a863350 +index 000000000..1fbb87421 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndoobr.h @@ -0,0 +1,96 @@ @@ -980382,7 +980374,7 @@ index 0000000000000000000000000000000000000000..1fbb8742146229f640181c8f24ae6a3c +#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 -index 0000000000000000000000000000000000000000..2901ba1dc708e5bad87224c30a3353301d3bb828 +index 000000000..2901ba1dc --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndpmu.h @@ -0,0 +1,349 @@ @@ -980737,7 +980729,7 @@ index 0000000000000000000000000000000000000000..2901ba1dc708e5bad87224c30a335330 +#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 -index 0000000000000000000000000000000000000000..f2d9f59587a5ee065acbcc78f99f96db7ab78957 +index 000000000..f2d9f5958 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndsoc.h @@ -0,0 +1,353 @@ @@ -981096,7 +981088,7 @@ index 0000000000000000000000000000000000000000..f2d9f59587a5ee065acbcc78f99f96db +#endif /* _HNDSOC_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/ieee80211_radiotap.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/ieee80211_radiotap.h new file mode 100755 -index 0000000000000000000000000000000000000000..89e2021291c14104d268043df2a60dba2a1b5923 +index 000000000..89e202129 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/ieee80211_radiotap.h @@ -0,0 +1,415 @@ @@ -981517,7 +981509,7 @@ index 0000000000000000000000000000000000000000..89e2021291c14104d268043df2a60dba +#endif /* !_NET80211_IEEE80211_RADIOTAP_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 -index 0000000000000000000000000000000000000000..6f7afd539414c1478649e84fe4f8e6d86328eb25 +index 000000000..6f7afd539 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_osl.h @@ -0,0 +1,994 @@ @@ -982517,7 +982509,7 @@ index 0000000000000000000000000000000000000000..6f7afd539414c1478649e84fe4f8e6d8 +#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 -index 0000000000000000000000000000000000000000..fb4da88589c663ae04362eaaf50f88f17c2c6e1f +index 000000000..fb4da8858 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_pkt.h @@ -0,0 +1,443 @@ @@ -982966,7 +982958,7 @@ index 0000000000000000000000000000000000000000..fb4da88589c663ae04362eaaf50f88f1 +#endif /* _linux_pkt_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxerrmap.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxerrmap.h new file mode 100755 -index 0000000000000000000000000000000000000000..3cc5a012c36a1c2aa31fbd35cbd37d32a29a1567 +index 000000000..3cc5a012c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxerrmap.h @@ -0,0 +1,28 @@ @@ -983000,7 +982992,7 @@ index 0000000000000000000000000000000000000000..3cc5a012c36a1c2aa31fbd35cbd37d32 +#endif /* _linuxerrmap_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 -index 0000000000000000000000000000000000000000..d5bf94b412952028829799635f99f7a3c7b25747 +index 000000000..d5bf94b41 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxver.h @@ -0,0 +1,1068 @@ @@ -984074,7 +984066,7 @@ index 0000000000000000000000000000000000000000..d5bf94b412952028829799635f99f7a3 +#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 -index 0000000000000000000000000000000000000000..6ff882a14c194c5603ec80ff0dcebd46d520ff02 +index 000000000..6ff882a14 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/lpflags.h @@ -0,0 +1,39 @@ @@ -984119,7 +984111,7 @@ index 0000000000000000000000000000000000000000..6ff882a14c194c5603ec80ff0dcebd46 +#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 -index 0000000000000000000000000000000000000000..c9130a910d782290a99b43740ea9a4721ae907ba +index 000000000..c9130a910 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/mbo.h @@ -0,0 +1,281 @@ @@ -984406,7 +984398,7 @@ index 0000000000000000000000000000000000000000..c9130a910d782290a99b43740ea9a472 +#endif /* __MBO_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 -index 0000000000000000000000000000000000000000..46df878f9d8fa94e8cfe14edbce1f2ce1ea4a495 +index 000000000..46df878f9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msgtrace.h @@ -0,0 +1,59 @@ @@ -984471,7 +984463,7 @@ index 0000000000000000000000000000000000000000..46df878f9d8fa94e8cfe14edbce1f2ce +#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 -index 0000000000000000000000000000000000000000..3ced5eb92c7d73dff3e98e9935b34a53c762c7a0 +index 000000000..3ced5eb92 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/nan.h @@ -0,0 +1,1913 @@ @@ -986390,7 +986382,7 @@ index 0000000000000000000000000000000000000000..3ced5eb92c7d73dff3e98e9935b34a53 +#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 -index 0000000000000000000000000000000000000000..175a4ea621a851c9d1daa47baf238be6a8b99561 +index 000000000..175a4ea62 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl.h @@ -0,0 +1,530 @@ @@ -986926,7 +986918,7 @@ index 0000000000000000000000000000000000000000..175a4ea621a851c9d1daa47baf238be6 +#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 -index 0000000000000000000000000000000000000000..898fb0f9ca413596bc9bfbedb0aad71128f498e2 +index 000000000..898fb0f9c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_decl.h @@ -0,0 +1,31 @@ @@ -986963,7 +986955,7 @@ index 0000000000000000000000000000000000000000..898fb0f9ca413596bc9bfbedb0aad711 +#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 -index 0000000000000000000000000000000000000000..33084e3df4f493775e51e30f56d352056ab0aa79 +index 000000000..33084e3df --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_ext.h @@ -0,0 +1,759 @@ @@ -987728,7 +987720,7 @@ index 0000000000000000000000000000000000000000..33084e3df4f493775e51e30f56d35205 +#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 -index 0000000000000000000000000000000000000000..87d9057db402309b27f939b1dfdedb7de288ba47 +index 000000000..87d9057db --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/p2p.h @@ -0,0 +1,696 @@ @@ -988430,7 +988422,7 @@ index 0000000000000000000000000000000000000000..87d9057db402309b27f939b1dfdedb7d +#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 -index 0000000000000000000000000000000000000000..566b15c711241414ec4f2849d67e2e813c5f141d +index 000000000..566b15c71 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_end.h @@ -0,0 +1,62 @@ @@ -988498,7 +988490,7 @@ index 0000000000000000000000000000000000000000..566b15c711241414ec4f2849d67e2e81 +#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 -index 0000000000000000000000000000000000000000..1cda56d8ebec64b4d1b0bdf1e88bc8b36dc6accb +index 000000000..1cda56d8e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_start.h @@ -0,0 +1,117 @@ @@ -988621,7 +988613,7 @@ index 0000000000000000000000000000000000000000..1cda56d8ebec64b4d1b0bdf1e88bc8b3 +#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 -index 0000000000000000000000000000000000000000..ac082a7fb39d8cd9c2e32382ef02949cf094320c +index 000000000..ac082a7fb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcicfg.h @@ -0,0 +1,737 @@ @@ -989364,7 +989356,7 @@ index 0000000000000000000000000000000000000000..ac082a7fb39d8cd9c2e32382ef02949c +#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 -index 0000000000000000000000000000000000000000..d1d3cf49d2eb6012c6bac8a1ec39128a1aa35c09 +index 000000000..d1d3cf49d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcie_core.h @@ -0,0 +1,1513 @@ @@ -990883,7 +990875,7 @@ index 0000000000000000000000000000000000000000..d1d3cf49d2eb6012c6bac8a1ec39128a +#endif /* _PCIE_CORE_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/phy_event_log_payload.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/phy_event_log_payload.h new file mode 100755 -index 0000000000000000000000000000000000000000..336fdea4232481e99e1826cc687a4e259cf7d1f8 +index 000000000..336fdea42 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/phy_event_log_payload.h @@ -0,0 +1,3430 @@ @@ -994319,7 +994311,7 @@ index 0000000000000000000000000000000000000000..336fdea4232481e99e1826cc687a4e25 +#endif /* _PHY_EVENT_LOG_PAYLOAD_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 -index 0000000000000000000000000000000000000000..558f940283c90a7fe566d19df145ce3b9a916cfc +index 000000000..558f94028 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbchipc.h @@ -0,0 +1,5370 @@ @@ -999695,7 +999687,7 @@ index 0000000000000000000000000000000000000000..558f940283c90a7fe566d19df145ce3b +#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 -index 0000000000000000000000000000000000000000..424a3621cce373c29eba1b7865cdd2587739d3b2 +index 000000000..424a3621c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbconfig.h @@ -0,0 +1,279 @@ @@ -999980,7 +999972,7 @@ index 0000000000000000000000000000000000000000..424a3621cce373c29eba1b7865cdd258 +#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 -index 0000000000000000000000000000000000000000..55afc79d30bb0f95bb52c683c8dcc86c7d2d3095 +index 000000000..55afc79d3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbgci.h @@ -0,0 +1,424 @@ @@ -1000410,7 +1000402,7 @@ index 0000000000000000000000000000000000000000..55afc79d30bb0f95bb52c683c8dcc86c +#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 -index 0000000000000000000000000000000000000000..92660123db2251886c4d3aaacc255986d805305f +index 000000000..92660123d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhndarm.h @@ -0,0 +1,414 @@ @@ -1000830,7 +1000822,7 @@ index 0000000000000000000000000000000000000000..92660123db2251886c4d3aaacc255986 +#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 -index 0000000000000000000000000000000000000000..86422ebc65c2b85618237a9bc5328362219a0d60 +index 000000000..86422ebc6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhnddma.h @@ -0,0 +1,481 @@ @@ -1001317,7 +1001309,7 @@ index 0000000000000000000000000000000000000000..86422ebc65c2b85618237a9bc5328362 +#endif /* _sbhnddma_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhndpio.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhndpio.h new file mode 100755 -index 0000000000000000000000000000000000000000..289a40b5e7f91427d0eb1e69043fd77425dcff64 +index 000000000..289a40b5e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhndpio.h @@ -0,0 +1,60 @@ @@ -1001383,7 +1001375,7 @@ index 0000000000000000000000000000000000000000..289a40b5e7f91427d0eb1e69043fd774 +#endif /* _sbhndpio_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 -index 0000000000000000000000000000000000000000..297898f2a68fcfb997f13caf86f1ed001b7b922f +index 000000000..297898f2a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbpcmcia.h @@ -0,0 +1,415 @@ @@ -1001804,7 +1001796,7 @@ index 0000000000000000000000000000000000000000..297898f2a68fcfb997f13caf86f1ed00 +#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 -index 0000000000000000000000000000000000000000..18ba612336188c112855f2b6aa9dacbf25b1d7ab +index 000000000..18ba61233 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdio.h @@ -0,0 +1,185 @@ @@ -1001995,7 +1001987,7 @@ index 0000000000000000000000000000000000000000..18ba612336188c112855f2b6aa9dacbf +#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 -index 0000000000000000000000000000000000000000..91e04882acd8f63dfec2caf70529b14e31cca8df +index 000000000..91e04882a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdpcmdev.h @@ -0,0 +1,307 @@ @@ -1002308,7 +1002300,7 @@ index 0000000000000000000000000000000000000000..91e04882acd8f63dfec2caf70529b14e +#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 -index 0000000000000000000000000000000000000000..a8802bf604278681dd7926b2dfe1055c92312a80 +index 000000000..a8802bf60 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsocram.h @@ -0,0 +1,198 @@ @@ -1002512,7 +1002504,7 @@ index 0000000000000000000000000000000000000000..a8802bf604278681dd7926b2dfe1055c +#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 -index 0000000000000000000000000000000000000000..dc7f8a783e12247f9ac2bd69c7ad5b6e6dc1e4c5 +index 000000000..dc7f8a783 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsysmem.h @@ -0,0 +1,191 @@ @@ -1002709,7 +1002701,7 @@ index 0000000000000000000000000000000000000000..dc7f8a783e12247f9ac2bd69c7ad5b6e +#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 -index 0000000000000000000000000000000000000000..70721f1bced3941c3db3ec6b64c1648c7f14941e +index 000000000..70721f1bc --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdio.h @@ -0,0 +1,644 @@ @@ -1003359,7 +1003351,7 @@ index 0000000000000000000000000000000000000000..70721f1bced3941c3db3ec6b64c1648c +#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 -index 0000000000000000000000000000000000000000..20200c131fdcd77aecf130a7efb57e50b66a871d +index 000000000..20200c131 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdioh.h @@ -0,0 +1,459 @@ @@ -1003824,7 +1003816,7 @@ index 0000000000000000000000000000000000000000..20200c131fdcd77aecf130a7efb57e50 +#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 -index 0000000000000000000000000000000000000000..cd10d991eac317b0af1a22f9dbd9eae27924aa32 +index 000000000..cd10d991e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdiovar.h @@ -0,0 +1,124 @@ @@ -1003954,7 +1003946,7 @@ index 0000000000000000000000000000000000000000..cd10d991eac317b0af1a22f9dbd9eae2 +#endif /* _sdiovar_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 -index 0000000000000000000000000000000000000000..52b326612dea229210df8e00851eba17e2416ea6 +index 000000000..52b326612 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/siutils.h @@ -0,0 +1,1052 @@ @@ -1005012,7 +1005004,7 @@ index 0000000000000000000000000000000000000000..52b326612dea229210df8e00851eba17 +#endif /* _siutils_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 -index 0000000000000000000000000000000000000000..e87ce64e10d7edaa9690fd6c8cbc57e50ee9806c +index 000000000..e87ce64e1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/trxhdr.h @@ -0,0 +1,93 @@ @@ -1005111,7 +1005103,7 @@ index 0000000000000000000000000000000000000000..e87ce64e10d7edaa9690fd6c8cbc57e5 +#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 -index 0000000000000000000000000000000000000000..df09e00be80d940f84ca756b34659574d3cff0ab +index 000000000..df09e00be --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/typedefs.h @@ -0,0 +1,424 @@ @@ -1005541,7 +1005533,7 @@ index 0000000000000000000000000000000000000000..df09e00be80d940f84ca756b34659574 +#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 -index 0000000000000000000000000000000000000000..91bdd07ab3afe7118123d583dd3e0e4a16af559c +index 000000000..91bdd07ab --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/usbrdl.h @@ -0,0 +1,221 @@ @@ -1005768,7 +1005760,7 @@ index 0000000000000000000000000000000000000000..91bdd07ab3afe7118123d583dd3e0e4a +#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 -index 0000000000000000000000000000000000000000..e22e1900e411be5be07d5a4f05460af5e5622837 +index 000000000..e22e1900e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/vlan.h @@ -0,0 +1,91 @@ @@ -1005865,7 +1005857,7 @@ index 0000000000000000000000000000000000000000..e22e1900e411be5be07d5a4f05460af5 +#endif /* _vlan_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wl_bam.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wl_bam.h new file mode 100755 -index 0000000000000000000000000000000000000000..c816b6ade818299b2a6dd8217eb9e1a7062c1b81 +index 000000000..c816b6ade --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wl_bam.h @@ -0,0 +1,65 @@ @@ -1005936,7 +1005928,7 @@ index 0000000000000000000000000000000000000000..c816b6ade818299b2a6dd8217eb9e1a7 +#endif /* _WL_BAM_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wldev_common.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wldev_common.h new file mode 100755 -index 0000000000000000000000000000000000000000..bfd998c841911c6846e48a76292b1c2938cf2546 +index 000000000..bfd998c84 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wldev_common.h @@ -0,0 +1,143 @@ @@ -1006085,7 +1006077,7 @@ index 0000000000000000000000000000000000000000..bfd998c841911c6846e48a76292b1c29 +#endif /* __WLDEV_COMMON_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 -index 0000000000000000000000000000000000000000..bf5d3972cae17945eab4c7182da82df71c7e54a6 +index 000000000..bf5d3972c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlfc_proto.h @@ -0,0 +1,520 @@ @@ -1006611,7 +1006603,7 @@ index 0000000000000000000000000000000000000000..bf5d3972cae17945eab4c7182da82df7 +#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 -index 0000000000000000000000000000000000000000..65edb4b10d86b6f09d55a6ace3f6538440943c9e +index 000000000..65edb4b10 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl.h @@ -0,0 +1,31196 @@ @@ -1037813,7 +1037805,7 @@ index 0000000000000000000000000000000000000000..65edb4b10d86b6f09d55a6ace3f65384 +#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 -index 0000000000000000000000000000000000000000..55ede5bc4f28004a6584b431075b275323dd6700 +index 000000000..55ede5bc4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_defs.h @@ -0,0 +1,2556 @@ @@ -1040375,7 +1040367,7 @@ index 0000000000000000000000000000000000000000..55ede5bc4f28004a6584b431075b2753 +#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 -index 0000000000000000000000000000000000000000..9558938684bd121ec7aafd3f36a5ca21d115fd59 +index 000000000..955893868 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_utils.h @@ -0,0 +1,60 @@ @@ -1040441,7 +1040433,7 @@ index 0000000000000000000000000000000000000000..9558938684bd121ec7aafd3f36a5ca21 +#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 -index 0000000000000000000000000000000000000000..da403ee53db8f5c6d76cfea02866cd47f6527797 +index 000000000..da403ee53 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wpa.h @@ -0,0 +1,280 @@ @@ -1040727,7 +1040719,7 @@ index 0000000000000000000000000000000000000000..da403ee53db8f5c6d76cfea02866cd47 +#endif /* _proto_wpa_h_ */ 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 -index 0000000000000000000000000000000000000000..fe9b9511cc65ebd101c67496462a0324b53c9fc7 +index 000000000..fe9b9511c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl.c @@ -0,0 +1,2307 @@ @@ -1043040,7 +1043032,7 @@ index 0000000000000000000000000000000000000000..fe9b9511cc65ebd101c67496462a0324 +#endif 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 -index 0000000000000000000000000000000000000000..51530815e93538ea9da28feb2c8b9287011aa183 +index 000000000..51530815e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl_priv.h @@ -0,0 +1,177 @@ @@ -1043223,7 +1043215,7 @@ index 0000000000000000000000000000000000000000..51530815e93538ea9da28feb2c8b9287 +#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 -index 0000000000000000000000000000000000000000..22e05a4d0cb1a529827d33ad7870952297841940 +index 000000000..22e05a4d0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_pkt.c @@ -0,0 +1,909 @@ @@ -1044138,7 +1044130,7 @@ index 0000000000000000000000000000000000000000..22e05a4d0cb1a529827d33ad78709522 +#endif /* LINUX_VERSION >= 3.6.0 && TSQ_MULTIPLIER */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linuxerrmap.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linuxerrmap.c new file mode 100755 -index 0000000000000000000000000000000000000000..a182d4f8dd275c122ec0c4cc1c5dfec31fd6c3d6 +index 000000000..a182d4f8d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linuxerrmap.c @@ -0,0 +1,128 @@ @@ -1044272,7 +1044264,7 @@ index 0000000000000000000000000000000000000000..a182d4f8dd275c122ec0c4cc1c5dfec3 +} 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 -index 0000000000000000000000000000000000000000..bc3e4bebfc38685ba9bf90855b389b08e7c900ef +index 000000000..bc3e4bebf --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/pcie_core.c @@ -0,0 +1,228 @@ @@ -1044506,7 +1044498,7 @@ index 0000000000000000000000000000000000000000..bc3e4bebfc38685ba9bf90855b389b08 +#endif /* BCMDRIVER */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/rk_dhd_pcie_linux.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/rk_dhd_pcie_linux.h new file mode 100755 -index 0000000000000000000000000000000000000000..80501a3cfd412be2e3e80a87692e4239f618999e +index 000000000..80501a3cf --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/rk_dhd_pcie_linux.h @@ -0,0 +1,37 @@ @@ -1044549,7 +1044541,7 @@ index 0000000000000000000000000000000000000000..80501a3cfd412be2e3e80a87692e4239 +#endif /* __RK_DHD_PCIE_LINUX_H__ */ 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 -index 0000000000000000000000000000000000000000..bb8b6a12fb1c46915f90caf9709e03ecf830c02d +index 000000000..bb8b6a12f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/sbutils.c @@ -0,0 +1,1110 @@ @@ -1045665,7 +1045657,7 @@ index 0000000000000000000000000000000000000000..bb8b6a12fb1c46915f90caf9709e03ec +#endif /* BCMDBG */ 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 -index 0000000000000000000000000000000000000000..1819a6c0cb9f65c0368bd5b66f84b9e0ae4616f1 +index 000000000..1819a6c0c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils.c @@ -0,0 +1,10248 @@ @@ -1055919,7 +1055911,7 @@ index 0000000000000000000000000000000000000000..1819a6c0cb9f65c0368bd5b66f84b9e0 +#endif /* USE_LHL_TIMER */ 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 -index 0000000000000000000000000000000000000000..f57c41c4a9936383025a9162d4833f6fdb1223ff +index 000000000..f57c41c4a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils_priv.h @@ -0,0 +1,519 @@ @@ -1056444,7 +1056436,7 @@ index 0000000000000000000000000000000000000000..f57c41c4a9936383025a9162d4833f6f +#endif /* _siutils_priv_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wb_regon_coordinator.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wb_regon_coordinator.c new file mode 100755 -index 0000000000000000000000000000000000000000..571d9728bcdb38cf7196f25acbf6bec9e9434703 +index 000000000..571d9728b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wb_regon_coordinator.c @@ -0,0 +1,522 @@ @@ -1056972,7 +1056964,7 @@ index 0000000000000000000000000000000000000000..571d9728bcdb38cf7196f25acbf6bec9 +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wifi_stats.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wifi_stats.h new file mode 100755 -index 0000000000000000000000000000000000000000..94a2136324c23d1a1ccaa5cf7f9dec44673b7b46 +index 000000000..94a213632 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wifi_stats.h @@ -0,0 +1,437 @@ @@ -1057415,7 +1057407,7 @@ index 0000000000000000000000000000000000000000..94a2136324c23d1a1ccaa5cf7f9dec44 +#endif /* _wifi_stats_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 -index 0000000000000000000000000000000000000000..f07c6cce006911bb890147667de760ace909f979 +index 000000000..f07c6cce0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.c @@ -0,0 +1,10263 @@ @@ -1067684,7 +1067676,7 @@ index 0000000000000000000000000000000000000000..f07c6cce006911bb890147667de760ac +#endif /* SUPPORT_AP_INIT_BWCONF */ 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 -index 0000000000000000000000000000000000000000..d9b61ba02fcc40744496fa46221138f4d39e4f7c +index 000000000..d9b61ba02 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.h @@ -0,0 +1,270 @@ @@ -1067960,7 +1067952,7 @@ index 0000000000000000000000000000000000000000..d9b61ba02fcc40744496fa46221138f4 +#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 -index 0000000000000000000000000000000000000000..9b0d4b4c279a5535699224bafa7148ea70aee74c +index 000000000..9b0d4b4c2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android_ext.c @@ -0,0 +1,4242 @@ @@ -1072208,7 +1072200,7 @@ index 0000000000000000000000000000000000000000..9b0d4b4c279a5535699224bafa7148ea +#endif /* BSSCACHE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android_ext.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android_ext.h new file mode 100755 -index 0000000000000000000000000000000000000000..da605828db5a588e76df5bfbe04fb11894bf52fe +index 000000000..da605828d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android_ext.h @@ -0,0 +1,217 @@ @@ -1072431,7 +1072423,7 @@ index 0000000000000000000000000000000000000000..da605828db5a588e76df5bfbe04fb118 +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_bam.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_bam.c new file mode 100755 -index 0000000000000000000000000000000000000000..c568b04ab6d27f80b66273ed24c29160d14be1e3 +index 000000000..c568b04ab --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_bam.c @@ -0,0 +1,314 @@ @@ -1072751,7 +1072743,7 @@ index 0000000000000000000000000000000000000000..c568b04ab6d27f80b66273ed24c29160 +} 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 -index 0000000000000000000000000000000000000000..08df037c5eb91bf5b29a418beb4b83ebe73da410 +index 000000000..08df037c5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.c @@ -0,0 +1,28504 @@ @@ -1101261,7 +1101253,7 @@ index 0000000000000000000000000000000000000000..08df037c5eb91bf5b29a418beb4b83eb +#endif /* WL_STATIC_IF */ 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 -index 0000000000000000000000000000000000000000..65783e72b234b7f9f31f6e4805e3a6f3b12b2597 +index 000000000..65783e72b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.h @@ -0,0 +1,3845 @@ @@ -1105112,7 +1105104,7 @@ index 0000000000000000000000000000000000000000..65783e72b234b7f9f31f6e4805e3a6f3 +#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 -index 0000000000000000000000000000000000000000..49a51285ce8a0801c279f0e62ca6eb1a40f0a7ea +index 000000000..49a51285c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg_btcoex.c @@ -0,0 +1,934 @@ @@ -1106052,7 +1106044,7 @@ index 0000000000000000000000000000000000000000..49a51285ce8a0801c279f0e62ca6eb1a +#endif /* defined(OEM_ANDROID) */ 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 -index 0000000000000000000000000000000000000000..415f845b38927ee6ce32278c87c77801f9b160b6 +index 000000000..415f845b3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.c @@ -0,0 +1,10459 @@ @@ -1116517,7 +1116509,7 @@ index 0000000000000000000000000000000000000000..415f845b38927ee6ce32278c87c77801 +#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 -index 0000000000000000000000000000000000000000..23d4f3d7c47e83a2b72e5d85f388de2503f08253 +index 000000000..23d4f3d7c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.h @@ -0,0 +1,1023 @@ @@ -1117546,7 +1117538,7 @@ index 0000000000000000000000000000000000000000..23d4f3d7c47e83a2b72e5d85f388de25 +#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 -index 0000000000000000000000000000000000000000..7cdd8f7cddfc0c981d3f42256f826554530eb578 +index 000000000..7cdd8f7cd --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.c @@ -0,0 +1,3022 @@ @@ -1120574,7 +1120566,7 @@ index 0000000000000000000000000000000000000000..7cdd8f7cddfc0c981d3f42256f826554 +#endif /* BCMDBUS */ 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 -index 0000000000000000000000000000000000000000..d1ecbba5c8371fb41e8aac7be442139c2041c87b +index 000000000..d1ecbba5c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.h @@ -0,0 +1,484 @@ @@ -1121064,7 +1121056,7 @@ index 0000000000000000000000000000000000000000..d1ecbba5c8371fb41e8aac7be442139c +#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 -index 0000000000000000000000000000000000000000..b073244d5c19b6199db918876a6063504517daee +index 000000000..b073244d5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.c @@ -0,0 +1,7461 @@ @@ -1128531,7 +1128523,7 @@ index 0000000000000000000000000000000000000000..b073244d5c19b6199db918876a606350 +} 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 -index 0000000000000000000000000000000000000000..2c6429f0c4da234ab939c91744ff3183d58c1f8c +index 000000000..2c6429f0c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.h @@ -0,0 +1,231 @@ @@ -1128768,7 +1128760,7 @@ index 0000000000000000000000000000000000000000..2c6429f0c4da234ab939c91744ff3183 +#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 -index 0000000000000000000000000000000000000000..9b19314c4e1f932b987c6acf50b14b8b10452603 +index 000000000..9b19314c4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.c @@ -0,0 +1,14390 @@ @@ -1143164,7 +1143156,7 @@ index 0000000000000000000000000000000000000000..9b19314c4e1f932b987c6acf50b14b8b +#endif /* WL_CFGVENDOR_CUST_ADVLOG */ 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 -index 0000000000000000000000000000000000000000..b1fe71729f4e8069122a9551169b0b098e68c063 +index 000000000..b1fe71729 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.h @@ -0,0 +1,1308 @@ @@ -1144478,7 +1144470,7 @@ index 0000000000000000000000000000000000000000..b1fe71729f4e8069122a9551169b0b09 +#endif /* _wl_cfgvendor_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvif.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvif.c new file mode 100755 -index 0000000000000000000000000000000000000000..604effd19905fd27a9b23cc58836f6ec38cd5d57 +index 000000000..604effd19 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvif.c @@ -0,0 +1,7965 @@ @@ -1152449,7 +1152441,7 @@ index 0000000000000000000000000000000000000000..604effd19905fd27a9b23cc58836f6ec +#endif /* WL_STATIC_IF */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvif.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvif.h new file mode 100755 -index 0000000000000000000000000000000000000000..ea8bc76c07b2c2ebdeba3c542229e917058edcdd +index 000000000..ea8bc76c0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvif.h @@ -0,0 +1,291 @@ @@ -1152746,7 +1152738,7 @@ index 0000000000000000000000000000000000000000..ea8bc76c07b2c2ebdeba3c542229e917 +#endif /* _wl_cfgvif_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 -index 0000000000000000000000000000000000000000..0a7aea9148ba2b509766d84031d035394283dbdc +index 000000000..0a7aea914 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.c @@ -0,0 +1,1914 @@ @@ -1154666,7 +1154658,7 @@ index 0000000000000000000000000000000000000000..0a7aea9148ba2b509766d84031d03539 +#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 -index 0000000000000000000000000000000000000000..5670681106bc51cb319f0135c3e63a68632672e6 +index 000000000..567068110 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.h @@ -0,0 +1,86 @@ @@ -1154758,7 +1154750,7 @@ index 0000000000000000000000000000000000000000..5670681106bc51cb319f0135c3e63a68 +#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 -index 0000000000000000000000000000000000000000..2d2a999d84af227316b505da2ace18eb62d0de97 +index 000000000..2d2a999d8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_event.c @@ -0,0 +1,558 @@ @@ -1155322,7 +1155314,7 @@ index 0000000000000000000000000000000000000000..2d2a999d84af227316b505da2ace18eb +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_event.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_event.h new file mode 100755 -index 0000000000000000000000000000000000000000..cae71544a05c0170eb6129d745c88488e0b82b6a +index 000000000..cae71544a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_event.h @@ -0,0 +1,18 @@ @@ -1155346,7 +1155338,7 @@ index 0000000000000000000000000000000000000000..cae71544a05c0170eb6129d745c88488 +#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 -index 0000000000000000000000000000000000000000..815eb6de4d4e7bb2d0462c34b1a815edb638bc79 +index 000000000..815eb6de4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_ext_genl.c @@ -0,0 +1,568 @@ @@ -1155920,7 +1155912,7 @@ index 0000000000000000000000000000000000000000..815eb6de4d4e7bb2d0462c34b1a815ed +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iapsta.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iapsta.c new file mode 100755 -index 0000000000000000000000000000000000000000..06e67c5eac62046c9cb6b2a49ee8dd38567556f5 +index 000000000..06e67c5ea --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iapsta.c @@ -0,0 +1,7210 @@ @@ -1163136,7 +1163128,7 @@ index 0000000000000000000000000000000000000000..06e67c5eac62046c9cb6b2a49ee8dd38 +#endif /* WL_EXT_IAPSTA */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iapsta.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iapsta.h new file mode 100755 -index 0000000000000000000000000000000000000000..26eb7e7d0da8729419e2a9cd262956e9b86de4b5 +index 000000000..26eb7e7d0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iapsta.h @@ -0,0 +1,108 @@ @@ -1163250,7 +1163242,7 @@ index 0000000000000000000000000000000000000000..26eb7e7d0da8729419e2a9cd262956e9 +#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 -index 0000000000000000000000000000000000000000..96d63cdf207f18d1ccee7f171962b3421f0d4579 +index 000000000..96d63cdf2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.c @@ -0,0 +1,4359 @@ @@ -1167615,7 +1167607,7 @@ index 0000000000000000000000000000000000000000..96d63cdf207f18d1ccee7f171962b342 +#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 -index 0000000000000000000000000000000000000000..a16265501e252d8866f76430438f07f0021bc4ac +index 000000000..a16265501 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.h @@ -0,0 +1,170 @@ @@ -1167791,7 +1167783,7 @@ index 0000000000000000000000000000000000000000..a16265501e252d8866f76430438f07f0 +#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 -index 0000000000000000000000000000000000000000..42445271d581ec839d1a11084fc984a7030c98ff +index 000000000..42445271d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_linux_mon.c @@ -0,0 +1,412 @@ @@ -1168209,7 +1168201,7 @@ index 0000000000000000000000000000000000000000..42445271d581ec839d1a11084fc984a7 +} 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 -index 0000000000000000000000000000000000000000..e061b342c51d2dc53d61b361dd9295f5376b1a07 +index 000000000..e061b342c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_roam.c @@ -0,0 +1,608 @@ @@ -1168823,7 +1168815,7 @@ index 0000000000000000000000000000000000000000..e061b342c51d2dc53d61b361dd9295f5 +#endif /* ESCAN_CHANNEL_CACHE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_timer.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_timer.c new file mode 100755 -index 0000000000000000000000000000000000000000..0255acd55fbd25cc0d90be518ffc312b137f40b9 +index 000000000..0255acd55 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_timer.c @@ -0,0 +1,611 @@ @@ -1169440,7 +1169432,7 @@ index 0000000000000000000000000000000000000000..0255acd55fbd25cc0d90be518ffc312b +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_timer.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_timer.h new file mode 100755 -index 0000000000000000000000000000000000000000..6b43384682b768f9c44218edd32ac46b00db12db +index 000000000..6b4338468 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_timer.h @@ -0,0 +1,8 @@ @@ -1169454,7 +1169446,7 @@ index 0000000000000000000000000000000000000000..6b43384682b768f9c44218edd32ac46b +#endif 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 -index 0000000000000000000000000000000000000000..5da6be12646069cb4b4501432303a013aa241045 +index 000000000..5da6be126 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.c @@ -0,0 +1,596 @@ @@ -1170056,7 +1170048,7 @@ index 0000000000000000000000000000000000000000..5da6be12646069cb4b4501432303a013 +} 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 100644 -index 0000000000000000000000000000000000000000..82799df987e89966ae5efc399db7413f4cdf5981 +index 000000000..82799df98 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c @@ -0,0 +1,30 @@ @@ -1170091,7 +1170083,7 @@ index 0000000000000000000000000000000000000000..82799df987e89966ae5efc399db7413f +EXPORT_SYMBOL(rkwifi_set_firmware); +MODULE_LICENSE("GPL"); diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig -index 5bc9c4874fe3bb1faa55ded3d24d5af7546f537a..a6bdc92eed7b1953fe22279ec7f978b85fb729b9 100644 +index 5bc9c4874..a6bdc92ee 100644 --- a/drivers/nvmem/Kconfig +++ b/drivers/nvmem/Kconfig @@ -245,6 +245,18 @@ config NVMEM_RAVE_SP_EEPROM @@ -1170132,7 +1170124,7 @@ index 5bc9c4874fe3bb1faa55ded3d24d5af7546f537a..a6bdc92eed7b1953fe22279ec7f978b8 tristate "Spreadtrum SC27XX eFuse Support" depends on MFD_SC27XX_PMIC || COMPILE_TEST diff --git a/drivers/nvmem/Makefile b/drivers/nvmem/Makefile -index 423baf089515c2b4acbd1adf65fbe3912094b58d..aaaf802b73b4e854abe729fd87c5a92f7ed58e08 100644 +index 423baf089..aaaf802b7 100644 --- a/drivers/nvmem/Makefile +++ b/drivers/nvmem/Makefile @@ -50,12 +50,16 @@ obj-$(CONFIG_NVMEM_QCOM_SEC_QFPROM) += nvmem_sec_qfprom.o @@ -1170153,7 +1170145,7 @@ index 423baf089515c2b4acbd1adf65fbe3912094b58d..aaaf802b73b4e854abe729fd87c5a92f nvmem-sc27xx-efuse-y := sc27xx-efuse.o obj-$(CONFIG_NVMEM_SNVS_LPGPR) += nvmem_snvs_lpgpr.o diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c -index 5b3955ad40534f1d113781bc5dd81ba476bae6dd..831d8ce16022d9d51cdb62a6059cfcca36728631 100644 +index 5b3955ad4..831d8ce16 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -2140,7 +2140,11 @@ static void __exit nvmem_exit(void) @@ -1170170,7 +1170162,7 @@ index 5b3955ad40534f1d113781bc5dd81ba476bae6dd..831d8ce16022d9d51cdb62a6059cfcca MODULE_AUTHOR("Srinivas Kandagatla diff --git a/drivers/phy/rockchip/phy-rockchip-inno-combphy.c b/drivers/phy/rockchip/phy-rockchip-inno-combphy.c new file mode 100644 -index 0000000000000000000000000000000000000000..8b93016edce5122b9825b832efcc7101ca692f36 +index 000000000..8b93016ed --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-combphy.c @@ -0,0 +1,1024 @@ @@ -1182184,7 +1182176,7 @@ index 0000000000000000000000000000000000000000..8b93016edce5122b9825b832efcc7101 +MODULE_DESCRIPTION("Rockchip USB3.0 and PCIE COMBPHY driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-inno-csidphy.c b/drivers/phy/rockchip/phy-rockchip-inno-csidphy.c -index 98c92d6c482feff1dc72a9a311e26e7c0537d9d2..75f948bdea6a10ddd9cc0075408959c7ef26d1f1 100644 +index 98c92d6c4..75f948bde 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-csidphy.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-csidphy.c @@ -459,11 +459,13 @@ static int rockchip_inno_csidphy_probe(struct platform_device *pdev) @@ -1182212,7 +1182204,7 @@ index 98c92d6c482feff1dc72a9a311e26e7c0537d9d2..75f948bdea6a10ddd9cc0075408959c7 module_platform_driver(rockchip_inno_csidphy_driver); diff --git a/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c b/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c -index 6405943a2676786cc5be6b6432dd84e721431372..a074bca21b4b4d9640a6b8231d03bf1a6530814e 100644 +index 6405943a2..a074bca21 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c @@ -14,7 +14,7 @@ @@ -1182919,7 +1182911,7 @@ index 6405943a2676786cc5be6b6432dd84e721431372..a074bca21b4b4d9640a6b8231d03bf1a 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 100644 -index 0000000000000000000000000000000000000000..23f1e5d87ea9ef8f3a7e379256a6d2c0297dcf95 +index 000000000..23f1e5d87 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-hdmi-phy.c @@ -0,0 +1,1632 @@ @@ -1184556,7 +1184548,7 @@ index 0000000000000000000000000000000000000000..23f1e5d87ea9ef8f3a7e379256a6d2c0 +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 053bd62e31ba779eadef6bb8176135eb7f0c398f..80acca4e9e146299457cb341fdba2b61f5b20ecb 100644 +index 053bd62e3..80acca4e9 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c @@ -15,6 +15,7 @@ @@ -1184924,7 +1184916,7 @@ index 053bd62e31ba779eadef6bb8176135eb7f0c398f..80acca4e9e146299457cb341fdba2b61 .of_match_table = inno_hdmi_phy_of_match, 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 100644 -index 0000000000000000000000000000000000000000..b49b1aad2a097ca212e1c2b3f50d1ee57804a6c6 +index 000000000..b49b1aad2 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-mipi-dphy.c @@ -0,0 +1,853 @@ @@ -1185782,7 +1185774,7 @@ index 0000000000000000000000000000000000000000..b49b1aad2a097ca212e1c2b3f50d1ee5 +MODULE_DESCRIPTION("Innosilicon MIPI D-PHY Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c -index b982c3f0d4b56bf58e3d762b077efa8e491c06d4..a28e933331dd8493868bfa512b7159f32e35adad 100644 +index b982c3f0d..a28e93333 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c @@ -22,16 +22,23 @@ @@ -1189798,7 +1189790,7 @@ index b982c3f0d4b56bf58e3d762b077efa8e491c06d4..a28e933331dd8493868bfa512b7159f3 }; diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb3.c b/drivers/phy/rockchip/phy-rockchip-inno-usb3.c new file mode 100644 -index 0000000000000000000000000000000000000000..f345f23afbd15edabb0e41cf2237ca7175e0abc5 +index 000000000..f345f23af --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb3.c @@ -0,0 +1,1114 @@ @@ -1190918,7 +1190910,7 @@ index 0000000000000000000000000000000000000000..f345f23afbd15edabb0e41cf2237ca71 +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 100644 -index 0000000000000000000000000000000000000000..4166d4bacb42395b7ef042731d02eec3ef29a83d +index 000000000..4166d4bac --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-video-combo-phy.c @@ -0,0 +1,874 @@ @@ -1191798,7 +1191790,7 @@ index 0000000000000000000000000000000000000000..4166d4bacb42395b7ef042731d02eec3 +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 100644 -index 0000000000000000000000000000000000000000..22d26f1413d92beabd3c602c0c68d1a805acb9d3 +index 000000000..22d26f141 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-video-phy.c @@ -0,0 +1,245 @@ @@ -1192049,7 +1192041,7 @@ index 0000000000000000000000000000000000000000..22d26f1413d92beabd3c602c0c68d1a8 +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 100644 -index 0000000000000000000000000000000000000000..617b9ed785d4002f34ff67fccefe2db0f11d7d76 +index 000000000..617b9ed78 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-mipi-rx.c @@ -0,0 +1,1915 @@ @@ -1193969,7 +1193961,7 @@ index 0000000000000000000000000000000000000000..617b9ed785d4002f34ff67fccefe2db0 +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 -index 5de5e2e97ffa0f17d1997d49661f3699ef5fe3c1..e9fcc9eb09618150aa6c20051aa8e760da4405a3 100644 +index 5de5e2e97..e9fcc9eb0 100644 --- a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c +++ b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c @@ -5,85 +5,25 @@ @@ -1195316,7 +1195308,7 @@ index 5de5e2e97ffa0f17d1997d49661f3699ef5fe3c1..e9fcc9eb09618150aa6c20051aa8e760 }; diff --git a/drivers/phy/rockchip/phy-rockchip-naneng-edp.c b/drivers/phy/rockchip/phy-rockchip-naneng-edp.c new file mode 100644 -index 0000000000000000000000000000000000000000..209ce9d0384a28fb9d23d62790adc8e35aaa966d +index 000000000..209ce9d03 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-naneng-edp.c @@ -0,0 +1,478 @@ @@ -1195800,7 +1195792,7 @@ index 0000000000000000000000000000000000000000..209ce9d0384a28fb9d23d62790adc8e3 +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 100644 -index 0000000000000000000000000000000000000000..7cfbf260f325dfed30fdf3df8fb4b1acc3b94276 +index 000000000..7cfbf260f --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-naneng-usb2.c @@ -0,0 +1,1942 @@ @@ -1197747,7 +1197739,7 @@ index 0000000000000000000000000000000000000000..7cfbf260f325dfed30fdf3df8fb4b1ac +MODULE_DESCRIPTION("Rockchip USB2.0 Naneng PHY driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c -index 8234b83fdd88c012fdd92f567b3423cfac650036..2f47a3e7fd88f83de24fe48d846ca81e89c15480 100644 +index 8234b83fd..2f47a3e7f 100644 --- a/drivers/phy/rockchip/phy-rockchip-pcie.c +++ b/drivers/phy/rockchip/phy-rockchip-pcie.c @@ -119,6 +119,21 @@ static inline void phy_wr_cfg(struct rockchip_pcie_phy *rk_phy, @@ -1197800,7 +1197792,7 @@ index 8234b83fdd88c012fdd92f567b3423cfac650036..2f47a3e7fd88f83de24fe48d846ca81e * 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 100644 -index 0000000000000000000000000000000000000000..f8fc5b7b584641396d61775f6c97a5550600a7ab +index 000000000..f8fc5b7b5 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c @@ -0,0 +1,2463 @@ @@ -1200269,7 +1200261,7 @@ index 0000000000000000000000000000000000000000..f8fc5b7b584641396d61775f6c97a555 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-dcphy.h b/drivers/phy/rockchip/phy-rockchip-samsung-dcphy.h new file mode 100644 -index 0000000000000000000000000000000000000000..2c04aa3b6e05cbcf4f30f24c917a4c437ec0a964 +index 000000000..2c04aa3b6 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-samsung-dcphy.h @@ -0,0 +1,47 @@ @@ -1200322,7 +1200314,7 @@ index 0000000000000000000000000000000000000000..2c04aa3b6e05cbcf4f30f24c917a4c43 +#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 100644 -index 0000000000000000000000000000000000000000..15f361facdf38aa4d7bf47b6746f339fdd20a6bc +index 000000000..15f361fac --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx-hdmi.c @@ -0,0 +1,2358 @@ @@ -1202686,7 +1202678,7 @@ index 0000000000000000000000000000000000000000..15f361facdf38aa4d7bf47b6746f339f +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 100644 -index 0000000000000000000000000000000000000000..2d142cf731d108d88669ff74a124cb8dd61f9c48 +index 000000000..2d142cf73 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c @@ -0,0 +1,1233 @@ @@ -1203924,7 +1203916,7 @@ index 0000000000000000000000000000000000000000..2d142cf731d108d88669ff74a124cb8d +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 -index 121e5961ce11472ff1576dc83686072eb2f115e0..7eb8899e9b662cf5c436e18f0dd9f954612924fc 100644 +index 121e5961c..7eb8899e9 100644 --- a/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c +++ b/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c @@ -12,24 +12,21 @@ @@ -1204196,7 +1204188,7 @@ index 121e5961ce11472ff1576dc83686072eb2f115e0..7eb8899e9b662cf5c436e18f0dd9f954 if (priv->num_clks < 1) diff --git a/drivers/phy/rockchip/phy-rockchip-snps-pcie3.fw b/drivers/phy/rockchip/phy-rockchip-snps-pcie3.fw new file mode 100644 -index 0000000000000000000000000000000000000000..301c42837ad944dcfa484e5afc1c4978eda5e24c +index 000000000..301c42837 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-snps-pcie3.fw @@ -0,0 +1,8192 @@ @@ -1212393,7 +1212385,7 @@ index 0000000000000000000000000000000000000000..301c42837ad944dcfa484e5afc1c4978 +0x0000, +0x0000 diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c -index 4efcb78b0ab18e656330ab6383601252a1035377..b8f644df1566b4b8a3098ae652a98a2bf7de56b8 100644 +index 4efcb78b0..b8f644df1 100644 --- a/drivers/phy/rockchip/phy-rockchip-typec.c +++ b/drivers/phy/rockchip/phy-rockchip-typec.c @@ -51,9 +51,13 @@ @@ -1213687,7 +1213679,7 @@ index 4efcb78b0ab18e656330ab6383601252a1035377..b8f644df1566b4b8a3098ae652a98a2b .name = "rockchip-typec-phy", .of_match_table = rockchip_typec_phy_dt_ids, diff --git a/drivers/phy/rockchip/phy-rockchip-usb.c b/drivers/phy/rockchip/phy-rockchip-usb.c -index 8454285977ebc17326e406fb749d9cd9a208b0c4..a891018fe72e91cc8fb35518df8620813731dde9 100644 +index 845428597..a891018fe 100644 --- a/drivers/phy/rockchip/phy-rockchip-usb.c +++ b/drivers/phy/rockchip/phy-rockchip-usb.c @@ -8,20 +8,26 @@ @@ -1214420,7 +1214412,7 @@ index 8454285977ebc17326e406fb749d9cd9a208b0c4..a891018fe72e91cc8fb35518df862081 diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockchip/phy-rockchip-usbdp.c new file mode 100644 -index 0000000000000000000000000000000000000000..c6fc4a2aa5588a4f6b1e0451cae037bb98a15666 +index 000000000..c6fc4a2aa --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c @@ -0,0 +1,1675 @@ @@ -1216100,7 +1216092,7 @@ index 0000000000000000000000000000000000000000..c6fc4a2aa5588a4f6b1e0451cae037bb +MODULE_DESCRIPTION("Rockchip USBDP Combo PHY driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig -index 7dfb7190580efaa47bcc8a68f73a642e23270f6f..a78c73b214feaf38cc4050736a680a3009e1b4c4 100644 +index 7dfb71905..a78c73b21 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -394,15 +394,34 @@ config PINCTRL_PISTACHIO @@ -1216140,7 +1216132,7 @@ index 7dfb7190580efaa47bcc8a68f73a642e23270f6f..a78c73b214feaf38cc4050736a680a30 tristate "Rockchip gpio and pinctrl driver" depends on ARCH_ROCKCHIP || COMPILE_TEST diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile -index dd6cda27029492812122d2712336237cebc234f3..dd94e17ea5ed39124e625cbc6f9bc0c3c32b63d4 100644 +index dd6cda270..dd94e17ea 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@ -41,7 +41,9 @@ obj-$(CONFIG_PINCTRL_OCELOT) += pinctrl-ocelot.o @@ -1216155,7 +1216147,7 @@ index dd6cda27029492812122d2712336237cebc234f3..dd94e17ea5ed39124e625cbc6f9bc0c3 obj-$(CONFIG_PINCTRL_ST) += pinctrl-st.o diff --git a/drivers/pinctrl/pinctrl-rk628.c b/drivers/pinctrl/pinctrl-rk628.c new file mode 100644 -index 0000000000000000000000000000000000000000..6e07be50e6e2642f454b49269e6a7d4a484aac2f +index 000000000..6e07be50e --- /dev/null +++ b/drivers/pinctrl/pinctrl-rk628.c @@ -0,0 +1,1696 @@ @@ -1217856,7 +1217848,7 @@ index 0000000000000000000000000000000000000000..6e07be50e6e2642f454b49269e6a7d4a +MODULE_AUTHOR("Weixin Zhou "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/pinctrl/pinctrl-rk805.c b/drivers/pinctrl/pinctrl-rk805.c -index 2639a9ee82cd0fa150c021cfa089551bafd7a096..f4f8866612d34b256bdf2bc5be602c43b18285ef 100644 +index 2639a9ee8..f4f886661 100644 --- a/drivers/pinctrl/pinctrl-rk805.c +++ b/drivers/pinctrl/pinctrl-rk805.c @@ -337,6 +337,120 @@ static const struct gpio_chip rk805_gpio_chip = { @@ -1218108,7 +1218100,7 @@ index 2639a9ee82cd0fa150c021cfa089551bafd7a096..f4f8866612d34b256bdf2bc5be602c43 MODULE_AUTHOR("Xu Shengfei "); diff --git a/drivers/pinctrl/pinctrl-rk806.c b/drivers/pinctrl/pinctrl-rk806.c new file mode 100644 -index 0000000000000000000000000000000000000000..09ddeb2034c157f7c9ffa1c2726a4200a091a830 +index 000000000..09ddeb203 --- /dev/null +++ b/drivers/pinctrl/pinctrl-rk806.c @@ -0,0 +1,572 @@ @@ -1218685,7 +1218677,7 @@ index 0000000000000000000000000000000000000000..09ddeb2034c157f7c9ffa1c2726a4200 +MODULE_AUTHOR("Xu Shengfei "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c -index 45e416f68e74f6f64684efe47954fbf30194ea1a..ca228e9b980e6b2f98505b4d8e0136aa5688f4a4 100644 +index 45e416f68..ca228e9b9 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -21,8 +21,9 @@ @@ -1221095,7 +1221087,7 @@ index 45e416f68e74f6f64684efe47954fbf30194ea1a..ca228e9b980e6b2f98505b4d8e0136aa MODULE_LICENSE("GPL"); MODULE_ALIAS("platform:pinctrl-rockchip"); diff --git a/drivers/pinctrl/pinctrl-rockchip.h b/drivers/pinctrl/pinctrl-rockchip.h -index 4759f336941ef3017d1f36fb42ab33ae3d2c504b..80b5552fd8d04ae29cb1bd409d883489dea1588a 100644 +index 4759f3369..80b5552fd 100644 --- a/drivers/pinctrl/pinctrl-rockchip.h +++ b/drivers/pinctrl/pinctrl-rockchip.h @@ -185,8 +185,10 @@ @@ -1221169,7 +1221161,7 @@ index 4759f336941ef3017d1f36fb42ab33ae3d2c504b..80b5552fd8d04ae29cb1bd409d883489 + #endif diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c -index 2a180a5d64a4ad89836b2b5e1e98280848ed9012..128c5e5afe2d4ecb06066b616ceccfa09c55ff48 100644 +index 2a180a5d6..128c5e5af 100644 --- a/drivers/pinctrl/pinmux.c +++ b/drivers/pinctrl/pinmux.c @@ -677,6 +677,7 @@ void pinmux_show_setting(struct seq_file *s, @@ -1221214,7 +1221206,7 @@ index 2a180a5d64a4ad89836b2b5e1e98280848ed9012..128c5e5afe2d4ecb06066b616ceccfa0 ret = pmxops->set_mux(pctldev, fsel, gsel); diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/pm-domains.c -index d5d3ecb38283c849c6010bc06c72b9c54a8503f0..606e27363b5803df44d7bf51bc4feb1d367db597 100644 +index d5d3ecb38..606e27363 100644 --- a/drivers/pmdomain/rockchip/pm-domains.c +++ b/drivers/pmdomain/rockchip/pm-domains.c @@ -5,6 +5,7 @@ @@ -1222896,7 +1222888,7 @@ index d5d3ecb38283c849c6010bc06c72b9c54a8503f0..606e27363b5803df44d7bf51bc4feb1d +MODULE_LICENSE("GPL"); diff --git a/drivers/power/supply/rk816_battery.c b/drivers/power/supply/rk816_battery.c new file mode 100644 -index 0000000000000000000000000000000000000000..1e4f6cd8e54ac1e28253c88488ec705b65129df4 +index 000000000..1e4f6cd8e --- /dev/null +++ b/drivers/power/supply/rk816_battery.c @@ -0,0 +1,5177 @@ @@ -1228079,7 +1228071,7 @@ index 0000000000000000000000000000000000000000..1e4f6cd8e54ac1e28253c88488ec705b +MODULE_AUTHOR("chenjh"); diff --git a/drivers/power/supply/rk816_battery.h b/drivers/power/supply/rk816_battery.h new file mode 100644 -index 0000000000000000000000000000000000000000..b8b467114c1f376748d9b7ad7078e9a28ef998ee +index 000000000..b8b467114 --- /dev/null +++ b/drivers/power/supply/rk816_battery.h @@ -0,0 +1,286 @@ @@ -1228371,7 +1228363,7 @@ index 0000000000000000000000000000000000000000..b8b467114c1f376748d9b7ad7078e9a2 +#endif diff --git a/drivers/power/supply/rk817_battery.c b/drivers/power/supply/rk817_battery.c new file mode 100644 -index 0000000000000000000000000000000000000000..f6d4345cc67751aebbe3be81255e947f38f90bf1 +index 000000000..f6d4345cc --- /dev/null +++ b/drivers/power/supply/rk817_battery.c @@ -0,0 +1,3427 @@ @@ -1231804,7 +1231796,7 @@ index 0000000000000000000000000000000000000000..f6d4345cc67751aebbe3be81255e947f +MODULE_LICENSE("GPL"); diff --git a/drivers/power/supply/rk818_battery.c b/drivers/power/supply/rk818_battery.c new file mode 100644 -index 0000000000000000000000000000000000000000..a538407ba5226ec0fba24d509588cafa1aac164b +index 000000000..a538407ba --- /dev/null +++ b/drivers/power/supply/rk818_battery.c @@ -0,0 +1,3627 @@ @@ -1235437,7 +1235429,7 @@ index 0000000000000000000000000000000000000000..a538407ba5226ec0fba24d509588cafa +MODULE_AUTHOR("chenjh"); diff --git a/drivers/power/supply/rk818_battery.h b/drivers/power/supply/rk818_battery.h new file mode 100644 -index 0000000000000000000000000000000000000000..66cbbe9dac4cdc5b9a4ebf25072e1b9b2d90bac8 +index 000000000..66cbbe9da --- /dev/null +++ b/drivers/power/supply/rk818_battery.h @@ -0,0 +1,168 @@ @@ -1235611,7 +1235603,7 @@ index 0000000000000000000000000000000000000000..66cbbe9dac4cdc5b9a4ebf25072e1b9b +#endif diff --git a/drivers/power/supply/rk818_charger.c b/drivers/power/supply/rk818_charger.c new file mode 100644 -index 0000000000000000000000000000000000000000..56961effd13c152c970b7466c61b7f986417165a +index 000000000..56961effd --- /dev/null +++ b/drivers/power/supply/rk818_charger.c @@ -0,0 +1,1889 @@ @@ -1237505,7 +1237497,7 @@ index 0000000000000000000000000000000000000000..56961effd13c152c970b7466c61b7f98 +MODULE_ALIAS("platform:rk818-charger"); +MODULE_AUTHOR("chenjh"); diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig -index 8ebcddf91f7b78582ab3b182879477a7be4f5d38..ce8e0d9d565e77580fd580005788eab656cb5525 100644 +index 8ebcddf91..ce8e0d9d5 100644 --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig @@ -217,6 +217,21 @@ config PWM_FSL_FTM @@ -1237544,7 +1237536,7 @@ index 8ebcddf91f7b78582ab3b182879477a7be4f5d38..ce8e0d9d565e77580fd580005788eab6 tristate "Samsung PWM support" depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile -index c822389c2a24c2dd76b106ebb64b4a215f522889..d45a4afc89574a9f84af9a7bc7667580ba48feb4 100644 +index c822389c2..d45a4afc8 100644 --- a/drivers/pwm/Makefile +++ b/drivers/pwm/Makefile @@ -18,6 +18,7 @@ obj-$(CONFIG_PWM_CROS_EC) += pwm-cros-ec.o @@ -1237556,7 +1237548,7 @@ index c822389c2a24c2dd76b106ebb64b4a215f522889..d45a4afc89574a9f84af9a7bc7667580 obj-$(CONFIG_PWM_IMG) += pwm-img.o obj-$(CONFIG_PWM_IMX1) += pwm-imx1.o diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c -index 0c8c63239adbf4221841f201f4be1cf24045e527..297d8da3be0502c3c0967098b1fb4d07068b5561 100644 +index 0c8c63239..297d8da3b 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -10,6 +10,7 @@ @@ -1237680,7 +1237672,7 @@ index 0c8c63239adbf4221841f201f4be1cf24045e527..297d8da3be0502c3c0967098b1fb4d07 state->usage_power == pwm->state.usage_power) return 0; diff --git a/drivers/pwm/pwm-clk.c b/drivers/pwm/pwm-clk.c -index 0ee4d2aee4df0c31d7878e1527d690f13557e335..666b9f48a25fb923df4b289f8cddc5727a52c769 100644 +index 0ee4d2aee..666b9f48a 100644 --- a/drivers/pwm/pwm-clk.c +++ b/drivers/pwm/pwm-clk.c @@ -89,7 +89,7 @@ static int pwm_clk_probe(struct platform_device *pdev) @@ -1237721,7 +1237713,7 @@ index 0ee4d2aee4df0c31d7878e1527d690f13557e335..666b9f48a25fb923df4b289f8cddc572 static const struct of_device_id pwm_clk_dt_ids[] = { diff --git a/drivers/pwm/pwm-gpio.c b/drivers/pwm/pwm-gpio.c new file mode 100644 -index 0000000000000000000000000000000000000000..7ac10bf24ebf13c445ab1d55b966ab4af11f89af +index 000000000..7ac10bf24 --- /dev/null +++ b/drivers/pwm/pwm-gpio.c @@ -0,0 +1,212 @@ @@ -1237939,7 +1237931,7 @@ index 0000000000000000000000000000000000000000..7ac10bf24ebf13c445ab1d55b966ab4a +MODULE_LICENSE("GPL"); diff --git a/drivers/pwm/pwm-rockchip-i2s.c b/drivers/pwm/pwm-rockchip-i2s.c new file mode 100644 -index 0000000000000000000000000000000000000000..0888f62ab60a515695fa3552af3c97d90ca867a6 +index 000000000..0888f62ab --- /dev/null +++ b/drivers/pwm/pwm-rockchip-i2s.c @@ -0,0 +1,506 @@ @@ -1238451,7 +1238443,7 @@ index 0000000000000000000000000000000000000000..0888f62ab60a515695fa3552af3c97d9 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/pwm/pwm-rockchip-irq-callbacks.h b/drivers/pwm/pwm-rockchip-irq-callbacks.h new file mode 100644 -index 0000000000000000000000000000000000000000..191c62e968219a2b4316e70c01c3df0e35b7761f +index 000000000..191c62e96 --- /dev/null +++ b/drivers/pwm/pwm-rockchip-irq-callbacks.h @@ -0,0 +1,64 @@ @@ -1238520,7 +1238512,7 @@ index 0000000000000000000000000000000000000000..191c62e968219a2b4316e70c01c3df0e + +#endif diff --git a/drivers/pwm/pwm-rockchip.c b/drivers/pwm/pwm-rockchip.c -index 03ee18fb82d5b40dc5699da1c5410dac830d5ac1..cd1fb02934e4fc250e23cae492d006e7d7bfb102 100644 +index 03ee18fb8..cd1fb0293 100644 --- a/drivers/pwm/pwm-rockchip.c +++ b/drivers/pwm/pwm-rockchip.c @@ -7,34 +7,235 @@ @@ -1240334,7 +1240326,7 @@ index 03ee18fb82d5b40dc5699da1c5410dac830d5ac1..cd1fb02934e4fc250e23cae492d006e7 MODULE_AUTHOR("Beniamino Galvani "); MODULE_DESCRIPTION("Rockchip SoC PWM driver"); diff --git a/drivers/pwm/sysfs.c b/drivers/pwm/sysfs.c -index 8d1254761e4dd2ab465008875573c71a7ecfa3e7..b5d6aa7e67399a3bee32d781cac1f6b2b6659629 100644 +index 8d1254761..b5d6aa7e6 100644 --- a/drivers/pwm/sysfs.c +++ b/drivers/pwm/sysfs.c @@ -103,6 +103,113 @@ static ssize_t duty_cycle_store(struct device *child, @@ -1240476,7 +1240468,7 @@ index 8d1254761e4dd2ab465008875573c71a7ecfa3e7..b5d6aa7e67399a3bee32d781cac1f6b2 &dev_attr_polarity.attr, &dev_attr_capture.attr, diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig -index 965d4f0c18a6c0bfaff78fd4a8e7b31cb099bd03..4c1eca4e92a083e6293f6fdb4dddd446eb53d6ca 100644 +index 965d4f0c1..4c1eca4e9 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -1107,16 +1107,35 @@ config REGULATOR_RC5T583 @@ -1240519,7 +1240511,7 @@ index 965d4f0c18a6c0bfaff78fd4a8e7b31cb099bd03..4c1eca4e92a083e6293f6fdb4dddd446 tristate "Ricoh RN5T567/618 voltage regulators" depends on MFD_RN5T618 diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile -index 23074714a81a3e8910c53f52e7b73a0f5604059a..3635dffe7c170ea97d605592eef65e594acefa8e 100644 +index 23074714a..3635dffe7 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -131,7 +131,9 @@ obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o @@ -1240533,7 +1240525,7 @@ index 23074714a81a3e8910c53f52e7b73a0f5604059a..3635dffe7c170ea97d605592eef65e59 obj-$(CONFIG_REGULATOR_ROHM) += rohm-regulator.o obj-$(CONFIG_REGULATOR_RT4801) += rt4801-regulator.o diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c -index a7b3e548ea5aca8c233ee154ec8155eff3d9b023..25a390d9ce4cfae9f8eb25924c168a26938df4ee 100644 +index a7b3e548e..25a390d9c 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -40,6 +40,7 @@ static LIST_HEAD(regulator_map_list); @@ -1241099,7 +1241091,7 @@ index a7b3e548ea5aca8c233ee154ec8155eff3d9b023..25a390d9ce4cfae9f8eb25924c168a26 static int regulator_late_cleanup(struct device *dev, void *data) { diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c -index 48f312167e5351b138ad6e2c8e759c90efca5e62..1960a2f0fd37a59625d52a17b627f4dae4ac0826 100644 +index 48f312167..1960a2f0f 100644 --- a/drivers/regulator/fan53555.c +++ b/drivers/regulator/fan53555.c @@ -652,6 +652,9 @@ static const struct of_device_id __maybe_unused fan53555_dt_ids[] = { @@ -1241113,7 +1241105,7 @@ index 48f312167e5351b138ad6e2c8e759c90efca5e62..1960a2f0fd37a59625d52a17b627f4da { } }; diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c -index e33d10df7a7633dae489f620f7b0a4a3afa55e1d..96f403c1251ca6b7d8592ea15bfaee0b063e0e19 100644 +index e33d10df7..96f403c12 100644 --- a/drivers/regulator/pwm-regulator.c +++ b/drivers/regulator/pwm-regulator.c @@ -41,6 +41,9 @@ struct pwm_regulator_data { @@ -1241176,7 +1241168,7 @@ index e33d10df7a7633dae489f620f7b0a4a3afa55e1d..96f403c1251ca6b7d8592ea15bfaee0b if (!init_data) diff --git a/drivers/regulator/rk806-regulator.c b/drivers/regulator/rk806-regulator.c new file mode 100644 -index 0000000000000000000000000000000000000000..3e33b3f585bec8c9eb0d3c7e3c7a83763f83bf61 +index 000000000..3e33b3f58 --- /dev/null +++ b/drivers/regulator/rk806-regulator.c @@ -0,0 +1,1229 @@ @@ -1242410,7 +1242402,7 @@ index 0000000000000000000000000000000000000000..3e33b3f585bec8c9eb0d3c7e3c7a8376 +MODULE_DESCRIPTION("rk806 voltage regulator driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c -index 867a2cf243f6866099a18ee70c1b0b1fbcfce70d..784d9244f7c1407a58a5112994ba00f423b3a13b 100644 +index 867a2cf24..784d9244f 100644 --- a/drivers/regulator/rk808-regulator.c +++ b/drivers/regulator/rk808-regulator.c @@ -3,11 +3,9 @@ @@ -1243812,7 +1243804,7 @@ index 867a2cf243f6866099a18ee70c1b0b1fbcfce70d..784d9244f7c1407a58a5112994ba00f4 MODULE_ALIAS("platform:rk808-regulator"); diff --git a/drivers/regulator/rk860x-regulator.c b/drivers/regulator/rk860x-regulator.c new file mode 100644 -index 0000000000000000000000000000000000000000..4596761bdb4041888c52a97dfc6151bca8595391 +index 000000000..4596761bd --- /dev/null +++ b/drivers/regulator/rk860x-regulator.c @@ -0,0 +1,607 @@ @@ -1244425,7 +1244417,7 @@ index 0000000000000000000000000000000000000000..4596761bdb4041888c52a97dfc6151bc +MODULE_LICENSE("GPL v2"); diff --git a/drivers/rk_nand/Kconfig b/drivers/rk_nand/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..c49a1c28b7029556a31e80082b2d1a0b07b3138f +index 000000000..c49a1c28b --- /dev/null +++ b/drivers/rk_nand/Kconfig @@ -0,0 +1,10 @@ @@ -1244441,7 +1244433,7 @@ index 0000000000000000000000000000000000000000..c49a1c28b7029556a31e80082b2d1a0b +endif diff --git a/drivers/rk_nand/Makefile b/drivers/rk_nand/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..dbd156f6e78b1c2b6406fb01d47f4e5c455e508d +index 000000000..dbd156f6e --- /dev/null +++ b/drivers/rk_nand/Makefile @@ -0,0 +1,9 @@ @@ -1244456,7 +1244448,7 @@ index 0000000000000000000000000000000000000000..dbd156f6e78b1c2b6406fb01d47f4e5c +endif diff --git a/drivers/rk_nand/rk_ftl_api.h b/drivers/rk_nand/rk_ftl_api.h new file mode 100644 -index 0000000000000000000000000000000000000000..ebde01e3dbb6ad141b49976a69ec2c79dc3c9cd2 +index 000000000..ebde01e3d --- /dev/null +++ b/drivers/rk_nand/rk_ftl_api.h @@ -0,0 +1,41 @@ @@ -1244503,7 +1244495,7 @@ index 0000000000000000000000000000000000000000..ebde01e3dbb6ad141b49976a69ec2c79 + diff --git a/drivers/rk_nand/rk_ftl_arm_v7.S b/drivers/rk_nand/rk_ftl_arm_v7.S new file mode 100755 -index 0000000000000000000000000000000000000000..da6f8a9667e31f191823d261a59cd787016a2f5c +index 000000000..da6f8a966 --- /dev/null +++ b/drivers/rk_nand/rk_ftl_arm_v7.S @@ -0,0 +1,30164 @@ @@ -1274673,7 +1274665,7 @@ index 0000000000000000000000000000000000000000..da6f8a9667e31f191823d261a59cd787 + .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 -index 0000000000000000000000000000000000000000..4cf752e4b834c9b89977e6e61470a2d814a6303c +index 000000000..4cf752e4b --- /dev/null +++ b/drivers/rk_nand/rk_ftl_arm_v7_thumb.S @@ -0,0 +1,30191 @@ @@ -1304870,7 +1304862,7 @@ index 0000000000000000000000000000000000000000..4cf752e4b834c9b89977e6e61470a2d8 + .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 -index 0000000000000000000000000000000000000000..537155f1fcde5c2ec6f5e1303c1e56b2026885ed +index 000000000..537155f1f --- /dev/null +++ b/drivers/rk_nand/rk_ftl_arm_v8.S @@ -0,0 +1,27968 @@ @@ -1332844,7 +1332836,7 @@ index 0000000000000000000000000000000000000000..537155f1fcde5c2ec6f5e1303c1e56b2 + .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 -index 0000000000000000000000000000000000000000..28d165342153ccb3cb2dad9a7d74c99e9dd6bafc +index 000000000..28d165342 --- /dev/null +++ b/drivers/rk_nand/rk_ftlv5_arm32.S @@ -0,0 +1,27611 @@ @@ -1360461,7 +1360453,7 @@ index 0000000000000000000000000000000000000000..28d165342153ccb3cb2dad9a7d74c99e + .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 -index 0000000000000000000000000000000000000000..260a57d855b5af7b143674983f2853168772e256 +index 000000000..260a57d85 --- /dev/null +++ b/drivers/rk_nand/rk_ftlv5_arm64.S @@ -0,0 +1,25632 @@ @@ -1386099,7 +1386091,7 @@ index 0000000000000000000000000000000000000000..260a57d855b5af7b143674983f285316 + .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 100644 -index 0000000000000000000000000000000000000000..9d5e2fb02baa57773d21e86dba015ba0d48ddbea +index 000000000..9d5e2fb02 --- /dev/null +++ b/drivers/rk_nand/rk_nand_base.c @@ -0,0 +1,456 @@ @@ -1386561,7 +1386553,7 @@ index 0000000000000000000000000000000000000000..9d5e2fb02baa57773d21e86dba015ba0 +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 100644 -index 0000000000000000000000000000000000000000..023e58d5fc5c037af2642e732ebcde6ebbcf666b +index 000000000..023e58d5f --- /dev/null +++ b/drivers/rk_nand/rk_nand_base.h @@ -0,0 +1,46 @@ @@ -1386613,7 +1386605,7 @@ index 0000000000000000000000000000000000000000..023e58d5fc5c037af2642e732ebcde6e +#endif diff --git a/drivers/rk_nand/rk_nand_blk.c b/drivers/rk_nand/rk_nand_blk.c new file mode 100644 -index 0000000000000000000000000000000000000000..d4c7f0d7cd14fc77c0189a5f7f4c554db6fa421b +index 000000000..d4c7f0d7c --- /dev/null +++ b/drivers/rk_nand/rk_nand_blk.c @@ -0,0 +1,700 @@ @@ -1387319,7 +1387311,7 @@ index 0000000000000000000000000000000000000000..d4c7f0d7cd14fc77c0189a5f7f4c554d +} diff --git a/drivers/rk_nand/rk_nand_blk.h b/drivers/rk_nand/rk_nand_blk.h new file mode 100644 -index 0000000000000000000000000000000000000000..681c625f50819bf7c0a8f85221bfd1cafaa9a87f +index 000000000..681c625f5 --- /dev/null +++ b/drivers/rk_nand/rk_nand_blk.h @@ -0,0 +1,67 @@ @@ -1387392,7 +1387384,7 @@ index 0000000000000000000000000000000000000000..681c625f50819bf7c0a8f85221bfd1ca +#endif diff --git a/drivers/rk_nand/rk_zftl_arm32.S b/drivers/rk_nand/rk_zftl_arm32.S new file mode 100755 -index 0000000000000000000000000000000000000000..4af2ab302d330a39c29279770ccd86cf9958683a +index 000000000..4af2ab302 --- /dev/null +++ b/drivers/rk_nand/rk_zftl_arm32.S @@ -0,0 +1,37094 @@ @@ -1424492,7 +1424484,7 @@ index 0000000000000000000000000000000000000000..4af2ab302d330a39c29279770ccd86cf + .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 -index 0000000000000000000000000000000000000000..943e37110677e656342e9f030740ebad8559b66c +index 000000000..943e37110 --- /dev/null +++ b/drivers/rk_nand/rk_zftl_arm64.S @@ -0,0 +1,35207 @@ @@ -1459705,7 +1459697,7 @@ index 0000000000000000000000000000000000000000..943e37110677e656342e9f030740ebad + .string "\0013vendor storage %x,%x,%x\n" diff --git a/drivers/rkflash/Kconfig b/drivers/rkflash/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..67527b25cc5fb51c73b4654221ac4e429a8153e7 +index 000000000..67527b25c --- /dev/null +++ b/drivers/rkflash/Kconfig @@ -0,0 +1,89 @@ @@ -1459800,7 +1459792,7 @@ index 0000000000000000000000000000000000000000..67527b25cc5fb51c73b4654221ac4e42 +endif # ARCH_ROCKCHIP diff --git a/drivers/rkflash/Makefile b/drivers/rkflash/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..319656b66ef09f1aabbdf4b31948eca0911db6ef +index 000000000..319656b66 --- /dev/null +++ b/drivers/rkflash/Makefile @@ -0,0 +1,27 @@ @@ -1459833,7 +1459825,7 @@ index 0000000000000000000000000000000000000000..319656b66ef09f1aabbdf4b31948eca0 +endif diff --git a/drivers/rkflash/flash.c b/drivers/rkflash/flash.c new file mode 100644 -index 0000000000000000000000000000000000000000..276d18a08bd27367c6fd15708ef2334a2ef4c58b +index 000000000..276d18a08 --- /dev/null +++ b/drivers/rkflash/flash.c @@ -0,0 +1,510 @@ @@ -1460349,7 +1460341,7 @@ index 0000000000000000000000000000000000000000..276d18a08bd27367c6fd15708ef2334a +} diff --git a/drivers/rkflash/flash.h b/drivers/rkflash/flash.h new file mode 100644 -index 0000000000000000000000000000000000000000..8f1284c9026a35cfd747a5e4b0c5e7d5217a6e3a +index 000000000..8f1284c90 --- /dev/null +++ b/drivers/rkflash/flash.h @@ -0,0 +1,132 @@ @@ -1460487,7 +1460479,7 @@ index 0000000000000000000000000000000000000000..8f1284c9026a35cfd747a5e4b0c5e7d5 +#endif diff --git a/drivers/rkflash/flash_com.h b/drivers/rkflash/flash_com.h new file mode 100644 -index 0000000000000000000000000000000000000000..da6eb29968a1d9bf9cfb61f01b284076afbbd65d +index 000000000..da6eb2996 --- /dev/null +++ b/drivers/rkflash/flash_com.h @@ -0,0 +1,77 @@ @@ -1460570,7 +1460562,7 @@ index 0000000000000000000000000000000000000000..da6eb29968a1d9bf9cfb61f01b284076 +#endif diff --git a/drivers/rkflash/nand_boot.c b/drivers/rkflash/nand_boot.c new file mode 100644 -index 0000000000000000000000000000000000000000..7db6ff9e7f483e295c03d531423b0844ff75c7ef +index 000000000..7db6ff9e7 --- /dev/null +++ b/drivers/rkflash/nand_boot.c @@ -0,0 +1,83 @@ @@ -1460659,7 +1460651,7 @@ index 0000000000000000000000000000000000000000..7db6ff9e7f483e295c03d531423b0844 + diff --git a/drivers/rkflash/nandc.c b/drivers/rkflash/nandc.c new file mode 100644 -index 0000000000000000000000000000000000000000..2ac3d69b15514bff72096daea0150a859f8c600b +index 000000000..2ac3d69b1 --- /dev/null +++ b/drivers/rkflash/nandc.c @@ -0,0 +1,472 @@ @@ -1461137,7 +1461129,7 @@ index 0000000000000000000000000000000000000000..2ac3d69b15514bff72096daea0150a85 +} diff --git a/drivers/rkflash/nandc.h b/drivers/rkflash/nandc.h new file mode 100644 -index 0000000000000000000000000000000000000000..e650493dbe4d2013bf6f3e143590e6d5f0334799 +index 000000000..e650493db --- /dev/null +++ b/drivers/rkflash/nandc.h @@ -0,0 +1,346 @@ @@ -1461489,7 +1461481,7 @@ index 0000000000000000000000000000000000000000..e650493dbe4d2013bf6f3e143590e6d5 +#endif diff --git a/drivers/rkflash/rk_sftl.h b/drivers/rkflash/rk_sftl.h new file mode 100644 -index 0000000000000000000000000000000000000000..378f83714b5d8b17367338c9f0359e33d9b578e5 +index 000000000..378f83714 --- /dev/null +++ b/drivers/rkflash/rk_sftl.h @@ -0,0 +1,48 @@ @@ -1461543,7 +1461535,7 @@ index 0000000000000000000000000000000000000000..378f83714b5d8b17367338c9f0359e33 +#endif diff --git a/drivers/rkflash/rk_sftl_arm_v7.S b/drivers/rkflash/rk_sftl_arm_v7.S new file mode 100755 -index 0000000000000000000000000000000000000000..4fa6a0a457c88c33bf9b68f1f11832889ae01ed3 +index 000000000..4fa6a0a45 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v7.S @@ -0,0 +1,15998 @@ @@ -1477547,7 +1477539,7 @@ index 0000000000000000000000000000000000000000..4fa6a0a457c88c33bf9b68f1f1183288 + .section .note.GNU-stack,"",%progbits diff --git a/drivers/rkflash/rk_sftl_arm_v7_thumb.S b/drivers/rkflash/rk_sftl_arm_v7_thumb.S new file mode 100755 -index 0000000000000000000000000000000000000000..4d1177156efe1e876dbcd1a7c062b22aeddf6482 +index 000000000..4d1177156 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v7_thumb.S @@ -0,0 +1,15535 @@ @@ -1493088,7 +1493080,7 @@ index 0000000000000000000000000000000000000000..4d1177156efe1e876dbcd1a7c062b22a + .section .note.GNU-stack,"",%progbits diff --git a/drivers/rkflash/rk_sftl_arm_v8.S b/drivers/rkflash/rk_sftl_arm_v8.S new file mode 100755 -index 0000000000000000000000000000000000000000..6e550cfe702c08f925c2716ae183812317f4184b +index 000000000..6e550cfe7 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v8.S @@ -0,0 +1,15782 @@ @@ -1508876,7 +1508868,7 @@ index 0000000000000000000000000000000000000000..6e550cfe702c08f925c2716ae1838123 + .align 3 diff --git a/drivers/rkflash/rk_sftl_arm_v8_clang.S b/drivers/rkflash/rk_sftl_arm_v8_clang.S new file mode 100755 -index 0000000000000000000000000000000000000000..864822c991c3dc465d5570e864fad70e310dce94 +index 000000000..864822c99 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v8_clang.S @@ -0,0 +1,22705 @@ @@ -1531587,7 +1531579,7 @@ index 0000000000000000000000000000000000000000..864822c991c3dc465d5570e864fad70e + .addrsig_sym rk_sftl_vendor_storage_fops diff --git a/drivers/rkflash/rkflash_api.h b/drivers/rkflash/rkflash_api.h new file mode 100644 -index 0000000000000000000000000000000000000000..7ddc9eafe96017f59dac909cfb214c50f7d34860 +index 000000000..7ddc9eafe --- /dev/null +++ b/drivers/rkflash/rkflash_api.h @@ -0,0 +1,58 @@ @@ -1531651,7 +1531643,7 @@ index 0000000000000000000000000000000000000000..7ddc9eafe96017f59dac909cfb214c50 +#endif diff --git a/drivers/rkflash/rkflash_blk.c b/drivers/rkflash/rkflash_blk.c new file mode 100644 -index 0000000000000000000000000000000000000000..4a45a014d3be83d345877631721f59387585d082 +index 000000000..4a45a014d --- /dev/null +++ b/drivers/rkflash/rkflash_blk.c @@ -0,0 +1,846 @@ @@ -1532503,7 +1532495,7 @@ index 0000000000000000000000000000000000000000..4a45a014d3be83d345877631721f5938 +} diff --git a/drivers/rkflash/rkflash_blk.h b/drivers/rkflash/rkflash_blk.h new file mode 100644 -index 0000000000000000000000000000000000000000..4781632525dcff6ec100b96553364263bf2ed8c1 +index 000000000..478163252 --- /dev/null +++ b/drivers/rkflash/rkflash_blk.h @@ -0,0 +1,117 @@ @@ -1532626,7 +1532618,7 @@ index 0000000000000000000000000000000000000000..4781632525dcff6ec100b96553364263 +#endif diff --git a/drivers/rkflash/rkflash_debug.c b/drivers/rkflash/rkflash_debug.c new file mode 100644 -index 0000000000000000000000000000000000000000..ce742b0382efab74dbefa9cb7b0c1ab5010f4d5c +index 000000000..ce742b038 --- /dev/null +++ b/drivers/rkflash/rkflash_debug.c @@ -0,0 +1,116 @@ @@ -1532748,7 +1532740,7 @@ index 0000000000000000000000000000000000000000..ce742b0382efab74dbefa9cb7b0c1ab5 +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 100644 -index 0000000000000000000000000000000000000000..3fe4068322e7636f92a18076e7348e5180c2927d +index 000000000..3fe406832 --- /dev/null +++ b/drivers/rkflash/rkflash_debug.h @@ -0,0 +1,42 @@ @@ -1532796,7 +1532788,7 @@ index 0000000000000000000000000000000000000000..3fe4068322e7636f92a18076e7348e51 + diff --git a/drivers/rkflash/rknandc_base.c b/drivers/rkflash/rknandc_base.c new file mode 100644 -index 0000000000000000000000000000000000000000..d2e97883dec42f27ef1f4892b96374b3ae99aa53 +index 000000000..d2e97883d --- /dev/null +++ b/drivers/rkflash/rknandc_base.c @@ -0,0 +1,192 @@ @@ -1532994,7 +1532986,7 @@ index 0000000000000000000000000000000000000000..d2e97883dec42f27ef1f4892b96374b3 +MODULE_ALIAS("rknandc"); diff --git a/drivers/rkflash/rksfc_base.c b/drivers/rkflash/rksfc_base.c new file mode 100644 -index 0000000000000000000000000000000000000000..fb420b216f867f082cb231761dcd4f0e625ef4cf +index 000000000..fb420b216 --- /dev/null +++ b/drivers/rkflash/rksfc_base.c @@ -0,0 +1,301 @@ @@ -1533301,7 +1533293,7 @@ index 0000000000000000000000000000000000000000..fb420b216f867f082cb231761dcd4f0e +MODULE_ALIAS("rksfc"); diff --git a/drivers/rkflash/sfc.c b/drivers/rkflash/sfc.c new file mode 100644 -index 0000000000000000000000000000000000000000..19773a8ec0fc3a97e26528cf111635e0cc50d12f +index 000000000..19773a8ec --- /dev/null +++ b/drivers/rkflash/sfc.c @@ -0,0 +1,269 @@ @@ -1533576,7 +1533568,7 @@ index 0000000000000000000000000000000000000000..19773a8ec0fc3a97e26528cf111635e0 +} diff --git a/drivers/rkflash/sfc.h b/drivers/rkflash/sfc.h new file mode 100644 -index 0000000000000000000000000000000000000000..918811a5cb3f99c8d0d5f94eb9e7a7fc9b52addd +index 000000000..918811a5c --- /dev/null +++ b/drivers/rkflash/sfc.h @@ -0,0 +1,229 @@ @@ -1533811,7 +1533803,7 @@ index 0000000000000000000000000000000000000000..918811a5cb3f99c8d0d5f94eb9e7a7fc +#endif diff --git a/drivers/rkflash/sfc_nand.c b/drivers/rkflash/sfc_nand.c new file mode 100644 -index 0000000000000000000000000000000000000000..4accf3d791c68bb21b16d2f94ea011f14b968ad2 +index 000000000..4accf3d79 --- /dev/null +++ b/drivers/rkflash/sfc_nand.c @@ -0,0 +1,1223 @@ @@ -1535040,7 +1535032,7 @@ index 0000000000000000000000000000000000000000..4accf3d791c68bb21b16d2f94ea011f1 +} diff --git a/drivers/rkflash/sfc_nand.h b/drivers/rkflash/sfc_nand.h new file mode 100644 -index 0000000000000000000000000000000000000000..43f4adf4508bd9afbf5411bf73dbc7938c31240b +index 000000000..43f4adf45 --- /dev/null +++ b/drivers/rkflash/sfc_nand.h @@ -0,0 +1,133 @@ @@ -1535179,7 +1535171,7 @@ index 0000000000000000000000000000000000000000..43f4adf4508bd9afbf5411bf73dbc793 +#endif diff --git a/drivers/rkflash/sfc_nand_boot.c b/drivers/rkflash/sfc_nand_boot.c new file mode 100644 -index 0000000000000000000000000000000000000000..d31628a4e61259843bf8af12648e2b9b89507608 +index 000000000..d31628a4e --- /dev/null +++ b/drivers/rkflash/sfc_nand_boot.c @@ -0,0 +1,105 @@ @@ -1535290,7 +1535282,7 @@ index 0000000000000000000000000000000000000000..d31628a4e61259843bf8af12648e2b9b +}; diff --git a/drivers/rkflash/sfc_nand_mtd.c b/drivers/rkflash/sfc_nand_mtd.c new file mode 100644 -index 0000000000000000000000000000000000000000..1b4d306050cf0687a860069d97c7110dd264a028 +index 000000000..1b4d30605 --- /dev/null +++ b/drivers/rkflash/sfc_nand_mtd.c @@ -0,0 +1,423 @@ @@ -1535719,7 +1535711,7 @@ index 0000000000000000000000000000000000000000..1b4d306050cf0687a860069d97c7110d +#endif diff --git a/drivers/rkflash/sfc_nand_mtd.h b/drivers/rkflash/sfc_nand_mtd.h new file mode 100644 -index 0000000000000000000000000000000000000000..0d49c74654ab4ce503f48736de7470187ab25836 +index 000000000..0d49c7465 --- /dev/null +++ b/drivers/rkflash/sfc_nand_mtd.h @@ -0,0 +1,82 @@ @@ -1535807,7 +1535799,7 @@ index 0000000000000000000000000000000000000000..0d49c74654ab4ce503f48736de747018 +#endif diff --git a/drivers/rkflash/sfc_nand_mtd_bbt.c b/drivers/rkflash/sfc_nand_mtd_bbt.c new file mode 100644 -index 0000000000000000000000000000000000000000..0fce0b9946540d37fc9c5346de91f84212aa9c57 +index 000000000..0fce0b994 --- /dev/null +++ b/drivers/rkflash/sfc_nand_mtd_bbt.c @@ -0,0 +1,615 @@ @@ -1536428,7 +1536420,7 @@ index 0000000000000000000000000000000000000000..0fce0b9946540d37fc9c5346de91f842 +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 100644 -index 0000000000000000000000000000000000000000..c38801b4fb0d7b3930b84e0127f3791d75433ab1 +index 000000000..c38801b4f --- /dev/null +++ b/drivers/rkflash/sfc_nor.c @@ -0,0 +1,796 @@ @@ -1537230,7 +1537222,7 @@ index 0000000000000000000000000000000000000000..c38801b4fb0d7b3930b84e0127f3791d + diff --git a/drivers/rkflash/sfc_nor.h b/drivers/rkflash/sfc_nor.h new file mode 100644 -index 0000000000000000000000000000000000000000..998121c1bd7af9df4e7d9d3dd3d0944746bb8f43 +index 000000000..998121c1b --- /dev/null +++ b/drivers/rkflash/sfc_nor.h @@ -0,0 +1,177 @@ @@ -1537413,7 +1537405,7 @@ index 0000000000000000000000000000000000000000..998121c1bd7af9df4e7d9d3dd3d09447 +#endif diff --git a/drivers/rkflash/sfc_nor_boot.c b/drivers/rkflash/sfc_nor_boot.c new file mode 100644 -index 0000000000000000000000000000000000000000..d6fa42b355bb1b4d8eaa975f889ea332be510e7d +index 000000000..d6fa42b35 --- /dev/null +++ b/drivers/rkflash/sfc_nor_boot.c @@ -0,0 +1,181 @@ @@ -1537600,7 +1537592,7 @@ index 0000000000000000000000000000000000000000..d6fa42b355bb1b4d8eaa975f889ea332 +}; diff --git a/drivers/rkflash/sfc_nor_mtd.c b/drivers/rkflash/sfc_nor_mtd.c new file mode 100644 -index 0000000000000000000000000000000000000000..8c9d69a581f216de13c712a9855ad916b6a88eb5 +index 000000000..8c9d69a58 --- /dev/null +++ b/drivers/rkflash/sfc_nor_mtd.c @@ -0,0 +1,266 @@ @@ -1537872,7 +1537864,7 @@ index 0000000000000000000000000000000000000000..8c9d69a581f216de13c712a9855ad916 +} diff --git a/drivers/rkflash/typedef.h b/drivers/rkflash/typedef.h new file mode 100644 -index 0000000000000000000000000000000000000000..5808ec281fa22c5d4f3707aa366f3d15125b27ce +index 000000000..5808ec281 --- /dev/null +++ b/drivers/rkflash/typedef.h @@ -0,0 +1,30 @@ @@ -1537908,7 +1537900,7 @@ index 0000000000000000000000000000000000000000..5808ec281fa22c5d4f3707aa366f3d15 +#endif /*__TYPEDEF_H */ diff --git a/drivers/rknpu/Kconfig b/drivers/rknpu/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..c3343eece9c6db2adcaefa1f45ffdb960b530ed7 +index 000000000..c3343eece --- /dev/null +++ b/drivers/rknpu/Kconfig @@ -0,0 +1,60 @@ @@ -1537974,7 +1537966,7 @@ index 0000000000000000000000000000000000000000..c3343eece9c6db2adcaefa1f45ffdb96 +endmenu diff --git a/drivers/rknpu/Makefile b/drivers/rknpu/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..d73563dbaf7d355992e5418a69f1669dcca9d6ba +index 000000000..d73563dba --- /dev/null +++ b/drivers/rknpu/Makefile @@ -0,0 +1,17 @@ @@ -1537997,7 +1537989,7 @@ index 0000000000000000000000000000000000000000..d73563dbaf7d355992e5418a69f1669d +rknpu-$(CONFIG_ROCKCHIP_RKNPU_DMA_HEAP) += rknpu_mem.o diff --git a/drivers/rknpu/include/rknpu_debugger.h b/drivers/rknpu/include/rknpu_debugger.h new file mode 100644 -index 0000000000000000000000000000000000000000..3f4420d443e1e0c4646b48d6285be3a621fc4e31 +index 000000000..3f4420d44 --- /dev/null +++ b/drivers/rknpu/include/rknpu_debugger.h @@ -0,0 +1,88 @@ @@ -1538091,7 +1538083,7 @@ index 0000000000000000000000000000000000000000..3f4420d443e1e0c4646b48d6285be3a6 +#endif /* __LINUX_RKNPU_FENCE_H_ */ diff --git a/drivers/rknpu/include/rknpu_devfreq.h b/drivers/rknpu/include/rknpu_devfreq.h new file mode 100644 -index 0000000000000000000000000000000000000000..3edeb1fe4a6bcff216d6f480c6a40e47bfd066f0 +index 000000000..3edeb1fe4 --- /dev/null +++ b/drivers/rknpu/include/rknpu_devfreq.h @@ -0,0 +1,46 @@ @@ -1538143,7 +1538135,7 @@ index 0000000000000000000000000000000000000000..3edeb1fe4a6bcff216d6f480c6a40e47 +#endif /* __LINUX_RKNPU_DEVFREQ_H_ */ diff --git a/drivers/rknpu/include/rknpu_drv.h b/drivers/rknpu/include/rknpu_drv.h new file mode 100644 -index 0000000000000000000000000000000000000000..ffb902856260bd44d298e1a8320427b3c1144225 +index 000000000..ffb902856 --- /dev/null +++ b/drivers/rknpu/include/rknpu_drv.h @@ -0,0 +1,176 @@ @@ -1538325,7 +1538317,7 @@ index 0000000000000000000000000000000000000000..ffb902856260bd44d298e1a8320427b3 +#endif /* __LINUX_RKNPU_DRV_H_ */ diff --git a/drivers/rknpu/include/rknpu_fence.h b/drivers/rknpu/include/rknpu_fence.h new file mode 100644 -index 0000000000000000000000000000000000000000..164f6de4116b33c19ad6a7ab772d39b9c786f981 +index 000000000..164f6de41 --- /dev/null +++ b/drivers/rknpu/include/rknpu_fence.h @@ -0,0 +1,24 @@ @@ -1538355,7 +1538347,7 @@ index 0000000000000000000000000000000000000000..164f6de4116b33c19ad6a7ab772d39b9 +#endif /* __LINUX_RKNPU_FENCE_H_ */ diff --git a/drivers/rknpu/include/rknpu_gem.h b/drivers/rknpu/include/rknpu_gem.h new file mode 100644 -index 0000000000000000000000000000000000000000..aedcab89d241999ec14d9a455042b2aa1ad6929c +index 000000000..aedcab89d --- /dev/null +++ b/drivers/rknpu/include/rknpu_gem.h @@ -0,0 +1,213 @@ @@ -1538574,7 +1538566,7 @@ index 0000000000000000000000000000000000000000..aedcab89d241999ec14d9a455042b2aa +#endif diff --git a/drivers/rknpu/include/rknpu_ioctl.h b/drivers/rknpu/include/rknpu_ioctl.h new file mode 100644 -index 0000000000000000000000000000000000000000..803caf0c92474975a78128414c62dfa5349804eb +index 000000000..803caf0c9 --- /dev/null +++ b/drivers/rknpu/include/rknpu_ioctl.h @@ -0,0 +1,319 @@ @@ -1538899,7 +1538891,7 @@ index 0000000000000000000000000000000000000000..803caf0c92474975a78128414c62dfa5 +#endif diff --git a/drivers/rknpu/include/rknpu_iommu.h b/drivers/rknpu/include/rknpu_iommu.h new file mode 100644 -index 0000000000000000000000000000000000000000..aa680c99761473cdefed06ca3f7470f294639d96 +index 000000000..aa680c997 --- /dev/null +++ b/drivers/rknpu/include/rknpu_iommu.h @@ -0,0 +1,40 @@ @@ -1538945,7 +1538937,7 @@ index 0000000000000000000000000000000000000000..aa680c99761473cdefed06ca3f7470f2 +#endif diff --git a/drivers/rknpu/include/rknpu_job.h b/drivers/rknpu/include/rknpu_job.h new file mode 100644 -index 0000000000000000000000000000000000000000..cd0d1dfb8363ce3a7a15ab1037afb8ce9f1b9200 +index 000000000..cd0d1dfb8 --- /dev/null +++ b/drivers/rknpu/include/rknpu_job.h @@ -0,0 +1,80 @@ @@ -1539031,7 +1539023,7 @@ index 0000000000000000000000000000000000000000..cd0d1dfb8363ce3a7a15ab1037afb8ce +#endif /* __LINUX_RKNPU_JOB_H_ */ diff --git a/drivers/rknpu/include/rknpu_mem.h b/drivers/rknpu/include/rknpu_mem.h new file mode 100644 -index 0000000000000000000000000000000000000000..69975408f434141cc972897803d7bf52242600da +index 000000000..69975408f --- /dev/null +++ b/drivers/rknpu/include/rknpu_mem.h @@ -0,0 +1,46 @@ @@ -1539083,7 +1539075,7 @@ index 0000000000000000000000000000000000000000..69975408f434141cc972897803d7bf52 +#endif diff --git a/drivers/rknpu/include/rknpu_mm.h b/drivers/rknpu/include/rknpu_mm.h new file mode 100644 -index 0000000000000000000000000000000000000000..73ae6d7cef9821440e895636bd6dbe52e5bbfb84 +index 000000000..73ae6d7ce --- /dev/null +++ b/drivers/rknpu/include/rknpu_mm.h @@ -0,0 +1,42 @@ @@ -1539131,7 +1539123,7 @@ index 0000000000000000000000000000000000000000..73ae6d7cef9821440e895636bd6dbe52 +#endif diff --git a/drivers/rknpu/include/rknpu_reset.h b/drivers/rknpu/include/rknpu_reset.h new file mode 100644 -index 0000000000000000000000000000000000000000..b80e29b321b0ef857328bf83827b5c00475ef847 +index 000000000..b80e29b32 --- /dev/null +++ b/drivers/rknpu/include/rknpu_reset.h @@ -0,0 +1,18 @@ @@ -1539155,7 +1539147,7 @@ index 0000000000000000000000000000000000000000..b80e29b321b0ef857328bf83827b5c00 +#endif diff --git a/drivers/rknpu/rknpu_debugger.c b/drivers/rknpu/rknpu_debugger.c new file mode 100644 -index 0000000000000000000000000000000000000000..0cfec7fe7c19957614ecb9e5dd0dea962aac7289 +index 000000000..0cfec7fe7 --- /dev/null +++ b/drivers/rknpu/rknpu_debugger.c @@ -0,0 +1,605 @@ @@ -1539766,7 +1539758,7 @@ index 0000000000000000000000000000000000000000..0cfec7fe7c19957614ecb9e5dd0dea96 +} diff --git a/drivers/rknpu/rknpu_devfreq.c b/drivers/rknpu/rknpu_devfreq.c new file mode 100644 -index 0000000000000000000000000000000000000000..a2a83a9ccd9e3d8ee7db381e148d53516966502b +index 000000000..a2a83a9cc --- /dev/null +++ b/drivers/rknpu/rknpu_devfreq.c @@ -0,0 +1,765 @@ @@ -1540537,7 +1540529,7 @@ index 0000000000000000000000000000000000000000..a2a83a9ccd9e3d8ee7db381e148d5351 +EXPORT_SYMBOL(rknpu_devfreq_remove); diff --git a/drivers/rknpu/rknpu_drv.c b/drivers/rknpu/rknpu_drv.c new file mode 100644 -index 0000000000000000000000000000000000000000..c27ac34847a73b21ddc8556b2185e70dc8dff1e5 +index 000000000..c27ac3484 --- /dev/null +++ b/drivers/rknpu/rknpu_drv.c @@ -0,0 +1,1501 @@ @@ -1542044,7 +1542036,7 @@ index 0000000000000000000000000000000000000000..c27ac34847a73b21ddc8556b2185e70d +#endif diff --git a/drivers/rknpu/rknpu_fence.c b/drivers/rknpu/rknpu_fence.c new file mode 100644 -index 0000000000000000000000000000000000000000..dc22ea1c4e120abab4293bf02ca2a152a92e0bc8 +index 000000000..dc22ea1c4 --- /dev/null +++ b/drivers/rknpu/rknpu_fence.c @@ -0,0 +1,80 @@ @@ -1542130,7 +1542122,7 @@ index 0000000000000000000000000000000000000000..dc22ea1c4e120abab4293bf02ca2a152 +} diff --git a/drivers/rknpu/rknpu_gem.c b/drivers/rknpu/rknpu_gem.c new file mode 100644 -index 0000000000000000000000000000000000000000..60ad44804a5e46a38478912bbf3873bcb65aa3e1 +index 000000000..60ad44804 --- /dev/null +++ b/drivers/rknpu/rknpu_gem.c @@ -0,0 +1,1506 @@ @@ -1543642,7 +1543634,7 @@ index 0000000000000000000000000000000000000000..60ad44804a5e46a38478912bbf3873bc +} diff --git a/drivers/rknpu/rknpu_iommu.c b/drivers/rknpu/rknpu_iommu.c new file mode 100644 -index 0000000000000000000000000000000000000000..01620d9c305603734998e3c018600bdf920f9301 +index 000000000..01620d9c3 --- /dev/null +++ b/drivers/rknpu/rknpu_iommu.c @@ -0,0 +1,61 @@ @@ -1543709,7 +1543701,7 @@ index 0000000000000000000000000000000000000000..01620d9c305603734998e3c018600bdf +} diff --git a/drivers/rknpu/rknpu_job.c b/drivers/rknpu/rknpu_job.c new file mode 100644 -index 0000000000000000000000000000000000000000..e13488dfc6b366c4dbf8c56da4d9cd086b334fee +index 000000000..e13488dfc --- /dev/null +++ b/drivers/rknpu/rknpu_job.c @@ -0,0 +1,1044 @@ @@ -1544759,7 +1544751,7 @@ index 0000000000000000000000000000000000000000..e13488dfc6b366c4dbf8c56da4d9cd08 +} diff --git a/drivers/rknpu/rknpu_mem.c b/drivers/rknpu/rknpu_mem.c new file mode 100644 -index 0000000000000000000000000000000000000000..858c21f484f5e3a6cd8cfb1361ed5c378743f9a3 +index 000000000..858c21f48 --- /dev/null +++ b/drivers/rknpu/rknpu_mem.c @@ -0,0 +1,347 @@ @@ -1545112,7 +1545104,7 @@ index 0000000000000000000000000000000000000000..858c21f484f5e3a6cd8cfb1361ed5c37 +#endif diff --git a/drivers/rknpu/rknpu_mm.c b/drivers/rknpu/rknpu_mm.c new file mode 100644 -index 0000000000000000000000000000000000000000..a21bb6ded182795cb2880bfec018063d02d42dc4 +index 000000000..a21bb6ded --- /dev/null +++ b/drivers/rknpu/rknpu_mm.c @@ -0,0 +1,238 @@ @@ -1545356,7 +1545348,7 @@ index 0000000000000000000000000000000000000000..a21bb6ded182795cb2880bfec018063d +} diff --git a/drivers/rknpu/rknpu_reset.c b/drivers/rknpu/rknpu_reset.c new file mode 100644 -index 0000000000000000000000000000000000000000..36657a7852feba9d9de6bcc636e1208c6196d478 +index 000000000..36657a785 --- /dev/null +++ b/drivers/rknpu/rknpu_reset.c @@ -0,0 +1,155 @@ @@ -1545516,7 +1545508,7 @@ index 0000000000000000000000000000000000000000..36657a7852feba9d9de6bcc636e1208c + return 0; +} diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig -index d7502433c78aa318a1a8baf1b835d1d4e1e639f3..406dfd983b2c66c3c95206b7c1884443ab670fff 100644 +index d7502433c..406dfd983 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -393,16 +393,36 @@ config RTC_DRV_NCT3018Y @@ -1545560,7 +1545552,7 @@ index d7502433c78aa318a1a8baf1b835d1d4e1e639f3..406dfd983b2c66c3c95206b7c1884443 tristate "Ricoh R2025S/D, RS5C372A/B, RV5C386, RV5C387A" help diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile -index fd209883ee2efd118c992f010fde9935c186c816..d8e039f4fe9cdf0f65202ca2d542cc938e7675f5 100644 +index fd209883e..d8e039f4f 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -137,7 +137,9 @@ obj-$(CONFIG_RTC_DRV_R7301) += rtc-r7301.o @@ -1545575,7 +1545567,7 @@ index fd209883ee2efd118c992f010fde9935c186c816..d8e039f4fe9cdf0f65202ca2d542cc93 obj-$(CONFIG_RTC_DRV_RS5C348) += rtc-rs5c348.o diff --git a/drivers/rtc/rtc-fake.c b/drivers/rtc/rtc-fake.c new file mode 100644 -index 0000000000000000000000000000000000000000..0b2cf0e7fbfa87dcbb95344bc6d192e5475cdb89 +index 000000000..0b2cf0e7f --- /dev/null +++ b/drivers/rtc/rtc-fake.c @@ -0,0 +1,116 @@ @@ -1545696,7 +1545688,7 @@ index 0000000000000000000000000000000000000000..0b2cf0e7fbfa87dcbb95344bc6d192e5 +MODULE_LICENSE("GPL"); + diff --git a/drivers/rtc/rtc-hym8563.c b/drivers/rtc/rtc-hym8563.c -index b018535c842b376adce85d2f584a8c85b0286e5c..955a3b7e5f4fd58976b47cc2515a839232e546a4 100644 +index b018535c8..955a3b7e5 100644 --- a/drivers/rtc/rtc-hym8563.c +++ b/drivers/rtc/rtc-hym8563.c @@ -97,12 +97,6 @@ static int hym8563_rtc_read_time(struct device *dev, struct rtc_time *tm) @@ -1545836,7 +1545828,7 @@ index b018535c842b376adce85d2f584a8c85b0286e5c..955a3b7e5f4fd58976b47cc2515a8392 clear_bit(RTC_FEATURE_UPDATE_INTERRUPT, hym8563->rtc->features); diff --git a/drivers/rtc/rtc-rk-timer.c b/drivers/rtc/rtc-rk-timer.c new file mode 100644 -index 0000000000000000000000000000000000000000..aa88fd6de2a147e688c574d9c938de5c1e1e8673 +index 000000000..aa88fd6de --- /dev/null +++ b/drivers/rtc/rtc-rk-timer.c @@ -0,0 +1,508 @@ @@ -1546350,7 +1546342,7 @@ index 0000000000000000000000000000000000000000..aa88fd6de2a147e688c574d9c938de5c +MODULE_ALIAS("platform:" DRV_NAME); diff --git a/drivers/rtc/rtc-rk630.c b/drivers/rtc/rtc-rk630.c new file mode 100644 -index 0000000000000000000000000000000000000000..c9c08914c135bb1234f2902698effbff5df1e993 +index 000000000..c9c08914c --- /dev/null +++ b/drivers/rtc/rtc-rk630.c @@ -0,0 +1,637 @@ @@ -1546992,7 +1546984,7 @@ index 0000000000000000000000000000000000000000..c9c08914c135bb1234f2902698effbff +MODULE_AUTHOR("Zhang Qing "); +MODULE_LICENSE("GPL"); diff --git a/drivers/rtc/rtc-rk808.c b/drivers/rtc/rtc-rk808.c -index 2d9bcb3ce1e3b93b7c67f0c32d0628aba91f8fd9..40df3fac9c69fe287fbaace612ae547feb0e24f1 100644 +index 2d9bcb3ce..40df3fac9 100644 --- a/drivers/rtc/rtc-rk808.c +++ b/drivers/rtc/rtc-rk808.c @@ -14,6 +14,7 @@ @@ -1547301,7 +1547293,7 @@ index 2d9bcb3ce1e3b93b7c67f0c32d0628aba91f8fd9..40df3fac9c69fe287fbaace612ae547f dev_err(&pdev->dev, diff --git a/drivers/rtc/rtc-rockchip.c b/drivers/rtc/rtc-rockchip.c new file mode 100644 -index 0000000000000000000000000000000000000000..5ea695c2f2f34e10dc54d5638b19e0e66131c063 +index 000000000..5ea695c2f --- /dev/null +++ b/drivers/rtc/rtc-rockchip.c @@ -0,0 +1,810 @@ @@ -1548116,7 +1548108,7 @@ index 0000000000000000000000000000000000000000..5ea695c2f2f34e10dc54d5638b19e0e6 +MODULE_AUTHOR("Zhang Qing "); +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/Kconfig b/drivers/soc/rockchip/Kconfig -index aff2f7e95237434f1cd1665b9feb6ec9debad217..503d83beb4940845d6870b22fd03d83be20cc336 100644 +index aff2f7e95..503d83beb 100644 --- a/drivers/soc/rockchip/Kconfig +++ b/drivers/soc/rockchip/Kconfig @@ -1,12 +1,65 @@ @@ -1548426,7 +1548418,7 @@ index aff2f7e95237434f1cd1665b9feb6ec9debad217..503d83beb4940845d6870b22fd03d83b endif diff --git a/drivers/soc/rockchip/Kconfig.cpu b/drivers/soc/rockchip/Kconfig.cpu new file mode 100644 -index 0000000000000000000000000000000000000000..1ffc763434bfceb81106f15b8ecd34041f8b1a56 +index 000000000..1ffc76343 --- /dev/null +++ b/drivers/soc/rockchip/Kconfig.cpu @@ -0,0 +1,72 @@ @@ -1548503,7 +1548495,7 @@ index 0000000000000000000000000000000000000000..1ffc763434bfceb81106f15b8ecd3404 + +endmenu diff --git a/drivers/soc/rockchip/Makefile b/drivers/soc/rockchip/Makefile -index 23d414433c8c58557effc214337ec8e6ff17a461..8015b2c47bf218e8a2fa59fe6f3c1e7a1e052be1 100644 +index 23d414433..8015b2c47 100644 --- a/drivers/soc/rockchip/Makefile +++ b/drivers/soc/rockchip/Makefile @@ -2,6 +2,35 @@ @@ -1548544,7 +1548536,7 @@ index 23d414433c8c58557effc214337ec8e6ff17a461..8015b2c47bf218e8a2fa59fe6f3c1e7a +obj-$(CONFIG_ROCKCHIP_MINIDUMP) += minidump/ diff --git a/drivers/soc/rockchip/fiq_debugger/Kconfig b/drivers/soc/rockchip/fiq_debugger/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..4805100b127ab52086e69394de23b051effba18d +index 000000000..4805100b1 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/Kconfig @@ -0,0 +1,87 @@ @@ -1548637,7 +1548629,7 @@ index 0000000000000000000000000000000000000000..4805100b127ab52086e69394de23b051 + Say y here to enable Rockchip FIQ Debugger platform driver. diff --git a/drivers/soc/rockchip/fiq_debugger/Makefile b/drivers/soc/rockchip/fiq_debugger/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..6ac2cd61bf8e79214eb88eb2b11b1ed476230202 +index 000000000..6ac2cd61b --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/Makefile @@ -0,0 +1,3 @@ @@ -1548646,7 +1548638,7 @@ index 0000000000000000000000000000000000000000..6ac2cd61bf8e79214eb88eb2b11b1ed4 +obj-$(CONFIG_ROCKCHIP_FIQ_DEBUGGER) += rk_fiq_debugger.o diff --git a/drivers/soc/rockchip/fiq_debugger/fiq_debugger.c b/drivers/soc/rockchip/fiq_debugger/fiq_debugger.c new file mode 100644 -index 0000000000000000000000000000000000000000..373efed6965cb0c53a5f79b7e3bcf067f7bc42df +index 000000000..373efed69 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger.c @@ -0,0 +1,1729 @@ @@ -1550381,7 +1550373,7 @@ index 0000000000000000000000000000000000000000..373efed6965cb0c53a5f79b7e3bcf067 +MODULE_ALIAS("platform:fiq-debugger"); diff --git a/drivers/soc/rockchip/fiq_debugger/fiq_debugger.h b/drivers/soc/rockchip/fiq_debugger/fiq_debugger.h new file mode 100644 -index 0000000000000000000000000000000000000000..e2003e47904d5a1cf36f8def83a843d06c13eed1 +index 000000000..e2003e479 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger.h @@ -0,0 +1,81 @@ @@ -1550468,7 +1550460,7 @@ index 0000000000000000000000000000000000000000..e2003e47904d5a1cf36f8def83a843d0 +#endif diff --git a/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm.c b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm.c new file mode 100644 -index 0000000000000000000000000000000000000000..d44287eba4bd8867e5ccb72a94d29d5a060bba02 +index 000000000..d44287eba --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm.c @@ -0,0 +1,270 @@ @@ -1550744,7 +1550736,7 @@ index 0000000000000000000000000000000000000000..d44287eba4bd8867e5ccb72a94d29d5a +#endif diff --git a/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm64.c b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm64.c new file mode 100644 -index 0000000000000000000000000000000000000000..d77b1ebdcde70cf1c27db254a27563c752d7bb9d +index 000000000..d77b1ebdc --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm64.c @@ -0,0 +1,204 @@ @@ -1550954,7 +1550946,7 @@ index 0000000000000000000000000000000000000000..d77b1ebdcde70cf1c27db254a27563c7 +#endif diff --git a/drivers/soc/rockchip/fiq_debugger/fiq_debugger_priv.h b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_priv.h new file mode 100644 -index 0000000000000000000000000000000000000000..915860a6b38a655098f0567d60ef8f725729d70f +index 000000000..915860a6b --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_priv.h @@ -0,0 +1,39 @@ @@ -1550999,7 +1550991,7 @@ index 0000000000000000000000000000000000000000..915860a6b38a655098f0567d60ef8f72 +#endif diff --git a/drivers/soc/rockchip/fiq_debugger/fiq_debugger_ringbuf.h b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_ringbuf.h new file mode 100644 -index 0000000000000000000000000000000000000000..10c3c5d09098e108f260e44285194416db7c972b +index 000000000..10c3c5d09 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_ringbuf.h @@ -0,0 +1,94 @@ @@ -1551099,7 +1551091,7 @@ index 0000000000000000000000000000000000000000..10c3c5d09098e108f260e44285194416 +} diff --git a/drivers/soc/rockchip/fiq_debugger/fiq_watchdog.c b/drivers/soc/rockchip/fiq_debugger/fiq_watchdog.c new file mode 100644 -index 0000000000000000000000000000000000000000..194b541384177215ab41211ff7027b806d3270b5 +index 000000000..194b54138 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_watchdog.c @@ -0,0 +1,56 @@ @@ -1551161,7 +1551153,7 @@ index 0000000000000000000000000000000000000000..194b541384177215ab41211ff7027b80 +} diff --git a/drivers/soc/rockchip/fiq_debugger/fiq_watchdog.h b/drivers/soc/rockchip/fiq_debugger/fiq_watchdog.h new file mode 100644 -index 0000000000000000000000000000000000000000..c6b507f8d976803c23fa254ba1f97374c2d1fd4c +index 000000000..c6b507f8d --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_watchdog.h @@ -0,0 +1,20 @@ @@ -1551187,7 +1551179,7 @@ index 0000000000000000000000000000000000000000..c6b507f8d976803c23fa254ba1f97374 +#endif diff --git a/drivers/soc/rockchip/fiq_debugger/rk_fiq_debugger.c b/drivers/soc/rockchip/fiq_debugger/rk_fiq_debugger.c new file mode 100644 -index 0000000000000000000000000000000000000000..e5421e4515d2908321ff73ac92012bf07218a5e4 +index 000000000..e5421e451 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/rk_fiq_debugger.c @@ -0,0 +1,1136 @@ @@ -1552329,7 +1552321,7 @@ index 0000000000000000000000000000000000000000..e5421e4515d2908321ff73ac92012bf0 +MODULE_ALIAS("platform:rk-fiq-debugger"); diff --git a/drivers/soc/rockchip/fiq_debugger/rk_fiq_debugger.h b/drivers/soc/rockchip/fiq_debugger/rk_fiq_debugger.h new file mode 100644 -index 0000000000000000000000000000000000000000..f5ec8d143b2252903f51332711cda9fc94bf3c99 +index 000000000..f5ec8d143 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/rk_fiq_debugger.h @@ -0,0 +1,22 @@ @@ -1552357,7 +1552349,7 @@ index 0000000000000000000000000000000000000000..f5ec8d143b2252903f51332711cda9fc +#endif diff --git a/drivers/soc/rockchip/flash_vendor_storage.c b/drivers/soc/rockchip/flash_vendor_storage.c new file mode 100644 -index 0000000000000000000000000000000000000000..7c8cd338d286aafa79ca4085dcda29685428bd55 +index 000000000..7c8cd338d --- /dev/null +++ b/drivers/soc/rockchip/flash_vendor_storage.c @@ -0,0 +1,342 @@ @@ -1552705,7 +1552697,7 @@ index 0000000000000000000000000000000000000000..7c8cd338d286aafa79ca4085dcda2968 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/flash_vendor_storage.h b/drivers/soc/rockchip/flash_vendor_storage.h new file mode 100644 -index 0000000000000000000000000000000000000000..55ca52486de7a8863fd97a52b5670f7b5b4de6a4 +index 000000000..55ca52486 --- /dev/null +++ b/drivers/soc/rockchip/flash_vendor_storage.h @@ -0,0 +1,16 @@ @@ -1552726,7 +1552718,7 @@ index 0000000000000000000000000000000000000000..55ca52486de7a8863fd97a52b5670f7b +#endif + diff --git a/drivers/soc/rockchip/grf.c b/drivers/soc/rockchip/grf.c -index 5fd62046b28aae0523c7250901b86107872917da..b68556f542dde6b831cbe9d05a0bbdc00ef7166e 100644 +index 5fd62046b..b68556f54 100644 --- a/drivers/soc/rockchip/grf.c +++ b/drivers/soc/rockchip/grf.c @@ -5,12 +5,105 @@ @@ -1552979,7 +1552971,7 @@ index 5fd62046b28aae0523c7250901b86107872917da..b68556f542dde6b831cbe9d05a0bbdc0 +MODULE_DESCRIPTION("Rockchip GRF"); +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/io-domain.c b/drivers/soc/rockchip/io-domain.c -index 6619256c2d1180f2a24e5c1a595bafe1d2c65c16..26ca59f4322724fdb5df8df8a2760d669c6e555a 100644 +index 6619256c2..26ca59f43 100644 --- a/drivers/soc/rockchip/io-domain.c +++ b/drivers/soc/rockchip/io-domain.c @@ -14,6 +14,13 @@ @@ -1553310,7 +1553302,7 @@ index 6619256c2d1180f2a24e5c1a595bafe1d2c65c16..26ca59f4322724fdb5df8df8a2760d66 MODULE_AUTHOR("Heiko Stuebner "); diff --git a/drivers/soc/rockchip/iomux.c b/drivers/soc/rockchip/iomux.c new file mode 100644 -index 0000000000000000000000000000000000000000..110feb7f839df531f418177c94a8c9196ece051e +index 000000000..110feb7f8 --- /dev/null +++ b/drivers/soc/rockchip/iomux.c @@ -0,0 +1,88 @@ @@ -1553404,7 +1553396,7 @@ index 0000000000000000000000000000000000000000..110feb7f839df531f418177c94a8c919 +late_initcall(rk_iomux_device_create); diff --git a/drivers/soc/rockchip/minidump/Kconfig b/drivers/soc/rockchip/minidump/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..64dc1465004b607a0db23ea494b391c0dd8b25b8 +index 000000000..64dc14650 --- /dev/null +++ b/drivers/soc/rockchip/minidump/Kconfig @@ -0,0 +1,40 @@ @@ -1553450,7 +1553442,7 @@ index 0000000000000000000000000000000000000000..64dc1465004b607a0db23ea494b391c0 +endmenu diff --git a/drivers/soc/rockchip/minidump/Makefile b/drivers/soc/rockchip/minidump/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..7f799a034c01a48ebd6d73dc5e67f84e182f3c23 +index 000000000..7f799a034 --- /dev/null +++ b/drivers/soc/rockchip/minidump/Makefile @@ -0,0 +1,3 @@ @@ -1553459,7 +1553451,7 @@ index 0000000000000000000000000000000000000000..7f799a034c01a48ebd6d73dc5e67f84e +rockchip_minidump-y := rk_minidump.o minidump_log.o minidump_memory.o rk_minidump_asm.o diff --git a/drivers/soc/rockchip/minidump/elf.h b/drivers/soc/rockchip/minidump/elf.h new file mode 100644 -index 0000000000000000000000000000000000000000..dbccd0316008be3f5cedea4d484ec4d678cb6817 +index 000000000..dbccd0316 --- /dev/null +++ b/drivers/soc/rockchip/minidump/elf.h @@ -0,0 +1,45 @@ @@ -1553510,7 +1553502,7 @@ index 0000000000000000000000000000000000000000..dbccd0316008be3f5cedea4d484ec4d6 +#endif diff --git a/drivers/soc/rockchip/minidump/minidump_log.c b/drivers/soc/rockchip/minidump/minidump_log.c new file mode 100644 -index 0000000000000000000000000000000000000000..18b1934e9356749ae1d64c597b2a7647c12941e9 +index 000000000..18b1934e9 --- /dev/null +++ b/drivers/soc/rockchip/minidump/minidump_log.c @@ -0,0 +1,1508 @@ @@ -1555024,7 +1555016,7 @@ index 0000000000000000000000000000000000000000..18b1934e9356749ae1d64c597b2a7647 +} diff --git a/drivers/soc/rockchip/minidump/minidump_memory.c b/drivers/soc/rockchip/minidump/minidump_memory.c new file mode 100644 -index 0000000000000000000000000000000000000000..d7f93e2f12b68337388dae1edfcde7d1e1650345 +index 000000000..d7f93e2f1 --- /dev/null +++ b/drivers/soc/rockchip/minidump/minidump_memory.c @@ -0,0 +1,1350 @@ @@ -1556380,7 +1556372,7 @@ index 0000000000000000000000000000000000000000..d7f93e2f12b68337388dae1edfcde7d1 +} diff --git a/drivers/soc/rockchip/minidump/minidump_memory.h b/drivers/soc/rockchip/minidump/minidump_memory.h new file mode 100644 -index 0000000000000000000000000000000000000000..086f1f89a090ff4493f71df9b414f4a7cbdb14dd +index 000000000..086f1f89a --- /dev/null +++ b/drivers/soc/rockchip/minidump/minidump_memory.h @@ -0,0 +1,51 @@ @@ -1556437,7 +1556429,7 @@ index 0000000000000000000000000000000000000000..086f1f89a090ff4493f71df9b414f4a7 +void md_debugfs_dmabufprocs(struct dentry *minidump_dir); diff --git a/drivers/soc/rockchip/minidump/minidump_private.h b/drivers/soc/rockchip/minidump/minidump_private.h new file mode 100644 -index 0000000000000000000000000000000000000000..f2dadce35bf0c84565be6d046943d8f1b87a76d0 +index 000000000..f2dadce35 --- /dev/null +++ b/drivers/soc/rockchip/minidump/minidump_private.h @@ -0,0 +1,90 @@ @@ -1556533,7 +1556525,7 @@ index 0000000000000000000000000000000000000000..f2dadce35bf0c84565be6d046943d8f1 +#endif diff --git a/drivers/soc/rockchip/minidump/rk_minidump.c b/drivers/soc/rockchip/minidump/rk_minidump.c new file mode 100644 -index 0000000000000000000000000000000000000000..d742b7e2eda68419b57514feed8ff3a9fbee8498 +index 000000000..d742b7e2e --- /dev/null +++ b/drivers/soc/rockchip/minidump/rk_minidump.c @@ -0,0 +1,779 @@ @@ -1557318,7 +1557310,7 @@ index 0000000000000000000000000000000000000000..d742b7e2eda68419b57514feed8ff3a9 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/minidump/rk_minidump_asm.S b/drivers/soc/rockchip/minidump/rk_minidump_asm.S new file mode 100755 -index 0000000000000000000000000000000000000000..c8fa137be25e52452be0cd503ee6395d090fbb80 +index 000000000..c8fa137be --- /dev/null +++ b/drivers/soc/rockchip/minidump/rk_minidump_asm.S @@ -0,0 +1,23 @@ @@ -1557347,7 +1557339,7 @@ index 0000000000000000000000000000000000000000..c8fa137be25e52452be0cd503ee6395d +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 100644 -index 0000000000000000000000000000000000000000..1f32930d906c32726b3d1aed1fae0074fdafebc9 +index 000000000..1f32930d9 --- /dev/null +++ b/drivers/soc/rockchip/mtd_vendor_storage.c @@ -0,0 +1,445 @@ @@ -1557798,7 +1557790,7 @@ index 0000000000000000000000000000000000000000..1f32930d906c32726b3d1aed1fae0074 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/ram_vendor_storage.c b/drivers/soc/rockchip/ram_vendor_storage.c new file mode 100644 -index 0000000000000000000000000000000000000000..eb9768d88d3d459f687bf5a6065b058506a2e1a4 +index 000000000..eb9768d88 --- /dev/null +++ b/drivers/soc/rockchip/ram_vendor_storage.c @@ -0,0 +1,214 @@ @@ -1558018,7 +1558010,7 @@ index 0000000000000000000000000000000000000000..eb9768d88d3d459f687bf5a6065b0585 +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 100644 -index 0000000000000000000000000000000000000000..55823b3839b283fa2c2e6174dc72771eddd64f69 +index 000000000..55823b383 --- /dev/null +++ b/drivers/soc/rockchip/rk_camera_sensor_info.h @@ -0,0 +1,421 @@ @@ -1558445,7 +1558437,7 @@ index 0000000000000000000000000000000000000000..55823b3839b283fa2c2e6174dc72771e +#endif diff --git a/drivers/soc/rockchip/rk_cma_procfs.c b/drivers/soc/rockchip/rk_cma_procfs.c new file mode 100644 -index 0000000000000000000000000000000000000000..b2e48b5718c46c95bb3d8c096aee98d6c1345ec3 +index 000000000..b2e48b571 --- /dev/null +++ b/drivers/soc/rockchip/rk_cma_procfs.c @@ -0,0 +1,93 @@ @@ -1558544,7 +1558536,7 @@ index 0000000000000000000000000000000000000000..b2e48b5718c46c95bb3d8c096aee98d6 +MODULE_ALIAS("platform:rk-cma"); diff --git a/drivers/soc/rockchip/rk_dmabuf_procfs.c b/drivers/soc/rockchip/rk_dmabuf_procfs.c new file mode 100644 -index 0000000000000000000000000000000000000000..e389449a10ef5f0cfa14003aee0218e0853310c7 +index 000000000..e389449a1 --- /dev/null +++ b/drivers/soc/rockchip/rk_dmabuf_procfs.c @@ -0,0 +1,206 @@ @@ -1558756,7 +1558748,7 @@ index 0000000000000000000000000000000000000000..e389449a10ef5f0cfa14003aee0218e0 +MODULE_ALIAS("platform:rk-dmabuf"); diff --git a/drivers/soc/rockchip/rk_memblock_procfs.c b/drivers/soc/rockchip/rk_memblock_procfs.c new file mode 100644 -index 0000000000000000000000000000000000000000..f888c9c187384e40d347f37eaa3d59fad1ea372f +index 000000000..f888c9c18 --- /dev/null +++ b/drivers/soc/rockchip/rk_memblock_procfs.c @@ -0,0 +1,50 @@ @@ -1558812,7 +1558804,7 @@ index 0000000000000000000000000000000000000000..f888c9c187384e40d347f37eaa3d59fa +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 100644 -index 0000000000000000000000000000000000000000..a8a316e47ff97c6ac3768bbe729902197f311308 +index 000000000..a8a316e47 --- /dev/null +++ b/drivers/soc/rockchip/rk_vendor_storage.c @@ -0,0 +1,50 @@ @@ -1558868,7 +1558860,7 @@ index 0000000000000000000000000000000000000000..a8a316e47ff97c6ac3768bbe72990219 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip-cpuinfo.c b/drivers/soc/rockchip/rockchip-cpuinfo.c new file mode 100644 -index 0000000000000000000000000000000000000000..02befb165d9873ae959e0e2986168f7beb49c1cd +index 000000000..02befb165 --- /dev/null +++ b/drivers/soc/rockchip/rockchip-cpuinfo.c @@ -0,0 +1,309 @@ @@ -1559183,7 +1559175,7 @@ index 0000000000000000000000000000000000000000..02befb165d9873ae959e0e2986168f7b +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_amp.c b/drivers/soc/rockchip/rockchip_amp.c new file mode 100644 -index 0000000000000000000000000000000000000000..6f5bdc678756917f33ea487f88ae6111bf7c2940 +index 000000000..6f5bdc678 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_amp.c @@ -0,0 +1,660 @@ @@ -1559849,7 +1559841,7 @@ index 0000000000000000000000000000000000000000..6f5bdc678756917f33ea487f88ae6111 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_csu.c b/drivers/soc/rockchip/rockchip_csu.c new file mode 100644 -index 0000000000000000000000000000000000000000..04a6a5b39715bf38ba93560125886812287bcfda +index 000000000..04a6a5b39 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_csu.c @@ -0,0 +1,377 @@ @@ -1560232,7 +1560224,7 @@ index 0000000000000000000000000000000000000000..04a6a5b39715bf38ba93560125886812 +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 100644 -index 0000000000000000000000000000000000000000..417781d3f8b029bfd765212a5d3b98e9bade3576 +index 000000000..417781d3f --- /dev/null +++ b/drivers/soc/rockchip/rockchip_debug.c @@ -0,0 +1,680 @@ @@ -1560918,7 +1560910,7 @@ index 0000000000000000000000000000000000000000..417781d3f8b029bfd765212a5d3b98e9 +MODULE_ALIAS("platform:rockchip-debugger"); diff --git a/drivers/soc/rockchip/rockchip_debug.h b/drivers/soc/rockchip/rockchip_debug.h new file mode 100644 -index 0000000000000000000000000000000000000000..82036d8ebf72a9b96601e9add2ca2724405fcb25 +index 000000000..82036d8eb --- /dev/null +++ b/drivers/soc/rockchip/rockchip_debug.h @@ -0,0 +1,14 @@ @@ -1560938,7 +1560930,7 @@ index 0000000000000000000000000000000000000000..82036d8ebf72a9b96601e9add2ca2724 +#endif diff --git a/drivers/soc/rockchip/rockchip_decompress.c b/drivers/soc/rockchip/rockchip_decompress.c new file mode 100644 -index 0000000000000000000000000000000000000000..275a605cfccb9de27ad962eed8a68be145cb6620 +index 000000000..275a605cf --- /dev/null +++ b/drivers/soc/rockchip/rockchip_decompress.c @@ -0,0 +1,388 @@ @@ -1561332,7 +1561324,7 @@ index 0000000000000000000000000000000000000000..275a605cfccb9de27ad962eed8a68be1 +pure_initcall(rockchip_hw_decompress_init); diff --git a/drivers/soc/rockchip/rockchip_decompress_user.c b/drivers/soc/rockchip/rockchip_decompress_user.c new file mode 100644 -index 0000000000000000000000000000000000000000..4e47e810c48fd4fa18a0449c5ebca5f73d10c512 +index 000000000..4e47e810c --- /dev/null +++ b/drivers/soc/rockchip/rockchip_decompress_user.c @@ -0,0 +1,287 @@ @@ -1561625,7 +1561617,7 @@ index 0000000000000000000000000000000000000000..4e47e810c48fd4fa18a0449c5ebca5f7 +MODULE_DESCRIPTION("Rockchip decom driver"); diff --git a/drivers/soc/rockchip/rockchip_disable_unused.c b/drivers/soc/rockchip/rockchip_disable_unused.c new file mode 100644 -index 0000000000000000000000000000000000000000..5f9a9b3b933841b8225808b8f9da3c1388eb447f +index 000000000..5f9a9b3b9 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_disable_unused.c @@ -0,0 +1,24 @@ @@ -1561655,7 +1561647,7 @@ index 0000000000000000000000000000000000000000..5f9a9b3b933841b8225808b8f9da3c13 +#endif diff --git a/drivers/soc/rockchip/rockchip_ipa.c b/drivers/soc/rockchip/rockchip_ipa.c new file mode 100644 -index 0000000000000000000000000000000000000000..e8982b7defeef4e7d8a6c0a6cc3f294856f483ec +index 000000000..e8982b7de --- /dev/null +++ b/drivers/soc/rockchip/rockchip_ipa.c @@ -0,0 +1,232 @@ @@ -1561893,7 +1561885,7 @@ index 0000000000000000000000000000000000000000..e8982b7defeef4e7d8a6c0a6cc3f2948 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_npor_powergood.c b/drivers/soc/rockchip/rockchip_npor_powergood.c new file mode 100644 -index 0000000000000000000000000000000000000000..1c92541ce2aeafdfd48637def7ebf0ee15a7c9e8 +index 000000000..1c92541ce --- /dev/null +++ b/drivers/soc/rockchip/rockchip_npor_powergood.c @@ -0,0 +1,101 @@ @@ -1562000,7 +1561992,7 @@ index 0000000000000000000000000000000000000000..1c92541ce2aeafdfd48637def7ebf0ee +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_opp_select.c b/drivers/soc/rockchip/rockchip_opp_select.c new file mode 100644 -index 0000000000000000000000000000000000000000..9e3b93fa7920b648fffc870ce88a20363fc941f5 +index 000000000..9e3b93fa7 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_opp_select.c @@ -0,0 +1,2490 @@ @@ -1564496,7 +1564488,7 @@ index 0000000000000000000000000000000000000000..9e3b93fa7920b648fffc870ce88a2036 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_performance.c b/drivers/soc/rockchip/rockchip_performance.c new file mode 100644 -index 0000000000000000000000000000000000000000..6b96ea0600623809eaff5139493f0fd5c24ebe65 +index 000000000..6b96ea060 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_performance.c @@ -0,0 +1,185 @@ @@ -1564687,7 +1564679,7 @@ index 0000000000000000000000000000000000000000..6b96ea0600623809eaff5139493f0fd5 +#endif /* CONFIG_SMP */ diff --git a/drivers/soc/rockchip/rockchip_pm_config.c b/drivers/soc/rockchip/rockchip_pm_config.c new file mode 100644 -index 0000000000000000000000000000000000000000..c805f686bd70f70e712c78c350f829d77e437001 +index 000000000..c805f686b --- /dev/null +++ b/drivers/soc/rockchip/rockchip_pm_config.c @@ -0,0 +1,616 @@ @@ -1565309,7 +1565301,7 @@ index 0000000000000000000000000000000000000000..c805f686bd70f70e712c78c350f829d7 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_pvtm.c b/drivers/soc/rockchip/rockchip_pvtm.c new file mode 100644 -index 0000000000000000000000000000000000000000..75006737f421dc5a70d40fa5f157af1e239791cb +index 000000000..75006737f --- /dev/null +++ b/drivers/soc/rockchip/rockchip_pvtm.c @@ -0,0 +1,1046 @@ @@ -1566361,7 +1566353,7 @@ index 0000000000000000000000000000000000000000..75006737f421dc5a70d40fa5f157af1e +MODULE_LICENSE("GPL v2"); diff --git a/drivers/soc/rockchip/rockchip_ramdisk.c b/drivers/soc/rockchip/rockchip_ramdisk.c new file mode 100644 -index 0000000000000000000000000000000000000000..7ce0dfe15d1cefeb273968ea1654483609a04740 +index 000000000..7ce0dfe15 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_ramdisk.c @@ -0,0 +1,354 @@ @@ -1566721,7 +1566713,7 @@ index 0000000000000000000000000000000000000000..7ce0dfe15d1cefeb273968ea16544836 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_system_monitor.c b/drivers/soc/rockchip/rockchip_system_monitor.c new file mode 100644 -index 0000000000000000000000000000000000000000..5087e619215205da47acbe8d642a0a3bf3780917 +index 000000000..5087e6192 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_system_monitor.c @@ -0,0 +1,1691 @@ @@ -1568418,7 +1568410,7 @@ index 0000000000000000000000000000000000000000..5087e619215205da47acbe8d642a0a3b +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 100644 -index 0000000000000000000000000000000000000000..7a3c93a0304e7b5d16a1d074079e3e6bb813283f +index 000000000..7a3c93a03 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_crypto.c @@ -0,0 +1,440 @@ @@ -1568864,7 +1568856,7 @@ index 0000000000000000000000000000000000000000..7a3c93a0304e7b5d16a1d074079e3e6b +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 100644 -index 0000000000000000000000000000000000000000..10618811f0e9edeb06669c2606efb34d910ba749 +index 000000000..10618811f --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_mmc.c @@ -0,0 +1,165 @@ @@ -1569035,7 +1569027,7 @@ index 0000000000000000000000000000000000000000..10618811f0e9edeb06669c2606efb34d +pure_initcall(rk_tb_mmc_init); diff --git a/drivers/soc/rockchip/rockchip_thunderboot_service.c b/drivers/soc/rockchip/rockchip_thunderboot_service.c new file mode 100644 -index 0000000000000000000000000000000000000000..6002d64c8b05beb79bfd510193f854dd62db846d +index 000000000..6002d64c8 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_service.c @@ -0,0 +1,192 @@ @@ -1569233,7 +1569225,7 @@ index 0000000000000000000000000000000000000000..6002d64c8b05beb79bfd510193f854dd +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 100644 -index 0000000000000000000000000000000000000000..d81ca755aa12c79809570193f1e68dc01f4fed06 +index 000000000..d81ca755a --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_sfc.c @@ -0,0 +1,141 @@ @@ -1569380,7 +1569372,7 @@ index 0000000000000000000000000000000000000000..d81ca755aa12c79809570193f1e68dc0 +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 100644 -index 0000000000000000000000000000000000000000..ea1d9410b8ebe34669f42f9f8fd9cfc78d52dff4 +index 000000000..ea1d9410b --- /dev/null +++ b/drivers/soc/rockchip/sdmmc_vendor_storage.c @@ -0,0 +1,586 @@ @@ -1569971,7 +1569963,7 @@ index 0000000000000000000000000000000000000000..ea1d9410b8ebe34669f42f9f8fd9cfc7 +module_exit(vendor_storage_deinit); +MODULE_LICENSE("GPL"); diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig -index 5dc634897b4843dab8d6f92c53fb2ccb0e191255..73ff1e155e948c4e3e979538060fb36b2b257438 100644 +index 5dc634897..73ff1e155 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -54,6 +54,8 @@ source "drivers/staging/nvec/Kconfig" @@ -1569993,7 +1569985,7 @@ index 5dc634897b4843dab8d6f92c53fb2ccb0e191255..73ff1e155e948c4e3e979538060fb36b +source "drivers/staging/ucollection/Kconfig" endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile -index aec6e94a3c69048caaac17039bca3690c7819784..30b7433e68bb17113df395a5bad7b7e78e42d51f 100644 +index aec6e94a3..30b7433e6 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -17,6 +17,7 @@ obj-$(CONFIG_IIO) += iio/ @@ -1570012,7 +1570004,7 @@ index aec6e94a3c69048caaac17039bca3690c7819784..30b7433e68bb17113df395a5bad7b7e7 +obj-$(CONFIG_UNIFIED_COLLECTION) += ucollection/ diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..8d8fd5c29349a836cd3444dac91c2ffa02e10dec +index 000000000..8d8fd5c29 --- /dev/null +++ b/drivers/staging/android/Kconfig @@ -0,0 +1,21 @@ @@ -1570039,7 +1570031,7 @@ index 0000000000000000000000000000000000000000..8d8fd5c29349a836cd3444dac91c2ffa +endmenu diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..3b66cd0b0ec56d3a9d1da56b280333d3a4cdb078 +index 000000000..3b66cd0b0 --- /dev/null +++ b/drivers/staging/android/Makefile @@ -0,0 +1,6 @@ @@ -1570051,7 +1570043,7 @@ index 0000000000000000000000000000000000000000..3b66cd0b0ec56d3a9d1da56b280333d3 +obj-$(CONFIG_ASHMEM) += ashmem.o diff --git a/drivers/staging/android/TODO b/drivers/staging/android/TODO new file mode 100644 -index 0000000000000000000000000000000000000000..80eccfaf6db53c40f8beadee75e5f778e7532d44 +index 000000000..80eccfaf6 --- /dev/null +++ b/drivers/staging/android/TODO @@ -0,0 +1,13 @@ @@ -1570070,7 +1570062,7 @@ index 0000000000000000000000000000000000000000..80eccfaf6db53c40f8beadee75e5f778 +Arve HjønnevÃ¥g and Riley Andrews diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c new file mode 100644 -index 0000000000000000000000000000000000000000..a1d11cc23ff5bc4ada0789ba5a754399d4e85dca +index 000000000..a1d11cc23 --- /dev/null +++ b/drivers/staging/android/ashmem.c @@ -0,0 +1,1192 @@ @@ -1571268,7 +1571260,7 @@ index 0000000000000000000000000000000000000000..a1d11cc23ff5bc4ada0789ba5a754399 +device_initcall(ashmem_init); diff --git a/drivers/staging/android/ashmem.h b/drivers/staging/android/ashmem.h new file mode 100644 -index 0000000000000000000000000000000000000000..2f04163c67ed8c5d171e892a1375a5b4b4b84fbc +index 000000000..2f04163c6 --- /dev/null +++ b/drivers/staging/android/ashmem.h @@ -0,0 +1,47 @@ @@ -1571321,7 +1571313,7 @@ index 0000000000000000000000000000000000000000..2f04163c67ed8c5d171e892a1375a5b4 +#endif /* _LINUX_ASHMEM_H */ diff --git a/drivers/staging/android/ion/Kconfig b/drivers/staging/android/ion/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..7b7da979991e486c154e6b90a19b7925655b453b +index 000000000..7b7da9799 --- /dev/null +++ b/drivers/staging/android/ion/Kconfig @@ -0,0 +1,14 @@ @@ -1571341,7 +1571333,7 @@ index 0000000000000000000000000000000000000000..7b7da979991e486c154e6b90a19b7925 +source "drivers/staging/android/ion/heaps/Kconfig" diff --git a/drivers/staging/android/ion/Makefile b/drivers/staging/android/ion/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..7f8fd0f537b4a73c37d80b2467b4d022bf5527f9 +index 000000000..7f8fd0f53 --- /dev/null +++ b/drivers/staging/android/ion/Makefile @@ -0,0 +1,4 @@ @@ -1571351,7 +1571343,7 @@ index 0000000000000000000000000000000000000000..7f8fd0f537b4a73c37d80b2467b4d022 +obj-y += heaps/ diff --git a/drivers/staging/android/ion/heaps/Kconfig b/drivers/staging/android/ion/heaps/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..5034c45a397d187a9efb5c70420eeeb80d8f68a5 +index 000000000..5034c45a3 --- /dev/null +++ b/drivers/staging/android/ion/heaps/Kconfig @@ -0,0 +1,15 @@ @@ -1571372,7 +1571364,7 @@ index 0000000000000000000000000000000000000000..5034c45a397d187a9efb5c70420eeeb8 + 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 100644 -index 0000000000000000000000000000000000000000..82e36e89e978c6bb6f0b22f4b11fb38241204e7f +index 000000000..82e36e89e --- /dev/null +++ b/drivers/staging/android/ion/heaps/Makefile @@ -0,0 +1,5 @@ @@ -1571383,7 +1571375,7 @@ index 0000000000000000000000000000000000000000..82e36e89e978c6bb6f0b22f4b11fb382 +obj-$(CONFIG_ION_CMA_HEAP) += ion_cma_heap.o diff --git a/drivers/staging/android/ion/heaps/ion_cma_heap.c b/drivers/staging/android/ion/heaps/ion_cma_heap.c new file mode 100644 -index 0000000000000000000000000000000000000000..6ba7fd84c9eec8c39fd6f64b29831fc6bb18225d +index 000000000..6ba7fd84c --- /dev/null +++ b/drivers/staging/android/ion/heaps/ion_cma_heap.c @@ -0,0 +1,151 @@ @@ -1571540,7 +1571532,7 @@ index 0000000000000000000000000000000000000000..6ba7fd84c9eec8c39fd6f64b29831fc6 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/staging/android/ion/heaps/ion_page_pool.c b/drivers/staging/android/ion/heaps/ion_page_pool.c new file mode 100644 -index 0000000000000000000000000000000000000000..efd6ce4cc0adb08ede39dcb17530520c1493d8f5 +index 000000000..efd6ce4cc --- /dev/null +++ b/drivers/staging/android/ion/heaps/ion_page_pool.c @@ -0,0 +1,172 @@ @@ -1571718,7 +1571710,7 @@ index 0000000000000000000000000000000000000000..efd6ce4cc0adb08ede39dcb17530520c +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 100644 -index 0000000000000000000000000000000000000000..10c79090c7a019fe941e9646d4d47735d15a3126 +index 000000000..10c79090c --- /dev/null +++ b/drivers/staging/android/ion/heaps/ion_page_pool.h @@ -0,0 +1,67 @@ @@ -1571791,7 +1571783,7 @@ index 0000000000000000000000000000000000000000..10c79090c7a019fe941e9646d4d47735 +#endif /* _ION_PAGE_POOL_H */ diff --git a/drivers/staging/android/ion/heaps/ion_system_heap.c b/drivers/staging/android/ion/heaps/ion_system_heap.c new file mode 100644 -index 0000000000000000000000000000000000000000..45d23bea38228e40f6b75cfe8a7e57d46bddd728 +index 000000000..45d23bea3 --- /dev/null +++ b/drivers/staging/android/ion/heaps/ion_system_heap.c @@ -0,0 +1,344 @@ @@ -1572141,7 +1572133,7 @@ index 0000000000000000000000000000000000000000..45d23bea38228e40f6b75cfe8a7e57d4 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c new file mode 100644 -index 0000000000000000000000000000000000000000..3d9ec5f1045cb83534468a01c4dd955ceaed5f16 +index 000000000..3d9ec5f10 --- /dev/null +++ b/drivers/staging/android/ion/ion.c @@ -0,0 +1,518 @@ @@ -1572665,7 +1572657,7 @@ index 0000000000000000000000000000000000000000..3d9ec5f1045cb83534468a01c4dd955c +subsys_initcall(ion_device_create); diff --git a/drivers/staging/android/ion/ion_buffer.c b/drivers/staging/android/ion/ion_buffer.c new file mode 100644 -index 0000000000000000000000000000000000000000..9baca1a472b6a456bf3cbe473d6a76ccc131dbc0 +index 000000000..9baca1a47 --- /dev/null +++ b/drivers/staging/android/ion/ion_buffer.c @@ -0,0 +1,278 @@ @@ -1572949,7 +1572941,7 @@ index 0000000000000000000000000000000000000000..9baca1a472b6a456bf3cbe473d6a76cc +} diff --git a/drivers/staging/android/ion/ion_dma_buf.c b/drivers/staging/android/ion/ion_dma_buf.c new file mode 100644 -index 0000000000000000000000000000000000000000..47ae54af5ccf702067c4da7f6f974b2ee67cc89c +index 000000000..47ae54af5 --- /dev/null +++ b/drivers/staging/android/ion/ion_dma_buf.c @@ -0,0 +1,359 @@ @@ -1573314,7 +1573306,7 @@ index 0000000000000000000000000000000000000000..47ae54af5ccf702067c4da7f6f974b2e +} diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c new file mode 100644 -index 0000000000000000000000000000000000000000..aa29a4ee48a328e9c460155d87165c819ccbb567 +index 000000000..aa29a4ee4 --- /dev/null +++ b/drivers/staging/android/ion/ion_heap.c @@ -0,0 +1,291 @@ @@ -1573611,7 +1573603,7 @@ index 0000000000000000000000000000000000000000..aa29a4ee48a328e9c460155d87165c81 +} diff --git a/drivers/staging/android/ion/ion_private.h b/drivers/staging/android/ion/ion_private.h new file mode 100644 -index 0000000000000000000000000000000000000000..db4e90683f4c707d88734e385d2f461d8b133883 +index 000000000..db4e90683 --- /dev/null +++ b/drivers/staging/android/ion/ion_private.h @@ -0,0 +1,58 @@ @@ -1573675,7 +1573667,7 @@ index 0000000000000000000000000000000000000000..db4e90683f4c707d88734e385d2f461d +#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 100644 -index 0000000000000000000000000000000000000000..c7f25373a744699b7690dc38d8d7f7ab09c05be6 +index 000000000..c7f25373a --- /dev/null +++ b/drivers/staging/android/ion/ion_protected_heap.c @@ -0,0 +1,526 @@ @@ -1574207,7 +1574199,7 @@ index 0000000000000000000000000000000000000000..c7f25373a744699b7690dc38d8d7f7ab +#endif diff --git a/drivers/staging/android/ion/ion_trace.h b/drivers/staging/android/ion/ion_trace.h new file mode 100644 -index 0000000000000000000000000000000000000000..eacb47d4f13535762d6545e74d2c14119d7a1ec5 +index 000000000..eacb47d4f --- /dev/null +++ b/drivers/staging/android/ion/ion_trace.h @@ -0,0 +1,55 @@ @@ -1574268,7 +1574260,7 @@ index 0000000000000000000000000000000000000000..eacb47d4f13535762d6545e74d2c1411 +#include diff --git a/drivers/staging/android/ion/rockchip/Makefile b/drivers/staging/android/ion/rockchip/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..89265fcbbe6fa454cc3ff36a04c781ac5484cbc3 +index 000000000..89265fcbb --- /dev/null +++ b/drivers/staging/android/ion/rockchip/Makefile @@ -0,0 +1,3 @@ @@ -1574277,7 +1574269,7 @@ index 0000000000000000000000000000000000000000..89265fcbbe6fa454cc3ff36a04c781ac +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 100644 -index 0000000000000000000000000000000000000000..d3c3d06856ad7564e2e9f504b67e056d229358de +index 000000000..d3c3d0685 --- /dev/null +++ b/drivers/staging/android/ion/rockchip/rockchip_ion.c @@ -0,0 +1,224 @@ @@ -1574507,7 +1574499,7 @@ index 0000000000000000000000000000000000000000..d3c3d06856ad7564e2e9f504b67e056d +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 100644 -index 0000000000000000000000000000000000000000..ab27d05319ae8e055a8b7027538a074fe1c50aa7 +index 000000000..ab27d0531 --- /dev/null +++ b/drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c @@ -0,0 +1,145 @@ @@ -1574658,7 +1574650,7 @@ index 0000000000000000000000000000000000000000..ab27d05319ae8e055a8b7027538a074f +postcore_initcall(rockchip_ion_snapshot_init); diff --git a/drivers/staging/android/uapi/ashmem.h b/drivers/staging/android/uapi/ashmem.h new file mode 100644 -index 0000000000000000000000000000000000000000..2d4673b609d6d9ccb830e56346e7a439aedc9d25 +index 000000000..2d4673b60 --- /dev/null +++ b/drivers/staging/android/uapi/ashmem.h @@ -0,0 +1,54 @@ @@ -1574718,7 +1574710,7 @@ index 0000000000000000000000000000000000000000..2d4673b609d6d9ccb830e56346e7a439 +#endif /* _UAPI_LINUX_ASHMEM_H */ diff --git a/drivers/staging/android/uapi/ion.h b/drivers/staging/android/uapi/ion.h new file mode 100644 -index 0000000000000000000000000000000000000000..46c93fcb46d6e690298f643c6019edaaa47649b9 +index 000000000..46c93fcb4 --- /dev/null +++ b/drivers/staging/android/uapi/ion.h @@ -0,0 +1,127 @@ @@ -1574850,7 +1574842,7 @@ index 0000000000000000000000000000000000000000..46c93fcb46d6e690298f643c6019edaa + +#endif /* _UAPI_LINUX_ION_H */ diff --git a/drivers/staging/blackbox/Kconfig b/drivers/staging/blackbox/Kconfig -index 0e985823c2e83539023f66d06041de502dbb7f0a..7f1eb0e16e2d75a9e13af804733d0aec1f911dde 100644 +index 0e985823c..7f1eb0e16 100644 --- a/drivers/staging/blackbox/Kconfig +++ b/drivers/staging/blackbox/Kconfig @@ -106,3 +106,14 @@ config DEF_BLACKBOX_STORAGE @@ -1574869,7 +1574861,7 @@ index 0e985823c2e83539023f66d06041de502dbb7f0a..7f1eb0e16e2d75a9e13af804733d0aec + +endif diff --git a/drivers/staging/blackbox/Makefile b/drivers/staging/blackbox/Makefile -index 9befa81a176e41923da418450d3cb7cc27f99c00..77c1a37e51028f2890f69cbd682c2c55ce4cbaa6 100644 +index 9befa81a1..77c1a37e5 100644 --- a/drivers/staging/blackbox/Makefile +++ b/drivers/staging/blackbox/Makefile @@ -3,3 +3,5 @@ @@ -1574880,7 +1574872,7 @@ index 9befa81a176e41923da418450d3cb7cc27f99c00..77c1a37e51028f2890f69cbd682c2c55 +obj-$(CONFIG_BLACKBOX_ROCKCHIP) += rockchip/ diff --git a/drivers/staging/blackbox/rockchip/Makefile b/drivers/staging/blackbox/rockchip/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..8bef3d7285ed1aa4ec03d6d25750508cf4fab6c1 +index 000000000..8bef3d728 --- /dev/null +++ b/drivers/staging/blackbox/rockchip/Makefile @@ -0,0 +1,4 @@ @@ -1574890,7 +1574882,7 @@ index 0000000000000000000000000000000000000000..8bef3d7285ed1aa4ec03d6d25750508c +obj-$(CONFIG_BLACKBOX_STORAGE_BY_MEMORY) += system_adapter_by_memory.o diff --git a/drivers/staging/blackbox/rockchip/system_adapter.c b/drivers/staging/blackbox/rockchip/system_adapter.c new file mode 100644 -index 0000000000000000000000000000000000000000..538f8fbd745d30b18f8cd8858def826c001d38e3 +index 000000000..538f8fbd7 --- /dev/null +++ b/drivers/staging/blackbox/rockchip/system_adapter.c @@ -0,0 +1,312 @@ @@ -1575208,7 +1575200,7 @@ index 0000000000000000000000000000000000000000..538f8fbd745d30b18f8cd8858def826c +MODULE_AUTHOR("OHOS"); diff --git a/drivers/staging/blackbox/rockchip/system_adapter_by_memory.c b/drivers/staging/blackbox/rockchip/system_adapter_by_memory.c new file mode 100644 -index 0000000000000000000000000000000000000000..30757db43e421657b5c6c715761c553294de72df +index 000000000..30757db43 --- /dev/null +++ b/drivers/staging/blackbox/rockchip/system_adapter_by_memory.c @@ -0,0 +1,313 @@ @@ -1575526,7 +1575518,7 @@ index 0000000000000000000000000000000000000000..30757db43e421657b5c6c715761c5532 +MODULE_DESCRIPTION("Blackbox for system"); +MODULE_AUTHOR("OHOS"); diff --git a/drivers/tee/optee/supp.c b/drivers/tee/optee/supp.c -index 322a543b8c278abbb493724b7c717690fbeed972..2d556b79a67e6939433cef7c4d5c241b4fda5341 100644 +index 322a543b8..2d556b79a 100644 --- a/drivers/tee/optee/supp.c +++ b/drivers/tee/optee/supp.c @@ -82,6 +82,9 @@ u32 optee_supp_thrd_req(struct tee_context *ctx, u32 func, size_t num_params, @@ -1575574,7 +1575566,7 @@ index 322a543b8c278abbb493724b7c717690fbeed972..2d556b79a67e6939433cef7c4d5c241b mutex_unlock(&supp->mutex); diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h -index 1aa3e55c8b47da2cdb93ef2e846a88d239a35369..14a5cb64034a9a477b91f055e4d72b316c748699 100644 +index 1aa3e55c8..14a5cb640 100644 --- a/drivers/tty/serial/8250/8250.h +++ b/drivers/tty/serial/8250/8250.h @@ -51,6 +51,9 @@ struct uart_8250_dma { @@ -1575631,7 +1575623,7 @@ index 1aa3e55c8b47da2cdb93ef2e846a88d239a35369..14a5cb64034a9a477b91f055e4d72b31 static inline int serial8250_request_dma(struct uart_8250_port *p) { diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c -index 3449f8790e462e269df4c454fb37bfde330bed7e..9853e356f795e582a1680a8a496950b27f5673db 100644 +index 3449f8790..9853e356f 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -569,6 +569,7 @@ static void __init serial8250_isa_init_ports(void) @@ -1575674,7 +1575666,7 @@ index 3449f8790e462e269df4c454fb37bfde330bed7e..9853e356f795e582a1680a8a496950b2 MODULE_LICENSE("GPL"); diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c -index 7fa66501792dd8043304af153ae9072ff287ce8c..f48abcf669d65834bf57ccfe73643e176e6d2e11 100644 +index 7fa665017..f48abcf66 100644 --- a/drivers/tty/serial/8250/8250_dma.c +++ b/drivers/tty/serial/8250/8250_dma.c @@ -11,6 +11,13 @@ @@ -1575983,7 +1575975,7 @@ index 7fa66501792dd8043304af153ae9072ff287ce8c..f48abcf669d65834bf57ccfe73643e17 dev_dbg_ratelimited(p->port.dev, "dma channels released\n"); } diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c -index a1f2259cc9a980edd2b182640696a2a59a1056a7..73c78debb99750c4f430af2c818a7328ca8e9aba 100644 +index a1f2259cc..73c78debb 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -30,11 +30,16 @@ @@ -1576237,7 +1576229,7 @@ index a1f2259cc9a980edd2b182640696a2a59a1056a7..73c78debb99750c4f430af2c818a7328 }; MODULE_DEVICE_TABLE(acpi, dw8250_acpi_match); diff --git a/drivers/tty/serial/8250/8250_dwlib.c b/drivers/tty/serial/8250/8250_dwlib.c -index 84843e204a5e80e872ab840e9069cc73a018d38d..9dd6c3bd2da2dcc0cf95f463f3ed83a729bb5b68 100644 +index 84843e204..9dd6c3bd2 100644 --- a/drivers/tty/serial/8250/8250_dwlib.c +++ b/drivers/tty/serial/8250/8250_dwlib.c @@ -296,6 +296,9 @@ void dw8250_setup_port(struct uart_port *p) @@ -1576258,7 +1576250,7 @@ index 84843e204a5e80e872ab840e9069cc73a018d38d..9dd6c3bd2da2dcc0cf95f463f3ed83a7 EXPORT_SYMBOL_GPL(dw8250_setup_port); +#endif diff --git a/drivers/tty/serial/8250/8250_dwlib.h b/drivers/tty/serial/8250/8250_dwlib.h -index f13e91f2cace9ccb119745f803e5e7cf92065d9c..13025a666e6e2b2098f13ef29bd29cba3a8d5a46 100644 +index f13e91f2c..13025a666 100644 --- a/drivers/tty/serial/8250/8250_dwlib.h +++ b/drivers/tty/serial/8250/8250_dwlib.h @@ -43,6 +43,11 @@ struct dw8250_data { @@ -1576274,7 +1576266,7 @@ index f13e91f2cace9ccb119745f803e5e7cf92065d9c..13025a666e6e2b2098f13ef29bd29cba unsigned int uart_16550_compatible:1; }; diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c -index 141627370aabc334936aa560f4881ec258005fbc..47d943b927821352d97d892f3939d47ec78cb10c 100644 +index 141627370..47d943b92 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -55,6 +55,7 @@ @@ -1576553,7 +1576545,7 @@ index 141627370aabc334936aa560f4881ec258005fbc..47d943b927821352d97d892f3939d47e serial8250_rpm_put(up); diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 71635dfa741d291489fc9fd7e510588328af6a19..07446b94b4e48d49e9f5f4fc51aaeb12e726e73f 100644 +index 71635dfa7..07446b94b 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1850,7 +1850,8 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) @@ -1576567,7 +1576559,7 @@ index 71635dfa741d291489fc9fd7e510588328af6a19..07446b94b4e48d49e9f5f4fc51aaeb12 const struct hc_driver *drv = bus_to_hcd(hdev->bus)->driver; diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c -index 15e9bd180a1d253f3b3cd2eebb3de68bcae9fb5e..96c67eacacfe62d711591480156056df7b9a445d 100644 +index 15e9bd180..96c67eaca 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[] = { @@ -1576604,7 +1576596,7 @@ index 15e9bd180a1d253f3b3cd2eebb3de68bcae9fb5e..96c67eacacfe62d711591480156056df { USB_DEVICE(0x2386, 0x3114), .driver_info = USB_QUIRK_NO_LPM }, diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig -index b694d7669d3200b148c5575a468f9464192114c0..a772957233a507750a60a95ff980ec1cb06a11d3 100644 +index b694d7669..a77295723 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -40,6 +40,7 @@ source "drivers/gpu/host1x/Kconfig" @@ -1576627,7 +1576619,7 @@ index b694d7669d3200b148c5575a468f9464192114c0..a772957233a507750a60a95ff980ec1c tristate default n diff --git a/drivers/video/Makefile b/drivers/video/Makefile -index 6bbc039508995ee9b027ab19571d9db53c75e6d9..8e1b0f820829cd5f6a2f3bb82f0fb934eaad13cf 100644 +index 6bbc03950..8e1b0f820 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_VT) += console/ @@ -1576640,7 +1576632,7 @@ index 6bbc039508995ee9b027ab19571d9db53c75e6d9..8e1b0f820829cd5f6a2f3bb82f0fb934 diff --git a/drivers/video/hdmi-notifier.c b/drivers/video/hdmi-notifier.c new file mode 100644 -index 0000000000000000000000000000000000000000..a233359cacfa88e26cab6152f48cc63541c24df6 +index 000000000..a233359ca --- /dev/null +++ b/drivers/video/hdmi-notifier.c @@ -0,0 +1,61 @@ @@ -1576707,7 +1576699,7 @@ index 0000000000000000000000000000000000000000..a233359cacfa88e26cab6152f48cc635 +EXPORT_SYMBOL_GPL(hdmi_event_new_eld); diff --git a/drivers/video/rockchip/Kconfig b/drivers/video/rockchip/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..6548dd38b534ded9b058cca4aebce31fb3f52441 +index 000000000..6548dd38b --- /dev/null +++ b/drivers/video/rockchip/Kconfig @@ -0,0 +1,11 @@ @@ -1576724,7 +1576716,7 @@ index 0000000000000000000000000000000000000000..6548dd38b534ded9b058cca4aebce31f +source "drivers/video/rockchip/vtunnel/Kconfig" diff --git a/drivers/video/rockchip/Makefile b/drivers/video/rockchip/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..867ac56fe5b72760a922dbd0356fd875bfc0cc0f +index 000000000..867ac56fe --- /dev/null +++ b/drivers/video/rockchip/Makefile @@ -0,0 +1,11 @@ @@ -1576741,7 +1576733,7 @@ index 0000000000000000000000000000000000000000..867ac56fe5b72760a922dbd0356fd875 +obj-$(CONFIG_ROCKCHIP_VIDEO_TUNNEL) += vtunnel/ diff --git a/drivers/video/rockchip/dvbm/Kconfig b/drivers/video/rockchip/dvbm/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..bfbd396b2706627b5fd3690ad384c809c1d7397d +index 000000000..bfbd396b2 --- /dev/null +++ b/drivers/video/rockchip/dvbm/Kconfig @@ -0,0 +1,18 @@ @@ -1576765,7 +1576757,7 @@ index 0000000000000000000000000000000000000000..bfbd396b2706627b5fd3690ad384c809 +endif diff --git a/drivers/video/rockchip/dvbm/Makefile b/drivers/video/rockchip/dvbm/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..9096c34720ec1100c2714b44a8afba75eb25084d +index 000000000..9096c3472 --- /dev/null +++ b/drivers/video/rockchip/dvbm/Makefile @@ -0,0 +1,5 @@ @@ -1576776,7 +1576768,7 @@ index 0000000000000000000000000000000000000000..9096c34720ec1100c2714b44a8afba75 +obj-$(CONFIG_ROCKCHIP_DVBM) += rk_dvbm.o diff --git a/drivers/video/rockchip/dvbm/rockchip_dvbm.c b/drivers/video/rockchip/dvbm/rockchip_dvbm.c new file mode 100644 -index 0000000000000000000000000000000000000000..abff28da714eb8372e3a3ded51099e65779a7452 +index 000000000..abff28da7 --- /dev/null +++ b/drivers/video/rockchip/dvbm/rockchip_dvbm.c @@ -0,0 +1,752 @@ @@ -1577534,7 +1577526,7 @@ index 0000000000000000000000000000000000000000..abff28da714eb8372e3a3ded51099e65 +MODULE_DESCRIPTION("Rockchip dvbm driver"); diff --git a/drivers/video/rockchip/dvbm/rockchip_dvbm.h b/drivers/video/rockchip/dvbm/rockchip_dvbm.h new file mode 100644 -index 0000000000000000000000000000000000000000..9f298b7dd47d8fccb1b4b78f2eab1d54290b0811 +index 000000000..9f298b7dd --- /dev/null +++ b/drivers/video/rockchip/dvbm/rockchip_dvbm.h @@ -0,0 +1,214 @@ @@ -1577754,7 +1577746,7 @@ index 0000000000000000000000000000000000000000..9f298b7dd47d8fccb1b4b78f2eab1d54 +#endif diff --git a/drivers/video/rockchip/iep/Kconfig b/drivers/video/rockchip/iep/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..cd8ba653f9eaac2ed92d05c7d974ea83617781e4 +index 000000000..cd8ba653f --- /dev/null +++ b/drivers/video/rockchip/iep/Kconfig @@ -0,0 +1,10 @@ @@ -1577770,7 +1577762,7 @@ index 0000000000000000000000000000000000000000..cd8ba653f9eaac2ed92d05c7d974ea83 +endmenu diff --git a/drivers/video/rockchip/iep/Makefile b/drivers/video/rockchip/iep/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..f4dba6e9379a227031fa53af01dcb04c7bc9d273 +index 000000000..f4dba6e93 --- /dev/null +++ b/drivers/video/rockchip/iep/Makefile @@ -0,0 +1,4 @@ @@ -1577780,7 +1577772,7 @@ index 0000000000000000000000000000000000000000..f4dba6e9379a227031fa53af01dcb04c +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 100644 -index 0000000000000000000000000000000000000000..1f4a0706233fc25671c6a0e5fadc881cb36eaeac +index 000000000..1f4a07062 --- /dev/null +++ b/drivers/video/rockchip/iep/hw_iep_config_addr.h @@ -0,0 +1,99 @@ @@ -1577885,7 +1577877,7 @@ index 0000000000000000000000000000000000000000..1f4a0706233fc25671c6a0e5fadc881c +#endif diff --git a/drivers/video/rockchip/iep/hw_iep_reg.c b/drivers/video/rockchip/iep/hw_iep_reg.c new file mode 100644 -index 0000000000000000000000000000000000000000..331a508650452cd74af4ccca078443c53810ab8b +index 000000000..331a50865 --- /dev/null +++ b/drivers/video/rockchip/iep/hw_iep_reg.c @@ -0,0 +1,1530 @@ @@ -1579421,7 +1579413,7 @@ index 0000000000000000000000000000000000000000..331a508650452cd74af4ccca078443c5 + diff --git a/drivers/video/rockchip/iep/hw_iep_reg.h b/drivers/video/rockchip/iep/hw_iep_reg.h new file mode 100644 -index 0000000000000000000000000000000000000000..03d9fe92ca2311007b5428df6bfd249f12f65945 +index 000000000..03d9fe92c --- /dev/null +++ b/drivers/video/rockchip/iep/hw_iep_reg.h @@ -0,0 +1,525 @@ @@ -1579952,7 +1579944,7 @@ index 0000000000000000000000000000000000000000..03d9fe92ca2311007b5428df6bfd249f +#endif diff --git a/drivers/video/rockchip/iep/iep.h b/drivers/video/rockchip/iep/iep.h new file mode 100644 -index 0000000000000000000000000000000000000000..94e372e6a471dc9919c1a3325e69511e29fb4d55 +index 000000000..94e372e6a --- /dev/null +++ b/drivers/video/rockchip/iep/iep.h @@ -0,0 +1,276 @@ @@ -1580234,7 +1580226,7 @@ index 0000000000000000000000000000000000000000..94e372e6a471dc9919c1a3325e69511e +#endif diff --git a/drivers/video/rockchip/iep/iep_drv.c b/drivers/video/rockchip/iep/iep_drv.c new file mode 100644 -index 0000000000000000000000000000000000000000..a7199c62dd0481708b3f2fa88a6348549e6a569a +index 000000000..a7199c62d --- /dev/null +++ b/drivers/video/rockchip/iep/iep_drv.c @@ -0,0 +1,1321 @@ @@ -1581561,7 +1581553,7 @@ index 0000000000000000000000000000000000000000..a7199c62dd0481708b3f2fa88a634854 +#endif diff --git a/drivers/video/rockchip/iep/iep_drv.h b/drivers/video/rockchip/iep/iep_drv.h new file mode 100644 -index 0000000000000000000000000000000000000000..19160c6ffccde9989d1f6309b3a5194cb2e3b01e +index 000000000..19160c6ff --- /dev/null +++ b/drivers/video/rockchip/iep/iep_drv.h @@ -0,0 +1,159 @@ @@ -1581726,7 +1581718,7 @@ index 0000000000000000000000000000000000000000..19160c6ffccde9989d1f6309b3a5194c + diff --git a/drivers/video/rockchip/iep/iep_iommu_drm.c b/drivers/video/rockchip/iep/iep_iommu_drm.c new file mode 100644 -index 0000000000000000000000000000000000000000..654459a908ff6a69c2ee5e5af6709c2e449d3ec6 +index 000000000..654459a90 --- /dev/null +++ b/drivers/video/rockchip/iep/iep_iommu_drm.c @@ -0,0 +1,464 @@ @@ -1582196,7 +1582188,7 @@ index 0000000000000000000000000000000000000000..654459a908ff6a69c2ee5e5af6709c2e +} diff --git a/drivers/video/rockchip/iep/iep_iommu_ops.c b/drivers/video/rockchip/iep/iep_iommu_ops.c new file mode 100644 -index 0000000000000000000000000000000000000000..e84772237b898cf20611a981d930aef40586122c +index 000000000..e84772237 --- /dev/null +++ b/drivers/video/rockchip/iep/iep_iommu_ops.c @@ -0,0 +1,244 @@ @@ -1582446,7 +1582438,7 @@ index 0000000000000000000000000000000000000000..e84772237b898cf20611a981d930aef4 +} diff --git a/drivers/video/rockchip/iep/iep_iommu_ops.h b/drivers/video/rockchip/iep/iep_iommu_ops.h new file mode 100644 -index 0000000000000000000000000000000000000000..9b71d53a51ebe0c3a01b3ad8e05b47484bda4695 +index 000000000..9b71d53a5 --- /dev/null +++ b/drivers/video/rockchip/iep/iep_iommu_ops.h @@ -0,0 +1,121 @@ @@ -1582573,7 +1582565,7 @@ index 0000000000000000000000000000000000000000..9b71d53a51ebe0c3a01b3ad8e05b4748 +#endif diff --git a/drivers/video/rockchip/mpp/Kconfig b/drivers/video/rockchip/mpp/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..53342703a6ee013652c7dc8e76be975581aa5bcf +index 000000000..53342703a --- /dev/null +++ b/drivers/video/rockchip/mpp/Kconfig @@ -0,0 +1,78 @@ @@ -1582657,7 +1582649,7 @@ index 0000000000000000000000000000000000000000..53342703a6ee013652c7dc8e76be9755 +endif diff --git a/drivers/video/rockchip/mpp/Makefile b/drivers/video/rockchip/mpp/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..42ec696bc9d79df0984819f35d6eeda3774ead5c +index 000000000..42ec696bc --- /dev/null +++ b/drivers/video/rockchip/mpp/Makefile @@ -0,0 +1,30 @@ @@ -1582693,7 +1582685,7 @@ index 0000000000000000000000000000000000000000..42ec696bc9d79df0984819f35d6eeda3 +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 100644 -index 0000000000000000000000000000000000000000..a8e1a457bf9757229590303abd3a39cf6895ee01 +index 000000000..a8e1a457b --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_hack_px30.c @@ -0,0 +1,245 @@ @@ -1582944,7 +1582936,7 @@ index 0000000000000000000000000000000000000000..a8e1a457bf9757229590303abd3a39cf +} 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 100644 -index 0000000000000000000000000000000000000000..c8402e30d810adc6181f1d98baf34508a6d69887 +index 000000000..c8402e30d --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_hack_px30.h @@ -0,0 +1,27 @@ @@ -1582977,7 +1582969,7 @@ index 0000000000000000000000000000000000000000..c8402e30d810adc6181f1d98baf34508 +#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 100644 -index 0000000000000000000000000000000000000000..c2bb2687fc3d0bfb02ae7e96377231d700aef06f +index 000000000..c2bb2687f --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_hack_rk3568.c @@ -0,0 +1,732 @@ @@ -1583715,7 +1583707,7 @@ index 0000000000000000000000000000000000000000..c2bb2687fc3d0bfb02ae7e96377231d7 +} 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 100644 -index 0000000000000000000000000000000000000000..900b63a5767369029cae7ed7bf919697fd8b22ed +index 000000000..900b63a57 --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_link_hack_rk3568.c @@ -0,0 +1,213 @@ @@ -1583934,7 +1583926,7 @@ index 0000000000000000000000000000000000000000..900b63a5767369029cae7ed7bf919697 +} diff --git a/drivers/video/rockchip/mpp/mpp_av1dec.c b/drivers/video/rockchip/mpp/mpp_av1dec.c new file mode 100644 -index 0000000000000000000000000000000000000000..33e118ae6450f4a509d3865d5f68f62e416da5f4 +index 000000000..33e118ae6 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_av1dec.c @@ -0,0 +1,1343 @@ @@ -1585283,7 +1585275,7 @@ index 0000000000000000000000000000000000000000..33e118ae6450f4a509d3865d5f68f62e +}; diff --git a/drivers/video/rockchip/mpp/mpp_common.c b/drivers/video/rockchip/mpp/mpp_common.c new file mode 100644 -index 0000000000000000000000000000000000000000..f80087d11170fa3d3e84f2107d42a5633a927f38 +index 000000000..f80087d11 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_common.c @@ -0,0 +1,2610 @@ @@ -1587899,7 +1587891,7 @@ index 0000000000000000000000000000000000000000..f80087d11170fa3d3e84f2107d42a563 +#endif diff --git a/drivers/video/rockchip/mpp/mpp_common.h b/drivers/video/rockchip/mpp/mpp_common.h new file mode 100644 -index 0000000000000000000000000000000000000000..8daeb083817051aa0d2c81941f61dba1ac97a16d +index 000000000..8daeb0838 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_common.h @@ -0,0 +1,853 @@ @@ -1588758,7 +1588750,7 @@ index 0000000000000000000000000000000000000000..8daeb083817051aa0d2c81941f61dba1 +#endif diff --git a/drivers/video/rockchip/mpp/mpp_debug.h b/drivers/video/rockchip/mpp/mpp_debug.h new file mode 100644 -index 0000000000000000000000000000000000000000..4108c69da894aa3647a4f74541c6984b48da810a +index 000000000..4108c69da --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_debug.h @@ -0,0 +1,138 @@ @@ -1588902,7 +1588894,7 @@ index 0000000000000000000000000000000000000000..4108c69da894aa3647a4f74541c6984b +#endif diff --git a/drivers/video/rockchip/mpp/mpp_iep2.c b/drivers/video/rockchip/mpp/mpp_iep2.c new file mode 100644 -index 0000000000000000000000000000000000000000..8d1926957f69fb7c56a11ff7f9f8707ca07ca7f9 +index 000000000..8d1926957 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iep2.c @@ -0,0 +1,1038 @@ @@ -1589946,7 +1589938,7 @@ index 0000000000000000000000000000000000000000..8d1926957f69fb7c56a11ff7f9f8707c + diff --git a/drivers/video/rockchip/mpp/mpp_iommu.c b/drivers/video/rockchip/mpp/mpp_iommu.c new file mode 100644 -index 0000000000000000000000000000000000000000..2dbf1535904db8d2544fc46ab3dc0510d090ed49 +index 000000000..2dbf15359 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iommu.c @@ -0,0 +1,671 @@ @@ -1590623,7 +1590615,7 @@ index 0000000000000000000000000000000000000000..2dbf1535904db8d2544fc46ab3dc0510 +} diff --git a/drivers/video/rockchip/mpp/mpp_iommu.h b/drivers/video/rockchip/mpp/mpp_iommu.h new file mode 100644 -index 0000000000000000000000000000000000000000..c4c0199f8558112bf2092a545c5369847bca7bca +index 000000000..c4c0199f8 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iommu.h @@ -0,0 +1,184 @@ @@ -1590813,7 +1590805,7 @@ index 0000000000000000000000000000000000000000..c4c0199f8558112bf2092a545c536984 +#endif diff --git a/drivers/video/rockchip/mpp/mpp_iommu_av1d.c b/drivers/video/rockchip/mpp/mpp_iommu_av1d.c new file mode 100644 -index 0000000000000000000000000000000000000000..39ff16c21ee9ceee9e707c1b3ed210df7a46482c +index 000000000..39ff16c21 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iommu_av1d.c @@ -0,0 +1,997 @@ @@ -1591816,7 +1591808,7 @@ index 0000000000000000000000000000000000000000..39ff16c21ee9ceee9e707c1b3ed210df +}; diff --git a/drivers/video/rockchip/mpp/mpp_jpgdec.c b/drivers/video/rockchip/mpp/mpp_jpgdec.c new file mode 100644 -index 0000000000000000000000000000000000000000..753b061f22ea4d51f6961f3b0f1f39b53f688f86 +index 000000000..753b061f2 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_jpgdec.c @@ -0,0 +1,643 @@ @@ -1592465,7 +1592457,7 @@ index 0000000000000000000000000000000000000000..753b061f22ea4d51f6961f3b0f1f39b5 +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 100644 -index 0000000000000000000000000000000000000000..32b08a14734c43a4590ec88594496116e0128c0d +index 000000000..32b08a147 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec.c @@ -0,0 +1,1925 @@ @@ -1594396,7 +1594388,7 @@ index 0000000000000000000000000000000000000000..32b08a14734c43a4590ec88594496116 +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 100644 -index 0000000000000000000000000000000000000000..7a5fcda6cce284af328a4fb0791b0f18677b553e +index 000000000..7a5fcda6c --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2.c @@ -0,0 +1,1760 @@ @@ -1596162,7 +1596154,7 @@ index 0000000000000000000000000000000000000000..7a5fcda6cce284af328a4fb0791b0f18 +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 100644 -index 0000000000000000000000000000000000000000..3a1ac035abb06311601996769c17d47fb8971240 +index 000000000..3a1ac035a --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2.h @@ -0,0 +1,241 @@ @@ -1596409,7 +1596401,7 @@ index 0000000000000000000000000000000000000000..3a1ac035abb06311601996769c17d47f +#endif diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c new file mode 100644 -index 0000000000000000000000000000000000000000..7c5a58df18656b40ff12776a6038cbb7a3ccfe64 +index 000000000..7c5a58df1 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c @@ -0,0 +1,2511 @@ @@ -1598926,7 +1598918,7 @@ index 0000000000000000000000000000000000000000..7c5a58df18656b40ff12776a6038cbb7 +} diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2_link.h b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.h new file mode 100644 -index 0000000000000000000000000000000000000000..518927e9481e122f92cc909db682acb1a1ade839 +index 000000000..518927e94 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.h @@ -0,0 +1,238 @@ @@ -1599170,7 +1599162,7 @@ index 0000000000000000000000000000000000000000..518927e9481e122f92cc909db682acb1 +#endif diff --git a/drivers/video/rockchip/mpp/mpp_rkvenc.c b/drivers/video/rockchip/mpp/mpp_rkvenc.c new file mode 100644 -index 0000000000000000000000000000000000000000..c30f74d8124c7bbed7b7ebef54cabd31357dcc49 +index 000000000..c30f74d81 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvenc.c @@ -0,0 +1,1464 @@ @@ -1600640,7 +1600632,7 @@ index 0000000000000000000000000000000000000000..c30f74d8124c7bbed7b7ebef54cabd31 +}; diff --git a/drivers/video/rockchip/mpp/mpp_rkvenc2.c b/drivers/video/rockchip/mpp/mpp_rkvenc2.c new file mode 100644 -index 0000000000000000000000000000000000000000..c7b9e9d988811e187ab59ce90149d086361c4158 +index 000000000..c7b9e9d98 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvenc2.c @@ -0,0 +1,2658 @@ @@ -1603304,7 +1603296,7 @@ index 0000000000000000000000000000000000000000..c7b9e9d988811e187ab59ce90149d086 +}; diff --git a/drivers/video/rockchip/mpp/mpp_service.c b/drivers/video/rockchip/mpp/mpp_service.c new file mode 100644 -index 0000000000000000000000000000000000000000..29792d9cd8a28ec8e1a97fa2881e7960cf1d93fb +index 000000000..29792d9cd --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_service.c @@ -0,0 +1,500 @@ @@ -1603810,7 +1603802,7 @@ index 0000000000000000000000000000000000000000..29792d9cd8a28ec8e1a97fa2881e7960 +MODULE_DESCRIPTION("Rockchip mpp service driver"); diff --git a/drivers/video/rockchip/mpp/mpp_vdpp.c b/drivers/video/rockchip/mpp/mpp_vdpp.c new file mode 100644 -index 0000000000000000000000000000000000000000..c0dc382a187214f21113e2d5ebba94b792f4dd6d +index 000000000..c0dc382a1 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vdpp.c @@ -0,0 +1,784 @@ @@ -1604600,7 +1604592,7 @@ index 0000000000000000000000000000000000000000..c0dc382a187214f21113e2d5ebba94b7 +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 100644 -index 0000000000000000000000000000000000000000..6ddf5dae73f3a9488ca21badee61f3eea43084d4 +index 000000000..6ddf5dae7 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vdpu1.c @@ -0,0 +1,972 @@ @@ -1605578,7 +1605570,7 @@ index 0000000000000000000000000000000000000000..6ddf5dae73f3a9488ca21badee61f3ee +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 100644 -index 0000000000000000000000000000000000000000..d5a6a3017208fff03a997cb9eb7237580c900f11 +index 000000000..d5a6a3017 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vdpu2.c @@ -0,0 +1,808 @@ @@ -1606392,7 +1606384,7 @@ index 0000000000000000000000000000000000000000..d5a6a3017208fff03a997cb9eb723758 +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 100644 -index 0000000000000000000000000000000000000000..18f685a2e948ae604928ffc436a0e839c5224e4b +index 000000000..18f685a2e --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vepu1.c @@ -0,0 +1,795 @@ @@ -1607193,7 +1607185,7 @@ index 0000000000000000000000000000000000000000..18f685a2e948ae604928ffc436a0e839 +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 100644 -index 0000000000000000000000000000000000000000..fb5f5e5c28e3bae226990cd2399cd31b786ad909 +index 000000000..fb5f5e5c2 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vepu2.c @@ -0,0 +1,1278 @@ @@ -1608477,7 +1608469,7 @@ index 0000000000000000000000000000000000000000..fb5f5e5c28e3bae226990cd2399cd31b +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 100644 -index 0000000000000000000000000000000000000000..d85a30dfb84f69ad74230f63f75a22048c81cc9e +index 000000000..d85a30dfb --- /dev/null +++ b/drivers/video/rockchip/mpp/rockchip_iep2_regs.h @@ -0,0 +1,183 @@ @@ -1608666,7 +1608658,7 @@ index 0000000000000000000000000000000000000000..d85a30dfb84f69ad74230f63f75a2204 + diff --git a/drivers/video/rockchip/mpp_osal/Kconfig b/drivers/video/rockchip/mpp_osal/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..75cd7028615f1479084521f50c884287711db77d +index 000000000..75cd70286 --- /dev/null +++ b/drivers/video/rockchip/mpp_osal/Kconfig @@ -0,0 +1,8 @@ @@ -1608680,7 +1608672,7 @@ index 0000000000000000000000000000000000000000..75cd7028615f1479084521f50c884287 + rockchip mpp osal adapt for kmpp diff --git a/drivers/video/rockchip/mpp_osal/Makefile b/drivers/video/rockchip/mpp_osal/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..f4ca9643fff2c078ffe12088237781e1014269e2 +index 000000000..f4ca9643f --- /dev/null +++ b/drivers/video/rockchip/mpp_osal/Makefile @@ -0,0 +1,2 @@ @@ -1608688,7 +1608680,7 @@ index 0000000000000000000000000000000000000000..f4ca9643fff2c078ffe12088237781e1 +obj-$(CONFIG_ROCKCHIP_MPP_OSAL) += mpp_osal.o diff --git a/drivers/video/rockchip/mpp_osal/mpp_osal.c b/drivers/video/rockchip/mpp_osal/mpp_osal.c new file mode 100644 -index 0000000000000000000000000000000000000000..a778b1904044bc401a8fe7822cc35a7a02d3c5c2 +index 000000000..a778b1904 --- /dev/null +++ b/drivers/video/rockchip/mpp_osal/mpp_osal.c @@ -0,0 +1,30 @@ @@ -1608724,7 +1608716,7 @@ index 0000000000000000000000000000000000000000..a778b1904044bc401a8fe7822cc35a7a +EXPORT_SYMBOL(mpp_device_init_wakeup); diff --git a/drivers/video/rockchip/mpp_osal/mpp_osal.h b/drivers/video/rockchip/mpp_osal/mpp_osal.h new file mode 100644 -index 0000000000000000000000000000000000000000..d798dfd0c293ad8e8c2e2cf271414bbc014a93dc +index 000000000..d798dfd0c --- /dev/null +++ b/drivers/video/rockchip/mpp_osal/mpp_osal.h @@ -0,0 +1,18 @@ @@ -1608748,7 +1608740,7 @@ index 0000000000000000000000000000000000000000..d798dfd0c293ad8e8c2e2cf271414bbc +#endif diff --git a/drivers/video/rockchip/rga/Kconfig b/drivers/video/rockchip/rga/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..6023b2eb23a72e908f6d38f686b9f38ed74ca9b7 +index 000000000..6023b2eb2 --- /dev/null +++ b/drivers/video/rockchip/rga/Kconfig @@ -0,0 +1,10 @@ @@ -1608764,7 +1608756,7 @@ index 0000000000000000000000000000000000000000..6023b2eb23a72e908f6d38f686b9f38e +endmenu diff --git a/drivers/video/rockchip/rga/Makefile b/drivers/video/rockchip/rga/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..58dd4c6a3e42276e36e3e95d7adcdc090c7e1bd7 +index 000000000..58dd4c6a3 --- /dev/null +++ b/drivers/video/rockchip/rga/Makefile @@ -0,0 +1,4 @@ @@ -1608774,7 +1608766,7 @@ index 0000000000000000000000000000000000000000..58dd4c6a3e42276e36e3e95d7adcdc09 +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 100644 -index 0000000000000000000000000000000000000000..947a9b925f603bcd2ddcf06a5e6da778fefacefd +index 000000000..947a9b925 --- /dev/null +++ b/drivers/video/rockchip/rga/RGA_API.c @@ -0,0 +1,201 @@ @@ -1608981,7 +1608973,7 @@ index 0000000000000000000000000000000000000000..947a9b925f603bcd2ddcf06a5e6da778 + diff --git a/drivers/video/rockchip/rga/RGA_API.h b/drivers/video/rockchip/rga/RGA_API.h new file mode 100644 -index 0000000000000000000000000000000000000000..ade17d03e85c7c307d86d3a62be0cd48815d3009 +index 000000000..ade17d03e --- /dev/null +++ b/drivers/video/rockchip/rga/RGA_API.h @@ -0,0 +1,40 @@ @@ -1609027,7 +1609019,7 @@ index 0000000000000000000000000000000000000000..ade17d03e85c7c307d86d3a62be0cd48 +#endif diff --git a/drivers/video/rockchip/rga/rga.h b/drivers/video/rockchip/rga/rga.h new file mode 100644 -index 0000000000000000000000000000000000000000..59da2042af0ebe66df0c0b5e3b44e1a720bc794b +index 000000000..59da2042a --- /dev/null +++ b/drivers/video/rockchip/rga/rga.h @@ -0,0 +1,507 @@ @@ -1609540,7 +1609532,7 @@ index 0000000000000000000000000000000000000000..59da2042af0ebe66df0c0b5e3b44e1a7 +#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 100644 -index 0000000000000000000000000000000000000000..c5d3672c54fa573d66d9fabbc91c1f05395f1212 +index 000000000..c5d3672c5 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_drv.c @@ -0,0 +1,2574 @@ @@ -1612120,7 +1612112,7 @@ index 0000000000000000000000000000000000000000..c5d3672c54fa573d66d9fabbc91c1f05 +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 100644 -index 0000000000000000000000000000000000000000..32a99d53bb73a8c3d0ffea083f359e4056e9672a +index 000000000..32a99d53b --- /dev/null +++ b/drivers/video/rockchip/rga/rga_mmu_info.c @@ -0,0 +1,1325 @@ @@ -1613451,7 +1613443,7 @@ index 0000000000000000000000000000000000000000..32a99d53bb73a8c3d0ffea083f359e40 + diff --git a/drivers/video/rockchip/rga/rga_mmu_info.h b/drivers/video/rockchip/rga/rga_mmu_info.h new file mode 100644 -index 0000000000000000000000000000000000000000..d4226cc16329627333c6df83d2eb9882d8223416 +index 000000000..d4226cc16 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_mmu_info.h @@ -0,0 +1,24 @@ @@ -1613481,7 +1613473,7 @@ index 0000000000000000000000000000000000000000..d4226cc16329627333c6df83d2eb9882 + diff --git a/drivers/video/rockchip/rga/rga_reg_info.c b/drivers/video/rockchip/rga/rga_reg_info.c new file mode 100644 -index 0000000000000000000000000000000000000000..94a6305b870b4219d47e99312f81308b3f2d123b +index 000000000..94a6305b8 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_reg_info.c @@ -0,0 +1,1587 @@ @@ -1615074,7 +1615066,7 @@ index 0000000000000000000000000000000000000000..94a6305b870b4219d47e99312f81308b + diff --git a/drivers/video/rockchip/rga/rga_reg_info.h b/drivers/video/rockchip/rga/rga_reg_info.h new file mode 100644 -index 0000000000000000000000000000000000000000..565e8f72d7f09f299d5f52b10fcf0e332e470f6f +index 000000000..565e8f72d --- /dev/null +++ b/drivers/video/rockchip/rga/rga_reg_info.h @@ -0,0 +1,467 @@ @@ -1615547,7 +1615539,7 @@ index 0000000000000000000000000000000000000000..565e8f72d7f09f299d5f52b10fcf0e33 + diff --git a/drivers/video/rockchip/rga/rga_rop.h b/drivers/video/rockchip/rga/rga_rop.h new file mode 100644 -index 0000000000000000000000000000000000000000..ed9758711022081229bd8e09cef9f150eaa2c70f +index 000000000..ed9758711 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_rop.h @@ -0,0 +1,56 @@ @@ -1615609,7 +1615601,7 @@ index 0000000000000000000000000000000000000000..ed9758711022081229bd8e09cef9f150 +#endif diff --git a/drivers/video/rockchip/rga/rga_type.h b/drivers/video/rockchip/rga/rga_type.h new file mode 100644 -index 0000000000000000000000000000000000000000..ce3610ab9b672a476c402d9a1fa62818b1783ae0 +index 000000000..ce3610ab9 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_type.h @@ -0,0 +1,49 @@ @@ -1615664,7 +1615656,7 @@ index 0000000000000000000000000000000000000000..ce3610ab9b672a476c402d9a1fa62818 + diff --git a/drivers/video/rockchip/rga2/Kconfig b/drivers/video/rockchip/rga2/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..49a0f62b99a05906e91f0aee39cfd37b809a4559 +index 000000000..49a0f62b9 --- /dev/null +++ b/drivers/video/rockchip/rga2/Kconfig @@ -0,0 +1,30 @@ @@ -1615700,7 +1615692,7 @@ index 0000000000000000000000000000000000000000..49a0f62b99a05906e91f0aee39cfd37b +endif diff --git a/drivers/video/rockchip/rga2/Makefile b/drivers/video/rockchip/rga2/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..60181fffa4c88af22b0f00ed24b49bda6e393305 +index 000000000..60181fffa --- /dev/null +++ b/drivers/video/rockchip/rga2/Makefile @@ -0,0 +1,5 @@ @@ -1615711,7 +1615703,7 @@ index 0000000000000000000000000000000000000000..60181fffa4c88af22b0f00ed24b49bda +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 100644 -index 0000000000000000000000000000000000000000..0be2c1ae64b6acc41d284dcaa25e4a3b3ad57240 +index 000000000..0be2c1ae6 --- /dev/null +++ b/drivers/video/rockchip/rga2/RGA2_API.c @@ -0,0 +1,23 @@ @@ -1615740,7 +1615732,7 @@ index 0000000000000000000000000000000000000000..0be2c1ae64b6acc41d284dcaa25e4a3b + diff --git a/drivers/video/rockchip/rga2/RGA2_API.h b/drivers/video/rockchip/rga2/RGA2_API.h new file mode 100644 -index 0000000000000000000000000000000000000000..1fa38ed6cffee87a6b3426e646cf654db3b95f33 +index 000000000..1fa38ed6c --- /dev/null +++ b/drivers/video/rockchip/rga2/RGA2_API.h @@ -0,0 +1,59 @@ @@ -1615805,7 +1615797,7 @@ index 0000000000000000000000000000000000000000..1fa38ed6cffee87a6b3426e646cf654d +#endif diff --git a/drivers/video/rockchip/rga2/rga2.h b/drivers/video/rockchip/rga2/rga2.h new file mode 100644 -index 0000000000000000000000000000000000000000..335970c44ed6b9a087ad7ef8da31339d46d09792 +index 000000000..335970c44 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2.h @@ -0,0 +1,792 @@ @@ -1616603,7 +1616595,7 @@ index 0000000000000000000000000000000000000000..335970c44ed6b9a087ad7ef8da31339d +#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 100644 -index 0000000000000000000000000000000000000000..66ba484df9a98109620d8361e9e0a5b10eed4027 +index 000000000..66ba484df --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_debugger.c @@ -0,0 +1,395 @@ @@ -1617004,7 +1616996,7 @@ index 0000000000000000000000000000000000000000..66ba484df9a98109620d8361e9e0a5b1 +#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 100644 -index 0000000000000000000000000000000000000000..33b2f43e9f8a86aa501888873cf4fe48ac31b6af +index 000000000..33b2f43e9 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_debugger.h @@ -0,0 +1,120 @@ @@ -1617130,7 +1617122,7 @@ index 0000000000000000000000000000000000000000..33b2f43e9f8a86aa501888873cf4fe48 + diff --git a/drivers/video/rockchip/rga2/rga2_drv.c b/drivers/video/rockchip/rga2/rga2_drv.c new file mode 100644 -index 0000000000000000000000000000000000000000..ca5218f3e09fbfeb6eac3ea86e318c51eae1042d +index 000000000..ca5218f3e --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_drv.c @@ -0,0 +1,2273 @@ @@ -1619409,7 +1619401,7 @@ index 0000000000000000000000000000000000000000..ca5218f3e09fbfeb6eac3ea86e318c51 +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 100644 -index 0000000000000000000000000000000000000000..1095522c59b087ef2867a52715ac632c3300db17 +index 000000000..1095522c5 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_mmu_info.c @@ -0,0 +1,1843 @@ @@ -1621258,7 +1621250,7 @@ index 0000000000000000000000000000000000000000..1095522c59b087ef2867a52715ac632c + diff --git a/drivers/video/rockchip/rga2/rga2_mmu_info.h b/drivers/video/rockchip/rga2/rga2_mmu_info.h new file mode 100644 -index 0000000000000000000000000000000000000000..a823f2fe7c3a67ee4a65ee5b0702764f57179b62 +index 000000000..a823f2fe7 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_mmu_info.h @@ -0,0 +1,35 @@ @@ -1621299,7 +1621291,7 @@ index 0000000000000000000000000000000000000000..a823f2fe7c3a67ee4a65ee5b0702764f + diff --git a/drivers/video/rockchip/rga2/rga2_reg_info.c b/drivers/video/rockchip/rga2/rga2_reg_info.c new file mode 100644 -index 0000000000000000000000000000000000000000..a6c154989dd15e6eac8a5fc7e6d6db90248b86da +index 000000000..a6c154989 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_reg_info.c @@ -0,0 +1,1689 @@ @@ -1622994,7 +1622986,7 @@ index 0000000000000000000000000000000000000000..a6c154989dd15e6eac8a5fc7e6d6db90 +} diff --git a/drivers/video/rockchip/rga2/rga2_reg_info.h b/drivers/video/rockchip/rga2/rga2_reg_info.h new file mode 100644 -index 0000000000000000000000000000000000000000..7aaac7d3502bb52007c058605753cf2a98a39814 +index 000000000..7aaac7d35 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_reg_info.h @@ -0,0 +1,331 @@ @@ -1623331,7 +1623323,7 @@ index 0000000000000000000000000000000000000000..7aaac7d3502bb52007c058605753cf2a + diff --git a/drivers/video/rockchip/rga2/rga2_rop.h b/drivers/video/rockchip/rga2/rga2_rop.h new file mode 100644 -index 0000000000000000000000000000000000000000..dc2a343f4c5cdcb3d261029dcc8ef2322eba3be5 +index 000000000..dc2a343f4 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_rop.h @@ -0,0 +1,56 @@ @@ -1623393,7 +1623385,7 @@ index 0000000000000000000000000000000000000000..dc2a343f4c5cdcb3d261029dcc8ef232 +#endif diff --git a/drivers/video/rockchip/rga2/rga2_type.h b/drivers/video/rockchip/rga2/rga2_type.h new file mode 100644 -index 0000000000000000000000000000000000000000..30f5df2f38e580c0c7af5c57dd1200ca6be34b7e +index 000000000..30f5df2f3 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_type.h @@ -0,0 +1,49 @@ @@ -1623448,7 +1623440,7 @@ index 0000000000000000000000000000000000000000..30f5df2f38e580c0c7af5c57dd1200ca + diff --git a/drivers/video/rockchip/rga3/Kconfig b/drivers/video/rockchip/rga3/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..c8c96b2d67ffbf5719e3087f78a24a9328204726 +index 000000000..c8c96b2d6 --- /dev/null +++ b/drivers/video/rockchip/rga3/Kconfig @@ -0,0 +1,37 @@ @@ -1623491,7 +1623483,7 @@ index 0000000000000000000000000000000000000000..c8c96b2d67ffbf5719e3087f78a24a93 +endif diff --git a/drivers/video/rockchip/rga3/Makefile b/drivers/video/rockchip/rga3/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..11f401de2ae0bfe4f2e8caeda996df49d772fb89 +index 000000000..11f401de2 --- /dev/null +++ b/drivers/video/rockchip/rga3/Makefile @@ -0,0 +1,9 @@ @@ -1623506,7 +1623498,7 @@ index 0000000000000000000000000000000000000000..11f401de2ae0bfe4f2e8caeda996df49 +obj-$(CONFIG_ROCKCHIP_MULTI_RGA) += rga3.o diff --git a/drivers/video/rockchip/rga3/include/rga.h b/drivers/video/rockchip/rga3/include/rga.h new file mode 100644 -index 0000000000000000000000000000000000000000..2a60a1ae72db1f5fa140d11a28c980565a103553 +index 000000000..2a60a1ae7 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga.h @@ -0,0 +1,944 @@ @@ -1624456,7 +1624448,7 @@ index 0000000000000000000000000000000000000000..2a60a1ae72db1f5fa140d11a28c98056 +#endif /*_RGA_DRIVER_H_*/ diff --git a/drivers/video/rockchip/rga3/include/rga2_reg_info.h b/drivers/video/rockchip/rga3/include/rga2_reg_info.h new file mode 100644 -index 0000000000000000000000000000000000000000..add2f41bda7866ae1a2b1da012e0993e580f7187 +index 000000000..add2f41bd --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga2_reg_info.h @@ -0,0 +1,477 @@ @@ -1624939,7 +1624931,7 @@ index 0000000000000000000000000000000000000000..add2f41bda7866ae1a2b1da012e0993e + diff --git a/drivers/video/rockchip/rga3/include/rga3_reg_info.h b/drivers/video/rockchip/rga3/include/rga3_reg_info.h new file mode 100644 -index 0000000000000000000000000000000000000000..4db80cfb09eed2ecf4966ac8fdfab52b28ec3cc2 +index 000000000..4db80cfb0 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga3_reg_info.h @@ -0,0 +1,521 @@ @@ -1625466,7 +1625458,7 @@ index 0000000000000000000000000000000000000000..4db80cfb09eed2ecf4966ac8fdfab52b + diff --git a/drivers/video/rockchip/rga3/include/rga_common.h b/drivers/video/rockchip/rga3/include/rga_common.h new file mode 100644 -index 0000000000000000000000000000000000000000..32e83cc9c9f957e85d7f54be96332c167ab9a675 +index 000000000..32e83cc9c --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_common.h @@ -0,0 +1,49 @@ @@ -1625521,7 +1625513,7 @@ index 0000000000000000000000000000000000000000..32e83cc9c9f957e85d7f54be96332c16 +#endif diff --git a/drivers/video/rockchip/rga3/include/rga_debugger.h b/drivers/video/rockchip/rga3/include/rga_debugger.h new file mode 100644 -index 0000000000000000000000000000000000000000..c274fe87f0709a20046684890464d6c89f5d4871 +index 000000000..c274fe87f --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_debugger.h @@ -0,0 +1,145 @@ @@ -1625672,7 +1625664,7 @@ index 0000000000000000000000000000000000000000..c274fe87f0709a20046684890464d6c8 + diff --git a/drivers/video/rockchip/rga3/include/rga_dma_buf.h b/drivers/video/rockchip/rga3/include/rga_dma_buf.h new file mode 100644 -index 0000000000000000000000000000000000000000..2ff0857a66a9d0072fb4b43e0b36bfbb8f71613e +index 000000000..2ff0857a6 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_dma_buf.h @@ -0,0 +1,46 @@ @@ -1625724,7 +1625716,7 @@ index 0000000000000000000000000000000000000000..2ff0857a66a9d0072fb4b43e0b36bfbb + diff --git a/drivers/video/rockchip/rga3/include/rga_drv.h b/drivers/video/rockchip/rga3/include/rga_drv.h new file mode 100644 -index 0000000000000000000000000000000000000000..e9743a40327b8ba34816f2e2fb5ab76e0ecd709b +index 000000000..e9743a403 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_drv.h @@ -0,0 +1,463 @@ @@ -1626193,7 +1626185,7 @@ index 0000000000000000000000000000000000000000..e9743a40327b8ba34816f2e2fb5ab76e +#endif /* __LINUX_RGA_FENCE_H_ */ diff --git a/drivers/video/rockchip/rga3/include/rga_fence.h b/drivers/video/rockchip/rga3/include/rga_fence.h new file mode 100644 -index 0000000000000000000000000000000000000000..7e3bbeebbc3a45d3198dd22b91e9841e0a453290 +index 000000000..7e3bbeebb --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_fence.h @@ -0,0 +1,101 @@ @@ -1626300,7 +1626292,7 @@ index 0000000000000000000000000000000000000000..7e3bbeebbc3a45d3198dd22b91e9841e +#endif /* __LINUX_RGA_FENCE_H_ */ diff --git a/drivers/video/rockchip/rga3/include/rga_hw_config.h b/drivers/video/rockchip/rga3/include/rga_hw_config.h new file mode 100644 -index 0000000000000000000000000000000000000000..46f7531aa88ff3ed5e7209a3f7668ef5984f80be +index 000000000..46f7531aa --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_hw_config.h @@ -0,0 +1,81 @@ @@ -1626387,7 +1626379,7 @@ index 0000000000000000000000000000000000000000..46f7531aa88ff3ed5e7209a3f7668ef5 +#endif /* __LINUX_RGA_HW_CONFIG_H_ */ diff --git a/drivers/video/rockchip/rga3/include/rga_iommu.h b/drivers/video/rockchip/rga3/include/rga_iommu.h new file mode 100644 -index 0000000000000000000000000000000000000000..b80a1f48bb25bbe13aab75ab1fda149040a776ac +index 000000000..b80a1f48b --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_iommu.h @@ -0,0 +1,79 @@ @@ -1626472,7 +1626464,7 @@ index 0000000000000000000000000000000000000000..b80a1f48bb25bbe13aab75ab1fda1490 + diff --git a/drivers/video/rockchip/rga3/include/rga_job.h b/drivers/video/rockchip/rga3/include/rga_job.h new file mode 100644 -index 0000000000000000000000000000000000000000..0fc776173f1640567f4f3b504bd3e9200ccd1053 +index 000000000..0fc776173 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_job.h @@ -0,0 +1,53 @@ @@ -1626531,7 +1626523,7 @@ index 0000000000000000000000000000000000000000..0fc776173f1640567f4f3b504bd3e920 +#endif /* __LINUX_RKRGA_JOB_H_ */ diff --git a/drivers/video/rockchip/rga3/include/rga_mm.h b/drivers/video/rockchip/rga3/include/rga_mm.h new file mode 100644 -index 0000000000000000000000000000000000000000..d68fd75dcb4539e0e46f6f12c0d912cd9fd10d1b +index 000000000..d68fd75dc --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_mm.h @@ -0,0 +1,67 @@ @@ -1626604,7 +1626596,7 @@ index 0000000000000000000000000000000000000000..d68fd75dcb4539e0e46f6f12c0d912cd +#endif diff --git a/drivers/video/rockchip/rga3/rga2_reg_info.c b/drivers/video/rockchip/rga3/rga2_reg_info.c new file mode 100644 -index 0000000000000000000000000000000000000000..d2e379fa9264a58d17a3e2f917b9f42f73459b7b +index 000000000..d2e379fa9 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga2_reg_info.c @@ -0,0 +1,2744 @@ @@ -1629354,7 +1629346,7 @@ index 0000000000000000000000000000000000000000..d2e379fa9264a58d17a3e2f917b9f42f +}; diff --git a/drivers/video/rockchip/rga3/rga3_reg_info.c b/drivers/video/rockchip/rga3/rga3_reg_info.c new file mode 100644 -index 0000000000000000000000000000000000000000..4091892e0f5798d83ff62162898a972f2092f698 +index 000000000..4091892e0 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga3_reg_info.c @@ -0,0 +1,2191 @@ @@ -1631551,7 +1631543,7 @@ index 0000000000000000000000000000000000000000..4091892e0f5798d83ff62162898a972f +}; diff --git a/drivers/video/rockchip/rga3/rga_common.c b/drivers/video/rockchip/rga3/rga_common.c new file mode 100644 -index 0000000000000000000000000000000000000000..80d4821fb321d23a8639a0a9677d2e2fd841ff45 +index 000000000..80d4821fb --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_common.c @@ -0,0 +1,772 @@ @@ -1632329,7 +1632321,7 @@ index 0000000000000000000000000000000000000000..80d4821fb321d23a8639a0a9677d2e2f +} diff --git a/drivers/video/rockchip/rga3/rga_debugger.c b/drivers/video/rockchip/rga3/rga_debugger.c new file mode 100644 -index 0000000000000000000000000000000000000000..fe2103147845260aa8074e0daa88f50ed549eafc +index 000000000..fe2103147 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_debugger.c @@ -0,0 +1,970 @@ @@ -1633305,7 +1633297,7 @@ index 0000000000000000000000000000000000000000..fe2103147845260aa8074e0daa88f50e +#endif /* #ifdef CONFIG_NO_GKI */ diff --git a/drivers/video/rockchip/rga3/rga_dma_buf.c b/drivers/video/rockchip/rga3/rga_dma_buf.c new file mode 100644 -index 0000000000000000000000000000000000000000..753348a00f4a508f1c7a2cf9e907f62c228cc3b6 +index 000000000..753348a00 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_dma_buf.c @@ -0,0 +1,546 @@ @@ -1633857,7 +1633849,7 @@ index 0000000000000000000000000000000000000000..753348a00f4a508f1c7a2cf9e907f62c +} diff --git a/drivers/video/rockchip/rga3/rga_drv.c b/drivers/video/rockchip/rga3/rga_drv.c new file mode 100644 -index 0000000000000000000000000000000000000000..2d80c8089440bf9d62abfe9b7c1ba8146626a28a +index 000000000..2d80c8089 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_drv.c @@ -0,0 +1,1615 @@ @@ -1635478,7 +1635470,7 @@ index 0000000000000000000000000000000000000000..2d80c8089440bf9d62abfe9b7c1ba814 +#endif diff --git a/drivers/video/rockchip/rga3/rga_fence.c b/drivers/video/rockchip/rga3/rga_fence.c new file mode 100644 -index 0000000000000000000000000000000000000000..7d831d55d15d850998c5f45c8c4e254a3cabc1bf +index 000000000..7d831d55d --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_fence.c @@ -0,0 +1,146 @@ @@ -1635630,7 +1635622,7 @@ index 0000000000000000000000000000000000000000..7d831d55d15d850998c5f45c8c4e254a +} diff --git a/drivers/video/rockchip/rga3/rga_hw_config.c b/drivers/video/rockchip/rga3/rga_hw_config.c new file mode 100644 -index 0000000000000000000000000000000000000000..0cf2599b931ecad797c00caad9ab57dae2f3e505 +index 000000000..0cf2599b9 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_hw_config.c @@ -0,0 +1,352 @@ @@ -1635988,7 +1635980,7 @@ index 0000000000000000000000000000000000000000..0cf2599b931ecad797c00caad9ab57da +}; diff --git a/drivers/video/rockchip/rga3/rga_iommu.c b/drivers/video/rockchip/rga3/rga_iommu.c new file mode 100644 -index 0000000000000000000000000000000000000000..6ef9cbc0d5d2f9fe1bd65b3fe6ab905d5043e6d3 +index 000000000..6ef9cbc0d --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_iommu.c @@ -0,0 +1,425 @@ @@ -1636419,7 +1636411,7 @@ index 0000000000000000000000000000000000000000..6ef9cbc0d5d2f9fe1bd65b3fe6ab905d +} diff --git a/drivers/video/rockchip/rga3/rga_job.c b/drivers/video/rockchip/rga3/rga_job.c new file mode 100644 -index 0000000000000000000000000000000000000000..fae613bbf716c190ccad557578961ecdcbb9077f +index 000000000..fae613bbf --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_job.c @@ -0,0 +1,1423 @@ @@ -1637848,7 +1637840,7 @@ index 0000000000000000000000000000000000000000..fae613bbf716c190ccad557578961ecd +} diff --git a/drivers/video/rockchip/rga3/rga_mm.c b/drivers/video/rockchip/rga3/rga_mm.c new file mode 100644 -index 0000000000000000000000000000000000000000..de7e9a6fd7fab0d168f648c4c4928591a30da47e +index 000000000..de7e9a6fd --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_mm.c @@ -0,0 +1,2229 @@ @@ -1640083,7 +1640075,7 @@ index 0000000000000000000000000000000000000000..de7e9a6fd7fab0d168f648c4c4928591 +} diff --git a/drivers/video/rockchip/rga3/rga_policy.c b/drivers/video/rockchip/rga3/rga_policy.c new file mode 100644 -index 0000000000000000000000000000000000000000..c87ce1881cff809a27e1126cc8339ae2abada248 +index 000000000..c87ce1881 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_policy.c @@ -0,0 +1,426 @@ @@ -1640515,7 +1640507,7 @@ index 0000000000000000000000000000000000000000..c87ce1881cff809a27e1126cc8339ae2 +} diff --git a/drivers/video/rockchip/rve/Kconfig b/drivers/video/rockchip/rve/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..d28b9d0599cf14f1ec091f62b552c254763764e1 +index 000000000..d28b9d059 --- /dev/null +++ b/drivers/video/rockchip/rve/Kconfig @@ -0,0 +1,29 @@ @@ -1640550,7 +1640542,7 @@ index 0000000000000000000000000000000000000000..d28b9d0599cf14f1ec091f62b552c254 +endif diff --git a/drivers/video/rockchip/rve/Makefile b/drivers/video/rockchip/rve/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..e475b771751000545bcc1876fea793f417567507 +index 000000000..e475b7717 --- /dev/null +++ b/drivers/video/rockchip/rve/Makefile @@ -0,0 +1,9 @@ @@ -1640565,7 +1640557,7 @@ index 0000000000000000000000000000000000000000..e475b771751000545bcc1876fea793f4 +obj-$(CONFIG_ROCKCHIP_RVE) += rve.o diff --git a/drivers/video/rockchip/rve/include/rve.h b/drivers/video/rockchip/rve/include/rve.h new file mode 100644 -index 0000000000000000000000000000000000000000..922e9e3bfb4783e475aee31f8e2e10adb1c32b5e +index 000000000..922e9e3bf --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve.h @@ -0,0 +1,72 @@ @@ -1640643,7 +1640635,7 @@ index 0000000000000000000000000000000000000000..922e9e3bfb4783e475aee31f8e2e10ad +#endif /*_RVE_DRIVER_H_*/ diff --git a/drivers/video/rockchip/rve/include/rve_debugger.h b/drivers/video/rockchip/rve/include/rve_debugger.h new file mode 100644 -index 0000000000000000000000000000000000000000..8dbb46850532afa257e8e9aa8fc3182e5a70e40b +index 000000000..8dbb46850 --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_debugger.h @@ -0,0 +1,132 @@ @@ -1640781,7 +1640773,7 @@ index 0000000000000000000000000000000000000000..8dbb46850532afa257e8e9aa8fc3182e + diff --git a/drivers/video/rockchip/rve/include/rve_drv.h b/drivers/video/rockchip/rve/include/rve_drv.h new file mode 100644 -index 0000000000000000000000000000000000000000..9220b972477271ef47564d6774eb9a39de5b43b7 +index 000000000..9220b9724 --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_drv.h @@ -0,0 +1,332 @@ @@ -1641119,7 +1641111,7 @@ index 0000000000000000000000000000000000000000..9220b972477271ef47564d6774eb9a39 +#endif /* __LINUX_RVE_FENCE_H_ */ diff --git a/drivers/video/rockchip/rve/include/rve_fence.h b/drivers/video/rockchip/rve/include/rve_fence.h new file mode 100644 -index 0000000000000000000000000000000000000000..e70b6ac0442b8e8b2345675e0fdfbfe4bcf487c4 +index 000000000..e70b6ac04 --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_fence.h @@ -0,0 +1,32 @@ @@ -1641157,7 +1641149,7 @@ index 0000000000000000000000000000000000000000..e70b6ac0442b8e8b2345675e0fdfbfe4 +#endif /* __LINUX_RVE_FENCE_H_ */ diff --git a/drivers/video/rockchip/rve/include/rve_job.h b/drivers/video/rockchip/rve/include/rve_job.h new file mode 100644 -index 0000000000000000000000000000000000000000..b2a86f317e5f85aef2639257c3b233510636b080 +index 000000000..b2a86f317 --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_job.h @@ -0,0 +1,53 @@ @@ -1641216,7 +1641208,7 @@ index 0000000000000000000000000000000000000000..b2a86f317e5f85aef2639257c3b23351 +#endif /* __LINUX_RKRVE_JOB_H_ */ diff --git a/drivers/video/rockchip/rve/include/rve_reg.h b/drivers/video/rockchip/rve/include/rve_reg.h new file mode 100644 -index 0000000000000000000000000000000000000000..05df28037a83a1bcb7ec684206eb5957a5ba508b +index 000000000..05df28037 --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_reg.h @@ -0,0 +1,88 @@ @@ -1641310,7 +1641302,7 @@ index 0000000000000000000000000000000000000000..05df28037a83a1bcb7ec684206eb5957 + diff --git a/drivers/video/rockchip/rve/rve_debugger.c b/drivers/video/rockchip/rve/rve_debugger.c new file mode 100644 -index 0000000000000000000000000000000000000000..f156435405cfd114df2767b4504b71821fd3a2a7 +index 000000000..f15643540 --- /dev/null +++ b/drivers/video/rockchip/rve/rve_debugger.c @@ -0,0 +1,566 @@ @@ -1641882,7 +1641874,7 @@ index 0000000000000000000000000000000000000000..f156435405cfd114df2767b4504b7182 + diff --git a/drivers/video/rockchip/rve/rve_drv.c b/drivers/video/rockchip/rve/rve_drv.c new file mode 100644 -index 0000000000000000000000000000000000000000..b4b460437b655345166052a63e411f8bc4b380b3 +index 000000000..b4b460437 --- /dev/null +++ b/drivers/video/rockchip/rve/rve_drv.c @@ -0,0 +1,897 @@ @@ -1642785,7 +1642777,7 @@ index 0000000000000000000000000000000000000000..b4b460437b655345166052a63e411f8b +MODULE_LICENSE("GPL"); diff --git a/drivers/video/rockchip/rve/rve_fence.c b/drivers/video/rockchip/rve/rve_fence.c new file mode 100644 -index 0000000000000000000000000000000000000000..8d48f8033fa76512f924553da9eca7e37eebde73 +index 000000000..8d48f8033 --- /dev/null +++ b/drivers/video/rockchip/rve/rve_fence.c @@ -0,0 +1,136 @@ @@ -1642927,7 +1642919,7 @@ index 0000000000000000000000000000000000000000..8d48f8033fa76512f924553da9eca7e3 +} diff --git a/drivers/video/rockchip/rve/rve_job.c b/drivers/video/rockchip/rve/rve_job.c new file mode 100644 -index 0000000000000000000000000000000000000000..f31bba66175a481d1d60f0ff5aea97e6a2a8a5a5 +index 000000000..f31bba661 --- /dev/null +++ b/drivers/video/rockchip/rve/rve_job.c @@ -0,0 +1,1028 @@ @@ -1643961,7 +1643953,7 @@ index 0000000000000000000000000000000000000000..f31bba66175a481d1d60f0ff5aea97e6 +} diff --git a/drivers/video/rockchip/rve/rve_reg.c b/drivers/video/rockchip/rve/rve_reg.c new file mode 100644 -index 0000000000000000000000000000000000000000..44b305cce0db35424d3aa78473cd1c6e0efd3c1c +index 000000000..44b305cce --- /dev/null +++ b/drivers/video/rockchip/rve/rve_reg.c @@ -0,0 +1,277 @@ @@ -1644244,7 +1644236,7 @@ index 0000000000000000000000000000000000000000..44b305cce0db35424d3aa78473cd1c6e +} diff --git a/drivers/video/rockchip/vehicle/Kconfig b/drivers/video/rockchip/vehicle/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..e61c864842f2345f2ba8136d002e4f0fe4bcd459 +index 000000000..e61c86484 --- /dev/null +++ b/drivers/video/rockchip/vehicle/Kconfig @@ -0,0 +1,41 @@ @@ -1644291,7 +1644283,7 @@ index 0000000000000000000000000000000000000000..e61c864842f2345f2ba8136d002e4f0f +endif diff --git a/drivers/video/rockchip/vehicle/Makefile b/drivers/video/rockchip/vehicle/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..7da28b30548abfcb146fba5e10d1ddef09121556 +index 000000000..7da28b305 --- /dev/null +++ b/drivers/video/rockchip/vehicle/Makefile @@ -0,0 +1,26 @@ @@ -1644323,7 +1644315,7 @@ index 0000000000000000000000000000000000000000..7da28b30548abfcb146fba5e10d1ddef + vehicle_ad_7181.o diff --git a/drivers/video/rockchip/vehicle/vehicle-csi2-dphy-common.h b/drivers/video/rockchip/vehicle/vehicle-csi2-dphy-common.h new file mode 100644 -index 0000000000000000000000000000000000000000..8f7ac2429bef7fefeace5f153868fdc41c0fa9cd +index 000000000..8f7ac2429 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle-csi2-dphy-common.h @@ -0,0 +1,381 @@ @@ -1644710,7 +1644702,7 @@ index 0000000000000000000000000000000000000000..8f7ac2429bef7fefeace5f153868fdc4 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_ad.h b/drivers/video/rockchip/vehicle/vehicle_ad.h new file mode 100644 -index 0000000000000000000000000000000000000000..a83233b791e06743a0ef62b01ed58ccf98d92785 +index 000000000..a83233b79 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad.h @@ -0,0 +1,83 @@ @@ -1644799,7 +1644791,7 @@ index 0000000000000000000000000000000000000000..a83233b791e06743a0ef62b01ed58ccf +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_7181.c b/drivers/video/rockchip/vehicle/vehicle_ad_7181.c new file mode 100644 -index 0000000000000000000000000000000000000000..9547e887031aa0c80be7444e716be1f44aba2063 +index 000000000..9547e8870 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_7181.c @@ -0,0 +1,608 @@ @@ -1645413,7 +1645405,7 @@ index 0000000000000000000000000000000000000000..9547e887031aa0c80be7444e716be1f4 + diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_7181.h b/drivers/video/rockchip/vehicle/vehicle_ad_7181.h new file mode 100644 -index 0000000000000000000000000000000000000000..b4e572ed0ef869d210bf6336be6bab180765ea67 +index 000000000..b4e572ed0 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_7181.h @@ -0,0 +1,19 @@ @@ -1645438,7 +1645430,7 @@ index 0000000000000000000000000000000000000000..b4e572ed0ef869d210bf6336be6bab18 + diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_gc2145.c b/drivers/video/rockchip/vehicle/vehicle_ad_gc2145.c new file mode 100644 -index 0000000000000000000000000000000000000000..a015f0d7a2042339659673b23f7dfe58d1e12caa +index 000000000..a015f0d7a --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_gc2145.c @@ -0,0 +1,1149 @@ @@ -1646593,7 +1646585,7 @@ index 0000000000000000000000000000000000000000..a015f0d7a2042339659673b23f7dfe58 + diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_gc2145.h b/drivers/video/rockchip/vehicle/vehicle_ad_gc2145.h new file mode 100644 -index 0000000000000000000000000000000000000000..1934bc2172adaaa574c8faded1a6367616553379 +index 000000000..1934bc217 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_gc2145.h @@ -0,0 +1,18 @@ @@ -1646617,7 +1646609,7 @@ index 0000000000000000000000000000000000000000..1934bc2172adaaa574c8faded1a63676 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_max96714.c b/drivers/video/rockchip/vehicle/vehicle_ad_max96714.c new file mode 100644 -index 0000000000000000000000000000000000000000..607484ce732c6a0d43a31530dd1ff3f3c1b3bdbe +index 000000000..607484ce7 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_max96714.c @@ -0,0 +1,538 @@ @@ -1647161,7 +1647153,7 @@ index 0000000000000000000000000000000000000000..607484ce732c6a0d43a31530dd1ff3f3 +} diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_max96714.h b/drivers/video/rockchip/vehicle/vehicle_ad_max96714.h new file mode 100644 -index 0000000000000000000000000000000000000000..5f1ce6fcda6a3ecf0c2a566810b6ef20321f49a4 +index 000000000..5f1ce6fcd --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_max96714.h @@ -0,0 +1,18 @@ @@ -1647185,7 +1647177,7 @@ index 0000000000000000000000000000000000000000..5f1ce6fcda6a3ecf0c2a566810b6ef20 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_nvp6188.c b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6188.c new file mode 100644 -index 0000000000000000000000000000000000000000..3c67848320d8e160ac0c85387b73ebd10ec14ac1 +index 000000000..3c6784832 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6188.c @@ -0,0 +1,1206 @@ @@ -1648397,7 +1648389,7 @@ index 0000000000000000000000000000000000000000..3c67848320d8e160ac0c85387b73ebd1 +} diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_nvp6188.h b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6188.h new file mode 100644 -index 0000000000000000000000000000000000000000..4e9c6a61ed61c9ae1b6fb5441909a7fab0b503f2 +index 000000000..4e9c6a61e --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6188.h @@ -0,0 +1,18 @@ @@ -1648421,7 +1648413,7 @@ index 0000000000000000000000000000000000000000..4e9c6a61ed61c9ae1b6fb5441909a7fa +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_nvp6324.c b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6324.c new file mode 100644 -index 0000000000000000000000000000000000000000..af9274dd35e7b7e11c1aed478652d3de3d82df60 +index 000000000..af9274dd3 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6324.c @@ -0,0 +1,2238 @@ @@ -1650665,7 +1650657,7 @@ index 0000000000000000000000000000000000000000..af9274dd35e7b7e11c1aed478652d3de +} diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_nvp6324.h b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6324.h new file mode 100644 -index 0000000000000000000000000000000000000000..b28780737969234fd63edbe25bada7f6bfc86b23 +index 000000000..b28780737 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6324.h @@ -0,0 +1,18 @@ @@ -1650689,7 +1650681,7 @@ index 0000000000000000000000000000000000000000..b28780737969234fd63edbe25bada7f6 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_tp2825.c b/drivers/video/rockchip/vehicle/vehicle_ad_tp2825.c new file mode 100644 -index 0000000000000000000000000000000000000000..08888dbe6c1b81070caa93cd30befb1a984f1292 +index 000000000..08888dbe6 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_tp2825.c @@ -0,0 +1,1039 @@ @@ -1651734,7 +1651726,7 @@ index 0000000000000000000000000000000000000000..08888dbe6c1b81070caa93cd30befb1a + diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_tp2825.h b/drivers/video/rockchip/vehicle/vehicle_ad_tp2825.h new file mode 100644 -index 0000000000000000000000000000000000000000..451912580de8078b6ecf2bdac0810a1e980011a4 +index 000000000..451912580 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_tp2825.h @@ -0,0 +1,18 @@ @@ -1651758,7 +1651750,7 @@ index 0000000000000000000000000000000000000000..451912580de8078b6ecf2bdac0810a1e +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_cfg.h b/drivers/video/rockchip/vehicle/vehicle_cfg.h new file mode 100644 -index 0000000000000000000000000000000000000000..96241b7b512879d4ab0a3e5300958f142d8ab21b +index 000000000..96241b7b5 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_cfg.h @@ -0,0 +1,145 @@ @@ -1651909,7 +1651901,7 @@ index 0000000000000000000000000000000000000000..96241b7b512879d4ab0a3e5300958f14 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_cif.c b/drivers/video/rockchip/vehicle/vehicle_cif.c new file mode 100644 -index 0000000000000000000000000000000000000000..96c2bfb957852ff176f50892e438666c501a3ed0 +index 000000000..96c2bfb95 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_cif.c @@ -0,0 +1,5332 @@ @@ -1657247,7 +1657239,7 @@ index 0000000000000000000000000000000000000000..96c2bfb957852ff176f50892e438666c +} diff --git a/drivers/video/rockchip/vehicle/vehicle_cif.h b/drivers/video/rockchip/vehicle/vehicle_cif.h new file mode 100644 -index 0000000000000000000000000000000000000000..3c75694acd89b1ccd1eddbd65eb405329865c2a8 +index 000000000..3c75694ac --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_cif.h @@ -0,0 +1,189 @@ @@ -1657442,7 +1657434,7 @@ index 0000000000000000000000000000000000000000..3c75694acd89b1ccd1eddbd65eb40532 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_cif_regs.h b/drivers/video/rockchip/vehicle/vehicle_cif_regs.h new file mode 100644 -index 0000000000000000000000000000000000000000..08e1b1f892d20ae1db83247b919cda1fdb85d93b +index 000000000..08e1b1f89 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_cif_regs.h @@ -0,0 +1,19 @@ @@ -1657467,7 +1657459,7 @@ index 0000000000000000000000000000000000000000..08e1b1f892d20ae1db83247b919cda1f +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_dev.c b/drivers/video/rockchip/vehicle/vehicle_dev.c new file mode 100644 -index 0000000000000000000000000000000000000000..29c0f67111edeb5fad517a95a2ff357ed6e51312 +index 000000000..29c0f6711 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_dev.c @@ -0,0 +1,116 @@ @@ -1657589,7 +1657581,7 @@ index 0000000000000000000000000000000000000000..29c0f67111edeb5fad517a95a2ff357e +MODULE_LICENSE("GPL"); diff --git a/drivers/video/rockchip/vehicle/vehicle_flinger.c b/drivers/video/rockchip/vehicle/vehicle_flinger.c new file mode 100644 -index 0000000000000000000000000000000000000000..e2c0e676ba8596d895dc7409d26a5c9118071a09 +index 000000000..e2c0e676b --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_flinger.c @@ -0,0 +1,1552 @@ @@ -1659147,7 +1659139,7 @@ index 0000000000000000000000000000000000000000..e2c0e676ba8596d895dc7409d26a5c91 +} diff --git a/drivers/video/rockchip/vehicle/vehicle_flinger.h b/drivers/video/rockchip/vehicle/vehicle_flinger.h new file mode 100644 -index 0000000000000000000000000000000000000000..4b6cf8f3d5b2e4e0a2f6d9e94a62869a987ab1c7 +index 000000000..4b6cf8f3d --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_flinger.h @@ -0,0 +1,115 @@ @@ -1659268,7 +1659260,7 @@ index 0000000000000000000000000000000000000000..4b6cf8f3d5b2e4e0a2f6d9e94a62869a +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_generic_sensor.c b/drivers/video/rockchip/vehicle/vehicle_generic_sensor.c new file mode 100644 -index 0000000000000000000000000000000000000000..ccb45fd01051aa0bbc285daf99498cd993684760 +index 000000000..ccb45fd01 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_generic_sensor.c @@ -0,0 +1,441 @@ @@ -1659715,7 +1659707,7 @@ index 0000000000000000000000000000000000000000..ccb45fd01051aa0bbc285daf99498cd9 +} diff --git a/drivers/video/rockchip/vehicle/vehicle_gpio.c b/drivers/video/rockchip/vehicle/vehicle_gpio.c new file mode 100644 -index 0000000000000000000000000000000000000000..baab6aa28e34104a2695cf0c1e31e55bfff8089a +index 000000000..baab6aa28 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_gpio.c @@ -0,0 +1,178 @@ @@ -1659899,7 +1659891,7 @@ index 0000000000000000000000000000000000000000..baab6aa28e34104a2695cf0c1e31e55b +} diff --git a/drivers/video/rockchip/vehicle/vehicle_gpio.h b/drivers/video/rockchip/vehicle/vehicle_gpio.h new file mode 100644 -index 0000000000000000000000000000000000000000..6c36392cd6b78960b537098b1d6b910bcb11316d +index 000000000..6c36392cd --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_gpio.h @@ -0,0 +1,33 @@ @@ -1659938,7 +1659930,7 @@ index 0000000000000000000000000000000000000000..6c36392cd6b78960b537098b1d6b910b +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_main.c b/drivers/video/rockchip/vehicle/vehicle_main.c new file mode 100644 -index 0000000000000000000000000000000000000000..fe07b9a42a58ef9bf60bf071b31ec5e9b2ad704a +index 000000000..fe07b9a42 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_main.c @@ -0,0 +1,501 @@ @@ -1660445,7 +1660437,7 @@ index 0000000000000000000000000000000000000000..fe07b9a42a58ef9bf60bf071b31ec5e9 +subsys_initcall_sync(vehicle_system_start); diff --git a/drivers/video/rockchip/vehicle/vehicle_main.h b/drivers/video/rockchip/vehicle/vehicle_main.h new file mode 100644 -index 0000000000000000000000000000000000000000..4d66db14a978c4381e1c1924864716097b9920ed +index 000000000..4d66db14a --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_main.h @@ -0,0 +1,19 @@ @@ -1660470,7 +1660462,7 @@ index 0000000000000000000000000000000000000000..4d66db14a978c4381e1c192486471609 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_samsung_dcphy_common.h b/drivers/video/rockchip/vehicle/vehicle_samsung_dcphy_common.h new file mode 100644 -index 0000000000000000000000000000000000000000..65189b720a02e956bfc4eb2ac119a8a29b200677 +index 000000000..65189b720 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_samsung_dcphy_common.h @@ -0,0 +1,246 @@ @@ -1660722,7 +1660714,7 @@ index 0000000000000000000000000000000000000000..65189b720a02e956bfc4eb2ac119a8a2 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_version.h b/drivers/video/rockchip/vehicle/vehicle_version.h new file mode 100644 -index 0000000000000000000000000000000000000000..9e5da4de3c75f88bcbff3a9622bb42e02f2d8bc9 +index 000000000..9e5da4de3 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_version.h @@ -0,0 +1,78 @@ @@ -1660806,7 +1660798,7 @@ index 0000000000000000000000000000000000000000..9e5da4de3c75f88bcbff3a9622bb42e0 +#endif diff --git a/drivers/video/rockchip/vtunnel/Kconfig b/drivers/video/rockchip/vtunnel/Kconfig new file mode 100644 -index 0000000000000000000000000000000000000000..49ad2a592bb0da89f459c06a6ae0b36da5def960 +index 000000000..49ad2a592 --- /dev/null +++ b/drivers/video/rockchip/vtunnel/Kconfig @@ -0,0 +1,12 @@ @@ -1660824,7 +1660816,7 @@ index 0000000000000000000000000000000000000000..49ad2a592bb0da89f459c06a6ae0b36d +endmenu diff --git a/drivers/video/rockchip/vtunnel/Makefile b/drivers/video/rockchip/vtunnel/Makefile new file mode 100644 -index 0000000000000000000000000000000000000000..fdfd79a1c0a2709f642956d3123355a806ab264e +index 000000000..fdfd79a1c --- /dev/null +++ b/drivers/video/rockchip/vtunnel/Makefile @@ -0,0 +1,3 @@ @@ -1660833,7 +1660825,7 @@ index 0000000000000000000000000000000000000000..fdfd79a1c0a2709f642956d3123355a8 +obj-$(CONFIG_ROCKCHIP_VIDEO_TUNNEL) += rkvtunnel.o diff --git a/drivers/video/rockchip/vtunnel/rkvtunnel.c b/drivers/video/rockchip/vtunnel/rkvtunnel.c new file mode 100644 -index 0000000000000000000000000000000000000000..2a879ab5f83deeaf441ffe9c7773f8ea2b6edac5 +index 000000000..2a879ab5f --- /dev/null +++ b/drivers/video/rockchip/vtunnel/rkvtunnel.c @@ -0,0 +1,1527 @@ @@ -1662366,7 +1662358,7 @@ index 0000000000000000000000000000000000000000..2a879ab5f83deeaf441ffe9c7773f8ea +MODULE_DESCRIPTION("ROCKCHIP videotunnel driver"); diff --git a/drivers/video/rockchip/vtunnel/rkvtunnel.h b/drivers/video/rockchip/vtunnel/rkvtunnel.h new file mode 100644 -index 0000000000000000000000000000000000000000..1781aa785bc0ba84b87cb251e82a01e62b4c5b0e +index 000000000..1781aa785 --- /dev/null +++ b/drivers/video/rockchip/vtunnel/rkvtunnel.h @@ -0,0 +1,81 @@ @@ -1662452,7 +1662444,7 @@ index 0000000000000000000000000000000000000000..1781aa785bc0ba84b87cb251e82a01e6 + +#endif diff --git a/fs/stat.c b/fs/stat.c -index 5375be5f97ccfdbfc490b1d736af36e47a49a25c..3250e427e1aae862c8075225793c163cb5fe92d0 100644 +index 5375be5f9..3250e427e 100644 --- a/fs/stat.c +++ b/fs/stat.c @@ -167,9 +167,6 @@ int vfs_getattr(const struct path *path, struct kstat *stat, @@ -1662466,7 +1662458,7 @@ index 5375be5f97ccfdbfc490b1d736af36e47a49a25c..3250e427e1aae862c8075225793c163c if (retval) return retval; diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h -index bae0fe4d499bccead73abfeda5fac62dc04bbd1e..89e44ecd32a15bf9e8eda210ab0b9a6bfb097f50 100644 +index bae0fe4d4..89e44ecd3 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -902,6 +902,7 @@ @@ -1662478,7 +1662470,7 @@ index bae0fe4d499bccead73abfeda5fac62dc04bbd1e..89e44ecd32a15bf9e8eda210ab0b9a6b #define INIT_CALLS \ diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h -index b0dcc07334a1ee5642b7187307ae2553aed7ef41..09f0dfeff6e80fc4ee9741fe42c3bce135c76d56 100644 +index b0dcc0733..09f0dfeff 100644 --- a/include/drm/bridge/analogix_dp.h +++ b/include/drm/bridge/analogix_dp.h @@ -8,6 +8,7 @@ @@ -1662564,7 +1662556,7 @@ index b0dcc07334a1ee5642b7187307ae2553aed7ef41..09f0dfeff6e80fc4ee9741fe42c3bce1 + #endif /* _ANALOGIX_DP_H_ */ diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h -index 6a46baa0737cd082927bb85afe9cf3434969a24b..4378295b8213a41357b7d8fc988a90da165801c2 100644 +index 6a46baa07..4378295b8 100644 --- a/include/drm/bridge/dw_hdmi.h +++ b/include/drm/bridge/dw_hdmi.h @@ -6,12 +6,16 @@ @@ -1662804,7 +1662796,7 @@ index 6a46baa0737cd082927bb85afe9cf3434969a24b..4378295b8213a41357b7d8fc988a90da #endif /* __IMX_HDMI_H__ */ diff --git a/include/drm/bridge/dw_mipi_dsi.h b/include/drm/bridge/dw_mipi_dsi.h -index 5286a53a1875d3e8590d6986ab54f63e6d24c961..4844b7d011777bfa42cf851c1f7a1650943bf6c3 100644 +index 5286a53a1..4844b7d01 100644 --- a/include/drm/bridge/dw_mipi_dsi.h +++ b/include/drm/bridge/dw_mipi_dsi.h @@ -57,6 +57,7 @@ struct dw_mipi_dsi_plat_data { @@ -1662823,7 +1662815,7 @@ index 5286a53a1875d3e8590d6986ab54f63e6d24c961..4844b7d011777bfa42cf851c1f7a1650 #endif /* __DW_MIPI_DSI__ */ diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h -index d300fde6c1a47a0330dc17d17725c26fa206235d..4a1e26591ec1dbe52343821de8b3725e96f34373 100644 +index d300fde6c..4a1e26591 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -2018,8 +2018,17 @@ int drm_mode_create_suggested_offset_properties(struct drm_device *dev); @@ -1662845,7 +1662837,7 @@ index d300fde6c1a47a0330dc17d17725c26fa206235d..4a1e26591ec1dbe52343821de8b3725e uint64_t link_status); void drm_connector_set_vrr_capable_property( diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h -index 48e93f909ef6fec10933d2530e6c0c8349f2b518..9049a687dd0309cc21b49a1a7eff4b6751ecc216 100644 +index 48e93f909..9049a687d 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -392,6 +392,7 @@ int __drm_set_edid_firmware_path(const char *path); @@ -1663098,7 +1663090,7 @@ index 48e93f909ef6fec10933d2530e6c0c8349f2b518..9049a687dd0309cc21b49a1a7eff4b67 #endif /* __DRM_EDID_H__ */ diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h -index c0aec0d4d664e7f216a334a0cd755f8b0e9ac740..cb6decf31669caf943dfcb2e14dee7b72d816deb 100644 +index c0aec0d4d..cb6decf31 100644 --- a/include/drm/drm_mipi_dsi.h +++ b/include/drm/drm_mipi_dsi.h @@ -19,6 +19,10 @@ struct drm_dsc_picture_parameter_set; @@ -1663130,7 +1663122,7 @@ index c0aec0d4d664e7f216a334a0cd755f8b0e9ac740..cb6decf31669caf943dfcb2e14dee7b7 enum mipi_dsi_pixel_format { MIPI_DSI_FMT_RGB888, diff --git a/include/dt-bindings/clock/px30-cru.h b/include/dt-bindings/clock/px30-cru.h -index 5b1416fcde6fcc0262acb3016222c7fc1568d3cb..7ddb0602d97e5130948a2f6d05ba7079dd141543 100644 +index 5b1416fcd..7ddb0602d 100644 --- a/include/dt-bindings/clock/px30-cru.h +++ b/include/dt-bindings/clock/px30-cru.h @@ -87,6 +87,8 @@ @@ -1663152,7 +1663144,7 @@ index 5b1416fcde6fcc0262acb3016222c7fc1568d3cb..7ddb0602d97e5130948a2f6d05ba7079 #endif diff --git a/include/dt-bindings/clock/rk1808-cru.h b/include/dt-bindings/clock/rk1808-cru.h new file mode 100644 -index 0000000000000000000000000000000000000000..c2153802a461e193c8e670cac1bf63abe5dd5106 +index 000000000..c2153802a --- /dev/null +++ b/include/dt-bindings/clock/rk1808-cru.h @@ -0,0 +1,473 @@ @@ -1663630,7 +1663622,7 @@ index 0000000000000000000000000000000000000000..c2153802a461e193c8e670cac1bf63ab + +#endif diff --git a/include/dt-bindings/clock/rk3399-cru.h b/include/dt-bindings/clock/rk3399-cru.h -index 39169d94a44ecd889d7338430e5f3522783c8fab..b541bdce1c9e9216f3c9a8c36fdc53fe476acbd1 100644 +index 39169d94a..b541bdce1 100644 --- a/include/dt-bindings/clock/rk3399-cru.h +++ b/include/dt-bindings/clock/rk3399-cru.h @@ -7,6 +7,8 @@ @@ -1663739,7 +1663731,7 @@ index 39169d94a44ecd889d7338430e5f3522783c8fab..b541bdce1c9e9216f3c9a8c36fdc53fe #define SRST_P_TIMER_0 9 #define SRST_P_TIMER_1 10 diff --git a/include/dt-bindings/clock/rk3568-cru.h b/include/dt-bindings/clock/rk3568-cru.h -index d29890865150d3c6e371e3fd589116db91c7764e..251445cf7632768bd5d76bdea1d22413f7ae84ea 100644 +index d29890865..251445cf7 100644 --- a/include/dt-bindings/clock/rk3568-cru.h +++ b/include/dt-bindings/clock/rk3568-cru.h @@ -479,6 +479,12 @@ @@ -1663757,7 +1663749,7 @@ index d29890865150d3c6e371e3fd589116db91c7764e..251445cf7632768bd5d76bdea1d22413 diff --git a/include/dt-bindings/clock/rk3588-cru.h b/include/dt-bindings/clock/rk3588-cru.h new file mode 100644 -index 0000000000000000000000000000000000000000..33b0f08c837022025bfd4878d89b6a134267572f +index 000000000..33b0f08c8 --- /dev/null +++ b/include/dt-bindings/clock/rk3588-cru.h @@ -0,0 +1,1497 @@ @@ -1665260,7 +1665252,7 @@ index 0000000000000000000000000000000000000000..33b0f08c837022025bfd4878d89b6a13 +#endif diff --git a/include/dt-bindings/clock/rk618-cru.h b/include/dt-bindings/clock/rk618-cru.h new file mode 100644 -index 0000000000000000000000000000000000000000..72ae0aef1378774d147e00afafdbb07399c4b22a +index 000000000..72ae0aef1 --- /dev/null +++ b/include/dt-bindings/clock/rk618-cru.h @@ -0,0 +1,38 @@ @@ -1665304,7 +1665296,7 @@ index 0000000000000000000000000000000000000000..72ae0aef1378774d147e00afafdbb073 +#endif diff --git a/include/dt-bindings/clock/rk628-cgu.h b/include/dt-bindings/clock/rk628-cgu.h new file mode 100644 -index 0000000000000000000000000000000000000000..bc2dd772c47d8ad675ed9469d0f7edd954cc5bcd +index 000000000..bc2dd772c --- /dev/null +++ b/include/dt-bindings/clock/rk628-cgu.h @@ -0,0 +1,51 @@ @@ -1665361,7 +1665353,7 @@ index 0000000000000000000000000000000000000000..bc2dd772c47d8ad675ed9469d0f7edd9 +#endif diff --git a/include/dt-bindings/clock/rockchip-ddr.h b/include/dt-bindings/clock/rockchip-ddr.h new file mode 100644 -index 0000000000000000000000000000000000000000..b065432e7793b80743efd67c1795914749b6d71c +index 000000000..b065432e7 --- /dev/null +++ b/include/dt-bindings/clock/rockchip-ddr.h @@ -0,0 +1,63 @@ @@ -1665430,7 +1665422,7 @@ index 0000000000000000000000000000000000000000..b065432e7793b80743efd67c17959147 +#endif diff --git a/include/dt-bindings/clock/rockchip.h b/include/dt-bindings/clock/rockchip.h new file mode 100644 -index 0000000000000000000000000000000000000000..b438f7bd40837061a32749800f1d2e89d8ac7bc1 +index 000000000..b438f7bd4 --- /dev/null +++ b/include/dt-bindings/clock/rockchip.h @@ -0,0 +1,101 @@ @@ -1665537,7 +1665529,7 @@ index 0000000000000000000000000000000000000000..b438f7bd40837061a32749800f1d2e89 +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_H */ diff --git a/include/dt-bindings/clock/rv1106-cru.h b/include/dt-bindings/clock/rv1106-cru.h new file mode 100644 -index 0000000000000000000000000000000000000000..95d3652fa9d823220ab8a8b6c4afa392618a8e9c +index 000000000..95d3652fa --- /dev/null +++ b/include/dt-bindings/clock/rv1106-cru.h @@ -0,0 +1,571 @@ @@ -1666114,7 +1666106,7 @@ index 0000000000000000000000000000000000000000..95d3652fa9d823220ab8a8b6c4afa392 +#endif diff --git a/include/dt-bindings/display/drm_mipi_dsi.h b/include/dt-bindings/display/drm_mipi_dsi.h new file mode 100644 -index 0000000000000000000000000000000000000000..c13d3f955453358bca8000874cdb260b51f141da +index 000000000..c13d3f955 --- /dev/null +++ b/include/dt-bindings/display/drm_mipi_dsi.h @@ -0,0 +1,53 @@ @@ -1666173,7 +1666165,7 @@ index 0000000000000000000000000000000000000000..c13d3f955453358bca8000874cdb260b +#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 100644 -index 0000000000000000000000000000000000000000..8d1f8733b8d50abd23a4601547d3ac13005ac9c2 +index 000000000..8d1f8733b --- /dev/null +++ b/include/dt-bindings/display/media-bus-format.h @@ -0,0 +1,2 @@ @@ -1666181,7 +1666173,7 @@ index 0000000000000000000000000000000000000000..8d1f8733b8d50abd23a4601547d3ac13 +#include "../../uapi/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 100644 -index 0000000000000000000000000000000000000000..38aeee0ed51d466fa3bd3d5c5d7c4beca32b352b +index 000000000..38aeee0ed --- /dev/null +++ b/include/dt-bindings/display/mipi_dsi.h @@ -0,0 +1,106 @@ @@ -1666293,7 +1666285,7 @@ index 0000000000000000000000000000000000000000..38aeee0ed51d466fa3bd3d5c5d7c4bec +#endif /* end of MIPI_DSI_H_ */ diff --git a/include/dt-bindings/display/rockchip-tve.h b/include/dt-bindings/display/rockchip-tve.h new file mode 100644 -index 0000000000000000000000000000000000000000..d72d69287bce4a0164653dafb3d78626d6c6f63f +index 000000000..d72d69287 --- /dev/null +++ b/include/dt-bindings/display/rockchip-tve.h @@ -0,0 +1,15 @@ @@ -1666314,7 +1666306,7 @@ index 0000000000000000000000000000000000000000..d72d69287bce4a0164653dafb3d78626 +#endif diff --git a/include/dt-bindings/display/rockchip_vop.h b/include/dt-bindings/display/rockchip_vop.h new file mode 100644 -index 0000000000000000000000000000000000000000..3e14128e7ab1827a3c1665f74fb40e6b0b642654 +index 000000000..3e14128e7 --- /dev/null +++ b/include/dt-bindings/display/rockchip_vop.h @@ -0,0 +1,21 @@ @@ -1666341,7 +1666333,7 @@ index 0000000000000000000000000000000000000000..3e14128e7ab1827a3c1665f74fb40e6b +#endif diff --git a/include/dt-bindings/dram/rockchip,rk322x.h b/include/dt-bindings/dram/rockchip,rk322x.h new file mode 100644 -index 0000000000000000000000000000000000000000..1ab3317d700e75586713296974ce9121ef75f2f7 +index 000000000..1ab3317d7 --- /dev/null +++ b/include/dt-bindings/dram/rockchip,rk322x.h @@ -0,0 +1,90 @@ @@ -1666437,7 +1666429,7 @@ index 0000000000000000000000000000000000000000..1ab3317d700e75586713296974ce9121 +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK322X_H */ diff --git a/include/dt-bindings/input/rk-input.h b/include/dt-bindings/input/rk-input.h new file mode 100644 -index 0000000000000000000000000000000000000000..00b412927890e8ed92746815a90a68f5d40785c5 +index 000000000..00b412927 --- /dev/null +++ b/include/dt-bindings/input/rk-input.h @@ -0,0 +1,814 @@ @@ -1667257,7 +1667249,7 @@ index 0000000000000000000000000000000000000000..00b412927890e8ed92746815a90a68f5 +#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 100644 -index 0000000000000000000000000000000000000000..4a07a5175d29f0cc6db5cf4d2da67feccfb89955 +index 000000000..4a07a5175 --- /dev/null +++ b/include/dt-bindings/memory/px30-dram.h @@ -0,0 +1,140 @@ @@ -1667403,7 +1667395,7 @@ index 0000000000000000000000000000000000000000..4a07a5175d29f0cc6db5cf4d2da67fec +#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 100644 -index 0000000000000000000000000000000000000000..522bd75a4a55ba9573211781652b977193eaf798 +index 000000000..522bd75a4 --- /dev/null +++ b/include/dt-bindings/memory/rk1808-dram.h @@ -0,0 +1,180 @@ @@ -1667589,7 +1667581,7 @@ index 0000000000000000000000000000000000000000..522bd75a4a55ba9573211781652b9771 +#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 100644 -index 0000000000000000000000000000000000000000..2598ac98e5256106837461fed0ecad9606f2f1f6 +index 000000000..2598ac98e --- /dev/null +++ b/include/dt-bindings/memory/rk3128-dram.h @@ -0,0 +1,95 @@ @@ -1667690,7 +1667682,7 @@ index 0000000000000000000000000000000000000000..2598ac98e5256106837461fed0ecad96 +#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 100644 -index 0000000000000000000000000000000000000000..1c531dca755c7dac29f5bbb3e49ea3af4e935e17 +index 000000000..1c531dca7 --- /dev/null +++ b/include/dt-bindings/memory/rk3288-dram.h @@ -0,0 +1,127 @@ @@ -1667823,7 +1667815,7 @@ index 0000000000000000000000000000000000000000..1c531dca755c7dac29f5bbb3e49ea3af +#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 100644 -index 0000000000000000000000000000000000000000..171f41c256d390fb4f9b1159fcd7f1ebf00a47ba +index 000000000..171f41c25 --- /dev/null +++ b/include/dt-bindings/memory/rk3328-dram.h @@ -0,0 +1,159 @@ @@ -1667988,7 +1667980,7 @@ index 0000000000000000000000000000000000000000..171f41c256d390fb4f9b1159fcd7f1eb +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK3328_H*/ diff --git a/include/dt-bindings/memory/rk3399-dram.h b/include/dt-bindings/memory/rk3399-dram.h new file mode 100644 -index 0000000000000000000000000000000000000000..44abb0aafb0583c206d5bc49835cc1223f2f4b2f +index 000000000..44abb0aaf --- /dev/null +++ b/include/dt-bindings/memory/rk3399-dram.h @@ -0,0 +1,107 @@ @@ -1668101,7 +1668093,7 @@ index 0000000000000000000000000000000000000000..44abb0aafb0583c206d5bc49835cc122 +#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 100644 -index 0000000000000000000000000000000000000000..c05eae7fe32e8129a69bcb6c9a69ea0c769f2e3c +index 000000000..c05eae7fe --- /dev/null +++ b/include/dt-bindings/memory/rk3568-dram.h @@ -0,0 +1,111 @@ @@ -1668218,7 +1668210,7 @@ index 0000000000000000000000000000000000000000..c05eae7fe32e8129a69bcb6c9a69ea0c +#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 100644 -index 0000000000000000000000000000000000000000..21ed3975211f5648e1e147b95593c1828fb1beaa +index 000000000..21ed39752 --- /dev/null +++ b/include/dt-bindings/memory/rockchip-dram.h @@ -0,0 +1,102 @@ @@ -1668326,7 +1668318,7 @@ index 0000000000000000000000000000000000000000..21ed3975211f5648e1e147b95593c182 +#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 100644 -index 0000000000000000000000000000000000000000..2082278250449517e9d93c8946618d5883123b37 +index 000000000..208227825 --- /dev/null +++ b/include/dt-bindings/memory/rv1126-dram.h @@ -0,0 +1,161 @@ @@ -1668493,7 +1668485,7 @@ index 0000000000000000000000000000000000000000..2082278250449517e9d93c8946618d58 +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RV1126_H*/ diff --git a/include/dt-bindings/mfd/rockchip-serdes.h b/include/dt-bindings/mfd/rockchip-serdes.h new file mode 100644 -index 0000000000000000000000000000000000000000..610a1e3f5be8f6688ba4dd486a065b44c5711048 +index 000000000..610a1e3f5 --- /dev/null +++ b/include/dt-bindings/mfd/rockchip-serdes.h @@ -0,0 +1,151 @@ @@ -1668650,7 +1668642,7 @@ index 0000000000000000000000000000000000000000..610a1e3f5be8f6688ba4dd486a065b44 +#endif /* __DT_BINDINGS_MFD_ROCKCHIP_SERDES_H */ diff --git a/include/dt-bindings/phy/phy-snps-pcie3.h b/include/dt-bindings/phy/phy-snps-pcie3.h new file mode 100644 -index 0000000000000000000000000000000000000000..5006947f228535e5ea97a8c87805cfe16a7638d4 +index 000000000..5006947f2 --- /dev/null +++ b/include/dt-bindings/phy/phy-snps-pcie3.h @@ -0,0 +1,21 @@ @@ -1668677,7 +1668669,7 @@ index 0000000000000000000000000000000000000000..5006947f228535e5ea97a8c87805cfe1 +#endif /* _DT_BINDINGS_PHY_SNPS_PCIE3 */ diff --git a/include/dt-bindings/power/rk1808-power.h b/include/dt-bindings/power/rk1808-power.h new file mode 100644 -index 0000000000000000000000000000000000000000..2ab9d9901161d1d5568b2f2c768e98d772d74a7d +index 000000000..2ab9d9901 --- /dev/null +++ b/include/dt-bindings/power/rk1808-power.h @@ -0,0 +1,20 @@ @@ -1668703,7 +1668695,7 @@ index 0000000000000000000000000000000000000000..2ab9d9901161d1d5568b2f2c768e98d7 +#endif diff --git a/include/dt-bindings/power/rk3528-power.h b/include/dt-bindings/power/rk3528-power.h new file mode 100644 -index 0000000000000000000000000000000000000000..4f7c978651b52a1efbf30904cd76f36f90883e19 +index 000000000..4f7c97865 --- /dev/null +++ b/include/dt-bindings/power/rk3528-power.h @@ -0,0 +1,18 @@ @@ -1668727,7 +1668719,7 @@ index 0000000000000000000000000000000000000000..4f7c978651b52a1efbf30904cd76f36f +#endif diff --git a/include/dt-bindings/power/rk3562-power.h b/include/dt-bindings/power/rk3562-power.h new file mode 100644 -index 0000000000000000000000000000000000000000..94b26b5bea5fca7789bfd2efe7b622a7afc80bb2 +index 000000000..94b26b5be --- /dev/null +++ b/include/dt-bindings/power/rk3562-power.h @@ -0,0 +1,32 @@ @@ -1668765,7 +1668757,7 @@ index 0000000000000000000000000000000000000000..94b26b5bea5fca7789bfd2efe7b622a7 +#endif diff --git a/include/dt-bindings/sensor-dev.h b/include/dt-bindings/sensor-dev.h new file mode 100644 -index 0000000000000000000000000000000000000000..e03f0027d325d4829edb1fd1fb8167817ab593af +index 000000000..e03f0027d --- /dev/null +++ b/include/dt-bindings/sensor-dev.h @@ -0,0 +1,18 @@ @@ -1668788,7 +1668780,7 @@ index 0000000000000000000000000000000000000000..e03f0027d325d4829edb1fd1fb816781 + +#endif diff --git a/include/dt-bindings/soc/rockchip,boot-mode.h b/include/dt-bindings/soc/rockchip,boot-mode.h -index 4b0914c0989da653110b700fa90871e3f0046fb8..a0f63a040613f3e8d5373f129bca12907a6a9627 100644 +index 4b0914c09..a0f63a040 100644 --- a/include/dt-bindings/soc/rockchip,boot-mode.h +++ b/include/dt-bindings/soc/rockchip,boot-mode.h @@ -10,7 +10,19 @@ @@ -1668813,7 +1668805,7 @@ index 4b0914c0989da653110b700fa90871e3f0046fb8..a0f63a040613f3e8d5373f129bca1290 #endif diff --git a/include/dt-bindings/soc/rockchip,vop2.h b/include/dt-bindings/soc/rockchip,vop2.h -index 6e66a802b96a50bacc7503284fced6eee39161e7..668f199df9f04e1b670802002a1906ec162d06e7 100644 +index 6e66a802b..668f199df 100644 --- a/include/dt-bindings/soc/rockchip,vop2.h +++ b/include/dt-bindings/soc/rockchip,vop2.h @@ -10,5 +10,9 @@ @@ -1668828,7 +1668820,7 @@ index 6e66a802b96a50bacc7503284fced6eee39161e7..668f199df9f04e1b670802002a1906ec #endif /* __DT_BINDINGS_ROCKCHIP_VOP2_H */ diff --git a/include/dt-bindings/soc/rockchip-amp.h b/include/dt-bindings/soc/rockchip-amp.h new file mode 100644 -index 0000000000000000000000000000000000000000..0681e92ef4da4537661fd26c2fe86e21d829fe05 +index 000000000..0681e92ef --- /dev/null +++ b/include/dt-bindings/soc/rockchip-amp.h @@ -0,0 +1,7 @@ @@ -1668841,7 +1668833,7 @@ index 0000000000000000000000000000000000000000..0681e92ef4da4537661fd26c2fe86e21 +#endif diff --git a/include/dt-bindings/soc/rockchip-csu.h b/include/dt-bindings/soc/rockchip-csu.h new file mode 100644 -index 0000000000000000000000000000000000000000..8b0442533c3fb327ea1ba4864368af45869d9946 +index 000000000..8b0442533 --- /dev/null +++ b/include/dt-bindings/soc/rockchip-csu.h @@ -0,0 +1,15 @@ @@ -1668862,7 +1668854,7 @@ index 0000000000000000000000000000000000000000..8b0442533c3fb327ea1ba4864368af45 +#endif diff --git a/include/dt-bindings/soc/rockchip-system-status.h b/include/dt-bindings/soc/rockchip-system-status.h new file mode 100644 -index 0000000000000000000000000000000000000000..6a0d198a2e6ed393e6cc95c9cf712eac5f9b3e82 +index 000000000..6a0d198a2 --- /dev/null +++ b/include/dt-bindings/soc/rockchip-system-status.h @@ -0,0 +1,59 @@ @@ -1668927,7 +1668919,7 @@ index 0000000000000000000000000000000000000000..6a0d198a2e6ed393e6cc95c9cf712eac +#endif diff --git a/include/dt-bindings/suspend/rockchip-px30.h b/include/dt-bindings/suspend/rockchip-px30.h new file mode 100644 -index 0000000000000000000000000000000000000000..4362028f677c0d9e0fbc6bc070b312a6dbe4015d +index 000000000..4362028f6 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-px30.h @@ -0,0 +1,53 @@ @@ -1668986,7 +1668978,7 @@ index 0000000000000000000000000000000000000000..4362028f677c0d9e0fbc6bc070b312a6 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk1808.h b/include/dt-bindings/suspend/rockchip-rk1808.h new file mode 100644 -index 0000000000000000000000000000000000000000..3d565faabf4d4eb7f8c2f717f15bf743bed9a8be +index 000000000..3d565faab --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk1808.h @@ -0,0 +1,46 @@ @@ -1669038,7 +1669030,7 @@ index 0000000000000000000000000000000000000000..3d565faabf4d4eb7f8c2f717f15bf743 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk322x.h b/include/dt-bindings/suspend/rockchip-rk322x.h new file mode 100644 -index 0000000000000000000000000000000000000000..882ae053fa2298275a91c43273793f14ff1aade7 +index 000000000..882ae053f --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk322x.h @@ -0,0 +1,57 @@ @@ -1669101,7 +1669093,7 @@ index 0000000000000000000000000000000000000000..882ae053fa2298275a91c43273793f14 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3288.h b/include/dt-bindings/suspend/rockchip-rk3288.h new file mode 100644 -index 0000000000000000000000000000000000000000..d07cced438779c5300a1d7171900fe50cc87381e +index 000000000..d07cced43 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3288.h @@ -0,0 +1,59 @@ @@ -1669166,7 +1669158,7 @@ index 0000000000000000000000000000000000000000..d07cced438779c5300a1d7171900fe50 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3308.h b/include/dt-bindings/suspend/rockchip-rk3308.h new file mode 100644 -index 0000000000000000000000000000000000000000..78a8cc128b5de7b131b3553dfeaa32e7f07523a9 +index 000000000..78a8cc128 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3308.h @@ -0,0 +1,105 @@ @@ -1669277,7 +1669269,7 @@ index 0000000000000000000000000000000000000000..78a8cc128b5de7b131b3553dfeaa32e7 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3328.h b/include/dt-bindings/suspend/rockchip-rk3328.h new file mode 100644 -index 0000000000000000000000000000000000000000..972f8bb5e2814690c32499895c3b254c00ce8b9d +index 000000000..972f8bb5e --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3328.h @@ -0,0 +1,19 @@ @@ -1669302,7 +1669294,7 @@ index 0000000000000000000000000000000000000000..972f8bb5e2814690c32499895c3b254c +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3399.h b/include/dt-bindings/suspend/rockchip-rk3399.h new file mode 100644 -index 0000000000000000000000000000000000000000..176c7cfcd989dc9b257050a67e72a76bbae42a33 +index 000000000..176c7cfcd --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3399.h @@ -0,0 +1,61 @@ @@ -1669369,7 +1669361,7 @@ index 0000000000000000000000000000000000000000..176c7cfcd989dc9b257050a67e72a76b +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3528.h b/include/dt-bindings/suspend/rockchip-rk3528.h new file mode 100644 -index 0000000000000000000000000000000000000000..5f16a4682963514d378525ab26aff8051915ff1a +index 000000000..5f16a4682 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3528.h @@ -0,0 +1,67 @@ @@ -1669442,7 +1669434,7 @@ index 0000000000000000000000000000000000000000..5f16a4682963514d378525ab26aff805 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3562.h b/include/dt-bindings/suspend/rockchip-rk3562.h new file mode 100644 -index 0000000000000000000000000000000000000000..499f423de63660fe5685dcc8d645c320091ebfa5 +index 000000000..499f423de --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3562.h @@ -0,0 +1,47 @@ @@ -1669495,7 +1669487,7 @@ index 0000000000000000000000000000000000000000..499f423de63660fe5685dcc8d645c320 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3568.h b/include/dt-bindings/suspend/rockchip-rk3568.h new file mode 100644 -index 0000000000000000000000000000000000000000..91e89f64a0674d9c0a90937d05436461e2414b1f +index 000000000..91e89f64a --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3568.h @@ -0,0 +1,57 @@ @@ -1669558,7 +1669550,7 @@ index 0000000000000000000000000000000000000000..91e89f64a0674d9c0a90937d05436461 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3588.h b/include/dt-bindings/suspend/rockchip-rk3588.h new file mode 100644 -index 0000000000000000000000000000000000000000..936febd57cce0e42ea3390dc530bec0c25619dde +index 000000000..936febd57 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3588.h @@ -0,0 +1,65 @@ @@ -1669629,7 +1669621,7 @@ index 0000000000000000000000000000000000000000..936febd57cce0e42ea3390dc530bec0c +#endif diff --git a/include/dt-bindings/suspend/rockchip-rv1106.h b/include/dt-bindings/suspend/rockchip-rv1106.h new file mode 100644 -index 0000000000000000000000000000000000000000..3e3e6ce6bf02e8894eca5a299c0dd3009e03fb5c +index 000000000..3e3e6ce6b --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rv1106.h @@ -0,0 +1,81 @@ @@ -1669716,7 +1669708,7 @@ index 0000000000000000000000000000000000000000..3e3e6ce6bf02e8894eca5a299c0dd300 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rv1126.h b/include/dt-bindings/suspend/rockchip-rv1126.h new file mode 100644 -index 0000000000000000000000000000000000000000..7c28c2bd76193282a4bbdc9c0cfa8a0e4fb5b9c0 +index 000000000..7c28c2bd7 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rv1126.h @@ -0,0 +1,46 @@ @@ -1669767,7 +1669759,7 @@ index 0000000000000000000000000000000000000000..7c28c2bd76193282a4bbdc9c0cfa8a0e +#define RKPM_TIME_OUT_WKUP_EN BIT(10) +#endif diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h -index 1293c38ddb7f7390b26c78e36148b8f9e5ffb1c4..6b78750bac21c32a234c3e3e8550d42b679b21bb 100644 +index 1293c38dd..6b78750ba 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -1155,8 +1155,10 @@ struct clk_fractional_divider { @@ -1669791,7 +1669783,7 @@ index 1293c38ddb7f7390b26c78e36148b8f9e5ffb1c4..6b78750bac21c32a234c3e3e8550d42b const char *name, const char *parent_name, unsigned long flags, diff --git a/include/linux/clk/rockchip.h b/include/linux/clk/rockchip.h new file mode 100644 -index 0000000000000000000000000000000000000000..07c563a42c60d809a9c2bcd617151025c56c8ae5 +index 000000000..07c563a42 --- /dev/null +++ b/include/linux/clk/rockchip.h @@ -0,0 +1,18 @@ @@ -1669815,7 +1669807,7 @@ index 0000000000000000000000000000000000000000..07c563a42c60d809a9c2bcd617151025 +#endif /* __LINUX_CLK_ROCKCHIP_H_ */ diff --git a/include/linux/dma-buf-cache.h b/include/linux/dma-buf-cache.h new file mode 100644 -index 0000000000000000000000000000000000000000..d97545560990a11750bc5f25ee649206be762367 +index 000000000..d97545560 --- /dev/null +++ b/include/linux/dma-buf-cache.h @@ -0,0 +1,32 @@ @@ -1669852,7 +1669844,7 @@ index 0000000000000000000000000000000000000000..d97545560990a11750bc5f25ee649206 + +#endif /* _LINUX_DMA_BUF_CACHE_H */ diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h -index 3f31baa3293f9819e271911db351456ad2a14519..762ff7f221ce7851c966aa0459ff38a794967339 100644 +index 3f31baa32..762ff7f22 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -287,6 +287,20 @@ struct dma_buf_ops { @@ -1669961,7 +1669953,7 @@ index 3f31baa3293f9819e271911db351456ad2a14519..762ff7f221ce7851c966aa0459ff38a7 + #endif /* __DMA_BUF_H__ */ diff --git a/include/linux/dma-heap.h b/include/linux/dma-heap.h -index 0c05561cad6e62b78af6d492b565f50db21e596f..a96c42dcba82e31d2d0b360fa43f0082779d9cb5 100644 +index 0c05561ca..a96c42dcb 100644 --- a/include/linux/dma-heap.h +++ b/include/linux/dma-heap.h @@ -11,6 +11,7 @@ @@ -1669983,7 +1669975,7 @@ index 0c05561cad6e62b78af6d492b565f50db21e596f..a96c42dcba82e31d2d0b360fa43f0082 /** diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h -index cff3dba65820946f7865d8d432385bd13ddc570b..e3ae61d519b32f5aed469ca50a480a6c62e56f89 100644 +index cff3dba65..e3ae61d51 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -445,6 +445,7 @@ struct dma_slave_config { @@ -1669995,7 +1669987,7 @@ index cff3dba65820946f7865d8d432385bd13ddc570b..e3ae61d519b32f5aed469ca50a480a6c size_t peripheral_size; }; diff --git a/include/linux/extcon.h b/include/linux/extcon.h -index e596a0abcb27447fc52992cc72b1b46ff09abe38..1ba671fb92bd9da16a5baf6bcd5be45c4967ead7 100644 +index e596a0abc..1ba671fb9 100644 --- a/include/linux/extcon.h +++ b/include/linux/extcon.h @@ -37,6 +37,7 @@ @@ -1670025,7 +1670017,7 @@ index e596a0abcb27447fc52992cc72b1b46ff09abe38..1ba671fb92bd9da16a5baf6bcd5be45c #endif /* __LINUX_EXTCON_H__ */ diff --git a/include/linux/hdmi-notifier.h b/include/linux/hdmi-notifier.h new file mode 100644 -index 0000000000000000000000000000000000000000..b75b0da280c9c7f03334182b991c1d5eedd84406 +index 000000000..b75b0da28 --- /dev/null +++ b/include/linux/hdmi-notifier.h @@ -0,0 +1,45 @@ @@ -1670076,7 +1670068,7 @@ index 0000000000000000000000000000000000000000..b75b0da280c9c7f03334182b991c1d5e +#endif diff --git a/include/linux/hyperhold_inf.h b/include/linux/hyperhold_inf.h new file mode 100644 -index 0000000000000000000000000000000000000000..7d2bd1e88c1ca1146cf7c106c09366b53fce12bc +index 000000000..7d2bd1e88 --- /dev/null +++ b/include/linux/hyperhold_inf.h @@ -0,0 +1,23 @@ @@ -1670105,7 +1670097,7 @@ index 0000000000000000000000000000000000000000..7d2bd1e88c1ca1146cf7c106c09366b5 +#endif diff --git a/include/linux/initramfs.h b/include/linux/initramfs.h new file mode 100644 -index 0000000000000000000000000000000000000000..26953171620f395dd841d6278889bfb8b0791ec8 +index 000000000..269531716 --- /dev/null +++ b/include/linux/initramfs.h @@ -0,0 +1,40 @@ @@ -1670150,7 +1670142,7 @@ index 0000000000000000000000000000000000000000..26953171620f395dd841d6278889bfb8 + +#endif /* _LINUX_INITRAMFS_H */ diff --git a/include/linux/iommu.h b/include/linux/iommu.h -index 0225cf7445de2a97bbfa3f33a0cf0ea39153d92a..ef9b2836098ace5c7db3734911a35c7957245002 100644 +index 0225cf744..ef9b28360 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -331,6 +331,7 @@ struct iommu_ops { @@ -1670162,7 +1670154,7 @@ index 0225cf7445de2a97bbfa3f33a0cf0ea39153d92a..ef9b2836098ace5c7db3734911a35c79 ioasid_t pasid); diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h -index 2223f95079ce8bfae42c86153ad8bc3ad05f2b2f..6a10a0f810012e4fa46bdda122d849ba5cc37390 100644 +index 2223f9507..6a10a0f81 100644 --- a/include/linux/irqchip/arm-gic.h +++ b/include/linux/irqchip/arm-gic.h @@ -15,6 +15,7 @@ @@ -1670187,7 +1670179,7 @@ index 2223f95079ce8bfae42c86153ad8bc3ad05f2b2f..6a10a0f810012e4fa46bdda122d849ba int gic_get_cpu_id(unsigned int cpu); void gic_migrate_target(unsigned int new_cpu_id); diff --git a/include/linux/kthread.h b/include/linux/kthread.h -index 2c30ade43bc87a1d3ecd44616d3d585433d89558..aada59cb2866caf84e580188075e19c6e30509db 100644 +index 2c30ade43..aada59cb2 100644 --- a/include/linux/kthread.h +++ b/include/linux/kthread.h @@ -141,6 +141,12 @@ struct kthread_delayed_work { @@ -1670245,7 +1670237,7 @@ index 2c30ade43bc87a1d3ecd44616d3d585433d89558..aada59cb2866caf84e580188075e19c6 #endif /* _LINUX_KTHREAD_H */ diff --git a/include/linux/lowmem_dbg.h b/include/linux/lowmem_dbg.h new file mode 100644 -index 0000000000000000000000000000000000000000..be459bd1860345b0f96a2de3a01a9a89a3b0eab8 +index 000000000..be459bd18 --- /dev/null +++ b/include/linux/lowmem_dbg.h @@ -0,0 +1,16 @@ @@ -1670267,7 +1670259,7 @@ index 0000000000000000000000000000000000000000..be459bd1860345b0f96a2de3a01a9a89 + diff --git a/include/linux/memcg_policy.h b/include/linux/memcg_policy.h new file mode 100644 -index 0000000000000000000000000000000000000000..4aec2a1bb3ecf8a8e7f2c4835a524f54c09bb7de +index 000000000..4aec2a1bb --- /dev/null +++ b/include/linux/memcg_policy.h @@ -0,0 +1,47 @@ @@ -1670320,7 +1670312,7 @@ index 0000000000000000000000000000000000000000..4aec2a1bb3ecf8a8e7f2c4835a524f54 +#endif /* _LINUX_MEMCG_POLICY_H */ diff --git a/include/linux/memcheck.h b/include/linux/memcheck.h new file mode 100644 -index 0000000000000000000000000000000000000000..087cd760ece4c33366b3eab3dbf01f68fc1090b0 +index 000000000..087cd760e --- /dev/null +++ b/include/linux/memcheck.h @@ -0,0 +1,22 @@ @@ -1670348,7 +1670340,7 @@ index 0000000000000000000000000000000000000000..087cd760ece4c33366b3eab3dbf01f68 + diff --git a/include/linux/memory_group_manager.h b/include/linux/memory_group_manager.h new file mode 100644 -index 0000000000000000000000000000000000000000..786e3b995f297dd7439f16e450e5f10f9c220af5 +index 000000000..786e3b995 --- /dev/null +++ b/include/linux/memory_group_manager.h @@ -0,0 +1,223 @@ @@ -1670577,7 +1670569,7 @@ index 0000000000000000000000000000000000000000..786e3b995f297dd7439f16e450e5f10f +#endif /* _MEMORY_GROUP_MANAGER_H_ */ diff --git a/include/linux/mfd/rk618.h b/include/linux/mfd/rk618.h new file mode 100644 -index 0000000000000000000000000000000000000000..94525e1cb137eea891add8b334689d007ab2d80d +index 000000000..94525e1cb --- /dev/null +++ b/include/linux/mfd/rk618.h @@ -0,0 +1,125 @@ @@ -1670708,7 +1670700,7 @@ index 0000000000000000000000000000000000000000..94525e1cb137eea891add8b334689d00 +#endif diff --git a/include/linux/mfd/rk628.h b/include/linux/mfd/rk628.h new file mode 100644 -index 0000000000000000000000000000000000000000..52ff63e0c601574513e199f35f382f290ccf66c0 +index 000000000..52ff63e0c --- /dev/null +++ b/include/linux/mfd/rk628.h @@ -0,0 +1,272 @@ @@ -1670986,7 +1670978,7 @@ index 0000000000000000000000000000000000000000..52ff63e0c601574513e199f35f382f29 +#endif diff --git a/include/linux/mfd/rk630.h b/include/linux/mfd/rk630.h new file mode 100644 -index 0000000000000000000000000000000000000000..53c67e846f7ca3da63411aabad59fe13bf376513 +index 000000000..53c67e846 --- /dev/null +++ b/include/linux/mfd/rk630.h @@ -0,0 +1,242 @@ @@ -1671234,7 +1671226,7 @@ index 0000000000000000000000000000000000000000..53c67e846f7ca3da63411aabad59fe13 +#endif diff --git a/include/linux/mfd/rk806.h b/include/linux/mfd/rk806.h new file mode 100644 -index 0000000000000000000000000000000000000000..7735121592c80474b5e30e4afbb444de197e92a3 +index 000000000..773512159 --- /dev/null +++ b/include/linux/mfd/rk806.h @@ -0,0 +1,531 @@ @@ -1671770,7 +1671762,7 @@ index 0000000000000000000000000000000000000000..7735121592c80474b5e30e4afbb444de + enum rk806_fields field_id); +#endif /* __LINUX_REGULATOR_RK806_H */ diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h -index 78e167a9248338071dc3cf8e11e08e5a50eac1b1..92040136070c28530e97ecd5fdb14e85a07fd551 100644 +index 78e167a92..920401360 100644 --- a/include/linux/mfd/rk808.h +++ b/include/linux/mfd/rk808.h @@ -113,6 +113,235 @@ enum rk808_reg { @@ -1672725,7 +1672717,7 @@ index 78e167a9248338071dc3cf8e11e08e5a50eac1b1..92040136070c28530e97ecd5fdb14e85 #endif /* __LINUX_REGULATOR_RK808_H */ diff --git a/include/linux/mm_purgeable.h b/include/linux/mm_purgeable.h new file mode 100644 -index 0000000000000000000000000000000000000000..04d027cb1548d138e19ced1dcb1445a3b3af47b0 +index 000000000..04d027cb1 --- /dev/null +++ b/include/linux/mm_purgeable.h @@ -0,0 +1,77 @@ @@ -1672807,7 +1672799,7 @@ index 0000000000000000000000000000000000000000..04d027cb1548d138e19ced1dcb1445a3 +#endif /* __MM_PURGEABLE_MEM_H */ + diff --git a/include/linux/of_gpio.h b/include/linux/of_gpio.h -index d0f66a5e1b2a7254df8beab0a14807249fd92dfc..ca36529c1c40c731db351749641da2327802dcb2 100644 +index d0f66a5e1..ca36529c1 100644 --- a/include/linux/of_gpio.h +++ b/include/linux/of_gpio.h @@ -17,11 +17,28 @@ @@ -1672858,7 +1672850,7 @@ index d0f66a5e1b2a7254df8beab0a14807249fd92dfc..ca36529c1c40c731db351749641da232 #endif /* __LINUX_OF_GPIO_H */ diff --git a/include/linux/phy/phy-rockchip-usbdp.h b/include/linux/phy/phy-rockchip-usbdp.h new file mode 100644 -index 0000000000000000000000000000000000000000..6a65a159652164d001841337842524568a7b3a22 +index 000000000..6a65a1596 --- /dev/null +++ b/include/linux/phy/phy-rockchip-usbdp.h @@ -0,0 +1,70 @@ @@ -1672934,7 +1672926,7 @@ index 0000000000000000000000000000000000000000..6a65a159652164d00184133784252456 +#endif diff --git a/include/linux/power/rk_usbbc.h b/include/linux/power/rk_usbbc.h new file mode 100644 -index 0000000000000000000000000000000000000000..45f7128b3a692f4b330583e9051f01a5d7d5b15e +index 000000000..45f7128b3 --- /dev/null +++ b/include/linux/power/rk_usbbc.h @@ -0,0 +1,44 @@ @@ -1672984,7 +1672976,7 @@ index 0000000000000000000000000000000000000000..45f7128b3a692f4b330583e9051f01a5 +#endif diff --git a/include/linux/priority_control_manager.h b/include/linux/priority_control_manager.h new file mode 100644 -index 0000000000000000000000000000000000000000..9f28b1b8582abf5087981a76d338476d6ab811d2 +index 000000000..9f28b1b85 --- /dev/null +++ b/include/linux/priority_control_manager.h @@ -0,0 +1,76 @@ @@ -1673065,7 +1673057,7 @@ index 0000000000000000000000000000000000000000..9f28b1b8582abf5087981a76d338476d + +#endif /* _PRIORITY_CONTROL_MANAGER_H_ */ diff --git a/include/linux/profile.h b/include/linux/profile.h -index 11db1ec516e272ab030716b6206340b43a44dac8..61bb6d58b359be0ad1a04ee5d92bf9cd341ce952 100644 +index 11db1ec51..61bb6d58b 100644 --- a/include/linux/profile.h +++ b/include/linux/profile.h @@ -31,6 +31,11 @@ static inline int create_proc_profile(void) @@ -1673138,7 +1673130,7 @@ index 11db1ec516e272ab030716b6206340b43a44dac8..61bb6d58b359be0ad1a04ee5d92bf9cd diff --git a/include/linux/protected_memory_allocator.h b/include/linux/protected_memory_allocator.h new file mode 100644 -index 0000000000000000000000000000000000000000..0c83845a35e0a928a27c200cb27966333f0f43c1 +index 000000000..0c83845a3 --- /dev/null +++ b/include/linux/protected_memory_allocator.h @@ -0,0 +1,106 @@ @@ -1673250,7 +1673242,7 @@ index 0000000000000000000000000000000000000000..0c83845a35e0a928a27c200cb2796633 +#endif /* _PROTECTED_MEMORY_ALLOCATOR_H_ */ diff --git a/include/linux/protected_mode_switcher.h b/include/linux/protected_mode_switcher.h new file mode 100644 -index 0000000000000000000000000000000000000000..5559b184c8bbd5c304a930ccfa77593df3acbba3 +index 000000000..5559b184c --- /dev/null +++ b/include/linux/protected_mode_switcher.h @@ -0,0 +1,66 @@ @@ -1673322,7 +1673314,7 @@ index 0000000000000000000000000000000000000000..5559b184c8bbd5c304a930ccfa77593d +#endif /* _PROTECTED_MODE_SWITCH_H_ */ diff --git a/include/linux/pwm-rockchip.h b/include/linux/pwm-rockchip.h new file mode 100644 -index 0000000000000000000000000000000000000000..60e42aaba7a1e9f5340cd0c9af40caf4ea857c14 +index 000000000..60e42aaba --- /dev/null +++ b/include/linux/pwm-rockchip.h @@ -0,0 +1,187 @@ @@ -1673514,7 +1673506,7 @@ index 0000000000000000000000000000000000000000..60e42aaba7a1e9f5340cd0c9af40caf4 + +#endif /* _PWM_ROCKCHIP_H_ */ diff --git a/include/linux/pwm.h b/include/linux/pwm.h -index fe0f38ce1bdee9b2fcfb8962841bc5987864f05b..14d52d94da44f6c512274b12bdc158ba2c8167c1 100644 +index fe0f38ce1..14d52d94d 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h @@ -309,6 +309,8 @@ struct pwm_chip { @@ -1673546,7 +1673538,7 @@ index fe0f38ce1bdee9b2fcfb8962841bc5987864f05b..14d52d94da44f6c512274b12bdc158ba { diff --git a/include/linux/reclaim_acct.h b/include/linux/reclaim_acct.h new file mode 100644 -index 0000000000000000000000000000000000000000..5cf26f3267d1b73e6caa33fa7cd47b3257ff86f3 +index 000000000..5cf26f326 --- /dev/null +++ b/include/linux/reclaim_acct.h @@ -0,0 +1,48 @@ @@ -1673600,7 +1673592,7 @@ index 0000000000000000000000000000000000000000..5cf26f3267d1b73e6caa33fa7cd47b32 +#endif /* _RECLAIM_ACCT_H */ diff --git a/include/linux/rfkill-bt.h b/include/linux/rfkill-bt.h new file mode 100644 -index 0000000000000000000000000000000000000000..ed8da08ee0bd4d2412231de506b5f7d697164449 +index 000000000..ed8da08ee --- /dev/null +++ b/include/linux/rfkill-bt.h @@ -0,0 +1,74 @@ @@ -1673680,7 +1673672,7 @@ index 0000000000000000000000000000000000000000..ed8da08ee0bd4d2412231de506b5f7d6 + diff --git a/include/linux/rfkill-wlan.h b/include/linux/rfkill-wlan.h new file mode 100644 -index 0000000000000000000000000000000000000000..c1987c316794e03257440139fbc7b210685a437b +index 000000000..c1987c316 --- /dev/null +++ b/include/linux/rfkill-wlan.h @@ -0,0 +1,69 @@ @@ -1673755,7 +1673747,7 @@ index 0000000000000000000000000000000000000000..c1987c316794e03257440139fbc7b210 +#endif diff --git a/include/linux/rk-dma-heap.h b/include/linux/rk-dma-heap.h new file mode 100644 -index 0000000000000000000000000000000000000000..e42bc227dd049c327012f980115b5942e3cb8457 +index 000000000..e42bc227d --- /dev/null +++ b/include/linux/rk-dma-heap.h @@ -0,0 +1,137 @@ @@ -1673898,7 +1673890,7 @@ index 0000000000000000000000000000000000000000..e42bc227dd049c327012f980115b5942 +#endif /* _DMA_HEAPS_H */ diff --git a/include/linux/rk_hdmirx_class.h b/include/linux/rk_hdmirx_class.h new file mode 100644 -index 0000000000000000000000000000000000000000..d3a3e434b0308ea6db5a4ae3e5a8be9dc675c71d +index 000000000..d3a3e434b --- /dev/null +++ b/include/linux/rk_hdmirx_class.h @@ -0,0 +1,13 @@ @@ -1673917,7 +1673909,7 @@ index 0000000000000000000000000000000000000000..d3a3e434b0308ea6db5a4ae3e5a8be9d +#endif diff --git a/include/linux/rk_keys.h b/include/linux/rk_keys.h new file mode 100644 -index 0000000000000000000000000000000000000000..aee656daf2c8a5a40120685d46d79729e8353a2b +index 000000000..aee656daf --- /dev/null +++ b/include/linux/rk_keys.h @@ -0,0 +1,19 @@ @@ -1673942,7 +1673934,7 @@ index 0000000000000000000000000000000000000000..aee656daf2c8a5a40120685d46d79729 +#endif diff --git a/include/linux/rockchip-iovmm.h b/include/linux/rockchip-iovmm.h new file mode 100644 -index 0000000000000000000000000000000000000000..3005c745e5b8ed78f3f511814171307858b5b919 +index 000000000..3005c745e --- /dev/null +++ b/include/linux/rockchip-iovmm.h @@ -0,0 +1,91 @@ @@ -1674039,7 +1674031,7 @@ index 0000000000000000000000000000000000000000..3005c745e5b8ed78f3f5118141713078 +#endif /*__ASM_PLAT_IOVMM_H*/ diff --git a/include/linux/rockchip/cpu.h b/include/linux/rockchip/cpu.h new file mode 100644 -index 0000000000000000000000000000000000000000..beaaf923f9eca86e367e8a3a4591029e5c033535 +index 000000000..beaaf923f --- /dev/null +++ b/include/linux/rockchip/cpu.h @@ -0,0 +1,272 @@ @@ -1674317,7 +1674309,7 @@ index 0000000000000000000000000000000000000000..beaaf923f9eca86e367e8a3a4591029e +#endif diff --git a/include/linux/rockchip/grf.h b/include/linux/rockchip/grf.h new file mode 100644 -index 0000000000000000000000000000000000000000..fae51232297c6d41b9a3a87b63ad8fb64767002f +index 000000000..fae512322 --- /dev/null +++ b/include/linux/rockchip/grf.h @@ -0,0 +1,700 @@ @@ -1675023,7 +1675015,7 @@ index 0000000000000000000000000000000000000000..fae51232297c6d41b9a3a87b63ad8fb6 +#endif diff --git a/include/linux/rockchip/nvmem.h b/include/linux/rockchip/nvmem.h new file mode 100644 -index 0000000000000000000000000000000000000000..741887856e3353cc6b7f86f05140551c6acb5c63 +index 000000000..741887856 --- /dev/null +++ b/include/linux/rockchip/nvmem.h @@ -0,0 +1,26 @@ @@ -1675055,7 +1675047,7 @@ index 0000000000000000000000000000000000000000..741887856e3353cc6b7f86f05140551c +#endif diff --git a/include/linux/rockchip/psci.h b/include/linux/rockchip/psci.h new file mode 100644 -index 0000000000000000000000000000000000000000..870da27edf65d280df7f40f7a2dd9871ba0b6f23 +index 000000000..870da27ed --- /dev/null +++ b/include/linux/rockchip/psci.h @@ -0,0 +1,76 @@ @@ -1675137,7 +1675129,7 @@ index 0000000000000000000000000000000000000000..870da27edf65d280df7f40f7a2dd9871 +#endif /* __ROCKCHIP_PSCI_H */ diff --git a/include/linux/rockchip/rockchip_pm_config.h b/include/linux/rockchip/rockchip_pm_config.h new file mode 100644 -index 0000000000000000000000000000000000000000..2c95b04b092ddd545e2b27719612718b5065d10b +index 000000000..2c95b04b0 --- /dev/null +++ b/include/linux/rockchip/rockchip_pm_config.h @@ -0,0 +1,32 @@ @@ -1675175,7 +1675167,7 @@ index 0000000000000000000000000000000000000000..2c95b04b092ddd545e2b27719612718b +#endif /* __ROCKCHIP_PM_CONFIG_H */ diff --git a/include/linux/rockchip/rockchip_sip.h b/include/linux/rockchip/rockchip_sip.h new file mode 100644 -index 0000000000000000000000000000000000000000..70b1493ef6972dad17dfb6b998e11807bbc94d1b +index 000000000..70b1493ef --- /dev/null +++ b/include/linux/rockchip/rockchip_sip.h @@ -0,0 +1,549 @@ @@ -1675730,7 +1675722,7 @@ index 0000000000000000000000000000000000000000..70b1493ef6972dad17dfb6b998e11807 +#endif diff --git a/include/linux/rockchip_ion.h b/include/linux/rockchip_ion.h new file mode 100644 -index 0000000000000000000000000000000000000000..39c497774fb09926e3282dbf71648777c0e6d716 +index 000000000..39c497774 --- /dev/null +++ b/include/linux/rockchip_ion.h @@ -0,0 +1,41 @@ @@ -1675776,7 +1675768,7 @@ index 0000000000000000000000000000000000000000..39c497774fb09926e3282dbf71648777 + +#endif diff --git a/include/linux/sched.h b/include/linux/sched.h -index d3198acc29af318b39ef85a111161ab0c99238b0..b522879c7ae274ef81c5f6c7ea955b2e2aaee663 100644 +index d3198acc2..b522879c7 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -744,6 +744,20 @@ struct kmap_ctrl { @@ -1675812,7 +1675804,7 @@ index d3198acc29af318b39ef85a111161ab0c99238b0..b522879c7ae274ef81c5f6c7ea955b2e * New fields for task_struct should be added above here, so that * they are included in the randomized portion of task_struct. diff --git a/include/linux/sched/signal.h b/include/linux/sched/signal.h -index 0014d3adaf8460b03b4ad2e4ccaf97b17b7a8884..669e8cff40c7444b13cc1b101624c59da0fb3868 100644 +index 0014d3ada..669e8cff4 100644 --- a/include/linux/sched/signal.h +++ b/include/linux/sched/signal.h @@ -649,9 +649,12 @@ extern void flush_itimer_signals(void); @@ -1675832,7 +1675824,7 @@ index 0014d3adaf8460b03b4ad2e4ccaf97b17b7a8884..669e8cff40c7444b13cc1b101624c59d diff --git a/include/linux/soc/rockchip/pvtm.h b/include/linux/soc/rockchip/pvtm.h new file mode 100644 -index 0000000000000000000000000000000000000000..3d2495cfd6e5ad6bcf27548258f418f903d3af77 +index 000000000..3d2495cfd --- /dev/null +++ b/include/linux/soc/rockchip/pvtm.h @@ -0,0 +1,17 @@ @@ -1675855,7 +1675847,7 @@ index 0000000000000000000000000000000000000000..3d2495cfd6e5ad6bcf27548258f418f9 +#endif /* __SOC_ROCKCHIP_PVTM_H */ diff --git a/include/linux/soc/rockchip/rk_sdmmc.h b/include/linux/soc/rockchip/rk_sdmmc.h new file mode 100644 -index 0000000000000000000000000000000000000000..14f70f72e3836e3dfbde4a1cbb4b42bc40cfb530 +index 000000000..14f70f72e --- /dev/null +++ b/include/linux/soc/rockchip/rk_sdmmc.h @@ -0,0 +1,13 @@ @@ -1675874,7 +1675866,7 @@ index 0000000000000000000000000000000000000000..14f70f72e3836e3dfbde4a1cbb4b42bc +#endif diff --git a/include/linux/soc/rockchip/rk_vendor_storage.h b/include/linux/soc/rockchip/rk_vendor_storage.h new file mode 100644 -index 0000000000000000000000000000000000000000..d30b775e6a5f4513d5cd83ff6bdbba31745cb695 +index 000000000..d30b775e6 --- /dev/null +++ b/include/linux/soc/rockchip/rk_vendor_storage.h @@ -0,0 +1,96 @@ @@ -1675976,7 +1675968,7 @@ index 0000000000000000000000000000000000000000..d30b775e6a5f4513d5cd83ff6bdbba31 +#endif diff --git a/include/linux/soc/rockchip/rockchip_decompress.h b/include/linux/soc/rockchip/rockchip_decompress.h new file mode 100644 -index 0000000000000000000000000000000000000000..120ae907c2aafcf3df916ab2e3b1526e218ccd0a +index 000000000..120ae907c --- /dev/null +++ b/include/linux/soc/rockchip/rockchip_decompress.h @@ -0,0 +1,42 @@ @@ -1676024,7 +1676016,7 @@ index 0000000000000000000000000000000000000000..120ae907c2aafcf3df916ab2e3b1526e +#endif diff --git a/include/linux/soc/rockchip/rockchip_thunderboot_crypto.h b/include/linux/soc/rockchip/rockchip_thunderboot_crypto.h new file mode 100644 -index 0000000000000000000000000000000000000000..2fe1766494099a25b4bbb28b48bbe8db7c790519 +index 000000000..2fe176649 --- /dev/null +++ b/include/linux/soc/rockchip/rockchip_thunderboot_crypto.h @@ -0,0 +1,9 @@ @@ -1676039,7 +1676031,7 @@ index 0000000000000000000000000000000000000000..2fe1766494099a25b4bbb28b48bbe8db +#endif diff --git a/include/linux/soc/rockchip/rockchip_thunderboot_service.h b/include/linux/soc/rockchip/rockchip_thunderboot_service.h new file mode 100644 -index 0000000000000000000000000000000000000000..d0a08a07c21dfdec58df1e834d2cea78af8d384c +index 000000000..d0a08a07c --- /dev/null +++ b/include/linux/soc/rockchip/rockchip_thunderboot_service.h @@ -0,0 +1,37 @@ @@ -1676081,7 +1676073,7 @@ index 0000000000000000000000000000000000000000..d0a08a07c21dfdec58df1e834d2cea78 +#endif +#endif diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h -index 5acb77968902dc3c8d20ef75945dee1025140b9a..b81871205c254b025c08f4955d765eec39ba8850 100644 +index 5acb77968..b81871205 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -264,6 +264,9 @@ struct plat_stmmacenet_data { @@ -1676106,7 +1676098,7 @@ index 5acb77968902dc3c8d20ef75945dee1025140b9a..b81871205c254b025c08f4955d765eec int (*clks_config)(void *priv, bool enabled); int (*crosststamp)(ktime_t *device, struct system_counterval_t *system, diff --git a/include/linux/usb/quirks.h b/include/linux/usb/quirks.h -index eeb7c2157c72fba0e54f926cec863bb9e50ff9f5..e3e543d04bd603fd992cc0c7b5a085e622307ee3 100644 +index eeb7c2157..e3e543d04 100644 --- a/include/linux/usb/quirks.h +++ b/include/linux/usb/quirks.h @@ -72,4 +72,7 @@ @@ -1676119,7 +1676111,7 @@ index eeb7c2157c72fba0e54f926cec863bb9e50ff9f5..e3e543d04bd603fd992cc0c7b5a085e6 #endif /* __LINUX_USB_QUIRKS_H */ diff --git a/include/linux/version_compat_defs.h b/include/linux/version_compat_defs.h new file mode 100644 -index 0000000000000000000000000000000000000000..a83b8871598e1fc359d60e63e5f97a1f2d17d036 +index 000000000..a83b88715 --- /dev/null +++ b/include/linux/version_compat_defs.h @@ -0,0 +1,289 @@ @@ -1676414,7 +1676406,7 @@ index 0000000000000000000000000000000000000000..a83b8871598e1fc359d60e63e5f97a1f +#endif /* _VERSION_COMPAT_DEFS_H_ */ diff --git a/include/linux/wakelock.h b/include/linux/wakelock.h new file mode 100644 -index 0000000000000000000000000000000000000000..7b4825ba952145e9b487501d66e830a06d38eae9 +index 000000000..7b4825ba9 --- /dev/null +++ b/include/linux/wakelock.h @@ -0,0 +1,76 @@ @@ -1676496,7 +1676488,7 @@ index 0000000000000000000000000000000000000000..7b4825ba952145e9b487501d66e830a0 +#endif diff --git a/include/linux/wakeup_reason.h b/include/linux/wakeup_reason.h new file mode 100644 -index 0000000000000000000000000000000000000000..54f5caaa5cde52672422c6593027feef2d926a98 +index 000000000..54f5caaa5 --- /dev/null +++ b/include/linux/wakeup_reason.h @@ -0,0 +1,37 @@ @@ -1676539,7 +1676531,7 @@ index 0000000000000000000000000000000000000000..54f5caaa5cde52672422c6593027feef +#endif /* _LINUX_WAKEUP_REASON_H */ diff --git a/include/linux/xpm.h b/include/linux/xpm.h new file mode 100644 -index 0000000000000000000000000000000000000000..2373d9c2321c13aca6e0544454f4650214b5397f +index 000000000..2373d9c23 --- /dev/null +++ b/include/linux/xpm.h @@ -0,0 +1,99 @@ @@ -1676644,7 +1676636,7 @@ index 0000000000000000000000000000000000000000..2373d9c2321c13aca6e0544454f46502 +#endif /* _XPM_H */ diff --git a/include/linux/xpm_types.h b/include/linux/xpm_types.h new file mode 100644 -index 0000000000000000000000000000000000000000..e8a0cec9845f15561dddbf521ea3c398b96e4979 +index 000000000..e8a0cec98 --- /dev/null +++ b/include/linux/xpm_types.h @@ -0,0 +1,21 @@ @@ -1676672,7 +1676664,7 @@ index 0000000000000000000000000000000000000000..e8a0cec9845f15561dddbf521ea3c398 \ No newline at end of file diff --git a/include/linux/zswapd.h b/include/linux/zswapd.h new file mode 100644 -index 0000000000000000000000000000000000000000..3a9768a358a8eb31666cfdf58f4efe10bd4e8263 +index 000000000..3a9768a35 --- /dev/null +++ b/include/linux/zswapd.h @@ -0,0 +1,50 @@ @@ -1676727,7 +1676719,7 @@ index 0000000000000000000000000000000000000000..3a9768a358a8eb31666cfdf58f4efe10 + +#endif /* _LINUX_ZSWAPD_H */ diff --git a/include/media/mipi-csi2.h b/include/media/mipi-csi2.h -index c3d8f12234b1fb73ced5ac5c0adcc9f1a3328e0d..40fc0264250d779ab5dfa7d2fe16e6f1382c07d4 100644 +index c3d8f1223..40fc02642 100644 --- a/include/media/mipi-csi2.h +++ b/include/media/mipi-csi2.h @@ -19,6 +19,7 @@ @@ -1676739,7 +1676731,7 @@ index c3d8f12234b1fb73ced5ac5c0adcc9f1a3328e0d..40fc0264250d779ab5dfa7d2fe16e6f1 #define MIPI_CSI2_DT_YUV420_10B 0x19 #define MIPI_CSI2_DT_YUV420_8B_LEGACY 0x1a diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h -index 9bd326d31181294580becead9546975724138fa1..246cde0a993b28e1b4a391445e326eec67c9d9cb 100644 +index 9bd326d31..246cde0a9 100644 --- a/include/media/v4l2-async.h +++ b/include/media/v4l2-async.h @@ -17,6 +17,7 @@ struct device_node; @@ -1676866,7 +1676858,7 @@ index 9bd326d31181294580becead9546975724138fa1..246cde0a993b28e1b4a391445e326eec * diff --git a/include/media/v4l2-controls_rockchip.h b/include/media/v4l2-controls_rockchip.h new file mode 100644 -index 0000000000000000000000000000000000000000..fc14dc8513e489944faaec32477bec3a3ef08221 +index 000000000..fc14dc851 --- /dev/null +++ b/include/media/v4l2-controls_rockchip.h @@ -0,0 +1,27 @@ @@ -1676899,7 +1676891,7 @@ index 0000000000000000000000000000000000000000..fc14dc8513e489944faaec32477bec3a +#endif diff --git a/include/media/v4l2-uvc.h b/include/media/v4l2-uvc.h new file mode 100644 -index 0000000000000000000000000000000000000000..b010a36fc1d951bbe73cb52484a0e316c71b1794 +index 000000000..b010a36fc --- /dev/null +++ b/include/media/v4l2-uvc.h @@ -0,0 +1,367 @@ @@ -1677272,7 +1677264,7 @@ index 0000000000000000000000000000000000000000..b010a36fc1d951bbe73cb52484a0e316 +#endif /* __LINUX_V4L2_UVC_H */ diff --git a/include/media/videobuf2-cma-sg.h b/include/media/videobuf2-cma-sg.h new file mode 100644 -index 0000000000000000000000000000000000000000..021a80a2f10b00b712d6967dd6d3c8d12d591f34 +index 000000000..021a80a2f --- /dev/null +++ b/include/media/videobuf2-cma-sg.h @@ -0,0 +1,10 @@ @@ -1677287,7 +1677279,7 @@ index 0000000000000000000000000000000000000000..021a80a2f10b00b712d6967dd6d3c8d1 + +#endif diff --git a/include/soc/rockchip/pm_domains.h b/include/soc/rockchip/pm_domains.h -index 7dbd941fc937154d834b9c6f803320296743a390..670459c6a0a11399519326cb07df60c137b515ea 100644 +index 7dbd941fc..670459c6a 100644 --- a/include/soc/rockchip/pm_domains.h +++ b/include/soc/rockchip/pm_domains.h @@ -6,10 +6,21 @@ @@ -1677363,7 +1677355,7 @@ index 7dbd941fc937154d834b9c6f803320296743a390..670459c6a0a11399519326cb07df60c1 + #endif /* __SOC_ROCKCHIP_PM_DOMAINS_H__ */ diff --git a/include/soc/rockchip/rk3399_grf.h b/include/soc/rockchip/rk3399_grf.h -index 3eebabcb28123b041f4114c91e90239adf6236cf..39cd44cec982f3f599d90ee961a8062bdc4a9c8b 100644 +index 3eebabcb2..39cd44cec 100644 --- a/include/soc/rockchip/rk3399_grf.h +++ b/include/soc/rockchip/rk3399_grf.h @@ -11,11 +11,8 @@ @@ -1677383,7 +1677375,7 @@ index 3eebabcb28123b041f4114c91e90239adf6236cf..39cd44cec982f3f599d90ee961a8062b #endif diff --git a/include/soc/rockchip/rk3568_grf.h b/include/soc/rockchip/rk3568_grf.h new file mode 100644 -index 0000000000000000000000000000000000000000..52853efd6720e804e60d86d6be6a18a38a22c607 +index 000000000..52853efd6 --- /dev/null +++ b/include/soc/rockchip/rk3568_grf.h @@ -0,0 +1,13 @@ @@ -1677402,7 +1677394,7 @@ index 0000000000000000000000000000000000000000..52853efd6720e804e60d86d6be6a18a3 +#endif /* __SOC_RK3568_GRF_H */ diff --git a/include/soc/rockchip/rk3588_grf.h b/include/soc/rockchip/rk3588_grf.h new file mode 100644 -index 0000000000000000000000000000000000000000..630b35a550640e57f1b5a50dfbe362653a7cbcc1 +index 000000000..630b35a55 --- /dev/null +++ b/include/soc/rockchip/rk3588_grf.h @@ -0,0 +1,18 @@ @@ -1677426,7 +1677418,7 @@ index 0000000000000000000000000000000000000000..630b35a550640e57f1b5a50dfbe36265 +#endif /* __SOC_RK3588_GRF_H */ diff --git a/include/soc/rockchip/rk_minidump.h b/include/soc/rockchip/rk_minidump.h new file mode 100644 -index 0000000000000000000000000000000000000000..c9e9efd2222bf3178d17414e16253ecb51d9600e +index 000000000..c9e9efd22 --- /dev/null +++ b/include/soc/rockchip/rk_minidump.h @@ -0,0 +1,75 @@ @@ -1677507,7 +1677499,7 @@ index 0000000000000000000000000000000000000000..c9e9efd2222bf3178d17414e16253ecb +#endif /* __RK_MINIDUMP_H */ diff --git a/include/soc/rockchip/rkfb_dmc.h b/include/soc/rockchip/rkfb_dmc.h new file mode 100644 -index 0000000000000000000000000000000000000000..5e82b3194dd34e6e99400802366a51b661278099 +index 000000000..5e82b3194 --- /dev/null +++ b/include/soc/rockchip/rkfb_dmc.h @@ -0,0 +1,11 @@ @@ -1677524,7 +1677516,7 @@ index 0000000000000000000000000000000000000000..5e82b3194dd34e6e99400802366a51b6 +#endif diff --git a/include/soc/rockchip/rockchip-mailbox.h b/include/soc/rockchip/rockchip-mailbox.h new file mode 100644 -index 0000000000000000000000000000000000000000..e3698b9e10fee4edb0c75b35af5c5a20b0462e24 +index 000000000..e3698b9e1 --- /dev/null +++ b/include/soc/rockchip/rockchip-mailbox.h @@ -0,0 +1,30 @@ @@ -1677560,7 +1677552,7 @@ index 0000000000000000000000000000000000000000..e3698b9e10fee4edb0c75b35af5c5a20 +#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 100644 -index 0000000000000000000000000000000000000000..5eb53ff2f3f392f605c1d859ea7b47132e92293b +index 000000000..5eb53ff2f --- /dev/null +++ b/include/soc/rockchip/rockchip-system-status.h @@ -0,0 +1,55 @@ @@ -1677621,7 +1677613,7 @@ index 0000000000000000000000000000000000000000..5eb53ff2f3f392f605c1d859ea7b4713 +#endif diff --git a/include/soc/rockchip/rockchip_amp.h b/include/soc/rockchip/rockchip_amp.h new file mode 100644 -index 0000000000000000000000000000000000000000..851c0f47d54a88d3561267dbb065d4ed8c90afca +index 000000000..851c0f47d --- /dev/null +++ b/include/soc/rockchip/rockchip_amp.h @@ -0,0 +1,48 @@ @@ -1677675,7 +1677667,7 @@ index 0000000000000000000000000000000000000000..851c0f47d54a88d3561267dbb065d4ed +#endif /* _ROCKCHIP_AMP */ diff --git a/include/soc/rockchip/rockchip_csu.h b/include/soc/rockchip/rockchip_csu.h new file mode 100644 -index 0000000000000000000000000000000000000000..4338d68359f7f067361e8c204c6ae3a21df213f2 +index 000000000..4338d6835 --- /dev/null +++ b/include/soc/rockchip/rockchip_csu.h @@ -0,0 +1,46 @@ @@ -1677727,7 +1677719,7 @@ index 0000000000000000000000000000000000000000..4338d68359f7f067361e8c204c6ae3a2 +#endif diff --git a/include/soc/rockchip/rockchip_dmc.h b/include/soc/rockchip/rockchip_dmc.h new file mode 100644 -index 0000000000000000000000000000000000000000..f115cdcec291f20b19b48214bd160d4f7eac7790 +index 000000000..f115cdcec --- /dev/null +++ b/include/soc/rockchip/rockchip_dmc.h @@ -0,0 +1,131 @@ @@ -1677864,7 +1677856,7 @@ index 0000000000000000000000000000000000000000..f115cdcec291f20b19b48214bd160d4f +#endif diff --git a/include/soc/rockchip/rockchip_dvbm.h b/include/soc/rockchip/rockchip_dvbm.h new file mode 100644 -index 0000000000000000000000000000000000000000..19596f1bd4c61be39d4bd189c42ed87bd0e23732 +index 000000000..19596f1bd --- /dev/null +++ b/include/soc/rockchip/rockchip_dvbm.h @@ -0,0 +1,161 @@ @@ -1678031,7 +1678023,7 @@ index 0000000000000000000000000000000000000000..19596f1bd4c61be39d4bd189c42ed87b +#endif diff --git a/include/soc/rockchip/rockchip_grf.h b/include/soc/rockchip/rockchip_grf.h new file mode 100644 -index 0000000000000000000000000000000000000000..e46fd72aea8d1f649768a3269b85176dacceef0e +index 000000000..e46fd72ae --- /dev/null +++ b/include/soc/rockchip/rockchip_grf.h @@ -0,0 +1,18 @@ @@ -1678055,7 +1678047,7 @@ index 0000000000000000000000000000000000000000..e46fd72aea8d1f649768a3269b85176d +#endif /* __SOC_ROCKCHIP_GRF_H */ diff --git a/include/soc/rockchip/rockchip_iommu.h b/include/soc/rockchip/rockchip_iommu.h new file mode 100644 -index 0000000000000000000000000000000000000000..b3086c0f06175fd558f1909f4a6af640472b6a73 +index 000000000..b3086c0f0 --- /dev/null +++ b/include/soc/rockchip/rockchip_iommu.h @@ -0,0 +1,89 @@ @@ -1678150,7 +1678142,7 @@ index 0000000000000000000000000000000000000000..b3086c0f06175fd558f1909f4a6af640 +#endif diff --git a/include/soc/rockchip/rockchip_ipa.h b/include/soc/rockchip/rockchip_ipa.h new file mode 100644 -index 0000000000000000000000000000000000000000..cb333f463c7b78b9c09deac94300075da2d9a863 +index 000000000..cb333f463 --- /dev/null +++ b/include/soc/rockchip/rockchip_ipa.h @@ -0,0 +1,40 @@ @@ -1678196,7 +1678188,7 @@ index 0000000000000000000000000000000000000000..cb333f463c7b78b9c09deac94300075d +#endif diff --git a/include/soc/rockchip/rockchip_opp_select.h b/include/soc/rockchip/rockchip_opp_select.h new file mode 100644 -index 0000000000000000000000000000000000000000..f241978549f5da9183c3f0bf2988c8391140287b +index 000000000..f24197854 --- /dev/null +++ b/include/soc/rockchip/rockchip_opp_select.h @@ -0,0 +1,291 @@ @@ -1678493,7 +1678485,7 @@ index 0000000000000000000000000000000000000000..f241978549f5da9183c3f0bf2988c839 +#endif diff --git a/include/soc/rockchip/rockchip_performance.h b/include/soc/rockchip/rockchip_performance.h new file mode 100644 -index 0000000000000000000000000000000000000000..c080fb65c7a5d749f34e7158ac725bdd39e32f39 +index 000000000..c080fb65c --- /dev/null +++ b/include/soc/rockchip/rockchip_performance.h @@ -0,0 +1,33 @@ @@ -1678532,7 +1678524,7 @@ index 0000000000000000000000000000000000000000..c080fb65c7a5d749f34e7158ac725bdd +#endif diff --git a/include/soc/rockchip/rockchip_rockit.h b/include/soc/rockchip/rockchip_rockit.h new file mode 100644 -index 0000000000000000000000000000000000000000..760a864d24bcb451cbc5ab3deb1bc595a665ffd5 +index 000000000..760a864d2 --- /dev/null +++ b/include/soc/rockchip/rockchip_rockit.h @@ -0,0 +1,187 @@ @@ -1678724,7 +1678716,7 @@ index 0000000000000000000000000000000000000000..760a864d24bcb451cbc5ab3deb1bc595 + +#endif diff --git a/include/soc/rockchip/rockchip_sip.h b/include/soc/rockchip/rockchip_sip.h -index c46a9ae2a2abb656a08fc09ed83388bfd783df59..23daaddcacb5bd9a9e2f70a36e266386694c8a2c 100644 +index c46a9ae2a..23daaddca 100644 --- a/include/soc/rockchip/rockchip_sip.h +++ b/include/soc/rockchip/rockchip_sip.h @@ -16,5 +16,14 @@ @@ -1678744,7 +1678736,7 @@ index c46a9ae2a2abb656a08fc09ed83388bfd783df59..23daaddcacb5bd9a9e2f70a36e266386 #endif diff --git a/include/soc/rockchip/rockchip_system_monitor.h b/include/soc/rockchip/rockchip_system_monitor.h new file mode 100644 -index 0000000000000000000000000000000000000000..4df62aa371e90680b03d627a13ba24beba442f04 +index 000000000..4df62aa37 --- /dev/null +++ b/include/soc/rockchip/rockchip_system_monitor.h @@ -0,0 +1,215 @@ @@ -1678965,7 +1678957,7 @@ index 0000000000000000000000000000000000000000..4df62aa371e90680b03d627a13ba24be +#endif diff --git a/include/trace/events/platform_trace_event.h b/include/trace/events/platform_trace_event.h new file mode 100644 -index 0000000000000000000000000000000000000000..899a583fd1247250fd75c31f46e0a825cc544876 +index 000000000..899a583fd --- /dev/null +++ b/include/trace/events/platform_trace_event.h @@ -0,0 +1,30 @@ @@ -1679002,7 +1678994,7 @@ index 0000000000000000000000000000000000000000..899a583fd1247250fd75c31f46e0a825 \ No newline at end of file diff --git a/include/trace/events/sync.h b/include/trace/events/sync.h new file mode 100644 -index 0000000000000000000000000000000000000000..a1c58d1c25e9120a01c880781c342dba4b4716ec +index 000000000..a1c58d1c2 --- /dev/null +++ b/include/trace/events/sync.h @@ -0,0 +1,83 @@ @@ -1679091,7 +1679083,7 @@ index 0000000000000000000000000000000000000000..a1c58d1c25e9120a01c880781c342dba +#include diff --git a/include/trace/events/thermal.h b/include/trace/events/thermal.h new file mode 100644 -index 0000000000000000000000000000000000000000..e58bf3072f324493d84e76de2a5c1d53e405d33f +index 000000000..e58bf3072 --- /dev/null +++ b/include/trace/events/thermal.h @@ -0,0 +1,199 @@ @@ -1679296,7 +1679288,7 @@ index 0000000000000000000000000000000000000000..e58bf3072f324493d84e76de2a5c1d53 +#include diff --git a/include/trace/events/thermal_ipa_power.h b/include/trace/events/thermal_ipa_power.h new file mode 100644 -index 0000000000000000000000000000000000000000..a3a932c75d6a4edeaaaee04be4a33fc0bb294ba2 +index 000000000..a3a932c75 --- /dev/null +++ b/include/trace/events/thermal_ipa_power.h @@ -0,0 +1,47 @@ @@ -1679349,7 +1679341,7 @@ index 0000000000000000000000000000000000000000..a3a932c75d6a4edeaaaee04be4a33fc0 +#include diff --git a/include/trace/events/thermal_power_allocator.h b/include/trace/events/thermal_power_allocator.h new file mode 100644 -index 0000000000000000000000000000000000000000..1c8fb95544f93c87e93e68ef3c4ad49905f19556 +index 000000000..1c8fb9554 --- /dev/null +++ b/include/trace/events/thermal_power_allocator.h @@ -0,0 +1,88 @@ @@ -1679443,7 +1679435,7 @@ index 0000000000000000000000000000000000000000..1c8fb95544f93c87e93e68ef3c4ad499 +#include diff --git a/include/trace/hooks/mm.h b/include/trace/hooks/mm.h new file mode 100644 -index 0000000000000000000000000000000000000000..dbe41923041b038664f0dbabdc520844ff32d66d +index 000000000..dbe419230 --- /dev/null +++ b/include/trace/hooks/mm.h @@ -0,0 +1,25 @@ @@ -1679474,7 +1679466,7 @@ index 0000000000000000000000000000000000000000..dbe41923041b038664f0dbabdc520844 +#include diff --git a/include/trace/hooks/vendor_hooks.h b/include/trace/hooks/vendor_hooks.h new file mode 100644 -index 0000000000000000000000000000000000000000..21bafd6388740c456cbf6ccd63a72f0f28d4ccd6 +index 000000000..21bafd638 --- /dev/null +++ b/include/trace/hooks/vendor_hooks.h @@ -0,0 +1,13 @@ @@ -1679492,7 +1679484,7 @@ index 0000000000000000000000000000000000000000..21bafd6388740c456cbf6ccd63a72f0f + +#endif diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h -index 8db7fd3f743e4ffe12c4572eca3c0b10494a8138..e0f47498ca77b7e18f236b975d0c1426820a4b2b 100644 +index 8db7fd3f7..e0f47498c 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -323,6 +323,8 @@ extern "C" { @@ -1679559,7 +1679551,7 @@ index 8db7fd3f743e4ffe12c4572eca3c0b10494a8138..e0f47498ca77b7e18f236b975d0c1426 #endif diff --git a/include/uapi/drm/rockchip_drm.h b/include/uapi/drm/rockchip_drm.h new file mode 100644 -index 0000000000000000000000000000000000000000..2ac71b43dba0eff0ff80a33da6d8093161de6aa7 +index 000000000..2ac71b43d --- /dev/null +++ b/include/uapi/drm/rockchip_drm.h @@ -0,0 +1,139 @@ @@ -1679704,7 +1679696,7 @@ index 0000000000000000000000000000000000000000..2ac71b43dba0eff0ff80a33da6d80931 +#endif /* _UAPI_ROCKCHIP_DRM_H */ diff --git a/include/uapi/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.h b/include/uapi/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.h new file mode 100644 -index 0000000000000000000000000000000000000000..a44da7beb041dc3f4a3725a5f10645cb226fdac7 +index 000000000..a44da7beb --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.h @@ -0,0 +1,77 @@ @@ -1679787,7 +1679779,7 @@ index 0000000000000000000000000000000000000000..a44da7beb041dc3f4a3725a5f10645cb +#endif /* _UAPI_KBASE_MODEL_DUMMY_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.h b/include/uapi/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.h new file mode 100644 -index 0000000000000000000000000000000000000000..c83cedd6a775079fcab83762f264e959e19fb81d +index 000000000..c83cedd6a --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.h @@ -0,0 +1,36 @@ @@ -1679829,7 +1679821,7 @@ index 0000000000000000000000000000000000000000..c83cedd6a775079fcab83762f264e959 +#endif /* _UAPI_KBASE_MODEL_LINUX_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/csf/mali_base_csf_kernel.h b/include/uapi/gpu/arm/bifrost/csf/mali_base_csf_kernel.h new file mode 100644 -index 0000000000000000000000000000000000000000..c18c6fc8a7aedd8b7c66c51017a21c3d537e2196 +index 000000000..c18c6fc8a --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/csf/mali_base_csf_kernel.h @@ -0,0 +1,613 @@ @@ -1680448,7 +1680440,7 @@ index 0000000000000000000000000000000000000000..c18c6fc8a7aedd8b7c66c51017a21c3d +#endif /* _UAPI_BASE_CSF_KERNEL_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/csf/mali_kbase_csf_errors_dumpfault.h b/include/uapi/gpu/arm/bifrost/csf/mali_kbase_csf_errors_dumpfault.h new file mode 100644 -index 0000000000000000000000000000000000000000..f49ab0036fc34503d2b2eaab529b722592d9180f +index 000000000..f49ab0036 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/csf/mali_kbase_csf_errors_dumpfault.h @@ -0,0 +1,81 @@ @@ -1680535,7 +1680527,7 @@ index 0000000000000000000000000000000000000000..f49ab0036fc34503d2b2eaab529b7225 +#endif /* _UAPI_KBASE_CSF_ERRORS_DUMPFAULT_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/csf/mali_kbase_csf_ioctl.h b/include/uapi/gpu/arm/bifrost/csf/mali_kbase_csf_ioctl.h new file mode 100644 -index 0000000000000000000000000000000000000000..7c37cfc077f888b7f17aadee9785052a1746769d +index 000000000..7c37cfc07 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/csf/mali_kbase_csf_ioctl.h @@ -0,0 +1,614 @@ @@ -1681155,7 +1681147,7 @@ index 0000000000000000000000000000000000000000..7c37cfc077f888b7f17aadee9785052a +#endif /* _UAPI_KBASE_CSF_IOCTL_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h b/include/uapi/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h new file mode 100644 -index 0000000000000000000000000000000000000000..0ca5d902f174ed40493a7ce671c547a5b16fae26 +index 000000000..0ca5d902f --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h @@ -0,0 +1,41 @@ @@ -1681202,7 +1681194,7 @@ index 0000000000000000000000000000000000000000..0ca5d902f174ed40493a7ce671c547a5 +#endif /* _UAPI_KBASE_GPU_REGMAP_CSF_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h b/include/uapi/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h new file mode 100644 -index 0000000000000000000000000000000000000000..9bfd6d2fc5294a4467a811e6bfce0bc81298ce1f +index 000000000..9bfd6d2fc --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h @@ -0,0 +1,50 @@ @@ -1681258,7 +1681250,7 @@ index 0000000000000000000000000000000000000000..9bfd6d2fc5294a4467a811e6bfce0bc8 +#endif /* _UAPI_KBASE_GPU_REGMAP_JM_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_coherency.h b/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_coherency.h new file mode 100644 -index 0000000000000000000000000000000000000000..83d84137a034df78f521c0386fed07e2160bb5ff +index 000000000..83d84137a --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_coherency.h @@ -0,0 +1,30 @@ @@ -1681294,7 +1681286,7 @@ index 0000000000000000000000000000000000000000..83d84137a034df78f521c0386fed07e2 +#endif /* _UAPI_KBASE_GPU_COHERENCY_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_id.h b/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_id.h new file mode 100644 -index 0000000000000000000000000000000000000000..784e09a7edc26208bbd5d4080133c974be4f19a7 +index 000000000..784e09a7e --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_id.h @@ -0,0 +1,145 @@ @@ -1681445,7 +1681437,7 @@ index 0000000000000000000000000000000000000000..784e09a7edc26208bbd5d4080133c974 +#endif /* _UAPI_KBASE_GPU_ID_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h b/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h new file mode 100644 -index 0000000000000000000000000000000000000000..1f331671b6b4a826ec062e452ca96696f88730c7 +index 000000000..1f331671b --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h @@ -0,0 +1,98 @@ @@ -1681549,7 +1681541,7 @@ index 0000000000000000000000000000000000000000..1f331671b6b4a826ec062e452ca96696 +#endif /* _UAPI_KBASE_GPU_REGMAP_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/jm/mali_base_jm_kernel.h b/include/uapi/gpu/arm/bifrost/jm/mali_base_jm_kernel.h new file mode 100644 -index 0000000000000000000000000000000000000000..1a3098d6cad82f61fd94a473e8462e16836814b0 +index 000000000..1a3098d6c --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/jm/mali_base_jm_kernel.h @@ -0,0 +1,1055 @@ @@ -1682610,7 +1682602,7 @@ index 0000000000000000000000000000000000000000..1a3098d6cad82f61fd94a473e8462e16 +#endif /* _UAPI_BASE_JM_KERNEL_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/jm/mali_kbase_jm_ioctl.h b/include/uapi/gpu/arm/bifrost/jm/mali_kbase_jm_ioctl.h new file mode 100644 -index 0000000000000000000000000000000000000000..ac6affe8c76cdda8781f1d6b8c433df99c6f530a +index 000000000..ac6affe8c --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/jm/mali_kbase_jm_ioctl.h @@ -0,0 +1,247 @@ @@ -1682863,7 +1682855,7 @@ index 0000000000000000000000000000000000000000..ac6affe8c76cdda8781f1d6b8c433df9 +#endif /* _UAPI_KBASE_JM_IOCTL_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/mali_base_common_kernel.h b/include/uapi/gpu/arm/bifrost/mali_base_common_kernel.h new file mode 100644 -index 0000000000000000000000000000000000000000..f8378146aceb9d1723cea4df2ab2c7f5378fa2fb +index 000000000..f8378146a --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_base_common_kernel.h @@ -0,0 +1,231 @@ @@ -1683100,7 +1683092,7 @@ index 0000000000000000000000000000000000000000..f8378146aceb9d1723cea4df2ab2c7f5 +#endif /* _UAPI_BASE_COMMON_KERNEL_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/mali_base_kernel.h b/include/uapi/gpu/arm/bifrost/mali_base_kernel.h new file mode 100644 -index 0000000000000000000000000000000000000000..e6cac0eb2a1a7a12a5b0661a500bdfa295321047 +index 000000000..e6cac0eb2 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_base_kernel.h @@ -0,0 +1,643 @@ @@ -1683749,7 +1683741,7 @@ index 0000000000000000000000000000000000000000..e6cac0eb2a1a7a12a5b0661a500bdfa2 +#endif /* _UAPI_BASE_KERNEL_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/mali_base_mem_priv.h b/include/uapi/gpu/arm/bifrost/mali_base_mem_priv.h new file mode 100644 -index 0000000000000000000000000000000000000000..70f5b09775203ddb65d752eac2fdf153d73e8bd3 +index 000000000..70f5b0977 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_base_mem_priv.h @@ -0,0 +1,57 @@ @@ -1683812,7 +1683804,7 @@ index 0000000000000000000000000000000000000000..70f5b09775203ddb65d752eac2fdf153 +#endif /* _UAPI_BASE_MEM_PRIV_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/mali_kbase_hwcnt_reader.h b/include/uapi/gpu/arm/bifrost/mali_kbase_hwcnt_reader.h new file mode 100644 -index 0000000000000000000000000000000000000000..5089bf249528c84cfdae7da95161e07bb0e32098 +index 000000000..5089bf249 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_kbase_hwcnt_reader.h @@ -0,0 +1,503 @@ @@ -1684321,7 +1684313,7 @@ index 0000000000000000000000000000000000000000..5089bf249528c84cfdae7da95161e07b +#endif /* _UAPI_KBASE_HWCNT_READER_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/mali_kbase_ioctl.h b/include/uapi/gpu/arm/bifrost/mali_kbase_ioctl.h new file mode 100644 -index 0000000000000000000000000000000000000000..c8a54f91165e4c60782f198c69446923ec45037c +index 000000000..c8a54f911 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_kbase_ioctl.h @@ -0,0 +1,789 @@ @@ -1685116,7 +1685108,7 @@ index 0000000000000000000000000000000000000000..c8a54f91165e4c60782f198c69446923 +#endif /* _UAPI_KBASE_IOCTL_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/mali_kbase_kinstr_jm_reader.h b/include/uapi/gpu/arm/bifrost/mali_kbase_kinstr_jm_reader.h new file mode 100644 -index 0000000000000000000000000000000000000000..72e1b9dbf24502e897acdd5af2bc3941df7784fd +index 000000000..72e1b9dbf --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_kbase_kinstr_jm_reader.h @@ -0,0 +1,69 @@ @@ -1685191,7 +1685183,7 @@ index 0000000000000000000000000000000000000000..72e1b9dbf24502e897acdd5af2bc3941 +#endif /* _UAPI_KBASE_KINSTR_JM_READER_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs_buf_size.h b/include/uapi/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs_buf_size.h new file mode 100644 -index 0000000000000000000000000000000000000000..329845005341ef1e21dabdf7f85ff497cab2976f +index 000000000..329845005 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs_buf_size.h @@ -0,0 +1,35 @@ @@ -1685231,7 +1685223,7 @@ index 0000000000000000000000000000000000000000..329845005341ef1e21dabdf7f85ff497 + +#endif /*_UAPI_KBASE_MEM_PROFILE_DEBUGFS_BUF_SIZE_H_*/ diff --git a/include/uapi/linux/cec.h b/include/uapi/linux/cec.h -index b8e071abaea5acfa6d2fde13bb1ec6fb286fc1a0..9ea79869c17bedaac72fa6331fdf397623eb6d3e 100644 +index b8e071aba..9ea79869c 100644 --- a/include/uapi/linux/cec.h +++ b/include/uapi/linux/cec.h @@ -537,6 +537,12 @@ struct cec_event { @@ -1685249,7 +1685241,7 @@ index b8e071abaea5acfa6d2fde13bb1ec6fb286fc1a0..9ea79869c17bedaac72fa6331fdf3976 * The format matters since it the cec-ctl utility parses it to generate diff --git a/include/uapi/linux/cryptodev.h b/include/uapi/linux/cryptodev.h new file mode 100644 -index 0000000000000000000000000000000000000000..0b81c3c2dd135e58bdae7b358a2f44979034443a +index 000000000..0b81c3c2d --- /dev/null +++ b/include/uapi/linux/cryptodev.h @@ -0,0 +1,369 @@ @@ -1685623,7 +1685615,7 @@ index 0000000000000000000000000000000000000000..0b81c3c2dd135e58bdae7b358a2f4497 + +#endif /* L_CRYPTODEV_H */ diff --git a/include/uapi/linux/dma-heap.h b/include/uapi/linux/dma-heap.h -index 6f84fa08e074a3b8bdd9c627e4d43427e530212b..a69bdf05d8011f7f5deb2f9f2fa07f293eb411c6 100644 +index 6f84fa08e..a69bdf05d 100644 --- a/include/uapi/linux/dma-heap.h +++ b/include/uapi/linux/dma-heap.h @@ -39,6 +39,11 @@ struct dma_heap_allocation_data { @@ -1685648,7 +1685640,7 @@ index 6f84fa08e074a3b8bdd9c627e4d43427e530212b..a69bdf05d8011f7f5deb2f9f2fa07f29 #endif /* _UAPI_LINUX_DMABUF_POOL_H */ diff --git a/include/uapi/linux/fec-config.h b/include/uapi/linux/fec-config.h new file mode 100644 -index 0000000000000000000000000000000000000000..16c4dadb58a13b45206d7a115ab51e7780cdfeb5 +index 000000000..16c4dadb5 --- /dev/null +++ b/include/uapi/linux/fec-config.h @@ -0,0 +1,33 @@ @@ -1685686,7 +1685678,7 @@ index 0000000000000000000000000000000000000000..16c4dadb58a13b45206d7a115ab51e77 + +#endif diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h -index a03c543cb072de303e88740679c3f0aa44a13017..7be27ff711789daac60a84000d01933bedd99f25 100644 +index a03c543cb..7be27ff71 100644 --- a/include/uapi/linux/media-bus-format.h +++ b/include/uapi/linux/media-bus-format.h @@ -71,6 +71,11 @@ @@ -1685703,7 +1685695,7 @@ index a03c543cb072de303e88740679c3f0aa44a13017..7be27ff711789daac60a84000d01933b #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 100644 -index 0000000000000000000000000000000000000000..d25977d3b878a130629515c03a5a88e7fb11c65e +index 000000000..d25977d3b --- /dev/null +++ b/include/uapi/linux/rk-camera-module.h @@ -0,0 +1,816 @@ @@ -1686525,7 +1686517,7 @@ index 0000000000000000000000000000000000000000..d25977d3b878a130629515c03a5a88e7 +#endif /* _UAPI_RKMODULE_CAMERA_H */ diff --git a/include/uapi/linux/rk-decom.h b/include/uapi/linux/rk-decom.h new file mode 100644 -index 0000000000000000000000000000000000000000..b7a7fd1ddb3bbab9a74bedec22d45deccfbf6f72 +index 000000000..b7a7fd1dd --- /dev/null +++ b/include/uapi/linux/rk-decom.h @@ -0,0 +1,34 @@ @@ -1686565,7 +1686557,7 @@ index 0000000000000000000000000000000000000000..b7a7fd1ddb3bbab9a74bedec22d45dec +#endif diff --git a/include/uapi/linux/rk-dma-heap.h b/include/uapi/linux/rk-dma-heap.h new file mode 100644 -index 0000000000000000000000000000000000000000..4e83d71811ce0ecefd58356d2b4eb3342d4076fb +index 000000000..4e83d7181 --- /dev/null +++ b/include/uapi/linux/rk-dma-heap.h @@ -0,0 +1,55 @@ @@ -1686626,7 +1686618,7 @@ index 0000000000000000000000000000000000000000..4e83d71811ce0ecefd58356d2b4eb334 +#endif /* _UAPI_LINUX_DMABUF_POOL_H */ diff --git a/include/uapi/linux/rk-iomux.h b/include/uapi/linux/rk-iomux.h new file mode 100644 -index 0000000000000000000000000000000000000000..58da85c9cb2e28f0331222a63aec3f4d078122bc +index 000000000..58da85c9c --- /dev/null +++ b/include/uapi/linux/rk-iomux.h @@ -0,0 +1,20 @@ @@ -1686652,7 +1686644,7 @@ index 0000000000000000000000000000000000000000..58da85c9cb2e28f0331222a63aec3f4d +#endif diff --git a/include/uapi/linux/rk-isp1-config.h b/include/uapi/linux/rk-isp1-config.h new file mode 100644 -index 0000000000000000000000000000000000000000..72b8755dd70772210430acddcb42af1e6b21971a +index 000000000..72b8755dd --- /dev/null +++ b/include/uapi/linux/rk-isp1-config.h @@ -0,0 +1,872 @@ @@ -1687530,7 +1687522,7 @@ index 0000000000000000000000000000000000000000..72b8755dd70772210430acddcb42af1e +#endif /* _UAPI_RK_ISP1_CONFIG_H */ diff --git a/include/uapi/linux/rk-isp2-config.h b/include/uapi/linux/rk-isp2-config.h new file mode 100644 -index 0000000000000000000000000000000000000000..50949e0752bc5c51e3ecf819e7bae64ac4e3c91d +index 000000000..50949e075 --- /dev/null +++ b/include/uapi/linux/rk-isp2-config.h @@ -0,0 +1,2018 @@ @@ -1689554,7 +1689546,7 @@ index 0000000000000000000000000000000000000000..50949e0752bc5c51e3ecf819e7bae64a +#endif /* _UAPI_RK_ISP2_CONFIG_H */ diff --git a/include/uapi/linux/rk-isp21-config.h b/include/uapi/linux/rk-isp21-config.h new file mode 100644 -index 0000000000000000000000000000000000000000..aad8fbad705c0ac2c7be06a22f04d2f7adfb1b72 +index 000000000..aad8fbad7 --- /dev/null +++ b/include/uapi/linux/rk-isp21-config.h @@ -0,0 +1,813 @@ @@ -1690373,7 +1690365,7 @@ index 0000000000000000000000000000000000000000..aad8fbad705c0ac2c7be06a22f04d2f7 +#endif /* _UAPI_RK_ISP21_CONFIG_H */ diff --git a/include/uapi/linux/rk-isp3-config.h b/include/uapi/linux/rk-isp3-config.h new file mode 100644 -index 0000000000000000000000000000000000000000..e14492674b3ed1f625418d9c6507ad7e6f28397f +index 000000000..e14492674 --- /dev/null +++ b/include/uapi/linux/rk-isp3-config.h @@ -0,0 +1,1077 @@ @@ -1691456,7 +1691448,7 @@ index 0000000000000000000000000000000000000000..e14492674b3ed1f625418d9c6507ad7e +#endif /* _UAPI_RK_ISP3_CONFIG_H */ diff --git a/include/uapi/linux/rk-isp32-config.h b/include/uapi/linux/rk-isp32-config.h new file mode 100644 -index 0000000000000000000000000000000000000000..ecd4eaef2cd3512ec89970e858f8f5f6d7deea1c +index 000000000..ecd4eaef2 --- /dev/null +++ b/include/uapi/linux/rk-isp32-config.h @@ -0,0 +1,1528 @@ @@ -1692990,7 +1692982,7 @@ index 0000000000000000000000000000000000000000..ecd4eaef2cd3512ec89970e858f8f5f6 +#endif /* _UAPI_RK_ISP32_CONFIG_H */ diff --git a/include/uapi/linux/rk-ispp-config.h b/include/uapi/linux/rk-ispp-config.h new file mode 100644 -index 0000000000000000000000000000000000000000..616ddff9ed64ff68b8e7707bbf021e38a58eefe0 +index 000000000..616ddff9e --- /dev/null +++ b/include/uapi/linux/rk-ispp-config.h @@ -0,0 +1,422 @@ @@ -1693418,7 +1693410,7 @@ index 0000000000000000000000000000000000000000..616ddff9ed64ff68b8e7707bbf021e38 +#endif diff --git a/include/uapi/linux/rk-led-flash.h b/include/uapi/linux/rk-led-flash.h new file mode 100644 -index 0000000000000000000000000000000000000000..c679cb9eb39a6eecae4a2ca8fd20f3d91db2c0d0 +index 000000000..c679cb9eb --- /dev/null +++ b/include/uapi/linux/rk-led-flash.h @@ -0,0 +1,9 @@ @@ -1693433,7 +1693425,7 @@ index 0000000000000000000000000000000000000000..c679cb9eb39a6eecae4a2ca8fd20f3d9 +#endif diff --git a/include/uapi/linux/rk-mpp.h b/include/uapi/linux/rk-mpp.h new file mode 100644 -index 0000000000000000000000000000000000000000..9a24407001ec6a15ffce51f0294b26bf3ac41e7d +index 000000000..9a2440700 --- /dev/null +++ b/include/uapi/linux/rk-mpp.h @@ -0,0 +1,82 @@ @@ -1693521,7 +1693513,7 @@ index 0000000000000000000000000000000000000000..9a24407001ec6a15ffce51f0294b26bf +#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 100644 -index 0000000000000000000000000000000000000000..bf4a96b5eea7ebe0e34a61f391e08447120f9c75 +index 000000000..bf4a96b5e --- /dev/null +++ b/include/uapi/linux/rk-pcie-dma.h @@ -0,0 +1,57 @@ @@ -1693584,7 +1693576,7 @@ index 0000000000000000000000000000000000000000..bf4a96b5eea7ebe0e34a61f391e08447 +#endif diff --git a/include/uapi/linux/rk-pcie-ep.h b/include/uapi/linux/rk-pcie-ep.h new file mode 100644 -index 0000000000000000000000000000000000000000..d89748eed9255016d6948f3f7732c4003febc136 +index 000000000..d89748eed --- /dev/null +++ b/include/uapi/linux/rk-pcie-ep.h @@ -0,0 +1,122 @@ @@ -1693712,7 +1693704,7 @@ index 0000000000000000000000000000000000000000..d89748eed9255016d6948f3f7732c400 +#endif diff --git a/include/uapi/linux/rk-preisp.h b/include/uapi/linux/rk-preisp.h new file mode 100644 -index 0000000000000000000000000000000000000000..4cd51a84ada85c765fb15ea743522867162f39be +index 000000000..4cd51a84a --- /dev/null +++ b/include/uapi/linux/rk-preisp.h @@ -0,0 +1,118 @@ @@ -1693836,7 +1693828,7 @@ index 0000000000000000000000000000000000000000..4cd51a84ada85c765fb15ea743522867 +#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 100644 -index 0000000000000000000000000000000000000000..938d5adff737ec54f16d752291e357a3c9bfb661 +index 000000000..938d5adff --- /dev/null +++ b/include/uapi/linux/rk-video-format.h @@ -0,0 +1,37 @@ @@ -1693879,7 +1693871,7 @@ index 0000000000000000000000000000000000000000..938d5adff737ec54f16d752291e357a3 +#endif /* _UAPI_RK_VIDEO_FORMAT_H */ diff --git a/include/uapi/linux/rk803.h b/include/uapi/linux/rk803.h new file mode 100644 -index 0000000000000000000000000000000000000000..448468da9e8daf50625850d7a235015e38dc6482 +index 000000000..448468da9 --- /dev/null +++ b/include/uapi/linux/rk803.h @@ -0,0 +1,16 @@ @@ -1693901,7 +1693893,7 @@ index 0000000000000000000000000000000000000000..448468da9e8daf50625850d7a235015e +#endif /* _UAPI_RK803_H */ diff --git a/include/uapi/linux/rk_cryptodev.h b/include/uapi/linux/rk_cryptodev.h new file mode 100644 -index 0000000000000000000000000000000000000000..5714882354710ab8f8e17289f201bef74f6246b2 +index 000000000..571488235 --- /dev/null +++ b/include/uapi/linux/rk_cryptodev.h @@ -0,0 +1,85 @@ @@ -1693992,7 +1693984,7 @@ index 0000000000000000000000000000000000000000..5714882354710ab8f8e17289f201bef7 +#endif diff --git a/include/uapi/linux/rk_hdmirx_config.h b/include/uapi/linux/rk_hdmirx_config.h new file mode 100644 -index 0000000000000000000000000000000000000000..26dcea79001383e679eb96d4e53bcaa9cb141b0c +index 000000000..26dcea790 --- /dev/null +++ b/include/uapi/linux/rk_hdmirx_config.h @@ -0,0 +1,88 @@ @@ -1694086,7 +1694078,7 @@ index 0000000000000000000000000000000000000000..26dcea79001383e679eb96d4e53bcaa9 +#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 100644 -index 0000000000000000000000000000000000000000..4e663ae260d805d32aaacbf2fea92a045d2f72f4 +index 000000000..4e663ae26 --- /dev/null +++ b/include/uapi/linux/rk_vcm_head.h @@ -0,0 +1,137 @@ @@ -1694229,7 +1694221,7 @@ index 0000000000000000000000000000000000000000..4e663ae260d805d32aaacbf2fea92a04 + diff --git a/include/uapi/linux/rkcif-config.h b/include/uapi/linux/rkcif-config.h new file mode 100644 -index 0000000000000000000000000000000000000000..c9b9bbf0d301bb36b254ce4163ec2b5a7f4178c3 +index 000000000..c9b9bbf0d --- /dev/null +++ b/include/uapi/linux/rkcif-config.h @@ -0,0 +1,91 @@ @@ -1694325,7 +1694317,7 @@ index 0000000000000000000000000000000000000000..c9b9bbf0d301bb36b254ce4163ec2b5a + +#endif diff --git a/include/uapi/linux/rkisp1-config.h b/include/uapi/linux/rkisp1-config.h -index 730673ecc63d0a5ca3f7d5b4db1a93ce93737374..c26d4bb692610581fdf0f5a73edf303f8e592fcc 100644 +index 730673ecc..c26d4bb69 100644 --- a/include/uapi/linux/rkisp1-config.h +++ b/include/uapi/linux/rkisp1-config.h @@ -1,6 +1,6 @@ @@ -1695900,7 +1695892,7 @@ index 730673ecc63d0a5ca3f7d5b4db1a93ce93737374..c26d4bb692610581fdf0f5a73edf303f #endif /* _UAPI_RKISP1_CONFIG_H */ diff --git a/include/uapi/linux/rkisp2-config.h b/include/uapi/linux/rkisp2-config.h new file mode 100644 -index 0000000000000000000000000000000000000000..9d41f9e8a097083695cdb91defc178805e5f4ad5 +index 000000000..9d41f9e8a --- /dev/null +++ b/include/uapi/linux/rkisp2-config.h @@ -0,0 +1,1853 @@ @@ -1697759,7 +1697751,7 @@ index 0000000000000000000000000000000000000000..9d41f9e8a097083695cdb91defc17880 +#endif /* _UAPI_RKISP2_CONFIG_H */ diff --git a/include/uapi/linux/rkisp21-config.h b/include/uapi/linux/rkisp21-config.h new file mode 100644 -index 0000000000000000000000000000000000000000..203022b62361fd02c664aa26e2c24e84baa1df1a +index 000000000..203022b62 --- /dev/null +++ b/include/uapi/linux/rkisp21-config.h @@ -0,0 +1,804 @@ @@ -1698569,7 +1698561,7 @@ index 0000000000000000000000000000000000000000..203022b62361fd02c664aa26e2c24e84 +#endif /* _UAPI_RKISP21_CONFIG_H */ diff --git a/include/uapi/linux/rkisp3-config.h b/include/uapi/linux/rkisp3-config.h new file mode 100644 -index 0000000000000000000000000000000000000000..25bbe1a9a14672a7aeb2a0266567f57c61abaf81 +index 000000000..25bbe1a9a --- /dev/null +++ b/include/uapi/linux/rkisp3-config.h @@ -0,0 +1,1072 @@ @@ -1699647,7 +1699639,7 @@ index 0000000000000000000000000000000000000000..25bbe1a9a14672a7aeb2a0266567f57c +#endif /* _UAPI_RKISP3_CONFIG_H */ diff --git a/include/uapi/linux/rkispp-config.h b/include/uapi/linux/rkispp-config.h new file mode 100644 -index 0000000000000000000000000000000000000000..b4a27f74f9c9800dac1f6e2e81e5f7fcb3c9fa71 +index 000000000..b4a27f74f --- /dev/null +++ b/include/uapi/linux/rkispp-config.h @@ -0,0 +1,370 @@ @@ -1700022,7 +1700014,7 @@ index 0000000000000000000000000000000000000000..b4a27f74f9c9800dac1f6e2e81e5f7fc + +#endif diff --git a/include/uapi/linux/serial_reg.h b/include/uapi/linux/serial_reg.h -index 08b3527e1b9356408a119b917438982ed39c2b55..68c0ec727aca8fe3430d7fe59c98bff3998b4e69 100644 +index 08b3527e1..68c0ec727 100644 --- a/include/uapi/linux/serial_reg.h +++ b/include/uapi/linux/serial_reg.h @@ -30,6 +30,7 @@ @@ -1700035,7 +1700027,7 @@ index 08b3527e1b9356408a119b917438982ed39c2b55..68c0ec727aca8fe3430d7fe59c98bff3 #define UART_IIR_NO_INT 0x01 /* No interrupts pending */ diff --git a/include/uapi/misc/dw_hdcp2.h b/include/uapi/misc/dw_hdcp2.h new file mode 100644 -index 0000000000000000000000000000000000000000..43d4af3d80d623e379753c00cbb80d6127c4c7bf +index 000000000..43d4af3d8 --- /dev/null +++ b/include/uapi/misc/dw_hdcp2.h @@ -0,0 +1,130 @@ @@ -1700171,7 +1700163,7 @@ index 0000000000000000000000000000000000000000..43d4af3d80d623e379753c00cbb80d61 +#endif /* _DW_HDCP_HOST_LIB_DRIVER_LINUX_IF_H_ */ diff --git a/include/uapi/misc/rkflash_vendor_storage.h b/include/uapi/misc/rkflash_vendor_storage.h new file mode 100644 -index 0000000000000000000000000000000000000000..c217380d1713faf3d1ed306dbbfbe81b7735afe1 +index 000000000..c217380d1 --- /dev/null +++ b/include/uapi/misc/rkflash_vendor_storage.h @@ -0,0 +1,22 @@ @@ -1700198,7 +1700190,7 @@ index 0000000000000000000000000000000000000000..c217380d1713faf3d1ed306dbbfbe81b + +#endif diff --git a/init/Kconfig b/init/Kconfig -index 879f6dc1cb274a9f92a03601106cb1d1e1d35765..1f58de359e676482c38948061d6c3201a59bc639 100644 +index 879f6dc1c..1f58de359 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1317,6 +1317,12 @@ if BLK_DEV_INITRD @@ -1700215,7 +1700207,7 @@ index 879f6dc1cb274a9f92a03601106cb1d1e1d35765..1f58de359e676482c38948061d6c3201 config BOOT_CONFIG diff --git a/init/initramfs.c b/init/initramfs.c -index 8d0fd946cdd2b3fc8eae59ae6715928fa70e6f18..e6fc7d3a244245dd7b3661aecc6c920ff29ec247 100644 +index 8d0fd946c..e6fc7d3a2 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -15,6 +15,7 @@ @@ -1700237,7 +1700229,7 @@ index 8d0fd946cdd2b3fc8eae59ae6715928fa70e6f18..e6fc7d3a244245dd7b3661aecc6c920f loff_t saved_offset = this_header; if (*buf == '0' && !(this_header & 3)) { diff --git a/init/main.c b/init/main.c -index e24b0780fdff7a807bd027ab26e61fc303c624ef..ad605d35bc17c5aa8d0c86ed8e4ee069c2991612 100644 +index e24b0780f..ad605d35b 100644 --- a/init/main.c +++ b/init/main.c @@ -1544,6 +1544,10 @@ static noinline void __init kernel_init_freeable(void) @@ -1700252,7 +1700244,7 @@ index e24b0780fdff7a807bd027ab26e61fc303c624ef..ad605d35bc17c5aa8d0c86ed8e4ee069 padata_init(); page_alloc_init_late(); diff --git a/kernel/profile.c b/kernel/profile.c -index 8a77769bc4b4cbb655244fd163fc72a860b4bcdd..b2846f07295becc6c337bbce1730cc204bdd1c5e 100644 +index 8a77769bc..b2846f072 100644 --- a/kernel/profile.c +++ b/kernel/profile.c @@ -136,6 +136,79 @@ int __ref profile_init(void) @@ -1700336,7 +1700328,7 @@ index 8a77769bc4b4cbb655244fd163fc72a860b4bcdd..b2846f07295becc6c337bbce1730cc20 /* * Each cpu has a pair of open-addressed hashtables for pending diff --git a/kernel/rcu/tree_stall.h b/kernel/rcu/tree_stall.h -index e09f4f624261e0a9f6690e834e814deef3a5efc7..1fcb9d414e32b7ad39ef96efa6e45f8c93734a6c 100644 +index e09f4f624..1fcb9d414 100644 --- a/kernel/rcu/tree_stall.h +++ b/kernel/rcu/tree_stall.h @@ -16,6 +16,7 @@ @@ -1700358,7 +1700350,7 @@ index e09f4f624261e0a9f6690e834e814deef3a5efc7..1fcb9d414e32b7ad39ef96efa6e45f8c rcu_force_quiescent_state(); /* Kick them all. */ diff --git a/make-boot.sh b/make-boot.sh new file mode 100755 -index 0000000000000000000000000000000000000000..5fb7c561750e7dc59e552096c31ce7d926f68548 +index 000000000..5fb7c5617 --- /dev/null +++ b/make-boot.sh @@ -0,0 +1,31 @@ @@ -1700395,7 +1700387,7 @@ index 0000000000000000000000000000000000000000..5fb7c561750e7dc59e552096c31ce7d9 +cp ${BOOT_LINUX}/boot_linux.img ${OUT_IMAGE} diff --git a/make-ohos.sh b/make-ohos.sh new file mode 100755 -index 0000000000000000000000000000000000000000..6777ff0af531172bdc4d9c9edae9057497389847 +index 000000000..6777ff0af --- /dev/null +++ b/make-ohos.sh @@ -0,0 +1,142 @@ @@ -1700542,7 +1700534,7 @@ index 0000000000000000000000000000000000000000..6777ff0af531172bdc4d9c9edae90574 + fi +done diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig -index 83a7af8982bbcf6bc2e6308df690f8c5e6f9953b..33ab1f7a3cc038fec445b30abf6ecbd0d2e73cef 100644 +index 83a7af898..33ab1f7a3 100644 --- a/net/rfkill/Kconfig +++ b/net/rfkill/Kconfig @@ -32,3 +32,12 @@ config RFKILL_GPIO @@ -1700559,7 +1700551,7 @@ index 83a7af8982bbcf6bc2e6308df690f8c5e6f9953b..33ab1f7a3cc038fec445b30abf6ecbd0 + help + Rockchip rfkill driver for rk29/rk3X diff --git a/net/rfkill/Makefile b/net/rfkill/Makefile -index dc47b6174ec514e3ca6d7e71853b16614daccf5c..beed5b506307c27a341b29e4c0f87e36ebed2ce0 100644 +index dc47b6174..beed5b506 100644 --- a/net/rfkill/Makefile +++ b/net/rfkill/Makefile @@ -7,3 +7,5 @@ rfkill-y += core.o @@ -1700570,7 +1700562,7 @@ index dc47b6174ec514e3ca6d7e71853b16614daccf5c..beed5b506307c27a341b29e4c0f87e36 +obj-$(CONFIG_RFKILL_RK) += rfkill-rk.o diff --git a/net/rfkill/rfkill-bt.c b/net/rfkill/rfkill-bt.c new file mode 100644 -index 0000000000000000000000000000000000000000..8c82c8080f8bd38bb49e9a0654b6e88ad115e5d0 +index 000000000..8c82c8080 --- /dev/null +++ b/net/rfkill/rfkill-bt.c @@ -0,0 +1,830 @@ @@ -1701406,7 +1701398,7 @@ index 0000000000000000000000000000000000000000..8c82c8080f8bd38bb49e9a0654b6e88a +MODULE_LICENSE("GPL"); diff --git a/net/rfkill/rfkill-wlan.c b/net/rfkill/rfkill-wlan.c new file mode 100644 -index 0000000000000000000000000000000000000000..7ac4324e2966f9a055e8e026dc2aca6b93003522 +index 000000000..7ac4324e2 --- /dev/null +++ b/net/rfkill/rfkill-wlan.c @@ -0,0 +1,982 @@ @@ -1702393,7 +1702385,7 @@ index 0000000000000000000000000000000000000000..7ac4324e2966f9a055e8e026dc2aca6b +MODULE_AUTHOR("gwl@rock-chips.com"); +MODULE_LICENSE("GPL"); diff --git a/scripts/Makefile b/scripts/Makefile -index 576cf64be6677c28e1a048e082594e303a4c7f78..5f095b61bf1f974e1ce851b360e45e9ee6989218 100644 +index 576cf64be..5f095b61b 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -5,6 +5,7 @@ @@ -1702405,7 +1702397,7 @@ index 576cf64be6677c28e1a048e082594e303a4c7f78..5f095b61bf1f974e1ce851b360e45e9e hostprogs-always-$(CONFIG_ASN1) += asn1_compiler hostprogs-always-$(CONFIG_MODULE_SIG_FORMAT) += sign-file diff --git a/scripts/Makefile.clang b/scripts/Makefile.clang -index 6c23c6af797fb016232914589c948208345417ad..355b1061197295555916a7f79861fbe27e0b38ef 100644 +index 6c23c6af7..355b10611 100644 --- a/scripts/Makefile.clang +++ b/scripts/Makefile.clang @@ -34,6 +34,6 @@ endif @@ -1702417,7 +1702409,7 @@ index 6c23c6af797fb016232914589c948208345417ad..355b1061197295555916a7f79861fbe2 KBUILD_CPPFLAGS += $(CLANG_FLAGS) export CLANG_FLAGS diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn -index 2fe6f2828d3769a88da2a8ffcae91a64442fc9fb..79705d880d8dd1230974446ad07ca2af9b08e966 100644 +index 2fe6f2828..79705d880 100644 --- a/scripts/Makefile.extrawarn +++ b/scripts/Makefile.extrawarn @@ -143,6 +143,9 @@ KBUILD_CFLAGS += $(call cc-disable-warning, pointer-to-enum-cast) @@ -1702431,7 +1702423,7 @@ index 2fe6f2828d3769a88da2a8ffcae91a64442fc9fb..79705d880d8dd1230974446ad07ca2af endif diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 68d0134bdbf9d1488a1e4881b6de77016d6e8e75..35554da89015306b4a2fa2e704b00f448bd67158 100644 +index 68d0134bd..35554da89 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -389,8 +389,9 @@ $(obj)/%.dtbo.S: $(obj)/%.dtbo FORCE @@ -1702447,7 +1702439,7 @@ index 68d0134bdbf9d1488a1e4881b6de77016d6e8e75..35554da89015306b4a2fa2e704b00f44 -d $(depfile).dtc.tmp $(dtc-tmp) ; \ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c -index 9f31d260718224214fcb8c261c4083abb4eb4798..187cc491bb948cdc316cfa21b9712b11c90698c4 100644 +index 9f31d2607..187cc491b 100644 --- a/scripts/dtc/checks.c +++ b/scripts/dtc/checks.c @@ -672,6 +672,24 @@ static void fixup_omit_unused_nodes(struct check *c, struct dt_info *dti, @@ -1702477,7 +1702469,7 @@ index 9f31d260718224214fcb8c261c4083abb4eb4798..187cc491bb948cdc316cfa21b9712b11 diff --git a/scripts/gen_autoksyms.sh b/scripts/gen_autoksyms.sh new file mode 100755 -index 0000000000000000000000000000000000000000..da320151e7c39cd900dabac81c0ab0202c500bfb +index 000000000..da320151e --- /dev/null +++ b/scripts/gen_autoksyms.sh @@ -0,0 +1,72 @@ @@ -1702555,7 +1702547,7 @@ index 0000000000000000000000000000000000000000..da320151e7c39cd900dabac81c0ab020 +sed -e 's/\(.*\)/#define __KSYM_\1 1/' >> "$output_file" diff --git a/scripts/mkimg b/scripts/mkimg new file mode 100755 -index 0000000000000000000000000000000000000000..63e3da6f402c6a4a354aea745f1ad8539641a3e4 +index 000000000..63e3da6f4 --- /dev/null +++ b/scripts/mkimg @@ -0,0 +1,235 @@ @@ -1702795,7 +1702787,7 @@ index 0000000000000000000000000000000000000000..63e3da6f402c6a4a354aea745f1ad853 + make_boot_img; +fi diff --git a/scripts/mod/Makefile b/scripts/mod/Makefile -index c9e38ad937fd4549ceb716e05067f0339005ee56..3c54125eb373340745cd6e1784b5522b80679d15 100644 +index c9e38ad93..3c54125eb 100644 --- a/scripts/mod/Makefile +++ b/scripts/mod/Makefile @@ -5,7 +5,7 @@ CFLAGS_REMOVE_empty.o += $(CC_FLAGS_LTO) @@ -1702817,7 +1702809,7 @@ index c9e38ad937fd4549ceb716e05067f0339005ee56..3c54125eb373340745cd6e1784b5522b quiet_cmd_elfconfig = MKELF $@ diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 5191fdbd3fa230169496989cb2d3f8fbdd5c80b2..cb6406f485a960041db048a5f5e8ae5bfad40bb5 100644 +index 5191fdbd3..cb6406f48 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -22,7 +22,6 @@ @@ -1703144,7 +1703136,7 @@ index 5191fdbd3fa230169496989cb2d3f8fbdd5c80b2..cb6406f485a960041db048a5f5e8ae5b } diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h -index 5f94c2c9f2d9502c3637ab7fd24f70fec672c3f7..69baf014da4fdaa25989716f7686fadc43b8a603 100644 +index 5f94c2c9f..69baf014d 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h @@ -1,4 +1,5 @@ @@ -1703234,7 +1703226,7 @@ index 5f94c2c9f2d9502c3637ab7fd24f70fec672c3f7..69baf014da4fdaa25989716f7686fadc Elf_Sym *sym, const char *symname); diff --git a/scripts/mod/symsearch.c b/scripts/mod/symsearch.c new file mode 100644 -index 0000000000000000000000000000000000000000..aa4ed51f9960cd481d30492cf7742de7a725281e +index 000000000..aa4ed51f9 --- /dev/null +++ b/scripts/mod/symsearch.c @@ -0,0 +1,199 @@ @@ -1703439,7 +1703431,7 @@ index 0000000000000000000000000000000000000000..aa4ed51f9960cd481d30492cf7742de7 +} diff --git a/scripts/ohos-check-dir.sh b/scripts/ohos-check-dir.sh new file mode 100755 -index 0000000000000000000000000000000000000000..2833618f9304c633308b527a7e7f7a52e4a3fe36 +index 000000000..2833618f9 --- /dev/null +++ b/scripts/ohos-check-dir.sh @@ -0,0 +1,8 @@ @@ -1703453,7 +1703445,7 @@ index 0000000000000000000000000000000000000000..2833618f9304c633308b527a7e7f7a52 +exit 1 diff --git a/scripts/repack-bootimg b/scripts/repack-bootimg new file mode 100755 -index 0000000000000000000000000000000000000000..69065d28e0ea6840f892bdefa032a6f368a60f3a +index 000000000..69065d28e --- /dev/null +++ b/scripts/repack-bootimg @@ -0,0 +1,153 @@ @@ -1703612,7 +1703604,7 @@ index 0000000000000000000000000000000000000000..69065d28e0ea6840f892bdefa032a6f3 +--output $output diff --git a/scripts/resource_tool.c b/scripts/resource_tool.c new file mode 100644 -index 0000000000000000000000000000000000000000..8465c578b2d7bc81e68fc8b2635ba9cdf1806b96 +index 000000000..8465c578b --- /dev/null +++ b/scripts/resource_tool.c @@ -0,0 +1,1575 @@ @@ -1705192,7 +1705184,7 @@ index 0000000000000000000000000000000000000000..8465c578b2d7bc81e68fc8b2635ba9cd + +/************pack code end****************/ diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig -index f98a2fa85edd6bb45d46e915e05bf8e64dc704aa..e1b10483ae6f680308394a5a29580e037fba123f 100644 +index f98a2fa85..e1b10483a 100644 --- a/sound/soc/rockchip/Kconfig +++ b/sound/soc/rockchip/Kconfig @@ -7,13 +7,24 @@ config SND_SOC_ROCKCHIP @@ -1705318,7 +1705310,7 @@ index f98a2fa85edd6bb45d46e915e05bf8e64dc704aa..e1b10483ae6f680308394a5a29580e03 tristate "ASoC support multiple codecs for Rockchip RK3288 boards" depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && HAVE_CLK diff --git a/sound/soc/rockchip/Makefile b/sound/soc/rockchip/Makefile -index 30c57c0d76603f9b0d07ddb56b17067f6751e6a2..ca8dfb54841c0847d209da3d3213042a83e1e6a7 100644 +index 30c57c0d7..ca8dfb548 100644 --- a/sound/soc/rockchip/Makefile +++ b/sound/soc/rockchip/Makefile @@ -1,21 +1,45 @@ @@ -1705369,7 +1705361,7 @@ index 30c57c0d76603f9b0d07ddb56b17067f6751e6a2..ca8dfb54841c0847d209da3d3213042a obj-$(CONFIG_SND_SOC_RK3288_HDMI_ANALOG) += snd-soc-rk3288-hdmi-analog.o obj-$(CONFIG_SND_SOC_RK3399_GRU_SOUND) += snd-soc-rk3399-gru-sound.o diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c -index 0f704d22d21b01867acd20811b4dde582a12e953..2540b9ba37c80da1a678bf25666eb6bc11872759 100644 +index 0f704d22d..2540b9ba3 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -21,6 +21,7 @@ @@ -1705418,7 +1705410,7 @@ index 0f704d22d21b01867acd20811b4dde582a12e953..2540b9ba37c80da1a678bf25666eb6bc } diff --git a/sound/soc/rockchip/rockchip_audio_pwm.c b/sound/soc/rockchip/rockchip_audio_pwm.c new file mode 100644 -index 0000000000000000000000000000000000000000..44ca66f1ed95cad18a375816f056757a5a65b494 +index 000000000..44ca66f1e --- /dev/null +++ b/sound/soc/rockchip/rockchip_audio_pwm.c @@ -0,0 +1,372 @@ @@ -1705796,7 +1705788,7 @@ index 0000000000000000000000000000000000000000..44ca66f1ed95cad18a375816f056757a +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/rockchip/rockchip_audio_pwm.h b/sound/soc/rockchip/rockchip_audio_pwm.h new file mode 100644 -index 0000000000000000000000000000000000000000..ad68660437c25f1c32742e00827662d7128285d5 +index 000000000..ad6866043 --- /dev/null +++ b/sound/soc/rockchip/rockchip_audio_pwm.h @@ -0,0 +1,48 @@ @@ -1705850,7 +1705842,7 @@ index 0000000000000000000000000000000000000000..ad68660437c25f1c32742e00827662d7 +#endif /* _ROCKCHIP_AUDIO_PWM_H */ diff --git a/sound/soc/rockchip/rockchip_cdndp.c b/sound/soc/rockchip/rockchip_cdndp.c new file mode 100644 -index 0000000000000000000000000000000000000000..aafeab5b41c79c5de7298e1d0f2594c4f79a902f +index 000000000..aafeab5b4 --- /dev/null +++ b/sound/soc/rockchip/rockchip_cdndp.c @@ -0,0 +1,166 @@ @@ -1706022,7 +1706014,7 @@ index 0000000000000000000000000000000000000000..aafeab5b41c79c5de7298e1d0f2594c4 +MODULE_DEVICE_TABLE(of, rockchip_sound_of_match); diff --git a/sound/soc/rockchip/rockchip_da7219.c b/sound/soc/rockchip/rockchip_da7219.c new file mode 100644 -index 0000000000000000000000000000000000000000..bf675defb88472289cbf5eca42a5f8d310454414 +index 000000000..bf675defb --- /dev/null +++ b/sound/soc/rockchip/rockchip_da7219.c @@ -0,0 +1,235 @@ @@ -1706263,7 +1706255,7 @@ index 0000000000000000000000000000000000000000..bf675defb88472289cbf5eca42a5f8d3 +MODULE_DEVICE_TABLE(of, rockchip_da7219_of_match); diff --git a/sound/soc/rockchip/rockchip_dlp.c b/sound/soc/rockchip/rockchip_dlp.c new file mode 100644 -index 0000000000000000000000000000000000000000..f0d1f4136704d28f93fe3d985a7107788416ce12 +index 000000000..f0d1f4136 --- /dev/null +++ b/sound/soc/rockchip/rockchip_dlp.c @@ -0,0 +1,1064 @@ @@ -1707333,7 +1707325,7 @@ index 0000000000000000000000000000000000000000..f0d1f4136704d28f93fe3d985a710778 +MODULE_LICENSE("GPL"); diff --git a/sound/soc/rockchip/rockchip_dlp.h b/sound/soc/rockchip/rockchip_dlp.h new file mode 100644 -index 0000000000000000000000000000000000000000..e3c6d24e6503562d414bee1eafa4961620f195a9 +index 000000000..e3c6d24e6 --- /dev/null +++ b/sound/soc/rockchip/rockchip_dlp.h @@ -0,0 +1,134 @@ @@ -1707473,7 +1707465,7 @@ index 0000000000000000000000000000000000000000..e3c6d24e6503562d414bee1eafa49616 +#endif diff --git a/sound/soc/rockchip/rockchip_dlp_pcm.c b/sound/soc/rockchip/rockchip_dlp_pcm.c new file mode 100644 -index 0000000000000000000000000000000000000000..06fad00c23a45dfc8794eec6b4b8b135ef707abe +index 000000000..06fad00c2 --- /dev/null +++ b/sound/soc/rockchip/rockchip_dlp_pcm.c @@ -0,0 +1,516 @@ @@ -1707995,7 +1707987,7 @@ index 0000000000000000000000000000000000000000..06fad00c23a45dfc8794eec6b4b8b135 +MODULE_LICENSE("GPL"); diff --git a/sound/soc/rockchip/rockchip_dlp_pcm.h b/sound/soc/rockchip/rockchip_dlp_pcm.h new file mode 100644 -index 0000000000000000000000000000000000000000..3fa80bae8f4676ff0322c66d2318b2b4b7d75712 +index 000000000..3fa80bae8 --- /dev/null +++ b/sound/soc/rockchip/rockchip_dlp_pcm.h @@ -0,0 +1,28 @@ @@ -1708029,7 +1708021,7 @@ index 0000000000000000000000000000000000000000..3fa80bae8f4676ff0322c66d2318b2b4 +#endif diff --git a/sound/soc/rockchip/rockchip_hdmi.c b/sound/soc/rockchip/rockchip_hdmi.c new file mode 100644 -index 0000000000000000000000000000000000000000..f52bdc337d141e091d8aef81ffbd9a7e0878ad54 +index 000000000..f52bdc337 --- /dev/null +++ b/sound/soc/rockchip/rockchip_hdmi.c @@ -0,0 +1,315 @@ @@ -1708350,7 +1708342,7 @@ index 0000000000000000000000000000000000000000..f52bdc337d141e091d8aef81ffbd9a7e +MODULE_ALIAS("platform:" DRV_NAME); diff --git a/sound/soc/rockchip/rockchip_hdmi_analog.c b/sound/soc/rockchip/rockchip_hdmi_analog.c new file mode 100644 -index 0000000000000000000000000000000000000000..02a282e8f60ac860e1f7ea8f0fbbd0363b8f6293 +index 000000000..02a282e8f --- /dev/null +++ b/sound/soc/rockchip/rockchip_hdmi_analog.c @@ -0,0 +1,222 @@ @@ -1708578,7 +1708570,7 @@ index 0000000000000000000000000000000000000000..02a282e8f60ac860e1f7ea8f0fbbd036 +MODULE_ALIAS("platform:" DRV_NAME); diff --git a/sound/soc/rockchip/rockchip_hdmi_dp.c b/sound/soc/rockchip/rockchip_hdmi_dp.c new file mode 100644 -index 0000000000000000000000000000000000000000..4db9fb7b7daebae4b5d3ae0dcdadbe784d47c8d9 +index 000000000..4db9fb7b7 --- /dev/null +++ b/sound/soc/rockchip/rockchip_hdmi_dp.c @@ -0,0 +1,193 @@ @@ -1708776,7 +1708768,7 @@ index 0000000000000000000000000000000000000000..4db9fb7b7daebae4b5d3ae0dcdadbe78 +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c -index 834fbb5cf8103f7eff6c99216e4d3239c800b136..876fc83ad264a4aaccb74b9dbb4b2d8af5e1f6e9 100644 +index 834fbb5cf..876fc83ad 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -13,6 +13,7 @@ @@ -1709710,7 +1709702,7 @@ index 834fbb5cf8103f7eff6c99216e4d3239c800b136..876fc83ad264a4aaccb74b9dbb4b2d8a .name = DRV_NAME, .of_match_table = of_match_ptr(rockchip_i2s_match), diff --git a/sound/soc/rockchip/rockchip_i2s.h b/sound/soc/rockchip/rockchip_i2s.h -index 251851bf4f2c52dec4490bd0e7bee69fb52e0272..748cf7bf68ad8ae1dcef2301e7ed91a673670cf7 100644 +index 251851bf4..748cf7bf6 100644 --- a/sound/soc/rockchip/rockchip_i2s.h +++ b/sound/soc/rockchip/rockchip_i2s.h @@ -18,8 +18,9 @@ @@ -1709784,7 +1709776,7 @@ index 251851bf4f2c52dec4490bd0e7bee69fb52e0272..748cf7bf68ad8ae1dcef2301e7ed91a6 + #endif /* _ROCKCHIP_IIS_H */ diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c -index d3700f3c98e654a47c77d44330c8ba60cd9bccf9..6e5cfe729ddc4c846d813b5a926336a6817cfa06 100644 +index d3700f3c9..6e5cfe729 100644 --- a/sound/soc/rockchip/rockchip_i2s_tdm.c +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c @@ -13,6 +13,8 @@ @@ -1712301,7 +1712293,7 @@ index d3700f3c98e654a47c77d44330c8ba60cd9bccf9..6e5cfe729ddc4c846d813b5a926336a6 .name = DRV_NAME, .of_match_table = of_match_ptr(rockchip_i2s_tdm_match), diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.h b/sound/soc/rockchip/rockchip_i2s_tdm.h -index 0aa1c6da1e2c0ebb70473b1bcd1f6e0c1fb90df3..9b9f5fa390ee30db27d1d264378684fce96f82ca 100644 +index 0aa1c6da1..9b9f5fa39 100644 --- a/sound/soc/rockchip/rockchip_i2s_tdm.h +++ b/sound/soc/rockchip/rockchip_i2s_tdm.h @@ -20,8 +20,9 @@ @@ -1712428,7 +1712420,7 @@ index 0aa1c6da1e2c0ebb70473b1bcd1f6e0c1fb90df3..9b9f5fa390ee30db27d1d264378684fc #define RV1126_I2S0_MCLK_OUT_SRC_FROM_RX HIWORD_UPDATE(1, 9, 9) diff --git a/sound/soc/rockchip/rockchip_multi_dais.c b/sound/soc/rockchip/rockchip_multi_dais.c new file mode 100644 -index 0000000000000000000000000000000000000000..4b9bb34308781b0e8b89fbdbec5abcfc1ad841d1 +index 000000000..4b9bb3430 --- /dev/null +++ b/sound/soc/rockchip/rockchip_multi_dais.c @@ -0,0 +1,676 @@ @@ -1713110,7 +1713102,7 @@ index 0000000000000000000000000000000000000000..4b9bb34308781b0e8b89fbdbec5abcfc +MODULE_DEVICE_TABLE(of, rockchip_mdais_match); diff --git a/sound/soc/rockchip/rockchip_multi_dais.h b/sound/soc/rockchip/rockchip_multi_dais.h new file mode 100644 -index 0000000000000000000000000000000000000000..5d9a076afb785d6012c01e56db9ad409901c2f51 +index 000000000..5d9a076af --- /dev/null +++ b/sound/soc/rockchip/rockchip_multi_dais.h @@ -0,0 +1,33 @@ @@ -1713149,7 +1713141,7 @@ index 0000000000000000000000000000000000000000..5d9a076afb785d6012c01e56db9ad409 +#endif diff --git a/sound/soc/rockchip/rockchip_multi_dais_pcm.c b/sound/soc/rockchip/rockchip_multi_dais_pcm.c new file mode 100644 -index 0000000000000000000000000000000000000000..d0173bfd54aadb16fc5362b4d8f1ee00c1cdedec +index 000000000..d0173bfd5 --- /dev/null +++ b/sound/soc/rockchip/rockchip_multi_dais_pcm.c @@ -0,0 +1,988 @@ @@ -1714143,7 +1714135,7 @@ index 0000000000000000000000000000000000000000..d0173bfd54aadb16fc5362b4d8f1ee00 +MODULE_LICENSE("GPL"); diff --git a/sound/soc/rockchip/rockchip_multicodecs.c b/sound/soc/rockchip/rockchip_multicodecs.c new file mode 100644 -index 0000000000000000000000000000000000000000..aeb7a84cb6a54ad044be4cfec91744959afe0003 +index 000000000..aeb7a84cb --- /dev/null +++ b/sound/soc/rockchip/rockchip_multicodecs.c @@ -0,0 +1,842 @@ @@ -1714990,7 +1714982,7 @@ index 0000000000000000000000000000000000000000..aeb7a84cb6a54ad044be4cfec9174495 +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c -index 4756cfc23218cabf69f39e2cee75e9fc03cb878a..ecae4d2ff25e3f130b4bff90b4af22b0392e18a9 100644 +index 4756cfc23..ecae4d2ff 100644 --- a/sound/soc/rockchip/rockchip_pdm.c +++ b/sound/soc/rockchip/rockchip_pdm.c @@ -7,8 +7,10 @@ @@ -1715781,7 +1715773,7 @@ index 4756cfc23218cabf69f39e2cee75e9fc03cb878a..ecae4d2ff25e3f130b4bff90b4af22b0 .name = "rockchip-pdm", .of_match_table = of_match_ptr(rockchip_pdm_match), diff --git a/sound/soc/rockchip/rockchip_pdm.h b/sound/soc/rockchip/rockchip_pdm.h -index cab977272ee6f6d24bd7b652e663f36b4a2a5d3a..180b50b95d4375fef8d976f43e7bf7a8613f14d4 100644 +index cab977272..180b50b95 100644 --- a/sound/soc/rockchip/rockchip_pdm.h +++ b/sound/soc/rockchip/rockchip_pdm.h @@ -82,6 +82,9 @@ @@ -1715795,7 +1715787,7 @@ index cab977272ee6f6d24bd7b652e663f36b4a2a5d3a..180b50b95d4375fef8d976f43e7bf7a8 #define PDM_DMA_RD_MSK BIT(8) #define PDM_DMA_RD_EN BIT(8) diff --git a/sound/soc/rockchip/rockchip_rt5645.c b/sound/soc/rockchip/rockchip_rt5645.c -index ef9fdf0386cbdbce70dbf1ea210a8544adb7d023..d07cc5c813f2543f0b3b8aaee65dd90c48f35d6e 100644 +index ef9fdf038..d07cc5c81 100644 --- a/sound/soc/rockchip/rockchip_rt5645.c +++ b/sound/soc/rockchip/rockchip_rt5645.c @@ -22,16 +22,6 @@ @@ -1715861,7 +1715853,7 @@ index ef9fdf0386cbdbce70dbf1ea210a8544adb7d023..d07cc5c813f2543f0b3b8aaee65dd90c .pm = &snd_soc_pm_ops, diff --git a/sound/soc/rockchip/rockchip_rt5651.c b/sound/soc/rockchip/rockchip_rt5651.c new file mode 100644 -index 0000000000000000000000000000000000000000..4dc91c2a1e755fd610da26596d5f315bfdf9fe7b +index 000000000..4dc91c2a1 --- /dev/null +++ b/sound/soc/rockchip/rockchip_rt5651.c @@ -0,0 +1,245 @@ @@ -1716112,7 +1716104,7 @@ index 0000000000000000000000000000000000000000..4dc91c2a1e755fd610da26596d5f315b +MODULE_DEVICE_TABLE(of, rockchip_sound_of_match); diff --git a/sound/soc/rockchip/rockchip_sai.c b/sound/soc/rockchip/rockchip_sai.c new file mode 100644 -index 0000000000000000000000000000000000000000..77499246ee5980965bd55bc9e1e3f4b176883a72 +index 000000000..77499246e --- /dev/null +++ b/sound/soc/rockchip/rockchip_sai.c @@ -0,0 +1,1531 @@ @@ -1717649,7 +1717641,7 @@ index 0000000000000000000000000000000000000000..77499246ee5980965bd55bc9e1e3f4b1 +MODULE_DEVICE_TABLE(of, rockchip_sai_match); diff --git a/sound/soc/rockchip/rockchip_sai.h b/sound/soc/rockchip/rockchip_sai.h new file mode 100644 -index 0000000000000000000000000000000000000000..58e3aa58e1c11273fdae3c30bd011a10d8074a0e +index 000000000..58e3aa58e --- /dev/null +++ b/sound/soc/rockchip/rockchip_sai.h @@ -0,0 +1,165 @@ @@ -1717819,7 +1717811,7 @@ index 0000000000000000000000000000000000000000..58e3aa58e1c11273fdae3c30bd011a10 + +#endif /* _ROCKCHIP_SAI_H */ diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c -index 1a24b78e9e02a20d7b969a604f0386da8b071928..18460851c53ee71faf3f4769a9ec9c9103ed7927 100644 +index 1a24b78e9..18460851c 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -17,6 +17,7 @@ @@ -1718037,7 +1718029,7 @@ index 1a24b78e9e02a20d7b969a604f0386da8b071928..18460851c53ee71faf3f4769a9ec9c91 .name = "rockchip-spdif", .of_match_table = of_match_ptr(rk_spdif_match), diff --git a/sound/soc/rockchip/rockchip_spdif.h b/sound/soc/rockchip/rockchip_spdif.h -index d8be9aae5b195cd0c3e12a526fb6476bba5be507..5c656bd8fd181cf468e608914f0f555ca8ba32a6 100644 +index d8be9aae5..5c656bd8f 100644 --- a/sound/soc/rockchip/rockchip_spdif.h +++ b/sound/soc/rockchip/rockchip_spdif.h @@ -15,7 +15,19 @@ @@ -1718073,7 +1718065,7 @@ index d8be9aae5b195cd0c3e12a526fb6476bba5be507..5c656bd8fd181cf468e608914f0f555c #endif /* _ROCKCHIP_SPDIF_H */ diff --git a/sound/soc/rockchip/rockchip_spdifrx.c b/sound/soc/rockchip/rockchip_spdifrx.c new file mode 100644 -index 0000000000000000000000000000000000000000..0e457232116d4c66acc7b91be01753a81e7eaa5a +index 000000000..0e4572321 --- /dev/null +++ b/sound/soc/rockchip/rockchip_spdifrx.c @@ -0,0 +1,415 @@ @@ -1718494,7 +1718486,7 @@ index 0000000000000000000000000000000000000000..0e457232116d4c66acc7b91be01753a8 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/rockchip/rockchip_spdifrx.h b/sound/soc/rockchip/rockchip_spdifrx.h new file mode 100644 -index 0000000000000000000000000000000000000000..e75b2d5afd046a55827e507cbf8da873eedced32 +index 000000000..e75b2d5af --- /dev/null +++ b/sound/soc/rockchip/rockchip_spdifrx.h @@ -0,0 +1,113 @@ @@ -1718613,7 +1718605,7 @@ index 0000000000000000000000000000000000000000..e75b2d5afd046a55827e507cbf8da873 +#endif /* _ROCKCHIP_SPDIFRX_H */ diff --git a/sound/soc/rockchip/rockchip_utils.c b/sound/soc/rockchip/rockchip_utils.c new file mode 100644 -index 0000000000000000000000000000000000000000..6e81dab350913be2908cb1b2a201fc46f7db26ac +index 000000000..6e81dab35 --- /dev/null +++ b/sound/soc/rockchip/rockchip_utils.c @@ -0,0 +1,150 @@ @@ -1718769,7 +1718761,7 @@ index 0000000000000000000000000000000000000000..6e81dab350913be2908cb1b2a201fc46 +MODULE_LICENSE("GPL"); diff --git a/sound/soc/rockchip/rockchip_utils.h b/sound/soc/rockchip/rockchip_utils.h new file mode 100644 -index 0000000000000000000000000000000000000000..24280b2fd156692e088648a5ea67fa3210b89525 +index 000000000..24280b2fd --- /dev/null +++ b/sound/soc/rockchip/rockchip_utils.h @@ -0,0 +1,18 @@ @@ -1718793,7 +1718785,7 @@ index 0000000000000000000000000000000000000000..24280b2fd156692e088648a5ea67fa32 +#endif /* _ROCKCHIP_UTILS_H */ diff --git a/sound/soc/rockchip/rockchip_vad.c b/sound/soc/rockchip/rockchip_vad.c new file mode 100644 -index 0000000000000000000000000000000000000000..cae1be76c2017008c5a3e64ef5d89c782dc59a6f +index 000000000..cae1be76c --- /dev/null +++ b/sound/soc/rockchip/rockchip_vad.c @@ -0,0 +1,1324 @@ @@ -1720123,7 +1720115,7 @@ index 0000000000000000000000000000000000000000..cae1be76c2017008c5a3e64ef5d89c78 +MODULE_DEVICE_TABLE(of, rockchip_vad_match); diff --git a/sound/soc/rockchip/rockchip_vad.h b/sound/soc/rockchip/rockchip_vad.h new file mode 100644 -index 0000000000000000000000000000000000000000..1121e71490e02aa20878eb472afd0c9bc344aea9 +index 000000000..1121e7149 --- /dev/null +++ b/sound/soc/rockchip/rockchip_vad.h @@ -0,0 +1,231 @@ @@ -1720360,7 +1720352,7 @@ index 0000000000000000000000000000000000000000..1121e71490e02aa20878eb472afd0c9b +#endif diff --git a/sound/soc/rockchip/vad_preprocess.h b/sound/soc/rockchip/vad_preprocess.h new file mode 100644 -index 0000000000000000000000000000000000000000..85e4d102298484b8fccf143500c4b175eee21dab +index 000000000..85e4d1022 --- /dev/null +++ b/sound/soc/rockchip/vad_preprocess.h @@ -0,0 +1,29 @@ @@ -1720395,7 +1720387,7 @@ index 0000000000000000000000000000000000000000..85e4d102298484b8fccf143500c4b175 +#endif diff --git a/sound/soc/rockchip/vad_preprocess_arm.S b/sound/soc/rockchip/vad_preprocess_arm.S new file mode 100644 -index 0000000000000000000000000000000000000000..a0d3eabf2ba09663bb824d1b45ec7faa3e1fc550 +index 000000000..a0d3eabf2 --- /dev/null +++ b/sound/soc/rockchip/vad_preprocess_arm.S @@ -0,0 +1,348 @@ @@ -1720749,7 +1720741,7 @@ index 0000000000000000000000000000000000000000..a0d3eabf2ba09663bb824d1b45ec7faa + .section .note.GNU-stack,"",%progbits diff --git a/sound/soc/rockchip/vad_preprocess_arm64.S b/sound/soc/rockchip/vad_preprocess_arm64.S new file mode 100644 -index 0000000000000000000000000000000000000000..823757c1718f43e90aa16a833e424c25f4c6bef1 +index 000000000..823757c17 --- /dev/null +++ b/sound/soc/rockchip/vad_preprocess_arm64.S @@ -0,0 +1,273 @@ @@ -1721028,7 +1721020,7 @@ index 0000000000000000000000000000000000000000..823757c1718f43e90aa16a833e424c25 + .section .note.GNU-stack,"",@progbits diff --git a/sound/soc/rockchip/vad_preprocess_thumb.S b/sound/soc/rockchip/vad_preprocess_thumb.S new file mode 100644 -index 0000000000000000000000000000000000000000..a105634e60d0a5ea6c6129643f3b287dd6ea57e5 +index 000000000..a105634e6 --- /dev/null +++ b/sound/soc/rockchip/vad_preprocess_thumb.S @@ -0,0 +1,360 @@ -- Gitee