diff --git a/linux-5.10/rk3568_patch/kernel.patch b/linux-5.10/rk3568_patch/kernel.patch index d53402b685d2f6123a0af4dce613c08eddd8c742..73b453daae7f9de3bb7aa42912bec0c29fad0b1d 100755 --- a/linux-5.10/rk3568_patch/kernel.patch +++ b/linux-5.10/rk3568_patch/kernel.patch @@ -1,5 +1,5 @@ diff --git a/Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt b/Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt -index 148191b0f..eee2a7f7c 100644 +index 148191b0fc15..eee2a7f7cb92 100644 --- a/Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt +++ b/Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt @@ -1,8 +1,22 @@ @@ -28,7 +28,7 @@ index 148191b0f..eee2a7f7c 100644 - rockchip,pmu: phandle to the syscon managing the "pmu general register files" - clocks: phandles for clock specified in "clock-names" property diff --git a/Documentation/devicetree/bindings/display/bridge/analogix_dp.txt b/Documentation/devicetree/bindings/display/bridge/analogix_dp.txt -index 027d76c27..a548f4040 100644 +index 027d76c27a41..a548f404033c 100644 --- a/Documentation/devicetree/bindings/display/bridge/analogix_dp.txt +++ b/Documentation/devicetree/bindings/display/bridge/analogix_dp.txt @@ -21,17 +21,23 @@ Required properties for dp-controller: @@ -56,7 +56,7 @@ index 027d76c27..a548f4040 100644 [1]: Documentation/devicetree/bindings/media/video-interfaces.txt ------------------------------------------------------------------------------- diff --git a/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml b/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml -index 1bb761977..de8e78d56 100644 +index 1bb76197787b..de8e78d56dea 100644 --- a/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml +++ b/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml @@ -18,6 +18,7 @@ properties: @@ -68,7 +68,7 @@ index 1bb761977..de8e78d56 100644 - rockchip,rk3328-saradc - rockchip,rv1108-saradc diff --git a/Documentation/devicetree/bindings/iommu/rockchip,iommu.txt b/Documentation/devicetree/bindings/iommu/rockchip,iommu.txt -index 6ecefea1c..0b906fb63 100644 +index 6ecefea1c6f9..0b906fb630e2 100644 --- a/Documentation/devicetree/bindings/iommu/rockchip,iommu.txt +++ b/Documentation/devicetree/bindings/iommu/rockchip,iommu.txt @@ -24,6 +24,10 @@ Optional properties: @@ -84,7 +84,7 @@ index 6ecefea1c..0b906fb63 100644 diff --git a/Documentation/devicetree/bindings/mtd/rockchip,nand-controller.yaml b/Documentation/devicetree/bindings/mtd/rockchip,nand-controller.yaml new file mode 100644 -index 000000000..0922536b1 +index 000000000000..0922536b1811 --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/rockchip,nand-controller.yaml @@ -0,0 +1,161 @@ @@ -250,7 +250,7 @@ index 000000000..0922536b1 + +... diff --git a/Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml b/Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml -index 104dd5085..af1b9c318 100644 +index 104dd508565e..af1b9c31862a 100644 --- a/Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml +++ b/Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml @@ -15,10 +15,13 @@ allOf: @@ -268,7 +268,7 @@ index 104dd5085..af1b9c318 100644 - rockchip,rk3368-efuse - rockchip,rk3399-efuse diff --git a/Documentation/devicetree/bindings/nvmem/rockchip-otp.txt b/Documentation/devicetree/bindings/nvmem/rockchip-otp.txt -index 40f649f7c..6e6134582 100644 +index 40f649f7c2e5..6e61345829e7 100644 --- a/Documentation/devicetree/bindings/nvmem/rockchip-otp.txt +++ b/Documentation/devicetree/bindings/nvmem/rockchip-otp.txt @@ -7,6 +7,8 @@ Required properties: @@ -281,7 +281,7 @@ index 40f649f7c..6e6134582 100644 See ../../reset/reset.txt for details. - reset-names: Should be "phy". diff --git a/Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt b/Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt -index 960da7fca..ac82f7b4d 100644 +index 960da7fcaa9e..ac82f7b4dd58 100644 --- a/Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt +++ b/Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt @@ -17,6 +17,11 @@ Required properties: @@ -341,7 +341,7 @@ index 960da7fca..ac82f7b4d 100644 #phy-cells = <0>; }; diff --git a/Documentation/devicetree/bindings/power/rockchip-io-domain.txt b/Documentation/devicetree/bindings/power/rockchip-io-domain.txt -index e66fd4eab..09824bca2 100644 +index e66fd4eab71c..09824bca248e 100644 --- a/Documentation/devicetree/bindings/power/rockchip-io-domain.txt +++ b/Documentation/devicetree/bindings/power/rockchip-io-domain.txt @@ -41,8 +41,10 @@ Required properties: @@ -391,7 +391,7 @@ index e66fd4eab..09824bca2 100644 io-domains { diff --git a/Documentation/devicetree/bindings/soc/rockchip/power_domain.txt b/Documentation/devicetree/bindings/soc/rockchip/power_domain.txt -index 8304eceb6..e1920b15c 100644 +index 8304eceb62e4..e1920b15c86f 100644 --- a/Documentation/devicetree/bindings/soc/rockchip/power_domain.txt +++ b/Documentation/devicetree/bindings/soc/rockchip/power_domain.txt @@ -16,6 +16,7 @@ Required properties for power domain controller: @@ -419,7 +419,7 @@ index 8304eceb6..e1920b15c 100644 Example of the node using power domain: diff --git a/Documentation/devicetree/bindings/sound/rt5651.txt b/Documentation/devicetree/bindings/sound/rt5651.txt -index 56e736a1c..e7cd338d2 100644 +index 56e736a1cba9..e7cd338d2b59 100644 --- a/Documentation/devicetree/bindings/sound/rt5651.txt +++ b/Documentation/devicetree/bindings/sound/rt5651.txt @@ -38,6 +38,8 @@ Optional properties: @@ -432,7 +432,7 @@ index 56e736a1c..e7cd338d2 100644 * DMIC L1 diff --git a/Documentation/devicetree/bindings/spi/spi-rockchip.yaml b/Documentation/devicetree/bindings/spi/spi-rockchip.yaml -index 1e6cf29e6..7f987e793 100644 +index 1e6cf29e6388..7f987e79337c 100644 --- a/Documentation/devicetree/bindings/spi/spi-rockchip.yaml +++ b/Documentation/devicetree/bindings/spi/spi-rockchip.yaml @@ -33,6 +33,7 @@ properties: @@ -444,7 +444,7 @@ index 1e6cf29e6..7f987e793 100644 reg: diff --git a/Documentation/devicetree/bindings/thermal/rockchip-thermal.txt b/Documentation/devicetree/bindings/thermal/rockchip-thermal.txt -index 7f94669e9..346e466c2 100644 +index 7f94669e9ebe..346e466c2006 100644 --- a/Documentation/devicetree/bindings/thermal/rockchip-thermal.txt +++ b/Documentation/devicetree/bindings/thermal/rockchip-thermal.txt @@ -9,6 +9,7 @@ Required properties: @@ -456,7 +456,7 @@ index 7f94669e9..346e466c2 100644 region. - interrupts : The interrupt number to the cpu. The interrupt specifier format diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi -index 093567022..dc4c26a8a 100644 +index 093567022386..dc4c26a8a196 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -85,6 +85,11 @@ display-subsystem { @@ -508,7 +508,7 @@ index 093567022..dc4c26a8a 100644 status = "disabled"; }; diff --git a/arch/arm/boot/dts/rk3066a-rayeager.dts b/arch/arm/boot/dts/rk3066a-rayeager.dts -index 309518403..1a9891f80 100644 +index 309518403d86..1a9891f802f8 100644 --- a/arch/arm/boot/dts/rk3066a-rayeager.dts +++ b/arch/arm/boot/dts/rk3066a-rayeager.dts @@ -23,6 +23,20 @@ ir: ir-receiver { @@ -533,7 +533,7 @@ index 309518403..1a9891f80 100644 compatible = "gpio-keys"; diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi -index bbc3bff50..49b8652da 100644 +index bbc3bff50856..49b8652da097 100644 --- a/arch/arm/boot/dts/rk3066a.dtsi +++ b/arch/arm/boot/dts/rk3066a.dtsi @@ -800,22 +800,22 @@ power-domain@RK3066_PD_GPU { @@ -564,7 +564,7 @@ index bbc3bff50..49b8652da 100644 }; diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi -index ddf23748e..e3fe43499 100644 +index ddf23748ead4..e3fe43499c8a 100644 --- a/arch/arm/boot/dts/rk3188.dtsi +++ b/arch/arm/boot/dts/rk3188.dtsi @@ -738,22 +738,22 @@ power-domain@RK3188_PD_GPU { @@ -595,7 +595,7 @@ index ddf23748e..e3fe43499 100644 }; diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi -index 2f17bf35d..aae403bfa 100644 +index 2f17bf35d7a6..aae403bfaff1 100644 --- a/arch/arm/boot/dts/rk322x.dtsi +++ b/arch/arm/boot/dts/rk322x.dtsi @@ -398,7 +398,7 @@ pwm0: pwm@110b0000 { @@ -635,7 +635,7 @@ index 2f17bf35d..aae403bfa 100644 status = "disabled"; }; diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi -index 250a03a06..8a81801bd 100644 +index 250a03a066a1..8a81801bd90d 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -695,7 +695,7 @@ pwm0: pwm@ff680000 { @@ -675,7 +675,7 @@ index 250a03a06..8a81801bd 100644 clocks = <&cru PCLK_RKPWM>; clock-names = "pwm"; diff --git a/arch/arm/boot/dts/rv1108.dtsi b/arch/arm/boot/dts/rv1108.dtsi -index a1a08cb93..b079c0008 100644 +index a1a08cb9364e..b079c0008032 100644 --- a/arch/arm/boot/dts/rv1108.dtsi +++ b/arch/arm/boot/dts/rv1108.dtsi @@ -217,7 +217,7 @@ pwm4: pwm@10280000 { @@ -751,7 +751,7 @@ index a1a08cb93..b079c0008 100644 #pwm-cells = <3>; status = "disabled"; diff --git a/arch/arm/kernel/psci_smp.c b/arch/arm/kernel/psci_smp.c -index d4392e177..059db0b1c 100644 +index d4392e177484..059db0b1c1de 100644 --- a/arch/arm/kernel/psci_smp.c +++ b/arch/arm/kernel/psci_smp.c @@ -107,11 +107,12 @@ static int psci_cpu_kill(unsigned int cpu) @@ -769,7 +769,7 @@ index d4392e177..059db0b1c 100644 const struct smp_operations psci_smp_ops __initconst = { .smp_boot_secondary = psci_boot_secondary, diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c -index 0ce388f15..6f874647b 100644 +index 0ce388f15422..6f874647b63b 100644 --- a/arch/arm/kernel/reboot.c +++ b/arch/arm/kernel/reboot.c @@ -18,7 +18,6 @@ typedef void (*phys_reset_t)(unsigned long, bool); @@ -794,7 +794,7 @@ index 0ce388f15..6f874647b 100644 /* Give a grace period for failure to restart of 1s */ mdelay(1000); diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms -index 889e78f40..4a7839834 100644 +index 889e78f40a25..4a783983410a 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -224,11 +224,8 @@ config ARCH_RENESAS @@ -810,7 +810,7 @@ index 889e78f40..4a7839834 100644 This enables support for the ARMv8 based Rockchip chipsets, like the RK3368. diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile -index 485b7dbd4..7b56d7f76 100644 +index 485b7dbd4f9e..7b56d7f760a8 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -198,3 +198,16 @@ define archhelp @@ -831,7 +831,7 @@ index 485b7dbd4..7b56d7f76 100644 +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 26661c7b7..a2386c005 100644 +index 26661c7b736b..a2386c005926 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -44,3 +44,43 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb @@ -880,7 +880,7 @@ index 26661c7b7..a2386c005 100644 +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nvr-demo-v12-linux-spi-nand.dtb diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts b/arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts new file mode 100755 -index 000000000..2f2582862 +index 000000000000..2f258286286a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts @@ -0,0 +1,759 @@ @@ -1645,7 +1645,7 @@ index 000000000..2f2582862 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-dual-lvds.dts b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-dual-lvds.dts new file mode 100755 -index 000000000..09fc265a8 +index 000000000000..09fc265a8d7a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-dual-lvds.dts @@ -0,0 +1,147 @@ @@ -1798,7 +1798,7 @@ index 000000000..09fc265a8 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi-lvds.dts b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi-lvds.dts new file mode 100755 -index 000000000..d4f202189 +index 000000000000..d4f202189250 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi-lvds.dts @@ -0,0 +1,241 @@ @@ -2045,7 +2045,7 @@ index 000000000..d4f202189 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi.dts b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi.dts new file mode 100755 -index 000000000..0ea056682 +index 000000000000..0ea056682e57 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi.dts @@ -0,0 +1,105 @@ @@ -2156,7 +2156,7 @@ index 000000000..0ea056682 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-lvds.dts b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-lvds.dts new file mode 100755 -index 000000000..8b54a9a18 +index 000000000000..8b54a9a18fcc --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-lvds.dts @@ -0,0 +1,146 @@ @@ -2308,7 +2308,7 @@ index 000000000..8b54a9a18 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb.dtsi b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb.dtsi new file mode 100755 -index 000000000..bbcd18959 +index 000000000000..bbcd18959dc4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb.dtsi @@ -0,0 +1,823 @@ @@ -3137,7 +3137,7 @@ index 000000000..bbcd18959 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-android.dtsi b/arch/arm64/boot/dts/rockchip/px30-android.dtsi new file mode 100755 -index 000000000..aecb6344f +index 000000000000..aecb6344f01f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-android.dtsi @@ -0,0 +1,131 @@ @@ -3274,7 +3274,7 @@ index 000000000..aecb6344f +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ddr4p416dd6-timing.dtsi b/arch/arm64/boot/dts/rockchip/px30-ddr4p416dd6-timing.dtsi new file mode 100755 -index 000000000..fde5895db +index 000000000000..fde5895db94a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ddr4p416dd6-timing.dtsi @@ -0,0 +1,216 @@ @@ -3496,7 +3496,7 @@ index 000000000..fde5895db +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/px30-dram-default-timing.dtsi new file mode 100755 -index 000000000..c75c5ef4e +index 000000000000..c75c5ef4ef2a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-dram-default-timing.dtsi @@ -0,0 +1,294 @@ @@ -3796,7 +3796,7 @@ index 000000000..c75c5ef4e +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts new file mode 100755 -index 000000000..eb60e71b7 +index 000000000000..eb60e71b77f3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts @@ -0,0 +1,689 @@ @@ -4491,7 +4491,7 @@ index 000000000..eb60e71b7 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts new file mode 100755 -index 000000000..fca982485 +index 000000000000..fca982485b16 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts @@ -0,0 +1,109 @@ @@ -4606,7 +4606,7 @@ index 000000000..fca982485 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts new file mode 100755 -index 000000000..ff24bdd46 +index 000000000000..ff24bdd46aea --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts @@ -0,0 +1,939 @@ @@ -5551,7 +5551,7 @@ index 000000000..ff24bdd46 + diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts new file mode 100755 -index 000000000..317b53b2a +index 000000000000..317b53b2a1eb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts @@ -0,0 +1,627 @@ @@ -6184,7 +6184,7 @@ index 000000000..317b53b2a +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts new file mode 100755 -index 000000000..81f44c366 +index 000000000000..81f44c36686c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts @@ -0,0 +1,627 @@ @@ -6817,7 +6817,7 @@ index 000000000..81f44c366 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts new file mode 100755 -index 000000000..b814812ed +index 000000000000..b814812edbe9 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts @@ -0,0 +1,127 @@ @@ -6950,7 +6950,7 @@ index 000000000..b814812ed +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi new file mode 100755 -index 000000000..3d8e81009 +index 000000000000..3d8e81009bef --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi @@ -0,0 +1,815 @@ @@ -7771,7 +7771,7 @@ index 000000000..3d8e81009 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-avb.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-avb.dts new file mode 100755 -index 000000000..f2659a7f5 +index 000000000000..f2659a7f524e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-avb.dts @@ -0,0 +1,276 @@ @@ -8053,7 +8053,7 @@ index 000000000..f2659a7f5 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-linux.dts new file mode 100755 -index 000000000..54a4c19d1 +index 000000000000..54a4c19d11b3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-linux.dts @@ -0,0 +1,296 @@ @@ -8355,7 +8355,7 @@ index 000000000..54a4c19d1 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts new file mode 100755 -index 000000000..2e59a09d3 +index 000000000000..2e59a09d3c5c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts @@ -0,0 +1,293 @@ @@ -8654,7 +8654,7 @@ index 000000000..2e59a09d3 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts new file mode 100755 -index 000000000..7bfe640d3 +index 000000000000..7bfe640d32de --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts @@ -0,0 +1,853 @@ @@ -9513,7 +9513,7 @@ index 000000000..7bfe640d3 + diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618-avb.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618-avb.dts new file mode 100755 -index 000000000..ea44da506 +index 000000000000..ea44da5066af --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618-avb.dts @@ -0,0 +1,11 @@ @@ -9530,7 +9530,7 @@ index 000000000..ea44da506 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dts new file mode 100755 -index 000000000..69f44b4d1 +index 000000000000..69f44b4d115c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dts @@ -0,0 +1,33 @@ @@ -9569,7 +9569,7 @@ index 000000000..69f44b4d1 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi new file mode 100755 -index 000000000..0eac63181 +index 000000000000..0eac63181407 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi @@ -0,0 +1,202 @@ @@ -9777,7 +9777,7 @@ index 000000000..0eac63181 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-robot-no-gpu.dtsi b/arch/arm64/boot/dts/rockchip/px30-robot-no-gpu.dtsi new file mode 100755 -index 000000000..e3f4274b2 +index 000000000000..e3f4274b2309 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-robot-no-gpu.dtsi @@ -0,0 +1,57 @@ @@ -9840,7 +9840,7 @@ index 000000000..e3f4274b2 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-robot.dtsi b/arch/arm64/boot/dts/rockchip/px30-robot.dtsi new file mode 100755 -index 000000000..f48a753e6 +index 000000000000..f48a753e6453 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-robot.dtsi @@ -0,0 +1,93 @@ @@ -9939,7 +9939,7 @@ index 000000000..f48a753e6 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-z7-a0-rk618-dsi.dts b/arch/arm64/boot/dts/rockchip/px30-z7-a0-rk618-dsi.dts new file mode 100755 -index 000000000..1657151c9 +index 000000000000..1657151c988f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-z7-a0-rk618-dsi.dts @@ -0,0 +1,875 @@ @@ -10819,7 +10819,7 @@ index 000000000..1657151c9 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30.dtsi b/arch/arm64/boot/dts/rockchip/px30.dtsi -index 0d6761074..237c0d9af 100644 +index 0d6761074b11..237c0d9af325 100644 --- a/arch/arm64/boot/dts/rockchip/px30.dtsi +++ b/arch/arm64/boot/dts/rockchip/px30.dtsi @@ -25,6 +25,9 @@ aliases { @@ -10974,7 +10974,7 @@ index 0d6761074..237c0d9af 100644 status = "disabled"; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk1808-dram-default-timing.dtsi new file mode 100755 -index 000000000..0fa79e2f0 +index 000000000000..0fa79e2f05c0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-dram-default-timing.dtsi @@ -0,0 +1,302 @@ @@ -11282,7 +11282,7 @@ index 000000000..0fa79e2f0 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts new file mode 100755 -index 000000000..a09824816 +index 000000000000..a09824816188 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts @@ -0,0 +1,305 @@ @@ -11593,7 +11593,7 @@ index 000000000..a09824816 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb-x4-second.dts b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4-second.dts new file mode 100755 -index 000000000..413d4f6fa +index 000000000000..413d4f6fa29d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4-second.dts @@ -0,0 +1,272 @@ @@ -11871,7 +11871,7 @@ index 000000000..413d4f6fa +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts new file mode 100755 -index 000000000..17993d1ff +index 000000000000..17993d1ff44a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts @@ -0,0 +1,271 @@ @@ -12148,7 +12148,7 @@ index 000000000..17993d1ff +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi new file mode 100755 -index 000000000..3b9c88660 +index 000000000000..3b9c88660701 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi @@ -0,0 +1,717 @@ @@ -12871,7 +12871,7 @@ index 000000000..3b9c88660 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-fpga.dts b/arch/arm64/boot/dts/rockchip/rk1808-fpga.dts new file mode 100755 -index 000000000..d021918ca +index 000000000000..d021918cacd1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-fpga.dts @@ -0,0 +1,58 @@ @@ -12935,7 +12935,7 @@ index 000000000..d021918ca +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808.dtsi b/arch/arm64/boot/dts/rockchip/rk1808.dtsi new file mode 100755 -index 000000000..3469abac4 +index 000000000000..3469abac4f34 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808.dtsi @@ -0,0 +1,3040 @@ @@ -15981,7 +15981,7 @@ index 000000000..3469abac4 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808k.dtsi b/arch/arm64/boot/dts/rockchip/rk1808k.dtsi new file mode 100755 -index 000000000..78bd92e4c +index 000000000000..78bd92e4c2c6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808k.dtsi @@ -0,0 +1,51 @@ @@ -16038,7 +16038,7 @@ index 000000000..78bd92e4c +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts new file mode 100755 -index 000000000..c77d2e963 +index 000000000000..c77d2e963266 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts @@ -0,0 +1,681 @@ @@ -16725,7 +16725,7 @@ index 000000000..c77d2e963 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts new file mode 100755 -index 000000000..557daa856 +index 000000000000..557daa856132 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts @@ -0,0 +1,55 @@ @@ -16786,7 +16786,7 @@ index 000000000..557daa856 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts new file mode 100755 -index 000000000..90a29a903 +index 000000000000..90a29a903545 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts @@ -0,0 +1,56 @@ @@ -16848,7 +16848,7 @@ index 000000000..90a29a903 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v10.dts new file mode 100755 -index 000000000..88c1e9c6c +index 000000000000..88c1e9c6c8ac --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v10.dts @@ -0,0 +1,101 @@ @@ -16955,7 +16955,7 @@ index 000000000..88c1e9c6c +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v11.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v11.dts new file mode 100755 -index 000000000..364f74a40 +index 000000000000..364f74a40d9d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v11.dts @@ -0,0 +1,77 @@ @@ -17038,7 +17038,7 @@ index 000000000..364f74a40 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts new file mode 100755 -index 000000000..e2891ce10 +index 000000000000..e2891ce1092c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts @@ -0,0 +1,88 @@ @@ -17132,7 +17132,7 @@ index 000000000..e2891ce10 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v11.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v11.dts new file mode 100755 -index 000000000..c4a7178f1 +index 000000000000..c4a7178f1dc8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v11.dts @@ -0,0 +1,92 @@ @@ -17230,7 +17230,7 @@ index 000000000..c4a7178f1 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-ext-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-ext-v10.dtsi new file mode 100755 -index 000000000..1c0e66384 +index 000000000000..1c0e66384c16 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-ext-v10.dtsi @@ -0,0 +1,235 @@ @@ -17471,7 +17471,7 @@ index 000000000..1c0e66384 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi new file mode 100755 -index 000000000..3d052d0da +index 000000000000..3d052d0da477 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi @@ -0,0 +1,780 @@ @@ -18257,7 +18257,7 @@ index 000000000..3d052d0da +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi new file mode 100755 -index 000000000..7b692a810 +index 000000000000..7b692a810333 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi @@ -0,0 +1,835 @@ @@ -19098,7 +19098,7 @@ index 000000000..7b692a810 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-fpga.dts b/arch/arm64/boot/dts/rockchip/rk3308-fpga.dts new file mode 100755 -index 000000000..225aca323 +index 000000000000..225aca323f4d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-fpga.dts @@ -0,0 +1,51 @@ @@ -19154,7 +19154,7 @@ index 000000000..225aca323 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts -index 213c0759c..b89eaf107 100644 +index 213c0759c4b8..b89eaf1075ab 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts @@ -78,8 +78,8 @@ vcc_sdmmc: vcc-sdmmc { @@ -19170,7 +19170,7 @@ index 213c0759c..b89eaf107 100644 diff --git a/arch/arm64/boot/dts/rockchip/rk3308-voice-module-board-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-voice-module-board-v10.dts new file mode 100755 -index 000000000..2586d9905 +index 000000000000..2586d9905072 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-voice-module-board-v10.dts @@ -0,0 +1,19 @@ @@ -19194,7 +19194,7 @@ index 000000000..2586d9905 + console-size = <0xc0000>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi -index 2560b9877..cc86c0880 100644 +index 2560b98771ca..cc86c0880cec 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi @@ -10,6 +10,7 @@ @@ -19337,7 +19337,7 @@ index 2560b9877..cc86c0880 100644 status = "disabled"; diff --git a/arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts new file mode 100755 -index 000000000..d5e2d9ebd +index 000000000000..d5e2d9ebd4aa --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts @@ -0,0 +1,62 @@ @@ -19405,7 +19405,7 @@ index 000000000..d5e2d9ebd +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308b-evb-ext-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308b-evb-ext-v10.dtsi new file mode 100755 -index 000000000..e2414b67f +index 000000000000..e2414b67f0d1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-ext-v10.dtsi @@ -0,0 +1,124 @@ @@ -19535,7 +19535,7 @@ index 000000000..e2414b67f +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi new file mode 100755 -index 000000000..902ae3544 +index 000000000000..902ae3544235 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi @@ -0,0 +1,784 @@ @@ -20325,7 +20325,7 @@ index 000000000..902ae3544 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308k.dtsi b/arch/arm64/boot/dts/rockchip/rk3308k.dtsi new file mode 100755 -index 000000000..ffd53fd15 +index 000000000000..ffd53fd158c5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308k.dtsi @@ -0,0 +1,46 @@ @@ -20377,7 +20377,7 @@ index 000000000..ffd53fd15 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-cif-sensor.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-863-cif-sensor.dtsi new file mode 100755 -index 000000000..c01f4d014 +index 000000000000..c01f4d014a1b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-cif-sensor.dtsi @@ -0,0 +1,54 @@ @@ -20437,7 +20437,7 @@ index 000000000..c01f4d014 + diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts new file mode 100755 -index 000000000..174d05e37 +index 000000000000..174d05e37ccb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts @@ -0,0 +1,112 @@ @@ -20555,7 +20555,7 @@ index 000000000..174d05e37 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-rkisp1.dts b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-rkisp1.dts new file mode 100755 -index 000000000..d80dad694 +index 000000000000..d80dad694c1d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-rkisp1.dts @@ -0,0 +1,103 @@ @@ -20664,7 +20664,7 @@ index 000000000..d80dad694 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts new file mode 100755 -index 000000000..7a399b335 +index 000000000000..7a399b3356ac --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts @@ -0,0 +1,42 @@ @@ -20712,7 +20712,7 @@ index 000000000..7a399b335 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi new file mode 100755 -index 000000000..6e6e3be2f +index 000000000000..6e6e3be2f104 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi @@ -0,0 +1,833 @@ @@ -21551,7 +21551,7 @@ index 000000000..6e6e3be2f +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-86v-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-86v-v10.dts new file mode 100755 -index 000000000..86d048c0d +index 000000000000..86d048c0d731 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-86v-v10.dts @@ -0,0 +1,840 @@ @@ -22397,7 +22397,7 @@ index 000000000..86d048c0d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts new file mode 100755 -index 000000000..02308ebae +index 000000000000..02308ebae99e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts @@ -0,0 +1,1308 @@ @@ -23711,7 +23711,7 @@ index 000000000..02308ebae +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts new file mode 100755 -index 000000000..0af03d1ec +index 000000000000..0af03d1ec2a8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts @@ -0,0 +1,1330 @@ @@ -25047,7 +25047,7 @@ index 000000000..0af03d1ec +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts new file mode 100755 -index 000000000..fa8b7cff6 +index 000000000000..fa8b7cff619f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts @@ -0,0 +1,1317 @@ @@ -26370,7 +26370,7 @@ index 000000000..fa8b7cff6 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts new file mode 100755 -index 000000000..966999349 +index 000000000000..9669993499e0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts @@ -0,0 +1,1317 @@ @@ -27693,7 +27693,7 @@ index 000000000..966999349 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts new file mode 100755 -index 000000000..4c12a79f8 +index 000000000000..4c12a79f814b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts @@ -0,0 +1,91 @@ @@ -27790,7 +27790,7 @@ index 000000000..4c12a79f8 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts new file mode 100755 -index 000000000..67c131c96 +index 000000000000..67c131c9618a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts @@ -0,0 +1,1024 @@ @@ -28820,7 +28820,7 @@ index 000000000..67c131c96 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts new file mode 100755 -index 000000000..696680615 +index 000000000000..6966806150f5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts @@ -0,0 +1,748 @@ @@ -29574,7 +29574,7 @@ index 000000000..696680615 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts new file mode 100755 -index 000000000..b3b9efec9 +index 000000000000..b3b9efec92e4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts @@ -0,0 +1,728 @@ @@ -30308,7 +30308,7 @@ index 000000000..b3b9efec9 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts new file mode 100755 -index 000000000..58bbfdafb +index 000000000000..58bbfdafb489 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts @@ -0,0 +1,37 @@ @@ -30351,7 +30351,7 @@ index 000000000..58bbfdafb +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi new file mode 100755 -index 000000000..940c05df8 +index 000000000000..940c05df8304 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi @@ -0,0 +1,887 @@ @@ -31244,7 +31244,7 @@ index 000000000..940c05df8 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11-avb.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11-avb.dts new file mode 100755 -index 000000000..2f0c3fc3a +index 000000000000..2f0c3fc3a38d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11-avb.dts @@ -0,0 +1,351 @@ @@ -31601,7 +31601,7 @@ index 000000000..2f0c3fc3a +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts new file mode 100755 -index 000000000..139efd9d1 +index 000000000000..139efd9d1332 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts @@ -0,0 +1,297 @@ @@ -31904,7 +31904,7 @@ index 000000000..139efd9d1 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi new file mode 100755 -index 000000000..a386cd291 +index 000000000000..a386cd291cf3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi @@ -0,0 +1,120 @@ @@ -32030,7 +32030,7 @@ index 000000000..a386cd291 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-android.dtsi new file mode 100755 -index 000000000..809b6501b +index 000000000000..809b6501b78f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-android.dtsi @@ -0,0 +1,88 @@ @@ -32124,7 +32124,7 @@ index 000000000..809b6501b +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong-avb.dts b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong-avb.dts new file mode 100755 -index 000000000..ee04d8988 +index 000000000000..ee04d8988fbb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong-avb.dts @@ -0,0 +1,13 @@ @@ -32143,7 +32143,7 @@ index 000000000..ee04d8988 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dts b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dts new file mode 100755 -index 000000000..dcff87208 +index 000000000000..dcff87208d39 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dts @@ -0,0 +1,34 @@ @@ -32183,7 +32183,7 @@ index 000000000..dcff87208 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi new file mode 100755 -index 000000000..ad7ef6be4 +index 000000000000..ad7ef6be49fa --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi @@ -0,0 +1,673 @@ @@ -32862,7 +32862,7 @@ index 000000000..ad7ef6be4 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi new file mode 100755 -index 000000000..0ea270539 +index 000000000000..0ea270539a23 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi @@ -0,0 +1,221 @@ @@ -33089,7 +33089,7 @@ index 000000000..0ea270539 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-dram-2layer-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-dram-2layer-timing.dtsi new file mode 100755 -index 000000000..940024920 +index 000000000000..940024920b5d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-dram-2layer-timing.dtsi @@ -0,0 +1,257 @@ @@ -33352,7 +33352,7 @@ index 000000000..940024920 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi new file mode 100755 -index 000000000..a3f5ff4bd +index 000000000000..a3f5ff4bdc47 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi @@ -0,0 +1,311 @@ @@ -33669,7 +33669,7 @@ index 000000000..a3f5ff4bd +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts new file mode 100755 -index 000000000..0d72e05e2 +index 000000000000..0d72e05e2d59 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts @@ -0,0 +1,13 @@ @@ -33688,7 +33688,7 @@ index 000000000..0d72e05e2 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dts new file mode 100755 -index 000000000..6d50444a5 +index 000000000000..6d50444a5a1d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dts @@ -0,0 +1,34 @@ @@ -33728,7 +33728,7 @@ index 000000000..6d50444a5 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi new file mode 100755 -index 000000000..e05004742 +index 000000000000..e050047420a6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi @@ -0,0 +1,715 @@ @@ -34448,7 +34448,7 @@ index 000000000..e05004742 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts -index a48767931..82d2f01a8 100644 +index a48767931af6..82d2f01a8be6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts @@ -37,6 +37,18 @@ sdio_pwrseq: sdio-pwrseq { @@ -34495,7 +34495,7 @@ index a48767931..82d2f01a8 100644 #gpio-cells = <2>; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -index 83a0bdbe0..1eecad724 100644 +index 83a0bdbe00d6..1eecad724f04 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts @@ -71,8 +71,8 @@ vcc_io_sdio: sdmmcio-regulator { @@ -34510,7 +34510,7 @@ index 83a0bdbe0..1eecad724 100644 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts -index 22ab5e1d7..a0c4d321c 100644 +index 22ab5e1d7319..a0c4d321cc0b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts @@ -45,8 +45,8 @@ vcc_sd: sdmmc-regulator { @@ -34526,7 +34526,7 @@ index 22ab5e1d7..a0c4d321c 100644 regulator-min-microvolt = <1800000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android-avb.dts new file mode 100755 -index 000000000..adc1dd7cd +index 000000000000..adc1dd7cd4da --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android-avb.dts @@ -0,0 +1,32 @@ @@ -34564,7 +34564,7 @@ index 000000000..adc1dd7cd +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dts new file mode 100755 -index 000000000..66e83916c +index 000000000000..66e83916c728 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dts @@ -0,0 +1,34 @@ @@ -34604,7 +34604,7 @@ index 000000000..66e83916c +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi new file mode 100755 -index 000000000..3dad4f4fa +index 000000000000..3dad4f4fafcb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi @@ -0,0 +1,612 @@ @@ -35221,7 +35221,7 @@ index 000000000..3dad4f4fa + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -index 95ab6928c..4c33c21ee 100644 +index 95ab6928cfd4..4c33c21eee8d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts @@ -21,6 +21,13 @@ gmac_clkin: external-gmac-clock { @@ -35260,7 +35260,7 @@ index 95ab6928c..4c33c21ee 100644 status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index 72112fe05..a3fcf36f8 100644 +index 72112fe05a5c..a3fcf36f8ecc 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -318,13 +318,13 @@ power: power-controller { @@ -35365,7 +35365,7 @@ index 72112fe05..a3fcf36f8 100644 #interrupt-cells = <3>; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts b/arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts new file mode 100755 -index 000000000..7e803a8ed +index 000000000000..7e803a8ed30c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts @@ -0,0 +1,189 @@ @@ -35560,7 +35560,7 @@ index 000000000..7e803a8ed +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi new file mode 100755 -index 000000000..fdea0c739 +index 000000000000..fdea0c73932e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi @@ -0,0 +1,982 @@ @@ -36548,7 +36548,7 @@ index 000000000..fdea0c739 + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi new file mode 100755 -index 000000000..a3e0bbaaf +index 000000000000..a3e0bbaaf7c5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi @@ -0,0 +1,357 @@ @@ -36911,7 +36911,7 @@ index 000000000..a3e0bbaaf +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-cif-sensor.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-cif-sensor.dtsi new file mode 100755 -index 000000000..7d2aac22c +index 000000000000..7d2aac22c020 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-cif-sensor.dtsi @@ -0,0 +1,35 @@ @@ -36952,7 +36952,7 @@ index 000000000..7d2aac22c +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-dram-default-timing.dtsi new file mode 100755 -index 000000000..10bfbebda +index 000000000000..10bfbebda989 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-dram-default-timing.dtsi @@ -0,0 +1,66 @@ @@ -37024,7 +37024,7 @@ index 000000000..10bfbebda +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9-avb.dts b/arch/arm64/boot/dts/rockchip/rk3368-p9-avb.dts new file mode 100755 -index 000000000..6a9717810 +index 000000000000..6a971781032a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-p9-avb.dts @@ -0,0 +1,35 @@ @@ -37065,7 +37065,7 @@ index 000000000..6a9717810 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9.dts b/arch/arm64/boot/dts/rockchip/rk3368-p9.dts new file mode 100755 -index 000000000..29658be08 +index 000000000000..29658be08696 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-p9.dts @@ -0,0 +1,34 @@ @@ -37105,7 +37105,7 @@ index 000000000..29658be08 + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi new file mode 100755 -index 000000000..7eeb9db4f +index 000000000000..7eeb9db4f13b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi @@ -0,0 +1,841 @@ @@ -37952,7 +37952,7 @@ index 000000000..7eeb9db4f + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts new file mode 100755 -index 000000000..1d50d3fa5 +index 000000000000..1d50d3fa549f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts @@ -0,0 +1,993 @@ @@ -38951,7 +38951,7 @@ index 000000000..1d50d3fa5 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts new file mode 100755 -index 000000000..4a755f120 +index 000000000000..4a755f1207c1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts @@ -0,0 +1,676 @@ @@ -39633,7 +39633,7 @@ index 000000000..4a755f120 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts b/arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts new file mode 100755 -index 000000000..b7b11f895 +index 000000000000..b7b11f895cab --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts @@ -0,0 +1,662 @@ @@ -40301,7 +40301,7 @@ index 000000000..b7b11f895 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts b/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts new file mode 100755 -index 000000000..b9b6b24ff +index 000000000000..b9b6b24ff37b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts @@ -0,0 +1,746 @@ @@ -41053,7 +41053,7 @@ index 000000000..b9b6b24ff +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts b/arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts new file mode 100755 -index 000000000..eff7c2fed +index 000000000000..eff7c2fed990 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts @@ -0,0 +1,808 @@ @@ -41867,7 +41867,7 @@ index 000000000..eff7c2fed +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts new file mode 100755 -index 000000000..d7dc6d67e +index 000000000000..d7dc6d67e242 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts @@ -0,0 +1,1070 @@ @@ -42943,7 +42943,7 @@ index 000000000..d7dc6d67e + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts b/arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts new file mode 100755 -index 000000000..b455e32c3 +index 000000000000..b455e32c3e29 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts @@ -0,0 +1,139 @@ @@ -43088,7 +43088,7 @@ index 000000000..b455e32c3 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-xikp.dts b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dts new file mode 100755 -index 000000000..bc320ffdc +index 000000000000..bc320ffdc3b7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dts @@ -0,0 +1,33 @@ @@ -43128,7 +43128,7 @@ index 000000000..bc320ffdc \ No newline at end of file diff --git a/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi new file mode 100755 -index 000000000..aa73096af +index 000000000000..aa73096aff9d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi @@ -0,0 +1,893 @@ @@ -44026,7 +44026,7 @@ index 000000000..aa73096af +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi -index 3746f23dc..e962c7962 100644 +index 3746f23dc3df..e962c7962789 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi @@ -562,7 +562,7 @@ pwm0: pwm@ff680000 { @@ -44093,7 +44093,7 @@ index 3746f23dc..e962c7962 100644 diff --git a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts new file mode 100755 -index 000000000..0a489bf8f +index 000000000000..0a489bf8fc84 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts @@ -0,0 +1,1074 @@ @@ -45173,7 +45173,7 @@ index 000000000..0a489bf8f + diff --git a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts new file mode 100755 -index 000000000..31f25e445 +index 000000000000..31f25e44504d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts @@ -0,0 +1,1333 @@ @@ -46512,7 +46512,7 @@ index 000000000..31f25e445 + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi new file mode 100755 -index 000000000..ffaa92b7a +index 000000000000..ffaa92b7a89e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi @@ -0,0 +1,339 @@ @@ -46857,7 +46857,7 @@ index 000000000..ffaa92b7a + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts new file mode 100755 -index 000000000..c4572da2e +index 000000000000..c4572da2ec87 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts @@ -0,0 +1,134 @@ @@ -46997,7 +46997,7 @@ index 000000000..c4572da2e +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts new file mode 100755 -index 000000000..1c9b88473 +index 000000000000..1c9b884736b1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts @@ -0,0 +1,158 @@ @@ -47161,7 +47161,7 @@ index 000000000..1c9b88473 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi new file mode 100755 -index 000000000..704e0df4e +index 000000000000..704e0df4e122 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi @@ -0,0 +1,891 @@ @@ -48058,7 +48058,7 @@ index 000000000..704e0df4e +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-dram-default-timing.dtsi new file mode 100755 -index 000000000..981777b82 +index 000000000000..981777b82329 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-dram-default-timing.dtsi @@ -0,0 +1,80 @@ @@ -48144,7 +48144,7 @@ index 000000000..981777b82 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi new file mode 100755 -index 000000000..2a675ec7c +index 000000000000..2a675ec7c342 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi @@ -0,0 +1,127 @@ @@ -48277,7 +48277,7 @@ index 000000000..2a675ec7c +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi new file mode 100755 -index 000000000..4cac4981b +index 000000000000..4cac4981b267 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi @@ -0,0 +1,181 @@ @@ -48464,7 +48464,7 @@ index 000000000..4cac4981b +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts new file mode 100755 -index 000000000..343a9fc38 +index 000000000000..343a9fc389e1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts @@ -0,0 +1,389 @@ @@ -48859,7 +48859,7 @@ index 000000000..343a9fc38 + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts new file mode 100755 -index 000000000..72aa97aff +index 000000000000..72aa97affa99 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts @@ -0,0 +1,157 @@ @@ -49022,7 +49022,7 @@ index 000000000..72aa97aff + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts new file mode 100755 -index 000000000..5b6b7131f +index 000000000000..5b6b7131fdd1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts @@ -0,0 +1,321 @@ @@ -49349,7 +49349,7 @@ index 000000000..5b6b7131f + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts new file mode 100755 -index 000000000..8439d91dd +index 000000000000..8439d91dd125 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts @@ -0,0 +1,425 @@ @@ -49780,7 +49780,7 @@ index 000000000..8439d91dd + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi new file mode 100755 -index 000000000..dc821a2d4 +index 000000000000..dc821a2d45c4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi @@ -0,0 +1,1430 @@ @@ -51216,7 +51216,7 @@ index 000000000..dc821a2d4 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts new file mode 100755 -index 000000000..bb7ddac77 +index 000000000000..bb7ddac77f23 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts @@ -0,0 +1,145 @@ @@ -51367,7 +51367,7 @@ index 000000000..bb7ddac77 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts new file mode 100755 -index 000000000..bf2755629 +index 000000000000..bf27556295ec --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts @@ -0,0 +1,51 @@ @@ -51424,7 +51424,7 @@ index 000000000..bf2755629 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi new file mode 100755 -index 000000000..f35d6ee56 +index 000000000000..f35d6ee56072 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi @@ -0,0 +1,352 @@ @@ -51782,7 +51782,7 @@ index 000000000..f35d6ee56 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts new file mode 100755 -index 000000000..b15fb8a9d +index 000000000000..b15fb8a9d088 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts @@ -0,0 +1,156 @@ @@ -51944,7 +51944,7 @@ index 000000000..b15fb8a9d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts new file mode 100755 -index 000000000..2daf9f123 +index 000000000000..2daf9f1235f3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts @@ -0,0 +1,51 @@ @@ -52001,7 +52001,7 @@ index 000000000..2daf9f123 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi new file mode 100755 -index 000000000..4b23c1fca +index 000000000000..4b23c1fcadd8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi @@ -0,0 +1,366 @@ @@ -52373,7 +52373,7 @@ index 000000000..4b23c1fca +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts new file mode 100755 -index 000000000..7f730f563 +index 000000000000..7f730f5633dd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts @@ -0,0 +1,126 @@ @@ -52505,7 +52505,7 @@ index 000000000..7f730f563 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-lp4.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-lp4.dts new file mode 100755 -index 000000000..85f4356a0 +index 000000000000..85f4356a0030 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-lp4.dts @@ -0,0 +1,233 @@ @@ -52744,7 +52744,7 @@ index 000000000..85f4356a0 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-mipi-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-mipi-edp.dts new file mode 100755 -index 000000000..fffd92f00 +index 000000000000..fffd92f00ff4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-mipi-edp.dts @@ -0,0 +1,300 @@ @@ -53050,7 +53050,7 @@ index 000000000..fffd92f00 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts new file mode 100755 -index 000000000..9ba1b0381 +index 000000000000..9ba1b0381fed --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts @@ -0,0 +1,176 @@ @@ -53232,7 +53232,7 @@ index 000000000..9ba1b0381 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts new file mode 100755 -index 000000000..e1bb5f129 +index 000000000000..e1bb5f129680 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts @@ -0,0 +1,51 @@ @@ -53289,7 +53289,7 @@ index 000000000..e1bb5f129 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3.dtsi new file mode 100755 -index 000000000..e34379ded +index 000000000000..e34379ded3a5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3.dtsi @@ -0,0 +1,353 @@ @@ -53648,7 +53648,7 @@ index 000000000..e34379ded +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi new file mode 100755 -index 000000000..aa8ea436a +index 000000000000..aa8ea436ae9b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi @@ -0,0 +1,646 @@ @@ -54300,7 +54300,7 @@ index 000000000..aa8ea436a + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi new file mode 100755 -index 000000000..adbda6ba4 +index 000000000000..adbda6ba4e0d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi @@ -0,0 +1,324 @@ @@ -54630,7 +54630,7 @@ index 000000000..adbda6ba4 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts new file mode 100755 -index 000000000..c372ade53 +index 000000000000..c372ade536f2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts @@ -0,0 +1,1102 @@ @@ -55738,7 +55738,7 @@ index 000000000..c372ade53 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts new file mode 100755 -index 000000000..5a023389a +index 000000000000..5a023389a033 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts @@ -0,0 +1,1074 @@ @@ -56818,7 +56818,7 @@ index 000000000..5a023389a +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-fpga.dts b/arch/arm64/boot/dts/rockchip/rk3399-fpga.dts new file mode 100755 -index 000000000..1192dfa42 +index 000000000000..1192dfa42940 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-fpga.dts @@ -0,0 +1,64 @@ @@ -56888,7 +56888,7 @@ index 000000000..1192dfa42 + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts new file mode 100755 -index 000000000..e8d771e2b +index 000000000000..e8d771e2b90e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts @@ -0,0 +1,165 @@ @@ -57059,7 +57059,7 @@ index 000000000..e8d771e2b +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts new file mode 100755 -index 000000000..7a1c36e98 +index 000000000000..7a1c36e981d5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts @@ -0,0 +1,118 @@ @@ -57183,7 +57183,7 @@ index 000000000..7a1c36e98 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts new file mode 100755 -index 000000000..44b04e160 +index 000000000000..44b04e1606fc --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts @@ -0,0 +1,85 @@ @@ -57273,7 +57273,7 @@ index 000000000..44b04e160 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi -index e9ecffc40..60cd1c18c 100644 +index e9ecffc409c0..60cd1c18cd4e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi @@ -245,7 +245,7 @@ &ppvar_gpu_pwm { @@ -57286,7 +57286,7 @@ index e9ecffc40..60cd1c18c 100644 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi -index fb0a13cad..1ce91e36a 100644 +index fb0a13cad6c9..1ce91e36aa49 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi @@ -247,8 +247,8 @@ ppvar_sd_card_io: ppvar-sd-card-io { @@ -57302,7 +57302,7 @@ index fb0a13cad..1ce91e36a 100644 regulator-max-microvolt = <3000000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi new file mode 100755 -index 000000000..0549701d6 +index 000000000000..0549701d615e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi @@ -0,0 +1,306 @@ @@ -57614,7 +57614,7 @@ index 000000000..0549701d6 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts new file mode 100755 -index 000000000..8610539ef +index 000000000000..8610539ef284 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts @@ -0,0 +1,1121 @@ @@ -58740,7 +58740,7 @@ index 000000000..8610539ef + assigned-clock-parents = <&cru PLL_VPLL>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi -index d6f1095ab..f9f2cc8ab 100644 +index d6f1095abb04..f9f2cc8abec7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi @@ -3,35 +3,99 @@ @@ -59138,7 +59138,7 @@ index d6f1095ab..f9f2cc8ab 100644 &gpu { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi -index 35b7ab3bf..20309076d 100644 +index 35b7ab3bf10c..20309076dbac 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi @@ -384,7 +384,6 @@ regulator-state-mem { @@ -59160,7 +59160,7 @@ index 35b7ab3bf..20309076d 100644 regulator-state-mem { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts new file mode 100755 -index 000000000..86e45dc00 +index 000000000000..86e45dc0074d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts @@ -0,0 +1,1088 @@ @@ -60253,7 +60253,7 @@ index 000000000..86e45dc00 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts -index c88295782..1a23e8f3c 100644 +index c88295782e7b..1a23e8f3cdf6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts @@ -63,6 +63,20 @@ bt_active_led: led-6 { @@ -60325,7 +60325,7 @@ index c88295782..1a23e8f3c 100644 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts new file mode 100755 -index 000000000..3106512b8 +index 000000000000..3106512b87cd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts @@ -0,0 +1,181 @@ @@ -60512,7 +60512,7 @@ index 000000000..3106512b8 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts new file mode 100755 -index 000000000..3e9ef7b07 +index 000000000000..3e9ef7b0773b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts @@ -0,0 +1,128 @@ @@ -60646,7 +60646,7 @@ index 000000000..3e9ef7b07 + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts new file mode 100755 -index 000000000..c2f867319 +index 000000000000..c2f8673198d5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts @@ -0,0 +1,82 @@ @@ -60734,7 +60734,7 @@ index 000000000..c2f867319 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi new file mode 100755 -index 000000000..8156e5f7c +index 000000000000..8156e5f7c795 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi @@ -0,0 +1,488 @@ @@ -61228,7 +61228,7 @@ index 000000000..8156e5f7c + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts new file mode 100755 -index 000000000..e1e482938 +index 000000000000..e1e482938481 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts @@ -0,0 +1,487 @@ @@ -61721,7 +61721,7 @@ index 000000000..e1e482938 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts new file mode 100755 -index 000000000..9f370a7bf +index 000000000000..9f370a7bff1c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts @@ -0,0 +1,452 @@ @@ -62179,7 +62179,7 @@ index 000000000..9f370a7bf +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts new file mode 100755 -index 000000000..da471a636 +index 000000000000..da471a636103 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts @@ -0,0 +1,497 @@ @@ -62681,7 +62681,7 @@ index 000000000..da471a636 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi -index 701a567d7..3d9e27750 100644 +index 701a567d7638..3d9e27750139 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi @@ -515,6 +515,8 @@ &pwm0 { @@ -62695,7 +62695,7 @@ index 701a567d7..3d9e27750 100644 &saradc { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi new file mode 100755 -index 000000000..373a776b9 +index 000000000000..373a776b9207 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi @@ -0,0 +1,121 @@ @@ -62822,7 +62822,7 @@ index 000000000..373a776b9 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts new file mode 100755 -index 000000000..eeca9cf54 +index 000000000000..eeca9cf54373 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts @@ -0,0 +1,170 @@ @@ -62998,7 +62998,7 @@ index 000000000..eeca9cf54 + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dts new file mode 100755 -index 000000000..28f81ee8f +index 000000000000..28f81ee8f7f5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dts @@ -0,0 +1,42 @@ @@ -63046,7 +63046,7 @@ index 000000000..28f81ee8f +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi new file mode 100755 -index 000000000..fb700431e +index 000000000000..fb700431e356 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi @@ -0,0 +1,1039 @@ @@ -64091,7 +64091,7 @@ index 000000000..fb700431e +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts new file mode 100755 -index 000000000..ac9d28db5 +index 000000000000..ac9d28db5b76 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts @@ -0,0 +1,1179 @@ @@ -65276,7 +65276,7 @@ index 000000000..ac9d28db5 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts new file mode 100755 -index 000000000..10ba20484 +index 000000000000..10ba2048483d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts @@ -0,0 +1,293 @@ @@ -65575,7 +65575,7 @@ index 000000000..10ba20484 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-vop-clk-set.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-vop-clk-set.dtsi new file mode 100755 -index 000000000..5ed8dac6c +index 000000000000..5ed8dac6cf7d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-vop-clk-set.dtsi @@ -0,0 +1,181 @@ @@ -65761,7 +65761,7 @@ index 000000000..5ed8dac6c +#endif + diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -index c5f3d4f8f..7f4a812f4 100644 +index c5f3d4f8f4d2..7f4a812f4337 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -9,8 +9,13 @@ @@ -66476,7 +66476,7 @@ index c5f3d4f8f..7f4a812f4 100644 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399k-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399k-opp.dtsi new file mode 100755 -index 000000000..59f200e0b +index 000000000000..59f200e0b9cb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399k-opp.dtsi @@ -0,0 +1,24 @@ @@ -66506,7 +66506,7 @@ index 000000000..59f200e0b +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts new file mode 100755 -index 000000000..f975f47b7 +index 000000000000..f975f47b76d6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts @@ -0,0 +1,1293 @@ @@ -67805,7 +67805,7 @@ index 000000000..f975f47b7 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts new file mode 100755 -index 000000000..08ac2a477 +index 000000000000..08ac2a477852 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts @@ -0,0 +1,1203 @@ @@ -69014,7 +69014,7 @@ index 000000000..08ac2a477 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts new file mode 100755 -index 000000000..398f96211 +index 000000000000..398f962114cf --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts @@ -0,0 +1,1061 @@ @@ -70081,7 +70081,7 @@ index 000000000..398f96211 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts new file mode 100755 -index 000000000..c3faaa1ba +index 000000000000..c3faaa1ba4d3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts @@ -0,0 +1,1223 @@ @@ -71310,7 +71310,7 @@ index 000000000..c3faaa1ba +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts new file mode 100755 -index 000000000..7d118a783 +index 000000000000..7d118a783353 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts @@ -0,0 +1,1045 @@ @@ -72361,7 +72361,7 @@ index 000000000..7d118a783 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v14-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v14-linux.dts new file mode 100755 -index 000000000..4f8546eb8 +index 000000000000..4f8546eb80bf --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v14-linux.dts @@ -0,0 +1,247 @@ @@ -72614,7 +72614,7 @@ index 000000000..4f8546eb8 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts new file mode 100755 -index 000000000..96a3fb56c +index 000000000000..96a3fb56cfe5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts @@ -0,0 +1,140 @@ @@ -72760,7 +72760,7 @@ index 000000000..96a3fb56c +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi new file mode 100755 -index 000000000..3f176b3bc +index 000000000000..3f176b3bc94f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi @@ -0,0 +1,826 @@ @@ -73592,7 +73592,7 @@ index 000000000..3f176b3bc +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dts new file mode 100755 -index 000000000..1bd285bfc +index 000000000000..1bd285bfc695 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dts @@ -0,0 +1,15 @@ @@ -73613,7 +73613,7 @@ index 000000000..1bd285bfc +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi new file mode 100755 -index 000000000..41ac0af11 +index 000000000000..41ac0af11188 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi @@ -0,0 +1,528 @@ @@ -74147,7 +74147,7 @@ index 000000000..41ac0af11 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi new file mode 100755 -index 000000000..f0feae673 +index 000000000000..f0feae6730e3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi @@ -0,0 +1,436 @@ @@ -74589,7 +74589,7 @@ index 000000000..f0feae673 + diff --git a/arch/arm64/boot/dts/rockchip/rk3566-eink.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-eink.dtsi new file mode 100755 -index 000000000..09791eb16 +index 000000000000..09791eb16abf --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-eink.dtsi @@ -0,0 +1,100 @@ @@ -74695,7 +74695,7 @@ index 000000000..09791eb16 + diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dts new file mode 100755 -index 000000000..3f215884a +index 000000000000..3f215884a070 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dts @@ -0,0 +1,7 @@ @@ -74708,7 +74708,7 @@ index 000000000..3f215884a +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi new file mode 100755 -index 000000000..227bc4e39 +index 000000000000..227bc4e39d99 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi @@ -0,0 +1,507 @@ @@ -75221,7 +75221,7 @@ index 000000000..227bc4e39 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb.dtsi new file mode 100755 -index 000000000..d1aa123cd +index 000000000000..d1aa123cd347 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb.dtsi @@ -0,0 +1,7 @@ @@ -75234,7 +75234,7 @@ index 000000000..d1aa123cd +#include "rk3568-evb.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-linux.dts new file mode 100755 -index 000000000..a22cc8cec +index 000000000000..a22cc8cec6af --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-linux.dts @@ -0,0 +1,13 @@ @@ -75253,7 +75253,7 @@ index 000000000..a22cc8cec +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-lvds.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-lvds.dts new file mode 100755 -index 000000000..98a384041 +index 000000000000..98a384041b8b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-lvds.dts @@ -0,0 +1,99 @@ @@ -75358,7 +75358,7 @@ index 000000000..98a384041 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dts new file mode 100755 -index 000000000..f602ed98d +index 000000000000..f602ed98d7ce --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dts @@ -0,0 +1,7 @@ @@ -75371,7 +75371,7 @@ index 000000000..f602ed98d +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi new file mode 100755 -index 000000000..385933be9 +index 000000000000..385933be9f45 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi @@ -0,0 +1,489 @@ @@ -75866,7 +75866,7 @@ index 000000000..385933be9 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts new file mode 100755 -index 000000000..83546eef6 +index 000000000000..83546eef6529 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts @@ -0,0 +1,345 @@ @@ -76217,7 +76217,7 @@ index 000000000..83546eef6 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-i2s-mic-array.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-i2s-mic-array.dts new file mode 100755 -index 000000000..5ba1318bc +index 000000000000..5ba1318bcee1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-i2s-mic-array.dts @@ -0,0 +1,102 @@ @@ -76325,7 +76325,7 @@ index 000000000..5ba1318bc +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-linux.dts new file mode 100755 -index 000000000..957a99b16 +index 000000000000..957a99b168bb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-linux.dts @@ -0,0 +1,8 @@ @@ -76339,7 +76339,7 @@ index 000000000..957a99b16 +#include "rk3568-linux.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-pdm-mic-array.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-pdm-mic-array.dts new file mode 100755 -index 000000000..55e967919 +index 000000000000..55e9679194cb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-pdm-mic-array.dts @@ -0,0 +1,111 @@ @@ -76456,7 +76456,7 @@ index 000000000..55e967919 + diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts new file mode 100755 -index 000000000..3b36bdba1 +index 000000000000..3b36bdba12b6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts @@ -0,0 +1,8 @@ @@ -76470,7 +76470,7 @@ index 000000000..3b36bdba1 +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi new file mode 100755 -index 000000000..4a6bec70f +index 000000000000..4a6bec70f33e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi @@ -0,0 +1,599 @@ @@ -77075,7 +77075,7 @@ index 000000000..4a6bec70f +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10-linux.dts new file mode 100755 -index 000000000..e292b0dd1 +index 000000000000..e292b0dd1846 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10-linux.dts @@ -0,0 +1,8 @@ @@ -77089,7 +77089,7 @@ index 000000000..e292b0dd1 +#include "rk3568-linux.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dts new file mode 100755 -index 000000000..09f5260fb +index 000000000000..09f5260fb375 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dts @@ -0,0 +1,8 @@ @@ -77103,7 +77103,7 @@ index 000000000..09f5260fb +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi new file mode 100755 -index 000000000..f936cc186 +index 000000000000..f936cc186cfb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi @@ -0,0 +1,499 @@ @@ -77608,7 +77608,7 @@ index 000000000..f936cc186 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dts new file mode 100755 -index 000000000..600fc3c39 +index 000000000000..600fc3c39586 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dts @@ -0,0 +1,7 @@ @@ -77621,7 +77621,7 @@ index 000000000..600fc3c39 +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi new file mode 100755 -index 000000000..835866595 +index 000000000000..83586659530d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi @@ -0,0 +1,317 @@ @@ -77944,7 +77944,7 @@ index 000000000..835866595 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts new file mode 100755 -index 000000000..3f559fca2 +index 000000000000..3f559fca27f8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts @@ -0,0 +1,1115 @@ @@ -79065,7 +79065,7 @@ index 000000000..3f559fca2 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts new file mode 100755 -index 000000000..2e6d3160a +index 000000000000..2e6d3160aa16 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts @@ -0,0 +1,968 @@ @@ -80039,7 +80039,7 @@ index 000000000..2e6d3160a +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts new file mode 100755 -index 000000000..50412b44b +index 000000000000..50412b44bb71 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts @@ -0,0 +1,957 @@ @@ -81002,7 +81002,7 @@ index 000000000..50412b44b +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts new file mode 100755 -index 000000000..f6f4534aa +index 000000000000..f6f4534aad50 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts @@ -0,0 +1,1307 @@ @@ -82315,7 +82315,7 @@ index 000000000..f6f4534aa +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts new file mode 100755 -index 000000000..8102da027 +index 000000000000..8102da0270fa --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts @@ -0,0 +1,1180 @@ @@ -83501,7 +83501,7 @@ index 000000000..8102da027 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts new file mode 100755 -index 000000000..1d4a04844 +index 000000000000..1d4a0484473a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts @@ -0,0 +1,1208 @@ @@ -84715,7 +84715,7 @@ index 000000000..1d4a04844 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts new file mode 100755 -index 000000000..40022eb6c +index 000000000000..40022eb6c646 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts @@ -0,0 +1,1213 @@ @@ -85934,7 +85934,7 @@ index 000000000..40022eb6c +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566.dtsi b/arch/arm64/boot/dts/rockchip/rk3566.dtsi new file mode 100755 -index 000000000..01b6499b6 +index 000000000000..01b6499b678d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566.dtsi @@ -0,0 +1,53 @@ @@ -85993,7 +85993,7 @@ index 000000000..01b6499b6 +/delete-node/ &sata0; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-android.dtsi new file mode 100755 -index 000000000..01cd37c04 +index 000000000000..01cd37c04e1a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-android.dtsi @@ -0,0 +1,74 @@ @@ -86073,7 +86073,7 @@ index 000000000..01cd37c04 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-dram-default-timing.dtsi new file mode 100755 -index 000000000..43f978809 +index 000000000000..43f978809c02 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-dram-default-timing.dtsi @@ -0,0 +1,81 @@ @@ -86160,7 +86160,7 @@ index 000000000..43f978809 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi new file mode 100755 -index 000000000..2ca4a1831 +index 000000000000..2ca4a18314d2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi @@ -0,0 +1,1807 @@ @@ -87973,7 +87973,7 @@ index 000000000..2ca4a1831 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-spi-nor.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-spi-nor.dts new file mode 100755 -index 000000000..259b483af +index 000000000000..259b483af0f4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-spi-nor.dts @@ -0,0 +1,18 @@ @@ -87997,7 +87997,7 @@ index 000000000..259b483af +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts new file mode 100755 -index 000000000..55c255998 +index 000000000000..55c255998473 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts @@ -0,0 +1,8 @@ @@ -88011,7 +88011,7 @@ index 000000000..55c255998 +#include "rk3568-linux.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts new file mode 100755 -index 000000000..00c28f392 +index 000000000000..00c28f39269b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts @@ -0,0 +1,8 @@ @@ -88025,7 +88025,7 @@ index 000000000..00c28f392 +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi new file mode 100755 -index 000000000..64881d201 +index 000000000000..64881d20183f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi @@ -0,0 +1,490 @@ @@ -88521,7 +88521,7 @@ index 000000000..64881d201 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts new file mode 100755 -index 000000000..7a5a7feb5 +index 000000000000..7a5a7feb52a7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts @@ -0,0 +1,79 @@ @@ -88606,7 +88606,7 @@ index 000000000..7a5a7feb5 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dts new file mode 100755 -index 000000000..23f5f036c +index 000000000000..23f5f036c4b2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dts @@ -0,0 +1,8 @@ @@ -88620,7 +88620,7 @@ index 000000000..23f5f036c +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi new file mode 100755 -index 000000000..c2d0b697a +index 000000000000..c2d0b697a9bd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi @@ -0,0 +1,493 @@ @@ -89119,7 +89119,7 @@ index 000000000..c2d0b697a +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb4-lp3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb4-lp3-v10.dts new file mode 100755 -index 000000000..5884da41f +index 000000000000..5884da41f121 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb4-lp3-v10.dts @@ -0,0 +1,12 @@ @@ -89137,7 +89137,7 @@ index 000000000..5884da41f +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dts new file mode 100755 -index 000000000..e9eb33307 +index 000000000000..e9eb333079a2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dts @@ -0,0 +1,8 @@ @@ -89151,7 +89151,7 @@ index 000000000..e9eb33307 +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi new file mode 100755 -index 000000000..e8a00fc85 +index 000000000000..e8a00fc85483 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi @@ -0,0 +1,539 @@ @@ -89696,7 +89696,7 @@ index 000000000..e8a00fc85 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-linux.dts new file mode 100755 -index 000000000..a11975fc7 +index 000000000000..a11975fc7d53 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-linux.dts @@ -0,0 +1,8 @@ @@ -89710,7 +89710,7 @@ index 000000000..a11975fc7 +#include "rk3568-linux.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts new file mode 100755 -index 000000000..0c5ea5eb3 +index 000000000000..0c5ea5eb32ba --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts @@ -0,0 +1,127 @@ @@ -89843,7 +89843,7 @@ index 000000000..0c5ea5eb3 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts new file mode 100755 -index 000000000..597fa0b0b +index 000000000000..597fa0b0b089 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts @@ -0,0 +1,96 @@ @@ -89945,7 +89945,7 @@ index 000000000..597fa0b0b +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk630-bt656-to-cvbs.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk630-bt656-to-cvbs.dts new file mode 100755 -index 000000000..24c4debec +index 000000000000..24c4debec4f3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk630-bt656-to-cvbs.dts @@ -0,0 +1,70 @@ @@ -90021,7 +90021,7 @@ index 000000000..24c4debec +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dts new file mode 100755 -index 000000000..6e34fa48a +index 000000000000..6e34fa48abc4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dts @@ -0,0 +1,8 @@ @@ -90035,7 +90035,7 @@ index 000000000..6e34fa48a +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi new file mode 100755 -index 000000000..2f3b5d74e +index 000000000000..2f3b5d74e1cf --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi @@ -0,0 +1,490 @@ @@ -90531,7 +90531,7 @@ index 000000000..2f3b5d74e +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb7-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb7-ddr4-v10.dts new file mode 100755 -index 000000000..ecb96832c +index 000000000000..ecb96832c292 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb7-ddr4-v10.dts @@ -0,0 +1,12 @@ @@ -90549,7 +90549,7 @@ index 000000000..ecb96832c +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10-linux.dts new file mode 100755 -index 000000000..d832a40d3 +index 000000000000..d832a40d37e9 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10-linux.dts @@ -0,0 +1,69 @@ @@ -90624,7 +90624,7 @@ index 000000000..d832a40d3 +/delete-node/ &display_subsystem; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10.dts new file mode 100755 -index 000000000..489967f13 +index 000000000000..489967f1318f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10.dts @@ -0,0 +1,47 @@ @@ -90677,7 +90677,7 @@ index 000000000..489967f13 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi new file mode 100755 -index 000000000..838606964 +index 000000000000..838606964e15 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi @@ -0,0 +1,60 @@ @@ -90743,7 +90743,7 @@ index 000000000..838606964 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux-spi-nand.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux-spi-nand.dts new file mode 100755 -index 000000000..50bd02452 +index 000000000000..50bd024528df --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux-spi-nand.dts @@ -0,0 +1,31 @@ @@ -90780,7 +90780,7 @@ index 000000000..50bd02452 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux.dts new file mode 100755 -index 000000000..3317db6ee +index 000000000000..3317db6ee671 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux.dts @@ -0,0 +1,27 @@ @@ -90813,7 +90813,7 @@ index 000000000..3317db6ee +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dts new file mode 100755 -index 000000000..053d20259 +index 000000000000..053d20259e93 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dts @@ -0,0 +1,27 @@ @@ -90846,7 +90846,7 @@ index 000000000..053d20259 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi new file mode 100755 -index 000000000..40a2096bc +index 000000000000..40a2096bc58b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi @@ -0,0 +1,442 @@ @@ -91294,7 +91294,7 @@ index 000000000..40a2096bc +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts new file mode 100755 -index 000000000..de8c1a1e7 +index 000000000000..de8c1a1e734f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts @@ -0,0 +1,20 @@ @@ -91320,7 +91320,7 @@ index 000000000..de8c1a1e7 + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts new file mode 100755 -index 000000000..b605c3d57 +index 000000000000..b605c3d57d26 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts @@ -0,0 +1,16 @@ @@ -91342,7 +91342,7 @@ index 000000000..b605c3d57 + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12.dtsi new file mode 100755 -index 000000000..6bb50368a +index 000000000000..6bb50368a73b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12.dtsi @@ -0,0 +1,39 @@ @@ -91387,7 +91387,7 @@ index 000000000..6bb50368a +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr-linux.dtsi new file mode 100755 -index 000000000..f9908b61c +index 000000000000..f9908b61cb41 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-linux.dtsi @@ -0,0 +1,55 @@ @@ -91448,7 +91448,7 @@ index 000000000..f9908b61c +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi new file mode 100755 -index 000000000..e1ec294b2 +index 000000000000..e1ec294b2c82 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi @@ -0,0 +1,510 @@ @@ -91964,7 +91964,7 @@ index 000000000..e1ec294b2 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi new file mode 100755 -index 000000000..30d8cedfb +index 000000000000..30d8cedfbdc7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi @@ -0,0 +1,3119 @@ @@ -95089,7 +95089,7 @@ index 000000000..30d8cedfb +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts new file mode 100755 -index 000000000..0ef442123 +index 000000000000..0ef442123d05 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts @@ -0,0 +1,14 @@ @@ -95109,7 +95109,7 @@ index 000000000..0ef442123 + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-edp.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-edp.dtsi new file mode 100755 -index 000000000..459fc3b6d +index 000000000000..459fc3b6d6a0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-edp.dtsi @@ -0,0 +1,141 @@ @@ -95256,7 +95256,7 @@ index 000000000..459fc3b6d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0-beiqicloud.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0-beiqicloud.dtsi new file mode 100755 -index 000000000..25889a206 +index 000000000000..25889a206778 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0-beiqicloud.dtsi @@ -0,0 +1,395 @@ @@ -95657,7 +95657,7 @@ index 000000000..25889a206 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi new file mode 100755 -index 000000000..bd32a4246 +index 000000000000..bd32a4246df3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi @@ -0,0 +1,91 @@ @@ -95754,7 +95754,7 @@ index 000000000..bd32a4246 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx1.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx1.dtsi new file mode 100755 -index 000000000..70fc8ffc3 +index 000000000000..70fc8ffc3e41 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx1.dtsi @@ -0,0 +1,97 @@ @@ -95857,7 +95857,7 @@ index 000000000..70fc8ffc3 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-android.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-android.dts new file mode 100755 -index 000000000..ccfd369d0 +index 000000000000..ccfd369d0cd3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-android.dts @@ -0,0 +1,13 @@ @@ -95876,7 +95876,7 @@ index 000000000..ccfd369d0 + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts new file mode 100755 -index 000000000..3107e3a99 +index 000000000000..3107e3a9937a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts @@ -0,0 +1,155 @@ @@ -96037,7 +96037,7 @@ index 000000000..3107e3a99 + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts new file mode 100755 -index 000000000..67e95ebf4 +index 000000000000..67e95ebf496b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts @@ -0,0 +1,21 @@ @@ -96064,7 +96064,7 @@ index 000000000..67e95ebf4 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi new file mode 100755 -index 000000000..b6ec191b0 +index 000000000000..b6ec191b0107 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi @@ -0,0 +1,868 @@ @@ -96938,7 +96938,7 @@ index 000000000..b6ec191b0 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10-linux.dts new file mode 100755 -index 000000000..8dd494ce3 +index 000000000000..8dd494ce3a1f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10-linux.dts @@ -0,0 +1,13 @@ @@ -96957,7 +96957,7 @@ index 000000000..8dd494ce3 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10.dtsi new file mode 100755 -index 000000000..7c1919d7d +index 000000000000..7c1919d7d258 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10.dtsi @@ -0,0 +1,816 @@ @@ -97779,7 +97779,7 @@ index 000000000..7c1919d7d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi new file mode 100755 -index 000000000..8be2d36f3 +index 000000000000..8be2d36f38c0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi @@ -0,0 +1,1891 @@ @@ -99676,7 +99676,7 @@ index 000000000..8be2d36f3 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi new file mode 100755 -index 000000000..372617fee +index 000000000000..372617fee467 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi @@ -0,0 +1,3449 @@ @@ -103131,7 +103131,7 @@ index 000000000..372617fee +#include "rk3568-pinctrl.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi b/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi new file mode 100755 -index 000000000..fc0145333 +index 000000000000..fc0145333257 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi @@ -0,0 +1,382 @@ @@ -103519,7 +103519,7 @@ index 000000000..fc0145333 + diff --git a/arch/arm64/include/asm/system_info.h b/arch/arm64/include/asm/system_info.h new file mode 100755 -index 000000000..a82fe791b +index 000000000000..a82fe791b2f6 --- /dev/null +++ b/arch/arm64/include/asm/system_info.h @@ -0,0 +1,14 @@ @@ -103538,7 +103538,7 @@ index 000000000..a82fe791b + +#endif /* __ASM_ARM_SYSTEM_INFO_H */ diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c -index 4c0e72781..7221da6cf 100644 +index 4c0e72781f31..7221da6cf9ef 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -25,6 +25,12 @@ @@ -103555,7 +103555,7 @@ index 4c0e72781..7221da6cf 100644 * In case the boot CPU is hotpluggable, we record its initial state and * current state separately. Certain system registers may contain different diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c -index 3696dbcbf..ead9c33eb 100644 +index 3696dbcbfa80..ead9c33ebe91 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -191,6 +191,8 @@ void machine_restart(char *cmd) @@ -103568,7 +103568,7 @@ index 3696dbcbf..ead9c33eb 100644 * UpdateCapsule() depends on the system being reset via * ResetSystem(). diff --git a/drivers/Kconfig b/drivers/Kconfig -index 216c52363..7abae88c8 100644 +index 216c52363bd2..7abae88c80d0 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -246,4 +246,9 @@ source "drivers/hck/Kconfig" @@ -103582,7 +103582,7 @@ index 216c52363..7abae88c8 100644 +source "drivers/rk_nand/Kconfig" endmenu diff --git a/drivers/Makefile b/drivers/Makefile -index d0ff4fdb0..a1b4ece46 100644 +index d0ff4fdb0dfb..a1b4ece467b2 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -196,3 +196,6 @@ obj-$(CONFIG_MOST) += most/ @@ -103593,7 +103593,7 @@ index d0ff4fdb0..a1b4ece46 100644 +obj-$(CONFIG_TZDRIVER) += tzdriver/ +obj-$(CONFIG_RK_NAND) += rk_nand/ diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c -index 9a7ea4c18..92e61f980 100644 +index 9a7ea4c18366..92e61f980460 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -2400,12 +2400,6 @@ static int nbd_genl_status(struct sk_buff *skb, struct genl_info *info) @@ -103610,7 +103610,7 @@ index 9a7ea4c18..92e61f980 100644 ret = idr_for_each(&nbd_index_idr, &status_cb, reply); if (ret) { diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig -index 4ae49eae4..b64457abd 100644 +index 4ae49eae4586..b64457abdec3 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -38,6 +38,13 @@ menuconfig COMMON_CLK @@ -103628,7 +103628,7 @@ index 4ae49eae4..b64457abd 100644 tristate "Clock driver for WM831x/2x PMICs" depends on MFD_WM831X diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c -index 3575afe16..d2f0c049b 100644 +index 3575afe16a57..d2f0c049b837 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1324,7 +1324,7 @@ static int __init clk_disable_unused(void) @@ -103641,7 +103641,7 @@ index 3575afe16..d2f0c049b 100644 static int clk_core_determine_round_nolock(struct clk_core *core, struct clk_rate_request *req) diff --git a/drivers/clk/rockchip/Kconfig b/drivers/clk/rockchip/Kconfig -index 47cd6c5de..f92ce8b4c 100644 +index 47cd6c5de837..f92ce8b4c030 100644 --- a/drivers/clk/rockchip/Kconfig +++ b/drivers/clk/rockchip/Kconfig @@ -2,7 +2,7 @@ @@ -103878,7 +103878,7 @@ index 47cd6c5de..f92ce8b4c 100644 + endif diff --git a/drivers/clk/rockchip/Makefile b/drivers/clk/rockchip/Makefile -index a99e4d9bb..03ddb4baa 100644 +index a99e4d9bbae1..03ddb4baaa5a 100644 --- a/drivers/clk/rockchip/Makefile +++ b/drivers/clk/rockchip/Makefile @@ -4,19 +4,27 @@ @@ -103921,7 +103921,7 @@ index a99e4d9bb..03ddb4baa 100644 +obj-$(CONFIG_CLK_RK3568) += clk-rk3568.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 0dc478a19..365d4ec30 100644 +index 0dc478a19451..365d4ec3057a 100644 --- a/drivers/clk/rockchip/clk-cpu.c +++ b/drivers/clk/rockchip/clk-cpu.c @@ -51,6 +51,7 @@ @@ -104351,7 +104351,7 @@ index 0dc478a19..365d4ec30 100644 +} diff --git a/drivers/clk/rockchip/clk-dclk-divider.c b/drivers/clk/rockchip/clk-dclk-divider.c new file mode 100755 -index 000000000..88cf7ab82 +index 000000000000..88cf7ab82a57 --- /dev/null +++ b/drivers/clk/rockchip/clk-dclk-divider.c @@ -0,0 +1,168 @@ @@ -104524,7 +104524,7 @@ index 000000000..88cf7ab82 + return ERR_PTR(-ENOMEM); +} diff --git a/drivers/clk/rockchip/clk-ddr.c b/drivers/clk/rockchip/clk-ddr.c -index 86718c54e..46df75f1a 100644 +index 86718c54e56b..46df75f1a29c 100644 --- a/drivers/clk/rockchip/clk-ddr.c +++ b/drivers/clk/rockchip/clk-ddr.c @@ -8,8 +8,14 @@ @@ -104708,7 +104708,7 @@ index 86718c54e..46df75f1a 100644 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 ccd5c270c..b978af08d 100644 +index ccd5c270c213..b978af08d84f 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, @@ -104810,7 +104810,7 @@ index ccd5c270c..b978af08d 100644 div->lock = lock; diff --git a/drivers/clk/rockchip/clk-link.c b/drivers/clk/rockchip/clk-link.c new file mode 100644 -index 000000000..78ff9b53c +index 000000000000..78ff9b53c165 --- /dev/null +++ b/drivers/clk/rockchip/clk-link.c @@ -0,0 +1,244 @@ @@ -105060,7 +105060,7 @@ index 000000000..78ff9b53c +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-out.c b/drivers/clk/rockchip/clk-out.c new file mode 100644 -index 000000000..97177a462 +index 000000000000..97177a4626b9 --- /dev/null +++ b/drivers/clk/rockchip/clk-out.c @@ -0,0 +1,104 @@ @@ -105169,7 +105169,7 @@ index 000000000..97177a462 +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 d0bd513ff..89ecdd0f7 100644 +index d0bd513ff3c3..89ecdd0f7ad6 100644 --- a/drivers/clk/rockchip/clk-pll.c +++ b/drivers/clk/rockchip/clk-pll.c @@ -15,6 +15,9 @@ @@ -106652,7 +106652,7 @@ index d0bd513ff..89ecdd0f7 100644 +#endif /* CONFIG_ROCKCHIP_CLK_BOOST */ diff --git a/drivers/clk/rockchip/clk-pvtm.c b/drivers/clk/rockchip/clk-pvtm.c new file mode 100755 -index 000000000..c748589dd +index 000000000000..c748589dd922 --- /dev/null +++ b/drivers/clk/rockchip/clk-pvtm.c @@ -0,0 +1,311 @@ @@ -106968,7 +106968,7 @@ index 000000000..c748589dd +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 6fb9c98b7..3294ce8ea 100644 +index 6fb9c98b7d24..3294ce8eaf32 100644 --- a/drivers/clk/rockchip/clk-px30.c +++ b/drivers/clk/rockchip/clk-px30.c @@ -6,8 +6,11 @@ @@ -107490,7 +107490,7 @@ index 6fb9c98b7..3294ce8ea 100644 +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rk1808.c b/drivers/clk/rockchip/clk-rk1808.c new file mode 100755 -index 000000000..e177a3dd6 +index 000000000000..e177a3dd634c --- /dev/null +++ b/drivers/clk/rockchip/clk-rk1808.c @@ -0,0 +1,1249 @@ @@ -108744,7 +108744,7 @@ index 000000000..e177a3dd6 +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 6a46f85ad..ed05eb6c5 100644 +index 6a46f85ad837..ed05eb6c51f3 100644 --- a/drivers/clk/rockchip/clk-rk3036.c +++ b/drivers/clk/rockchip/clk-rk3036.c @@ -9,8 +9,10 @@ @@ -109058,7 +109058,7 @@ index 6a46f85ad..ed05eb6c5 100644 +MODULE_DESCRIPTION("Rockchip RK3036 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3128.c b/drivers/clk/rockchip/clk-rk3128.c -index 4b1122e98..1b1111e88 100644 +index 4b1122e98e16..1b1111e88089 100644 --- a/drivers/clk/rockchip/clk-rk3128.c +++ b/drivers/clk/rockchip/clk-rk3128.c @@ -6,8 +6,11 @@ @@ -109424,7 +109424,7 @@ index 4b1122e98..1b1111e88 100644 +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 730020fcc..510a70d4d 100644 +index 730020fcc7fe..510a70d4dc99 100644 --- a/drivers/clk/rockchip/clk-rk3188.c +++ b/drivers/clk/rockchip/clk-rk3188.c @@ -5,10 +5,12 @@ @@ -109731,7 +109731,7 @@ index 730020fcc..510a70d4d 100644 +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 47d6482dd..18c94343b 100644 +index 47d6482dda9d..18c94343b6b6 100644 --- a/drivers/clk/rockchip/clk-rk3228.c +++ b/drivers/clk/rockchip/clk-rk3228.c @@ -7,8 +7,10 @@ @@ -110147,7 +110147,7 @@ index 47d6482dd..18c94343b 100644 +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 93c794695..f9c4678fc 100644 +index 93c794695c46..f9c4678fcd73 100644 --- a/drivers/clk/rockchip/clk-rk3288.c +++ b/drivers/clk/rockchip/clk-rk3288.c @@ -6,11 +6,14 @@ @@ -110632,7 +110632,7 @@ index 93c794695..f9c4678fc 100644 +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 5bf15f2a4..6a8e38f11 100644 +index 5bf15f2a44b7..6a8e38f11808 100644 --- a/drivers/clk/rockchip/clk-rk3308.c +++ b/drivers/clk/rockchip/clk-rk3308.c @@ -8,6 +8,9 @@ @@ -110929,7 +110929,7 @@ index 5bf15f2a4..6a8e38f11 100644 +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 2429b7c2a..8ec63aaae 100644 +index 2429b7c2a8b3..8ec63aaae4f7 100644 --- a/drivers/clk/rockchip/clk-rk3328.c +++ b/drivers/clk/rockchip/clk-rk3328.c @@ -6,8 +6,10 @@ @@ -111388,7 +111388,7 @@ index 2429b7c2a..8ec63aaae 100644 +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 554433494..c56ea321e 100644 +index 55443349439b..c56ea321e904 100644 --- a/drivers/clk/rockchip/clk-rk3368.c +++ b/drivers/clk/rockchip/clk-rk3368.c @@ -5,8 +5,10 @@ @@ -111746,7 +111746,7 @@ index 554433494..c56ea321e 100644 +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 a9cacbcc1..6c4e0d248 100644 +index a9cacbcc1c2a..6c4e0d248272 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[] = { @@ -112996,7 +112996,7 @@ index a9cacbcc1..6c4e0d248 100644 +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rk3528.c b/drivers/clk/rockchip/clk-rk3528.c new file mode 100644 -index 000000000..1b14cd57b +index 000000000000..1b14cd57be0a --- /dev/null +++ b/drivers/clk/rockchip/clk-rk3528.c @@ -0,0 +1,1174 @@ @@ -114176,7 +114176,7 @@ index 000000000..1b14cd57b + diff --git a/drivers/clk/rockchip/clk-rk3562.c b/drivers/clk/rockchip/clk-rk3562.c new file mode 100644 -index 000000000..3c6f78fec +index 000000000000..3c6f78fecfa0 --- /dev/null +++ b/drivers/clk/rockchip/clk-rk3562.c @@ -0,0 +1,1134 @@ @@ -115316,7 +115316,7 @@ index 000000000..3c6f78fec +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rk3568.c b/drivers/clk/rockchip/clk-rk3568.c new file mode 100755 -index 000000000..0f5ed13a4 +index 000000000000..0f5ed13a4c9f --- /dev/null +++ b/drivers/clk/rockchip/clk-rk3568.c @@ -0,0 +1,1769 @@ @@ -117091,7 +117091,7 @@ index 000000000..0f5ed13a4 +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rk3588.c b/drivers/clk/rockchip/clk-rk3588.c new file mode 100644 -index 000000000..adcc1682e +index 000000000000..adcc1682eab4 --- /dev/null +++ b/drivers/clk/rockchip/clk-rk3588.c @@ -0,0 +1,2532 @@ @@ -119629,7 +119629,7 @@ index 000000000..adcc1682e +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rv1106.c b/drivers/clk/rockchip/clk-rv1106.c new file mode 100644 -index 000000000..0833bf2ad +index 000000000000..0833bf2adb8b --- /dev/null +++ b/drivers/clk/rockchip/clk-rv1106.c @@ -0,0 +1,1280 @@ @@ -120914,7 +120914,7 @@ index 000000000..0833bf2ad +MODULE_LICENSE("GPL"); +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rv1108.c b/drivers/clk/rockchip/clk-rv1108.c -index 5947d3192..0a93b9333 100644 +index 5947d3192866..0a93b93338ba 100644 --- a/drivers/clk/rockchip/clk-rv1108.c +++ b/drivers/clk/rockchip/clk-rv1108.c @@ -7,8 +7,10 @@ @@ -121162,7 +121162,7 @@ index 5947d3192..0a93b9333 100644 +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rv1126.c b/drivers/clk/rockchip/clk-rv1126.c new file mode 100755 -index 000000000..d3fc9380c +index 000000000000..d3fc9380c359 --- /dev/null +++ b/drivers/clk/rockchip/clk-rv1126.c @@ -0,0 +1,1568 @@ @@ -122735,7 +122735,7 @@ index 000000000..d3fc9380c +MODULE_DESCRIPTION("Rockchip RV1126 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c -index b443169dd..ab6f1d865 100644 +index b443169dd408..ab6f1d865eea 100644 --- a/drivers/clk/rockchip/clk.c +++ b/drivers/clk/rockchip/clk.c @@ -24,6 +24,10 @@ @@ -123149,7 +123149,7 @@ index b443169dd..ab6f1d865 100644 +EXPORT_SYMBOL_GPL(rockchip_clk_disable_unused); +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h -index 2271a8412..3d2b8d96a 100644 +index 2271a84124b0..3d2b8d96aefb 100644 --- a/drivers/clk/rockchip/clk.h +++ b/drivers/clk/rockchip/clk.h @@ -37,12 +37,25 @@ struct clk; @@ -123875,7 +123875,7 @@ index 2271a8412..3d2b8d96a 100644 #endif diff --git a/drivers/clk/rockchip/regmap/Kconfig b/drivers/clk/rockchip/regmap/Kconfig new file mode 100755 -index 000000000..65f691bc4 +index 000000000000..65f691bc4141 --- /dev/null +++ b/drivers/clk/rockchip/regmap/Kconfig @@ -0,0 +1,16 @@ @@ -123897,7 +123897,7 @@ index 000000000..65f691bc4 + select COMMON_CLK_ROCKCHIP_REGMAP diff --git a/drivers/clk/rockchip/regmap/Makefile b/drivers/clk/rockchip/regmap/Makefile new file mode 100755 -index 000000000..18d075d09 +index 000000000000..18d075d093d9 --- /dev/null +++ b/drivers/clk/rockchip/regmap/Makefile @@ -0,0 +1,13 @@ @@ -123916,7 +123916,7 @@ index 000000000..18d075d09 +obj-$(CONFIG_CLK_RK628) += clk-rk628.o diff --git a/drivers/clk/rockchip/regmap/clk-regmap-composite.c b/drivers/clk/rockchip/regmap/clk-regmap-composite.c new file mode 100755 -index 000000000..43d2b9a45 +index 000000000000..43d2b9a45aca --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-composite.c @@ -0,0 +1,400 @@ @@ -124322,7 +124322,7 @@ index 000000000..43d2b9a45 +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_composite); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-divider.c b/drivers/clk/rockchip/regmap/clk-regmap-divider.c new file mode 100755 -index 000000000..d57f2c7f8 +index 000000000000..d57f2c7f8350 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-divider.c @@ -0,0 +1,117 @@ @@ -124445,7 +124445,7 @@ index 000000000..d57f2c7f8 +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_divider); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c b/drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c new file mode 100755 -index 000000000..1acbc16e7 +index 000000000000..1acbc16e7aae --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c @@ -0,0 +1,167 @@ @@ -124618,7 +124618,7 @@ index 000000000..1acbc16e7 +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_fractional_divider); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-gate.c b/drivers/clk/rockchip/regmap/clk-regmap-gate.c new file mode 100755 -index 000000000..36549b912 +index 000000000000..36549b912fa2 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-gate.c @@ -0,0 +1,82 @@ @@ -124706,7 +124706,7 @@ index 000000000..36549b912 +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_gate); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-mux.c b/drivers/clk/rockchip/regmap/clk-regmap-mux.c new file mode 100755 -index 000000000..eb37b5f95 +index 000000000000..eb37b5f9503c --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-mux.c @@ -0,0 +1,81 @@ @@ -124793,7 +124793,7 @@ index 000000000..eb37b5f95 +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-pll.c b/drivers/clk/rockchip/regmap/clk-regmap-pll.c new file mode 100755 -index 000000000..24ad7eda9 +index 000000000000..24ad7eda9d94 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-pll.c @@ -0,0 +1,363 @@ @@ -125162,7 +125162,7 @@ index 000000000..24ad7eda9 +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_pll); diff --git a/drivers/clk/rockchip/regmap/clk-regmap.h b/drivers/clk/rockchip/regmap/clk-regmap.h new file mode 100755 -index 000000000..4626e1982 +index 000000000000..4626e1982beb --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap.h @@ -0,0 +1,308 @@ @@ -125476,7 +125476,7 @@ index 000000000..4626e1982 +#endif diff --git a/drivers/clk/rockchip/regmap/clk-rk618.c b/drivers/clk/rockchip/regmap/clk-rk618.c new file mode 100755 -index 000000000..c780f502b +index 000000000000..c780f502b354 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-rk618.c @@ -0,0 +1,408 @@ @@ -125890,7 +125890,7 @@ index 000000000..c780f502b +MODULE_LICENSE("GPL v2"); diff --git a/drivers/clk/rockchip/regmap/clk-rk628.c b/drivers/clk/rockchip/regmap/clk-rk628.c new file mode 100755 -index 000000000..7f501db66 +index 000000000000..7f501db660e0 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-rk628.c @@ -0,0 +1,609 @@ @@ -126504,7 +126504,7 @@ index 000000000..7f501db66 +MODULE_DESCRIPTION("Rockchip RK628 CRU driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig -index a0c6e88be..9d9cb5757 100644 +index a0c6e88bebe0..9d9cb5757913 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -85,7 +85,9 @@ config IXP4XX_TIMER @@ -126519,7 +126519,7 @@ index a0c6e88be..9d9cb5757 100644 select TIMER_OF select CLKSRC_MMIO diff --git a/drivers/clocksource/timer-rockchip.c b/drivers/clocksource/timer-rockchip.c -index 1f95d0aca..2f4e970d7 100644 +index 1f95d0aca08f..2f4e970d7433 100644 --- a/drivers/clocksource/timer-rockchip.c +++ b/drivers/clocksource/timer-rockchip.c @@ -8,11 +8,13 @@ @@ -126613,7 +126613,7 @@ index 1f95d0aca..2f4e970d7 100644 +MODULE_LICENSE("GPL"); +#endif diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm -index 1f73fa75b..0faef5fc6 100644 +index 1f73fa75b1a0..0faef5fc6df3 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -158,6 +158,16 @@ config ARM_RASPBERRYPI_CPUFREQ @@ -126634,7 +126634,7 @@ index 1f73fa75b..0faef5fc6 100644 bool help diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile -index f1b7e3dd6..2e0e827af 100644 +index f1b7e3dd6e5d..2e0e827afd21 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -64,6 +64,7 @@ obj-$(CONFIG_PXA3xx) += pxa3xx-cpufreq.o @@ -126646,7 +126646,7 @@ index f1b7e3dd6..2e0e827af 100644 obj-$(CONFIG_ARM_S3C2412_CPUFREQ) += s3c2412-cpufreq.o obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c -index aea285651..1840409d5 100644 +index aea285651fba..1840409d520d 100644 --- a/drivers/cpufreq/cpufreq-dt-platdev.c +++ b/drivers/cpufreq/cpufreq-dt-platdev.c @@ -66,21 +66,6 @@ static const struct of_device_id whitelist[] __initconst = { @@ -126701,7 +126701,7 @@ index aea285651..1840409d5 100644 { .compatible = "st,stih407", }, { .compatible = "st,stih410", }, diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c -index e363ae04a..f1327e7fe 100644 +index e363ae04aac6..f1327e7fe361 100644 --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c @@ -23,6 +23,9 @@ @@ -126991,7 +126991,7 @@ index e363ae04a..f1327e7fe 100644 list_del(&priv->node); } diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c -index 583423909..ae35ef771 100644 +index 58342390966b..ae35ef771900 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -688,8 +688,12 @@ static ssize_t show_##file_name \ @@ -127017,7 +127017,7 @@ index 583423909..ae35ef771 100644 /** * cpufreq_update_policy - Re-evaluate an existing cpufreq policy. diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c -index 50a4d7846..1f001d281 100644 +index 50a4d7846580..1f001d281718 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) @@ -127045,7 +127045,7 @@ index 50a4d7846..1f001d281 100644 diff --git a/drivers/cpufreq/rockchip-cpufreq.c b/drivers/cpufreq/rockchip-cpufreq.c new file mode 100755 -index 000000000..27c6d92ed +index 000000000000..27c6d92edfb7 --- /dev/null +++ b/drivers/cpufreq/rockchip-cpufreq.c @@ -0,0 +1,1025 @@ @@ -128076,7 +128076,7 @@ index 000000000..27c6d92ed +MODULE_LICENSE("GPL v2"); diff --git a/drivers/cpufreq/rockchip-cpufreq.h b/drivers/cpufreq/rockchip-cpufreq.h new file mode 100755 -index 000000000..3b3dbcf73 +index 000000000000..3b3dbcf73449 --- /dev/null +++ b/drivers/cpufreq/rockchip-cpufreq.h @@ -0,0 +1,24 @@ @@ -128105,7 +128105,7 @@ index 000000000..3b3dbcf73 + +#endif diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c -index 4070e573b..557f59ac4 100644 +index 4070e573bf43..557f59ac47a3 100644 --- a/drivers/cpuidle/driver.c +++ b/drivers/cpuidle/driver.c @@ -381,3 +381,4 @@ void cpuidle_driver_state_disabled(struct cpuidle_driver *drv, int idx, @@ -128114,7 +128114,7 @@ index 4070e573b..557f59ac4 100644 } +EXPORT_SYMBOL_GPL(cpuidle_driver_state_disabled); diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c -index 29acaf48e..0e51ed256 100644 +index 29acaf48e575..0e51ed25665e 100644 --- a/drivers/cpuidle/governor.c +++ b/drivers/cpuidle/governor.c @@ -102,6 +102,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov) @@ -128131,7 +128131,7 @@ index 29acaf48e..0e51ed256 100644 } +EXPORT_SYMBOL_GPL(cpuidle_governor_latency_req); diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig -index 37dc40d1f..ab9c00a1b 100644 +index 37dc40d1fcfb..ab9c00a1b1c3 100644 --- a/drivers/devfreq/Kconfig +++ b/drivers/devfreq/Kconfig @@ -131,15 +131,20 @@ config ARM_TEGRA20_DEVFREQ @@ -128160,7 +128160,7 @@ index 37dc40d1f..ab9c00a1b 100644 from hardware. diff --git a/drivers/devfreq/Makefile b/drivers/devfreq/Makefile -index 3ca1ad0ec..abea7adbc 100644 +index 3ca1ad0ecb97..abea7adbc7da 100644 --- a/drivers/devfreq/Makefile +++ b/drivers/devfreq/Makefile @@ -11,7 +11,8 @@ obj-$(CONFIG_DEVFREQ_GOV_PASSIVE) += governor_passive.o @@ -128174,7 +128174,7 @@ index 3ca1ad0ec..abea7adbc 100644 obj-$(CONFIG_ARM_TEGRA20_DEVFREQ) += tegra20-devfreq.o diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c -index c6f460550..db0fe99c8 100644 +index c6f460550f5e..db0fe99c8d61 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -1761,6 +1761,40 @@ static ssize_t timer_store(struct device *dev, struct device_attribute *attr, @@ -128227,7 +128227,7 @@ index c6f460550..db0fe99c8 100644 }; ATTRIBUTE_GROUPS(devfreq); diff --git a/drivers/devfreq/event/Kconfig b/drivers/devfreq/event/Kconfig -index 878825372..4526c69c6 100644 +index 878825372f6f..4526c69c602e 100644 --- a/drivers/devfreq/event/Kconfig +++ b/drivers/devfreq/event/Kconfig @@ -39,4 +39,11 @@ config DEVFREQ_EVENT_ROCKCHIP_DFI @@ -128243,7 +128243,7 @@ index 878825372..4526c69c6 100644 + endif # PM_DEVFREQ_EVENT diff --git a/drivers/devfreq/event/Makefile b/drivers/devfreq/event/Makefile -index 3c847e5d5..03d67f06c 100644 +index 3c847e5d5a35..03d67f06c22e 100644 --- a/drivers/devfreq/event/Makefile +++ b/drivers/devfreq/event/Makefile @@ -4,3 +4,4 @@ @@ -128252,7 +128252,7 @@ index 3c847e5d5..03d67f06c 100644 obj-$(CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI) += rockchip-dfi.o +obj-$(CONFIG_DEVFREQ_EVENT_ROCKCHIP_NOCP) += rockchip-nocp.o diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c -index 9a88faaf8..9fd6a82f7 100644 +index 9a88faaf8b27..9fd6a82f79d6 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -20,23 +20,70 @@ @@ -128918,7 +128918,7 @@ index 9a88faaf8..9fd6a82f7 100644 diff --git a/drivers/devfreq/event/rockchip-nocp.c b/drivers/devfreq/event/rockchip-nocp.c new file mode 100755 -index 000000000..957b84ee3 +index 000000000000..957b84ee3290 --- /dev/null +++ b/drivers/devfreq/event/rockchip-nocp.c @@ -0,0 +1,166 @@ @@ -129090,7 +129090,7 @@ index 000000000..957b84ee3 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c deleted file mode 100644 -index 7e52375d9..000000000 +index 7e52375d9818..000000000000 --- a/drivers/devfreq/rk3399_dmc.c +++ /dev/null @@ -1,518 +0,0 @@ @@ -129614,7 +129614,7 @@ index 7e52375d9..000000000 -MODULE_DESCRIPTION("RK3399 dmcfreq driver with devfreq framework"); diff --git a/drivers/devfreq/rockchip_bus.c b/drivers/devfreq/rockchip_bus.c new file mode 100755 -index 000000000..7032b4815 +index 000000000000..7032b4815c5a --- /dev/null +++ b/drivers/devfreq/rockchip_bus.c @@ -0,0 +1,500 @@ @@ -130120,7 +130120,7 @@ index 000000000..7032b4815 +MODULE_DESCRIPTION("rockchip busfreq driver with devfreq framework"); diff --git a/drivers/devfreq/rockchip_dmc.c b/drivers/devfreq/rockchip_dmc.c new file mode 100755 -index 000000000..e3d39bd8c +index 000000000000..e3d39bd8cea0 --- /dev/null +++ b/drivers/devfreq/rockchip_dmc.c @@ -0,0 +1,3558 @@ @@ -133684,7 +133684,7 @@ index 000000000..e3d39bd8c +MODULE_LICENSE("GPL v2"); diff --git a/drivers/devfreq/rockchip_dmc_common.c b/drivers/devfreq/rockchip_dmc_common.c new file mode 100755 -index 000000000..cacc7d02f +index 000000000000..cacc7d02f6fc --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_common.c @@ -0,0 +1,168 @@ @@ -133858,7 +133858,7 @@ index 000000000..cacc7d02f +MODULE_LICENSE("GPL v2"); diff --git a/drivers/devfreq/rockchip_dmc_dbg.c b/drivers/devfreq/rockchip_dmc_dbg.c new file mode 100755 -index 000000000..80b25e904 +index 000000000000..80b25e9046d1 --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_dbg.c @@ -0,0 +1,1061 @@ @@ -134925,7 +134925,7 @@ index 000000000..80b25e904 +MODULE_DESCRIPTION("rockchip dmc debug driver with devfreq framework"); diff --git a/drivers/devfreq/rockchip_dmc_timing.h b/drivers/devfreq/rockchip_dmc_timing.h new file mode 100755 -index 000000000..8f2e2c02b +index 000000000000..8f2e2c02bb90 --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_timing.h @@ -0,0 +1,1307 @@ @@ -136237,7 +136237,7 @@ index 000000000..8f2e2c02b +#endif /* __ROCKCHIP_DMC_TIMING_H__ */ + diff --git a/drivers/dma-buf/Kconfig b/drivers/dma-buf/Kconfig -index 594b77d89..c5de02400 100644 +index 594b77d8923c..c5de024009a9 100644 --- a/drivers/dma-buf/Kconfig +++ b/drivers/dma-buf/Kconfig @@ -21,7 +21,6 @@ config SW_SYNC @@ -136249,7 +136249,7 @@ index 594b77d89..c5de02400 100644 A sync object driver that uses a 32bit counter to coordinate synchronization. Useful when there is no hardware primitive backing diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c -index 89c10136b..3ef878608 100644 +index 89c10136b26f..3ef87860877a 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -32,8 +32,6 @@ @@ -136456,7 +136456,7 @@ index 89c10136b..3ef878608 100644 static int dma_buf_debug_show(struct seq_file *s, void *unused) { diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c -index 7475e09b0..d64fc0392 100644 +index 7475e09b0680..d64fc03929be 100644 --- a/drivers/dma-buf/dma-fence.c +++ b/drivers/dma-buf/dma-fence.c @@ -312,22 +312,25 @@ void __dma_fence_might_wait(void) @@ -136569,7 +136569,7 @@ index 7475e09b0..d64fc0392 100644 dma_fence_end_signalling(tmp); diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c -index bbbfa28b2..6c2299561 100644 +index bbbfa28b2f6c..873f789df20c 100644 --- a/drivers/dma-buf/dma-heap.c +++ b/drivers/dma-buf/dma-heap.c @@ -31,6 +31,7 @@ @@ -136896,7 +136896,7 @@ index bbbfa28b2..6c2299561 100644 } subsys_initcall(dma_heap_init); diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig -index a5eef06c4..ff52efa83 100644 +index a5eef06c4226..ff52efa83f39 100644 --- a/drivers/dma-buf/heaps/Kconfig +++ b/drivers/dma-buf/heaps/Kconfig @@ -1,12 +1,22 @@ @@ -136926,7 +136926,7 @@ index a5eef06c4..ff52efa83 100644 help Choose this option to enable dma-buf CMA heap. This heap is backed diff --git a/drivers/dma-buf/heaps/Makefile b/drivers/dma-buf/heaps/Makefile -index 6e54cdec3..4d4cd94a3 100644 +index 6e54cdec3da0..4d4cd94a3a4a 100644 --- a/drivers/dma-buf/heaps/Makefile +++ b/drivers/dma-buf/heaps/Makefile @@ -1,4 +1,5 @@ @@ -136937,7 +136937,7 @@ index 6e54cdec3..4d4cd94a3 100644 obj-$(CONFIG_DMABUF_HEAPS_SYSTEM) += system_heap.o obj-$(CONFIG_DMABUF_HEAPS_CMA) += cma_heap.o diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c -index e55384dc1..4931578df 100644 +index e55384dc115b..4931578df815 100644 --- a/drivers/dma-buf/heaps/cma_heap.c +++ b/drivers/dma-buf/heaps/cma_heap.c @@ -2,76 +2,304 @@ @@ -137352,7 +137352,7 @@ index e55384dc1..4931578df 100644 static const struct dma_heap_ops cma_heap_ops = { diff --git a/drivers/dma-buf/heaps/deferred-free-helper.c b/drivers/dma-buf/heaps/deferred-free-helper.c new file mode 100755 -index 000000000..e19c8b68d +index 000000000000..e19c8b68dfeb --- /dev/null +++ b/drivers/dma-buf/heaps/deferred-free-helper.c @@ -0,0 +1,138 @@ @@ -137496,7 +137496,7 @@ index 000000000..e19c8b68d + diff --git a/drivers/dma-buf/heaps/deferred-free-helper.h b/drivers/dma-buf/heaps/deferred-free-helper.h new file mode 100755 -index 000000000..11940328c +index 000000000000..11940328ce3f --- /dev/null +++ b/drivers/dma-buf/heaps/deferred-free-helper.h @@ -0,0 +1,55 @@ @@ -137557,7 +137557,7 @@ index 000000000..11940328c +#endif diff --git a/drivers/dma-buf/heaps/heap-helpers.c b/drivers/dma-buf/heaps/heap-helpers.c deleted file mode 100644 -index 35aa65bbf..000000000 +index 35aa65bbf0a7..000000000000 --- a/drivers/dma-buf/heaps/heap-helpers.c +++ /dev/null @@ -1,271 +0,0 @@ @@ -137834,7 +137834,7 @@ index 35aa65bbf..000000000 -}; diff --git a/drivers/dma-buf/heaps/heap-helpers.h b/drivers/dma-buf/heaps/heap-helpers.h deleted file mode 100644 -index 805d2df88..000000000 +index 805d2df88024..000000000000 --- a/drivers/dma-buf/heaps/heap-helpers.h +++ /dev/null @@ -1,53 +0,0 @@ @@ -137893,7 +137893,7 @@ index 805d2df88..000000000 -#endif /* _HEAP_HELPERS_H */ diff --git a/drivers/dma-buf/heaps/page_pool.c b/drivers/dma-buf/heaps/page_pool.c new file mode 100755 -index 000000000..7c34a1ba4 +index 000000000000..7c34a1ba48bb --- /dev/null +++ b/drivers/dma-buf/heaps/page_pool.c @@ -0,0 +1,247 @@ @@ -138146,7 +138146,7 @@ index 000000000..7c34a1ba4 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/heaps/page_pool.h b/drivers/dma-buf/heaps/page_pool.h new file mode 100755 -index 000000000..6b083b04f +index 000000000000..6b083b04f195 --- /dev/null +++ b/drivers/dma-buf/heaps/page_pool.h @@ -0,0 +1,55 @@ @@ -138206,7 +138206,7 @@ index 000000000..6b083b04f + +#endif /* _DMABUF_PAGE_POOL_H */ diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c -index 0bf688e3c..15796bc4c 100644 +index 0bf688e3c023..15796bc4c033 100644 --- a/drivers/dma-buf/heaps/system_heap.c +++ b/drivers/dma-buf/heaps/system_heap.c @@ -3,7 +3,11 @@ @@ -138847,7 +138847,7 @@ index 0bf688e3c..15796bc4c 100644 module_init(system_heap_create); MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/sw_sync.c b/drivers/dma-buf/sw_sync.c -index 348b3a917..3daa6c76b 100644 +index 348b3a9170fa..3daa6c76b8dd 100644 --- a/drivers/dma-buf/sw_sync.c +++ b/drivers/dma-buf/sw_sync.c @@ -7,6 +7,8 @@ @@ -138874,7 +138874,7 @@ index 348b3a917..3daa6c76b 100644 + +MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/sync_debug.c b/drivers/dma-buf/sync_debug.c -index 101394f16..a2f906741 100644 +index 101394f16930..a2f906741ce0 100644 --- a/drivers/dma-buf/sync_debug.c +++ b/drivers/dma-buf/sync_debug.c @@ -8,6 +8,7 @@ @@ -138891,7 +138891,7 @@ index 101394f16..a2f906741 100644 late_initcall(sync_debugfs_init); +#endif diff --git a/drivers/dma-buf/sync_debug.h b/drivers/dma-buf/sync_debug.h -index 6176e52ba..ee84997da 100644 +index 6176e52ba2d7..ee84997da6b4 100644 --- a/drivers/dma-buf/sync_debug.h +++ b/drivers/dma-buf/sync_debug.h @@ -62,11 +62,18 @@ struct sync_pt { @@ -138914,7 +138914,7 @@ index 6176e52ba..ee84997da 100644 #endif /* _LINUX_SYNC_H */ diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig -index c08968c5d..d9dbfda3c 100644 +index c08968c5ddf8..d9dbfda3c5f2 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -9,7 +9,7 @@ menu "Firmware Drivers" @@ -138941,7 +138941,7 @@ index c08968c5d..d9dbfda3c 100644 tristate "TI System Control Interface (TISCI) Message Protocol" depends on TI_MESSAGE_MANAGER diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile -index 5e013b6a3..850970fba 100644 +index 5e013b6a3692..850970fbacbc 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o @@ -138954,7 +138954,7 @@ index 5e013b6a3..850970fba 100644 obj-$(CONFIG_TI_SCI_PROTOCOL) += ti_sci.o diff --git a/drivers/firmware/rockchip_sip.c b/drivers/firmware/rockchip_sip.c new file mode 100755 -index 000000000..e483899d7 +index 000000000000..e483899d79fe --- /dev/null +++ b/drivers/firmware/rockchip_sip.c @@ -0,0 +1,715 @@ @@ -139674,7 +139674,7 @@ index 000000000..e483899d7 +MODULE_DESCRIPTION("Rockchip SIP Call"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig -index 39f3e1366..940774657 100644 +index 39f3e1366409..940774657951 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -495,6 +495,14 @@ config GPIO_REG @@ -139693,7 +139693,7 @@ index 39f3e1366..940774657 100644 tristate "SAMA5D2 PIOBU GPIO support" depends on MFD_SYSCON diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile -index 09dada80a..ce6cafb6d 100644 +index 09dada80ac34..ce6cafb6d3de 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -125,6 +125,7 @@ obj-$(CONFIG_GPIO_RCAR) += gpio-rcar.o @@ -139706,7 +139706,7 @@ index 09dada80a..ce6cafb6d 100644 obj-$(CONFIG_GPIO_SCH311X) += gpio-sch311x.o diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c new file mode 100755 -index 000000000..1d1e9a64c +index 000000000000..1d1e9a64cceb --- /dev/null +++ b/drivers/gpio/gpio-rockchip.c @@ -0,0 +1,746 @@ @@ -140457,7 +140457,7 @@ index 000000000..1d1e9a64c +MODULE_LICENSE("GPL v2"); +MODULE_DEVICE_TABLE(of, rockchip_gpio_match); diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c -index 2e63274a4..ab666917b 100644 +index 2e63274a4c2c..ab666917b1ab 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -1046,3 +1046,14 @@ void of_gpiochip_remove(struct gpio_chip *chip) @@ -140476,7 +140476,7 @@ index 2e63274a4..ab666917b 100644 + gdev->dev.fwnode = of_fwnode_handle(gdev->dev.of_node); +} diff --git a/drivers/gpio/gpiolib-of.h b/drivers/gpio/gpiolib-of.h -index ed26664f1..8af2bc899 100644 +index ed26664f1537..8af2bc899aab 100644 --- a/drivers/gpio/gpiolib-of.h +++ b/drivers/gpio/gpiolib-of.h @@ -15,6 +15,7 @@ int of_gpiochip_add(struct gpio_chip *gc); @@ -140499,7 +140499,7 @@ index ed26664f1..8af2bc899 100644 extern struct notifier_block gpio_of_notifier; diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile -index 835c88318..b66e520eb 100644 +index 835c88318cec..b66e520ebbdd 100644 --- a/drivers/gpu/Makefile +++ b/drivers/gpu/Makefile @@ -3,6 +3,6 @@ @@ -140512,7 +140512,7 @@ index 835c88318..b66e520eb 100644 obj-$(CONFIG_TRACE_GPU_MEM) += trace/ diff --git a/drivers/gpu/arm/Kbuild b/drivers/gpu/arm/Kbuild new file mode 100755 -index 000000000..f747fc889 +index 000000000000..f747fc889b5b --- /dev/null +++ b/drivers/gpu/arm/Kbuild @@ -0,0 +1,25 @@ @@ -140543,7 +140543,7 @@ index 000000000..f747fc889 +obj-$(CONFIG_MALI_BIFROST) += bifrost/ diff --git a/drivers/gpu/arm/Kconfig b/drivers/gpu/arm/Kconfig new file mode 100755 -index 000000000..398a8e50a +index 000000000000..398a8e50a4cd --- /dev/null +++ b/drivers/gpu/arm/Kconfig @@ -0,0 +1,25 @@ @@ -140574,7 +140574,7 @@ index 000000000..398a8e50a +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 000000000..9cadda188 +index 000000000000..9cadda188fbc --- /dev/null +++ b/drivers/gpu/arm/bifrost/Kbuild @@ -0,0 +1,243 @@ @@ -140823,7 +140823,7 @@ index 000000000..9cadda188 +endif diff --git a/drivers/gpu/arm/bifrost/Kconfig b/drivers/gpu/arm/bifrost/Kconfig new file mode 100755 -index 000000000..ca3da57cf +index 000000000000..ca3da57cffd3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/Kconfig @@ -0,0 +1,389 @@ @@ -141218,7 +141218,7 @@ index 000000000..ca3da57cf +endif diff --git a/drivers/gpu/arm/bifrost/Makefile b/drivers/gpu/arm/bifrost/Makefile new file mode 100755 -index 000000000..39df298ff +index 000000000000..39df298ff01c --- /dev/null +++ b/drivers/gpu/arm/bifrost/Makefile @@ -0,0 +1,279 @@ @@ -141503,7 +141503,7 @@ index 000000000..39df298ff + $(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 000000000..2e6b11144 +index 000000000000..2e6b111441ca --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/Kbuild @@ -0,0 +1,23 @@ @@ -141532,7 +141532,7 @@ index 000000000..2e6b11144 + arbiter/mali_kbase_arbiter_pm.o diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.c b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.c new file mode 100755 -index 000000000..b5d3cd685 +index 000000000000..b5d3cd685ba5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.c @@ -0,0 +1,357 @@ @@ -141895,7 +141895,7 @@ index 000000000..b5d3cd685 +} diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.h b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.h new file mode 100755 -index 000000000..701ffd42f +index 000000000000..701ffd42f6f7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.h @@ -0,0 +1,121 @@ @@ -142022,7 +142022,7 @@ index 000000000..701ffd42f +#endif /* _MALI_KBASE_ARBIF_H_ */ diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_defs.h b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_defs.h new file mode 100755 -index 000000000..1c4901b3b +index 000000000000..1c4901b3b4d9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_defs.h @@ -0,0 +1,76 @@ @@ -142104,7 +142104,7 @@ index 000000000..1c4901b3b +#endif /* _MALI_KBASE_ARBITER_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c new file mode 100755 -index 000000000..667552c56 +index 000000000000..667552c561fb --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c @@ -0,0 +1,1138 @@ @@ -143248,7 +143248,7 @@ index 000000000..667552c56 +}; diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h new file mode 100755 -index 000000000..f863f8860 +index 000000000000..f863f88601e6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h @@ -0,0 +1,196 @@ @@ -143450,7 +143450,7 @@ index 000000000..f863f8860 +#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 000000000..efebc8a54 +index 000000000000..efebc8a544d1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/Kbuild @@ -0,0 +1,58 @@ @@ -143514,7 +143514,7 @@ index 000000000..efebc8a54 + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_backend_config.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_backend_config.h new file mode 100755 -index 000000000..6924fdb8a +index 000000000000..6924fdb8a608 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_backend_config.h @@ -0,0 +1,30 @@ @@ -143550,7 +143550,7 @@ index 000000000..6924fdb8a + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.c new file mode 100755 -index 000000000..7c0abbaf8 +index 000000000000..7c0abbaf860f --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.c @@ -0,0 +1,92 @@ @@ -143648,7 +143648,7 @@ index 000000000..7c0abbaf8 +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.h new file mode 100755 -index 000000000..758e3be08 +index 000000000000..758e3be08c16 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.h @@ -0,0 +1,65 @@ @@ -143719,7 +143719,7 @@ index 000000000..758e3be08 +#endif /* _KBASE_CACHE_POLICY_BACKEND_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.c new file mode 100755 -index 000000000..ddd03ca23 +index 000000000000..ddd03ca23de6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.c @@ -0,0 +1,326 @@ @@ -144051,7 +144051,7 @@ index 000000000..ddd03ca23 +KBASE_EXPORT_TEST_API(kbase_clk_rate_trace_manager_notify_all); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.h new file mode 100755 -index 000000000..35b3b8d06 +index 000000000000..35b3b8d06d96 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.h @@ -0,0 +1,154 @@ @@ -144211,7 +144211,7 @@ index 000000000..35b3b8d06 + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_debug_job_fault_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_debug_job_fault_backend.c new file mode 100755 -index 000000000..e121b417f +index 000000000000..e121b417f80d --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_debug_job_fault_backend.c @@ -0,0 +1,163 @@ @@ -144380,7 +144380,7 @@ index 000000000..e121b417f +#endif diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c new file mode 100755 -index 000000000..02fb00da3 +index 000000000000..02fb00da365c --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c @@ -0,0 +1,895 @@ @@ -145281,7 +145281,7 @@ index 000000000..02fb00da3 +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.h new file mode 100755 -index 000000000..123c58cb0 +index 000000000000..123c58cb030f --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.h @@ -0,0 +1,63 @@ @@ -145350,7 +145350,7 @@ index 000000000..123c58cb0 +#endif /* _BASE_DEVFREQ_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_gpuprops_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_gpuprops_backend.c new file mode 100755 -index 000000000..10e92ec94 +index 000000000000..10e92ec94d3a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_gpuprops_backend.c @@ -0,0 +1,200 @@ @@ -145556,7 +145556,7 @@ index 000000000..10e92ec94 +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_backend.c new file mode 100755 -index 000000000..53578ded5 +index 000000000000..53578ded58b9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_backend.c @@ -0,0 +1,481 @@ @@ -146043,7 +146043,7 @@ index 000000000..53578ded5 +#endif diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_defs.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_defs.h new file mode 100755 -index 000000000..bd2eb8a12 +index 000000000000..bd2eb8a12047 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_defs.h @@ -0,0 +1,60 @@ @@ -146109,7 +146109,7 @@ index 000000000..bd2eb8a12 +#endif /* _KBASE_INSTR_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_internal.h new file mode 100755 -index 000000000..332cc6944 +index 000000000000..332cc6944d94 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_internal.h @@ -0,0 +1,41 @@ @@ -146156,7 +146156,7 @@ index 000000000..332cc6944 +#endif /* _KBASE_INSTR_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_internal.h new file mode 100755 -index 000000000..66cda8c0b +index 000000000000..66cda8c0b647 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_internal.h @@ -0,0 +1,47 @@ @@ -146209,7 +146209,7 @@ index 000000000..66cda8c0b +#endif /* _KBASE_IRQ_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_linux.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_linux.c new file mode 100755 -index 000000000..eb63b2c56 +index 000000000000..eb63b2c56c3d --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_linux.c @@ -0,0 +1,503 @@ @@ -146718,7 +146718,7 @@ index 000000000..eb63b2c56 +#endif /* IS_ENABLED(CONFIG_MALI_REAL_HW) */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_as.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_as.c new file mode 100755 -index 000000000..258dc6dac +index 000000000000..258dc6dac6c5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_as.c @@ -0,0 +1,241 @@ @@ -146965,7 +146965,7 @@ index 000000000..258dc6dac +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_defs.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_defs.h new file mode 100755 -index 000000000..136aa526d +index 000000000000..136aa526d41e --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_defs.h @@ -0,0 +1,135 @@ @@ -147106,7 +147106,7 @@ index 000000000..136aa526d +#endif /* _KBASE_HWACCESS_GPU_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_hw.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_hw.c new file mode 100755 -index 000000000..c7257117e +index 000000000000..c7257117e98a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_hw.c @@ -0,0 +1,1513 @@ @@ -148625,7 +148625,7 @@ index 000000000..c7257117e +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_internal.h new file mode 100755 -index 000000000..bfd55a6e2 +index 000000000000..bfd55a6e2160 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_internal.h @@ -0,0 +1,148 @@ @@ -148779,7 +148779,7 @@ index 000000000..bfd55a6e2 +#endif /* _KBASE_JM_HWACCESS_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.c new file mode 100755 -index 000000000..7db2b353b +index 000000000000..7db2b353b67a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.c @@ -0,0 +1,1873 @@ @@ -150658,7 +150658,7 @@ index 000000000..7db2b353b +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.h new file mode 100755 -index 000000000..32be0bf44 +index 000000000000..32be0bf44655 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.h @@ -0,0 +1,77 @@ @@ -150741,7 +150741,7 @@ index 000000000..32be0bf44 +#endif /* _KBASE_HWACCESS_GPU_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_backend.c new file mode 100755 -index 000000000..cbc88f91a +index 000000000000..cbc88f91a400 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_backend.c @@ -0,0 +1,377 @@ @@ -151124,7 +151124,7 @@ index 000000000..cbc88f91a +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_internal.h new file mode 100755 -index 000000000..4f7c371a1 +index 000000000000..4f7c371a1f1a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_internal.h @@ -0,0 +1,72 @@ @@ -151202,7 +151202,7 @@ index 000000000..4f7c371a1 +#endif /* _KBASE_JS_BACKEND_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.c new file mode 100755 -index 000000000..9ce50758c +index 000000000000..9ce50758c240 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.c @@ -0,0 +1,131 @@ @@ -151339,7 +151339,7 @@ index 000000000..9ce50758c +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.h new file mode 100755 -index 000000000..07014ad36 +index 000000000000..07014ad360d8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.h @@ -0,0 +1,36 @@ @@ -151381,7 +151381,7 @@ index 000000000..07014ad36 +#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 000000000..6db703176 +index 000000000000..6db7031764ea --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.c @@ -0,0 +1,2229 @@ @@ -153616,7 +153616,7 @@ index 000000000..6db703176 +} 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 000000000..84842291c +index 000000000000..84842291c0f7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.h @@ -0,0 +1,224 @@ @@ -153846,7 +153846,7 @@ index 000000000..84842291c +#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 000000000..f310cc74c +index 000000000000..f310cc74cb24 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_error_generator.c @@ -0,0 +1,183 @@ @@ -154035,7 +154035,7 @@ index 000000000..f310cc74c +} 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 000000000..e90e4df2f +index 000000000000..e90e4df2f494 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.c @@ -0,0 +1,244 @@ @@ -154285,7 +154285,7 @@ index 000000000..e90e4df2f +} 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 000000000..8f09afe3d +index 000000000000..8f09afe3d1cc --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.h @@ -0,0 +1,151 @@ @@ -154442,7 +154442,7 @@ index 000000000..8f09afe3d +#endif /* _KBASE_MODEL_LINUX_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c new file mode 100755 -index 000000000..bbf629065 +index 000000000000..bbf629065877 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c @@ -0,0 +1,73 @@ @@ -154521,7 +154521,7 @@ index 000000000..bbf629065 +KBASE_EXPORT_TEST_API(kbase_pm_always_on_policy_ops); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.h new file mode 100755 -index 000000000..98d35dabe +index 000000000000..98d35dabec88 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.h @@ -0,0 +1,78 @@ @@ -154605,7 +154605,7 @@ index 000000000..98d35dabe + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_backend.c new file mode 100755 -index 000000000..5c71fdf15 +index 000000000000..5c71fdf154b9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_backend.c @@ -0,0 +1,1238 @@ @@ -155849,7 +155849,7 @@ index 000000000..5c71fdf15 +#endif diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.c new file mode 100755 -index 000000000..e2b0a9192 +index 000000000000..e2b0a919282e --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.c @@ -0,0 +1,150 @@ @@ -156005,7 +156005,7 @@ index 000000000..e2b0a9192 +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.h new file mode 100755 -index 000000000..90dcaf5b6 +index 000000000000..90dcaf5b67db --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.h @@ -0,0 +1,88 @@ @@ -156099,7 +156099,7 @@ index 000000000..90dcaf5b6 +#endif /* _KBASE_PM_CA_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca_devfreq.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca_devfreq.h new file mode 100755 -index 000000000..d1e4b5327 +index 000000000000..d1e4b5327f8f --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca_devfreq.h @@ -0,0 +1,59 @@ @@ -156164,7 +156164,7 @@ index 000000000..d1e4b5327 + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.c new file mode 100755 -index 000000000..f40b75385 +index 000000000000..f40b753850df --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.c @@ -0,0 +1,67 @@ @@ -156237,7 +156237,7 @@ index 000000000..f40b75385 +KBASE_EXPORT_TEST_API(kbase_pm_coarse_demand_policy_ops); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.h new file mode 100755 -index 000000000..a947e8f55 +index 000000000000..a947e8f55643 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.h @@ -0,0 +1,64 @@ @@ -156307,7 +156307,7 @@ index 000000000..a947e8f55 +#endif /* MALI_KBASE_PM_COARSE_DEMAND_H */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_defs.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_defs.h new file mode 100755 -index 000000000..75d99a30e +index 000000000000..75d99a30efc0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_defs.h @@ -0,0 +1,649 @@ @@ -156962,7 +156962,7 @@ index 000000000..75d99a30e +#endif /* _KBASE_PM_HWACCESS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_driver.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_driver.c new file mode 100755 -index 000000000..5be8acd75 +index 000000000000..5be8acd75d0a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_driver.c @@ -0,0 +1,3417 @@ @@ -160385,7 +160385,7 @@ index 000000000..5be8acd75 +KBASE_EXPORT_TEST_API(kbase_pm_release_gpu_cycle_counter); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_internal.h new file mode 100755 -index 000000000..e66ce57d3 +index 000000000000..e66ce57d3120 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_internal.h @@ -0,0 +1,1021 @@ @@ -161412,7 +161412,7 @@ index 000000000..e66ce57d3 +#endif /* _KBASE_BACKEND_PM_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_l2_states.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_l2_states.h new file mode 100755 -index 000000000..ef72f6083 +index 000000000000..ef72f6083afd --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_l2_states.h @@ -0,0 +1,50 @@ @@ -161468,7 +161468,7 @@ index 000000000..ef72f6083 +KBASEP_L2_STATE(RESET_WAIT) diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_mcu_states.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_mcu_states.h new file mode 100755 -index 000000000..3b448e397 +index 000000000000..3b448e397e72 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_mcu_states.h @@ -0,0 +1,108 @@ @@ -161582,7 +161582,7 @@ index 000000000..3b448e397 +#endif /* IS_ENABLED(CONFIG_MALI_CORESIGHT) */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_metrics.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_metrics.c new file mode 100755 -index 000000000..865f526f6 +index 000000000000..865f526f61f2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_metrics.c @@ -0,0 +1,529 @@ @@ -162117,7 +162117,7 @@ index 000000000..865f526f6 +#endif /* !MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.c new file mode 100755 -index 000000000..4788f0413 +index 000000000000..4788f04132c1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.c @@ -0,0 +1,426 @@ @@ -162549,7 +162549,7 @@ index 000000000..4788f0413 +KBASE_EXPORT_TEST_API(kbase_pm_set_policy); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.h new file mode 100755 -index 000000000..e8113659b +index 000000000000..e8113659b92e --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.h @@ -0,0 +1,105 @@ @@ -162660,7 +162660,7 @@ index 000000000..e8113659b +#endif /* _KBASE_PM_POLICY_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_shader_states.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_shader_states.h new file mode 100755 -index 000000000..8622ef78d +index 000000000000..8622ef78d363 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_shader_states.h @@ -0,0 +1,79 @@ @@ -162745,7 +162745,7 @@ index 000000000..8622ef78d +KBASEP_SHADER_STATE(RESET_WAIT) diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_time.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_time.c new file mode 100755 -index 000000000..1b3346179 +index 000000000000..1b33461796e2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_time.c @@ -0,0 +1,279 @@ @@ -163030,7 +163030,7 @@ index 000000000..1b3346179 +} diff --git a/drivers/gpu/arm/bifrost/build.bp b/drivers/gpu/arm/bifrost/build.bp new file mode 100755 -index 000000000..0a61a12d9 +index 000000000000..0a61a12d902a --- /dev/null +++ b/drivers/gpu/arm/bifrost/build.bp @@ -0,0 +1,280 @@ @@ -163316,7 +163316,7 @@ index 000000000..0a61a12d9 +} diff --git a/drivers/gpu/arm/bifrost/context/Kbuild b/drivers/gpu/arm/bifrost/context/Kbuild new file mode 100644 -index 000000000..156b46a12 +index 000000000000..156b46a12870 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/Kbuild @@ -0,0 +1,27 @@ @@ -163349,7 +163349,7 @@ index 000000000..156b46a12 +endif diff --git a/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_csf.c b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_csf.c new file mode 100755 -index 000000000..07d277b94 +index 000000000000..07d277b947d2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_csf.c @@ -0,0 +1,207 @@ @@ -163562,7 +163562,7 @@ index 000000000..07d277b94 +KBASE_EXPORT_SYMBOL(kbase_destroy_context); diff --git a/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_jm.c b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_jm.c new file mode 100755 -index 000000000..995a08e36 +index 000000000000..995a08e36f43 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_jm.c @@ -0,0 +1,271 @@ @@ -163839,7 +163839,7 @@ index 000000000..995a08e36 +KBASE_EXPORT_SYMBOL(kbase_destroy_context); diff --git a/drivers/gpu/arm/bifrost/context/mali_kbase_context.c b/drivers/gpu/arm/bifrost/context/mali_kbase_context.c new file mode 100755 -index 000000000..88be6c2e7 +index 000000000000..88be6c2e7587 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context.c @@ -0,0 +1,392 @@ @@ -164237,7 +164237,7 @@ index 000000000..88be6c2e7 +} diff --git a/drivers/gpu/arm/bifrost/context/mali_kbase_context.h b/drivers/gpu/arm/bifrost/context/mali_kbase_context.h new file mode 100755 -index 000000000..7c90e2708 +index 000000000000..7c90e2708fa3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context.h @@ -0,0 +1,141 @@ @@ -164384,7 +164384,7 @@ index 000000000..7c90e2708 +#endif /* _KBASE_CONTEXT_H_ */ diff --git a/drivers/gpu/arm/bifrost/context/mali_kbase_context_internal.h b/drivers/gpu/arm/bifrost/context/mali_kbase_context_internal.h new file mode 100755 -index 000000000..1cde7394c +index 000000000000..1cde7394c705 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context_internal.h @@ -0,0 +1,54 @@ @@ -164444,7 +164444,7 @@ index 000000000..1cde7394c +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 000000000..44217dba1 +index 000000000000..44217dba10c0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/Kbuild @@ -0,0 +1,58 @@ @@ -164508,7 +164508,7 @@ index 000000000..44217dba1 +endif diff --git a/drivers/gpu/arm/bifrost/csf/ipa_control/Kbuild b/drivers/gpu/arm/bifrost/csf/ipa_control/Kbuild new file mode 100644 -index 000000000..dc30281e4 +index 000000000000..dc30281e4781 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/ipa_control/Kbuild @@ -0,0 +1,22 @@ @@ -164536,7 +164536,7 @@ index 000000000..dc30281e4 + 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 000000000..c81d0a5a7 +index 000000000000..c81d0a5a7236 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.c @@ -0,0 +1,1063 @@ @@ -165605,7 +165605,7 @@ index 000000000..c81d0a5a7 + 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 000000000..69ff8973b +index 000000000000..69ff8973bac4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.h @@ -0,0 +1,271 @@ @@ -165882,7 +165882,7 @@ index 000000000..69ff8973b +#endif /* _KBASE_CSF_IPA_CONTROL_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c new file mode 100755 -index 000000000..7a939fc33 +index 000000000000..7a939fc3382d --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c @@ -0,0 +1,3289 @@ @@ -169177,7 +169177,7 @@ index 000000000..7a939fc33 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.h new file mode 100755 -index 000000000..dd947dcba +index 000000000000..dd947dcbab1c --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.h @@ -0,0 +1,506 @@ @@ -169689,7 +169689,7 @@ index 000000000..dd947dcba +#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 000000000..516a33ff7 +index 000000000000..516a33ff7465 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.c @@ -0,0 +1,191 @@ @@ -169886,7 +169886,7 @@ index 000000000..516a33ff7 +#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 000000000..435a99395 +index 000000000000..435a993955fe --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.h @@ -0,0 +1,90 @@ @@ -169982,7 +169982,7 @@ index 000000000..435a99395 +#endif /* _KBASE_CSF_CPU_QUEUE_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c new file mode 100755 -index 000000000..e96044ae6 +index 000000000000..e96044ae6239 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c @@ -0,0 +1,767 @@ @@ -170755,7 +170755,7 @@ index 000000000..e96044ae6 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.h new file mode 100755 -index 000000000..16a548bf8 +index 000000000000..16a548bf8acb --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.h @@ -0,0 +1,54 @@ @@ -170815,7 +170815,7 @@ index 000000000..16a548bf8 +#endif /* _KBASE_CSF_CSG_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_defs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_defs.h new file mode 100755 -index 000000000..6fa0e27d6 +index 000000000000..6fa0e27d657f --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_defs.h @@ -0,0 +1,1666 @@ @@ -172487,7 +172487,7 @@ index 000000000..6fa0e27d6 +#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 000000000..49e529384 +index 000000000000..49e52938499f --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.c @@ -0,0 +1,265 @@ @@ -172758,7 +172758,7 @@ index 000000000..49e529384 +} 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 000000000..52122a9ef +index 000000000000..52122a9ef4d1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.h @@ -0,0 +1,171 @@ @@ -172935,7 +172935,7 @@ index 000000000..52122a9ef +#endif /* _KBASE_CSF_EVENT_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.c new file mode 100755 -index 000000000..42bff1e91 +index 000000000000..42bff1e91584 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.c @@ -0,0 +1,3144 @@ @@ -176085,7 +176085,7 @@ index 000000000..42bff1e91 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.h new file mode 100755 -index 000000000..714a14001 +index 000000000000..714a14001189 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.h @@ -0,0 +1,916 @@ @@ -177007,7 +177007,7 @@ index 000000000..714a14001 +#endif diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.c new file mode 100755 -index 000000000..c895b0801 +index 000000000000..c895b080143a --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.c @@ -0,0 +1,354 @@ @@ -177367,7 +177367,7 @@ index 000000000..c895b0801 +#endif /* CONFIG_SYSFS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.h new file mode 100755 -index 000000000..b227cf158 +index 000000000000..b227cf158925 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.h @@ -0,0 +1,72 @@ @@ -177445,7 +177445,7 @@ index 000000000..b227cf158 +#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 000000000..f0a10d197 +index 000000000000..f0a10d197eec --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.c @@ -0,0 +1,807 @@ @@ -178258,7 +178258,7 @@ index 000000000..f0a10d197 +} 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 000000000..0537dca4f +index 000000000000..0537dca4f37f --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.h @@ -0,0 +1,65 @@ @@ -178329,7 +178329,7 @@ index 000000000..0537dca4f +#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 000000000..6e0d3c2f5 +index 000000000000..6e0d3c2f5071 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.c @@ -0,0 +1,451 @@ @@ -178786,7 +178786,7 @@ index 000000000..6e0d3c2f5 +} 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 000000000..100832046 +index 000000000000..1008320464a9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.h @@ -0,0 +1,77 @@ @@ -178869,7 +178869,7 @@ index 000000000..100832046 +#endif /* _KBASE_CSF_FIRMWARE_LOG_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c new file mode 100755 -index 000000000..833947fac +index 000000000000..833947facce3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c @@ -0,0 +1,1661 @@ @@ -180536,7 +180536,7 @@ index 000000000..833947fac +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.c new file mode 100755 -index 000000000..7c14b8eb5 +index 000000000000..7c14b8eb554c --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.c @@ -0,0 +1,236 @@ @@ -180778,7 +180778,7 @@ index 000000000..7c14b8eb5 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.h new file mode 100755 -index 000000000..9aab7abfb +index 000000000000..9aab7abfb649 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.h @@ -0,0 +1,75 @@ @@ -180859,7 +180859,7 @@ index 000000000..9aab7abfb +#endif /* _KBASE_CSF_HEAP_CONTEXT_ALLOC_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.c new file mode 100755 -index 000000000..da8dde239 +index 000000000000..da8dde239972 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.c @@ -0,0 +1,2595 @@ @@ -183460,7 +183460,7 @@ index 000000000..da8dde239 +KBASE_EXPORT_TEST_API(kbase_csf_kcpu_queue_new); diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.h new file mode 100755 -index 000000000..5cad8b200 +index 000000000000..5cad8b200c93 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.h @@ -0,0 +1,384 @@ @@ -183850,7 +183850,7 @@ index 000000000..5cad8b200 +#endif /* _KBASE_CSF_KCPU_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.c new file mode 100755 -index 000000000..fa877778c +index 000000000000..fa877778ca79 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.c @@ -0,0 +1,193 @@ @@ -184049,7 +184049,7 @@ index 000000000..fa877778c +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.h new file mode 100755 -index 000000000..08f2fda03 +index 000000000000..08f2fda034a2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.h @@ -0,0 +1,37 @@ @@ -184092,7 +184092,7 @@ index 000000000..08f2fda03 +#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 000000000..4056a9d93 +index 000000000000..4056a9d933d7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.c @@ -0,0 +1,817 @@ @@ -184915,7 +184915,7 @@ index 000000000..4056a9d93 +} 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 000000000..61943cbbf +index 000000000000..61943cbbf083 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.h @@ -0,0 +1,139 @@ @@ -185060,7 +185060,7 @@ index 000000000..61943cbbf +#endif /* _KBASE_CSF_MCU_SHARED_REG_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.c new file mode 100755 -index 000000000..bf1835b5b +index 000000000000..bf1835b5be25 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.c @@ -0,0 +1,163 @@ @@ -185229,7 +185229,7 @@ index 000000000..bf1835b5b +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.h new file mode 100755 -index 000000000..8c1aa919f +index 000000000000..8c1aa919fbb0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.h @@ -0,0 +1,75 @@ @@ -185310,7 +185310,7 @@ index 000000000..8c1aa919f +#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 000000000..b5bf7bbbc +index 000000000000..b5bf7bbbc056 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_registers.h @@ -0,0 +1,1678 @@ @@ -186994,7 +186994,7 @@ index 000000000..b5bf7bbbc +#endif /* _KBASE_CSF_REGISTERS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_reset_gpu.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_reset_gpu.c new file mode 100755 -index 000000000..fe3b91a48 +index 000000000000..fe3b91a4845d --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_reset_gpu.c @@ -0,0 +1,637 @@ @@ -187637,7 +187637,7 @@ index 000000000..fe3b91a48 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.c new file mode 100755 -index 000000000..edaa6d17e +index 000000000000..edaa6d17e304 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.c @@ -0,0 +1,6889 @@ @@ -194532,7 +194532,7 @@ index 000000000..edaa6d17e +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.h new file mode 100755 -index 000000000..d22d7c8b9 +index 000000000000..d22d7c8b9dce --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.h @@ -0,0 +1,681 @@ @@ -195219,7 +195219,7 @@ index 000000000..d22d7c8b9 +#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 000000000..a5e0ab5ea +index 000000000000..a5e0ab5eaf17 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.c @@ -0,0 +1,788 @@ @@ -196013,7 +196013,7 @@ index 000000000..a5e0ab5ea +#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 000000000..177e15d85 +index 000000000000..177e15d85341 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.h @@ -0,0 +1,37 @@ @@ -196056,7 +196056,7 @@ index 000000000..177e15d85 +#endif /* _KBASE_CSF_SYNC_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.c new file mode 100755 -index 000000000..8072a8bd2 +index 000000000000..8072a8bd2c32 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.c @@ -0,0 +1,1372 @@ @@ -197434,7 +197434,7 @@ index 000000000..8072a8bd2 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.h new file mode 100755 -index 000000000..1b5cb5608 +index 000000000000..1b5cb560894f --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.h @@ -0,0 +1,142 @@ @@ -197582,7 +197582,7 @@ index 000000000..1b5cb5608 +#endif diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.c new file mode 100755 -index 000000000..96e0f2829 +index 000000000000..96e0f2829854 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.c @@ -0,0 +1,162 @@ @@ -197750,7 +197750,7 @@ index 000000000..96e0f2829 + diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.h new file mode 100755 -index 000000000..4a1b413ef +index 000000000000..4a1b413eff6d --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.h @@ -0,0 +1,44 @@ @@ -197800,7 +197800,7 @@ index 000000000..4a1b413ef +#endif /* _KBASE_CSF_TILER_HEAP_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_def.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_def.h new file mode 100755 -index 000000000..96f2b03d2 +index 000000000000..96f2b03d2d31 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_def.h @@ -0,0 +1,140 @@ @@ -197946,7 +197946,7 @@ index 000000000..96f2b03d2 +#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 000000000..6357e3518 +index 000000000000..6357e3518d87 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.c @@ -0,0 +1,359 @@ @@ -198311,7 +198311,7 @@ index 000000000..6357e3518 +} 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 000000000..b6e580e48 +index 000000000000..b6e580e48df6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.h @@ -0,0 +1,80 @@ @@ -198397,7 +198397,7 @@ index 000000000..b6e580e48 +#endif diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c new file mode 100755 -index 000000000..ea6c11624 +index 000000000000..ea6c11624157 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c @@ -0,0 +1,177 @@ @@ -198580,7 +198580,7 @@ index 000000000..ea6c11624 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.h new file mode 100755 -index 000000000..b406eaad2 +index 000000000000..b406eaad2d51 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.h @@ -0,0 +1,66 @@ @@ -198652,7 +198652,7 @@ index 000000000..b406eaad2 +#endif /* _KBASE_CSF_TIMEOUT_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.c new file mode 100755 -index 000000000..6859d6529 +index 000000000000..6859d65295c4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.c @@ -0,0 +1,441 @@ @@ -199099,7 +199099,7 @@ index 000000000..6859d6529 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.h new file mode 100755 -index 000000000..12b285fd2 +index 000000000000..12b285fd2929 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.h @@ -0,0 +1,146 @@ @@ -199251,7 +199251,7 @@ index 000000000..12b285fd2 +#endif /* _KBASE_CSFFW_TL_READER_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c new file mode 100755 -index 000000000..46872f937 +index 000000000000..46872f937dbf --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c @@ -0,0 +1,555 @@ @@ -199812,7 +199812,7 @@ index 000000000..46872f937 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.h new file mode 100755 -index 000000000..0389d093a +index 000000000000..0389d093a904 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.h @@ -0,0 +1,187 @@ @@ -200005,7 +200005,7 @@ index 000000000..0389d093a +#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 000000000..185779c16 +index 000000000000..185779c16815 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.c @@ -0,0 +1,271 @@ @@ -200282,7 +200282,7 @@ index 000000000..185779c16 +#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 000000000..6e9b1a9d5 +index 000000000000..6e9b1a9d51de --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.h @@ -0,0 +1,137 @@ @@ -200425,7 +200425,7 @@ index 000000000..6e9b1a9d5 +#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 100644 -index 000000000..ebf3ddb76 +index 000000000000..ebf3ddb763a2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/Kbuild @@ -0,0 +1,28 @@ @@ -200459,7 +200459,7 @@ index 000000000..ebf3ddb76 +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 000000000..ff5f947e2 +index 000000000000..ff5f947e2da5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_csf.c @@ -0,0 +1,851 @@ @@ -201316,7 +201316,7 @@ index 000000000..ff5f947e2 +} 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 000000000..06d62dc70 +index 000000000000..06d62dc70182 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_internal_csf.h @@ -0,0 +1,182 @@ @@ -201504,7 +201504,7 @@ index 000000000..06d62dc70 +#endif /* _KBASE_DEBUG_CORESIGHT_INTERNAL_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_csf.h new file mode 100755 -index 000000000..41b2b00f1 +index 000000000000..41b2b00f18c8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_csf.h @@ -0,0 +1,322 @@ @@ -201832,7 +201832,7 @@ index 000000000..41b2b00f1 + /* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_jm.h new file mode 100755 -index 000000000..6ba98b7c4 +index 000000000000..6ba98b7c4a6c --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_jm.h @@ -0,0 +1,206 @@ @@ -202044,7 +202044,7 @@ index 000000000..6ba98b7c4 +/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.c b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.c new file mode 100755 -index 000000000..cff6f8959 +index 000000000000..cff6f8959c35 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.c @@ -0,0 +1,199 @@ @@ -202249,7 +202249,7 @@ index 000000000..cff6f8959 +#endif /* KBASE_KTRACE_TARGET_RBUF */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.h new file mode 100755 -index 000000000..e3d037307 +index 000000000000..e3d03730734d --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.h @@ -0,0 +1,203 @@ @@ -202458,7 +202458,7 @@ index 000000000..e3d037307 +#endif /* _KBASE_DEBUG_KTRACE_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_csf.h new file mode 100755 -index 000000000..1896e10ed +index 000000000000..1896e10ed4ab --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_csf.h @@ -0,0 +1,116 @@ @@ -202580,7 +202580,7 @@ index 000000000..1896e10ed +#endif /* _KBASE_DEBUG_KTRACE_DEFS_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_jm.h new file mode 100755 -index 000000000..efa8ab05b +index 000000000000..efa8ab05b1cd --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_jm.h @@ -0,0 +1,112 @@ @@ -202698,7 +202698,7 @@ index 000000000..efa8ab05b +#endif /* _KBASE_DEBUG_KTRACE_DEFS_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.c b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.c new file mode 100755 -index 000000000..6597a15e5 +index 000000000000..6597a15e5000 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.c @@ -0,0 +1,121 @@ @@ -202825,7 +202825,7 @@ index 000000000..6597a15e5 +#endif /* KBASE_KTRACE_TARGET_RBUF */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.h new file mode 100755 -index 000000000..41be7a120 +index 000000000000..41be7a120dcc --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.h @@ -0,0 +1,309 @@ @@ -203140,7 +203140,7 @@ index 000000000..41be7a120 +#endif /* _KBASE_DEBUG_KTRACE_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_csf.h new file mode 100755 -index 000000000..ddcac906c +index 000000000000..ddcac906c492 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_csf.h @@ -0,0 +1,267 @@ @@ -203413,7 +203413,7 @@ index 000000000..ddcac906c +#endif /* !defined(_KBASE_DEBUG_LINUX_KTRACE_CSF_H_) || defined(TRACE_HEADER_MULTI_READ) */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_jm.h new file mode 100755 -index 000000000..8fa4e2a7c +index 000000000000..8fa4e2a7c10b --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_jm.h @@ -0,0 +1,174 @@ @@ -203593,7 +203593,7 @@ index 000000000..8fa4e2a7c +#endif /* !defined(_KBASE_DEBUG_LINUX_KTRACE_JM_H_) || defined(TRACE_HEADER_MULTI_READ)*/ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.c b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.c new file mode 100755 -index 000000000..f521b4712 +index 000000000000..f521b47120fb --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.c @@ -0,0 +1,361 @@ @@ -203960,7 +203960,7 @@ index 000000000..f521b4712 +#endif /* KBASE_KTRACE_TARGET_RBUF */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.h new file mode 100755 -index 000000000..11f0b5c42 +index 000000000000..11f0b5c42c89 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.h @@ -0,0 +1,238 @@ @@ -204204,7 +204204,7 @@ index 000000000..11f0b5c42 +#endif /* _KBASE_DEBUG_KTRACE_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_codes.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_codes.h new file mode 100755 -index 000000000..6103c3ee0 +index 000000000000..6103c3ee04a8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_codes.h @@ -0,0 +1,181 @@ @@ -204391,7 +204391,7 @@ index 000000000..6103c3ee0 +/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_defs.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_defs.h new file mode 100755 -index 000000000..a0fc9e51d +index 000000000000..a0fc9e51d274 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_defs.h @@ -0,0 +1,187 @@ @@ -204584,7 +204584,7 @@ index 000000000..a0fc9e51d +#endif /* _KBASE_DEBUG_KTRACE_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_internal.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_internal.h new file mode 100755 -index 000000000..ba93f29fe +index 000000000000..ba93f29fe5e6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_internal.h @@ -0,0 +1,90 @@ @@ -204680,7 +204680,7 @@ index 000000000..ba93f29fe +#endif /* _KBASE_DEBUG_KTRACE_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_linux_ktrace.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_linux_ktrace.h new file mode 100755 -index 000000000..6d9664716 +index 000000000000..6d96647161b4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_linux_ktrace.h @@ -0,0 +1,123 @@ @@ -204809,7 +204809,7 @@ index 000000000..6d9664716 +#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 100644 -index 000000000..723ffd215 +index 000000000000..723ffd215696 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/Kbuild @@ -0,0 +1,33 @@ @@ -204848,7 +204848,7 @@ index 000000000..723ffd215 +endif diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_csf.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_csf.c new file mode 100755 -index 000000000..f7054f5b0 +index 000000000000..f7054f5b0090 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_csf.c @@ -0,0 +1,525 @@ @@ -205379,7 +205379,7 @@ index 000000000..f7054f5b0 +KBASE_EXPORT_TEST_API(kbase_device_firmware_init_once); diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_csf.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_csf.c new file mode 100755 -index 000000000..2abd62aaa +index 000000000000..2abd62aaa8b1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_csf.c @@ -0,0 +1,252 @@ @@ -205637,7 +205637,7 @@ index 000000000..2abd62aaa +#endif /* !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_jm.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_jm.c new file mode 100755 -index 000000000..38223af21 +index 000000000000..38223af213d1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_jm.c @@ -0,0 +1,143 @@ @@ -205786,7 +205786,7 @@ index 000000000..38223af21 +#endif /* IS_ENABLED(CONFIG_MALI_REAL_HW) */ diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_jm.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_jm.c new file mode 100755 -index 000000000..2d3672383 +index 000000000000..2d3672383630 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_jm.c @@ -0,0 +1,344 @@ @@ -206136,7 +206136,7 @@ index 000000000..2d3672383 +} diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device.c b/drivers/gpu/arm/bifrost/device/mali_kbase_device.c new file mode 100755 -index 000000000..b2b0cfd6c +index 000000000000..b2b0cfd6cc97 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device.c @@ -0,0 +1,611 @@ @@ -206753,7 +206753,7 @@ index 000000000..b2b0cfd6c +} diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device.h b/drivers/gpu/arm/bifrost/device/mali_kbase_device.h new file mode 100755 -index 000000000..f02501100 +index 000000000000..f025011009d5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device.h @@ -0,0 +1,227 @@ @@ -206986,7 +206986,7 @@ index 000000000..f02501100 +void kbase_gpu_interrupt(struct kbase_device *kbdev, u32 val); diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device_hw.c b/drivers/gpu/arm/bifrost/device/mali_kbase_device_hw.c new file mode 100755 -index 000000000..d55495045 +index 000000000000..d55495045892 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device_hw.c @@ -0,0 +1,291 @@ @@ -207283,7 +207283,7 @@ index 000000000..d55495045 +} diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device_internal.h b/drivers/gpu/arm/bifrost/device/mali_kbase_device_internal.h new file mode 100755 -index 000000000..6f77592df +index 000000000000..6f77592dfff2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device_internal.h @@ -0,0 +1,101 @@ @@ -207390,7 +207390,7 @@ index 000000000..6f77592df +#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 100644 -index 000000000..f3a48caf6 +index 000000000000..f3a48caf6b2c --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/Kbuild @@ -0,0 +1,27 @@ @@ -207423,7 +207423,7 @@ index 000000000..f3a48caf6 +endif diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_csf.c b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_csf.c new file mode 100755 -index 000000000..60ba9beab +index 000000000000..60ba9beab91c --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_csf.c @@ -0,0 +1,179 @@ @@ -207608,7 +207608,7 @@ index 000000000..60ba9beab +} diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_jm.c b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_jm.c new file mode 100755 -index 000000000..7f3743ca6 +index 000000000000..7f3743ca6432 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_jm.c @@ -0,0 +1,176 @@ @@ -207790,7 +207790,7 @@ index 000000000..7f3743ca6 +} diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h new file mode 100755 -index 000000000..e7457ddb5 +index 000000000000..e7457ddb5534 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h @@ -0,0 +1,381 @@ @@ -208177,7 +208177,7 @@ index 000000000..e7457ddb5 +#endif /* _KBASE_GPU_REGMAP_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h new file mode 100755 -index 000000000..f86f493c7 +index 000000000000..f86f493c7f7e --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h @@ -0,0 +1,276 @@ @@ -208459,7 +208459,7 @@ index 000000000..f86f493c7 +#endif /* _KBASE_GPU_REGMAP_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.c b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.c new file mode 100755 -index 000000000..8a84ef541 +index 000000000000..8a84ef54100a --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.c @@ -0,0 +1,41 @@ @@ -208506,7 +208506,7 @@ index 000000000..8a84ef541 +} diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_fault.h b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_fault.h new file mode 100755 -index 000000000..6a937a5ed +index 000000000000..6a937a5ed16d --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_fault.h @@ -0,0 +1,48 @@ @@ -208560,7 +208560,7 @@ index 000000000..6a937a5ed +#endif /* _KBASE_GPU_FAULT_H_ */ diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h new file mode 100755 -index 000000000..6cef2bdd1 +index 000000000000..6cef2bdd11e0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h @@ -0,0 +1,637 @@ @@ -209203,7 +209203,7 @@ index 000000000..6cef2bdd1 +#endif /* _KBASE_GPU_REGMAP_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/Kbuild b/drivers/gpu/arm/bifrost/hwcnt/Kbuild new file mode 100644 -index 000000000..c1a381b24 +index 000000000000..c1a381b24593 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/Kbuild @@ -0,0 +1,37 @@ @@ -209246,7 +209246,7 @@ index 000000000..c1a381b24 +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 000000000..6cfa6f5ee +index 000000000000..6cfa6f5ee6f4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend.h @@ -0,0 +1,225 @@ @@ -209477,7 +209477,7 @@ index 000000000..6cfa6f5ee +#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 000000000..4a429a6cd +index 000000000000..4a429a6cd1ae --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.c @@ -0,0 +1,1896 @@ @@ -211379,7 +211379,7 @@ index 000000000..4a429a6cd +} 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 000000000..9c5a5c996 +index 000000000000..9c5a5c996ebd --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.h @@ -0,0 +1,153 @@ @@ -211538,7 +211538,7 @@ index 000000000..9c5a5c996 +#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 000000000..382a3adaa +index 000000000000..382a3adaa127 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if.h @@ -0,0 +1,302 @@ @@ -211846,7 +211846,7 @@ index 000000000..382a3adaa +#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 000000000..b11f3a4e5 +index 000000000000..b11f3a4e50e2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.c @@ -0,0 +1,787 @@ @@ -212639,7 +212639,7 @@ index 000000000..b11f3a4e5 +} 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 000000000..71d150669 +index 000000000000..71d1506694f4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.h @@ -0,0 +1,49 @@ @@ -212694,7 +212694,7 @@ index 000000000..71d150669 +#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 000000000..669701c29 +index 000000000000..669701c29152 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.c @@ -0,0 +1,860 @@ @@ -213560,7 +213560,7 @@ index 000000000..669701c29 +} 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 000000000..4a6293c25 +index 000000000000..4a6293c25473 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.h @@ -0,0 +1,58 @@ @@ -213624,7 +213624,7 @@ index 000000000..4a6293c25 +#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 000000000..564700b2d +index 000000000000..564700b2d978 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.c @@ -0,0 +1,829 @@ @@ -214459,7 +214459,7 @@ index 000000000..564700b2d +} 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 000000000..02a7952cc +index 000000000000..02a7952cced2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.h @@ -0,0 +1,65 @@ @@ -214530,7 +214530,7 @@ index 000000000..02a7952cc +#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 000000000..34deb5d9e +index 000000000000..34deb5d9e3fc --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt.c @@ -0,0 +1,775 @@ @@ -215311,7 +215311,7 @@ index 000000000..34deb5d9e +} 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 000000000..069e02068 +index 000000000000..069e02068902 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_accumulator.h @@ -0,0 +1,139 @@ @@ -215456,7 +215456,7 @@ index 000000000..069e02068 +#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 000000000..89732a908 +index 000000000000..89732a908789 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_context.h @@ -0,0 +1,148 @@ @@ -215610,7 +215610,7 @@ index 000000000..89732a908 +#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 000000000..74916dab0 +index 000000000000..74916dab060d --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.c @@ -0,0 +1,738 @@ @@ -216354,7 +216354,7 @@ index 000000000..74916dab0 +} 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 000000000..a49c31e52 +index 000000000000..a49c31e52f98 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.h @@ -0,0 +1,407 @@ @@ -216767,7 +216767,7 @@ index 000000000..a49c31e52 +#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 000000000..0cf2f94cf +index 000000000000..0cf2f94cfb87 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.c @@ -0,0 +1,298 @@ @@ -217071,7 +217071,7 @@ index 000000000..0cf2f94cf +} 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 000000000..afd236d71 +index 000000000000..afd236d71a7c --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.h @@ -0,0 +1,330 @@ @@ -217407,7 +217407,7 @@ index 000000000..afd236d71 +#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 000000000..763eb315d +index 000000000000..763eb315d9a2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.c @@ -0,0 +1,511 @@ @@ -217924,7 +217924,7 @@ index 000000000..763eb315d +} 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 000000000..5c5ada401 +index 000000000000..5c5ada401768 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.h @@ -0,0 +1,1231 @@ @@ -219161,7 +219161,7 @@ index 000000000..5c5ada401 +#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 000000000..d618764d3 +index 000000000000..d618764d3b32 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.c @@ -0,0 +1,744 @@ @@ -219911,7 +219911,7 @@ index 000000000..d618764d3 +} 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 000000000..485ba7496 +index 000000000000..485ba74960f6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.h @@ -0,0 +1,151 @@ @@ -220068,7 +220068,7 @@ index 000000000..485ba7496 +#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 000000000..501c0087b +index 000000000000..501c0087b7e6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if.h @@ -0,0 +1,89 @@ @@ -220163,7 +220163,7 @@ index 000000000..501c0087b +#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 000000000..4caa832cd +index 000000000000..4caa832cd587 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.c @@ -0,0 +1,157 @@ @@ -220326,7 +220326,7 @@ index 000000000..4caa832cd +} 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 000000000..a545ad3e3 +index 000000000000..a545ad3e39e3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.h @@ -0,0 +1,48 @@ @@ -220380,7 +220380,7 @@ index 000000000..a545ad3e3 +#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 000000000..0be664c47 +index 000000000000..0be664c47b54 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/Kbuild @@ -0,0 +1,35 @@ @@ -220421,7 +220421,7 @@ index 000000000..0be664c47 +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 000000000..60b061ef6 +index 000000000000..60b061ef623d --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.c @@ -0,0 +1,457 @@ @@ -220884,7 +220884,7 @@ index 000000000..60b061ef6 +} 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 000000000..37d2efc59 +index 000000000000..37d2efc59fcc --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.h @@ -0,0 +1,159 @@ @@ -221049,7 +221049,7 @@ index 000000000..37d2efc59 +#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 000000000..34515a934 +index 000000000000..34515a934b33 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.c @@ -0,0 +1,355 @@ @@ -221410,7 +221410,7 @@ index 000000000..34515a934 +} 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 000000000..608961084 +index 000000000000..6089610847b4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.h @@ -0,0 +1,234 @@ @@ -221650,7 +221650,7 @@ index 000000000..608961084 +#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 000000000..21b4e5288 +index 000000000000..21b4e52884c5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_csf.c @@ -0,0 +1,280 @@ @@ -221936,7 +221936,7 @@ index 000000000..21b4e5288 +} 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 000000000..2092db042 +index 000000000000..2092db042dec --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_jm.c @@ -0,0 +1,561 @@ @@ -222503,7 +222503,7 @@ index 000000000..2092db042 +} diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c new file mode 100755 -index 000000000..b2e6bc459 +index 000000000000..b2e6bc459f22 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c @@ -0,0 +1,778 @@ @@ -223287,7 +223287,7 @@ index 000000000..b2e6bc459 +} diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h new file mode 100755 -index 000000000..c875ffb49 +index 000000000000..c875ffb4990e --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h @@ -0,0 +1,304 @@ @@ -223597,7 +223597,7 @@ index 000000000..c875ffb49 +#endif diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c new file mode 100755 -index 000000000..a0963bbb2 +index 000000000000..a0963bbb2068 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c @@ -0,0 +1,324 @@ @@ -223927,7 +223927,7 @@ index 000000000..a0963bbb2 +} diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h new file mode 100755 -index 000000000..f69036775 +index 000000000000..f690367757c9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h @@ -0,0 +1,70 @@ @@ -224003,7 +224003,7 @@ index 000000000..f69036775 +#endif /* _KBASE_IPA_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c new file mode 100755 -index 000000000..8557fe872 +index 000000000000..8557fe8723cf --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c @@ -0,0 +1,370 @@ @@ -224379,7 +224379,7 @@ index 000000000..8557fe872 +KBASE_EXPORT_TEST_API(kbase_simple_ipa_model_ops); diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h new file mode 100755 -index 000000000..dd17786a5 +index 000000000000..dd17786a51d9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h @@ -0,0 +1,44 @@ @@ -224429,7 +224429,7 @@ index 000000000..dd17786a5 +#endif /* _KBASE_IPA_SIMPLE_H_ */ diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h new file mode 100755 -index 000000000..debc3ad25 +index 000000000000..debc3ad25fd7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h @@ -0,0 +1,878 @@ @@ -225313,7 +225313,7 @@ index 000000000..debc3ad25 +#endif /* _KBASE_JM_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h new file mode 100755 -index 000000000..53819caaf +index 000000000000..53819caaf616 --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h @@ -0,0 +1,1044 @@ @@ -226363,7 +226363,7 @@ index 000000000..53819caaf +#endif /* _KBASE_JM_JS_H_ */ diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h new file mode 100755 -index 000000000..465cf7ec0 +index 000000000000..465cf7ec05bd --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h @@ -0,0 +1,447 @@ @@ -226816,7 +226816,7 @@ index 000000000..465cf7ec0 +#endif /* _KBASE_JS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h b/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h new file mode 100755 -index 000000000..11aedef80 +index 000000000000..11aedef80109 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h @@ -0,0 +1,185 @@ @@ -227007,7 +227007,7 @@ index 000000000..11aedef80 +#endif /* _BASE_HWCONFIG_FEATURES_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h b/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h new file mode 100755 -index 000000000..0fbdec0bb +index 000000000000..0fbdec0bb0b6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h @@ -0,0 +1,835 @@ @@ -227848,7 +227848,7 @@ index 000000000..0fbdec0bb +#endif /* _BASE_HWCONFIG_ISSUES_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase.h b/drivers/gpu/arm/bifrost/mali_kbase.h new file mode 100755 -index 000000000..542e8f63f +index 000000000000..542e8f63fb5b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase.h @@ -0,0 +1,752 @@ @@ -228606,7 +228606,7 @@ index 000000000..542e8f63f +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c new file mode 100755 -index 000000000..10dbeee02 +index 000000000000..10dbeee02e40 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c @@ -0,0 +1,109 @@ @@ -228721,7 +228721,7 @@ index 000000000..10dbeee02 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h new file mode 100755 -index 000000000..59bbcf6f4 +index 000000000000..59bbcf6f4ff7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h @@ -0,0 +1,48 @@ @@ -228775,7 +228775,7 @@ index 000000000..59bbcf6f4 +#endif /*_KBASE_AS_FAULT_DEBUG_FS_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_bits.h b/drivers/gpu/arm/bifrost/mali_kbase_bits.h new file mode 100755 -index 000000000..a085fd86c +index 000000000000..a085fd86c488 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_bits.h @@ -0,0 +1,31 @@ @@ -228812,7 +228812,7 @@ index 000000000..a085fd86c +#endif /* _KBASE_BITS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c new file mode 100755 -index 000000000..af51ed8c2 +index 000000000000..af51ed8c2dec --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c @@ -0,0 +1,65 @@ @@ -228883,7 +228883,7 @@ index 000000000..af51ed8c2 +KBASE_EXPORT_TEST_API(kbase_sync_single_for_cpu); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h new file mode 100755 -index 000000000..598d24538 +index 000000000000..598d245383fd --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h @@ -0,0 +1,47 @@ @@ -228936,7 +228936,7 @@ index 000000000..598d24538 +#endif /* _KBASE_CACHE_POLICY_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_caps.h b/drivers/gpu/arm/bifrost/mali_kbase_caps.h new file mode 100755 -index 000000000..6aa31f3d3 +index 000000000000..6aa31f3d3a79 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_caps.h @@ -0,0 +1,70 @@ @@ -229012,7 +229012,7 @@ index 000000000..6aa31f3d3 +#endif /* __KBASE_CAPS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c new file mode 100755 -index 000000000..6a1e7e4c5 +index 000000000000..6a1e7e4c5ff5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c @@ -0,0 +1,100 @@ @@ -229118,7 +229118,7 @@ index 000000000..6a1e7e4c5 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h new file mode 100755 -index 000000000..f7fcf7780 +index 000000000000..f7fcf7780b35 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h @@ -0,0 +1,95 @@ @@ -229219,7 +229219,7 @@ index 000000000..f7fcf7780 +#endif /* _KBASE_CCSWE_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_config.c b/drivers/gpu/arm/bifrost/mali_kbase_config.c new file mode 100755 -index 000000000..37dbca129 +index 000000000000..37dbca129f86 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_config.c @@ -0,0 +1,104 @@ @@ -229329,7 +229329,7 @@ index 000000000..37dbca129 +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_config.h b/drivers/gpu/arm/bifrost/mali_kbase_config.h new file mode 100755 -index 000000000..ecfdb2876 +index 000000000000..ecfdb2876618 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_config.h @@ -0,0 +1,583 @@ @@ -229918,7 +229918,7 @@ index 000000000..ecfdb2876 +#endif /* _KBASE_CONFIG_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h b/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h new file mode 100755 -index 000000000..14493a77e +index 000000000000..14493a77e1ea --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h @@ -0,0 +1,278 @@ @@ -230202,7 +230202,7 @@ index 000000000..14493a77e +#endif /* _KBASE_CONFIG_DEFAULTS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c b/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c new file mode 100755 -index 000000000..12d6cc896 +index 000000000000..12d6cc8963a3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c @@ -0,0 +1,5904 @@ @@ -236112,7 +236112,7 @@ index 000000000..12d6cc896 +#endif /* CONFIG_MALI_BIFROST_GATOR_SUPPORT */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h b/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h new file mode 100755 -index 000000000..7e885ca46 +index 000000000000..7e885ca46ce9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h @@ -0,0 +1,40 @@ @@ -236158,7 +236158,7 @@ index 000000000..7e885ca46 + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c new file mode 100755 -index 000000000..dc6feb95a +index 000000000000..dc6feb95a391 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c @@ -0,0 +1,433 @@ @@ -236597,7 +236597,7 @@ index 000000000..dc6feb95a +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h new file mode 100755 -index 000000000..5a8d17547 +index 000000000000..5a8d17547b7b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h @@ -0,0 +1,247 @@ @@ -236850,7 +236850,7 @@ index 000000000..5a8d17547 +#endif /* _KBASE_CTX_SCHED_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug.c b/drivers/gpu/arm/bifrost/mali_kbase_debug.c new file mode 100755 -index 000000000..6d3b1093b +index 000000000000..6d3b1093b442 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug.c @@ -0,0 +1,41 @@ @@ -236897,7 +236897,7 @@ index 000000000..6d3b1093b + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug.h b/drivers/gpu/arm/bifrost/mali_kbase_debug.h new file mode 100755 -index 000000000..9d6ff73aa +index 000000000000..9d6ff73aa4e0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug.h @@ -0,0 +1,166 @@ @@ -237069,7 +237069,7 @@ index 000000000..9d6ff73aa +#endif /* _KBASE_DEBUG_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c new file mode 100755 -index 000000000..d6518b476 +index 000000000000..d6518b476115 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c @@ -0,0 +1,573 @@ @@ -237648,7 +237648,7 @@ index 000000000..d6518b476 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h new file mode 100755 -index 000000000..059d9c455 +index 000000000000..059d9c4553bb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h @@ -0,0 +1,121 @@ @@ -237775,7 +237775,7 @@ index 000000000..059d9c455 +#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 000000000..418bb1908 +index 000000000000..418bb19086bb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.c @@ -0,0 +1,138 @@ @@ -237919,7 +237919,7 @@ index 000000000..418bb1908 +#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 000000000..8cf69c2cb +index 000000000000..8cf69c2cbaf9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.h @@ -0,0 +1,39 @@ @@ -237964,7 +237964,7 @@ index 000000000..8cf69c2cb +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c new file mode 100755 -index 000000000..ce87a0070 +index 000000000000..ce87a0070b72 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c @@ -0,0 +1,410 @@ @@ -238380,7 +238380,7 @@ index 000000000..ce87a0070 +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h new file mode 100755 -index 000000000..cb8050d9b +index 000000000000..cb8050d9b32c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h @@ -0,0 +1,39 @@ @@ -238425,7 +238425,7 @@ index 000000000..cb8050d9b +#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 000000000..1f8db32aa +index 000000000000..1f8db32aa16f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.c @@ -0,0 +1,116 @@ @@ -238547,7 +238547,7 @@ index 000000000..1f8db32aa +#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 000000000..acf349b60 +index 000000000000..acf349b608d5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.h @@ -0,0 +1,39 @@ @@ -238592,7 +238592,7 @@ index 000000000..acf349b60 +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c new file mode 100755 -index 000000000..c846491e7 +index 000000000000..c846491e78fb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c @@ -0,0 +1,248 @@ @@ -238846,7 +238846,7 @@ index 000000000..c846491e7 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h new file mode 100755 -index 000000000..cbb24d6e0 +index 000000000000..cbb24d6e0acf --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h @@ -0,0 +1,162 @@ @@ -239014,7 +239014,7 @@ index 000000000..cbb24d6e0 + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_defs.h new file mode 100755 -index 000000000..809e73000 +index 000000000000..809e73000c4d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_defs.h @@ -0,0 +1,2105 @@ @@ -241125,7 +241125,7 @@ index 000000000..809e73000 +#endif /* _KBASE_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c b/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c new file mode 100755 -index 000000000..7d6e47558 +index 000000000000..7d6e475585ae --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c @@ -0,0 +1,80 @@ @@ -241211,7 +241211,7 @@ index 000000000..7d6e47558 +KBASE_EXPORT_TEST_API(kbase_disjoint_event_get); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c new file mode 100755 -index 000000000..0e0dab912 +index 000000000000..0e0dab912145 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c @@ -0,0 +1,452 @@ @@ -241669,7 +241669,7 @@ index 000000000..0e0dab912 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h new file mode 100755 -index 000000000..8713ba1ea +index 000000000000..8713ba1eaa6f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h @@ -0,0 +1,73 @@ @@ -241748,7 +241748,7 @@ index 000000000..8713ba1ea +#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 000000000..e4cb71632 +index 000000000000..e4cb71632aee --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.c @@ -0,0 +1,94 @@ @@ -241848,7 +241848,7 @@ index 000000000..e4cb71632 +#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 000000000..8334db7cc +index 000000000000..8334db7cc1ed --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.h @@ -0,0 +1,35 @@ @@ -241889,7 +241889,7 @@ index 000000000..8334db7cc +#endif /* _KBASE_DVFS_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_event.c b/drivers/gpu/arm/bifrost/mali_kbase_event.c new file mode 100755 -index 000000000..910c51170 +index 000000000000..910c51170ae8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_event.c @@ -0,0 +1,272 @@ @@ -242167,7 +242167,7 @@ index 000000000..910c51170 +KBASE_EXPORT_TEST_API(kbase_event_cleanup); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence.c b/drivers/gpu/arm/bifrost/mali_kbase_fence.c new file mode 100755 -index 000000000..b16b27659 +index 000000000000..b16b27659e61 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence.c @@ -0,0 +1,61 @@ @@ -242234,7 +242234,7 @@ index 000000000..b16b27659 + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence.h b/drivers/gpu/arm/bifrost/mali_kbase_fence.h new file mode 100755 -index 000000000..f4507ac43 +index 000000000000..f4507ac4309b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence.h @@ -0,0 +1,259 @@ @@ -242499,7 +242499,7 @@ index 000000000..f4507ac43 +#endif /* _KBASE_FENCE_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h new file mode 100755 -index 000000000..7a150bdf2 +index 000000000000..7a150bdf2947 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h @@ -0,0 +1,63 @@ @@ -242568,7 +242568,7 @@ index 000000000..7a150bdf2 +#endif /* _KBASE_FENCE_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c b/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c new file mode 100755 -index 000000000..25b4c9c03 +index 000000000000..25b4c9c03b53 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c @@ -0,0 +1,111 @@ @@ -242685,7 +242685,7 @@ index 000000000..25b4c9c03 +KBASE_EXPORT_TEST_API(kbase_fence_ops); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gator.h b/drivers/gpu/arm/bifrost/mali_kbase_gator.h new file mode 100755 -index 000000000..dd7df8746 +index 000000000000..dd7df874640a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gator.h @@ -0,0 +1,52 @@ @@ -242743,7 +242743,7 @@ index 000000000..dd7df8746 +#endif /* _KBASE_GATOR_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c new file mode 100755 -index 000000000..bf5f259a0 +index 000000000000..bf5f259a0bb6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c @@ -0,0 +1,112 @@ @@ -242861,7 +242861,7 @@ index 000000000..bf5f259a0 +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h new file mode 100755 -index 000000000..6d5423f37 +index 000000000000..6d5423f379d4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h @@ -0,0 +1,50 @@ @@ -242917,7 +242917,7 @@ index 000000000..6d5423f37 +#endif /*_KBASE_GPU_MEMORY_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c new file mode 100755 -index 000000000..7a7d17ea5 +index 000000000000..7a7d17ea5f26 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c @@ -0,0 +1,888 @@ @@ -243811,7 +243811,7 @@ index 000000000..7a7d17ea5 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h new file mode 100755 -index 000000000..f0a97312c +index 000000000000..f0a97312c0dd --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h @@ -0,0 +1,154 @@ @@ -243971,7 +243971,7 @@ index 000000000..f0a97312c +#endif /* _KBASE_GPUPROPS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h new file mode 100755 -index 000000000..45cb603fa +index 000000000000..45cb603fab82 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h @@ -0,0 +1,170 @@ @@ -244147,7 +244147,7 @@ index 000000000..45cb603fa +#endif /* _KBASE_GPUPROPS_TYPES_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gwt.c b/drivers/gpu/arm/bifrost/mali_kbase_gwt.c new file mode 100755 -index 000000000..0eba889e5 +index 000000000000..0eba889e5b19 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gwt.c @@ -0,0 +1,275 @@ @@ -244428,7 +244428,7 @@ index 000000000..0eba889e5 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gwt.h b/drivers/gpu/arm/bifrost/mali_kbase_gwt.h new file mode 100755 -index 000000000..9fdd68d62 +index 000000000000..9fdd68d62fb8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gwt.h @@ -0,0 +1,54 @@ @@ -244488,7 +244488,7 @@ index 000000000..9fdd68d62 +#endif /* _KBASE_GWT_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hw.c b/drivers/gpu/arm/bifrost/mali_kbase_hw.c new file mode 100755 -index 000000000..b07327a55 +index 000000000000..b07327a55c0a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hw.c @@ -0,0 +1,437 @@ @@ -244931,7 +244931,7 @@ index 000000000..b07327a55 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hw.h b/drivers/gpu/arm/bifrost/mali_kbase_hw.h new file mode 100755 -index 000000000..ddcddaaa4 +index 000000000000..ddcddaaa429d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hw.h @@ -0,0 +1,71 @@ @@ -245008,7 +245008,7 @@ index 000000000..ddcddaaa4 +#endif /* _KBASE_HW_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h new file mode 100755 -index 000000000..0da4eb258 +index 000000000000..0da4eb258a24 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h @@ -0,0 +1,43 @@ @@ -245057,7 +245057,7 @@ index 000000000..0da4eb258 +#endif /* _KBASE_HWACCESS_BACKEND_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h new file mode 100755 -index 000000000..62a6ec51b +index 000000000000..62a6ec51b17f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h @@ -0,0 +1,50 @@ @@ -245113,7 +245113,7 @@ index 000000000..62a6ec51b +#endif /* _KBASE_HWACCESS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h new file mode 100755 -index 000000000..f537b7f0a +index 000000000000..f537b7f0ac90 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h @@ -0,0 +1,88 @@ @@ -245207,7 +245207,7 @@ index 000000000..f537b7f0a +#endif /* _KBASE_HWACCESS_GPUPROPS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h new file mode 100755 -index 000000000..37663101a +index 000000000000..37663101a346 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h @@ -0,0 +1,170 @@ @@ -245383,7 +245383,7 @@ index 000000000..37663101a +#endif /* _KBASE_HWACCESS_INSTR_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h new file mode 100755 -index 000000000..ca77c192d +index 000000000000..ca77c192deea --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h @@ -0,0 +1,318 @@ @@ -245707,7 +245707,7 @@ index 000000000..ca77c192d +#endif /* _KBASE_HWACCESS_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h new file mode 100755 -index 000000000..effb2ffeb +index 000000000000..effb2ffeb349 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h @@ -0,0 +1,229 @@ @@ -245942,7 +245942,7 @@ index 000000000..effb2ffeb +#endif /* _KBASE_HWACCESS_PM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h new file mode 100755 -index 000000000..ac2a26d28 +index 000000000000..ac2a26d28d89 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h @@ -0,0 +1,126 @@ @@ -246074,7 +246074,7 @@ index 000000000..ac2a26d28 +#endif /* _KBASE_BACKEND_TIME_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jd.c b/drivers/gpu/arm/bifrost/mali_kbase_jd.c new file mode 100755 -index 000000000..f44426a73 +index 000000000000..f44426a736ca --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd.c @@ -0,0 +1,1660 @@ @@ -247740,7 +247740,7 @@ index 000000000..f44426a73 +KBASE_EXPORT_TEST_API(kbase_jd_exit); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.c new file mode 100755 -index 000000000..6196c0985 +index 000000000000..6196c0985c7e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.c @@ -0,0 +1,199 @@ @@ -247945,7 +247945,7 @@ index 000000000..6196c0985 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.h new file mode 100755 -index 000000000..8e6140c43 +index 000000000000..8e6140c43538 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.h @@ -0,0 +1,43 @@ @@ -247994,7 +247994,7 @@ index 000000000..8e6140c43 +#endif /*_KBASE_JD_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jm.c b/drivers/gpu/arm/bifrost/mali_kbase_jm.c new file mode 100755 -index 000000000..1ac5cd3ea +index 000000000000..1ac5cd3eafff --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jm.c @@ -0,0 +1,153 @@ @@ -248153,7 +248153,7 @@ index 000000000..1ac5cd3ea +#endif /* !MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jm.h b/drivers/gpu/arm/bifrost/mali_kbase_jm.h new file mode 100755 -index 000000000..eeafcb6b1 +index 000000000000..eeafcb6b1a77 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jm.h @@ -0,0 +1,117 @@ @@ -248276,7 +248276,7 @@ index 000000000..eeafcb6b1 +#endif /* _KBASE_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js.c b/drivers/gpu/arm/bifrost/mali_kbase_js.c new file mode 100755 -index 000000000..8ce09212a +index 000000000000..8ce09212a57e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js.c @@ -0,0 +1,4007 @@ @@ -252289,7 +252289,7 @@ index 000000000..8ce09212a +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js.h b/drivers/gpu/arm/bifrost/mali_kbase_js.h new file mode 100755 -index 000000000..96974c8c6 +index 000000000000..96974c8c6439 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js.h @@ -0,0 +1,36 @@ @@ -252331,7 +252331,7 @@ index 000000000..96974c8c6 +#endif /* _KBASE_JS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.c b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.c new file mode 100755 -index 000000000..04ea06b2f +index 000000000000..04ea06b2f381 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.c @@ -0,0 +1,298 @@ @@ -252635,7 +252635,7 @@ index 000000000..04ea06b2f +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.h b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.h new file mode 100755 -index 000000000..2dc640d5a +index 000000000000..2dc640d5ab82 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.h @@ -0,0 +1,147 @@ @@ -252788,7 +252788,7 @@ index 000000000..2dc640d5a +#endif /* _KBASE_JS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.c b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.c new file mode 100755 -index 000000000..14a730dc5 +index 000000000000..14a730dc5a12 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.c @@ -0,0 +1,896 @@ @@ -253690,7 +253690,7 @@ index 000000000..14a730dc5 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.h b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.h new file mode 100755 -index 000000000..9451d4cd9 +index 000000000000..9451d4cd943d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.h @@ -0,0 +1,273 @@ @@ -253969,7 +253969,7 @@ index 000000000..9451d4cd9 +#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 000000000..823f9156e +index 000000000000..823f9156e19e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.c @@ -0,0 +1,2021 @@ @@ -255996,7 +255996,7 @@ index 000000000..823f9156e +} 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 000000000..bbe33796e +index 000000000000..bbe33796e62f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.h @@ -0,0 +1,189 @@ @@ -256191,7 +256191,7 @@ index 000000000..bbe33796e +#endif /* _KBASE_KINSTR_PRFCNT_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_linux.h b/drivers/gpu/arm/bifrost/mali_kbase_linux.h new file mode 100755 -index 000000000..e5c6f7a0b +index 000000000000..e5c6f7a0b217 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_linux.h @@ -0,0 +1,44 @@ @@ -256241,7 +256241,7 @@ index 000000000..e5c6f7a0b +#endif /* _KBASE_LINUX_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem.c b/drivers/gpu/arm/bifrost/mali_kbase_mem.c new file mode 100755 -index 000000000..1c94e9c57 +index 000000000000..1c94e9c57b7f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem.c @@ -0,0 +1,5541 @@ @@ -261788,7 +261788,7 @@ index 000000000..1c94e9c57 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem.h b/drivers/gpu/arm/bifrost/mali_kbase_mem.h new file mode 100755 -index 000000000..490ad3c9c +index 000000000000..490ad3c9c2e2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem.h @@ -0,0 +1,2570 @@ @@ -264364,7 +264364,7 @@ index 000000000..490ad3c9c +#endif /* _KBASE_MEM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.c new file mode 100755 -index 000000000..f1251a4ed +index 000000000000..f1251a4ed575 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.c @@ -0,0 +1,3831 @@ @@ -268201,7 +268201,7 @@ index 000000000..f1251a4ed +#endif /* MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.h new file mode 100755 -index 000000000..6dda44b9f +index 000000000000..6dda44b9f128 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.h @@ -0,0 +1,533 @@ @@ -268740,7 +268740,7 @@ index 000000000..6dda44b9f +#endif /* _KBASE_MEM_LINUX_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_lowlevel.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_lowlevel.h new file mode 100755 -index 000000000..5a1bb16cc +index 000000000000..5a1bb16cca01 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_lowlevel.h @@ -0,0 +1,179 @@ @@ -268925,7 +268925,7 @@ index 000000000..5a1bb16cc +#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 000000000..737f7da55 +index 000000000000..737f7da5595d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.c @@ -0,0 +1,641 @@ @@ -269572,7 +269572,7 @@ index 000000000..737f7da55 +} 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 000000000..76bbc999e +index 000000000000..76bbc999e110 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.h @@ -0,0 +1,108 @@ @@ -269686,7 +269686,7 @@ index 000000000..76bbc999e +void kbase_mem_migrate_term(struct kbase_device *kbdev); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool.c new file mode 100755 -index 000000000..fa8f34d86 +index 000000000000..fa8f34d86c24 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool.c @@ -0,0 +1,1029 @@ @@ -270721,7 +270721,7 @@ index 000000000..fa8f34d86 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.c new file mode 100755 -index 000000000..3b1b2bae1 +index 000000000000..3b1b2bae15c8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.c @@ -0,0 +1,184 @@ @@ -270911,7 +270911,7 @@ index 000000000..3b1b2bae1 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.h new file mode 100755 -index 000000000..207b58536 +index 000000000000..207b58536a58 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.h @@ -0,0 +1,122 @@ @@ -271039,7 +271039,7 @@ index 000000000..207b58536 + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.c new file mode 100755 -index 000000000..49c4b041e +index 000000000000..49c4b041e13a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.c @@ -0,0 +1,107 @@ @@ -271152,7 +271152,7 @@ index 000000000..49c4b041e +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.h new file mode 100755 -index 000000000..fe8ce7752 +index 000000000000..fe8ce775258f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.h @@ -0,0 +1,114 @@ @@ -271272,7 +271272,7 @@ index 000000000..fe8ce7752 +#endif /* _KBASE_MEM_POOL_GROUP_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.c new file mode 100755 -index 000000000..9317023b7 +index 000000000000..9317023b71bb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.c @@ -0,0 +1,131 @@ @@ -271409,7 +271409,7 @@ index 000000000..9317023b7 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.h new file mode 100755 -index 000000000..c30fca665 +index 000000000000..c30fca6652dc --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.h @@ -0,0 +1,64 @@ @@ -271479,7 +271479,7 @@ index 000000000..c30fca665 + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mipe_gen_header.h b/drivers/gpu/arm/bifrost/mali_kbase_mipe_gen_header.h new file mode 100755 -index 000000000..951079d11 +index 000000000000..951079d11ab6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mipe_gen_header.h @@ -0,0 +1,229 @@ @@ -271714,7 +271714,7 @@ index 000000000..951079d11 +/* clang-format on */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mipe_proto.h b/drivers/gpu/arm/bifrost/mali_kbase_mipe_proto.h new file mode 100755 -index 000000000..c35ee61ce +index 000000000000..c35ee61ce5aa --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mipe_proto.h @@ -0,0 +1,126 @@ @@ -271846,7 +271846,7 @@ index 000000000..c35ee61ce +/* clang-format on */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.c b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.c new file mode 100755 -index 000000000..10a7f506b +index 000000000000..10a7f506b1a4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.c @@ -0,0 +1,177 @@ @@ -272029,7 +272029,7 @@ index 000000000..10a7f506b +}; diff --git a/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.h b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.h new file mode 100755 -index 000000000..1eae2fcf9 +index 000000000000..1eae2fcf98b6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.h @@ -0,0 +1,38 @@ @@ -272073,7 +272073,7 @@ index 000000000..1eae2fcf9 +#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 000000000..b65f9e7b5 +index 000000000000..b65f9e7b5162 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha.c @@ -0,0 +1,306 @@ @@ -272385,7 +272385,7 @@ index 000000000..b65f9e7b5 +} 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 000000000..79632194c +index 000000000000..79632194cabe --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha.h @@ -0,0 +1,77 @@ @@ -272468,7 +272468,7 @@ index 000000000..79632194c +#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 000000000..1cc29c700 +index 000000000000..1cc29c700e5a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.c @@ -0,0 +1,227 @@ @@ -272701,7 +272701,7 @@ index 000000000..1cc29c700 +} 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 000000000..508ecdff9 +index 000000000000..508ecdff9162 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.h @@ -0,0 +1,34 @@ @@ -272741,7 +272741,7 @@ index 000000000..508ecdff9 +#endif /* _KBASE_PBHA_DEBUGFS_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_platform_fake.c b/drivers/gpu/arm/bifrost/mali_kbase_platform_fake.c new file mode 100755 -index 000000000..265c676f1 +index 000000000000..265c676f13fa --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_platform_fake.c @@ -0,0 +1,119 @@ @@ -272866,7 +272866,7 @@ index 000000000..265c676f1 +#endif /* CONFIG_OF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pm.c b/drivers/gpu/arm/bifrost/mali_kbase_pm.c new file mode 100755 -index 000000000..62a132816 +index 000000000000..62a132816a42 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pm.c @@ -0,0 +1,311 @@ @@ -273183,7 +273183,7 @@ index 000000000..62a132816 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pm.h b/drivers/gpu/arm/bifrost/mali_kbase_pm.h new file mode 100755 -index 000000000..4bb90a4f6 +index 000000000000..4bb90a4f6542 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pm.h @@ -0,0 +1,257 @@ @@ -273446,7 +273446,7 @@ index 000000000..4bb90a4f6 +#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 000000000..c517a2d2a +index 000000000000..c517a2d2ab83 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_refcount_defs.h @@ -0,0 +1,57 @@ @@ -273509,7 +273509,7 @@ index 000000000..c517a2d2a +#endif /* _KBASE_REFCOUNT_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.c new file mode 100755 -index 000000000..147082c15 +index 000000000000..147082c15fed --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.c @@ -0,0 +1,239 @@ @@ -273754,7 +273754,7 @@ index 000000000..147082c15 +#endif /* defined(CONFIG_DEBUG_FS) && !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.h new file mode 100755 -index 000000000..ae327dd79 +index 000000000000..ae327dd799a4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.h @@ -0,0 +1,84 @@ @@ -273844,7 +273844,7 @@ index 000000000..ae327dd79 +#endif /*_KBASE_REGS_HISTORY_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_reset_gpu.h b/drivers/gpu/arm/bifrost/mali_kbase_reset_gpu.h new file mode 100755 -index 000000000..48ea9954b +index 000000000000..48ea9954b17c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_reset_gpu.h @@ -0,0 +1,277 @@ @@ -274127,7 +274127,7 @@ index 000000000..48ea9954b +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_smc.c b/drivers/gpu/arm/bifrost/mali_kbase_smc.c new file mode 100755 -index 000000000..abbe8d56d +index 000000000000..abbe8d56d082 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_smc.c @@ -0,0 +1,90 @@ @@ -274223,7 +274223,7 @@ index 000000000..abbe8d56d + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_smc.h b/drivers/gpu/arm/bifrost/mali_kbase_smc.h new file mode 100755 -index 000000000..40a348388 +index 000000000000..40a348388598 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_smc.h @@ -0,0 +1,69 @@ @@ -274298,7 +274298,7 @@ index 000000000..40a348388 +#endif /* _KBASE_SMC_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_softjobs.c b/drivers/gpu/arm/bifrost/mali_kbase_softjobs.c new file mode 100755 -index 000000000..a9312a0c4 +index 000000000000..a9312a0c433e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_softjobs.c @@ -0,0 +1,1770 @@ @@ -276074,7 +276074,7 @@ index 000000000..a9312a0c4 +#endif /* !MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_strings.c b/drivers/gpu/arm/bifrost/mali_kbase_strings.c new file mode 100755 -index 000000000..84784be6f +index 000000000000..84784be6f244 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_strings.c @@ -0,0 +1,28 @@ @@ -276108,7 +276108,7 @@ index 000000000..84784be6f +const char kbase_timeline_name[] = KBASE_TIMELINE_NAME; diff --git a/drivers/gpu/arm/bifrost/mali_kbase_strings.h b/drivers/gpu/arm/bifrost/mali_kbase_strings.h new file mode 100755 -index 000000000..c3f94f926 +index 000000000000..c3f94f9267d5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_strings.h @@ -0,0 +1,23 @@ @@ -276137,7 +276137,7 @@ index 000000000..c3f94f926 +extern const char kbase_timeline_name[]; diff --git a/drivers/gpu/arm/bifrost/mali_kbase_sync.h b/drivers/gpu/arm/bifrost/mali_kbase_sync.h new file mode 100755 -index 000000000..3d2053bee +index 000000000000..3d2053bee08e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync.h @@ -0,0 +1,216 @@ @@ -276359,7 +276359,7 @@ index 000000000..3d2053bee +#endif /* MALI_KBASE_SYNC_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_sync_common.c b/drivers/gpu/arm/bifrost/mali_kbase_sync_common.c new file mode 100755 -index 000000000..5ee7fc3ce +index 000000000000..5ee7fc3ce72b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync_common.c @@ -0,0 +1,50 @@ @@ -276415,7 +276415,7 @@ index 000000000..5ee7fc3ce +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_sync_file.c b/drivers/gpu/arm/bifrost/mali_kbase_sync_file.c new file mode 100755 -index 000000000..9360324cf +index 000000000000..9360324cfee6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync_file.c @@ -0,0 +1,409 @@ @@ -276830,7 +276830,7 @@ index 000000000..9360324cf +#endif /* !MALI_USE_CSF*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.c b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.c new file mode 100755 -index 000000000..7df7d79b6 +index 000000000000..7df7d79b6bc5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.c @@ -0,0 +1,225 @@ @@ -277061,7 +277061,7 @@ index 000000000..7df7d79b6 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.h b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.h new file mode 100755 -index 000000000..fd871fcb3 +index 000000000000..fd871fcb352a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.h @@ -0,0 +1,100 @@ @@ -277167,7 +277167,7 @@ index 000000000..fd871fcb3 +#endif /* _KBASE_TRACE_GPU_MEM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_utility.h b/drivers/gpu/arm/bifrost/mali_kbase_utility.h new file mode 100755 -index 000000000..2dad49b59 +index 000000000000..2dad49b59f52 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_utility.h @@ -0,0 +1,52 @@ @@ -277225,7 +277225,7 @@ index 000000000..2dad49b59 +#endif /* _KBASE_UTILITY_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_vinstr.c b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.c new file mode 100755 -index 000000000..d770913e9 +index 000000000000..d770913e9da5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.c @@ -0,0 +1,1132 @@ @@ -278363,7 +278363,7 @@ index 000000000..d770913e9 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_vinstr.h b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.h new file mode 100755 -index 000000000..6747ec70a +index 000000000000..6747ec70a406 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.h @@ -0,0 +1,90 @@ @@ -278459,7 +278459,7 @@ index 000000000..6747ec70a +#endif /* _KBASE_VINSTR_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_linux_trace.h b/drivers/gpu/arm/bifrost/mali_linux_trace.h new file mode 100755 -index 000000000..52f17390c +index 000000000000..52f17390c853 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_linux_trace.h @@ -0,0 +1,547 @@ @@ -279012,7 +279012,7 @@ index 000000000..52f17390c +#include diff --git a/drivers/gpu/arm/bifrost/mali_malisw.h b/drivers/gpu/arm/bifrost/mali_malisw.h new file mode 100755 -index 000000000..d9db189e8 +index 000000000000..d9db189e8684 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_malisw.h @@ -0,0 +1,108 @@ @@ -279126,7 +279126,7 @@ index 000000000..d9db189e8 +#endif /* _MALISW_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.c b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.c new file mode 100755 -index 000000000..1db3abe2f +index 000000000000..1db3abe2f9f6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.c @@ -0,0 +1,26 @@ @@ -279158,7 +279158,7 @@ index 000000000..1db3abe2f +#endif diff --git a/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.h b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.h new file mode 100755 -index 000000000..f156650a4 +index 000000000000..f156650a40a3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.h @@ -0,0 +1,68 @@ @@ -279232,7 +279232,7 @@ index 000000000..f156650a4 +#include diff --git a/drivers/gpu/arm/bifrost/mmu/Kbuild b/drivers/gpu/arm/bifrost/mmu/Kbuild new file mode 100644 -index 000000000..416432397 +index 000000000000..416432397b5c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/Kbuild @@ -0,0 +1,30 @@ @@ -279268,7 +279268,7 @@ index 000000000..416432397 +endif diff --git a/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_csf.c b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_csf.c new file mode 100755 -index 000000000..4cac7876f +index 000000000000..4cac7876f5f7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_csf.c @@ -0,0 +1,572 @@ @@ -279846,7 +279846,7 @@ index 000000000..4cac7876f +} diff --git a/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_jm.c b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_jm.c new file mode 100755 -index 000000000..d716ce006 +index 000000000000..d716ce0068fd --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_jm.c @@ -0,0 +1,442 @@ @@ -280294,7 +280294,7 @@ index 000000000..d716ce006 +} diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.c b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.c new file mode 100755 -index 000000000..d6d3fcdee +index 000000000000..d6d3fcdee6e7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.c @@ -0,0 +1,3889 @@ @@ -284189,7 +284189,7 @@ index 000000000..d6d3fcdee +} diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.h b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.h new file mode 100755 -index 000000000..699b1f340 +index 000000000000..699b1f340482 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.h @@ -0,0 +1,341 @@ @@ -284536,7 +284536,7 @@ index 000000000..699b1f340 +#endif /* _KBASE_MMU_H_ */ diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw.h b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw.h new file mode 100755 -index 000000000..50d2ea5d0 +index 000000000000..50d2ea5d07c8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw.h @@ -0,0 +1,214 @@ @@ -284756,7 +284756,7 @@ index 000000000..50d2ea5d0 +#endif /* _KBASE_MMU_HW_H_ */ diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw_direct.c b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw_direct.c new file mode 100755 -index 000000000..3f6da35d8 +index 000000000000..3f6da35d80f2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw_direct.c @@ -0,0 +1,699 @@ @@ -285461,7 +285461,7 @@ index 000000000..3f6da35d8 +} diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_internal.h b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_internal.h new file mode 100755 -index 000000000..9d7ce4856 +index 000000000000..9d7ce48568e4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_internal.h @@ -0,0 +1,72 @@ @@ -285539,7 +285539,7 @@ index 000000000..9d7ce4856 +#endif /* _KBASE_MMU_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_aarch64.c b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_aarch64.c new file mode 100755 -index 000000000..f2c627482 +index 000000000000..f2c627482c18 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_aarch64.c @@ -0,0 +1,219 @@ @@ -285764,7 +285764,7 @@ index 000000000..f2c627482 +} diff --git a/drivers/gpu/arm/bifrost/platform/Kconfig b/drivers/gpu/arm/bifrost/platform/Kconfig new file mode 100755 -index 000000000..3e1bd235b +index 000000000000..3e1bd235b842 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/Kconfig @@ -0,0 +1,26 @@ @@ -285796,7 +285796,7 @@ index 000000000..3e1bd235b +# diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild b/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild new file mode 100755 -index 000000000..60a52d80f +index 000000000000..60a52d80fa8e --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild @@ -0,0 +1,24 @@ @@ -285826,7 +285826,7 @@ index 000000000..60a52d80f + platform/$(MALI_PLATFORM_DIR)/mali_kbase_clk_rate_trace.o diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_clk_rate_trace.c b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_clk_rate_trace.c new file mode 100755 -index 000000000..4bcd5854d +index 000000000000..4bcd5854d3a3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_clk_rate_trace.c @@ -0,0 +1,105 @@ @@ -285937,7 +285937,7 @@ index 000000000..4bcd5854d +}; diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_devicetree.c b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_devicetree.c new file mode 100755 -index 000000000..a0b4a434e +index 000000000000..a0b4a434e2a7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_devicetree.c @@ -0,0 +1,53 @@ @@ -285996,7 +285996,7 @@ index 000000000..a0b4a434e +#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_platform.h new file mode 100755 -index 000000000..584a7217d +index 000000000000..584a7217d300 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_platform.h @@ -0,0 +1,47 @@ @@ -286049,7 +286049,7 @@ index 000000000..584a7217d +#define AUTO_SUSPEND_DELAY (100) diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_runtime_pm.c b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_runtime_pm.c new file mode 100755 -index 000000000..2687bee96 +index 000000000000..2687bee96ec9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_runtime_pm.c @@ -0,0 +1,298 @@ @@ -286353,7 +286353,7 @@ index 000000000..2687bee96 +}; diff --git a/drivers/gpu/arm/bifrost/platform/meson/Kbuild b/drivers/gpu/arm/bifrost/platform/meson/Kbuild new file mode 100644 -index 000000000..9b3de96ba +index 000000000000..9b3de96bace8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/meson/Kbuild @@ -0,0 +1,23 @@ @@ -286382,7 +286382,7 @@ index 000000000..9b3de96ba + 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 000000000..7b896b602 +index 000000000000..7b896b602e96 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_meson.c @@ -0,0 +1,53 @@ @@ -286441,7 +286441,7 @@ index 000000000..7b896b602 +#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 000000000..06279e2f6 +index 000000000000..06279e2f62ca --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_platform.h @@ -0,0 +1,45 @@ @@ -286492,7 +286492,7 @@ index 000000000..06279e2f6 +#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 000000000..910d4b4fd +index 000000000000..910d4b4fd3e1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_runtime_pm.c @@ -0,0 +1,265 @@ @@ -286763,7 +286763,7 @@ index 000000000..910d4b4fd +}; diff --git a/drivers/gpu/arm/bifrost/platform/rk/Kbuild b/drivers/gpu/arm/bifrost/platform/rk/Kbuild new file mode 100755 -index 000000000..a1e78cfc4 +index 000000000000..a1e78cfc4ae7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/Kbuild @@ -0,0 +1,16 @@ @@ -286785,7 +286785,7 @@ index 000000000..a1e78cfc4 + platform/$(MALI_PLATFORM_DIR)/mali_kbase_config_rk.o diff --git a/drivers/gpu/arm/bifrost/platform/rk/custom_log.h b/drivers/gpu/arm/bifrost/platform/rk/custom_log.h new file mode 100755 -index 000000000..5de70ee13 +index 000000000000..5de70ee13d25 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/custom_log.h @@ -0,0 +1,192 @@ @@ -286983,7 +286983,7 @@ index 000000000..5de70ee13 +#endif /* __CUSTOM_LOG_H__ */ diff --git a/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_platform.h new file mode 100755 -index 000000000..a2c93fa69 +index 000000000000..a2c93fa69e67 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_platform.h @@ -0,0 +1,93 @@ @@ -287082,7 +287082,7 @@ index 000000000..a2c93fa69 +int kbase_platform_rk_enable_regulator(struct kbase_device *kbdev); diff --git a/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c new file mode 100755 -index 000000000..c32526a86 +index 000000000000..c32526a86275 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c @@ -0,0 +1,692 @@ @@ -287780,7 +287780,7 @@ index 000000000..c32526a86 +}; diff --git a/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_rk.h b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_rk.h new file mode 100755 -index 000000000..0a42559df +index 000000000000..0a42559df2bf --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_rk.h @@ -0,0 +1,67 @@ @@ -287853,7 +287853,7 @@ index 000000000..0a42559df + diff --git a/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild b/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild new file mode 100755 -index 000000000..e1398fde3 +index 000000000000..e1398fde3976 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild @@ -0,0 +1,23 @@ @@ -287882,7 +287882,7 @@ index 000000000..e1398fde3 + mali_kbase_platform_fake.o diff --git a/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_platform.h new file mode 100755 -index 000000000..28f453161 +index 000000000000..28f453161358 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_platform.h @@ -0,0 +1,38 @@ @@ -287926,7 +287926,7 @@ index 000000000..28f453161 +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_vexpress.c new file mode 100755 -index 000000000..8add708d0 +index 000000000000..8add708d0f8a --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_vexpress.c @@ -0,0 +1,79 @@ @@ -288011,7 +288011,7 @@ index 000000000..8add708d0 +#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 000000000..e1398fde3 +index 000000000000..e1398fde3976 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/Kbuild @@ -0,0 +1,23 @@ @@ -288040,7 +288040,7 @@ index 000000000..e1398fde3 + mali_kbase_platform_fake.o diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h new file mode 100755 -index 000000000..28f453161 +index 000000000000..28f453161358 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h @@ -0,0 +1,38 @@ @@ -288084,7 +288084,7 @@ index 000000000..28f453161 +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c new file mode 100755 -index 000000000..835b7587c +index 000000000000..835b7587cfbf --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c @@ -0,0 +1,77 @@ @@ -288167,7 +288167,7 @@ index 000000000..835b7587c +#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 000000000..10f7dc8cf +index 000000000000..10f7dc8cf22c --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/Kbuild @@ -0,0 +1,24 @@ @@ -288197,7 +288197,7 @@ index 000000000..10f7dc8cf + mali_kbase_platform_fake.o diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h new file mode 100755 -index 000000000..28f453161 +index 000000000000..28f453161358 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h @@ -0,0 +1,38 @@ @@ -288241,7 +288241,7 @@ index 000000000..28f453161 +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c new file mode 100755 -index 000000000..8be30fb25 +index 000000000000..8be30fb25bba --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c @@ -0,0 +1,77 @@ @@ -288324,7 +288324,7 @@ index 000000000..8be30fb25 +#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/protected_mode_switcher.h b/drivers/gpu/arm/bifrost/protected_mode_switcher.h new file mode 100755 -index 000000000..9dd9253c7 +index 000000000000..9dd9253c7e95 --- /dev/null +++ b/drivers/gpu/arm/bifrost/protected_mode_switcher.h @@ -0,0 +1,56 @@ @@ -288386,7 +288386,7 @@ index 000000000..9dd9253c7 +#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 000000000..38e4dd4d7 +index 000000000000..38e4dd4d712a --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/Kbuild @@ -0,0 +1,31 @@ @@ -288423,7 +288423,7 @@ index 000000000..38e4dd4d7 + diff --git a/drivers/gpu/arm/bifrost/tests/Kconfig b/drivers/gpu/arm/bifrost/tests/Kconfig new file mode 100755 -index 000000000..e9fe22771 +index 000000000000..e9fe22771416 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/Kconfig @@ -0,0 +1,69 @@ @@ -288498,7 +288498,7 @@ index 000000000..e9fe22771 + 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 100644 -index 000000000..5581ba934 +index 000000000000..5581ba934cd3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/build.bp @@ -0,0 +1,46 @@ @@ -288550,7 +288550,7 @@ index 000000000..5581ba934 +} diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers.h new file mode 100755 -index 000000000..3f68efa42 +index 000000000000..3f68efa4257d --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers.h @@ -0,0 +1,109 @@ @@ -288665,7 +288665,7 @@ index 000000000..3f68efa42 +#endif /* _KERNEL_UTF_HELPERS_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers_user.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers_user.h new file mode 100755 -index 000000000..e147cbb90 +index 000000000000..e147cbb90154 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers_user.h @@ -0,0 +1,184 @@ @@ -288855,7 +288855,7 @@ index 000000000..e147cbb90 +#endif /* _KERNEL_UTF_HELPERS_USER_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_mem.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_mem.h new file mode 100755 -index 000000000..5d4d96ef3 +index 000000000000..5d4d96ef39b1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_mem.h @@ -0,0 +1,72 @@ @@ -288933,7 +288933,7 @@ index 000000000..5d4d96ef3 +#endif /* _KERNEL_UTF_MEM_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_resultset.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_resultset.h new file mode 100755 -index 000000000..2fb1a47a5 +index 000000000000..2fb1a47a59b4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_resultset.h @@ -0,0 +1,180 @@ @@ -289119,7 +289119,7 @@ index 000000000..2fb1a47a5 +#endif /* _KERNEL_UTF_RESULTSET_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_suite.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_suite.h new file mode 100755 -index 000000000..9e459c556 +index 000000000000..9e459c556013 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_suite.h @@ -0,0 +1,571 @@ @@ -289696,7 +289696,7 @@ index 000000000..9e459c556 +#endif /* _KERNEL_UTF_SUITE_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_utils.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_utils.h new file mode 100755 -index 000000000..f6e758b80 +index 000000000000..f6e758b80d98 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_utils.h @@ -0,0 +1,60 @@ @@ -289762,7 +289762,7 @@ index 000000000..f6e758b80 +#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 000000000..c4790bc66 +index 000000000000..c4790bc66c23 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/Kbuild @@ -0,0 +1,31 @@ @@ -289799,7 +289799,7 @@ index 000000000..c4790bc66 +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 000000000..89edae9c5 +index 000000000000..89edae9c5e6f --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/build.bp @@ -0,0 +1,42 @@ @@ -289847,7 +289847,7 @@ index 000000000..89edae9c5 +} diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers.c new file mode 100755 -index 000000000..42736195e +index 000000000000..42736195e071 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers.c @@ -0,0 +1,141 @@ @@ -289994,7 +289994,7 @@ index 000000000..42736195e +EXPORT_SYMBOL(kutf_helper_stop_ignoring_dmesg); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers_user.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers_user.c new file mode 100755 -index 000000000..c4e294325 +index 000000000000..c4e294325262 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers_user.c @@ -0,0 +1,474 @@ @@ -290474,7 +290474,7 @@ index 000000000..c4e294325 +EXPORT_SYMBOL(kutf_helper_output_named_val); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_mem.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_mem.c new file mode 100755 -index 000000000..716970abb +index 000000000000..716970abb8c4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_mem.c @@ -0,0 +1,107 @@ @@ -290587,7 +290587,7 @@ index 000000000..716970abb +EXPORT_SYMBOL(kutf_mempool_alloc); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_resultset.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_resultset.c new file mode 100755 -index 000000000..3a7ade283 +index 000000000000..3a7ade2831b3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_resultset.c @@ -0,0 +1,163 @@ @@ -290756,7 +290756,7 @@ index 000000000..3a7ade283 +} diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_suite.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_suite.c new file mode 100755 -index 000000000..4468066f1 +index 000000000000..4468066f1b27 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_suite.c @@ -0,0 +1,1216 @@ @@ -291978,7 +291978,7 @@ index 000000000..4468066f1 +module_exit(exit_kutf_core); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_utils.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_utils.c new file mode 100755 -index 000000000..21f5fadcc +index 000000000000..21f5fadcc5f6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_utils.c @@ -0,0 +1,75 @@ @@ -292059,7 +292059,7 @@ index 000000000..21f5fadcc +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 000000000..027bc27c9 +index 000000000000..027bc27c9d3c --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kbuild @@ -0,0 +1,25 @@ @@ -292090,7 +292090,7 @@ index 000000000..027bc27c9 +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 000000000..225ad69c5 +index 000000000000..225ad69c5042 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/build.bp @@ -0,0 +1,43 @@ @@ -292139,7 +292139,7 @@ index 000000000..225ad69c5 +} diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c new file mode 100755 -index 000000000..a6f54b61d +index 000000000000..a6f54b61d4ad --- /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 @@ @@ -293110,7 +293110,7 @@ index 000000000..a6f54b61d +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h new file mode 100755 -index 000000000..a716b9f70 +index 000000000000..a716b9f70135 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h @@ -0,0 +1,154 @@ @@ -293270,7 +293270,7 @@ index 000000000..a716b9f70 +#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 000000000..213d6d5ea +index 000000000000..213d6d5ea317 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kbuild @@ -0,0 +1,25 @@ @@ -293301,7 +293301,7 @@ index 000000000..213d6d5ea +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 000000000..155875b9d +index 000000000000..155875b9d5cc --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/build.bp @@ -0,0 +1,42 @@ @@ -293349,7 +293349,7 @@ index 000000000..155875b9d +} diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c new file mode 100755 -index 000000000..f2a014d9b +index 000000000000..f2a014d9b5ca --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c @@ -0,0 +1,283 @@ @@ -293638,7 +293638,7 @@ index 000000000..f2a014d9b +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 100644 -index 000000000..e9bff98b8 +index 000000000000..e9bff98b88b6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/Kbuild @@ -0,0 +1,25 @@ @@ -293669,7 +293669,7 @@ index 000000000..e9bff98b8 +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 100644 -index 000000000..8b995f8a0 +index 000000000000..8b995f8a0a07 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/build.bp @@ -0,0 +1,41 @@ @@ -293716,7 +293716,7 @@ index 000000000..8b995f8a0 +} 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 000000000..5a42bd675 +index 000000000000..5a42bd675c2a --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/mali_kutf_mgm_integration_test_main.c @@ -0,0 +1,210 @@ @@ -293932,7 +293932,7 @@ index 000000000..5a42bd675 +MODULE_VERSION("1.0"); diff --git a/drivers/gpu/arm/bifrost/thirdparty/Kbuild b/drivers/gpu/arm/bifrost/thirdparty/Kbuild new file mode 100644 -index 000000000..558be077d +index 000000000000..558be077d483 --- /dev/null +++ b/drivers/gpu/arm/bifrost/thirdparty/Kbuild @@ -0,0 +1,21 @@ @@ -293959,7 +293959,7 @@ index 000000000..558be077d +bifrost_kbase-y += thirdparty/mali_kbase_mmap.o diff --git a/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c b/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c new file mode 100755 -index 000000000..1e636b9a7 +index 000000000000..1e636b9a7759 --- /dev/null +++ b/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c @@ -0,0 +1,420 @@ @@ -294385,7 +294385,7 @@ index 000000000..1e636b9a7 +} diff --git a/drivers/gpu/arm/bifrost/tl/Kbuild b/drivers/gpu/arm/bifrost/tl/Kbuild new file mode 100644 -index 000000000..1c684d489 +index 000000000000..1c684d489d6f --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/Kbuild @@ -0,0 +1,32 @@ @@ -294423,7 +294423,7 @@ index 000000000..1c684d489 +endif diff --git a/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_csf.c b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_csf.c new file mode 100755 -index 000000000..a6062f170 +index 000000000000..a6062f170ff9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_csf.c @@ -0,0 +1,190 @@ @@ -294619,7 +294619,7 @@ index 000000000..a6062f170 +} diff --git a/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_jm.c b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_jm.c new file mode 100755 -index 000000000..9ba89f59f +index 000000000000..9ba89f59f03b --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_jm.c @@ -0,0 +1,96 @@ @@ -294721,7 +294721,7 @@ index 000000000..9ba89f59f +} diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.c new file mode 100755 -index 000000000..9ed59633c +index 000000000000..9ed59633c41b --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.c @@ -0,0 +1,412 @@ @@ -295139,7 +295139,7 @@ index 000000000..9ed59633c +#endif /* MALI_UNIT_TEST */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.h new file mode 100755 -index 000000000..62be6c64c +index 000000000000..62be6c64c850 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.h @@ -0,0 +1,128 @@ @@ -295273,7 +295273,7 @@ index 000000000..62be6c64c +#endif /* _KBASE_TIMELINE_H */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_io.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_io.c new file mode 100755 -index 000000000..ae570064e +index 000000000000..ae570064e7d0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_io.c @@ -0,0 +1,465 @@ @@ -295744,7 +295744,7 @@ index 000000000..ae570064e +} diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_priv.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_priv.h new file mode 100755 -index 000000000..de30bccc7 +index 000000000000..de30bccc7cca --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_priv.h @@ -0,0 +1,103 @@ @@ -295853,7 +295853,7 @@ index 000000000..de30bccc7 +#endif /* _KBASE_TIMELINE_PRIV_H */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tl_serialize.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_tl_serialize.h new file mode 100755 -index 000000000..b6aaadedc +index 000000000000..b6aaadedc6b9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tl_serialize.h @@ -0,0 +1,123 @@ @@ -295982,7 +295982,7 @@ index 000000000..b6aaadedc +#endif /* _KBASE_TL_SERIALIZE_H */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.c new file mode 100755 -index 000000000..47059deb4 +index 000000000000..47059deb4da2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.c @@ -0,0 +1,313 @@ @@ -296301,7 +296301,7 @@ index 000000000..47059deb4 +} diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.h new file mode 100755 -index 000000000..c1428495b +index 000000000000..c1428495b11c --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.h @@ -0,0 +1,168 @@ @@ -296475,7 +296475,7 @@ index 000000000..c1428495b +#endif /* _KBASE_TLSTREAM_H */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.c new file mode 100755 -index 000000000..f62c75583 +index 000000000000..f62c75583566 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.c @@ -0,0 +1,4223 @@ @@ -300704,7 +300704,7 @@ index 000000000..f62c75583 +/* clang-format on */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.h new file mode 100755 -index 000000000..06e4ca4a6 +index 000000000000..06e4ca4a6bc2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.h @@ -0,0 +1,4382 @@ @@ -305092,14 +305092,14 @@ index 000000000..06e4ca4a6 +#endif diff --git a/drivers/gpu/arm/mali400/.gitignore b/drivers/gpu/arm/mali400/.gitignore new file mode 100755 -index 000000000..d91c8078a +index 000000000000..d91c8078a009 --- /dev/null +++ b/drivers/gpu/arm/mali400/.gitignore @@ -0,0 +1 @@ +./mali/__malidrv_build_info.c diff --git a/drivers/gpu/arm/mali400/Kbuild b/drivers/gpu/arm/mali400/Kbuild new file mode 100755 -index 000000000..dbb7ad3e5 +index 000000000000..dbb7ad3e5d85 --- /dev/null +++ b/drivers/gpu/arm/mali400/Kbuild @@ -0,0 +1,2 @@ @@ -305107,14 +305107,14 @@ index 000000000..dbb7ad3e5 +obj-y += mali/ diff --git a/drivers/gpu/arm/mali400/mali/.gitignore b/drivers/gpu/arm/mali400/mali/.gitignore new file mode 100755 -index 000000000..6b1a3ed27 +index 000000000000..6b1a3ed27a7f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/.gitignore @@ -0,0 +1 @@ +__malidrv_build_info.c diff --git a/drivers/gpu/arm/mali400/mali/Kbuild b/drivers/gpu/arm/mali400/mali/Kbuild new file mode 100755 -index 000000000..7390ab758 +index 000000000000..7390ab758f22 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/Kbuild @@ -0,0 +1,254 @@ @@ -305374,7 +305374,7 @@ index 000000000..7390ab758 + @echo 'const char *__malidrv_build_info(void) { return "malidrv: $(VERSION_STRINGS)";}' > $(src)/__malidrv_build_info.c diff --git a/drivers/gpu/arm/mali400/mali/Kconfig b/drivers/gpu/arm/mali400/mali/Kconfig new file mode 100755 -index 000000000..082919d91 +index 000000000000..082919d91825 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/Kconfig @@ -0,0 +1,119 @@ @@ -305499,7 +305499,7 @@ index 000000000..082919d91 + If unsure, say N. diff --git a/drivers/gpu/arm/mali400/mali/Makefile b/drivers/gpu/arm/mali400/mali/Makefile new file mode 100755 -index 000000000..0b91321a5 +index 000000000000..0b91321a5af1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/Makefile @@ -0,0 +1,206 @@ @@ -305711,7 +305711,7 @@ index 000000000..0b91321a5 +export CONFIG KBUILD_EXTRA_SYMBOLS diff --git a/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c new file mode 100755 -index 000000000..79a418c36 +index 000000000000..79a418c36ccb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c @@ -0,0 +1,142 @@ @@ -305859,7 +305859,7 @@ index 000000000..79a418c36 +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_broadcast.h b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.h new file mode 100755 -index 000000000..0475b7171 +index 000000000000..0475b7171d8d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.h @@ -0,0 +1,57 @@ @@ -305922,7 +305922,7 @@ index 000000000..0475b7171 +#endif /* __MALI_BROADCAST_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c new file mode 100755 -index 000000000..5bed27a8c +index 000000000000..5bed27a8c5c9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c @@ -0,0 +1,139 @@ @@ -306067,7 +306067,7 @@ index 000000000..5bed27a8c +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h new file mode 100755 -index 000000000..c9e6e058e +index 000000000000..c9e6e058ea8e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h @@ -0,0 +1,30 @@ @@ -306103,7 +306103,7 @@ index 000000000..c9e6e058e + diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dlbu.c b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.c new file mode 100755 -index 000000000..99b7f3607 +index 000000000000..99b7f360768b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.c @@ -0,0 +1,213 @@ @@ -306322,7 +306322,7 @@ index 000000000..99b7f3607 +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h new file mode 100755 -index 000000000..a7ecf4147 +index 000000000000..a7ecf41471d8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h @@ -0,0 +1,45 @@ @@ -306373,7 +306373,7 @@ index 000000000..a7ecf4147 +#endif /* __MALI_DLBU_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c new file mode 100755 -index 000000000..55b21a410 +index 000000000000..55b21a410754 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c @@ -0,0 +1,308 @@ @@ -306687,7 +306687,7 @@ index 000000000..55b21a410 + diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.h b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.h new file mode 100755 -index 000000000..662348c4e +index 000000000000..662348c4e6ac --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.h @@ -0,0 +1,34 @@ @@ -306727,7 +306727,7 @@ index 000000000..662348c4e +#endif/* __MALI_DVFS_POLICY_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_executor.c b/drivers/gpu/arm/mali400/mali/common/mali_executor.c new file mode 100755 -index 000000000..0cf1ec0b0 +index 000000000000..0cf1ec0b0d02 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_executor.c @@ -0,0 +1,2707 @@ @@ -309440,7 +309440,7 @@ index 000000000..0cf1ec0b0 +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_executor.h b/drivers/gpu/arm/mali400/mali/common/mali_executor.h new file mode 100755 -index 000000000..4224d6a6c +index 000000000000..4224d6a6cdc4 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_executor.h @@ -0,0 +1,102 @@ @@ -309548,7 +309548,7 @@ index 000000000..4224d6a6c +#endif /* __MALI_EXECUTOR_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp.c b/drivers/gpu/arm/mali400/mali/common/mali_gp.c new file mode 100755 -index 000000000..7d3d4aff7 +index 000000000000..7d3d4aff7c3f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp.c @@ -0,0 +1,357 @@ @@ -309911,7 +309911,7 @@ index 000000000..7d3d4aff7 +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp.h b/drivers/gpu/arm/mali400/mali/common/mali_gp.h new file mode 100755 -index 000000000..3156310f2 +index 000000000000..3156310f21c7 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp.h @@ -0,0 +1,127 @@ @@ -310044,7 +310044,7 @@ index 000000000..3156310f2 +#endif /* __MALI_GP_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c new file mode 100755 -index 000000000..5d4d9f253 +index 000000000000..5d4d9f2530d3 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c @@ -0,0 +1,306 @@ @@ -310356,7 +310356,7 @@ index 000000000..5d4d9f253 +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp_job.h b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.h new file mode 100755 -index 000000000..b84333f9f +index 000000000000..b84333f9f810 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.h @@ -0,0 +1,324 @@ @@ -310686,7 +310686,7 @@ index 000000000..b84333f9f +#endif /* __MALI_GP_JOB_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_group.c b/drivers/gpu/arm/mali400/mali/common/mali_group.c new file mode 100755 -index 000000000..47979a2f1 +index 000000000000..47979a2f1a35 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_group.c @@ -0,0 +1,1875 @@ @@ -312567,7 +312567,7 @@ index 000000000..47979a2f1 +#endif /* #if defined(CONFIG_MALI400_PROFILING) */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_group.h b/drivers/gpu/arm/mali400/mali/common/mali_group.h new file mode 100755 -index 000000000..32481e4a6 +index 000000000000..32481e4a6748 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_group.h @@ -0,0 +1,460 @@ @@ -313033,7 +313033,7 @@ index 000000000..32481e4a6 +#endif /* __MALI_GROUP_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c new file mode 100755 -index 000000000..a813816e9 +index 000000000000..a813816e998d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c @@ -0,0 +1,47 @@ @@ -313086,7 +313086,7 @@ index 000000000..a813816e9 +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_hw_core.h b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.h new file mode 100755 -index 000000000..38d96e240 +index 000000000000..38d96e240a20 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.h @@ -0,0 +1,111 @@ @@ -313203,7 +313203,7 @@ index 000000000..38d96e240 +#endif /* __MALI_HW_CORE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h b/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h new file mode 100755 -index 000000000..6a8f0f011 +index 000000000000..6a8f0f0116a4 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h @@ -0,0 +1,181 @@ @@ -313390,7 +313390,7 @@ index 000000000..6a8f0f011 +#endif /* __MALI_KERNEL_COMMON_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c new file mode 100755 -index 000000000..87f97b710 +index 000000000000..87f97b710257 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c @@ -0,0 +1,1349 @@ @@ -314745,7 +314745,7 @@ index 000000000..87f97b710 +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h new file mode 100755 -index 000000000..c471fc955 +index 000000000000..c471fc955107 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h @@ -0,0 +1,57 @@ @@ -314808,7 +314808,7 @@ index 000000000..c471fc955 +#endif /* __MALI_KERNEL_CORE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c new file mode 100755 -index 000000000..d1b8dc3b0 +index 000000000000..d1b8dc3b0b0e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c @@ -0,0 +1,440 @@ @@ -315254,7 +315254,7 @@ index 000000000..d1b8dc3b0 +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.h b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.h new file mode 100755 -index 000000000..06f585dcb +index 000000000000..06f585dcb238 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.h @@ -0,0 +1,72 @@ @@ -315332,7 +315332,7 @@ index 000000000..06f585dcb +#endif /* __MALI_KERNEL_UTILIZATION_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c b/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c new file mode 100755 -index 000000000..dd44e5e7f +index 000000000000..dd44e5e7fa03 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c @@ -0,0 +1,45 @@ @@ -315383,7 +315383,7 @@ index 000000000..dd44e5e7f + diff --git a/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c new file mode 100755 -index 000000000..fe33f561b +index 000000000000..fe33f561b2aa --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c @@ -0,0 +1,534 @@ @@ -315923,7 +315923,7 @@ index 000000000..fe33f561b +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.h b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.h new file mode 100755 -index 000000000..c48a88440 +index 000000000000..c48a8844075f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.h @@ -0,0 +1,124 @@ @@ -316053,7 +316053,7 @@ index 000000000..c48a88440 +#endif /* __MALI_KERNEL_L2_CACHE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c new file mode 100755 -index 000000000..eb95998f1 +index 000000000000..eb95998f1469 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c @@ -0,0 +1,68 @@ @@ -316127,7 +316127,7 @@ index 000000000..eb95998f1 +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.h b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.h new file mode 100755 -index 000000000..05013f46f +index 000000000000..05013f46f901 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.h @@ -0,0 +1,19 @@ @@ -316152,7 +316152,7 @@ index 000000000..05013f46f +#endif /* __MALI_MEM_VALIDATION_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu.c b/drivers/gpu/arm/mali400/mali/common/mali_mmu.c new file mode 100755 -index 000000000..b82486fa6 +index 000000000000..b82486fa66c0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu.c @@ -0,0 +1,433 @@ @@ -316591,7 +316591,7 @@ index 000000000..b82486fa6 +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu.h b/drivers/gpu/arm/mali400/mali/common/mali_mmu.h new file mode 100755 -index 000000000..6ed48585f +index 000000000000..6ed48585f3d2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu.h @@ -0,0 +1,124 @@ @@ -316721,7 +316721,7 @@ index 000000000..6ed48585f +#endif /* __MALI_MMU_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c new file mode 100755 -index 000000000..9ad3e8970 +index 000000000000..9ad3e8970b7d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c @@ -0,0 +1,495 @@ @@ -317222,7 +317222,7 @@ index 000000000..9ad3e8970 +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.h b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.h new file mode 100755 -index 000000000..3fdf07210 +index 000000000000..3fdf07210259 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.h @@ -0,0 +1,110 @@ @@ -317338,7 +317338,7 @@ index 000000000..3fdf07210 +#endif /* __MALI_MMU_PAGE_DIRECTORY_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk.h b/drivers/gpu/arm/mali400/mali/common/mali_osk.h new file mode 100755 -index 000000000..9ade362d6 +index 000000000000..9ade362d6b28 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk.h @@ -0,0 +1,1389 @@ @@ -318733,7 +318733,7 @@ index 000000000..9ade362d6 +#endif /* __MALI_OSK_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h new file mode 100755 -index 000000000..bb1831753 +index 000000000000..bb1831753a40 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h @@ -0,0 +1,162 @@ @@ -318901,7 +318901,7 @@ index 000000000..bb1831753 +#endif /* __MALI_OSK_BITOPS_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h new file mode 100755 -index 000000000..9af2d7d4d +index 000000000000..9af2d7d4d621 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h @@ -0,0 +1,273 @@ @@ -319180,7 +319180,7 @@ index 000000000..9af2d7d4d +#endif /* __MALI_OSK_LIST_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h new file mode 100755 -index 000000000..a4c1618e9 +index 000000000000..a4c1618e9252 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h @@ -0,0 +1,155 @@ @@ -319341,7 +319341,7 @@ index 000000000..a4c1618e9 +#endif /* __MALI_OSK_MALI_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h new file mode 100755 -index 000000000..6e4583db1 +index 000000000000..6e4583db1c80 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h @@ -0,0 +1,146 @@ @@ -319493,7 +319493,7 @@ index 000000000..6e4583db1 + diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h new file mode 100755 -index 000000000..b6fa94ce1 +index 000000000000..b6fa94ce16b3 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h @@ -0,0 +1,471 @@ @@ -319970,7 +319970,7 @@ index 000000000..b6fa94ce1 +#endif /* __MALI_OSK_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm.c b/drivers/gpu/arm/mali400/mali/common/mali_pm.c new file mode 100755 -index 000000000..3989a33ae +index 000000000000..3989a33aeaef --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm.c @@ -0,0 +1,1362 @@ @@ -321338,7 +321338,7 @@ index 000000000..3989a33ae +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm.h b/drivers/gpu/arm/mali400/mali/common/mali_pm.h new file mode 100755 -index 000000000..dac69958e +index 000000000000..dac69958e034 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm.h @@ -0,0 +1,91 @@ @@ -321435,7 +321435,7 @@ index 000000000..dac69958e +#endif /* __MALI_PM_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.c b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.c new file mode 100755 -index 000000000..8290f7d88 +index 000000000000..8290f7d88f6a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.c @@ -0,0 +1,209 @@ @@ -321650,7 +321650,7 @@ index 000000000..8290f7d88 +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h new file mode 100755 -index 000000000..5776abe39 +index 000000000000..5776abe39f3d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h @@ -0,0 +1,104 @@ @@ -321760,7 +321760,7 @@ index 000000000..5776abe39 +#endif /* __MALI_PM_DOMAIN_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c new file mode 100755 -index 000000000..cf7482323 +index 000000000000..cf74823230f7 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c @@ -0,0 +1,255 @@ @@ -322021,7 +322021,7 @@ index 000000000..cf7482323 +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.h b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.h new file mode 100755 -index 000000000..2b136b0de +index 000000000000..2b136b0de4e3 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.h @@ -0,0 +1,74 @@ @@ -322101,7 +322101,7 @@ index 000000000..2b136b0de +#endif /* __MALI_PM_METRICS_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pmu.c b/drivers/gpu/arm/mali400/mali/common/mali_pmu.c new file mode 100755 -index 000000000..6f0af59f6 +index 000000000000..6f0af59f6fd4 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pmu.c @@ -0,0 +1,270 @@ @@ -322377,7 +322377,7 @@ index 000000000..6f0af59f6 +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pmu.h b/drivers/gpu/arm/mali400/mali/common/mali_pmu.h new file mode 100755 -index 000000000..5b856240f +index 000000000000..5b856240fdac --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pmu.h @@ -0,0 +1,123 @@ @@ -322506,7 +322506,7 @@ index 000000000..5b856240f +#endif /* __MALI_PMU_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp.c b/drivers/gpu/arm/mali400/mali/common/mali_pp.c new file mode 100755 -index 000000000..2dd8b8766 +index 000000000000..2dd8b8766f8e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp.c @@ -0,0 +1,502 @@ @@ -323014,7 +323014,7 @@ index 000000000..2dd8b8766 +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp.h b/drivers/gpu/arm/mali400/mali/common/mali_pp.h new file mode 100755 -index 000000000..f98b29866 +index 000000000000..f98b29866ffa --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp.h @@ -0,0 +1,138 @@ @@ -323158,7 +323158,7 @@ index 000000000..f98b29866 +#endif /* __MALI_PP_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c new file mode 100755 -index 000000000..b0216d4c1 +index 000000000000..b0216d4c1ac8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c @@ -0,0 +1,316 @@ @@ -323480,7 +323480,7 @@ index 000000000..b0216d4c1 +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp_job.h b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.h new file mode 100755 -index 000000000..d0331f398 +index 000000000000..d0331f398ff9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.h @@ -0,0 +1,594 @@ @@ -324080,7 +324080,7 @@ index 000000000..d0331f398 +#endif /* __MALI_PP_JOB_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c new file mode 100755 -index 000000000..b5e6cfddb +index 000000000000..b5e6cfddbb0e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c @@ -0,0 +1,1548 @@ @@ -325634,7 +325634,7 @@ index 000000000..b5e6cfddb +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_scheduler.h b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.h new file mode 100755 -index 000000000..de81a421e +index 000000000000..de81a421ea9a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.h @@ -0,0 +1,131 @@ @@ -325771,7 +325771,7 @@ index 000000000..de81a421e +#endif /* __MALI_SCHEDULER_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h b/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h new file mode 100755 -index 000000000..ba1d71d01 +index 000000000000..ba1d71d01d46 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h @@ -0,0 +1,29 @@ @@ -325806,7 +325806,7 @@ index 000000000..ba1d71d01 +#endif /* __MALI_SCHEDULER_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_session.c b/drivers/gpu/arm/mali400/mali/common/mali_session.c new file mode 100755 -index 000000000..7504fb108 +index 000000000000..7504fb108779 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_session.c @@ -0,0 +1,155 @@ @@ -325967,7 +325967,7 @@ index 000000000..7504fb108 +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_session.h b/drivers/gpu/arm/mali400/mali/common/mali_session.h new file mode 100755 -index 000000000..da8b9927e +index 000000000000..da8b9927ee60 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_session.h @@ -0,0 +1,136 @@ @@ -326109,7 +326109,7 @@ index 000000000..da8b9927e +#endif /* __MALI_SESSION_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c new file mode 100755 -index 000000000..35cd830bc +index 000000000000..35cd830bc83a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c @@ -0,0 +1,438 @@ @@ -326553,7 +326553,7 @@ index 000000000..35cd830bc +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h new file mode 100755 -index 000000000..018ef4c52 +index 000000000000..018ef4c527d9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h @@ -0,0 +1,190 @@ @@ -326749,7 +326749,7 @@ index 000000000..018ef4c52 +#endif /* __MALI_SOFT_JOB_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c new file mode 100755 -index 000000000..f829e99f0 +index 000000000000..f829e99f02ab --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c @@ -0,0 +1,77 @@ @@ -326832,7 +326832,7 @@ index 000000000..f829e99f0 +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h new file mode 100755 -index 000000000..4d788ec1b +index 000000000000..4d788ec1bbe4 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h @@ -0,0 +1,70 @@ @@ -326908,7 +326908,7 @@ index 000000000..4d788ec1b +#endif /* __MALI_SPINLOCK_REENTRANT_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline.c b/drivers/gpu/arm/mali400/mali/common/mali_timeline.c new file mode 100755 -index 000000000..ffffee930 +index 000000000000..ffffee9306ce --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline.c @@ -0,0 +1,1964 @@ @@ -328878,7 +328878,7 @@ index 000000000..ffffee930 +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline.h b/drivers/gpu/arm/mali400/mali/common/mali_timeline.h new file mode 100755 -index 000000000..3e8bfc8fb +index 000000000000..3e8bfc8fb733 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline.h @@ -0,0 +1,587 @@ @@ -329471,7 +329471,7 @@ index 000000000..3e8bfc8fb +#endif /* __MALI_TIMELINE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c new file mode 100755 -index 000000000..1ab13f509 +index 000000000000..1ab13f50997f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c @@ -0,0 +1,218 @@ @@ -329695,7 +329695,7 @@ index 000000000..1ab13f509 +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h new file mode 100755 -index 000000000..9da12baee +index 000000000000..9da12baeef1a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h @@ -0,0 +1,67 @@ @@ -329768,7 +329768,7 @@ index 000000000..9da12baee +#endif /* __MALI_TIMELINE_FENCE_WAIT_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c new file mode 100755 -index 000000000..bb7f6a04e +index 000000000000..bb7f6a04e8bd --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c @@ -0,0 +1,179 @@ @@ -329953,7 +329953,7 @@ index 000000000..bb7f6a04e +#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h new file mode 100755 -index 000000000..65e368ae7 +index 000000000000..65e368ae7c9e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h @@ -0,0 +1,51 @@ @@ -330010,7 +330010,7 @@ index 000000000..65e368ae7 +#endif /* __MALI_TIMELINE_SYNC_FENCE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_ukk.h b/drivers/gpu/arm/mali400/mali/common/mali_ukk.h new file mode 100755 -index 000000000..55a05c504 +index 000000000000..55a05c50436a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_ukk.h @@ -0,0 +1,551 @@ @@ -330567,7 +330567,7 @@ index 000000000..55a05c504 +#endif /* __MALI_UKK_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c new file mode 100755 -index 000000000..1911eff87 +index 000000000000..1911eff87a72 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c @@ -0,0 +1,147 @@ @@ -330720,7 +330720,7 @@ index 000000000..1911eff87 +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.h b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.h new file mode 100755 -index 000000000..da9c0630e +index 000000000000..da9c0630e371 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.h @@ -0,0 +1,39 @@ @@ -330765,7 +330765,7 @@ index 000000000..da9c0630e +#endif /* __MALI_KERNEL_USER_SETTING__ */ diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard.h new file mode 100755 -index 000000000..7df55c951 +index 000000000000..7df55c951d6f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard.h @@ -0,0 +1,526 @@ @@ -331297,7 +331297,7 @@ index 000000000..7df55c951 +#endif diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h new file mode 100755 -index 000000000..686708eae +index 000000000000..686708eaef75 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h @@ -0,0 +1,97 @@ @@ -331400,7 +331400,7 @@ index 000000000..686708eae +#endif /* __MALI_UTGARD_IOCTL_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h new file mode 100755 -index 000000000..17d31de93 +index 000000000000..17d31de931d0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h @@ -0,0 +1,190 @@ @@ -331596,7 +331596,7 @@ index 000000000..17d31de93 +#endif /*_MALI_UTGARD_PROFILING_EVENTS_H_*/ diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h new file mode 100755 -index 000000000..c1927d145 +index 000000000000..c1927d1450dc --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h @@ -0,0 +1,305 @@ @@ -331907,7 +331907,7 @@ index 000000000..c1927d145 +#endif /* __MALI_UTGARD_PROFILING_GATOR_API_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h new file mode 100755 -index 000000000..34656f09b +index 000000000000..34656f09b2ab --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h @@ -0,0 +1,1108 @@ @@ -333021,7 +333021,7 @@ index 000000000..34656f09b +#endif /* __MALI_UTGARD_UK_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h b/drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h new file mode 100755 -index 000000000..6fafc6777 +index 000000000000..6fafc6777e48 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h @@ -0,0 +1,30 @@ @@ -333057,7 +333057,7 @@ index 000000000..6fafc6777 +#endif /* __MALI_KERNEL_LICENSE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c new file mode 100755 -index 000000000..7438cb495 +index 000000000000..7438cb4951e2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c @@ -0,0 +1,362 @@ @@ -333425,7 +333425,7 @@ index 000000000..7438cb495 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h new file mode 100755 -index 000000000..ba7c017d8 +index 000000000000..ba7c017d88dc --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h @@ -0,0 +1,17 @@ @@ -333448,7 +333448,7 @@ index 000000000..ba7c017d8 +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c b/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c new file mode 100755 -index 000000000..95c3ea12d +index 000000000000..95c3ea12d645 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c @@ -0,0 +1,36 @@ @@ -333490,7 +333490,7 @@ index 000000000..95c3ea12d +EXPORT_SYMBOL(mali_dev_resume); diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c new file mode 100755 -index 000000000..e026e11e4 +index 000000000000..e026e11e4bc5 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c @@ -0,0 +1,439 @@ @@ -333935,7 +333935,7 @@ index 000000000..e026e11e4 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.h b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.h new file mode 100755 -index 000000000..d44f6d1a8 +index 000000000000..d44f6d1a8926 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.h @@ -0,0 +1,124 @@ @@ -334065,7 +334065,7 @@ index 000000000..d44f6d1a8 +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.c b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.c new file mode 100755 -index 000000000..e13cbad3e +index 000000000000..e13cbad3e513 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.c @@ -0,0 +1,783 @@ @@ -334854,7 +334854,7 @@ index 000000000..e13cbad3e +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h new file mode 100755 -index 000000000..dbb29222b +index 000000000000..dbb29222ba98 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h @@ -0,0 +1,191 @@ @@ -335051,7 +335051,7 @@ index 000000000..dbb29222b +#endif /* _MALI_INTERNAL_SYNC_H */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c new file mode 100755 -index 000000000..534db255e +index 000000000000..534db255ed02 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c @@ -0,0 +1,1177 @@ @@ -336234,7 +336234,7 @@ index 000000000..534db255e +MODULE_VERSION(SVN_REV_STRING); diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h new file mode 100755 -index 000000000..be754cb15 +index 000000000000..be754cb15646 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h @@ -0,0 +1,36 @@ @@ -336276,7 +336276,7 @@ index 000000000..be754cb15 +#endif /* __MALI_KERNEL_LINUX_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c new file mode 100755 -index 000000000..7bda438fe +index 000000000000..7bda438fef50 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c @@ -0,0 +1,1410 @@ @@ -337692,7 +337692,7 @@ index 000000000..7bda438fe +#endif /* MALI_LICENSE_IS_GPL */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h new file mode 100755 -index 000000000..91580a87c +index 000000000000..91580a87c1e1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h @@ -0,0 +1,29 @@ @@ -337727,7 +337727,7 @@ index 000000000..91580a87c +#endif /* __MALI_KERNEL_LINUX_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h b/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h new file mode 100755 -index 000000000..222260823 +index 000000000000..222260823c81 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h @@ -0,0 +1,161 @@ @@ -337894,7 +337894,7 @@ index 000000000..222260823 + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory.c new file mode 100755 -index 000000000..dfc769e6c +index 000000000000..dfc769e6cc40 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory.c @@ -0,0 +1,531 @@ @@ -338431,7 +338431,7 @@ index 000000000..dfc769e6c + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory.h new file mode 100755 -index 000000000..efebbef23 +index 000000000000..efebbef235d8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory.h @@ -0,0 +1,143 @@ @@ -338580,7 +338580,7 @@ index 000000000..efebbef23 +#endif /* __MALI_MEMORY_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c new file mode 100755 -index 000000000..bccef3576 +index 000000000000..bccef3576914 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c @@ -0,0 +1,362 @@ @@ -338948,7 +338948,7 @@ index 000000000..bccef3576 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.h new file mode 100755 -index 000000000..70fd9ec25 +index 000000000000..70fd9ec25f50 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.h @@ -0,0 +1,58 @@ @@ -339012,7 +339012,7 @@ index 000000000..70fd9ec25 +#endif /* __MALI_BLOCK_ALLOCATOR_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c new file mode 100755 -index 000000000..54e342a1f +index 000000000000..54e342a1f7ce --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c @@ -0,0 +1,776 @@ @@ -339794,7 +339794,7 @@ index 000000000..54e342a1f +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h new file mode 100755 -index 000000000..5f83a37fc +index 000000000000..5f83a37fc8f8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h @@ -0,0 +1,48 @@ @@ -339848,7 +339848,7 @@ index 000000000..5f83a37fc + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.c new file mode 100755 -index 000000000..a9db577cb +index 000000000000..a9db577cb851 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.c @@ -0,0 +1,262 @@ @@ -340116,7 +340116,7 @@ index 000000000..a9db577cb + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h new file mode 100755 -index 000000000..defa08d52 +index 000000000000..defa08d52a46 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h @@ -0,0 +1,64 @@ @@ -340186,7 +340186,7 @@ index 000000000..defa08d52 +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c new file mode 100755 -index 000000000..1f4565127 +index 000000000000..1f4565127a6b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c @@ -0,0 +1,369 @@ @@ -340561,7 +340561,7 @@ index 000000000..1f4565127 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.h new file mode 100755 -index 000000000..a9b287038 +index 000000000000..a9b2870389ff --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.h @@ -0,0 +1,53 @@ @@ -340620,7 +340620,7 @@ index 000000000..a9b287038 +#endif /* __MALI_MEMORY_DMA_BUF_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c new file mode 100755 -index 000000000..76018b7ab +index 000000000000..76018b7ab90b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c @@ -0,0 +1,89 @@ @@ -340715,7 +340715,7 @@ index 000000000..76018b7ab + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h new file mode 100755 -index 000000000..2db178d96 +index 000000000000..2db178d96233 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h @@ -0,0 +1,29 @@ @@ -340750,7 +340750,7 @@ index 000000000..2db178d96 +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c new file mode 100755 -index 000000000..6c0a2e9a8 +index 000000000000..6c0a2e9a8a14 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c @@ -0,0 +1,992 @@ @@ -341748,7 +341748,7 @@ index 000000000..6c0a2e9a8 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h new file mode 100755 -index 000000000..23d8cde75 +index 000000000000..23d8cde753a1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h @@ -0,0 +1,51 @@ @@ -341805,7 +341805,7 @@ index 000000000..23d8cde75 + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c new file mode 100755 -index 000000000..9c8214ba3 +index 000000000000..9c8214ba3b8e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c @@ -0,0 +1,810 @@ @@ -342621,7 +342621,7 @@ index 000000000..9c8214ba3 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h new file mode 100755 -index 000000000..8c9b35d0b +index 000000000000..8c9b35d0b230 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h @@ -0,0 +1,54 @@ @@ -342681,7 +342681,7 @@ index 000000000..8c9b35d0b +#endif /* __MALI_MEMORY_OS_ALLOC_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c new file mode 100755 -index 000000000..63506bfbe +index 000000000000..63506bfbe9fe --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c @@ -0,0 +1,170 @@ @@ -342857,7 +342857,7 @@ index 000000000..63506bfbe + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h new file mode 100755 -index 000000000..48691d479 +index 000000000000..48691d4790fe --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h @@ -0,0 +1,30 @@ @@ -342893,7 +342893,7 @@ index 000000000..48691d479 +#endif /* __MALI_MEMORY_SECURE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c new file mode 100755 -index 000000000..d682785b9 +index 000000000000..d682785b9673 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c @@ -0,0 +1,943 @@ @@ -343842,7 +343842,7 @@ index 000000000..d682785b9 +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h new file mode 100755 -index 000000000..5810960e2 +index 000000000000..5810960e204a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h @@ -0,0 +1,121 @@ @@ -343969,7 +343969,7 @@ index 000000000..5810960e2 + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_types.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_types.h new file mode 100755 -index 000000000..33db40929 +index 000000000000..33db40929642 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_types.h @@ -0,0 +1,219 @@ @@ -344194,7 +344194,7 @@ index 000000000..33db40929 +#endif /* __MALI_MEMORY_TYPES__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.c new file mode 100755 -index 000000000..666d4b0fb +index 000000000000..666d4b0fb1cd --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.c @@ -0,0 +1,154 @@ @@ -344354,7 +344354,7 @@ index 000000000..666d4b0fb + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h new file mode 100755 -index 000000000..c314c8dcb +index 000000000000..c314c8dcbf1c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h @@ -0,0 +1,29 @@ @@ -344389,7 +344389,7 @@ index 000000000..c314c8dcb +#endif /* __MALI_MEMORY_DMA_BUF_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c new file mode 100755 -index 000000000..8e13e923c +index 000000000000..8e13e923c3fb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c @@ -0,0 +1,158 @@ @@ -344553,7 +344553,7 @@ index 000000000..8e13e923c +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h new file mode 100755 -index 000000000..33ac99509 +index 000000000000..33ac99509740 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h @@ -0,0 +1,20 @@ @@ -344579,7 +344579,7 @@ index 000000000..33ac99509 +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c new file mode 100755 -index 000000000..0b31e3a23 +index 000000000000..0b31e3a23432 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c @@ -0,0 +1,127 @@ @@ -344712,7 +344712,7 @@ index 000000000..0b31e3a23 + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h new file mode 100755 -index 000000000..fd03ed9f2 +index 000000000000..fd03ed9f2bbb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h @@ -0,0 +1,35 @@ @@ -344753,7 +344753,7 @@ index 000000000..fd03ed9f2 +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c new file mode 100755 -index 000000000..5bc0e52eb +index 000000000000..5bc0e52ebe23 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c @@ -0,0 +1,59 @@ @@ -344818,7 +344818,7 @@ index 000000000..5bc0e52eb +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_bitmap.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_bitmap.c new file mode 100755 -index 000000000..fb9ccd2ad +index 000000000000..fb9ccd2ad1e2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_bitmap.c @@ -0,0 +1,152 @@ @@ -344976,7 +344976,7 @@ index 000000000..fb9ccd2ad + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c new file mode 100755 -index 000000000..5c8b9ceab +index 000000000000..5c8b9ceab9ab --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c @@ -0,0 +1,200 @@ @@ -345182,7 +345182,7 @@ index 000000000..5c8b9ceab +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.c new file mode 100755 -index 000000000..ed5f0b0da +index 000000000000..ed5f0b0da7cb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.c @@ -0,0 +1,287 @@ @@ -345475,7 +345475,7 @@ index 000000000..ed5f0b0da +#endif /* DEBUG */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.h b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.h new file mode 100755 -index 000000000..6fd5af952 +index 000000000000..6fd5af95285b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.h @@ -0,0 +1,326 @@ @@ -345807,7 +345807,7 @@ index 000000000..6fd5af952 +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c new file mode 100755 -index 000000000..994b04dad +index 000000000000..994b04dad745 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c @@ -0,0 +1,146 @@ @@ -345959,7 +345959,7 @@ index 000000000..994b04dad +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_mali.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_mali.c new file mode 100755 -index 000000000..a729d0499 +index 000000000000..a729d0499869 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_mali.c @@ -0,0 +1,505 @@ @@ -346470,7 +346470,7 @@ index 000000000..a729d0499 + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c new file mode 100755 -index 000000000..0b2d00762 +index 000000000000..0b2d00762771 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c @@ -0,0 +1,27 @@ @@ -346503,7 +346503,7 @@ index 000000000..0b2d00762 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_memory.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_memory.c new file mode 100755 -index 000000000..174616b56 +index 000000000000..174616b566c4 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_memory.c @@ -0,0 +1,61 @@ @@ -346570,7 +346570,7 @@ index 000000000..174616b56 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_misc.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_misc.c new file mode 100755 -index 000000000..9845187f8 +index 000000000000..9845187f8122 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_misc.c @@ -0,0 +1,81 @@ @@ -346657,7 +346657,7 @@ index 000000000..9845187f8 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_notification.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_notification.c new file mode 100755 -index 000000000..a05f8f066 +index 000000000000..a05f8f066964 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_notification.c @@ -0,0 +1,182 @@ @@ -346845,7 +346845,7 @@ index 000000000..a05f8f066 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_pm.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_pm.c new file mode 100755 -index 000000000..e28e2eb21 +index 000000000000..e28e2eb21fe2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_pm.c @@ -0,0 +1,83 @@ @@ -346934,7 +346934,7 @@ index 000000000..e28e2eb21 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_profiling.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_profiling.c new file mode 100755 -index 000000000..9e977ea4d +index 000000000000..9e977ea4d0ff --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_profiling.c @@ -0,0 +1,1282 @@ @@ -348222,7 +348222,7 @@ index 000000000..9e977ea4d +EXPORT_SYMBOL(_mali_profiling_get_mali_version); diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_specific.h b/drivers/gpu/arm/mali400/mali/linux/mali_osk_specific.h new file mode 100755 -index 000000000..af51161f9 +index 000000000000..af51161f9da1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_specific.h @@ -0,0 +1,74 @@ @@ -348302,7 +348302,7 @@ index 000000000..af51161f9 +#endif /* __MALI_OSK_SPECIFIC_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c new file mode 100755 -index 000000000..d295e712a +index 000000000000..d295e712ac7a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c @@ -0,0 +1,59 @@ @@ -348367,7 +348367,7 @@ index 000000000..d295e712a +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_timers.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_timers.c new file mode 100755 -index 000000000..d01c11482 +index 000000000000..d01c1148272a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_timers.c @@ -0,0 +1,76 @@ @@ -348449,7 +348449,7 @@ index 000000000..d01c11482 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_wait_queue.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wait_queue.c new file mode 100755 -index 000000000..fa12abd3f +index 000000000000..fa12abd3f5dc --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wait_queue.c @@ -0,0 +1,78 @@ @@ -348533,7 +348533,7 @@ index 000000000..fa12abd3f +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_wq.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wq.c new file mode 100755 -index 000000000..d5e258a83 +index 000000000000..d5e258a83a29 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wq.c @@ -0,0 +1,240 @@ @@ -348779,7 +348779,7 @@ index 000000000..d5e258a83 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c b/drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c new file mode 100755 -index 000000000..931d7f07a +index 000000000000..931d7f07a1d2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c @@ -0,0 +1,23 @@ @@ -348808,7 +348808,7 @@ index 000000000..931d7f07a +EXPORT_SYMBOL(mali_perf_set_num_pp_cores); diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h new file mode 100755 -index 000000000..4661cac42 +index 000000000000..4661cac42b3f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h @@ -0,0 +1,17 @@ @@ -348831,7 +348831,7 @@ index 000000000..4661cac42 +#endif /* __MALI_PROFILING_EVENTS_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h new file mode 100755 -index 000000000..6fdaa427c +index 000000000000..6fdaa427c4cf --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h @@ -0,0 +1,17 @@ @@ -348854,7 +348854,7 @@ index 000000000..6fdaa427c +#endif /* __MALI_PROFILING_GATOR_API_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c new file mode 100755 -index 000000000..c3a526f0a +index 000000000000..c3a526f0ad90 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c @@ -0,0 +1,275 @@ @@ -349135,7 +349135,7 @@ index 000000000..c3a526f0a +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.h b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.h new file mode 100755 -index 000000000..f17b45833 +index 000000000000..f17b4583307a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.h @@ -0,0 +1,35 @@ @@ -349176,7 +349176,7 @@ index 000000000..f17b45833 +#endif /* __MALI_PROFILING_INTERNAL_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_sync.c b/drivers/gpu/arm/mali400/mali/linux/mali_sync.c new file mode 100755 -index 000000000..0d98b518f +index 000000000000..0d98b518f1ac --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_sync.c @@ -0,0 +1,665 @@ @@ -349847,7 +349847,7 @@ index 000000000..0d98b518f + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_sync.h b/drivers/gpu/arm/mali400/mali/linux/mali_sync.h new file mode 100755 -index 000000000..91be8b9cf +index 000000000000..91be8b9cf314 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_sync.h @@ -0,0 +1,169 @@ @@ -350022,7 +350022,7 @@ index 000000000..91be8b9cf +#endif /* _MALI_SYNC_H_ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h b/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h new file mode 100755 -index 000000000..68b27b8be +index 000000000000..68b27b8be067 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h @@ -0,0 +1,17 @@ @@ -350045,7 +350045,7 @@ index 000000000..68b27b8be +#endif /* __MALI_UK_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c new file mode 100755 -index 000000000..0bd1cddb1 +index 000000000000..0bd1cddb10c6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c @@ -0,0 +1,171 @@ @@ -350222,7 +350222,7 @@ index 000000000..0bd1cddb1 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_gp.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_gp.c new file mode 100755 -index 000000000..68fcd9719 +index 000000000000..68fcd971938a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_gp.c @@ -0,0 +1,91 @@ @@ -350319,7 +350319,7 @@ index 000000000..68fcd9719 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_mem.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_mem.c new file mode 100755 -index 000000000..baea4c688 +index 000000000000..baea4c688db9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_mem.c @@ -0,0 +1,333 @@ @@ -350658,7 +350658,7 @@ index 000000000..baea4c688 + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c new file mode 100755 -index 000000000..a9b0958c0 +index 000000000000..a9b0958c06aa --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c @@ -0,0 +1,105 @@ @@ -350769,7 +350769,7 @@ index 000000000..a9b0958c0 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_profiling.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_profiling.c new file mode 100755 -index 000000000..8b49ebc50 +index 000000000000..8b49ebc50b95 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_profiling.c @@ -0,0 +1,183 @@ @@ -350958,7 +350958,7 @@ index 000000000..8b49ebc50 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_soft_job.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_soft_job.c new file mode 100755 -index 000000000..1dd4a7c6f +index 000000000000..1dd4a7c6fb1e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_soft_job.c @@ -0,0 +1,90 @@ @@ -351054,7 +351054,7 @@ index 000000000..1dd4a7c6f +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_timeline.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_timeline.c new file mode 100755 -index 000000000..ff0c90939 +index 000000000000..ff0c909393a4 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_timeline.c @@ -0,0 +1,88 @@ @@ -351148,7 +351148,7 @@ index 000000000..ff0c90939 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_vsync.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_vsync.c new file mode 100755 -index 000000000..52519d1f9 +index 000000000000..52519d1f96e0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_vsync.c @@ -0,0 +1,39 @@ @@ -351193,7 +351193,7 @@ index 000000000..52519d1f9 + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h new file mode 100755 -index 000000000..1add628fe +index 000000000000..1add628fe323 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h @@ -0,0 +1,82 @@ @@ -351281,7 +351281,7 @@ index 000000000..1add628fe +#endif /* __MALI_UKK_WRAPPERS_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/arm.c b/drivers/gpu/arm/mali400/mali/platform/arm/arm.c new file mode 100755 -index 000000000..fc7017bbf +index 000000000000..fc7017bbfe08 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm.c @@ -0,0 +1,629 @@ @@ -351916,7 +351916,7 @@ index 000000000..fc7017bbf +} diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c new file mode 100755 -index 000000000..7a2fc8107 +index 000000000000..7a2fc8107b4f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c @@ -0,0 +1,122 @@ @@ -352044,7 +352044,7 @@ index 000000000..7a2fc8107 +} diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h new file mode 100755 -index 000000000..8e0101830 +index 000000000000..8e0101830749 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h @@ -0,0 +1,44 @@ @@ -352094,7 +352094,7 @@ index 000000000..8e0101830 +#endif /* __ARM_CORE_SCALING_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c b/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c new file mode 100755 -index 000000000..e4e7ab8b2 +index 000000000000..e4e7ab8b2c2e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c @@ -0,0 +1,127 @@ @@ -352227,7 +352227,7 @@ index 000000000..e4e7ab8b2 +#endif diff --git a/drivers/gpu/arm/mali400/mali/platform/rk/custom_log.h b/drivers/gpu/arm/mali400/mali/platform/rk/custom_log.h new file mode 100755 -index 000000000..fe5e12241 +index 000000000000..fe5e1224149e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/rk/custom_log.h @@ -0,0 +1,209 @@ @@ -352442,7 +352442,7 @@ index 000000000..fe5e12241 +#endif /* __CUSTOM_LOG_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/platform/rk/rk.c b/drivers/gpu/arm/mali400/mali/platform/rk/rk.c new file mode 100755 -index 000000000..2b412b5ec +index 000000000000..2b412b5ec569 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/rk/rk.c @@ -0,0 +1,721 @@ @@ -353169,7 +353169,7 @@ index 000000000..2b412b5ec +} diff --git a/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h b/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h new file mode 100755 -index 000000000..bd939350c +index 000000000000..bd939350c425 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h @@ -0,0 +1,37 @@ @@ -353212,7 +353212,7 @@ index 000000000..bd939350c + diff --git a/drivers/gpu/arm/mali400/mali/readme.txt b/drivers/gpu/arm/mali400/mali/readme.txt new file mode 100755 -index 000000000..6785ac933 +index 000000000000..6785ac933b38 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/readme.txt @@ -0,0 +1,28 @@ @@ -353246,7 +353246,7 @@ index 000000000..6785ac933 +resources. diff --git a/drivers/gpu/arm/mali400/mali/regs/mali_200_regs.h b/drivers/gpu/arm/mali400/mali/regs/mali_200_regs.h new file mode 100755 -index 000000000..0345fb169 +index 000000000000..0345fb169a95 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/regs/mali_200_regs.h @@ -0,0 +1,131 @@ @@ -353383,7 +353383,7 @@ index 000000000..0345fb169 +#endif /* _MALI200_REGS_H_ */ diff --git a/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h b/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h new file mode 100755 -index 000000000..7f8b58fd6 +index 000000000000..7f8b58fd6c49 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h @@ -0,0 +1,172 @@ @@ -353561,7 +353561,7 @@ index 000000000..7f8b58fd6 +#endif diff --git a/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c new file mode 100755 -index 000000000..7df934c12 +index 000000000000..7df934c12122 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c @@ -0,0 +1,13 @@ @@ -353580,7 +353580,7 @@ index 000000000..7df934c12 +/* This file is intentionally left empty, as all functions are inlined in mali_profiling_sampler.h */ diff --git a/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h new file mode 100755 -index 000000000..f52097c19 +index 000000000000..f52097c1901b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h @@ -0,0 +1,48 @@ @@ -353634,7 +353634,7 @@ index 000000000..f52097c19 +#endif /* __MALI_TIMESTAMP_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c new file mode 100755 -index 000000000..7df934c12 +index 000000000000..7df934c12122 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c @@ -0,0 +1,13 @@ @@ -353653,7 +353653,7 @@ index 000000000..7df934c12 +/* This file is intentionally left empty, as all functions are inlined in mali_profiling_sampler.h */ diff --git a/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h new file mode 100755 -index 000000000..709a16a82 +index 000000000000..709a16a82f31 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h @@ -0,0 +1,26 @@ @@ -353685,7 +353685,7 @@ index 000000000..709a16a82 +#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 000000000..2a6cbbbb5 +index 000000000000..2a6cbbbb5a97 --- /dev/null +++ b/drivers/gpu/arm/mali400/rk_ver_info.txt @@ -0,0 +1,11 @@ @@ -353702,7 +353702,7 @@ index 000000000..2a6cbbbb5 + diff --git a/drivers/gpu/arm/mali400/ump/Kbuild b/drivers/gpu/arm/mali400/ump/Kbuild new file mode 100755 -index 000000000..a3067ba72 +index 000000000000..a3067ba72459 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Kbuild @@ -0,0 +1,92 @@ @@ -353800,7 +353800,7 @@ index 000000000..a3067ba72 + diff --git a/drivers/gpu/arm/mali400/ump/Kconfig b/drivers/gpu/arm/mali400/ump/Kconfig new file mode 100755 -index 000000000..ec3509057 +index 000000000000..ec3509057732 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Kconfig @@ -0,0 +1,17 @@ @@ -353823,7 +353823,7 @@ index 000000000..ec3509057 + diff --git a/drivers/gpu/arm/mali400/ump/Makefile b/drivers/gpu/arm/mali400/ump/Makefile new file mode 100755 -index 000000000..88b02a22f +index 000000000000..88b02a22fce5 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Makefile @@ -0,0 +1,67 @@ @@ -353896,7 +353896,7 @@ index 000000000..88b02a22f + $(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 000000000..ad2c18da9 +index 000000000000..ad2c18da98a0 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Makefile.common @@ -0,0 +1,20 @@ @@ -353922,7 +353922,7 @@ index 000000000..ad2c18da9 +EXTRA_CFLAGS += -DSVN_REV_STRING=\"$(SVN_REV)\" diff --git a/drivers/gpu/arm/mali400/ump/arch-default/config.h b/drivers/gpu/arm/mali400/ump/arch-default/config.h new file mode 100755 -index 000000000..d4aef9dd0 +index 000000000000..d4aef9dd09c7 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/arch-default/config.h @@ -0,0 +1,24 @@ @@ -353952,7 +353952,7 @@ index 000000000..d4aef9dd0 +#endif /* __ARCH_CONFIG_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h b/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h new file mode 100755 -index 000000000..182e90c1d +index 000000000000..182e90c1d64f --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h @@ -0,0 +1,18 @@ @@ -353976,7 +353976,7 @@ index 000000000..182e90c1d +#endif /* __ARCH_CONFIG_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/arch/config.h b/drivers/gpu/arm/mali400/ump/arch/config.h new file mode 100755 -index 000000000..d4aef9dd0 +index 000000000000..d4aef9dd09c7 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/arch/config.h @@ -0,0 +1,24 @@ @@ -354006,7 +354006,7 @@ index 000000000..d4aef9dd0 +#endif /* __ARCH_CONFIG_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c new file mode 100755 -index 000000000..36adb2f53 +index 000000000000..36adb2f5383e --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c @@ -0,0 +1,455 @@ @@ -354467,7 +354467,7 @@ index 000000000..36adb2f53 +} diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.c new file mode 100755 -index 000000000..73aa9e4c4 +index 000000000000..73aa9e4c49f9 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.c @@ -0,0 +1,358 @@ @@ -354831,7 +354831,7 @@ index 000000000..73aa9e4c4 +} diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.h new file mode 100755 -index 000000000..aa65f1cb6 +index 000000000000..aa65f1cb6c88 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.h @@ -0,0 +1,125 @@ @@ -354962,7 +354962,7 @@ index 000000000..aa65f1cb6 +#endif /* __UMP_KERNEL_COMMON_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c new file mode 100755 -index 000000000..e4642f039 +index 000000000000..e4642f0394c2 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c @@ -0,0 +1,155 @@ @@ -355123,7 +355123,7 @@ index 000000000..e4642f039 + diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h new file mode 100755 -index 000000000..a888ba833 +index 000000000000..a888ba833fbb --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h @@ -0,0 +1,89 @@ @@ -355218,7 +355218,7 @@ index 000000000..a888ba833 +#endif /* __UMP_KERNEL_DESCRIPTOR_MAPPING_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h new file mode 100755 -index 000000000..2b69f68e8 +index 000000000000..2b69f68e87ac --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h @@ -0,0 +1,48 @@ @@ -355272,7 +355272,7 @@ index 000000000..2b69f68e8 + diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_ref_drv.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_ref_drv.c new file mode 100755 -index 000000000..0b6434bee +index 000000000000..0b6434bee00f --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_ref_drv.c @@ -0,0 +1,181 @@ @@ -355459,7 +355459,7 @@ index 000000000..0b6434bee +} diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_types.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_types.h new file mode 100755 -index 000000000..32f32ccbe +index 000000000000..32f32ccbe9fc --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_types.h @@ -0,0 +1,58 @@ @@ -355523,7 +355523,7 @@ index 000000000..32f32ccbe +#endif /* __UMP_KERNEL_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_osk.h b/drivers/gpu/arm/mali400/ump/common/ump_osk.h new file mode 100755 -index 000000000..9adc4d3df +index 000000000000..9adc4d3df3f5 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_osk.h @@ -0,0 +1,48 @@ @@ -355577,7 +355577,7 @@ index 000000000..9adc4d3df +#endif diff --git a/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h b/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h new file mode 100755 -index 000000000..db842cdcb +index 000000000000..db842cdcbeff --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h @@ -0,0 +1,202 @@ @@ -355785,7 +355785,7 @@ index 000000000..db842cdcb +#endif /* __UMP_UK_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_ukk.h b/drivers/gpu/arm/mali400/ump/common/ump_ukk.h new file mode 100755 -index 000000000..f2906768c +index 000000000000..f2906768c37f --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_ukk.h @@ -0,0 +1,60 @@ @@ -355851,7 +355851,7 @@ index 000000000..f2906768c +#endif /* __UMP_UKK_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h b/drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h new file mode 100755 -index 000000000..d0174055a +index 000000000000..d0174055aa28 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h @@ -0,0 +1,30 @@ @@ -355887,7 +355887,7 @@ index 000000000..d0174055a +#endif /* __UMP_KERNEL_LICENSE_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h b/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h new file mode 100755 -index 000000000..bfb4e8d64 +index 000000000000..bfb4e8d64885 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h @@ -0,0 +1,54 @@ @@ -355947,7 +355947,7 @@ index 000000000..bfb4e8d64 +#endif /* __UMP_IOCTL_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c new file mode 100755 -index 000000000..71b30830c +index 000000000000..71b30830c308 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c @@ -0,0 +1,449 @@ @@ -356402,7 +356402,7 @@ index 000000000..71b30830c +MODULE_VERSION(SVN_REV_STRING); diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.h new file mode 100755 -index 000000000..8d32ddbb5 +index 000000000000..8d32ddbb5449 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.h @@ -0,0 +1,18 @@ @@ -356426,7 +356426,7 @@ index 000000000..8d32ddbb5 +#endif /* __UMP_KERNEL_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c new file mode 100755 -index 000000000..5a1257a25 +index 000000000000..5a1257a25b82 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c @@ -0,0 +1,271 @@ @@ -356703,7 +356703,7 @@ index 000000000..5a1257a25 +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.h new file mode 100755 -index 000000000..949fd245c +index 000000000000..949fd245c6af --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.h @@ -0,0 +1,23 @@ @@ -356732,7 +356732,7 @@ index 000000000..949fd245c + diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.c new file mode 100755 -index 000000000..7cd8d5d38 +index 000000000000..7cd8d5d381cf --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.c @@ -0,0 +1,235 @@ @@ -356973,7 +356973,7 @@ index 000000000..7cd8d5d38 +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.h new file mode 100755 -index 000000000..d21d50351 +index 000000000000..d21d503512ec --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.h @@ -0,0 +1,23 @@ @@ -357002,7 +357002,7 @@ index 000000000..d21d50351 + diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.c new file mode 100755 -index 000000000..6be0f8644 +index 000000000000..6be0f86440de --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.c @@ -0,0 +1,222 @@ @@ -357230,7 +357230,7 @@ index 000000000..6be0f8644 +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.h new file mode 100755 -index 000000000..2cea6cedc +index 000000000000..2cea6cedc380 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.h @@ -0,0 +1,84 @@ @@ -357320,7 +357320,7 @@ index 000000000..2cea6cedc +#endif /* __UMP_KERNEL_RANDOM_MAPPING_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c b/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c new file mode 100755 -index 000000000..e41931e1e +index 000000000000..e41931e1ea75 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c @@ -0,0 +1,65 @@ @@ -357391,7 +357391,7 @@ index 000000000..e41931e1e +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c b/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c new file mode 100755 -index 000000000..2b634ba79 +index 000000000000..2b634ba79c6e --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c @@ -0,0 +1,27 @@ @@ -357424,7 +357424,7 @@ index 000000000..2b634ba79 +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_osk_low_level_mem.c b/drivers/gpu/arm/mali400/ump/linux/ump_osk_low_level_mem.c new file mode 100755 -index 000000000..e08bf2525 +index 000000000000..e08bf25257b0 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_low_level_mem.c @@ -0,0 +1,314 @@ @@ -357744,7 +357744,7 @@ index 000000000..e08bf2525 +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_osk_misc.c b/drivers/gpu/arm/mali400/ump/linux/ump_osk_misc.c new file mode 100755 -index 000000000..58c9f1bf2 +index 000000000000..58c9f1bf27b8 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_misc.c @@ -0,0 +1,36 @@ @@ -357786,7 +357786,7 @@ index 000000000..58c9f1bf2 +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.c b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.c new file mode 100755 -index 000000000..56a787ff6 +index 000000000000..56a787ff64dc --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.c @@ -0,0 +1,230 @@ @@ -358022,7 +358022,7 @@ index 000000000..56a787ff6 +#endif diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h new file mode 100755 -index 000000000..61a7095a6 +index 000000000000..61a7095a6920 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h @@ -0,0 +1,36 @@ @@ -358064,7 +358064,7 @@ index 000000000..61a7095a6 +#endif /* __UMP_UKK_REF_WRAPPERS_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c new file mode 100755 -index 000000000..4d6b69608 +index 000000000000..4d6b69608fd4 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c @@ -0,0 +1,280 @@ @@ -358350,7 +358350,7 @@ index 000000000..4d6b69608 +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.h b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.h new file mode 100755 -index 000000000..5f8fc683c +index 000000000000..5f8fc683c8f5 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.h @@ -0,0 +1,46 @@ @@ -358402,7 +358402,7 @@ index 000000000..5f8fc683c +#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 000000000..c238cf0f2 +index 000000000000..c238cf0f2b1f --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/readme.txt @@ -0,0 +1,28 @@ @@ -358436,7 +358436,7 @@ index 000000000..c238cf0f2 +kernel itself. diff --git a/drivers/gpu/arm/mali400/umplock/Makefile b/drivers/gpu/arm/mali400/umplock/Makefile new file mode 100755 -index 000000000..e5549a33f +index 000000000000..e5549a33f91d --- /dev/null +++ b/drivers/gpu/arm/mali400/umplock/Makefile @@ -0,0 +1,69 @@ @@ -358511,7 +358511,7 @@ index 000000000..e5549a33f +endif diff --git a/drivers/gpu/arm/mali400/umplock/umplock_driver.c b/drivers/gpu/arm/mali400/umplock/umplock_driver.c new file mode 100755 -index 000000000..173f4d9bb +index 000000000000..173f4d9bb5c7 --- /dev/null +++ b/drivers/gpu/arm/mali400/umplock/umplock_driver.c @@ -0,0 +1,618 @@ @@ -359135,7 +359135,7 @@ index 000000000..173f4d9bb +MODULE_DESCRIPTION("ARM UMP locker"); diff --git a/drivers/gpu/arm/mali400/umplock/umplock_ioctl.h b/drivers/gpu/arm/mali400/umplock/umplock_ioctl.h new file mode 100755 -index 000000000..8afdaad70 +index 000000000000..8afdaad7000f --- /dev/null +++ b/drivers/gpu/arm/mali400/umplock/umplock_ioctl.h @@ -0,0 +1,66 @@ @@ -359207,7 +359207,7 @@ index 000000000..8afdaad70 + diff --git a/drivers/gpu/arm/midgard/Kbuild b/drivers/gpu/arm/midgard/Kbuild new file mode 100755 -index 000000000..b2c2bbcda +index 000000000000..b2c2bbcda668 --- /dev/null +++ b/drivers/gpu/arm/midgard/Kbuild @@ -0,0 +1,221 @@ @@ -359434,7 +359434,7 @@ index 000000000..b2c2bbcda +obj-$(CONFIG_MALI_KUTF) += tests/ diff --git a/drivers/gpu/arm/midgard/Kconfig b/drivers/gpu/arm/midgard/Kconfig new file mode 100755 -index 000000000..043bfc002 +index 000000000000..043bfc0021cc --- /dev/null +++ b/drivers/gpu/arm/midgard/Kconfig @@ -0,0 +1,249 @@ @@ -359689,7 +359689,7 @@ index 000000000..043bfc002 +source "drivers/gpu/arm/midgard/tests/Kconfig" diff --git a/drivers/gpu/arm/midgard/Makefile b/drivers/gpu/arm/midgard/Makefile new file mode 100755 -index 000000000..9aa242c4f +index 000000000000..9aa242c4f8c4 --- /dev/null +++ b/drivers/gpu/arm/midgard/Makefile @@ -0,0 +1,42 @@ @@ -359737,7 +359737,7 @@ index 000000000..9aa242c4f + $(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 000000000..2bef9c25e +index 000000000000..2bef9c25eaeb --- /dev/null +++ b/drivers/gpu/arm/midgard/Makefile.kbase @@ -0,0 +1,17 @@ @@ -359760,7 +359760,7 @@ index 000000000..2bef9c25e + diff --git a/drivers/gpu/arm/midgard/backend/gpu/Kbuild b/drivers/gpu/arm/midgard/backend/gpu/Kbuild new file mode 100755 -index 000000000..5f700e9b6 +index 000000000000..5f700e9b6b44 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/Kbuild @@ -0,0 +1,60 @@ @@ -359826,7 +359826,7 @@ index 000000000..5f700e9b6 +endif diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_backend_config.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_backend_config.h new file mode 100755 -index 000000000..c8ae87eb8 +index 000000000000..c8ae87eb84a2 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_backend_config.h @@ -0,0 +1,29 @@ @@ -359861,7 +359861,7 @@ index 000000000..c8ae87eb8 + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.c new file mode 100755 -index 000000000..fef9a2cb7 +index 000000000000..fef9a2cb743e --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.c @@ -0,0 +1,29 @@ @@ -359896,7 +359896,7 @@ index 000000000..fef9a2cb7 + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h new file mode 100755 -index 000000000..fe9869109 +index 000000000000..fe9869109a82 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h @@ -0,0 +1,34 @@ @@ -359936,7 +359936,7 @@ index 000000000..fe9869109 +#endif /* _KBASE_CACHE_POLICY_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c new file mode 100755 -index 000000000..7851ea646 +index 000000000000..7851ea6466c7 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c @@ -0,0 +1,157 @@ @@ -360099,7 +360099,7 @@ index 000000000..7851ea646 +#endif diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c new file mode 100755 -index 000000000..4e8e56e9b +index 000000000000..4e8e56e9baf2 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c @@ -0,0 +1,474 @@ @@ -360579,7 +360579,7 @@ index 000000000..4e8e56e9b +} diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h new file mode 100755 -index 000000000..c0bf8b15b +index 000000000000..c0bf8b15b3bc --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h @@ -0,0 +1,24 @@ @@ -360609,7 +360609,7 @@ index 000000000..c0bf8b15b +#endif /* _BASE_DEVFREQ_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c new file mode 100755 -index 000000000..dcdf15cdc +index 000000000000..dcdf15cdc3e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c @@ -0,0 +1,255 @@ @@ -360870,7 +360870,7 @@ index 000000000..dcdf15cdc +} diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_internal.h new file mode 100755 -index 000000000..5b2044593 +index 000000000000..5b20445932fb --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_internal.h @@ -0,0 +1,67 @@ @@ -360943,7 +360943,7 @@ index 000000000..5b2044593 +#endif /* _KBASE_DEVICE_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c new file mode 100755 -index 000000000..d578fd78e +index 000000000000..d578fd78e825 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c @@ -0,0 +1,123 @@ @@ -361072,7 +361072,7 @@ index 000000000..d578fd78e + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c new file mode 100755 -index 000000000..b395325b5 +index 000000000000..b395325b556b --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c @@ -0,0 +1,110 @@ @@ -361188,7 +361188,7 @@ index 000000000..b395325b5 + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c new file mode 100755 -index 000000000..7ad309e8d +index 000000000000..7ad309e8d7f4 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c @@ -0,0 +1,492 @@ @@ -361686,7 +361686,7 @@ index 000000000..7ad309e8d + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h new file mode 100755 -index 000000000..4794672da +index 000000000000..4794672da8f0 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h @@ -0,0 +1,58 @@ @@ -361750,7 +361750,7 @@ index 000000000..4794672da + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_internal.h new file mode 100755 -index 000000000..e96aeae78 +index 000000000000..e96aeae786e1 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_internal.h @@ -0,0 +1,45 @@ @@ -361801,7 +361801,7 @@ index 000000000..e96aeae78 +#endif /* _KBASE_INSTR_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h new file mode 100755 -index 000000000..8781561e7 +index 000000000000..8781561e73d0 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h @@ -0,0 +1,39 @@ @@ -361846,7 +361846,7 @@ index 000000000..8781561e7 +#endif /* _KBASE_IRQ_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c new file mode 100755 -index 000000000..8416b80e8 +index 000000000000..8416b80e8b77 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c @@ -0,0 +1,469 @@ @@ -362321,7 +362321,7 @@ index 000000000..8416b80e8 +#endif /* !defined(CONFIG_MALI_NO_MALI) */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c new file mode 100755 -index 000000000..92358f2bf +index 000000000000..92358f2bf298 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c @@ -0,0 +1,237 @@ @@ -362564,7 +362564,7 @@ index 000000000..92358f2bf + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h new file mode 100755 -index 000000000..08a7400e6 +index 000000000000..08a7400e66d5 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h @@ -0,0 +1,123 @@ @@ -362693,7 +362693,7 @@ index 000000000..08a7400e6 +#endif /* _KBASE_HWACCESS_GPU_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c new file mode 100755 -index 000000000..a6fb097b9 +index 000000000000..a6fb097b94f9 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c @@ -0,0 +1,1518 @@ @@ -364217,7 +364217,7 @@ index 000000000..a6fb097b9 +#endif /* KBASE_GPU_RESET_EN */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h new file mode 100755 -index 000000000..1f382b3c1 +index 000000000000..1f382b3c1af4 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h @@ -0,0 +1,164 @@ @@ -364387,7 +364387,7 @@ index 000000000..1f382b3c1 +#endif /* _KBASE_JM_HWACCESS_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c new file mode 100755 -index 000000000..4b4541660 +index 000000000000..4b4541660ec4 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c @@ -0,0 +1,1952 @@ @@ -366345,7 +366345,7 @@ index 000000000..4b4541660 + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h new file mode 100755 -index 000000000..1e0e05ad3 +index 000000000000..1e0e05ad3ea4 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h @@ -0,0 +1,76 @@ @@ -366427,7 +366427,7 @@ index 000000000..1e0e05ad3 +#endif /* _KBASE_HWACCESS_GPU_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c new file mode 100755 -index 000000000..54d8ddd80 +index 000000000000..54d8ddd80097 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c @@ -0,0 +1,303 @@ @@ -366736,7 +366736,7 @@ index 000000000..54d8ddd80 +#endif /* KBASE_TRACE_ENABLE */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h new file mode 100755 -index 000000000..35d9781ae +index 000000000000..35d9781ae092 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h @@ -0,0 +1,129 @@ @@ -366871,7 +366871,7 @@ index 000000000..35d9781ae +#endif /* _KBASE_JS_AFFINITY_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c new file mode 100755 -index 000000000..a8c1af23a +index 000000000000..a8c1af23a369 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c @@ -0,0 +1,356 @@ @@ -367233,7 +367233,7 @@ index 000000000..a8c1af23a + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h new file mode 100755 -index 000000000..3f53779c6 +index 000000000000..3f53779c6747 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h @@ -0,0 +1,69 @@ @@ -367308,7 +367308,7 @@ index 000000000..3f53779c6 +#endif /* _KBASE_JS_BACKEND_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c new file mode 100755 -index 000000000..ba826184d +index 000000000000..ba826184dd3f --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c @@ -0,0 +1,407 @@ @@ -367721,7 +367721,7 @@ index 000000000..ba826184d +} diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.h new file mode 100755 -index 000000000..c02253c6a +index 000000000000..c02253c6acc3 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.h @@ -0,0 +1,42 @@ @@ -367769,7 +367769,7 @@ index 000000000..c02253c6a +#endif /* _MALI_KBASE_MMU_HW_DIRECT_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c new file mode 100755 -index 000000000..0614348e9 +index 000000000000..0614348e935a --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c @@ -0,0 +1,63 @@ @@ -367838,7 +367838,7 @@ index 000000000..0614348e9 +KBASE_EXPORT_TEST_API(kbase_pm_always_on_policy_ops); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h new file mode 100755 -index 000000000..f9d244b01 +index 000000000000..f9d244b01bc2 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h @@ -0,0 +1,77 @@ @@ -367921,7 +367921,7 @@ index 000000000..f9d244b01 + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_backend.c new file mode 100755 -index 000000000..146fd48ba +index 000000000000..146fd48bab92 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_backend.c @@ -0,0 +1,482 @@ @@ -368409,7 +368409,7 @@ index 000000000..146fd48ba +} diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.c new file mode 100755 -index 000000000..85890f1e8 +index 000000000000..85890f1e85f5 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.c @@ -0,0 +1,182 @@ @@ -368597,7 +368597,7 @@ index 000000000..85890f1e8 +} diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.h new file mode 100755 -index 000000000..ee9e751f2 +index 000000000000..ee9e751f2d79 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.h @@ -0,0 +1,92 @@ @@ -368695,7 +368695,7 @@ index 000000000..ee9e751f2 +#endif /* _KBASE_PM_CA_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c new file mode 100755 -index 000000000..66bf660cf +index 000000000000..66bf660cffb6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c @@ -0,0 +1,129 @@ @@ -368830,7 +368830,7 @@ index 000000000..66bf660cf + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h new file mode 100755 -index 000000000..7ab3cd4d8 +index 000000000000..7ab3cd4d8460 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h @@ -0,0 +1,55 @@ @@ -368891,7 +368891,7 @@ index 000000000..7ab3cd4d8 + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.c new file mode 100755 -index 000000000..864612d31 +index 000000000000..864612d31f9b --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.c @@ -0,0 +1,65 @@ @@ -368962,7 +368962,7 @@ index 000000000..864612d31 +KBASE_EXPORT_TEST_API(kbase_pm_ca_fixed_policy_ops); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h new file mode 100755 -index 000000000..a763155cb +index 000000000000..a763155cb703 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h @@ -0,0 +1,40 @@ @@ -369008,7 +369008,7 @@ index 000000000..a763155cb + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.c new file mode 100755 -index 000000000..f891fa225 +index 000000000000..f891fa225a89 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.c @@ -0,0 +1,70 @@ @@ -369084,7 +369084,7 @@ index 000000000..f891fa225 +KBASE_EXPORT_TEST_API(kbase_pm_coarse_demand_policy_ops); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h new file mode 100755 -index 000000000..749d305ee +index 000000000000..749d305eee9a --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h @@ -0,0 +1,64 @@ @@ -369154,7 +369154,7 @@ index 000000000..749d305ee +#endif /* MALI_KBASE_PM_COARSE_DEMAND_H */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h new file mode 100755 -index 000000000..352744ee6 +index 000000000000..352744ee6d73 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h @@ -0,0 +1,519 @@ @@ -369679,7 +369679,7 @@ index 000000000..352744ee6 +#endif /* _KBASE_PM_HWACCESS_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c new file mode 100755 -index 000000000..81322fd0d +index 000000000000..81322fd0dd17 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c @@ -0,0 +1,73 @@ @@ -369758,7 +369758,7 @@ index 000000000..81322fd0d +KBASE_EXPORT_TEST_API(kbase_pm_demand_policy_ops); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h new file mode 100755 -index 000000000..c0c84b6e9 +index 000000000000..c0c84b6e9189 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h @@ -0,0 +1,64 @@ @@ -369828,7 +369828,7 @@ index 000000000..c0c84b6e9 +#endif /* MALI_KBASE_PM_DEMAND_H */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_driver.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_driver.c new file mode 100755 -index 000000000..82727937c +index 000000000000..82727937c545 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_driver.c @@ -0,0 +1,1713 @@ @@ -371547,7 +371547,7 @@ index 000000000..82727937c +KBASE_EXPORT_TEST_API(kbase_pm_release_gpu_cycle_counter); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_internal.h new file mode 100755 -index 000000000..6804f45ac +index 000000000000..6804f45ac27b --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_internal.h @@ -0,0 +1,548 @@ @@ -372101,7 +372101,7 @@ index 000000000..6804f45ac +#endif /* _KBASE_BACKEND_PM_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_metrics.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_metrics.c new file mode 100755 -index 000000000..024248ca7 +index 000000000000..024248ca7123 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_metrics.c @@ -0,0 +1,401 @@ @@ -372508,7 +372508,7 @@ index 000000000..024248ca7 +} diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.c new file mode 100755 -index 000000000..075f020c6 +index 000000000000..075f020c66e6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.c @@ -0,0 +1,973 @@ @@ -373487,7 +373487,7 @@ index 000000000..075f020c6 +KBASE_EXPORT_TEST_API(kbase_pm_release_l2_caches); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.h new file mode 100755 -index 000000000..611a90e66 +index 000000000000..611a90e66e65 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.h @@ -0,0 +1,227 @@ @@ -373720,7 +373720,7 @@ index 000000000..611a90e66 +#endif /* _KBASE_PM_POLICY_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c new file mode 100755 -index 000000000..d08c628dd +index 000000000000..d08c628dd433 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c @@ -0,0 +1,103 @@ @@ -373829,7 +373829,7 @@ index 000000000..d08c628dd +#endif /* CONFIG_MALI_NO_MALI */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.h new file mode 100755 -index 000000000..433aa4b9c +index 000000000000..433aa4b9cb5e --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.h @@ -0,0 +1,52 @@ @@ -373887,7 +373887,7 @@ index 000000000..433aa4b9c +#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 000000000..35ff2f1ce +index 000000000000..35ff2f1ce4a0 --- /dev/null +++ b/drivers/gpu/arm/midgard/docs/Doxyfile @@ -0,0 +1,126 @@ @@ -374019,7 +374019,7 @@ index 000000000..35ff2f1ce + 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 000000000..7ae05c2f8 +index 000000000000..7ae05c2f8ded --- /dev/null +++ b/drivers/gpu/arm/midgard/docs/policy_operation_diagram.dot @@ -0,0 +1,112 @@ @@ -374137,7 +374137,7 @@ index 000000000..7ae05c2f8 +} 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 000000000..159b993b7 +index 000000000000..159b993b7d61 --- /dev/null +++ b/drivers/gpu/arm/midgard/docs/policy_overview.dot @@ -0,0 +1,63 @@ @@ -374206,7 +374206,7 @@ index 000000000..159b993b7 +} diff --git a/drivers/gpu/arm/midgard/ipa/Kbuild b/drivers/gpu/arm/midgard/ipa/Kbuild new file mode 100755 -index 000000000..602b15f52 +index 000000000000..602b15f5225c --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/Kbuild @@ -0,0 +1,24 @@ @@ -374236,7 +374236,7 @@ index 000000000..602b15f52 +endif diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c new file mode 100755 -index 000000000..01bdbb4e8 +index 000000000000..01bdbb4e8eb1 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c @@ -0,0 +1,585 @@ @@ -374827,7 +374827,7 @@ index 000000000..01bdbb4e8 +KBASE_EXPORT_TEST_API(kbase_ipa_power_model_ops); diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h new file mode 100755 -index 000000000..b2d3db149 +index 000000000000..b2d3db149579 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h @@ -0,0 +1,148 @@ @@ -374981,7 +374981,7 @@ index 000000000..b2d3db149 +#endif diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.c b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.c new file mode 100755 -index 000000000..eafc14009 +index 000000000000..eafc14009ddc --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.c @@ -0,0 +1,219 @@ @@ -375206,7 +375206,7 @@ index 000000000..eafc14009 +} diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.h b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.h new file mode 100755 -index 000000000..ec06e2096 +index 000000000000..ec06e2096f94 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.h @@ -0,0 +1,49 @@ @@ -375261,7 +375261,7 @@ index 000000000..ec06e2096 +#endif /* _KBASE_IPA_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_simple.c b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_simple.c new file mode 100755 -index 000000000..da0a4d4a0 +index 000000000000..da0a4d4a0e7e --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_simple.c @@ -0,0 +1,222 @@ @@ -375489,7 +375489,7 @@ index 000000000..da0a4d4a0 +}; diff --git a/drivers/gpu/arm/midgard/mali_base_hwconfig_features.h b/drivers/gpu/arm/midgard/mali_base_hwconfig_features.h new file mode 100755 -index 000000000..6be0a334f +index 000000000000..6be0a334f99f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_hwconfig_features.h @@ -0,0 +1,311 @@ @@ -375806,7 +375806,7 @@ index 000000000..6be0a334f +#endif /* _BASE_HWCONFIG_FEATURES_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_base_hwconfig_issues.h b/drivers/gpu/arm/midgard/mali_base_hwconfig_issues.h new file mode 100755 -index 000000000..6d7e5c57e +index 000000000000..6d7e5c57e6a4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_hwconfig_issues.h @@ -0,0 +1,1098 @@ @@ -376910,7 +376910,7 @@ index 000000000..6d7e5c57e +#endif /* _BASE_HWCONFIG_ISSUES_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_base_kernel.h b/drivers/gpu/arm/midgard/mali_base_kernel.h new file mode 100755 -index 000000000..ea5e473ca +index 000000000000..ea5e473caef6 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_kernel.h @@ -0,0 +1,1858 @@ @@ -378774,7 +378774,7 @@ index 000000000..ea5e473ca +#endif /* _BASE_KERNEL_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_base_mem_priv.h b/drivers/gpu/arm/midgard/mali_base_mem_priv.h new file mode 100755 -index 000000000..4a98a72cc +index 000000000000..4a98a72cc37a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_mem_priv.h @@ -0,0 +1,52 @@ @@ -378832,7 +378832,7 @@ index 000000000..4a98a72cc +#endif diff --git a/drivers/gpu/arm/midgard/mali_base_vendor_specific_func.h b/drivers/gpu/arm/midgard/mali_base_vendor_specific_func.h new file mode 100755 -index 000000000..be454a216 +index 000000000000..be454a216a39 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_vendor_specific_func.h @@ -0,0 +1,24 @@ @@ -378862,7 +378862,7 @@ index 000000000..be454a216 +#endif /*_BASE_VENDOR_SPEC_FUNC_H_*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase.h b/drivers/gpu/arm/midgard/mali_kbase.h new file mode 100755 -index 000000000..0d9bf23dc +index 000000000000..0d9bf23dc685 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase.h @@ -0,0 +1,612 @@ @@ -379480,7 +379480,7 @@ index 000000000..0d9bf23dc + diff --git a/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.c b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.c new file mode 100755 -index 000000000..fde0f8ff8 +index 000000000000..fde0f8ff8582 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.c @@ -0,0 +1,209 @@ @@ -379695,7 +379695,7 @@ index 000000000..fde0f8ff8 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.h b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.h new file mode 100755 -index 000000000..099a29861 +index 000000000000..099a29861672 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.h @@ -0,0 +1,23 @@ @@ -379724,7 +379724,7 @@ index 000000000..099a29861 +#endif /* _KBASE_10969_WORKAROUND_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.c new file mode 100755 -index 000000000..f910fe970 +index 000000000000..f910fe970feb --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.c @@ -0,0 +1,102 @@ @@ -379832,7 +379832,7 @@ index 000000000..f910fe970 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.h new file mode 100755 -index 000000000..3ed224889 +index 000000000000..3ed2248897fc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.h @@ -0,0 +1,45 @@ @@ -379883,7 +379883,7 @@ index 000000000..3ed224889 +#endif /*_KBASE_AS_FAULT_DEBUG_FS_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_cache_policy.c b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.c new file mode 100755 -index 000000000..c67b3e97f +index 000000000000..c67b3e97f1af --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.c @@ -0,0 +1,64 @@ @@ -379953,7 +379953,7 @@ index 000000000..c67b3e97f +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_cache_policy.h b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.h new file mode 100755 -index 000000000..0c18bdb35 +index 000000000000..0c18bdb357b0 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.h @@ -0,0 +1,45 @@ @@ -380004,7 +380004,7 @@ index 000000000..0c18bdb35 +#endif /* _KBASE_CACHE_POLICY_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_config.c b/drivers/gpu/arm/midgard/mali_kbase_config.c new file mode 100755 -index 000000000..fb615ae02 +index 000000000000..fb615ae02ead --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_config.c @@ -0,0 +1,51 @@ @@ -380061,7 +380061,7 @@ index 000000000..fb615ae02 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_config.h b/drivers/gpu/arm/midgard/mali_kbase_config.h new file mode 100755 -index 000000000..356d52bcd +index 000000000000..356d52bcd774 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_config.h @@ -0,0 +1,345 @@ @@ -380412,7 +380412,7 @@ index 000000000..356d52bcd +#endif /* _KBASE_CONFIG_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h b/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h new file mode 100755 -index 000000000..1cf44b350 +index 000000000000..1cf44b3500cf --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h @@ -0,0 +1,227 @@ @@ -380645,7 +380645,7 @@ index 000000000..1cf44b350 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_context.c b/drivers/gpu/arm/midgard/mali_kbase_context.c new file mode 100755 -index 000000000..6338a7e22 +index 000000000000..6338a7e221ed --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_context.c @@ -0,0 +1,342 @@ @@ -380993,7 +380993,7 @@ index 000000000..6338a7e22 +KBASE_EXPORT_SYMBOL(kbase_context_set_create_flags); diff --git a/drivers/gpu/arm/midgard/mali_kbase_context.h b/drivers/gpu/arm/midgard/mali_kbase_context.h new file mode 100755 -index 000000000..a3f5bb0ce +index 000000000000..a3f5bb0ce0da --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_context.h @@ -0,0 +1,90 @@ @@ -381089,7 +381089,7 @@ index 000000000..a3f5bb0ce +#endif /* _KBASE_CONTEXT_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c new file mode 100755 -index 000000000..da55cb080 +index 000000000000..da55cb080d00 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c @@ -0,0 +1,4990 @@ @@ -386085,7 +386085,7 @@ index 000000000..da55cb080 +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.c b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.c new file mode 100755 -index 000000000..ce0048414 +index 000000000000..ce004841403f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.c @@ -0,0 +1,208 @@ @@ -386299,7 +386299,7 @@ index 000000000..ce0048414 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.h b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.h new file mode 100755 -index 000000000..47474fecc +index 000000000000..47474fecc2a9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.h @@ -0,0 +1,134 @@ @@ -386439,7 +386439,7 @@ index 000000000..47474fecc +#endif /* _KBASE_CTX_SCHED_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug.c b/drivers/gpu/arm/midgard/mali_kbase_debug.c new file mode 100755 -index 000000000..fb57ac2e3 +index 000000000000..fb57ac2e31ad --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug.c @@ -0,0 +1,39 @@ @@ -386484,7 +386484,7 @@ index 000000000..fb57ac2e3 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug.h b/drivers/gpu/arm/midgard/mali_kbase_debug.h new file mode 100755 -index 000000000..5fff2892b +index 000000000000..5fff2892bb55 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug.h @@ -0,0 +1,164 @@ @@ -386654,7 +386654,7 @@ index 000000000..5fff2892b +#endif /* _KBASE_DEBUG_H */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.c b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.c new file mode 100755 -index 000000000..f29430ddf +index 000000000000..f29430ddf8f9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.c @@ -0,0 +1,499 @@ @@ -387159,7 +387159,7 @@ index 000000000..f29430ddf +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.h b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.h new file mode 100755 -index 000000000..a2bf8983c +index 000000000000..a2bf8983c37c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.h @@ -0,0 +1,96 @@ @@ -387261,7 +387261,7 @@ index 000000000..a2bf8983c +#endif /*_KBASE_DEBUG_JOB_FAULT_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c new file mode 100755 -index 000000000..6f2cbdf57 +index 000000000000..6f2cbdf571cb --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c @@ -0,0 +1,306 @@ @@ -387573,7 +387573,7 @@ index 000000000..6f2cbdf57 +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.h b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.h new file mode 100755 -index 000000000..20ab51a77 +index 000000000000..20ab51a776c6 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.h @@ -0,0 +1,25 @@ @@ -387604,7 +387604,7 @@ index 000000000..20ab51a77 +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_defs.h b/drivers/gpu/arm/midgard/mali_kbase_defs.h new file mode 100755 -index 000000000..f8a6f33df +index 000000000000..f8a6f33df2da --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_defs.h @@ -0,0 +1,1602 @@ @@ -389212,7 +389212,7 @@ index 000000000..f8a6f33df +#endif /* _KBASE_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_device.c b/drivers/gpu/arm/midgard/mali_kbase_device.c new file mode 100755 -index 000000000..b0eb67da8 +index 000000000000..b0eb67da8644 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_device.c @@ -0,0 +1,674 @@ @@ -389892,7 +389892,7 @@ index 000000000..b0eb67da8 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_disjoint_events.c b/drivers/gpu/arm/midgard/mali_kbase_disjoint_events.c new file mode 100755 -index 000000000..f70bcccf4 +index 000000000000..f70bcccf4050 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_disjoint_events.c @@ -0,0 +1,76 @@ @@ -389974,7 +389974,7 @@ index 000000000..f70bcccf4 +KBASE_EXPORT_TEST_API(kbase_disjoint_event_get); diff --git a/drivers/gpu/arm/midgard/mali_kbase_dma_fence.c b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.c new file mode 100755 -index 000000000..9197743c8 +index 000000000000..9197743c81d4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.c @@ -0,0 +1,449 @@ @@ -390429,7 +390429,7 @@ index 000000000..9197743c8 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_dma_fence.h b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.h new file mode 100755 -index 000000000..c9ab40350 +index 000000000000..c9ab40350422 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.h @@ -0,0 +1,131 @@ @@ -390566,7 +390566,7 @@ index 000000000..c9ab40350 +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_event.c b/drivers/gpu/arm/midgard/mali_kbase_event.c new file mode 100755 -index 000000000..188148645 +index 000000000000..188148645f37 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_event.c @@ -0,0 +1,259 @@ @@ -390831,7 +390831,7 @@ index 000000000..188148645 +KBASE_EXPORT_TEST_API(kbase_event_cleanup); diff --git a/drivers/gpu/arm/midgard/mali_kbase_fence.c b/drivers/gpu/arm/midgard/mali_kbase_fence.c new file mode 100755 -index 000000000..3bcfb38c3 +index 000000000000..3bcfb38c31c2 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_fence.c @@ -0,0 +1,200 @@ @@ -391037,7 +391037,7 @@ index 000000000..3bcfb38c3 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_fence.h b/drivers/gpu/arm/midgard/mali_kbase_fence.h new file mode 100755 -index 000000000..639cc2ef4 +index 000000000000..639cc2ef4348 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_fence.h @@ -0,0 +1,275 @@ @@ -391318,7 +391318,7 @@ index 000000000..639cc2ef4 +#endif /* _KBASE_FENCE_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h b/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h new file mode 100755 -index 000000000..fa2c6dfe9 +index 000000000000..fa2c6dfe999e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h @@ -0,0 +1,51 @@ @@ -391375,7 +391375,7 @@ index 000000000..fa2c6dfe9 +#endif /* _KBASE_FENCE_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator.h b/drivers/gpu/arm/midgard/mali_kbase_gator.h new file mode 100755 -index 000000000..ce65b5562 +index 000000000000..ce65b5562a2b --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator.h @@ -0,0 +1,45 @@ @@ -391426,7 +391426,7 @@ index 000000000..ce65b5562 +#endif /* _KBASE_GATOR_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_api.c b/drivers/gpu/arm/midgard/mali_kbase_gator_api.c new file mode 100755 -index 000000000..860e10159 +index 000000000000..860e10159fb3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_api.c @@ -0,0 +1,334 @@ @@ -391766,7 +391766,7 @@ index 000000000..860e10159 +KBASE_EXPORT_SYMBOL(kbase_gator_instr_hwcnt_dump_irq); diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_api.h b/drivers/gpu/arm/midgard/mali_kbase_gator_api.h new file mode 100755 -index 000000000..ef9ac0f7b +index 000000000000..ef9ac0f7b633 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_api.h @@ -0,0 +1,219 @@ @@ -391991,7 +391991,7 @@ index 000000000..ef9ac0f7b +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names.h new file mode 100755 -index 000000000..cad19b662 +index 000000000000..cad19b66200d --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names.h @@ -0,0 +1,2170 @@ @@ -394167,7 +394167,7 @@ index 000000000..cad19b662 +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_thex.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_thex.h new file mode 100755 -index 000000000..bcceef4fc +index 000000000000..bcceef4fc9bc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_thex.h @@ -0,0 +1,291 @@ @@ -394464,7 +394464,7 @@ index 000000000..bcceef4fc +#endif /* _KBASE_GATOR_HWCNT_NAMES_THEX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tmix.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tmix.h new file mode 100755 -index 000000000..5ea06770f +index 000000000000..5ea06770fdb2 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tmix.h @@ -0,0 +1,291 @@ @@ -394761,7 +394761,7 @@ index 000000000..5ea06770f +#endif /* _KBASE_GATOR_HWCNT_NAMES_TMIX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tsix.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tsix.h new file mode 100755 -index 000000000..be09c4556 +index 000000000000..be09c4556735 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tsix.h @@ -0,0 +1,291 @@ @@ -395058,7 +395058,7 @@ index 000000000..be09c4556 +#endif /* _KBASE_GATOR_HWCNT_NAMES_TSIX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h b/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h new file mode 100755 -index 000000000..42f0111c4 +index 000000000000..42f0111c474f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h @@ -0,0 +1,123 @@ @@ -395187,7 +395187,7 @@ index 000000000..42f0111c4 +#endif /* _KBASE_GPU_ID_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.c new file mode 100755 -index 000000000..6df0a1cb1 +index 000000000000..6df0a1cb1264 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.c @@ -0,0 +1,97 @@ @@ -395290,7 +395290,7 @@ index 000000000..6df0a1cb1 +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.h new file mode 100755 -index 000000000..7045693eb +index 000000000000..7045693eb910 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.h @@ -0,0 +1,37 @@ @@ -395333,7 +395333,7 @@ index 000000000..7045693eb +#endif /*_KBASE_GPU_MEMORY_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpuprops.c b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.c new file mode 100755 -index 000000000..a947a2e03 +index 000000000000..a947a2e03a2f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.c @@ -0,0 +1,510 @@ @@ -395849,7 +395849,7 @@ index 000000000..a947a2e03 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpuprops.h b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.h new file mode 100755 -index 000000000..57b3eaf9c +index 000000000000..57b3eaf9cd53 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.h @@ -0,0 +1,84 @@ @@ -395939,7 +395939,7 @@ index 000000000..57b3eaf9c +#endif /* _KBASE_GPUPROPS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpuprops_types.h b/drivers/gpu/arm/midgard/mali_kbase_gpuprops_types.h new file mode 100755 -index 000000000..10794fc27 +index 000000000000..10794fc27318 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops_types.h @@ -0,0 +1,92 @@ @@ -396037,7 +396037,7 @@ index 000000000..10794fc27 +#endif /* _KBASE_GPUPROPS_TYPES_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hw.c b/drivers/gpu/arm/midgard/mali_kbase_hw.c new file mode 100755 -index 000000000..9a390d233 +index 000000000000..9a390d233939 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hw.c @@ -0,0 +1,453 @@ @@ -396496,7 +396496,7 @@ index 000000000..9a390d233 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_hw.h b/drivers/gpu/arm/midgard/mali_kbase_hw.h new file mode 100755 -index 000000000..754250ce9 +index 000000000000..754250ce968d --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hw.h @@ -0,0 +1,65 @@ @@ -396567,7 +396567,7 @@ index 000000000..754250ce9 +#endif /* _KBASE_HW_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_backend.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_backend.h new file mode 100755 -index 000000000..b09be99e6 +index 000000000000..b09be99e6b4e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_backend.h @@ -0,0 +1,54 @@ @@ -396627,7 +396627,7 @@ index 000000000..b09be99e6 +#endif /* _KBASE_HWACCESS_BACKEND_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_defs.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_defs.h new file mode 100755 -index 000000000..0acf29719 +index 000000000000..0acf297192fd --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_defs.h @@ -0,0 +1,36 @@ @@ -396669,7 +396669,7 @@ index 000000000..0acf29719 +#endif /* _KBASE_HWACCESS_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_gpuprops.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_gpuprops.h new file mode 100755 -index 000000000..cf8a8131c +index 000000000000..cf8a8131c22e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_gpuprops.h @@ -0,0 +1,47 @@ @@ -396722,7 +396722,7 @@ index 000000000..cf8a8131c +#endif /* _KBASE_HWACCESS_GPUPROPS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_instr.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_instr.h new file mode 100755 -index 000000000..5de2b7535 +index 000000000000..5de2b7535bb4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_instr.h @@ -0,0 +1,116 @@ @@ -396844,7 +396844,7 @@ index 000000000..5de2b7535 +#endif /* _KBASE_HWACCESS_INSTR_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_jm.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_jm.h new file mode 100755 -index 000000000..750fda2cd +index 000000000000..750fda2cd81d --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_jm.h @@ -0,0 +1,381 @@ @@ -397231,7 +397231,7 @@ index 000000000..750fda2cd +#endif /* _KBASE_HWACCESS_JM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_pm.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_pm.h new file mode 100755 -index 000000000..71c7d495c +index 000000000000..71c7d495c40a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_pm.h @@ -0,0 +1,209 @@ @@ -397446,7 +397446,7 @@ index 000000000..71c7d495c +#endif /* _KBASE_HWACCESS_PM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_time.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_time.h new file mode 100755 -index 000000000..10b65798e +index 000000000000..10b65798e6cf --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_time.h @@ -0,0 +1,53 @@ @@ -397505,7 +397505,7 @@ index 000000000..10b65798e +#endif /* _KBASE_BACKEND_TIME_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwcnt_reader.h b/drivers/gpu/arm/midgard/mali_kbase_hwcnt_reader.h new file mode 100755 -index 000000000..cf7bf1b35 +index 000000000000..cf7bf1b35dc5 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwcnt_reader.h @@ -0,0 +1,66 @@ @@ -397577,7 +397577,7 @@ index 000000000..cf7bf1b35 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_ioctl.h b/drivers/gpu/arm/midgard/mali_kbase_ioctl.h new file mode 100755 -index 000000000..dcbed9c77 +index 000000000000..dcbed9c774d6 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_ioctl.h @@ -0,0 +1,656 @@ @@ -398239,7 +398239,7 @@ index 000000000..dcbed9c77 +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_jd.c b/drivers/gpu/arm/midgard/mali_kbase_jd.c new file mode 100755 -index 000000000..d9d8658d3 +index 000000000000..d9d8658d31dc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jd.c @@ -0,0 +1,1903 @@ @@ -400148,7 +400148,7 @@ index 000000000..d9d8658d3 +KBASE_EXPORT_TEST_API(kbase_jd_exit); diff --git a/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c new file mode 100755 -index 000000000..44643abf8 +index 000000000000..44643abf85aa --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c @@ -0,0 +1,233 @@ @@ -400387,7 +400387,7 @@ index 000000000..44643abf8 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.h new file mode 100755 -index 000000000..0935f1db7 +index 000000000000..0935f1db7296 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.h @@ -0,0 +1,39 @@ @@ -400432,7 +400432,7 @@ index 000000000..0935f1db7 +#endif /*_KBASE_JD_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_jm.c b/drivers/gpu/arm/midgard/mali_kbase_jm.c new file mode 100755 -index 000000000..0c5c6a6f7 +index 000000000000..0c5c6a6f78cb --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jm.c @@ -0,0 +1,131 @@ @@ -400569,7 +400569,7 @@ index 000000000..0c5c6a6f7 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_jm.h b/drivers/gpu/arm/midgard/mali_kbase_jm.h new file mode 100755 -index 000000000..a74ee24c8 +index 000000000000..a74ee24c8058 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jm.h @@ -0,0 +1,110 @@ @@ -400685,7 +400685,7 @@ index 000000000..a74ee24c8 +#endif /* _KBASE_JM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_js.c b/drivers/gpu/arm/midgard/mali_kbase_js.c new file mode 100755 -index 000000000..10a1d5909 +index 000000000000..10a1d5909bbe --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js.c @@ -0,0 +1,2834 @@ @@ -403525,7 +403525,7 @@ index 000000000..10a1d5909 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_js.h b/drivers/gpu/arm/midgard/mali_kbase_js.h new file mode 100755 -index 000000000..ddada8e46 +index 000000000000..ddada8e468a1 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js.h @@ -0,0 +1,925 @@ @@ -404456,7 +404456,7 @@ index 000000000..ddada8e46 +#endif /* _KBASE_JS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.c b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.c new file mode 100755 -index 000000000..321506ada +index 000000000000..321506ada835 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.c @@ -0,0 +1,301 @@ @@ -404763,7 +404763,7 @@ index 000000000..321506ada +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.h b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.h new file mode 100755 -index 000000000..ce9183326 +index 000000000000..ce9183326a57 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.h @@ -0,0 +1,158 @@ @@ -404927,7 +404927,7 @@ index 000000000..ce9183326 +#endif /* _KBASE_JS_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_js_defs.h b/drivers/gpu/arm/midgard/mali_kbase_js_defs.h new file mode 100755 -index 000000000..ba8b64415 +index 000000000000..ba8b6441549b --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js_defs.h @@ -0,0 +1,386 @@ @@ -405319,7 +405319,7 @@ index 000000000..ba8b64415 +#endif /* _KBASE_JS_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_linux.h b/drivers/gpu/arm/midgard/mali_kbase_linux.h new file mode 100755 -index 000000000..6d1e61fd4 +index 000000000000..6d1e61fd41e0 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_linux.h @@ -0,0 +1,43 @@ @@ -405368,7 +405368,7 @@ index 000000000..6d1e61fd4 +#endif /* _KBASE_LINUX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem.c b/drivers/gpu/arm/midgard/mali_kbase_mem.c new file mode 100755 -index 000000000..8cbb5f676 +index 000000000000..8cbb5f6765b8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem.c @@ -0,0 +1,2657 @@ @@ -408031,7 +408031,7 @@ index 000000000..8cbb5f676 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem.h b/drivers/gpu/arm/midgard/mali_kbase_mem.h new file mode 100755 -index 000000000..3f3eaa3fd +index 000000000000..3f3eaa3fda98 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem.h @@ -0,0 +1,1068 @@ @@ -409105,7 +409105,7 @@ index 000000000..3f3eaa3fd +#endif /* _KBASE_MEM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c new file mode 100755 -index 000000000..e20315e67 +index 000000000000..e20315e67242 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c @@ -0,0 +1,2578 @@ @@ -411689,7 +411689,7 @@ index 000000000..e20315e67 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.h b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.h new file mode 100755 -index 000000000..33b3554f9 +index 000000000000..33b3554f9d82 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.h @@ -0,0 +1,231 @@ @@ -411926,7 +411926,7 @@ index 000000000..33b3554f9 +#endif /* _KBASE_MEM_LINUX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_lowlevel.h b/drivers/gpu/arm/midgard/mali_kbase_mem_lowlevel.h new file mode 100755 -index 000000000..9725fd3f0 +index 000000000000..9725fd3f05df --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_lowlevel.h @@ -0,0 +1,45 @@ @@ -411977,7 +411977,7 @@ index 000000000..9725fd3f0 +#endif /* _KBASE_LOWLEVEL_H */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_pool.c b/drivers/gpu/arm/midgard/mali_kbase_mem_pool.c new file mode 100755 -index 000000000..a8269940a +index 000000000000..a8269940a037 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool.c @@ -0,0 +1,569 @@ @@ -412552,7 +412552,7 @@ index 000000000..a8269940a +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.c new file mode 100755 -index 000000000..585fba036 +index 000000000000..585fba036c9e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.c @@ -0,0 +1,81 @@ @@ -412639,7 +412639,7 @@ index 000000000..585fba036 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.h new file mode 100755 -index 000000000..1442854e8 +index 000000000000..1442854e8956 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.h @@ -0,0 +1,36 @@ @@ -412681,7 +412681,7 @@ index 000000000..1442854e8 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c new file mode 100755 -index 000000000..d58fd8d62 +index 000000000000..d58fd8d62fde --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c @@ -0,0 +1,121 @@ @@ -412808,7 +412808,7 @@ index 000000000..d58fd8d62 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.h new file mode 100755 -index 000000000..a1dc2e0b1 +index 000000000000..a1dc2e0b165b --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.h @@ -0,0 +1,59 @@ @@ -412873,7 +412873,7 @@ index 000000000..a1dc2e0b1 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs_buf_size.h b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs_buf_size.h new file mode 100755 -index 000000000..82f070297 +index 000000000000..82f0702974c2 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs_buf_size.h @@ -0,0 +1,33 @@ @@ -412912,7 +412912,7 @@ index 000000000..82f070297 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu.c b/drivers/gpu/arm/midgard/mali_kbase_mmu.c new file mode 100755 -index 000000000..26144850a +index 000000000000..26144850a588 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu.c @@ -0,0 +1,2088 @@ @@ -415006,7 +415006,7 @@ index 000000000..26144850a +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu_hw.h b/drivers/gpu/arm/midgard/mali_kbase_mmu_hw.h new file mode 100755 -index 000000000..986e959e9 +index 000000000000..986e959e9a0c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_hw.h @@ -0,0 +1,123 @@ @@ -415135,7 +415135,7 @@ index 000000000..986e959e9 +#endif /* _MALI_KBASE_MMU_HW_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu_mode.h b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode.h new file mode 100755 -index 000000000..b487c0042 +index 000000000000..b487c00426ae --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode.h @@ -0,0 +1,47 @@ @@ -415188,7 +415188,7 @@ index 000000000..b487c0042 +#endif /* _MALI_KBASE_MMU_MODE_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_aarch64.c b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_aarch64.c new file mode 100755 -index 000000000..60df17116 +index 000000000000..60df171164ff --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_aarch64.c @@ -0,0 +1,200 @@ @@ -415394,7 +415394,7 @@ index 000000000..60df17116 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_lpae.c b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_lpae.c new file mode 100755 -index 000000000..53fbbc73a +index 000000000000..53fbbc73af91 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_lpae.c @@ -0,0 +1,198 @@ @@ -415598,7 +415598,7 @@ index 000000000..53fbbc73a +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_platform_fake.c b/drivers/gpu/arm/midgard/mali_kbase_platform_fake.c new file mode 100755 -index 000000000..1a44957fe +index 000000000000..1a44957fe44a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_platform_fake.c @@ -0,0 +1,124 @@ @@ -415728,7 +415728,7 @@ index 000000000..1a44957fe + diff --git a/drivers/gpu/arm/midgard/mali_kbase_pm.c b/drivers/gpu/arm/midgard/mali_kbase_pm.c new file mode 100755 -index 000000000..97d543464 +index 000000000000..97d543464c28 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_pm.c @@ -0,0 +1,205 @@ @@ -415939,7 +415939,7 @@ index 000000000..97d543464 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_pm.h b/drivers/gpu/arm/midgard/mali_kbase_pm.h new file mode 100755 -index 000000000..37fa2479d +index 000000000000..37fa2479df74 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_pm.h @@ -0,0 +1,171 @@ @@ -416116,7 +416116,7 @@ index 000000000..37fa2479d +#endif /* _KBASE_PM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_profiling_gator_api.h b/drivers/gpu/arm/midgard/mali_kbase_profiling_gator_api.h new file mode 100755 -index 000000000..7fb674ede +index 000000000000..7fb674eded37 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_profiling_gator_api.h @@ -0,0 +1,40 @@ @@ -416162,7 +416162,7 @@ index 000000000..7fb674ede +#endif /* _KBASE_PROFILING_GATOR_API */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.c new file mode 100755 -index 000000000..c97065006 +index 000000000000..c970650069cd --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.c @@ -0,0 +1,130 @@ @@ -416298,7 +416298,7 @@ index 000000000..c97065006 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.h new file mode 100755 -index 000000000..f10837002 +index 000000000000..f10837002330 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.h @@ -0,0 +1,50 @@ @@ -416354,7 +416354,7 @@ index 000000000..f10837002 +#endif /*_KBASE_REGS_HISTORY_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_replay.c b/drivers/gpu/arm/midgard/mali_kbase_replay.c new file mode 100755 -index 000000000..84aa3316e +index 000000000000..84aa3316e435 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_replay.c @@ -0,0 +1,1166 @@ @@ -417526,7 +417526,7 @@ index 000000000..84aa3316e +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_smc.c b/drivers/gpu/arm/midgard/mali_kbase_smc.c new file mode 100755 -index 000000000..6c8cf73ae +index 000000000000..6c8cf73ae58c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_smc.c @@ -0,0 +1,86 @@ @@ -417618,7 +417618,7 @@ index 000000000..6c8cf73ae + diff --git a/drivers/gpu/arm/midgard/mali_kbase_smc.h b/drivers/gpu/arm/midgard/mali_kbase_smc.h new file mode 100755 -index 000000000..9bff3d2e8 +index 000000000000..9bff3d2e8b4d --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_smc.h @@ -0,0 +1,67 @@ @@ -417691,7 +417691,7 @@ index 000000000..9bff3d2e8 +#endif /* _KBASE_SMC_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_softjobs.c b/drivers/gpu/arm/midgard/mali_kbase_softjobs.c new file mode 100755 -index 000000000..396953e78 +index 000000000000..396953e780a8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_softjobs.c @@ -0,0 +1,1549 @@ @@ -419246,7 +419246,7 @@ index 000000000..396953e78 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_strings.c b/drivers/gpu/arm/midgard/mali_kbase_strings.c new file mode 100755 -index 000000000..c98762cec +index 000000000000..c98762cec244 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_strings.c @@ -0,0 +1,23 @@ @@ -419275,7 +419275,7 @@ index 000000000..c98762cec +const char kbase_timeline_name[] = KBASE_TIMELINE_NAME; diff --git a/drivers/gpu/arm/midgard/mali_kbase_strings.h b/drivers/gpu/arm/midgard/mali_kbase_strings.h new file mode 100755 -index 000000000..41b8fdbec +index 000000000000..41b8fdbec6a4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_strings.h @@ -0,0 +1,19 @@ @@ -419300,7 +419300,7 @@ index 000000000..41b8fdbec +extern const char kbase_timeline_name[]; diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync.h b/drivers/gpu/arm/midgard/mali_kbase_sync.h new file mode 100755 -index 000000000..33b580595 +index 000000000000..33b580595563 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync.h @@ -0,0 +1,203 @@ @@ -419509,7 +419509,7 @@ index 000000000..33b580595 +#endif /* MALI_KBASE_SYNC_H */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync_android.c b/drivers/gpu/arm/midgard/mali_kbase_sync_android.c new file mode 100755 -index 000000000..d7349dcae +index 000000000000..d7349dcae69a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync_android.c @@ -0,0 +1,537 @@ @@ -420052,7 +420052,7 @@ index 000000000..d7349dcae +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync_common.c b/drivers/gpu/arm/midgard/mali_kbase_sync_common.c new file mode 100755 -index 000000000..457def296 +index 000000000000..457def296684 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync_common.c @@ -0,0 +1,43 @@ @@ -420101,7 +420101,7 @@ index 000000000..457def296 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync_file.c b/drivers/gpu/arm/midgard/mali_kbase_sync_file.c new file mode 100755 -index 000000000..60b5d74db +index 000000000000..60b5d74db33e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync_file.c @@ -0,0 +1,359 @@ @@ -420466,7 +420466,7 @@ index 000000000..60b5d74db +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_tlstream.c b/drivers/gpu/arm/midgard/mali_kbase_tlstream.c new file mode 100755 -index 000000000..c8310c45f +index 000000000000..c8310c45f143 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_tlstream.c @@ -0,0 +1,2572 @@ @@ -423044,7 +423044,7 @@ index 000000000..c8310c45f +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_tlstream.h b/drivers/gpu/arm/midgard/mali_kbase_tlstream.h new file mode 100755 -index 000000000..c0a1117d5 +index 000000000000..c0a1117d5f25 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_tlstream.h @@ -0,0 +1,623 @@ @@ -423673,7 +423673,7 @@ index 000000000..c0a1117d5 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_trace_defs.h b/drivers/gpu/arm/midgard/mali_kbase_trace_defs.h new file mode 100755 -index 000000000..e2e054420 +index 000000000000..e2e0544208ce --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_defs.h @@ -0,0 +1,264 @@ @@ -423943,7 +423943,7 @@ index 000000000..e2e054420 +/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c new file mode 100755 -index 000000000..5830e87f0 +index 000000000000..5830e87f0818 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c @@ -0,0 +1,236 @@ @@ -424185,7 +424185,7 @@ index 000000000..5830e87f0 +#endif /* CONFIG_MALI_TRACE_TIMELINE */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.h b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.h new file mode 100755 -index 000000000..a04f7c142 +index 000000000000..a04f7c1420e0 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.h @@ -0,0 +1,363 @@ @@ -424554,7 +424554,7 @@ index 000000000..a04f7c142 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_trace_timeline_defs.h b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline_defs.h new file mode 100755 -index 000000000..156a95a67 +index 000000000000..156a95a67f4a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline_defs.h @@ -0,0 +1,140 @@ @@ -424700,7 +424700,7 @@ index 000000000..156a95a67 +"_tgid,job_slot,_producerof_atom_number_completed") diff --git a/drivers/gpu/arm/midgard/mali_kbase_uku.h b/drivers/gpu/arm/midgard/mali_kbase_uku.h new file mode 100755 -index 000000000..c22a59324 +index 000000000000..c22a59324248 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_uku.h @@ -0,0 +1,545 @@ @@ -425251,7 +425251,7 @@ index 000000000..c22a59324 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_utility.c b/drivers/gpu/arm/midgard/mali_kbase_utility.c new file mode 100755 -index 000000000..be474ff87 +index 000000000000..be474ff87401 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_utility.c @@ -0,0 +1,33 @@ @@ -425290,7 +425290,7 @@ index 000000000..be474ff87 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_utility.h b/drivers/gpu/arm/midgard/mali_kbase_utility.h new file mode 100755 -index 000000000..fd7252dab +index 000000000000..fd7252dab0de --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_utility.h @@ -0,0 +1,37 @@ @@ -425333,7 +425333,7 @@ index 000000000..fd7252dab +#endif /* _KBASE_UTILITY_H */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_vinstr.c b/drivers/gpu/arm/midgard/mali_kbase_vinstr.c new file mode 100755 -index 000000000..8395568d0 +index 000000000000..8395568d0efa --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_vinstr.c @@ -0,0 +1,2070 @@ @@ -427409,7 +427409,7 @@ index 000000000..8395568d0 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_vinstr.h b/drivers/gpu/arm/midgard/mali_kbase_vinstr.h new file mode 100755 -index 000000000..6207d25ae +index 000000000000..6207d25aef06 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_vinstr.h @@ -0,0 +1,155 @@ @@ -427570,7 +427570,7 @@ index 000000000..6207d25ae + diff --git a/drivers/gpu/arm/midgard/mali_linux_kbase_trace.h b/drivers/gpu/arm/midgard/mali_linux_kbase_trace.h new file mode 100755 -index 000000000..5d6b4021d +index 000000000000..5d6b4021d626 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_linux_kbase_trace.h @@ -0,0 +1,201 @@ @@ -427777,7 +427777,7 @@ index 000000000..5d6b4021d +#include diff --git a/drivers/gpu/arm/midgard/mali_linux_trace.h b/drivers/gpu/arm/midgard/mali_linux_trace.h new file mode 100755 -index 000000000..2be06a552 +index 000000000000..2be06a552768 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_linux_trace.h @@ -0,0 +1,189 @@ @@ -427972,7 +427972,7 @@ index 000000000..2be06a552 +#include diff --git a/drivers/gpu/arm/midgard/mali_malisw.h b/drivers/gpu/arm/midgard/mali_malisw.h new file mode 100755 -index 000000000..99452933e +index 000000000000..99452933eab4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_malisw.h @@ -0,0 +1,131 @@ @@ -428109,7 +428109,7 @@ index 000000000..99452933e +#endif /* _MALISW_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_midg_coherency.h b/drivers/gpu/arm/midgard/mali_midg_coherency.h new file mode 100755 -index 000000000..a509cbd5f +index 000000000000..a509cbd5f175 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_midg_coherency.h @@ -0,0 +1,26 @@ @@ -428141,7 +428141,7 @@ index 000000000..a509cbd5f +#endif /* _MIDG_COHERENCY_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_midg_regmap.h b/drivers/gpu/arm/midgard/mali_midg_regmap.h new file mode 100755 -index 000000000..7d7b7bcd3 +index 000000000000..7d7b7bcd3cc3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_midg_regmap.h @@ -0,0 +1,611 @@ @@ -428758,7 +428758,7 @@ index 000000000..7d7b7bcd3 +#endif /* _MIDGARD_REGMAP_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_timeline.h b/drivers/gpu/arm/midgard/mali_timeline.h new file mode 100755 -index 000000000..bd5f6614b +index 000000000000..bd5f6614b6bb --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_timeline.h @@ -0,0 +1,396 @@ @@ -429160,7 +429160,7 @@ index 000000000..bd5f6614b + diff --git a/drivers/gpu/arm/midgard/mali_uk.h b/drivers/gpu/arm/midgard/mali_uk.h new file mode 100755 -index 000000000..841d03fb5 +index 000000000000..841d03fb5873 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_uk.h @@ -0,0 +1,141 @@ @@ -429307,7 +429307,7 @@ index 000000000..841d03fb5 +#endif /* _UK_H_ */ diff --git a/drivers/gpu/arm/midgard/platform/Kconfig b/drivers/gpu/arm/midgard/platform/Kconfig new file mode 100755 -index 000000000..8fb4e917c +index 000000000000..8fb4e917c4fa --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/Kconfig @@ -0,0 +1,24 @@ @@ -429337,7 +429337,7 @@ index 000000000..8fb4e917c + diff --git a/drivers/gpu/arm/midgard/platform/devicetree/Kbuild b/drivers/gpu/arm/midgard/platform/devicetree/Kbuild new file mode 100755 -index 000000000..e888a42fc +index 000000000000..e888a42fc69a --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/Kbuild @@ -0,0 +1,18 @@ @@ -429361,7 +429361,7 @@ index 000000000..e888a42fc + $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_runtime_pm.o diff --git a/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_devicetree.c b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_devicetree.c new file mode 100755 -index 000000000..b2a7c93f1 +index 000000000000..b2a7c93f12a9 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_devicetree.c @@ -0,0 +1,31 @@ @@ -429398,7 +429398,7 @@ index 000000000..b2a7c93f1 +} diff --git a/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_platform.h new file mode 100755 -index 000000000..49e107f98 +index 000000000000..49e107f98000 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_platform.h @@ -0,0 +1,73 @@ @@ -429477,7 +429477,7 @@ index 000000000..49e107f98 +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c new file mode 100755 -index 000000000..aa4376afd +index 000000000000..aa4376afd3ba --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c @@ -0,0 +1,100 @@ @@ -429583,7 +429583,7 @@ index 000000000..aa4376afd + diff --git a/drivers/gpu/arm/midgard/platform/mali_kbase_platform_common.h b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_common.h new file mode 100755 -index 000000000..c11085af5 +index 000000000000..c11085af5f24 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_common.h @@ -0,0 +1,28 @@ @@ -429617,7 +429617,7 @@ index 000000000..c11085af5 +int kbase_platform_rk_init_opp_table(struct kbase_device *kbdev); diff --git a/drivers/gpu/arm/midgard/platform/mali_kbase_platform_fake.h b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_fake.h new file mode 100755 -index 000000000..01f9dfce9 +index 000000000000..01f9dfce93cc --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_fake.h @@ -0,0 +1,38 @@ @@ -429661,7 +429661,7 @@ index 000000000..01f9dfce9 +#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 000000000..db993487e +index 000000000000..db993487e3be --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/Kbuild @@ -0,0 +1,17 @@ @@ -429684,7 +429684,7 @@ index 000000000..db993487e + diff --git a/drivers/gpu/arm/midgard/platform/rk/custom_log.h b/drivers/gpu/arm/midgard/platform/rk/custom_log.h new file mode 100755 -index 000000000..fe5e12241 +index 000000000000..fe5e1224149e --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/custom_log.h @@ -0,0 +1,209 @@ @@ -429899,7 +429899,7 @@ index 000000000..fe5e12241 +#endif /* __CUSTOM_LOG_H__ */ diff --git a/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_platform.h new file mode 100755 -index 000000000..07c5b6f8a +index 000000000000..07c5b6f8a760 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_platform.h @@ -0,0 +1,88 @@ @@ -429993,7 +429993,7 @@ index 000000000..07c5b6f8a + diff --git a/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c new file mode 100755 -index 000000000..8ad910c12 +index 000000000000..8ad910c1256f --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c @@ -0,0 +1,492 @@ @@ -430491,7 +430491,7 @@ index 000000000..8ad910c12 +} diff --git a/drivers/gpu/arm/midgard/platform/rk/mali_kbase_rk.h b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_rk.h new file mode 100755 -index 000000000..6eab25014 +index 000000000000..6eab25014d21 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_rk.h @@ -0,0 +1,62 @@ @@ -430559,7 +430559,7 @@ index 000000000..6eab25014 + diff --git a/drivers/gpu/arm/midgard/platform/vexpress/Kbuild b/drivers/gpu/arm/midgard/platform/vexpress/Kbuild new file mode 100755 -index 000000000..1caa29366 +index 000000000000..1caa293666d3 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/Kbuild @@ -0,0 +1,18 @@ @@ -430583,7 +430583,7 @@ index 000000000..1caa29366 + $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_cpu_vexpress.o diff --git a/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_platform.h new file mode 100755 -index 000000000..02835f129 +index 000000000000..02835f129aa3 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_platform.h @@ -0,0 +1,75 @@ @@ -430664,7 +430664,7 @@ index 000000000..02835f129 +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_vexpress.c new file mode 100755 -index 000000000..15ce2bc5e +index 000000000000..15ce2bc5eea5 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_vexpress.c @@ -0,0 +1,85 @@ @@ -430755,7 +430755,7 @@ index 000000000..15ce2bc5e +} diff --git a/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.c new file mode 100755 -index 000000000..4665f98cb +index 000000000000..4665f98cbbe4 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.c @@ -0,0 +1,279 @@ @@ -431040,7 +431040,7 @@ index 000000000..4665f98cb +} diff --git a/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.h b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.h new file mode 100755 -index 000000000..da8656981 +index 000000000000..da865698133a --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.h @@ -0,0 +1,38 @@ @@ -431084,7 +431084,7 @@ index 000000000..da8656981 +#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 000000000..7efe8fa42 +index 000000000000..7efe8fa4263b --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/Kbuild @@ -0,0 +1,16 @@ @@ -431106,7 +431106,7 @@ index 000000000..7efe8fa42 +mali_kbase-y += $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_config_vexpress.o diff --git a/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h new file mode 100755 -index 000000000..0efbf3962 +index 000000000000..0efbf3962f98 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h @@ -0,0 +1,73 @@ @@ -431185,7 +431185,7 @@ index 000000000..0efbf3962 +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c new file mode 100755 -index 000000000..3ff0930fb +index 000000000000..3ff0930fb4a3 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c @@ -0,0 +1,79 @@ @@ -431270,7 +431270,7 @@ index 000000000..3ff0930fb +} 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 000000000..1caa29366 +index 000000000000..1caa293666d3 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/Kbuild @@ -0,0 +1,18 @@ @@ -431294,7 +431294,7 @@ index 000000000..1caa29366 + $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_cpu_vexpress.o diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h new file mode 100755 -index 000000000..dbdf21e00 +index 000000000000..dbdf21e009f9 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h @@ -0,0 +1,75 @@ @@ -431375,7 +431375,7 @@ index 000000000..dbdf21e00 +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c new file mode 100755 -index 000000000..76ffe4a1e +index 000000000000..76ffe4a1e59e --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c @@ -0,0 +1,83 @@ @@ -431464,7 +431464,7 @@ index 000000000..76ffe4a1e + diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c new file mode 100755 -index 000000000..816dff498 +index 000000000000..816dff49835f --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c @@ -0,0 +1,71 @@ @@ -431541,7 +431541,7 @@ index 000000000..816dff498 +} diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h new file mode 100755 -index 000000000..23647ccb0 +index 000000000000..23647ccb0871 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h @@ -0,0 +1,28 @@ @@ -431575,7 +431575,7 @@ index 000000000..23647ccb0 +#endif /* _KBASE_CPU_VEXPRESS_H_ */ diff --git a/drivers/gpu/arm/midgard/platform_dummy/mali_ukk_os.h b/drivers/gpu/arm/midgard/platform_dummy/mali_ukk_os.h new file mode 100755 -index 000000000..5fa9b39c4 +index 000000000000..5fa9b39c4bc0 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform_dummy/mali_ukk_os.h @@ -0,0 +1,53 @@ @@ -431634,7 +431634,7 @@ index 000000000..5fa9b39c4 +#endif /* _UKK_OS_H__ */ diff --git a/drivers/gpu/arm/midgard/protected_mode_switcher.h b/drivers/gpu/arm/midgard/protected_mode_switcher.h new file mode 100755 -index 000000000..5dc2f3ba8 +index 000000000000..5dc2f3ba8cf6 --- /dev/null +++ b/drivers/gpu/arm/midgard/protected_mode_switcher.h @@ -0,0 +1,64 @@ @@ -431704,7 +431704,7 @@ index 000000000..5dc2f3ba8 +#endif /* _PROTECTED_MODE_SWITCH_H_ */ diff --git a/drivers/gpu/arm/midgard/rename.h b/drivers/gpu/arm/midgard/rename.h new file mode 100755 -index 000000000..821866618 +index 000000000000..8218666183ea --- /dev/null +++ b/drivers/gpu/arm/midgard/rename.h @@ -0,0 +1,426 @@ @@ -432136,7 +432136,7 @@ index 000000000..821866618 +#endif diff --git a/drivers/gpu/arm/midgard/sconscript b/drivers/gpu/arm/midgard/sconscript new file mode 100755 -index 000000000..ff23d7aeb +index 000000000000..ff23d7aebe6e --- /dev/null +++ b/drivers/gpu/arm/midgard/sconscript @@ -0,0 +1,92 @@ @@ -432234,7 +432234,7 @@ index 000000000..ff23d7aeb +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 000000000..b4bed0473 +index 000000000000..b4bed0473439 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/Kbuild @@ -0,0 +1,17 @@ @@ -432257,7 +432257,7 @@ index 000000000..b4bed0473 +obj-$(CONFIG_MALI_IRQ_LATENCY) += mali_kutf_irq_test/ diff --git a/drivers/gpu/arm/midgard/tests/Kconfig b/drivers/gpu/arm/midgard/tests/Kconfig new file mode 100755 -index 000000000..da0515c06 +index 000000000000..da0515c065de --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/Kconfig @@ -0,0 +1,17 @@ @@ -432280,7 +432280,7 @@ index 000000000..da0515c06 +source "drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig" diff --git a/drivers/gpu/arm/midgard/tests/include/kutf/kutf_mem.h b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_mem.h new file mode 100755 -index 000000000..0d145e42a +index 000000000000..0d145e42a0ca --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_mem.h @@ -0,0 +1,65 @@ @@ -432351,7 +432351,7 @@ index 000000000..0d145e42a +#endif /* _KERNEL_UTF_MEM_H_ */ diff --git a/drivers/gpu/arm/midgard/tests/include/kutf/kutf_resultset.h b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_resultset.h new file mode 100755 -index 000000000..1cc85f1b7 +index 000000000000..1cc85f1b7a46 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_resultset.h @@ -0,0 +1,121 @@ @@ -432478,7 +432478,7 @@ index 000000000..1cc85f1b7 +#endif /* _KERNEL_UTF_RESULTSET_H_ */ diff --git a/drivers/gpu/arm/midgard/tests/include/kutf/kutf_suite.h b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_suite.h new file mode 100755 -index 000000000..754c3adb1 +index 000000000000..754c3adb1cca --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_suite.h @@ -0,0 +1,508 @@ @@ -432992,7 +432992,7 @@ index 000000000..754c3adb1 +#endif /* _KERNEL_UTF_SUITE_H_ */ diff --git a/drivers/gpu/arm/midgard/tests/include/kutf/kutf_utils.h b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_utils.h new file mode 100755 -index 000000000..c458c1f73 +index 000000000000..c458c1f73802 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_utils.h @@ -0,0 +1,55 @@ @@ -433053,7 +433053,7 @@ index 000000000..c458c1f73 +#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 000000000..6b840c2ef +index 000000000000..6b840c2ef7b7 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/Kbuild @@ -0,0 +1,20 @@ @@ -433079,7 +433079,7 @@ index 000000000..6b840c2ef +kutf-y := kutf_mem.o kutf_resultset.o kutf_suite.o kutf_utils.o diff --git a/drivers/gpu/arm/midgard/tests/kutf/Kconfig b/drivers/gpu/arm/midgard/tests/kutf/Kconfig new file mode 100755 -index 000000000..84364716a +index 000000000000..84364716afe3 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/Kconfig @@ -0,0 +1,22 @@ @@ -433107,7 +433107,7 @@ index 000000000..84364716a + choose M here - this will generate a single module called kutf. diff --git a/drivers/gpu/arm/midgard/tests/kutf/Makefile b/drivers/gpu/arm/midgard/tests/kutf/Makefile new file mode 100755 -index 000000000..010c92ca3 +index 000000000000..010c92ca39b9 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/Makefile @@ -0,0 +1,29 @@ @@ -433142,7 +433142,7 @@ index 000000000..010c92ca3 + $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean diff --git a/drivers/gpu/arm/midgard/tests/kutf/kutf_mem.c b/drivers/gpu/arm/midgard/tests/kutf/kutf_mem.c new file mode 100755 -index 000000000..5408e57d4 +index 000000000000..5408e57d469a --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_mem.c @@ -0,0 +1,94 @@ @@ -433242,7 +433242,7 @@ index 000000000..5408e57d4 +EXPORT_SYMBOL(kutf_mempool_alloc); diff --git a/drivers/gpu/arm/midgard/tests/kutf/kutf_resultset.c b/drivers/gpu/arm/midgard/tests/kutf/kutf_resultset.c new file mode 100755 -index 000000000..5bd04969f +index 000000000000..5bd04969fd55 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_resultset.c @@ -0,0 +1,95 @@ @@ -433343,7 +433343,7 @@ index 000000000..5bd04969f + diff --git a/drivers/gpu/arm/midgard/tests/kutf/kutf_suite.c b/drivers/gpu/arm/midgard/tests/kutf/kutf_suite.c new file mode 100755 -index 000000000..a7cfd3be9 +index 000000000000..a7cfd3be9c46 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_suite.c @@ -0,0 +1,1041 @@ @@ -434390,7 +434390,7 @@ index 000000000..a7cfd3be9 +module_exit(exit_kutf_core); diff --git a/drivers/gpu/arm/midgard/tests/kutf/kutf_utils.c b/drivers/gpu/arm/midgard/tests/kutf/kutf_utils.c new file mode 100755 -index 000000000..a429a2dbf +index 000000000000..a429a2dbf788 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_utils.c @@ -0,0 +1,71 @@ @@ -434467,7 +434467,7 @@ index 000000000..a429a2dbf +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 000000000..d7f112448 +index 000000000000..d7f112448e42 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/sconscript @@ -0,0 +1,21 @@ @@ -434494,7 +434494,7 @@ index 000000000..d7f112448 +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 000000000..0cd9cebe9 +index 000000000000..0cd9cebe9d8b --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kbuild @@ -0,0 +1,20 @@ @@ -434520,7 +434520,7 @@ index 000000000..0cd9cebe9 +mali_kutf_irq_test-y := mali_kutf_irq_test_main.o diff --git a/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig new file mode 100755 -index 000000000..16f68d15c +index 000000000000..16f68d15c46e --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig @@ -0,0 +1,23 @@ @@ -434549,7 +434549,7 @@ index 000000000..16f68d15c + Choosing M here will generate a single module called mali_kutf_irq_test. diff --git a/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Makefile b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Makefile new file mode 100755 -index 000000000..4e948767a +index 000000000000..4e948767a4ac --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Makefile @@ -0,0 +1,51 @@ @@ -434606,7 +434606,7 @@ index 000000000..4e948767a + $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean diff --git a/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c new file mode 100755 -index 000000000..e2ff4432b +index 000000000000..e2ff4432bf80 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c @@ -0,0 +1,257 @@ @@ -434869,7 +434869,7 @@ index 000000000..e2ff4432b +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 000000000..ec837f164 +index 000000000000..ec837f16448d --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/sconscript @@ -0,0 +1,30 @@ @@ -434905,7 +434905,7 @@ index 000000000..ec837f164 + 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 000000000..5337e1078 +index 000000000000..5337e1078e20 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/sconscript @@ -0,0 +1,37 @@ @@ -434948,7 +434948,7 @@ index 000000000..5337e1078 + SConscript('mali_kutf_vinstr_test/sconscript') diff --git a/drivers/gpu/arm/sconscript b/drivers/gpu/arm/sconscript new file mode 100755 -index 000000000..a06092bd5 +index 000000000000..a06092bd5bf0 --- /dev/null +++ b/drivers/gpu/arm/sconscript @@ -0,0 +1,25 @@ @@ -434978,7 +434978,7 @@ index 000000000..a06092bd5 + +SConscript('midgard/sconscript') diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig -index 4e9b3a95f..95994151a 100644 +index 4e9b3a95fa7c..95994151a360 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -32,6 +32,10 @@ config DRM_MIPI_DBI @@ -434993,7 +434993,7 @@ index 4e9b3a95f..95994151a 100644 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 e8baa0745..53264c731 100644 +index e8baa07450b7..53264c731c69 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 @@ @@ -437105,7 +437105,7 @@ index e8baa0745..53264c731 100644 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 c051502d7..f744058e5 100644 +index c051502d7fbf..f744058e59a5 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h @@ -10,6 +10,7 @@ @@ -437271,7 +437271,7 @@ index c051502d7..f744058e5 100644 #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 cab3f5c4e..e756d7cd3 100644 +index cab3f5c4e2fc..e756d7cd3d41 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 @@ @@ -438960,7 +438960,7 @@ index cab3f5c4e..e756d7cd3 100644 + 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 e284ee8da..0a368b172 100644 +index e284ee8da58b..0a368b1722ec 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 @@ @@ -439152,7 +439152,7 @@ index e284ee8da..0a368b172 100644 + #endif /* _ANALOGIX_DP_REG_H */ diff --git a/drivers/gpu/drm/bridge/synopsys/Makefile b/drivers/gpu/drm/bridge/synopsys/Makefile -index 91d746ad5..757f5526f 100644 +index 91d746ad5de1..757f5526fd64 100644 --- a/drivers/gpu/drm/bridge/synopsys/Makefile +++ b/drivers/gpu/drm/bridge/synopsys/Makefile @@ -1,7 +1,8 @@ @@ -439168,7 +439168,7 @@ index 91d746ad5..757f5526f 100644 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 f72d27208..966d297ef 100644 +index f72d27208ebe..966d297ef41d 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 { @@ -439180,7 +439180,7 @@ index f72d27208..966d297ef 100644 }; diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c -index 70ab4fbdc..414d601bf 100644 +index 70ab4fbdc23e..414d601bf216 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 @@ @@ -439556,7 +439556,7 @@ index 70ab4fbdc..414d601bf 100644 return 0; } diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h -index cf4dc121a..ec10660a7 100644 +index cf4dc121a2c4..ec10660a7e53 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 @@ @@ -439586,7 +439586,7 @@ index cf4dc121a..ec10660a7 100644 #endif diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.c new file mode 100755 -index 000000000..24aab5043 +index 000000000000..24aab5043e61 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.c @@ -0,0 +1,748 @@ @@ -440340,7 +440340,7 @@ index 000000000..24aab5043 +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h new file mode 100755 -index 000000000..d138f91f3 +index 000000000000..d138f91f3422 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h @@ -0,0 +1,54 @@ @@ -440399,7 +440399,7 @@ index 000000000..d138f91f3 + +#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 968241605..7ec390d46 100644 +index 9682416056ed..7ec390d46ca5 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) @@ -440488,7 +440488,7 @@ index 968241605..7ec390d46 100644 .get_eld = dw_hdmi_i2s_get_eld, diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-audio.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-audio.h new file mode 100755 -index 000000000..93f1a4295 +index 000000000000..93f1a42954e7 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-audio.h @@ -0,0 +1,29 @@ @@ -440523,7 +440523,7 @@ index 000000000..93f1a4295 +#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 000000000..2d2320ed0 +index 000000000000..2d2320ed0769 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.c @@ -0,0 +1,336 @@ @@ -440865,7 +440865,7 @@ index 000000000..2d2320ed0 +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 000000000..c0977c612 +index 000000000000..c0977c612e34 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.h @@ -0,0 +1,25 @@ @@ -440896,7 +440896,7 @@ index 000000000..c0977c612 +#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 000000000..7f55f7201 +index 000000000000..7f55f7201ff8 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.c @@ -0,0 +1,650 @@ @@ -441552,7 +441552,7 @@ index 000000000..7f55f7201 +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 000000000..48c3a4843 +index 000000000000..48c3a4843ac0 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.h @@ -0,0 +1,55 @@ @@ -441613,7 +441613,7 @@ index 000000000..48c3a4843 +#endif diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c new file mode 100755 -index 000000000..5ece777c1 +index 000000000000..5ece777c1afa --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c @@ -0,0 +1,188 @@ @@ -441807,7 +441807,7 @@ index 000000000..5ece777c1 +MODULE_ALIAS("platform:" DRIVER_NAME); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c new file mode 100755 -index 000000000..ee2918156 +index 000000000000..ee29181563f9 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c @@ -0,0 +1,4109 @@ @@ -445922,7 +445922,7 @@ index 000000000..ee2918156 +MODULE_ALIAS("platform:dw-hdmi-qp"); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h new file mode 100755 -index 000000000..e9b5e19a3 +index 000000000000..e9b5e19a3be5 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h @@ -0,0 +1,850 @@ @@ -446777,7 +446777,7 @@ index 000000000..e9b5e19a3 + +#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 2c3c743df..5d20a72a1 100644 +index 2c3c743df950..5d20a72a186f 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -9,6 +9,8 @@ @@ -449781,7 +449781,7 @@ index 2c3c743df..5d20a72a1 100644 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 1999db05b..71e476bcf 100644 +index 1999db05bc3b..71e476bcfaf4 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h @@ -509,6 +509,51 @@ @@ -449904,7 +449904,7 @@ index 1999db05b..71e476bcf 100644 /* diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c -index 376fa6eb4..71f0daa5f 100644 +index 376fa6eb46f6..71f0daa5f834 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c @@ -26,6 +26,8 @@ @@ -450530,7 +450530,7 @@ index 376fa6eb4..71f0daa5f 100644 MODULE_AUTHOR("Philippe Cornu "); MODULE_DESCRIPTION("DW MIPI DSI host controller driver"); diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c -index 7fc8e7000..4108c7265 100644 +index 7fc8e7000046..4108c7265d53 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -296,12 +296,14 @@ update_connector_routing(struct drm_atomic_state *state, @@ -450571,7 +450571,7 @@ index 7fc8e7000..4108c7265 100644 ret = drm_atomic_commit(state); diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c -index 9ad740451..c29183d2a 100644 +index 9ad74045158e..c29183d2aa4e 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -141,6 +141,10 @@ void __drm_atomic_helper_crtc_duplicate_state(struct drm_crtc *crtc, @@ -450596,7 +450596,7 @@ index 9ad740451..c29183d2a 100644 EXPORT_SYMBOL(__drm_atomic_helper_crtc_destroy_state); diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c -index b60628333..1184ba39d 100644 +index b6062833370f..1184ba39dafb 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -461,6 +461,16 @@ static int drm_atomic_crtc_set_property(struct drm_crtc *crtc, @@ -450628,7 +450628,7 @@ index b60628333..1184ba39d 100644 *val = 0; else if (crtc->funcs->atomic_get_property) diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c -index c7adbeaf1..232abbba3 100644 +index c7adbeaf10b1..232abbba3686 100644 --- a/drivers/gpu/drm/drm_auth.c +++ b/drivers/gpu/drm/drm_auth.c @@ -135,18 +135,16 @@ static void drm_set_master(struct drm_device *dev, struct drm_file *fpriv, @@ -450703,7 +450703,7 @@ index c7adbeaf1..232abbba3 100644 { struct drm_master *master = container_of(kref, struct drm_master, refcount); diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c -index 138ff34b3..7b270b68a 100644 +index 138ff34b31db..7b270b68ade4 100644 --- a/drivers/gpu/drm/drm_color_mgmt.c +++ b/drivers/gpu/drm/drm_color_mgmt.c @@ -33,7 +33,7 @@ @@ -450771,7 +450771,7 @@ index 138ff34b3..7b270b68a 100644 * Setting this to NULL (blob property value set to 0) means a * linear/pass-thru gamma table should be used. This is generally the diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c -index b0a826489..3d7182001 100644 +index b0a826489488..3d7182001004 100644 --- a/drivers/gpu/drm/drm_debugfs.c +++ b/drivers/gpu/drm/drm_debugfs.c @@ -91,7 +91,6 @@ static int drm_clients_info(struct seq_file *m, void *data) @@ -450792,7 +450792,7 @@ index b0a826489..3d7182001 100644 from_kuid_munged(seq_user_ns(m), uid), priv->magic); diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c -index 39eb39e78..efc2372d3 100644 +index 39eb39e78d7a..efc2372d32a7 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1835,20 +1835,11 @@ static void connector_bad_edid(struct drm_connector *connector, @@ -450941,7 +450941,7 @@ index 39eb39e78..efc2372d3 100644 } diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c -index 537e7de8e..01670305d 100644 +index 537e7de8e9c3..01670305df3d 100644 --- a/drivers/gpu/drm/drm_file.c +++ b/drivers/gpu/drm/drm_file.c @@ -177,7 +177,6 @@ struct drm_file *drm_file_alloc(struct drm_minor *minor) @@ -451053,7 +451053,7 @@ index 537e7de8e..01670305d 100644 } EXPORT_SYMBOL(drm_send_event); diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c -index 8d1064061..e4c8aa361 100644 +index 8d1064061e83..e4c8aa3614a4 100644 --- a/drivers/gpu/drm/drm_fourcc.c +++ b/drivers/gpu/drm/drm_fourcc.c @@ -282,6 +282,16 @@ const struct drm_format_info *__drm_format_info(u32 format) @@ -451074,7 +451074,7 @@ index 8d1064061..e4c8aa361 100644 .num_planes = 3, .char_per_block = { 2, 2, 2 }, .block_w = { 1, 1, 1 }, .block_h = { 1, 1, 1 }, .hsub = 1, diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c -index c160a45a4..73818ffa0 100644 +index c160a45a4274..73818ffa019b 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -543,6 +543,7 @@ int drm_version(struct drm_device *dev, void *data, @@ -451107,7 +451107,7 @@ index c160a45a4..73818ffa0 100644 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/drm_lease.c b/drivers/gpu/drm/drm_lease.c -index aef226340..da4f085fc 100644 +index aef22634005e..da4f085fc09e 100644 --- a/drivers/gpu/drm/drm_lease.c +++ b/drivers/gpu/drm/drm_lease.c @@ -107,19 +107,10 @@ static bool _drm_has_leased(struct drm_master *master, int id) @@ -451344,7 +451344,7 @@ index aef226340..da4f085fc 100644 return ret; } diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c -index 0c806e99e..fddc041aa 100644 +index 0c806e99e869..fddc041aa865 100644 --- a/drivers/gpu/drm/drm_mipi_dsi.c +++ b/drivers/gpu/drm/drm_mipi_dsi.c @@ -356,6 +356,7 @@ static ssize_t mipi_dsi_device_transfer(struct mipi_dsi_device *dsi, @@ -451356,7 +451356,7 @@ index 0c806e99e..fddc041aa 100644 return ops->transfer(dsi->host, msg); } diff --git a/drivers/gpu/drm/drm_mode_config.c b/drivers/gpu/drm/drm_mode_config.c -index fad2c1181..58050d4ae 100644 +index fad2c1181127..58050d4aeabc 100644 --- a/drivers/gpu/drm/drm_mode_config.c +++ b/drivers/gpu/drm/drm_mode_config.c @@ -364,6 +364,22 @@ static int drm_mode_create_standard_properties(struct drm_device *dev) @@ -451383,7 +451383,7 @@ index fad2c1181..58050d4ae 100644 DRM_MODE_PROP_IMMUTABLE | DRM_MODE_PROP_BLOB, "IN_FORMATS", 0); diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c -index 0f99e5453..d42c7310b 100644 +index 0f99e5453f15..d42c7310bf09 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1940,6 +1940,7 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out, @@ -451403,7 +451403,7 @@ index 0f99e5453..d42c7310b 100644 /** * drm_mode_is_420_only - if a given videomode can be only supported in YCBCR420 diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c -index 825499ea3..272e5cdd6 100644 +index 825499ea3ff5..272e5cdd61ce 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -784,6 +784,28 @@ int drm_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct *vma) @@ -451445,7 +451445,7 @@ index 825499ea3..272e5cdd6 100644 /** diff --git a/drivers/gpu/drm/drm_sync_helper.c b/drivers/gpu/drm/drm_sync_helper.c new file mode 100755 -index 000000000..0c6aa875b +index 000000000000..0c6aa875b4c6 --- /dev/null +++ b/drivers/gpu/drm/drm_sync_helper.c @@ -0,0 +1,314 @@ @@ -451764,7 +451764,7 @@ index 000000000..0c6aa875b +} +EXPORT_SYMBOL(drm_sw_fence_new); diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c -index f135b7959..286edbe1b 100644 +index f135b79593dd..286edbe1bf7a 100644 --- a/drivers/gpu/drm/drm_vblank.c +++ b/drivers/gpu/drm/drm_vblank.c @@ -1000,7 +1000,14 @@ static void send_vblank_event(struct drm_device *dev, @@ -451784,7 +451784,7 @@ index f135b7959..286edbe1b 100644 /** diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c -index c940ac3aa..a19537706 100644 +index c940ac3aae2f..a19537706ed1 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c @@ -305,9 +305,8 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id) @@ -451799,7 +451799,7 @@ index c940ac3aa..a19537706 100644 engine->class = info->class; engine->instance = info->instance; diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c -index 6909da1e1..942c7c187 100644 +index 6909da1e1a73..942c7c187adb 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c @@ -213,6 +213,23 @@ static u32 guc_ctl_feature_flags(struct intel_guc *guc) @@ -451835,7 +451835,7 @@ index 6909da1e1..942c7c187 100644 params[GUC_CTL_FEATURE] = guc_ctl_feature_flags(guc); params[GUC_CTL_DEBUG] = guc_ctl_debug_flags(guc); diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c -index 7950d28be..d44061033 100644 +index 7950d28beb8c..d44061033f23 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c @@ -10,52 +10,11 @@ @@ -452038,7 +452038,7 @@ index 7950d28be..d44061033 100644 - guc_ads_private_data_reset(guc); } diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h -index 79c560d9c..a6b733c14 100644 +index 79c560d9c0b6..a6b733c146c9 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h @@ -26,8 +26,8 @@ @@ -452189,7 +452189,7 @@ index 79c560d9c..a6b733c14 100644 /* GuC logging structures */ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h -index b37fc2ffa..1949346e7 100644 +index b37fc2ffaef2..1949346e714e 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h @@ -118,11 +118,6 @@ struct guc_doorbell_info { @@ -452205,7 +452205,7 @@ index b37fc2ffa..1949346e7 100644 #define GUC_BCS_RCS_IER _MMIO(0xC550) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c -index ee4ac3922..80e8b6c3b 100644 +index ee4ac3922277..80e8b6c3bc8c 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c @@ -44,19 +44,23 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, @@ -452253,7 +452253,7 @@ index ee4ac3922..80e8b6c3b 100644 if (IS_ERR(obj)) { err = PTR_ERR(obj); diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h -index 99bb1fe1a..23d3a423a 100644 +index 99bb1fe1af66..23d3a423ac0f 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h @@ -88,8 +88,6 @@ struct intel_uc_fw { @@ -452266,7 +452266,7 @@ index 99bb1fe1a..23d3a423a 100644 #ifdef CONFIG_DRM_I915_DEBUG_GUC diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h -index e41ffc7a7..029214cde 100644 +index e41ffc7a7fbc..029214cdedd5 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h @@ -69,11 +69,7 @@ struct uc_css_header { @@ -452283,7 +452283,7 @@ index e41ffc7a7..029214cde 100644 } __packed; static_assert(sizeof(struct uc_css_header) == 128); diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c -index 8e15ff95b..92ed8d456 100644 +index 8e15ff95b809..92ed8d45657a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -563,7 +563,6 @@ nouveau_drm_device_init(struct drm_device *dev) @@ -452388,7 +452388,7 @@ index 8e15ff95b..92ed8d456 100644 static const struct drm_ioctl_desc diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h -index 8b252dca0..b8025507a 100644 +index 8b252dca0fc3..b8025507a9e4 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -142,11 +142,6 @@ struct nouveau_drm { @@ -452404,7 +452404,7 @@ index 8b252dca0..b8025507a 100644 struct { diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig -index 6153972e0..b9dbedf8f 100644 +index 6153972e0127..b9dbedf8f15e 100644 --- a/drivers/gpu/drm/panel/Kconfig +++ b/drivers/gpu/drm/panel/Kconfig @@ -233,7 +233,6 @@ config DRM_PANEL_OLIMEX_LCD_OLINUXINO @@ -452416,7 +452416,7 @@ index 6153972e0..b9dbedf8f 100644 The panel is used with different sizes LCDs, from 480x272 to 1280x800, and 24 bit per pixel. diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c -index 534dd7414..0145129d7 100644 +index 534dd7414d42..0145129d7c66 100644 --- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c +++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c @@ -590,14 +590,14 @@ static const struct drm_display_mode k101_im2byl02_default_mode = { @@ -452441,7 +452441,7 @@ index 534dd7414..0145129d7 100644 .width_mm = 135, .height_mm = 217, diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c -index 1a87cc445..d6c0bbc03 100644 +index 1a87cc445b5e..d6c0bbc03c6d 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -30,6 +30,7 @@ @@ -453119,7 +453119,7 @@ index 1a87cc445..d6c0bbc03 100644 dsi->lanes = desc->lanes; diff --git a/drivers/gpu/drm/panel/panel-simple.h b/drivers/gpu/drm/panel/panel-simple.h new file mode 100755 -index 000000000..7349c35e3 +index 000000000000..7349c35e3cb2 --- /dev/null +++ b/drivers/gpu/drm/panel/panel-simple.h @@ -0,0 +1,19 @@ @@ -453143,7 +453143,7 @@ index 000000000..7349c35e3 +#endif +#endif diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig -index 310aa1546..3154597de 100644 +index 310aa1546893..3154597de251 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -1,7 +1,7 @@ @@ -453285,7 +453285,7 @@ index 310aa1546..3154597de 100644 + endif diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile -index 17a9e7eb2..3287356fa 100644 +index 17a9e7eb2130..3287356fa0f8 100644 --- a/drivers/gpu/drm/rockchip/Makefile +++ b/drivers/gpu/drm/rockchip/Makefile @@ -4,16 +4,33 @@ @@ -453326,7 +453326,7 @@ index 17a9e7eb2..3287356fa 100644 +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 512581698..9f09525b4 100644 +index 512581698a1e..9f09525b4bc0 100644 --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c @@ -16,6 +16,7 @@ @@ -454110,7 +454110,7 @@ index 512581698..9f09525b4 100644 }; MODULE_DEVICE_TABLE(of, rockchip_dp_dt_ids); diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c -index adeaa0140..9804fe1ba 100644 +index adeaa0140f0f..9804fe1ba9a5 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c @@ -6,7 +6,6 @@ @@ -454488,7 +454488,7 @@ index adeaa0140..9804fe1ba 100644 } diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.h b/drivers/gpu/drm/rockchip/cdn-dp-core.h -index 81ac9b658..60a8c095b 100644 +index 81ac9b658a70..60a8c095b30f 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.h +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.h @@ -53,8 +53,6 @@ struct cdn_firmware_header { @@ -454528,7 +454528,7 @@ index 81ac9b658..60a8c095b 100644 bool sink_has_audio; diff --git a/drivers/gpu/drm/rockchip/cdn-dp-link-training.c b/drivers/gpu/drm/rockchip/cdn-dp-link-training.c new file mode 100755 -index 000000000..ec2f001c2 +index 000000000000..ec2f001c2557 --- /dev/null +++ b/drivers/gpu/drm/rockchip/cdn-dp-link-training.c @@ -0,0 +1,447 @@ @@ -454980,7 +454980,7 @@ index 000000000..ec2f001c2 + return ret; +} diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/rockchip/cdn-dp-reg.c -index 33fb4d05c..2a544869e 100644 +index 33fb4d05c506..2a544869e8de 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, @@ -455153,7 +455153,7 @@ index 33fb4d05c..2a544869e 100644 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 441248b7a..656ec69be 100644 +index 441248b7a79e..656ec69be66d 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-reg.h +++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.h @@ -8,6 +8,7 @@ @@ -455251,7 +455251,7 @@ index 441248b7a..656ec69be 100644 #endif /* _CDN_DP_REG_H */ diff --git a/drivers/gpu/drm/rockchip/dw-dp.c b/drivers/gpu/drm/rockchip/dw-dp.c new file mode 100755 -index 000000000..e6c3ac37c +index 000000000000..e6c3ac37c1b0 --- /dev/null +++ b/drivers/gpu/drm/rockchip/dw-dp.c @@ -0,0 +1,4250 @@ @@ -459506,7 +459506,7 @@ index 000000000..e6c3ac37c + }, +}; diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c -index 82cbfccba..2ff99e503 100644 +index 82cbfccba1bc..2ff99e503224 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c @@ -16,8 +16,9 @@ @@ -460460,7 +460460,7 @@ index 82cbfccba..2ff99e503 100644 * For dual-DSI display, one DSI pokes at the other DSI's diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c new file mode 100755 -index 000000000..e66df8098 +index 000000000000..e66df80980f4 --- /dev/null +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c @@ -0,0 +1,1868 @@ @@ -462334,7 +462334,7 @@ index 000000000..e66df8098 +}; diff --git a/drivers/gpu/drm/rockchip/dw_hdcp2.c b/drivers/gpu/drm/rockchip/dw_hdcp2.c new file mode 100644 -index 000000000..f8362ddea +index 000000000000..f8362ddea171 --- /dev/null +++ b/drivers/gpu/drm/rockchip/dw_hdcp2.c @@ -0,0 +1,642 @@ @@ -462981,7 +462981,7 @@ index 000000000..f8362ddea +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 23de359a1..3253cf215 100644 +index 23de359a1dec..3253cf215c5f 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -4,21 +4,33 @@ @@ -467064,7 +467064,7 @@ index 23de359a1..3253cf215 100644 .pm = &dw_hdmi_rockchip_pm, diff --git a/drivers/gpu/drm/rockchip/ebc-dev/Kconfig b/drivers/gpu/drm/rockchip/ebc-dev/Kconfig new file mode 100755 -index 000000000..949c8e4b7 +index 000000000000..949c8e4b7b57 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/Kconfig @@ -0,0 +1,14 @@ @@ -467084,7 +467084,7 @@ index 000000000..949c8e4b7 +endchoice diff --git a/drivers/gpu/drm/rockchip/ebc-dev/Makefile b/drivers/gpu/drm/rockchip/ebc-dev/Makefile new file mode 100755 -index 000000000..848ac22fd +index 000000000000..848ac22fd0b2 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/Makefile @@ -0,0 +1,9 @@ @@ -467099,7 +467099,7 @@ index 000000000..848ac22fd +rkebc-$(CONFIG_ARM64) += ebc_dev_v8.o diff --git a/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/Makefile b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/Makefile new file mode 100755 -index 000000000..a63ef49de +index 000000000000..a63ef49dea04 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/Makefile @@ -0,0 +1,3 @@ @@ -467108,7 +467108,7 @@ index 000000000..a63ef49de +obj-$(CONFIG_ROCKCHIP_EBC_DEV) += buf_manage.o buf_list.o diff --git a/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.c b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.c new file mode 100755 -index 000000000..90f350110 +index 000000000000..90f350110b70 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.c @@ -0,0 +1,171 @@ @@ -467285,7 +467285,7 @@ index 000000000..90f350110 +} diff --git a/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.h b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.h new file mode 100755 -index 000000000..eaf504560 +index 000000000000..eaf504560fb8 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.h @@ -0,0 +1,95 @@ @@ -467386,7 +467386,7 @@ index 000000000..eaf504560 +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.c b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.c new file mode 100755 -index 000000000..a2e47b45c +index 000000000000..a2e47b45c148 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.c @@ -0,0 +1,327 @@ @@ -467719,7 +467719,7 @@ index 000000000..a2e47b45c +} diff --git a/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.h b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.h new file mode 100755 -index 000000000..745cdbf9c +index 000000000000..745cdbf9cfde --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.h @@ -0,0 +1,49 @@ @@ -467774,7 +467774,7 @@ index 000000000..745cdbf9c + diff --git a/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev.h b/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev.h new file mode 100755 -index 000000000..5fc2fecd2 +index 000000000000..5fc2fecd22cb --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev.h @@ -0,0 +1,114 @@ @@ -467894,7 +467894,7 @@ index 000000000..5fc2fecd2 +#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 000000000..65be1fdee +index 000000000000..65be1fdee09f --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev_v8.S @@ -0,0 +1,55302 @@ @@ -523202,7 +523202,7 @@ index 000000000..65be1fdee + .section .note.GNU-stack,"",@progbits diff --git a/drivers/gpu/drm/rockchip/ebc-dev/ebc_panel.h b/drivers/gpu/drm/rockchip/ebc-dev/ebc_panel.h new file mode 100755 -index 000000000..dc0a72b11 +index 000000000000..dc0a72b11b21 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_panel.h @@ -0,0 +1,50 @@ @@ -523258,7 +523258,7 @@ index 000000000..dc0a72b11 +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/ebc_public.c b/drivers/gpu/drm/rockchip/ebc-dev/ebc_public.c new file mode 100755 -index 000000000..8ecccb7f6 +index 000000000000..8ecccb7f6403 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_public.c @@ -0,0 +1,36 @@ @@ -523300,7 +523300,7 @@ index 000000000..8ecccb7f6 +} diff --git a/drivers/gpu/drm/rockchip/ebc-dev/epdlut/Makefile b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/Makefile new file mode 100755 -index 000000000..6b99702b7 +index 000000000000..6b99702b7a6f --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/Makefile @@ -0,0 +1,5 @@ @@ -523311,7 +523311,7 @@ index 000000000..6b99702b7 +waveform-$(CONFIG_ARM64) += pvi_waveform_v8.o rkf_waveform_v8.o diff --git a/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.c b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.c new file mode 100755 -index 000000000..8871b37d5 +index 000000000000..8871b37d52cc --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.c @@ -0,0 +1,72 @@ @@ -523389,7 +523389,7 @@ index 000000000..8871b37d5 +} diff --git a/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.h b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.h new file mode 100755 -index 000000000..8d2210603 +index 000000000000..8d2210603a29 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.h @@ -0,0 +1,66 @@ @@ -523461,7 +523461,7 @@ index 000000000..8d2210603 +#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 000000000..849c81dcf +index 000000000000..849c81dcfc71 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/pvi_waveform_v8.S @@ -0,0 +1,18656 @@ @@ -542123,7 +542123,7 @@ index 000000000..849c81dcf + .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 000000000..8a1782224 +index 000000000000..8a17822240c5 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/rkf_waveform_v8.S @@ -0,0 +1,19357 @@ @@ -561486,7 +561486,7 @@ index 000000000..8a1782224 + .section .note.GNU-stack,"",@progbits diff --git a/drivers/gpu/drm/rockchip/ebc-dev/pmic/Makefile b/drivers/gpu/drm/rockchip/ebc-dev/pmic/Makefile new file mode 100755 -index 000000000..a05717f1c +index 000000000000..a05717f1ce98 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/Makefile @@ -0,0 +1,4 @@ @@ -561496,7 +561496,7 @@ index 000000000..a05717f1c +obj-$(CONFIG_EPD_TPS65185_SENSOR) += tps65185.o diff --git a/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.c b/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.c new file mode 100755 -index 000000000..c24db23dc +index 000000000000..c24db23dc47d --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.c @@ -0,0 +1,70 @@ @@ -561572,7 +561572,7 @@ index 000000000..c24db23dc +module_param(vcom, int, 0644); diff --git a/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.h b/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.h new file mode 100755 -index 000000000..f95192094 +index 000000000000..f95192094ba7 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.h @@ -0,0 +1,60 @@ @@ -561638,7 +561638,7 @@ index 000000000..f95192094 +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/pmic/tps65185.c b/drivers/gpu/drm/rockchip/ebc-dev/pmic/tps65185.c new file mode 100755 -index 000000000..f007dd0ad +index 000000000000..f007dd0adb65 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/tps65185.c @@ -0,0 +1,672 @@ @@ -562316,7 +562316,7 @@ index 000000000..f007dd0ad +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/rockchip/ebc-dev/tcon/Makefile b/drivers/gpu/drm/rockchip/ebc-dev/tcon/Makefile new file mode 100755 -index 000000000..913d48137 +index 000000000000..913d4813773b --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/Makefile @@ -0,0 +1,3 @@ @@ -562325,7 +562325,7 @@ index 000000000..913d48137 +obj-$(CONFIG_ROCKCHIP_EBC_DEV) += ebc_tcon.o eink_tcon.o diff --git a/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.c b/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.c new file mode 100755 -index 000000000..23c82751b +index 000000000000..23c82751bb1b --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.c @@ -0,0 +1,416 @@ @@ -562747,7 +562747,7 @@ index 000000000..23c82751b +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.h b/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.h new file mode 100755 -index 000000000..9a9ea56f3 +index 000000000000..9a9ea56f3cdb --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.h @@ -0,0 +1,119 @@ @@ -562872,7 +562872,7 @@ index 000000000..9a9ea56f3 +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/tcon/eink_tcon.c b/drivers/gpu/drm/rockchip/ebc-dev/tcon/eink_tcon.c new file mode 100755 -index 000000000..01b2b9629 +index 000000000000..01b2b9629c35 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/eink_tcon.c @@ -0,0 +1,301 @@ @@ -563178,7 +563178,7 @@ index 000000000..01b2b9629 +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 78120da5e..c74e0367c 100644 +index 78120da5e63a..c74e0367caf9 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -21,6 +21,8 @@ @@ -563688,7 +563688,7 @@ index 78120da5e..c74e0367c 100644 .probe = inno_hdmi_probe, .remove = inno_hdmi_remove, diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.h b/drivers/gpu/drm/rockchip/inno_hdmi.h -index 93245b55f..b722afc4e 100644 +index 93245b55f967..b722afc4e41f 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.h +++ b/drivers/gpu/drm/rockchip/inno_hdmi.h @@ -96,11 +96,13 @@ enum { @@ -563707,7 +563707,7 @@ index 93245b55f..b722afc4e 100644 #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 000000000..98c4443ec +index 000000000000..98c4443ec1bd --- /dev/null +++ b/drivers/gpu/drm/rockchip/kernel_logo_img.h @@ -0,0 +1,21855 @@ @@ -585567,7 +585567,7 @@ index 000000000..98c4443ec + 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; diff --git a/drivers/gpu/drm/rockchip/rk3066_hdmi.c b/drivers/gpu/drm/rockchip/rk3066_hdmi.c -index 17e7c40a9..46683937f 100644 +index 17e7c40a9e7b..46683937fc07 100644 --- a/drivers/gpu/drm/rockchip/rk3066_hdmi.c +++ b/drivers/gpu/drm/rockchip/rk3066_hdmi.c @@ -542,7 +542,7 @@ rk3066_hdmi_register(struct drm_device *drm, struct rk3066_hdmi *hdmi) @@ -585581,7 +585581,7 @@ index 17e7c40a9..46683937f 100644 * If we failed to find the CRTC(s) which this encoder is diff --git a/drivers/gpu/drm/rockchip/rk618/Kconfig b/drivers/gpu/drm/rockchip/rk618/Kconfig new file mode 100755 -index 000000000..03ae305a9 +index 000000000000..03ae305a93c1 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/Kconfig @@ -0,0 +1,10 @@ @@ -585597,7 +585597,7 @@ index 000000000..03ae305a9 + Rockchip rk618 display bridge chips driver. diff --git a/drivers/gpu/drm/rockchip/rk618/Makefile b/drivers/gpu/drm/rockchip/rk618/Makefile new file mode 100755 -index 000000000..ad3ac27b3 +index 000000000000..ad3ac27b36ad --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/Makefile @@ -0,0 +1,12 @@ @@ -585615,7 +585615,7 @@ index 000000000..ad3ac27b3 + rk618_dsi.o diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_dither.c b/drivers/gpu/drm/rockchip/rk618/rk618_dither.c new file mode 100755 -index 000000000..a9bc0c37c +index 000000000000..a9bc0c37c2d6 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dither.c @@ -0,0 +1,53 @@ @@ -585674,7 +585674,7 @@ index 000000000..a9bc0c37c +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_dither.h b/drivers/gpu/drm/rockchip/rk618/rk618_dither.h new file mode 100755 -index 000000000..c74bb95f0 +index 000000000000..c74bb95f0ce4 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dither.h @@ -0,0 +1,17 @@ @@ -585697,7 +585697,7 @@ index 000000000..c74bb95f0 +#endif diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c b/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c new file mode 100755 -index 000000000..a00825784 +index 000000000000..a00825784e2d --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c @@ -0,0 +1,1195 @@ @@ -586898,7 +586898,7 @@ index 000000000..a00825784 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c b/drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c new file mode 100755 -index 000000000..ab3fa5bfa +index 000000000000..ab3fa5bfab54 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c @@ -0,0 +1,1607 @@ @@ -588511,7 +588511,7 @@ index 000000000..ab3fa5bfa +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c b/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c new file mode 100755 -index 000000000..b652e19a6 +index 000000000000..b652e19a6a34 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c @@ -0,0 +1,303 @@ @@ -588820,7 +588820,7 @@ index 000000000..b652e19a6 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c b/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c new file mode 100755 -index 000000000..76efc25aa +index 000000000000..76efc25aa216 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c @@ -0,0 +1,301 @@ @@ -589127,7 +589127,7 @@ index 000000000..76efc25aa +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_scaler.c b/drivers/gpu/drm/rockchip/rk618/rk618_scaler.c new file mode 100755 -index 000000000..2c3a67664 +index 000000000000..2c3a67664699 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_scaler.c @@ -0,0 +1,425 @@ @@ -589558,7 +589558,7 @@ index 000000000..2c3a67664 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_vif.c b/drivers/gpu/drm/rockchip/rk618/rk618_vif.c new file mode 100755 -index 000000000..9dc9e10e2 +index 000000000000..9dc9e10e2d3a --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_vif.c @@ -0,0 +1,261 @@ @@ -589825,7 +589825,7 @@ index 000000000..9dc9e10e2 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/Kconfig b/drivers/gpu/drm/rockchip/rk628/Kconfig new file mode 100755 -index 000000000..41e1fbbe1 +index 000000000000..41e1fbbe1e61 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/Kconfig @@ -0,0 +1,8 @@ @@ -589839,7 +589839,7 @@ index 000000000..41e1fbbe1 + Rockchip RK628 display bridge chips driver. diff --git a/drivers/gpu/drm/rockchip/rk628/Makefile b/drivers/gpu/drm/rockchip/rk628/Makefile new file mode 100755 -index 000000000..76d768d29 +index 000000000000..76d768d29776 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/Makefile @@ -0,0 +1,14 @@ @@ -589859,7 +589859,7 @@ index 000000000..76d768d29 + rk628_hdmirx.o diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_combrxphy.c b/drivers/gpu/drm/rockchip/rk628/rk628_combrxphy.c new file mode 100755 -index 000000000..a83eeeaf9 +index 000000000000..a83eeeaf935f --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_combrxphy.c @@ -0,0 +1,1030 @@ @@ -590895,7 +590895,7 @@ index 000000000..a83eeeaf9 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c new file mode 100755 -index 000000000..cbe792313 +index 000000000000..cbe7923139b7 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c @@ -0,0 +1,520 @@ @@ -591421,7 +591421,7 @@ index 000000000..cbe792313 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.h b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.h new file mode 100755 -index 000000000..40d785eec +index 000000000000..40d785eecd67 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.h @@ -0,0 +1,13 @@ @@ -591440,7 +591440,7 @@ index 000000000..40d785eec +#endif diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c b/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c new file mode 100755 -index 000000000..fc7da77ec +index 000000000000..fc7da77ec0e4 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c @@ -0,0 +1,1395 @@ @@ -592841,7 +592841,7 @@ index 000000000..fc7da77ec +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_gvi.c b/drivers/gpu/drm/rockchip/rk628/rk628_gvi.c new file mode 100755 -index 000000000..a3c92195e +index 000000000000..a3c92195e2dd --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_gvi.c @@ -0,0 +1,664 @@ @@ -593511,7 +593511,7 @@ index 000000000..a3c92195e +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_hdmi.c b/drivers/gpu/drm/rockchip/rk628/rk628_hdmi.c new file mode 100755 -index 000000000..29b5fcb2d +index 000000000000..29b5fcb2d3bc --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_hdmi.c @@ -0,0 +1,1622 @@ @@ -595139,7 +595139,7 @@ index 000000000..29b5fcb2d +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c b/drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c new file mode 100755 -index 000000000..7ff3cc008 +index 000000000000..7ff3cc0087a1 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c @@ -0,0 +1,980 @@ @@ -596125,7 +596125,7 @@ index 000000000..7ff3cc008 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c b/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c new file mode 100755 -index 000000000..61326b147 +index 000000000000..61326b1477cc --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c @@ -0,0 +1,319 @@ @@ -596450,7 +596450,7 @@ index 000000000..61326b147 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_post_process.c b/drivers/gpu/drm/rockchip/rk628/rk628_post_process.c new file mode 100755 -index 000000000..80fd257a6 +index 000000000000..80fd257a6471 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_post_process.c @@ -0,0 +1,495 @@ @@ -596951,7 +596951,7 @@ index 000000000..80fd257a6 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_rgb.c b/drivers/gpu/drm/rockchip/rk628/rk628_rgb.c new file mode 100755 -index 000000000..df8cc3cee +index 000000000000..df8cc3cee860 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_rgb.c @@ -0,0 +1,378 @@ @@ -597335,7 +597335,7 @@ index 000000000..df8cc3cee +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.c b/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.c new file mode 100755 -index 000000000..adbc11679 +index 000000000000..adbc11679f53 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.c @@ -0,0 +1,1403 @@ @@ -598744,7 +598744,7 @@ index 000000000..adbc11679 +MODULE_ALIAS("platform:" DRIVER_NAME); diff --git a/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.h b/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.h new file mode 100755 -index 000000000..a4330df85 +index 000000000000..a4330df85b33 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.h @@ -0,0 +1,289 @@ @@ -599039,7 +599039,7 @@ index 000000000..a4330df85 +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_backlight.c b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.c new file mode 100755 -index 000000000..2f0a98749 +index 000000000000..2f0a98749683 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.c @@ -0,0 +1,514 @@ @@ -599559,7 +599559,7 @@ index 000000000..2f0a98749 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_backlight.h b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.h new file mode 100755 -index 000000000..4c8dc6348 +index 000000000000..4c8dc6348354 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.h @@ -0,0 +1,64 @@ @@ -599629,7 +599629,7 @@ index 000000000..4c8dc6348 +#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 000000000..f606377ae +index 000000000000..f606377aeb07 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_clk.c @@ -0,0 +1,284 @@ @@ -599919,7 +599919,7 @@ index 000000000..f606377ae +} diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.c b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.c new file mode 100755 -index 000000000..923bcf3b2 +index 000000000000..923bcf3b2aa9 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.c @@ -0,0 +1,287 @@ @@ -600212,7 +600212,7 @@ index 000000000..923bcf3b2 +} diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.h b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.h new file mode 100755 -index 000000000..5bb39c044 +index 000000000000..5bb39c0447f0 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.h @@ -0,0 +1,79 @@ @@ -600297,7 +600297,7 @@ index 000000000..5bb39c044 +#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 000000000..9e7276b93 +index 000000000000..9e7276b933f9 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_direct_show.c @@ -0,0 +1,333 @@ @@ -600636,7 +600636,7 @@ index 000000000..9e7276b93 + 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 000000000..583f760eb +index 000000000000..583f760eb1f5 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_direct_show.h @@ -0,0 +1,67 @@ @@ -600709,7 +600709,7 @@ index 000000000..583f760eb +#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 000000000..58a907b6c +index 000000000000..58a907b6c816 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_display_pattern.c @@ -0,0 +1,419 @@ @@ -601134,7 +601134,7 @@ index 000000000..58a907b6c +} 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 000000000..4368f3397 +index 000000000000..4368f3397dbe --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_display_pattern.h @@ -0,0 +1,51 @@ @@ -601190,7 +601190,7 @@ index 000000000..4368f3397 + +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c -index 0f3eb392f..9f64ad8ed 100644 +index 0f3eb392fe39..9f64ad8ed07b 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -6,17 +6,24 @@ @@ -603116,7 +603116,7 @@ index 0f3eb392f..9f64ad8ed 100644 MODULE_AUTHOR("Mark Yao "); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h -index e33c2dcd0..2e8739b4f 100644 +index e33c2dcd0d4b..2e8739b4fcab 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h @@ -9,32 +9,463 @@ @@ -603717,7 +603717,7 @@ index e33c2dcd0..2e8739b4f 100644 +extern struct platform_driver vvop_platform_driver; #endif /* _ROCKCHIP_DRM_DRV_H_ */ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c -index 3aa37e177..91cb11985 100644 +index 3aa37e177667..91cb11985db8 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -5,6 +5,7 @@ @@ -604008,7 +604008,7 @@ index 3aa37e177..91cb11985 100644 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 1a6965210..444271927 100644 +index 1a696521096d..4442719270ab 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.h @@ -7,6 +7,10 @@ @@ -604047,7 +604047,7 @@ index 1a6965210..444271927 100644 + #endif /* _ROCKCHIP_DRM_FB_H */ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c -index 2fdc455c4..bd449be5b 100644 +index 2fdc455c4ad7..bd449be5b9c0 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c @@ -15,14 +15,12 @@ @@ -604119,7 +604119,7 @@ index 2fdc455c4..bd449be5b 100644 drm_fb_helper_unregister_fbi(helper); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c -index 22ff4a592..9a4b78d04 100644 +index 22ff4a592976..9a4b78d04191 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c @@ -4,7 +4,7 @@ @@ -604903,7 +604903,7 @@ index 22ff4a592..9a4b78d04 100644 + return 0; +} diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.h b/drivers/gpu/drm/rockchip/rockchip_drm_gem.h -index 7ffc541be..34bcb76b2 100644 +index 7ffc541bea07..34bcb76b20e3 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.h @@ -7,14 +7,24 @@ @@ -604971,7 +604971,7 @@ index 7ffc541be..34bcb76b2 100644 #endif /* _ROCKCHIP_DRM_GEM_H */ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_logo.c b/drivers/gpu/drm/rockchip/rockchip_drm_logo.c new file mode 100755 -index 000000000..af228f40c +index 000000000000..af228f40c404 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_logo.c @@ -0,0 +1,1234 @@ @@ -606211,7 +606211,7 @@ index 000000000..af228f40c +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_logo.h b/drivers/gpu/drm/rockchip/rockchip_drm_logo.h new file mode 100755 -index 000000000..7e1b1d2df +index 000000000000..7e1b1d2dfdf4 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_logo.h @@ -0,0 +1,46 @@ @@ -606263,7 +606263,7 @@ index 000000000..7e1b1d2df +#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 000000000..7c764fca1 +index 000000000000..7c764fca154d --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_self_test.c @@ -0,0 +1,269 @@ @@ -606538,7 +606538,7 @@ index 000000000..7c764fca1 +subsys_initcall_sync(rockchip_drm_self_test); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_tve.c b/drivers/gpu/drm/rockchip/rockchip_drm_tve.c new file mode 100755 -index 000000000..6fbd17c1b +index 000000000000..6fbd17c1b003 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_tve.c @@ -0,0 +1,1067 @@ @@ -607611,7 +607611,7 @@ index 000000000..6fbd17c1b +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_tve.h b/drivers/gpu/drm/rockchip/rockchip_drm_tve.h new file mode 100755 -index 000000000..376b2ff0f +index 000000000000..376b2ff0f422 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_tve.h @@ -0,0 +1,285 @@ @@ -607902,7 +607902,7 @@ index 000000000..376b2ff0f +#endif /* _ROCKCHIP_DRM_TVE_ */ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vconn.c b/drivers/gpu/drm/rockchip/rockchip_drm_vconn.c new file mode 100755 -index 000000000..f0fab09d3 +index 000000000000..f0fab09d386b --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vconn.c @@ -0,0 +1,587 @@ @@ -608494,7 +608494,7 @@ index 000000000..f0fab09d3 + }, +}; diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c -index af98bfcde..b80ef0c6d 100644 +index af98bfcde518..b80ef0c6dc53 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -6,21 +6,28 @@ @@ -614091,7 +614091,7 @@ index af98bfcde..b80ef0c6d 100644 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 857d97cdc..5f72a76be 100644 +index 857d97cdc67c..5f72a76beee0 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -7,112 +7,396 @@ @@ -615659,7 +615659,7 @@ index 857d97cdc..5f72a76be 100644 #endif /* _ROCKCHIP_DRM_VOP_H */ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c new file mode 100755 -index 000000000..2c7a66adf +index 000000000000..2c7a66adfb75 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -0,0 +1,12140 @@ @@ -627805,7 +627805,7 @@ index 000000000..2c7a66adf +EXPORT_SYMBOL_GPL(vop2_component_ops); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c new file mode 100755 -index 000000000..3f4432ad5 +index 000000000000..3f4432ad596c --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c @@ -0,0 +1,679 @@ @@ -628489,7 +628489,7 @@ index 000000000..3f4432ad5 +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 e2487937c..bc21bf48a 100644 +index e2487937c4e3..bc21bf48a329 100644 --- a/drivers/gpu/drm/rockchip/rockchip_lvds.c +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c @@ -6,98 +6,252 @@ @@ -629838,7 +629838,7 @@ index e2487937c..bc21bf48a 100644 .remove = rockchip_lvds_remove, 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 000000000..212a4b4b8 +index 000000000000..212a4b4b89e6 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_post_csc.c @@ -0,0 +1,1573 @@ @@ -631417,7 +631417,7 @@ index 000000000..212a4b4b8 +} 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 000000000..1215a5cd1 +index 000000000000..1215a5cd1c87 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_post_csc.h @@ -0,0 +1,18 @@ @@ -631440,7 +631440,7 @@ index 000000000..1215a5cd1 + +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_rgb.c b/drivers/gpu/drm/rockchip/rockchip_rgb.c -index 9a771af5d..a7f2057d3 100644 +index 9a771af5d0c9..a7f2057d349f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_rgb.c +++ b/drivers/gpu/drm/rockchip/rockchip_rgb.c @@ -6,29 +6,256 @@ @@ -632656,7 +632656,7 @@ index 9a771af5d..a7f2057d3 100644 + }, +}; diff --git a/drivers/gpu/drm/rockchip/rockchip_rgb.h b/drivers/gpu/drm/rockchip/rockchip_rgb.h -index 27b963512..8973232e0 100644 +index 27b9635124bc..8973232e0caa 100644 --- a/drivers/gpu/drm/rockchip/rockchip_rgb.h +++ b/drivers/gpu/drm/rockchip/rockchip_rgb.h @@ -8,12 +8,14 @@ @@ -632678,7 +632678,7 @@ index 27b963512..8973232e0 100644 } diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_clk.c b/drivers/gpu/drm/rockchip/rockchip_vop2_clk.c new file mode 100755 -index 000000000..b670e3d38 +index 000000000000..b670e3d38a64 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_clk.c @@ -0,0 +1,332 @@ @@ -633016,7 +633016,7 @@ index 000000000..b670e3d38 +} diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c new file mode 100755 -index 000000000..9854a23f5 +index 000000000000..9854a23f545b --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c @@ -0,0 +1,4010 @@ @@ -637031,7 +637031,7 @@ index 000000000..9854a23f5 + }, +}; diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c -index 39e1e1ebe..069cb6e7a 100644 +index 39e1e1ebea92..069cb6e7aef9 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -5,36 +5,36 @@ @@ -639857,7 +639857,7 @@ index 39e1e1ebe..069cb6e7a 100644 }; MODULE_DEVICE_TABLE(of, vop_driver_dt_match); diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h -index 6e9fa5815..a33f6fcec 100644 +index 6e9fa5815d4d..a33f6fcecb78 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h @@ -113,6 +113,11 @@ @@ -640885,7 +640885,7 @@ index 6e9fa5815..a33f6fcec 100644 +#define RK3528_ACM_YHS_DEL_HGAIN_SEG64 0x07d8 #endif /* _ROCKCHIP_VOP_REG_H */ diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c -index 13c14eb17..3a3de40fc 100644 +index 13c14eb175e9..3a3de40fc90f 100644 --- a/drivers/i2c/busses/i2c-rk3x.c +++ b/drivers/i2c/busses/i2c-rk3x.c @@ -23,6 +23,8 @@ @@ -641402,7 +641402,7 @@ index 13c14eb17..3a3de40fc 100644 MODULE_DESCRIPTION("Rockchip RK3xxx I2C Bus driver"); MODULE_AUTHOR("Max Schwarz "); diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c -index 34fecf97a..d041b7fa5 100644 +index 34fecf97a355..d041b7fa5c9c 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -61,6 +61,7 @@ @@ -641507,7 +641507,7 @@ index 34fecf97a..d041b7fa5 100644 unsigned cmd; void *arg; diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig -index e39b67912..2760f1e52 100644 +index e39b679126a2..2760f1e52b97 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -876,6 +876,13 @@ config ROCKCHIP_SARADC @@ -641525,7 +641525,7 @@ index e39b67912..2760f1e52 100644 tristate "Spreadtrum SC27xx series PMICs ADC" depends on MFD_SC27XX_PMIC || COMPILE_TEST diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c -index 12584f163..c266169df 100644 +index 12584f1631d8..c266169dfe61 100644 --- a/drivers/iio/adc/rockchip_saradc.c +++ b/drivers/iio/adc/rockchip_saradc.c @@ -35,7 +35,7 @@ @@ -641754,7 +641754,7 @@ index 12584f163..c266169df 100644 } diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig -index 1efd3154b..1c80fe7b3 100644 +index 1efd3154b68d..1c80fe7b3c4a 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig @@ -197,6 +197,10 @@ source "drivers/input/tablet/Kconfig" @@ -641769,7 +641769,7 @@ index 1efd3154b..1c80fe7b3 100644 source "drivers/input/rmi4/Kconfig" diff --git a/drivers/input/Makefile b/drivers/input/Makefile -index e35650930..5cd16233c 100644 +index e35650930371..5cd16233ce08 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -24,6 +24,8 @@ obj-$(CONFIG_INPUT_MOUSE) += mouse/ @@ -641782,7 +641782,7 @@ index e35650930..5cd16233c 100644 obj-$(CONFIG_INPUT_APMPOWER) += apm-power.o diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig -index 3f7a5ff17..7f21a0ba6 100644 +index 3f7a5ff17a9a..7f21a0ba6ae1 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -67,6 +67,9 @@ config KEYBOARD_AMIGA @@ -641796,7 +641796,7 @@ index 3f7a5ff17..7f21a0ba6 100644 tristate "Apple SPI keyboard and trackpad" depends on ACPI && EFI diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c -index 54afb3860..bb29a7c9a 100644 +index 54afb38601b9..bb29a7c9a1c0 100644 --- a/drivers/input/keyboard/hil_kbd.c +++ b/drivers/input/keyboard/hil_kbd.c @@ -512,7 +512,6 @@ static int hil_dev_connect(struct serio *serio, struct serio_driver *drv) @@ -641809,7 +641809,7 @@ index 54afb3860..bb29a7c9a 100644 diff --git a/drivers/input/keyboard/rk_keys.c b/drivers/input/keyboard/rk_keys.c new file mode 100755 -index 000000000..375cfbd60 +index 000000000000..375cfbd600ea --- /dev/null +++ b/drivers/input/keyboard/rk_keys.c @@ -0,0 +1,555 @@ @@ -642370,7 +642370,7 @@ index 000000000..375cfbd60 +module_exit(rk_keys_driver_exit); diff --git a/drivers/input/remotectl/Kconfig b/drivers/input/remotectl/Kconfig new file mode 100755 -index 000000000..67558b488 +index 000000000000..67558b48869e --- /dev/null +++ b/drivers/input/remotectl/Kconfig @@ -0,0 +1,19 @@ @@ -642395,7 +642395,7 @@ index 000000000..67558b488 +endif diff --git a/drivers/input/remotectl/Makefile b/drivers/input/remotectl/Makefile new file mode 100755 -index 000000000..209472b4a +index 000000000000..209472b4a356 --- /dev/null +++ b/drivers/input/remotectl/Makefile @@ -0,0 +1,8 @@ @@ -642409,7 +642409,7 @@ index 000000000..209472b4a +obj-$(CONFIG_ROCKCHIP_REMOTECTL_PWM) += rockchip_pwm_remotectl.o diff --git a/drivers/input/remotectl/rockchip_pwm_remotectl.c b/drivers/input/remotectl/rockchip_pwm_remotectl.c new file mode 100755 -index 000000000..f24ba9edf +index 000000000000..f24ba9edf08b --- /dev/null +++ b/drivers/input/remotectl/rockchip_pwm_remotectl.c @@ -0,0 +1,828 @@ @@ -643243,7 +643243,7 @@ index 000000000..f24ba9edf +MODULE_LICENSE("GPL"); diff --git a/drivers/input/remotectl/rockchip_pwm_remotectl.h b/drivers/input/remotectl/rockchip_pwm_remotectl.h new file mode 100755 -index 000000000..5126a3edb +index 000000000000..5126a3edb5d5 --- /dev/null +++ b/drivers/input/remotectl/rockchip_pwm_remotectl.h @@ -0,0 +1,160 @@ @@ -643409,7 +643409,7 @@ index 000000000..5126a3edb +#endif diff --git a/drivers/input/sensors/Kconfig b/drivers/input/sensors/Kconfig new file mode 100755 -index 000000000..ebff9437a +index 000000000000..ebff9437aa66 --- /dev/null +++ b/drivers/input/sensors/Kconfig @@ -0,0 +1,23 @@ @@ -643438,7 +643438,7 @@ index 000000000..ebff9437a +endif diff --git a/drivers/input/sensors/Makefile b/drivers/input/sensors/Makefile new file mode 100755 -index 000000000..df8d372da +index 000000000000..df8d372dafe1 --- /dev/null +++ b/drivers/input/sensors/Makefile @@ -0,0 +1,15 @@ @@ -643459,7 +643459,7 @@ index 000000000..df8d372da +sensor_dev-y = sensor-i2c.o sensor-dev.o diff --git a/drivers/input/sensors/accel/Kconfig b/drivers/input/sensors/accel/Kconfig new file mode 100755 -index 000000000..724cb2ca1 +index 000000000000..724cb2ca1e7a --- /dev/null +++ b/drivers/input/sensors/accel/Kconfig @@ -0,0 +1,149 @@ @@ -643614,7 +643614,7 @@ index 000000000..724cb2ca1 +endif diff --git a/drivers/input/sensors/accel/Makefile b/drivers/input/sensors/accel/Makefile new file mode 100755 -index 000000000..de250ef4a +index 000000000000..de250ef4a282 --- /dev/null +++ b/drivers/input/sensors/accel/Makefile @@ -0,0 +1,22 @@ @@ -643642,7 +643642,7 @@ index 000000000..de250ef4a +da223-y := da223_cust.o da223_core.o diff --git a/drivers/input/sensors/accel/bma2xx.c b/drivers/input/sensors/accel/bma2xx.c new file mode 100755 -index 000000000..19f578a77 +index 000000000000..19f578a77295 --- /dev/null +++ b/drivers/input/sensors/accel/bma2xx.c @@ -0,0 +1,2268 @@ @@ -645916,7 +645916,7 @@ index 000000000..19f578a77 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/da223_core.c b/drivers/input/sensors/accel/da223_core.c new file mode 100755 -index 000000000..b0e25eac9 +index 000000000000..b0e25eac9b5f --- /dev/null +++ b/drivers/input/sensors/accel/da223_core.c @@ -0,0 +1,1907 @@ @@ -647829,7 +647829,7 @@ index 000000000..b0e25eac9 +} diff --git a/drivers/input/sensors/accel/da223_core.h b/drivers/input/sensors/accel/da223_core.h new file mode 100755 -index 000000000..de67d711b +index 000000000000..de67d711b486 --- /dev/null +++ b/drivers/input/sensors/accel/da223_core.h @@ -0,0 +1,303 @@ @@ -648138,7 +648138,7 @@ index 000000000..de67d711b + diff --git a/drivers/input/sensors/accel/da223_cust.c b/drivers/input/sensors/accel/da223_cust.c new file mode 100755 -index 000000000..c00836d5b +index 000000000000..c00836d5b78d --- /dev/null +++ b/drivers/input/sensors/accel/da223_cust.c @@ -0,0 +1,898 @@ @@ -649042,7 +649042,7 @@ index 000000000..c00836d5b +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/da223_cust.h b/drivers/input/sensors/accel/da223_cust.h new file mode 100755 -index 000000000..e6bf15a02 +index 000000000000..e6bf15a02da8 --- /dev/null +++ b/drivers/input/sensors/accel/da223_cust.h @@ -0,0 +1,44 @@ @@ -649092,7 +649092,7 @@ index 000000000..e6bf15a02 + diff --git a/drivers/input/sensors/accel/dmard10.c b/drivers/input/sensors/accel/dmard10.c new file mode 100755 -index 000000000..8be258c31 +index 000000000000..8be258c316a2 --- /dev/null +++ b/drivers/input/sensors/accel/dmard10.c @@ -0,0 +1,454 @@ @@ -649552,7 +649552,7 @@ index 000000000..8be258c31 + diff --git a/drivers/input/sensors/accel/icm2060x_acc.c b/drivers/input/sensors/accel/icm2060x_acc.c new file mode 100755 -index 000000000..80a5c96e6 +index 000000000000..80a5c96e6207 --- /dev/null +++ b/drivers/input/sensors/accel/icm2060x_acc.c @@ -0,0 +1,260 @@ @@ -649818,7 +649818,7 @@ index 000000000..80a5c96e6 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/kxtik.c b/drivers/input/sensors/accel/kxtik.c new file mode 100755 -index 000000000..734b471f5 +index 000000000000..734b471f5d3a --- /dev/null +++ b/drivers/input/sensors/accel/kxtik.c @@ -0,0 +1,359 @@ @@ -650183,7 +650183,7 @@ index 000000000..734b471f5 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/kxtj9.c b/drivers/input/sensors/accel/kxtj9.c new file mode 100755 -index 000000000..6fc6a8c5f +index 000000000000..6fc6a8c5f119 --- /dev/null +++ b/drivers/input/sensors/accel/kxtj9.c @@ -0,0 +1,332 @@ @@ -650521,7 +650521,7 @@ index 000000000..6fc6a8c5f +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/lis3dh.c b/drivers/input/sensors/accel/lis3dh.c new file mode 100755 -index 000000000..55f0fe526 +index 000000000000..55f0fe526899 --- /dev/null +++ b/drivers/input/sensors/accel/lis3dh.c @@ -0,0 +1,303 @@ @@ -650830,7 +650830,7 @@ index 000000000..55f0fe526 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/lsm303d.c b/drivers/input/sensors/accel/lsm303d.c new file mode 100755 -index 000000000..ff238278f +index 000000000000..ff238278f10c --- /dev/null +++ b/drivers/input/sensors/accel/lsm303d.c @@ -0,0 +1,362 @@ @@ -651198,7 +651198,7 @@ index 000000000..ff238278f +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/lsm330_acc.c b/drivers/input/sensors/accel/lsm330_acc.c new file mode 100755 -index 000000000..ed93bb014 +index 000000000000..ed93bb0147ff --- /dev/null +++ b/drivers/input/sensors/accel/lsm330_acc.c @@ -0,0 +1,278 @@ @@ -651482,7 +651482,7 @@ index 000000000..ed93bb014 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/mc3230.c b/drivers/input/sensors/accel/mc3230.c new file mode 100755 -index 000000000..d5827f2f2 +index 000000000000..d5827f2f2bee --- /dev/null +++ b/drivers/input/sensors/accel/mc3230.c @@ -0,0 +1,1353 @@ @@ -652841,7 +652841,7 @@ index 000000000..d5827f2f2 +MODULE_DESCRIPTION("mc3230 3-Axis accelerometer driver"); diff --git a/drivers/input/sensors/accel/mma7660.c b/drivers/input/sensors/accel/mma7660.c new file mode 100755 -index 000000000..33e2dec7b +index 000000000000..33e2dec7bb22 --- /dev/null +++ b/drivers/input/sensors/accel/mma7660.c @@ -0,0 +1,258 @@ @@ -653105,7 +653105,7 @@ index 000000000..33e2dec7b +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/mma8452.c b/drivers/input/sensors/accel/mma8452.c new file mode 100755 -index 000000000..9c8bb48f0 +index 000000000000..9c8bb48f0848 --- /dev/null +++ b/drivers/input/sensors/accel/mma8452.c @@ -0,0 +1,424 @@ @@ -653535,7 +653535,7 @@ index 000000000..9c8bb48f0 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/mpu6500_acc.c b/drivers/input/sensors/accel/mpu6500_acc.c new file mode 100755 -index 000000000..6fc2058e0 +index 000000000000..6fc2058e0f9f --- /dev/null +++ b/drivers/input/sensors/accel/mpu6500_acc.c @@ -0,0 +1,300 @@ @@ -653841,7 +653841,7 @@ index 000000000..6fc2058e0 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/mpu6880_acc.c b/drivers/input/sensors/accel/mpu6880_acc.c new file mode 100755 -index 000000000..4cf8c8950 +index 000000000000..4cf8c89506a5 --- /dev/null +++ b/drivers/input/sensors/accel/mpu6880_acc.c @@ -0,0 +1,296 @@ @@ -654143,7 +654143,7 @@ index 000000000..4cf8c8950 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/mxc622x.c b/drivers/input/sensors/accel/mxc622x.c new file mode 100755 -index 000000000..614242584 +index 000000000000..614242584e0a --- /dev/null +++ b/drivers/input/sensors/accel/mxc622x.c @@ -0,0 +1,284 @@ @@ -654433,7 +654433,7 @@ index 000000000..614242584 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/mxc6655xa.c b/drivers/input/sensors/accel/mxc6655xa.c new file mode 100755 -index 000000000..535a83a26 +index 000000000000..535a83a262f5 --- /dev/null +++ b/drivers/input/sensors/accel/mxc6655xa.c @@ -0,0 +1,262 @@ @@ -654701,7 +654701,7 @@ index 000000000..535a83a26 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/sc7660.c b/drivers/input/sensors/accel/sc7660.c new file mode 100755 -index 000000000..39106b111 +index 000000000000..39106b111000 --- /dev/null +++ b/drivers/input/sensors/accel/sc7660.c @@ -0,0 +1,1655 @@ @@ -656362,7 +656362,7 @@ index 000000000..39106b111 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/sc7a20.c b/drivers/input/sensors/accel/sc7a20.c new file mode 100755 -index 000000000..f7443f922 +index 000000000000..f7443f922e7e --- /dev/null +++ b/drivers/input/sensors/accel/sc7a20.c @@ -0,0 +1,1768 @@ @@ -658136,7 +658136,7 @@ index 000000000..f7443f922 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/sc7a30.c b/drivers/input/sensors/accel/sc7a30.c new file mode 100755 -index 000000000..576c91880 +index 000000000000..576c9188029b --- /dev/null +++ b/drivers/input/sensors/accel/sc7a30.c @@ -0,0 +1,1215 @@ @@ -659357,7 +659357,7 @@ index 000000000..576c91880 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/stk8baxx.c b/drivers/input/sensors/accel/stk8baxx.c new file mode 100755 -index 000000000..9ca93971d +index 000000000000..9ca93971d914 --- /dev/null +++ b/drivers/input/sensors/accel/stk8baxx.c @@ -0,0 +1,957 @@ @@ -660320,7 +660320,7 @@ index 000000000..9ca93971d +MODULE_VERSION(STK_ACC_DRIVER_VERSION); diff --git a/drivers/input/sensors/angle/Kconfig b/drivers/input/sensors/angle/Kconfig new file mode 100755 -index 000000000..088837f92 +index 000000000000..088837f92ed8 --- /dev/null +++ b/drivers/input/sensors/angle/Kconfig @@ -0,0 +1,27 @@ @@ -660353,7 +660353,7 @@ index 000000000..088837f92 + diff --git a/drivers/input/sensors/angle/Makefile b/drivers/input/sensors/angle/Makefile new file mode 100755 -index 000000000..0696550b5 +index 000000000000..0696550b53f8 --- /dev/null +++ b/drivers/input/sensors/angle/Makefile @@ -0,0 +1,3 @@ @@ -660362,7 +660362,7 @@ index 000000000..0696550b5 +obj-$(CONFIG_ANGLE_LIS3DH) += angle_lis3dh.o diff --git a/drivers/input/sensors/angle/angle_kxtik.c b/drivers/input/sensors/angle/angle_kxtik.c new file mode 100755 -index 000000000..7373c6bd4 +index 000000000000..7373c6bd4068 --- /dev/null +++ b/drivers/input/sensors/angle/angle_kxtik.c @@ -0,0 +1,398 @@ @@ -660766,7 +660766,7 @@ index 000000000..7373c6bd4 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/angle/angle_lis3dh.c b/drivers/input/sensors/angle/angle_lis3dh.c new file mode 100755 -index 000000000..ae247ffa2 +index 000000000000..ae247ffa2312 --- /dev/null +++ b/drivers/input/sensors/angle/angle_lis3dh.c @@ -0,0 +1,342 @@ @@ -661114,7 +661114,7 @@ index 000000000..ae247ffa2 + diff --git a/drivers/input/sensors/compass/Kconfig b/drivers/input/sensors/compass/Kconfig new file mode 100755 -index 000000000..91a19ffe2 +index 000000000000..91a19ffe23ea --- /dev/null +++ b/drivers/input/sensors/compass/Kconfig @@ -0,0 +1,58 @@ @@ -661178,7 +661178,7 @@ index 000000000..91a19ffe2 + diff --git a/drivers/input/sensors/compass/Makefile b/drivers/input/sensors/compass/Makefile new file mode 100755 -index 000000000..f42c2aa2d +index 000000000000..f42c2aa2dd17 --- /dev/null +++ b/drivers/input/sensors/compass/Makefile @@ -0,0 +1,8 @@ @@ -661192,7 +661192,7 @@ index 000000000..f42c2aa2d +obj-$(CONFIG_COMPASS_AK09918) += ak09918.o diff --git a/drivers/input/sensors/compass/ak09911.c b/drivers/input/sensors/compass/ak09911.c new file mode 100755 -index 000000000..b1e334d0b +index 000000000000..b1e334d0b5a8 --- /dev/null +++ b/drivers/input/sensors/compass/ak09911.c @@ -0,0 +1,667 @@ @@ -661865,7 +661865,7 @@ index 000000000..b1e334d0b +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/compass/ak09918.c b/drivers/input/sensors/compass/ak09918.c new file mode 100755 -index 000000000..1c3056a82 +index 000000000000..1c3056a824e5 --- /dev/null +++ b/drivers/input/sensors/compass/ak09918.c @@ -0,0 +1,692 @@ @@ -662563,7 +662563,7 @@ index 000000000..1c3056a82 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/compass/ak8963.c b/drivers/input/sensors/compass/ak8963.c new file mode 100755 -index 000000000..10e91eb2d +index 000000000000..10e91eb2d0be --- /dev/null +++ b/drivers/input/sensors/compass/ak8963.c @@ -0,0 +1,714 @@ @@ -663283,7 +663283,7 @@ index 000000000..10e91eb2d +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/compass/ak8975.c b/drivers/input/sensors/compass/ak8975.c new file mode 100755 -index 000000000..c48a808ed +index 000000000000..c48a808ed18d --- /dev/null +++ b/drivers/input/sensors/compass/ak8975.c @@ -0,0 +1,650 @@ @@ -663939,7 +663939,7 @@ index 000000000..c48a808ed + diff --git a/drivers/input/sensors/gyro/Kconfig b/drivers/input/sensors/gyro/Kconfig new file mode 100755 -index 000000000..fb721d4cb +index 000000000000..fb721d4cb30d --- /dev/null +++ b/drivers/input/sensors/gyro/Kconfig @@ -0,0 +1,42 @@ @@ -663987,7 +663987,7 @@ index 000000000..fb721d4cb +endif diff --git a/drivers/input/sensors/gyro/Makefile b/drivers/input/sensors/gyro/Makefile new file mode 100755 -index 000000000..0943257a1 +index 000000000000..0943257a11de --- /dev/null +++ b/drivers/input/sensors/gyro/Makefile @@ -0,0 +1,11 @@ @@ -664004,7 +664004,7 @@ index 000000000..0943257a1 +obj-$(CONFIG_GYRO_ICM2060X) += icm2060x_gyro.o diff --git a/drivers/input/sensors/gyro/ewtsa.c b/drivers/input/sensors/gyro/ewtsa.c new file mode 100755 -index 000000000..acbc0ac4b +index 000000000000..acbc0ac4b143 --- /dev/null +++ b/drivers/input/sensors/gyro/ewtsa.c @@ -0,0 +1,461 @@ @@ -664471,7 +664471,7 @@ index 000000000..acbc0ac4b +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/gyro/icm2060x_gyro.c b/drivers/input/sensors/gyro/icm2060x_gyro.c new file mode 100755 -index 000000000..3d4624b5d +index 000000000000..3d4624b5dbd6 --- /dev/null +++ b/drivers/input/sensors/gyro/icm2060x_gyro.c @@ -0,0 +1,216 @@ @@ -664693,7 +664693,7 @@ index 000000000..3d4624b5d +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/gyro/l3g20d.c b/drivers/input/sensors/gyro/l3g20d.c new file mode 100755 -index 000000000..8822a0e3b +index 000000000000..8822a0e3bfe0 --- /dev/null +++ b/drivers/input/sensors/gyro/l3g20d.c @@ -0,0 +1,257 @@ @@ -664956,7 +664956,7 @@ index 000000000..8822a0e3b +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/gyro/l3g4200d.c b/drivers/input/sensors/gyro/l3g4200d.c new file mode 100755 -index 000000000..b1e3af658 +index 000000000000..b1e3af6589cb --- /dev/null +++ b/drivers/input/sensors/gyro/l3g4200d.c @@ -0,0 +1,257 @@ @@ -665219,7 +665219,7 @@ index 000000000..b1e3af658 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/gyro/lsm330_gyro.c b/drivers/input/sensors/gyro/lsm330_gyro.c new file mode 100755 -index 000000000..a488d4826 +index 000000000000..a488d4826acf --- /dev/null +++ b/drivers/input/sensors/gyro/lsm330_gyro.c @@ -0,0 +1,262 @@ @@ -665487,7 +665487,7 @@ index 000000000..a488d4826 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/gyro/mpu6500_gyro.c b/drivers/input/sensors/gyro/mpu6500_gyro.c new file mode 100755 -index 000000000..6b4f81154 +index 000000000000..6b4f81154b7f --- /dev/null +++ b/drivers/input/sensors/gyro/mpu6500_gyro.c @@ -0,0 +1,216 @@ @@ -665709,7 +665709,7 @@ index 000000000..6b4f81154 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/gyro/mpu6880_gyro.c b/drivers/input/sensors/gyro/mpu6880_gyro.c new file mode 100755 -index 000000000..324e66ecf +index 000000000000..324e66ecfab6 --- /dev/null +++ b/drivers/input/sensors/gyro/mpu6880_gyro.c @@ -0,0 +1,216 @@ @@ -665931,7 +665931,7 @@ index 000000000..324e66ecf +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/hall/Kconfig b/drivers/input/sensors/hall/Kconfig new file mode 100755 -index 000000000..33ca28c87 +index 000000000000..33ca28c87cda --- /dev/null +++ b/drivers/input/sensors/hall/Kconfig @@ -0,0 +1,16 @@ @@ -665953,7 +665953,7 @@ index 000000000..33ca28c87 +endif diff --git a/drivers/input/sensors/hall/Makefile b/drivers/input/sensors/hall/Makefile new file mode 100755 -index 000000000..f78ba4ffb +index 000000000000..f78ba4ffb850 --- /dev/null +++ b/drivers/input/sensors/hall/Makefile @@ -0,0 +1,3 @@ @@ -665962,7 +665962,7 @@ index 000000000..f78ba4ffb +obj-$(CONFIG_HS_MH248) += mh248.o diff --git a/drivers/input/sensors/hall/mh248.c b/drivers/input/sensors/hall/mh248.c new file mode 100755 -index 000000000..88ee00980 +index 000000000000..88ee00980514 --- /dev/null +++ b/drivers/input/sensors/hall/mh248.c @@ -0,0 +1,165 @@ @@ -666133,7 +666133,7 @@ index 000000000..88ee00980 +MODULE_DESCRIPTION("Hall Sensor MH248 driver"); diff --git a/drivers/input/sensors/hall/och165t_hall.c b/drivers/input/sensors/hall/och165t_hall.c new file mode 100755 -index 000000000..71711a950 +index 000000000000..71711a95028d --- /dev/null +++ b/drivers/input/sensors/hall/och165t_hall.c @@ -0,0 +1,159 @@ @@ -666298,7 +666298,7 @@ index 000000000..71711a950 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/Kconfig b/drivers/input/sensors/lsensor/Kconfig new file mode 100755 -index 000000000..8ea493862 +index 000000000000..8ea493862dd3 --- /dev/null +++ b/drivers/input/sensors/lsensor/Kconfig @@ -0,0 +1,50 @@ @@ -666354,7 +666354,7 @@ index 000000000..8ea493862 + diff --git a/drivers/input/sensors/lsensor/Makefile b/drivers/input/sensors/lsensor/Makefile new file mode 100755 -index 000000000..aa8bf78f4 +index 000000000000..aa8bf78f440c --- /dev/null +++ b/drivers/input/sensors/lsensor/Makefile @@ -0,0 +1,13 @@ @@ -666373,7 +666373,7 @@ index 000000000..aa8bf78f4 +obj-$(CONFIG_LS_EM3071X) += ls_em3071x.o diff --git a/drivers/input/sensors/lsensor/cm3217.c b/drivers/input/sensors/lsensor/cm3217.c new file mode 100755 -index 000000000..182fee423 +index 000000000000..182fee423993 --- /dev/null +++ b/drivers/input/sensors/lsensor/cm3217.c @@ -0,0 +1,237 @@ @@ -666616,7 +666616,7 @@ index 000000000..182fee423 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/cm3218.c b/drivers/input/sensors/lsensor/cm3218.c new file mode 100755 -index 000000000..eed39578b +index 000000000000..eed39578b005 --- /dev/null +++ b/drivers/input/sensors/lsensor/cm3218.c @@ -0,0 +1,415 @@ @@ -667037,7 +667037,7 @@ index 000000000..eed39578b +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/cm3232.c b/drivers/input/sensors/lsensor/cm3232.c new file mode 100755 -index 000000000..6322e57bb +index 000000000000..6322e57bb1a9 --- /dev/null +++ b/drivers/input/sensors/lsensor/cm3232.c @@ -0,0 +1,245 @@ @@ -667288,7 +667288,7 @@ index 000000000..6322e57bb +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/isl29023.c b/drivers/input/sensors/lsensor/isl29023.c new file mode 100755 -index 000000000..200c4b295 +index 000000000000..200c4b2959c7 --- /dev/null +++ b/drivers/input/sensors/lsensor/isl29023.c @@ -0,0 +1,273 @@ @@ -667567,7 +667567,7 @@ index 000000000..200c4b295 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/ls_al3006.c b/drivers/input/sensors/lsensor/ls_al3006.c new file mode 100755 -index 000000000..8334d0fac +index 000000000000..8334d0faceaf --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_al3006.c @@ -0,0 +1,301 @@ @@ -667874,7 +667874,7 @@ index 000000000..8334d0fac + diff --git a/drivers/input/sensors/lsensor/ls_ap321xx.c b/drivers/input/sensors/lsensor/ls_ap321xx.c new file mode 100755 -index 000000000..8181cec58 +index 000000000000..8181cec587a0 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_ap321xx.c @@ -0,0 +1,415 @@ @@ -668295,7 +668295,7 @@ index 000000000..8181cec58 + diff --git a/drivers/input/sensors/lsensor/ls_em3071x.c b/drivers/input/sensors/lsensor/ls_em3071x.c new file mode 100755 -index 000000000..fc7500963 +index 000000000000..fc7500963ab5 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_em3071x.c @@ -0,0 +1,283 @@ @@ -668584,7 +668584,7 @@ index 000000000..fc7500963 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/ls_stk3171.c b/drivers/input/sensors/lsensor/ls_stk3171.c new file mode 100755 -index 000000000..a8bc7d0e9 +index 000000000000..a8bc7d0e9af3 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_stk3171.c @@ -0,0 +1,321 @@ @@ -668911,7 +668911,7 @@ index 000000000..a8bc7d0e9 + diff --git a/drivers/input/sensors/lsensor/ls_stk3410.c b/drivers/input/sensors/lsensor/ls_stk3410.c new file mode 100755 -index 000000000..25722040f +index 000000000000..25722040fc31 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_stk3410.c @@ -0,0 +1,374 @@ @@ -669291,7 +669291,7 @@ index 000000000..25722040f +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/ls_us5152.c b/drivers/input/sensors/lsensor/ls_us5152.c new file mode 100755 -index 000000000..4f5b470bc +index 000000000000..4f5b470bc735 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_us5152.c @@ -0,0 +1,440 @@ @@ -669737,7 +669737,7 @@ index 000000000..4f5b470bc +MODULE_VERSION(DRIVER_VERSION); diff --git a/drivers/input/sensors/lsensor/ls_us5152.h b/drivers/input/sensors/lsensor/ls_us5152.h new file mode 100755 -index 000000000..71f108572 +index 000000000000..71f108572639 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_us5152.h @@ -0,0 +1,235 @@ @@ -669978,7 +669978,7 @@ index 000000000..71f108572 +#endif diff --git a/drivers/input/sensors/pressure/Kconfig b/drivers/input/sensors/pressure/Kconfig new file mode 100755 -index 000000000..8bbaaa148 +index 000000000000..8bbaaa148690 --- /dev/null +++ b/drivers/input/sensors/pressure/Kconfig @@ -0,0 +1,15 @@ @@ -669999,7 +669999,7 @@ index 000000000..8bbaaa148 +endif diff --git a/drivers/input/sensors/pressure/Makefile b/drivers/input/sensors/pressure/Makefile new file mode 100755 -index 000000000..18872b53b +index 000000000000..18872b53bb4b --- /dev/null +++ b/drivers/input/sensors/pressure/Makefile @@ -0,0 +1,7 @@ @@ -670012,7 +670012,7 @@ index 000000000..18872b53b + diff --git a/drivers/input/sensors/pressure/pr_ms5607.c b/drivers/input/sensors/pressure/pr_ms5607.c new file mode 100755 -index 000000000..9833ad5d9 +index 000000000000..9833ad5d9a9e --- /dev/null +++ b/drivers/input/sensors/pressure/pr_ms5607.c @@ -0,0 +1,297 @@ @@ -670315,7 +670315,7 @@ index 000000000..9833ad5d9 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/psensor/Kconfig b/drivers/input/sensors/psensor/Kconfig new file mode 100755 -index 000000000..c7d32f51e +index 000000000000..c7d32f51e7d0 --- /dev/null +++ b/drivers/input/sensors/psensor/Kconfig @@ -0,0 +1,32 @@ @@ -670353,7 +670353,7 @@ index 000000000..c7d32f51e + diff --git a/drivers/input/sensors/psensor/Makefile b/drivers/input/sensors/psensor/Makefile new file mode 100755 -index 000000000..49210d0e7 +index 000000000000..49210d0e71cc --- /dev/null +++ b/drivers/input/sensors/psensor/Makefile @@ -0,0 +1,8 @@ @@ -670367,7 +670367,7 @@ index 000000000..49210d0e7 +obj-$(CONFIG_PS_EM3071X) += ps_em3071x.o diff --git a/drivers/input/sensors/psensor/ps_al3006.c b/drivers/input/sensors/psensor/ps_al3006.c new file mode 100755 -index 000000000..3242af2be +index 000000000000..3242af2be23f --- /dev/null +++ b/drivers/input/sensors/psensor/ps_al3006.c @@ -0,0 +1,261 @@ @@ -670634,7 +670634,7 @@ index 000000000..3242af2be +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/psensor/ps_ap321xx.c b/drivers/input/sensors/psensor/ps_ap321xx.c new file mode 100755 -index 000000000..d3711461a +index 000000000000..d3711461af20 --- /dev/null +++ b/drivers/input/sensors/psensor/ps_ap321xx.c @@ -0,0 +1,325 @@ @@ -670965,7 +670965,7 @@ index 000000000..d3711461a +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/psensor/ps_em3071x.c b/drivers/input/sensors/psensor/ps_em3071x.c new file mode 100755 -index 000000000..5f3873488 +index 000000000000..5f387348881b --- /dev/null +++ b/drivers/input/sensors/psensor/ps_em3071x.c @@ -0,0 +1,280 @@ @@ -671251,7 +671251,7 @@ index 000000000..5f3873488 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/psensor/ps_stk3171.c b/drivers/input/sensors/psensor/ps_stk3171.c new file mode 100755 -index 000000000..1753bbe65 +index 000000000000..1753bbe65c19 --- /dev/null +++ b/drivers/input/sensors/psensor/ps_stk3171.c @@ -0,0 +1,268 @@ @@ -671525,7 +671525,7 @@ index 000000000..1753bbe65 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/psensor/ps_stk3410.c b/drivers/input/sensors/psensor/ps_stk3410.c new file mode 100755 -index 000000000..90f9a2313 +index 000000000000..90f9a2313d1f --- /dev/null +++ b/drivers/input/sensors/psensor/ps_stk3410.c @@ -0,0 +1,377 @@ @@ -671908,7 +671908,7 @@ index 000000000..90f9a2313 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/sensor-dev.c b/drivers/input/sensors/sensor-dev.c new file mode 100755 -index 000000000..5aeeba175 +index 000000000000..5aeeba175edd --- /dev/null +++ b/drivers/input/sensors/sensor-dev.c @@ -0,0 +1,2042 @@ @@ -673956,7 +673956,7 @@ index 000000000..5aeeba175 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/sensor-i2c.c b/drivers/input/sensors/sensor-i2c.c new file mode 100755 -index 000000000..35c3feec8 +index 000000000000..35c3feec8b32 --- /dev/null +++ b/drivers/input/sensors/sensor-i2c.c @@ -0,0 +1,245 @@ @@ -674207,7 +674207,7 @@ index 000000000..35c3feec8 + diff --git a/drivers/input/sensors/temperature/Kconfig b/drivers/input/sensors/temperature/Kconfig new file mode 100755 -index 000000000..34edaa783 +index 000000000000..34edaa7838ac --- /dev/null +++ b/drivers/input/sensors/temperature/Kconfig @@ -0,0 +1,15 @@ @@ -674228,7 +674228,7 @@ index 000000000..34edaa783 +endif diff --git a/drivers/input/sensors/temperature/Makefile b/drivers/input/sensors/temperature/Makefile new file mode 100755 -index 000000000..6045760d7 +index 000000000000..6045760d7e93 --- /dev/null +++ b/drivers/input/sensors/temperature/Makefile @@ -0,0 +1,7 @@ @@ -674241,7 +674241,7 @@ index 000000000..6045760d7 + diff --git a/drivers/input/sensors/temperature/tmp_ms5607.c b/drivers/input/sensors/temperature/tmp_ms5607.c new file mode 100755 -index 000000000..1e5183ccc +index 000000000000..1e5183ccc11d --- /dev/null +++ b/drivers/input/sensors/temperature/tmp_ms5607.c @@ -0,0 +1,314 @@ @@ -674560,7 +674560,7 @@ index 000000000..1e5183ccc +MODULE_DESCRIPTION("ms5607 temperature driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig -index cc18f54ea..b9db13eda 100644 +index cc18f54ea887..b9db13edafc1 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -404,6 +404,24 @@ config TOUCHSCREEN_GOODIX @@ -674589,7 +674589,7 @@ index cc18f54ea..b9db13eda 100644 tristate "HiDeep Touch IC" depends on I2C diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile -index 6233541e9..4a3cd29bd 100644 +index 6233541e9173..4a3cd29bd96d 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -45,6 +45,10 @@ obj-$(CONFIG_TOUCHSCREEN_EGALAX_SERIAL) += egalax_ts_serial.o @@ -674605,7 +674605,7 @@ index 6233541e9..4a3cd29bd 100644 obj-$(CONFIG_TOUCHSCREEN_IMX6UL_TSC) += imx6ul_tsc.o diff --git a/drivers/input/touchscreen/cy8c_touchpad.c b/drivers/input/touchscreen/cy8c_touchpad.c new file mode 100755 -index 000000000..8088cb918 +index 000000000000..8088cb918c79 --- /dev/null +++ b/drivers/input/touchscreen/cy8c_touchpad.c @@ -0,0 +1,296 @@ @@ -674907,7 +674907,7 @@ index 000000000..8088cb918 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/input/touchscreen/cyttsp5/Kconfig b/drivers/input/touchscreen/cyttsp5/Kconfig new file mode 100755 -index 000000000..4bdeb1b83 +index 000000000000..4bdeb1b8365d --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/Kconfig @@ -0,0 +1,205 @@ @@ -675118,7 +675118,7 @@ index 000000000..4bdeb1b83 + diff --git a/drivers/input/touchscreen/cyttsp5/Makefile b/drivers/input/touchscreen/cyttsp5/Makefile new file mode 100755 -index 000000000..ff1fe5260 +index 000000000000..ff1fe526035d --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/Makefile @@ -0,0 +1,23 @@ @@ -675147,7 +675147,7 @@ index 000000000..ff1fe5260 +obj-$(CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP5_TEST_DEVICE_ACCESS_API) += cyttsp5_test_device_access_api.o diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_btn.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_btn.c new file mode 100755 -index 000000000..52c0eb85d +index 000000000000..52c0eb85d29e --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_btn.c @@ -0,0 +1,369 @@ @@ -675522,7 +675522,7 @@ index 000000000..52c0eb85d +} diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_core.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_core.c new file mode 100755 -index 000000000..7fac39a1b +index 000000000000..7fac39a1bbaf --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_core.c @@ -0,0 +1,6292 @@ @@ -681820,7 +681820,7 @@ index 000000000..7fac39a1b +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_core.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_core.h new file mode 100755 -index 000000000..598961386 +index 000000000000..5989613865c1 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_core.h @@ -0,0 +1,182 @@ @@ -682008,7 +682008,7 @@ index 000000000..598961386 +#endif /* _LINUX_CYTTSP5_CORE_H */ diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_debug.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_debug.c new file mode 100755 -index 000000000..f4ebba784 +index 000000000000..f4ebba784936 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_debug.c @@ -0,0 +1,393 @@ @@ -682407,7 +682407,7 @@ index 000000000..f4ebba784 +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_device_access.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_device_access.c new file mode 100755 -index 000000000..51cd63dc6 +index 000000000000..51cd63dc6ac0 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_device_access.c @@ -0,0 +1,5219 @@ @@ -687632,7 +687632,7 @@ index 000000000..51cd63dc6 + diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_devtree.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_devtree.c new file mode 100755 -index 000000000..9cb905096 +index 000000000000..9cb9050960b6 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_devtree.c @@ -0,0 +1,785 @@ @@ -688423,7 +688423,7 @@ index 000000000..9cb905096 +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_i2c.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_i2c.c new file mode 100755 -index 000000000..976db422b +index 000000000000..976db422b907 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_i2c.c @@ -0,0 +1,248 @@ @@ -688677,7 +688677,7 @@ index 000000000..976db422b +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_loader.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_loader.c new file mode 100755 -index 000000000..c900eb206 +index 000000000000..c900eb206881 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_loader.c @@ -0,0 +1,1586 @@ @@ -690269,7 +690269,7 @@ index 000000000..c900eb206 +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_mt_common.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_mt_common.c new file mode 100755 -index 000000000..25e5fa765 +index 000000000000..25e5fa7654d4 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_mt_common.c @@ -0,0 +1,793 @@ @@ -691068,7 +691068,7 @@ index 000000000..25e5fa765 +} diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_mta.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_mta.c new file mode 100755 -index 000000000..d457bb66d +index 000000000000..d457bb66d360 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_mta.c @@ -0,0 +1,85 @@ @@ -691159,7 +691159,7 @@ index 000000000..d457bb66d +} diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_mtb.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_mtb.c new file mode 100755 -index 000000000..d5f51e9c8 +index 000000000000..d5f51e9c836f --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_mtb.c @@ -0,0 +1,93 @@ @@ -691258,7 +691258,7 @@ index 000000000..d5f51e9c8 + diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_params.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_params.h new file mode 100755 -index 000000000..7a92d109f +index 000000000000..7a92d109fa73 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_params.h @@ -0,0 +1,1548 @@ @@ -692812,7 +692812,7 @@ index 000000000..7a92d109f + diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid00.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid00.h new file mode 100755 -index 000000000..939ff2a28 +index 000000000000..939ff2a288ae --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid00.h @@ -0,0 +1,1548 @@ @@ -694366,7 +694366,7 @@ index 000000000..939ff2a28 + diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid01.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid01.h new file mode 100755 -index 000000000..3dcb64dd3 +index 000000000000..3dcb64dd3ba7 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid01.h @@ -0,0 +1,1548 @@ @@ -695920,7 +695920,7 @@ index 000000000..3dcb64dd3 + diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.c new file mode 100755 -index 000000000..cc6feaef1 +index 000000000000..cc6feaef1031 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.c @@ -0,0 +1,289 @@ @@ -696215,7 +696215,7 @@ index 000000000..cc6feaef1 +#endif diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.h new file mode 100755 -index 000000000..289b01477 +index 000000000000..289b014775c0 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.h @@ -0,0 +1,60 @@ @@ -696281,7 +696281,7 @@ index 000000000..289b01477 +#endif /* _LINUX_CYTTSP5_PLATFORM_H */ diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_proximity.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_proximity.c new file mode 100755 -index 000000000..0dba2c817 +index 000000000000..0dba2c817387 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_proximity.c @@ -0,0 +1,555 @@ @@ -696842,7 +696842,7 @@ index 000000000..0dba2c817 +} diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_regs.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_regs.h new file mode 100755 -index 000000000..ded98eff2 +index 000000000000..ded98eff2deb --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_regs.h @@ -0,0 +1,1202 @@ @@ -698050,7 +698050,7 @@ index 000000000..ded98eff2 +#endif /* _CYTTSP5_REGS_H */ diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_spi.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_spi.c new file mode 100755 -index 000000000..a01b88b0c +index 000000000000..a01b88b0c8a9 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_spi.c @@ -0,0 +1,255 @@ @@ -698311,7 +698311,7 @@ index 000000000..a01b88b0c +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_test_device_access_api.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_test_device_access_api.c new file mode 100755 -index 000000000..b9517d52d +index 000000000000..b9517d52d5d4 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_test_device_access_api.c @@ -0,0 +1,442 @@ @@ -698759,7 +698759,7 @@ index 000000000..b9517d52d +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/focaltech_touch/Makefile b/drivers/input/touchscreen/focaltech_touch/Makefile new file mode 100755 -index 000000000..bf7df1543 +index 000000000000..bf7df1543b01 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/Makefile @@ -0,0 +1,18 @@ @@ -698783,7 +698783,7 @@ index 000000000..bf7df1543 + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_common.h b/drivers/input/touchscreen/focaltech_touch/focaltech_common.h new file mode 100755 -index 000000000..7e911d1ac +index 000000000000..7e911d1ac36f --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_common.h @@ -0,0 +1,159 @@ @@ -698948,7 +698948,7 @@ index 000000000..7e911d1ac +#endif /* __LINUX_FOCALTECH_COMMON_H__ */ diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_config.h b/drivers/input/touchscreen/focaltech_touch/focaltech_config.h new file mode 100755 -index 000000000..18cf1eafa +index 000000000000..18cf1eafaa9a --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_config.h @@ -0,0 +1,244 @@ @@ -699198,7 +699198,7 @@ index 000000000..18cf1eafa +#endif /* _LINUX_FOCLATECH_CONFIG_H_ */ diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_core.c b/drivers/input/touchscreen/focaltech_touch/focaltech_core.c new file mode 100755 -index 000000000..c8318c0ce +index 000000000000..c8318c0ce8c0 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_core.c @@ -0,0 +1,1783 @@ @@ -700987,7 +700987,7 @@ index 000000000..c8318c0ce +MODULE_LICENSE("GPL v2"); diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_core.h b/drivers/input/touchscreen/focaltech_touch/focaltech_core.h new file mode 100755 -index 000000000..6547719b9 +index 000000000000..6547719b94a9 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_core.h @@ -0,0 +1,254 @@ @@ -701247,7 +701247,7 @@ index 000000000..6547719b9 +#endif /* __LINUX_FOCALTECH_CORE_H__ */ diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_esdcheck.c b/drivers/input/touchscreen/focaltech_touch/focaltech_esdcheck.c new file mode 100755 -index 000000000..cb8e6ec18 +index 000000000000..cb8e6ec18bcf --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_esdcheck.c @@ -0,0 +1,552 @@ @@ -701805,7 +701805,7 @@ index 000000000..cb8e6ec18 + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_ex_fun.c b/drivers/input/touchscreen/focaltech_touch/focaltech_ex_fun.c new file mode 100755 -index 000000000..06511c515 +index 000000000000..06511c515869 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_ex_fun.c @@ -0,0 +1,1130 @@ @@ -702941,7 +702941,7 @@ index 000000000..06511c515 +#endif diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_ex_mode.c b/drivers/input/touchscreen/focaltech_touch/focaltech_ex_mode.c new file mode 100755 -index 000000000..bca972ebb +index 000000000000..bca972ebb040 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_ex_mode.c @@ -0,0 +1,382 @@ @@ -703329,7 +703329,7 @@ index 000000000..bca972ebb + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_flash.c b/drivers/input/touchscreen/focaltech_touch/focaltech_flash.c new file mode 100755 -index 000000000..43672a78d +index 000000000000..43672a78ddac --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_flash.c @@ -0,0 +1,1971 @@ @@ -705306,7 +705306,7 @@ index 000000000..43672a78d +#endif /* #if FTS_AUTO_UPGRADE_EN */ diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_flash.h b/drivers/input/touchscreen/focaltech_touch/focaltech_flash.h new file mode 100755 -index 000000000..d11f42ca8 +index 000000000000..d11f42ca8e1e --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_flash.h @@ -0,0 +1,182 @@ @@ -705494,7 +705494,7 @@ index 000000000..d11f42ca8 +#endif diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_flash/Makefile b/drivers/input/touchscreen/focaltech_touch/focaltech_flash/Makefile new file mode 100755 -index 000000000..133dbcf8d +index 000000000000..133dbcf8d701 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_flash/Makefile @@ -0,0 +1,8 @@ @@ -705509,7 +705509,7 @@ index 000000000..133dbcf8d \ No newline at end of file diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_flash/focaltech_upgrade_ft8201.c b/drivers/input/touchscreen/focaltech_touch/focaltech_flash/focaltech_upgrade_ft8201.c new file mode 100755 -index 000000000..e32de88b2 +index 000000000000..e32de88b2435 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_flash/focaltech_upgrade_ft8201.c @@ -0,0 +1,1033 @@ @@ -706548,7 +706548,7 @@ index 000000000..e32de88b2 +}; diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_gesture.c b/drivers/input/touchscreen/focaltech_touch/focaltech_gesture.c new file mode 100755 -index 000000000..0874729e5 +index 000000000000..0874729e5d59 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_gesture.c @@ -0,0 +1,597 @@ @@ -707151,7 +707151,7 @@ index 000000000..0874729e5 +#endif diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_i2c.c b/drivers/input/touchscreen/focaltech_touch/focaltech_i2c.c new file mode 100755 -index 000000000..5e8294145 +index 000000000000..5e8294145b28 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_i2c.c @@ -0,0 +1,240 @@ @@ -707397,7 +707397,7 @@ index 000000000..5e8294145 + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_point_report_check.c b/drivers/input/touchscreen/focaltech_touch/focaltech_point_report_check.c new file mode 100755 -index 000000000..7157f4440 +index 000000000000..7157f444080d --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_point_report_check.c @@ -0,0 +1,135 @@ @@ -707538,7 +707538,7 @@ index 000000000..7157f4440 + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/Makefile b/drivers/input/touchscreen/focaltech_touch/focaltech_test/Makefile new file mode 100755 -index 000000000..2a2945ec0 +index 000000000000..2a2945ec021a --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/Makefile @@ -0,0 +1,11 @@ @@ -707555,7 +707555,7 @@ index 000000000..2a2945ec0 + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.c b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.c new file mode 100755 -index 000000000..991bbba87 +index 000000000000..991bbba87c70 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.c @@ -0,0 +1,1948 @@ @@ -709509,7 +709509,7 @@ index 000000000..991bbba87 +} diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.h b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.h new file mode 100755 -index 000000000..bf3623336 +index 000000000000..bf36233363a1 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.h @@ -0,0 +1,589 @@ @@ -710104,7 +710104,7 @@ index 000000000..bf3623336 +#endif diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.c b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.c new file mode 100755 -index 000000000..a6ea11fd6 +index 000000000000..a6ea11fd6025 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.c @@ -0,0 +1,1220 @@ @@ -711330,7 +711330,7 @@ index 000000000..a6ea11fd6 +} diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.h b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.h new file mode 100755 -index 000000000..a6c8d50c1 +index 000000000000..a6c8d50c11d2 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.h @@ -0,0 +1,144 @@ @@ -711480,7 +711480,7 @@ index 000000000..a6c8d50c1 +#endif /* _INI_H */ diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/Makefile b/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/Makefile new file mode 100755 -index 000000000..2e3a5e524 +index 000000000000..2e3a5e524418 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/Makefile @@ -0,0 +1,6 @@ @@ -711492,7 +711492,7 @@ index 000000000..2e3a5e524 +obj-y += focaltech_test_ft8201.o diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/focaltech_test_ft8201.c b/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/focaltech_test_ft8201.c new file mode 100755 -index 000000000..a5d666724 +index 000000000000..a5d666724e55 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/focaltech_test_ft8201.c @@ -0,0 +1,1034 @@ @@ -712532,10 +712532,10 @@ index 000000000..a5d666724 + diff --git a/drivers/input/touchscreen/focaltech_touch/include/firmware/fw_sample.h b/drivers/input/touchscreen/focaltech_touch/include/firmware/fw_sample.h new file mode 100755 -index 000000000..e69de29bb +index 000000000000..e69de29bb2d1 diff --git a/drivers/input/touchscreen/focaltech_touch/include/pramboot/FT8006M_Pramboot_V1.6_20180426_le.h b/drivers/input/touchscreen/focaltech_touch/include/pramboot/FT8006M_Pramboot_V1.6_20180426_le.h new file mode 100755 -index 000000000..0db3f0511 +index 000000000000..0db3f051175a --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/include/pramboot/FT8006M_Pramboot_V1.6_20180426_le.h @@ -0,0 +1,299 @@ @@ -712841,7 +712841,7 @@ index 000000000..0db3f0511 \ No newline at end of file diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/Makefile b/drivers/input/touchscreen/focaltech_touch_ft5436/Makefile new file mode 100755 -index 000000000..df8d3e5ef +index 000000000000..df8d3e5ef10a --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/Makefile @@ -0,0 +1,16 @@ @@ -712863,7 +712863,7 @@ index 000000000..df8d3e5ef +obj-y += focaltech_flash/ diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_common.h b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_common.h new file mode 100755 -index 000000000..1d7ac5557 +index 000000000000..1d7ac55572fe --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_common.h @@ -0,0 +1,166 @@ @@ -713035,7 +713035,7 @@ index 000000000..1d7ac5557 +#endif /* __LINUX_FOCALTECH_COMMON_H__ */ diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_config.h b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_config.h new file mode 100755 -index 000000000..d30ca81df +index 000000000000..d30ca81df9a9 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_config.h @@ -0,0 +1,241 @@ @@ -713282,7 +713282,7 @@ index 000000000..d30ca81df +#endif /* _LINUX_FOCLATECH_CONFIG_H_ */ diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.c new file mode 100755 -index 000000000..932b2f866 +index 000000000000..932b2f866274 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.c @@ -0,0 +1,1747 @@ @@ -715035,7 +715035,7 @@ index 000000000..932b2f866 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.h b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.h new file mode 100755 -index 000000000..66e98371b +index 000000000000..66e98371bf1c --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.h @@ -0,0 +1,263 @@ @@ -715304,7 +715304,7 @@ index 000000000..66e98371b +#endif /* __LINUX_FOCALTECH_CORE_H__ */ diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_esdcheck.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_esdcheck.c new file mode 100755 -index 000000000..b34bb26e8 +index 000000000000..b34bb26e8529 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_esdcheck.c @@ -0,0 +1,464 @@ @@ -715774,7 +715774,7 @@ index 000000000..b34bb26e8 + diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_fun.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_fun.c new file mode 100755 -index 000000000..b012c093b +index 000000000000..b012c093b4d5 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_fun.c @@ -0,0 +1,1181 @@ @@ -716961,7 +716961,7 @@ index 000000000..b012c093b +} diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_mode.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_mode.c new file mode 100755 -index 000000000..c0c970b12 +index 000000000000..c0c970b12e48 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_mode.c @@ -0,0 +1,307 @@ @@ -717274,7 +717274,7 @@ index 000000000..c0c970b12 +} diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.c new file mode 100755 -index 000000000..83bf8f4a6 +index 000000000000..83bf8f4a6039 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.c @@ -0,0 +1,2011 @@ @@ -719291,7 +719291,7 @@ index 000000000..83bf8f4a6 +} diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.h b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.h new file mode 100755 -index 000000000..cfebe2d12 +index 000000000000..cfebe2d12489 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.h @@ -0,0 +1,205 @@ @@ -719502,7 +719502,7 @@ index 000000000..cfebe2d12 +#endif diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/Makefile b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/Makefile new file mode 100755 -index 000000000..17c9595ca +index 000000000000..17c9595ca5c9 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/Makefile @@ -0,0 +1,7 @@ @@ -719515,7 +719515,7 @@ index 000000000..17c9595ca + diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/focaltech_upgrade_ft5436.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/focaltech_upgrade_ft5436.c new file mode 100755 -index 000000000..7ed7315f0 +index 000000000000..7ed7315f0d93 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/focaltech_upgrade_ft5436.c @@ -0,0 +1,154 @@ @@ -719675,7 +719675,7 @@ index 000000000..7ed7315f0 +}; diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_gesture.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_gesture.c new file mode 100755 -index 000000000..b65cf3945 +index 000000000000..b65cf39451d2 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_gesture.c @@ -0,0 +1,460 @@ @@ -720141,7 +720141,7 @@ index 000000000..b65cf3945 +} diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_i2c.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_i2c.c new file mode 100755 -index 000000000..f2e335c3d +index 000000000000..f2e335c3db4f --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_i2c.c @@ -0,0 +1,193 @@ @@ -720341,7 +720341,7 @@ index 000000000..f2e335c3d \ No newline at end of file diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_point_report_check.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_point_report_check.c new file mode 100755 -index 000000000..1296af155 +index 000000000000..1296af1551db --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_point_report_check.c @@ -0,0 +1,135 @@ @@ -720482,7 +720482,7 @@ index 000000000..1296af155 + diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/include/firmware/fw_sample.h b/drivers/input/touchscreen/focaltech_touch_ft5436/include/firmware/fw_sample.h new file mode 100755 -index 000000000..60120df32 +index 000000000000..60120df3213d --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/include/firmware/fw_sample.h @@ -0,0 +1,3223 @@ @@ -723712,7 +723712,7 @@ index 000000000..60120df32 \ No newline at end of file diff --git a/drivers/input/touchscreen/gsl3673.c b/drivers/input/touchscreen/gsl3673.c new file mode 100755 -index 000000000..2191bb6af +index 000000000000..2191bb6af26b --- /dev/null +++ b/drivers/input/touchscreen/gsl3673.c @@ -0,0 +1,1302 @@ @@ -725020,7 +725020,7 @@ index 000000000..2191bb6af +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gsl3673.h b/drivers/input/touchscreen/gsl3673.h new file mode 100755 -index 000000000..5d8d8ef02 +index 000000000000..5d8d8ef02bec --- /dev/null +++ b/drivers/input/touchscreen/gsl3673.h @@ -0,0 +1,5091 @@ @@ -730117,7 +730117,7 @@ index 000000000..5d8d8ef02 +#endif diff --git a/drivers/input/touchscreen/gsl3673_800x1280.c b/drivers/input/touchscreen/gsl3673_800x1280.c new file mode 100755 -index 000000000..191029084 +index 000000000000..191029084c22 --- /dev/null +++ b/drivers/input/touchscreen/gsl3673_800x1280.c @@ -0,0 +1,1247 @@ @@ -731370,7 +731370,7 @@ index 000000000..191029084 +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gsl3673_800x1280.h b/drivers/input/touchscreen/gsl3673_800x1280.h new file mode 100755 -index 000000000..38fa03963 +index 000000000000..38fa03963eb1 --- /dev/null +++ b/drivers/input/touchscreen/gsl3673_800x1280.h @@ -0,0 +1,5187 @@ @@ -736563,7 +736563,7 @@ index 000000000..38fa03963 +#endif diff --git a/drivers/input/touchscreen/gsl3676/Makefile b/drivers/input/touchscreen/gsl3676/Makefile new file mode 100755 -index 000000000..27c326481 +index 000000000000..27c3264812e1 --- /dev/null +++ b/drivers/input/touchscreen/gsl3676/Makefile @@ -0,0 +1,3 @@ @@ -736572,7 +736572,7 @@ index 000000000..27c326481 + diff --git a/drivers/input/touchscreen/gsl3676/gsl3676.c b/drivers/input/touchscreen/gsl3676/gsl3676.c new file mode 100755 -index 000000000..4b1baca36 +index 000000000000..4b1baca365fd --- /dev/null +++ b/drivers/input/touchscreen/gsl3676/gsl3676.c @@ -0,0 +1,1261 @@ @@ -737839,7 +737839,7 @@ index 000000000..4b1baca36 +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gsl3676/rk3368_th863c_10.h b/drivers/input/touchscreen/gsl3676/rk3368_th863c_10.h new file mode 100755 -index 000000000..617860f76 +index 000000000000..617860f76401 --- /dev/null +++ b/drivers/input/touchscreen/gsl3676/rk3368_th863c_10.h @@ -0,0 +1,5331 @@ @@ -743176,7 +743176,7 @@ index 000000000..617860f76 +#endif diff --git a/drivers/input/touchscreen/gsl_point_id.c b/drivers/input/touchscreen/gsl_point_id.c new file mode 100755 -index 000000000..624502b6b +index 000000000000..624502b6bacc --- /dev/null +++ b/drivers/input/touchscreen/gsl_point_id.c @@ -0,0 +1,3100 @@ @@ -746282,7 +746282,7 @@ index 000000000..624502b6b +}*/ diff --git a/drivers/input/touchscreen/gslx680.c b/drivers/input/touchscreen/gslx680.c new file mode 100755 -index 000000000..ab970845c +index 000000000000..ab970845c64f --- /dev/null +++ b/drivers/input/touchscreen/gslx680.c @@ -0,0 +1,1905 @@ @@ -748193,7 +748193,7 @@ index 000000000..ab970845c +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gslx680.h b/drivers/input/touchscreen/gslx680.h new file mode 100755 -index 000000000..2a76ec410 +index 000000000000..2a76ec410c81 --- /dev/null +++ b/drivers/input/touchscreen/gslx680.h @@ -0,0 +1,10368 @@ @@ -758567,7 +758567,7 @@ index 000000000..2a76ec410 +#endif diff --git a/drivers/input/touchscreen/gslx6801.c b/drivers/input/touchscreen/gslx6801.c new file mode 100755 -index 000000000..3c1e1655c +index 000000000000..3c1e1655c0a8 --- /dev/null +++ b/drivers/input/touchscreen/gslx6801.c @@ -0,0 +1,1680 @@ @@ -760253,7 +760253,7 @@ index 000000000..3c1e1655c +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gslx6801.h b/drivers/input/touchscreen/gslx6801.h new file mode 100755 -index 000000000..45bb3469d +index 000000000000..45bb3469d2ea --- /dev/null +++ b/drivers/input/touchscreen/gslx6801.h @@ -0,0 +1,4955 @@ @@ -765214,7 +765214,7 @@ index 000000000..45bb3469d +#endif diff --git a/drivers/input/touchscreen/gslx680_d708/Makefile b/drivers/input/touchscreen/gslx680_d708/Makefile new file mode 100755 -index 000000000..86d995c5e +index 000000000000..86d995c5e6c5 --- /dev/null +++ b/drivers/input/touchscreen/gslx680_d708/Makefile @@ -0,0 +1,9 @@ @@ -765229,7 +765229,7 @@ index 000000000..86d995c5e + diff --git a/drivers/input/touchscreen/gslx680_d708/rockchip_gsl3670.h b/drivers/input/touchscreen/gslx680_d708/rockchip_gsl3670.h new file mode 100755 -index 000000000..89b74fe3e +index 000000000000..89b74fe3e23c --- /dev/null +++ b/drivers/input/touchscreen/gslx680_d708/rockchip_gsl3670.h @@ -0,0 +1,5047 @@ @@ -770282,7 +770282,7 @@ index 000000000..89b74fe3e +#endif diff --git a/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680.c b/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680.c new file mode 100755 -index 000000000..f75586e2d +index 000000000000..f75586e2d37a --- /dev/null +++ b/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680.c @@ -0,0 +1,1393 @@ @@ -771681,7 +771681,7 @@ index 000000000..f75586e2d +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680_88v.h b/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680_88v.h new file mode 100755 -index 000000000..f58ba4a8a +index 000000000000..f58ba4a8a72b --- /dev/null +++ b/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680_88v.h @@ -0,0 +1,5248 @@ @@ -776935,7 +776935,7 @@ index 000000000..f58ba4a8a + diff --git a/drivers/input/touchscreen/gslx680_firefly.c b/drivers/input/touchscreen/gslx680_firefly.c new file mode 100755 -index 000000000..0786b5ecb +index 000000000000..0786b5ecb311 --- /dev/null +++ b/drivers/input/touchscreen/gslx680_firefly.c @@ -0,0 +1,1130 @@ @@ -778071,7 +778071,7 @@ index 000000000..0786b5ecb +MODULE_DESCRIPTION("GSLX680 touchscreen controller driver"); diff --git a/drivers/input/touchscreen/gslx680_firefly.h b/drivers/input/touchscreen/gslx680_firefly.h new file mode 100755 -index 000000000..8f40c59d7 +index 000000000000..8f40c59d7d2d --- /dev/null +++ b/drivers/input/touchscreen/gslx680_firefly.h @@ -0,0 +1,5120 @@ @@ -783197,7 +783197,7 @@ index 000000000..8f40c59d7 +#endif diff --git a/drivers/input/touchscreen/gslx680_pad.c b/drivers/input/touchscreen/gslx680_pad.c new file mode 100755 -index 000000000..d61a5ec76 +index 000000000000..d61a5ec76e94 --- /dev/null +++ b/drivers/input/touchscreen/gslx680_pad.c @@ -0,0 +1,1198 @@ @@ -784401,7 +784401,7 @@ index 000000000..d61a5ec76 +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gslx680_pad.h b/drivers/input/touchscreen/gslx680_pad.h new file mode 100755 -index 000000000..aab1786f2 +index 000000000000..aab1786f221a --- /dev/null +++ b/drivers/input/touchscreen/gslx680_pad.h @@ -0,0 +1,10232 @@ @@ -794639,7 +794639,7 @@ index 000000000..aab1786f2 +#endif diff --git a/drivers/input/touchscreen/gslx680a.c b/drivers/input/touchscreen/gslx680a.c new file mode 100755 -index 000000000..380a0fd93 +index 000000000000..380a0fd93fa0 --- /dev/null +++ b/drivers/input/touchscreen/gslx680a.c @@ -0,0 +1,1320 @@ @@ -795965,14 +795965,14 @@ index 000000000..380a0fd93 +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gt1x/GT5688_Config_20170713_1080_1920.cfg b/drivers/input/touchscreen/gt1x/GT5688_Config_20170713_1080_1920.cfg new file mode 100755 -index 000000000..2f65c7ee0 +index 000000000000..2f65c7ee0482 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/GT5688_Config_20170713_1080_1920.cfg @@ -0,0 +1 @@ +0x88,0x38,0x04,0x80,0x07,0x05,0x35,0x1E,0x05,0x40,0x00,0x08,0x50,0x3C,0x53,0x11,0x00,0x00,0x11,0x11,0x14,0x17,0x19,0x1C,0x0A,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x1E,0x28,0x8B,0x2B,0x0C,0x15,0x17,0xDF,0x07,0x04,0xA1,0x00,0x03,0x02,0x24,0x00,0x00,0x28,0x50,0x80,0x14,0x02,0x00,0x00,0x54,0xAD,0x2E,0x9B,0x35,0x8C,0x3B,0x81,0x42,0x79,0x49,0x71,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x50,0x3C,0xFF,0xFF,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x20,0x78,0x78,0x64,0x00,0x00,0x00,0x00,0x00,0x01,0x08,0x02,0x09,0x03,0x0A,0x04,0x0B,0x05,0x0C,0x06,0x0D,0xFF,0xFF,0x0A,0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01,0x00,0x15,0x14,0x13,0x12,0x11,0x10,0x0F,0x0E,0x0D,0x0C,0x0B,0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x00,0x05,0x1E,0x00,0x02,0x2A,0x1E,0x19,0x14,0x02,0x00,0x03,0x0A,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xFF,0xFF,0x86,0x22,0x03,0x00,0x00,0x33,0x00,0x0F,0x00,0x00,0x00,0x50,0x3C,0x50,0x00,0x00,0x00,0x23,0x13,0x01 diff --git a/drivers/input/touchscreen/gt1x/Makefile b/drivers/input/touchscreen/gt1x/Makefile new file mode 100755 -index 000000000..2b3fa3680 +index 000000000000..2b3fa3680e98 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/Makefile @@ -0,0 +1,8 @@ @@ -795986,7 +795986,7 @@ index 000000000..2b3fa3680 + diff --git a/drivers/input/touchscreen/gt1x/gt1x.c b/drivers/input/touchscreen/gt1x/gt1x.c new file mode 100755 -index 000000000..f65ca3b91 +index 000000000000..f65ca3b916e4 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x.c @@ -0,0 +1,809 @@ @@ -796801,7 +796801,7 @@ index 000000000..f65ca3b91 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/touchscreen/gt1x/gt1x.h b/drivers/input/touchscreen/gt1x/gt1x.h new file mode 100755 -index 000000000..b9339f10b +index 000000000000..b9339f10b0ad --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x.h @@ -0,0 +1,64 @@ @@ -796871,7 +796871,7 @@ index 000000000..b9339f10b +#endif /* _GOODIX_GT1X_H_ */ diff --git a/drivers/input/touchscreen/gt1x/gt1x_cfg.h b/drivers/input/touchscreen/gt1x/gt1x_cfg.h new file mode 100755 -index 000000000..6581aebfe +index 000000000000..6581aebfeda7 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_cfg.h @@ -0,0 +1,27 @@ @@ -796904,7 +796904,7 @@ index 000000000..6581aebfe +#endif /* _GOODIX_GT1X_CFG_H_ */ diff --git a/drivers/input/touchscreen/gt1x/gt1x_extents.c b/drivers/input/touchscreen/gt1x/gt1x_extents.c new file mode 100755 -index 000000000..ed087d8f0 +index 000000000000..ed087d8f0031 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_extents.c @@ -0,0 +1,928 @@ @@ -797838,7 +797838,7 @@ index 000000000..ed087d8f0 +} diff --git a/drivers/input/touchscreen/gt1x/gt1x_firmware.h b/drivers/input/touchscreen/gt1x/gt1x_firmware.h new file mode 100755 -index 000000000..758863339 +index 000000000000..7588633397f5 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_firmware.h @@ -0,0 +1,548 @@ @@ -798392,7 +798392,7 @@ index 000000000..758863339 +#endif diff --git a/drivers/input/touchscreen/gt1x/gt1x_generic.c b/drivers/input/touchscreen/gt1x/gt1x_generic.c new file mode 100755 -index 000000000..48b29ab50 +index 000000000000..48b29ab50bcd --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_generic.c @@ -0,0 +1,2445 @@ @@ -800843,7 +800843,7 @@ index 000000000..48b29ab50 + diff --git a/drivers/input/touchscreen/gt1x/gt1x_generic.h b/drivers/input/touchscreen/gt1x/gt1x_generic.h new file mode 100755 -index 000000000..7acc390d4 +index 000000000000..7acc390d47ef --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_generic.h @@ -0,0 +1,595 @@ @@ -801444,7 +801444,7 @@ index 000000000..7acc390d4 + diff --git a/drivers/input/touchscreen/gt1x/gt1x_tools.c b/drivers/input/touchscreen/gt1x/gt1x_tools.c new file mode 100755 -index 000000000..1d824bdaf +index 000000000000..1d824bdafd8a --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_tools.c @@ -0,0 +1,433 @@ @@ -801883,7 +801883,7 @@ index 000000000..1d824bdaf +} diff --git a/drivers/input/touchscreen/gt1x/gt1x_update.c b/drivers/input/touchscreen/gt1x/gt1x_update.c new file mode 100755 -index 000000000..0979bb32d +index 000000000000..0979bb32d52f --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_update.c @@ -0,0 +1,1456 @@ @@ -803345,7 +803345,7 @@ index 000000000..0979bb32d +} diff --git a/drivers/input/touchscreen/gt9xx/GT9110P(2020)V71_Config_20201028_170326.cfg b/drivers/input/touchscreen/gt9xx/GT9110P(2020)V71_Config_20201028_170326.cfg new file mode 100755 -index 000000000..62a3d0e49 +index 000000000000..62a3d0e496c6 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/GT9110P(2020)V71_Config_20201028_170326.cfg @@ -0,0 +1,19 @@ @@ -803371,7 +803371,7 @@ index 000000000..62a3d0e49 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/GT9110P_Config_20160217_1526_2048_97.cfg b/drivers/input/touchscreen/gt9xx/GT9110P_Config_20160217_1526_2048_97.cfg new file mode 100755 -index 000000000..952ea8453 +index 000000000000..952ea845390e --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/GT9110P_Config_20160217_1526_2048_97.cfg @@ -0,0 +1 @@ @@ -803379,7 +803379,7 @@ index 000000000..952ea8453 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/GT9271_Config_20170526.cfg b/drivers/input/touchscreen/gt9xx/GT9271_Config_20170526.cfg new file mode 100755 -index 000000000..a7ac38fe3 +index 000000000000..a7ac38fe331e --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/GT9271_Config_20170526.cfg @@ -0,0 +1 @@ @@ -803387,7 +803387,7 @@ index 000000000..a7ac38fe3 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/HLS-0102-1398V1-1060-GT911_Config_20201204_V66.cfg b/drivers/input/touchscreen/gt9xx/HLS-0102-1398V1-1060-GT911_Config_20201204_V66.cfg new file mode 100755 -index 000000000..77b72c416 +index 000000000000..77b72c416bea --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/HLS-0102-1398V1-1060-GT911_Config_20201204_V66.cfg @@ -0,0 +1 @@ @@ -803395,7 +803395,7 @@ index 000000000..77b72c416 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/Makefile b/drivers/input/touchscreen/gt9xx/Makefile new file mode 100755 -index 000000000..f63b5f278 +index 000000000000..f63b5f2783a5 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/Makefile @@ -0,0 +1,6 @@ @@ -803407,7 +803407,7 @@ index 000000000..f63b5f278 +goodix_gt9xx-y +=gt9xx_update.o diff --git a/drivers/input/touchscreen/gt9xx/WGJ10162B_GT9271_1060_Config_20140821_1341110X42.cfg b/drivers/input/touchscreen/gt9xx/WGJ10162B_GT9271_1060_Config_20140821_1341110X42.cfg new file mode 100755 -index 000000000..db5ed0f34 +index 000000000000..db5ed0f34b82 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ10162B_GT9271_1060_Config_20140821_1341110X42.cfg @@ -0,0 +1 @@ @@ -803415,7 +803415,7 @@ index 000000000..db5ed0f34 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/WGJ10162_GT9271_Config_20140820_182456.cfg b/drivers/input/touchscreen/gt9xx/WGJ10162_GT9271_Config_20140820_182456.cfg new file mode 100755 -index 000000000..96bf8cb79 +index 000000000000..96bf8cb7961c --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ10162_GT9271_Config_20140820_182456.cfg @@ -0,0 +1 @@ @@ -803423,7 +803423,7 @@ index 000000000..96bf8cb79 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/WGJ10187_GT910_Config_20140623_104014_0X41.cfg b/drivers/input/touchscreen/gt9xx/WGJ10187_GT910_Config_20140623_104014_0X41.cfg new file mode 100755 -index 000000000..ffc4679bf +index 000000000000..ffc4679bf2d9 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ10187_GT910_Config_20140623_104014_0X41.cfg @@ -0,0 +1 @@ @@ -803431,7 +803431,7 @@ index 000000000..ffc4679bf \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/WGJ10187_GT9271_Config_20140623_104014_0X41.cfg b/drivers/input/touchscreen/gt9xx/WGJ10187_GT9271_Config_20140623_104014_0X41.cfg new file mode 100755 -index 000000000..ffbfe3d54 +index 000000000000..ffbfe3d547da --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ10187_GT9271_Config_20140623_104014_0X41.cfg @@ -0,0 +1 @@ @@ -803439,7 +803439,7 @@ index 000000000..ffbfe3d54 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/WGJ89006B_GT911_Config_20140625_085816_0X43.cfg b/drivers/input/touchscreen/gt9xx/WGJ89006B_GT911_Config_20140625_085816_0X43.cfg new file mode 100755 -index 000000000..1c42d9ef7 +index 000000000000..1c42d9ef7ce1 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ89006B_GT911_Config_20140625_085816_0X43.cfg @@ -0,0 +1 @@ @@ -803447,7 +803447,7 @@ index 000000000..1c42d9ef7 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/WGJ89006B_GT9271_Config_20140625_085816_0X41.cfg b/drivers/input/touchscreen/gt9xx/WGJ89006B_GT9271_Config_20140625_085816_0X41.cfg new file mode 100755 -index 000000000..7ed0266ac +index 000000000000..7ed0266acfaa --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ89006B_GT9271_Config_20140625_085816_0X41.cfg @@ -0,0 +1 @@ @@ -803455,7 +803455,7 @@ index 000000000..7ed0266ac \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/goodix_tool.c b/drivers/input/touchscreen/gt9xx/goodix_tool.c new file mode 100755 -index 000000000..b2dffcb5e +index 000000000000..b2dffcb5e105 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/goodix_tool.c @@ -0,0 +1,627 @@ @@ -804088,7 +804088,7 @@ index 000000000..b2dffcb5e +} diff --git a/drivers/input/touchscreen/gt9xx/gt9xx.c b/drivers/input/touchscreen/gt9xx/gt9xx.c new file mode 100755 -index 000000000..cdc421cfd +index 000000000000..cdc421cfd093 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx.c @@ -0,0 +1,3236 @@ @@ -807330,7 +807330,7 @@ index 000000000..cdc421cfd +MODULE_LICENSE("GPL"); diff --git a/drivers/input/touchscreen/gt9xx/gt9xx.h b/drivers/input/touchscreen/gt9xx/gt9xx.h new file mode 100755 -index 000000000..acc288575 +index 000000000000..acc288575691 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx.h @@ -0,0 +1,397 @@ @@ -807733,7 +807733,7 @@ index 000000000..acc288575 +#endif /* _GOODIX_GT9XX_H_ */ diff --git a/drivers/input/touchscreen/gt9xx/gt9xx_cfg.h b/drivers/input/touchscreen/gt9xx/gt9xx_cfg.h new file mode 100755 -index 000000000..2b083c565 +index 000000000000..2b083c5655f8 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx_cfg.h @@ -0,0 +1,65 @@ @@ -807804,7 +807804,7 @@ index 000000000..2b083c565 +#endif /* _GOODIX_GT9XX_CFG_H_ */ diff --git a/drivers/input/touchscreen/gt9xx/gt9xx_firmware.h b/drivers/input/touchscreen/gt9xx/gt9xx_firmware.h new file mode 100755 -index 000000000..7dce6045b +index 000000000000..7dce6045b736 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx_firmware.h @@ -0,0 +1,2338 @@ @@ -810148,7 +810148,7 @@ index 000000000..7dce6045b +#endif diff --git a/drivers/input/touchscreen/gt9xx/gt9xx_update.c b/drivers/input/touchscreen/gt9xx/gt9xx_update.c new file mode 100755 -index 000000000..312b1f93b +index 000000000000..312b1f93be60 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx_update.c @@ -0,0 +1,3637 @@ @@ -813791,7 +813791,7 @@ index 000000000..312b1f93b +//**************** For GT9XXF End ********************// diff --git a/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D863_7.h b/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D863_7.h new file mode 100755 -index 000000000..af607b6f7 +index 000000000000..af607b6f7c6a --- /dev/null +++ b/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D863_7.h @@ -0,0 +1,514 @@ @@ -814311,7 +814311,7 @@ index 000000000..af607b6f7 + diff --git a/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D89.h b/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D89.h new file mode 100755 -index 000000000..2a2045660 +index 000000000000..2a2045660c0a --- /dev/null +++ b/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D89.h @@ -0,0 +1,514 @@ @@ -814831,7 +814831,7 @@ index 000000000..2a2045660 + diff --git a/drivers/input/touchscreen/hyn_cst2xx/Makefile b/drivers/input/touchscreen/hyn_cst2xx/Makefile new file mode 100755 -index 000000000..247b6045d +index 000000000000..247b6045dd13 --- /dev/null +++ b/drivers/input/touchscreen/hyn_cst2xx/Makefile @@ -0,0 +1,2 @@ @@ -814839,7 +814839,7 @@ index 000000000..247b6045d + diff --git a/drivers/input/touchscreen/hyn_cst2xx/hyn_cst2xx.c b/drivers/input/touchscreen/hyn_cst2xx/hyn_cst2xx.c new file mode 100755 -index 000000000..689e0a8a7 +index 000000000000..689e0a8a7e26 --- /dev/null +++ b/drivers/input/touchscreen/hyn_cst2xx/hyn_cst2xx.c @@ -0,0 +1,1970 @@ @@ -816815,7 +816815,7 @@ index 000000000..689e0a8a7 + diff --git a/drivers/input/touchscreen/tp_gslx680_board.h b/drivers/input/touchscreen/tp_gslx680_board.h new file mode 100755 -index 000000000..bc90005e2 +index 000000000000..bc90005e215d --- /dev/null +++ b/drivers/input/touchscreen/tp_gslx680_board.h @@ -0,0 +1,4908 @@ @@ -821729,7 +821729,7 @@ index 000000000..bc90005e2 +#endif diff --git a/drivers/input/touchscreen/tp_suspend.h b/drivers/input/touchscreen/tp_suspend.h new file mode 100755 -index 000000000..e4248663f +index 000000000000..e4248663febc --- /dev/null +++ b/drivers/input/touchscreen/tp_suspend.h @@ -0,0 +1,109 @@ @@ -821844,7 +821844,7 @@ index 000000000..e4248663f +#endif diff --git a/drivers/input/touchscreen/vtl_ts/LX20JS06_A1_CT363_V03_5198_121015.dat b/drivers/input/touchscreen/vtl_ts/LX20JS06_A1_CT363_V03_5198_121015.dat new file mode 100755 -index 000000000..dd2c3d8b2 +index 000000000000..dd2c3d8b25b4 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/LX20JS06_A1_CT363_V03_5198_121015.dat @@ -0,0 +1,4096 @@ @@ -825947,7 +825947,7 @@ index 000000000..dd2c3d8b2 \ No newline at end of file diff --git a/drivers/input/touchscreen/vtl_ts/Makefile b/drivers/input/touchscreen/vtl_ts/Makefile new file mode 100755 -index 000000000..0d15d7471 +index 000000000000..0d15d7471f7f --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/Makefile @@ -0,0 +1,9 @@ @@ -825962,7 +825962,7 @@ index 000000000..0d15d7471 + diff --git a/drivers/input/touchscreen/vtl_ts/apk.c b/drivers/input/touchscreen/vtl_ts/apk.c new file mode 100755 -index 000000000..44db1086d +index 000000000000..44db1086d264 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/apk.c @@ -0,0 +1,232 @@ @@ -826200,7 +826200,7 @@ index 000000000..44db1086d + diff --git a/drivers/input/touchscreen/vtl_ts/apk.h b/drivers/input/touchscreen/vtl_ts/apk.h new file mode 100755 -index 000000000..a0a14b6b3 +index 000000000000..a0a14b6b3cc8 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/apk.h @@ -0,0 +1,7 @@ @@ -826213,7 +826213,7 @@ index 000000000..a0a14b6b3 +#endif diff --git a/drivers/input/touchscreen/vtl_ts/chip.c b/drivers/input/touchscreen/vtl_ts/chip.c new file mode 100755 -index 000000000..50004cef1 +index 000000000000..50004cef1f0c --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/chip.c @@ -0,0 +1,860 @@ @@ -827079,7 +827079,7 @@ index 000000000..50004cef1 + diff --git a/drivers/input/touchscreen/vtl_ts/chip.h b/drivers/input/touchscreen/vtl_ts/chip.h new file mode 100755 -index 000000000..5ebb12127 +index 000000000000..5ebb121276ed --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/chip.h @@ -0,0 +1,13 @@ @@ -827098,7 +827098,7 @@ index 000000000..5ebb12127 +#endif diff --git a/drivers/input/touchscreen/vtl_ts/f307&f317&f316_CT363S_01_V10_F7E9_140212.dat b/drivers/input/touchscreen/vtl_ts/f307&f317&f316_CT363S_01_V10_F7E9_140212.dat new file mode 100755 -index 000000000..8d4313875 +index 000000000000..8d43138759b3 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/f307&f317&f316_CT363S_01_V10_F7E9_140212.dat @@ -0,0 +1,2048 @@ @@ -829153,7 +829153,7 @@ index 000000000..8d4313875 \ No newline at end of file diff --git a/drivers/input/touchscreen/vtl_ts/lx--js77_97_CT365_V01_E7DA_130419.dat b/drivers/input/touchscreen/vtl_ts/lx--js77_97_CT365_V01_E7DA_130419.dat new file mode 100755 -index 000000000..d3fc42f43 +index 000000000000..d3fc42f43e6b --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/lx--js77_97_CT365_V01_E7DA_130419.dat @@ -0,0 +1,2048 @@ @@ -831208,7 +831208,7 @@ index 000000000..d3fc42f43 \ No newline at end of file diff --git a/drivers/input/touchscreen/vtl_ts/tp_fw.h b/drivers/input/touchscreen/vtl_ts/tp_fw.h new file mode 100755 -index 000000000..df431fcab +index 000000000000..df431fcabca8 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/tp_fw.h @@ -0,0 +1,2051 @@ @@ -833265,7 +833265,7 @@ index 000000000..df431fcab +}; diff --git a/drivers/input/touchscreen/vtl_ts/vtl_ts.c b/drivers/input/touchscreen/vtl_ts/vtl_ts.c new file mode 100755 -index 000000000..8c8e374ab +index 000000000000..8c8e374ab9d2 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/vtl_ts.c @@ -0,0 +1,728 @@ @@ -833999,7 +833999,7 @@ index 000000000..8c8e374ab + diff --git a/drivers/input/touchscreen/vtl_ts/vtl_ts.h b/drivers/input/touchscreen/vtl_ts/vtl_ts.h new file mode 100755 -index 000000000..95e280688 +index 000000000000..95e280688d74 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/vtl_ts.h @@ -0,0 +1,193 @@ @@ -834198,7 +834198,7 @@ index 000000000..95e280688 + diff --git a/drivers/input/touchscreen/vtl_ts/wgj36js07_A1_CT363_V01_0187_140306.dat b/drivers/input/touchscreen/vtl_ts/wgj36js07_A1_CT363_V01_0187_140306.dat new file mode 100755 -index 000000000..a488e9812 +index 000000000000..a488e98122a6 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/wgj36js07_A1_CT363_V01_0187_140306.dat @@ -0,0 +1,2048 @@ @@ -836253,7 +836253,7 @@ index 000000000..a488e9812 \ No newline at end of file diff --git a/drivers/input/touchscreen/wacom_w9013.c b/drivers/input/touchscreen/wacom_w9013.c new file mode 100755 -index 000000000..6bbdb01e4 +index 000000000000..6bbdb01e40ac --- /dev/null +++ b/drivers/input/touchscreen/wacom_w9013.c @@ -0,0 +1,510 @@ @@ -836768,7 +836768,7 @@ index 000000000..6bbdb01e4 +MODULE_DESCRIPTION("WACOM EMR I2C Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig -index 04878caf6..fe1256b01 100644 +index 04878caf6da4..fe1256b01f7e 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -160,7 +160,8 @@ config OMAP_IOMMU_DEBUG @@ -836783,7 +836783,7 @@ index 04878caf6..fe1256b01 100644 select ARM_DMA_USE_IOMMU diff --git a/drivers/iommu/dma-iommu-ops.c b/drivers/iommu/dma-iommu-ops.c new file mode 100755 -index 000000000..862d78239 +index 000000000000..862d7823985e --- /dev/null +++ b/drivers/iommu/dma-iommu-ops.c @@ -0,0 +1,473 @@ @@ -837261,7 +837261,7 @@ index 000000000..862d78239 +} +EXPORT_SYMBOL_GPL(common_iommu_teardown_dma_ops); diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c -index d1539b739..d5020a729 100644 +index d1539b7399a9..d5020a7299a3 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -372,6 +372,52 @@ static int iommu_dma_deferred_attach(struct device *dev, @@ -837329,7 +837329,7 @@ index d1539b739..d5020a729 100644 switch (dir) { case DMA_BIDIRECTIONAL: diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index 9d65557df..abf1b1e6c 100644 +index 9d65557dfb2c..abf1b1e6c200 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -837581,7 +837581,7 @@ index 9d65557df..abf1b1e6c 100644 out_err: diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c -index 12551dc11..bb29a4e18 100644 +index 12551dc11714..bb29a4e18dc8 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -19,6 +19,7 @@ @@ -838791,7 +838791,7 @@ index 12551dc11..bb29a4e18 100644 +MODULE_ALIAS("platform:rockchip-iommu"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig -index 3c24bf452..ddcd884d1 100644 +index 3c24bf45263c..ddcd884d1175 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -417,8 +417,9 @@ config IRQ_UNIPHIER_AIDET @@ -838807,7 +838807,7 @@ index 3c24bf452..ddcd884d1 100644 help Support Meson SoC Family GPIO Interrupt Multiplexer diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c -index 5ec091c64..985d8de84 100644 +index 5ec091c64d47..985d8de8445f 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -2167,6 +2167,8 @@ static struct page *its_allocate_prop_table(gfp_t gfp_flags) @@ -838990,7 +838990,7 @@ index 5ec091c64..985d8de84 100644 if (!(tmp & GITS_CBASER_SHAREABILITY_MASK)) { /* diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c -index c1f8c1be8..b9ae28cea 100644 +index c1f8c1be8485..b9ae28cea29c 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -18,6 +18,9 @@ @@ -839048,7 +839048,7 @@ index c1f8c1be8..b9ae28cea 100644 if (gic_dist_supports_lpis()) { its_init(handle, &gic_data.rdists, gic_data.domain); diff --git a/drivers/irqchip/irq-gic-v4.c b/drivers/irqchip/irq-gic-v4.c -index 0c18714ae..5d1dc9915 100644 +index 0c18714ae13e..5d1dc9915272 100644 --- a/drivers/irqchip/irq-gic-v4.c +++ b/drivers/irqchip/irq-gic-v4.c @@ -232,6 +232,8 @@ int its_make_vpe_non_resident(struct its_vpe *vpe, bool db) @@ -839085,7 +839085,7 @@ index 0c18714ae..5d1dc9915 100644 { struct its_cmd_info info = { diff --git a/drivers/irqchip/irq-meson-gpio.c b/drivers/irqchip/irq-meson-gpio.c -index e50676ce2..cfc5cf522 100644 +index e50676ce2ec8..cfc5cf5224cb 100644 --- a/drivers/irqchip/irq-meson-gpio.c +++ b/drivers/irqchip/irq-meson-gpio.c @@ -15,6 +15,7 @@ @@ -839232,7 +839232,7 @@ index e50676ce2..cfc5cf522 100644 +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:meson-gpio-intc"); diff --git a/drivers/mailbox/rockchip-mailbox.c b/drivers/mailbox/rockchip-mailbox.c -index 979acc810..99b9421b8 100644 +index 979acc810f30..99b9421b8494 100644 --- a/drivers/mailbox/rockchip-mailbox.c +++ b/drivers/mailbox/rockchip-mailbox.c @@ -11,6 +11,7 @@ @@ -839465,7 +839465,7 @@ index 979acc810..99b9421b8 100644 ret = devm_mbox_controller_register(&pdev->dev, &mb->mbox); diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index 878f66ef2..ab8742848 100644 +index 878f66ef2719..ab87428481c5 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -725,6 +725,17 @@ config VIDEO_APTINA_PLL @@ -839487,7 +839487,7 @@ index 878f66ef2..ab8742848 100644 tristate "Hynix Hi-556 sensor support" depends on I2C && VIDEO_V4L2 diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile -index f0a774739..298863171 100644 +index f0a77473979d..298863171375 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -111,6 +111,7 @@ obj-$(CONFIG_VIDEO_I2C) += video-i2c.o @@ -839500,7 +839500,7 @@ index f0a774739..298863171 100644 obj-$(CONFIG_VIDEO_IMX219) += imx219.o diff --git a/drivers/media/i2c/gc8034.c b/drivers/media/i2c/gc8034.c new file mode 100755 -index 000000000..6edbf5e02 +index 000000000000..6edbf5e02995 --- /dev/null +++ b/drivers/media/i2c/gc8034.c @@ -0,0 +1,2827 @@ @@ -842333,7 +842333,7 @@ index 000000000..6edbf5e02 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/i2c/rk628_csi.c b/drivers/media/i2c/rk628_csi.c new file mode 100755 -index 000000000..3fe765c14 +index 000000000000..3fe765c148c7 --- /dev/null +++ b/drivers/media/i2c/rk628_csi.c @@ -0,0 +1,2696 @@ @@ -845035,7 +845035,7 @@ index 000000000..3fe765c14 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/i2c/rk628_csi.h b/drivers/media/i2c/rk628_csi.h new file mode 100755 -index 000000000..e4aa25866 +index 000000000000..e4aa258663b8 --- /dev/null +++ b/drivers/media/i2c/rk628_csi.h @@ -0,0 +1,344 @@ @@ -845384,7 +845384,7 @@ index 000000000..e4aa25866 + +#endif diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig -index 7e152bbb4..51d069028 100644 +index 7e152bbb4fa6..51d069028c3d 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -153,6 +153,9 @@ source "drivers/media/platform/xilinx/Kconfig" @@ -845398,7 +845398,7 @@ index 7e152bbb4..51d069028 100644 config VIDEO_TI_CAL tristate "TI CAL (Camera Adaptation Layer) driver" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile -index 62b6cdc8c..c7cb2135b 100644 +index 62b6cdc8c730..c7cb2135bb56 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -53,6 +53,9 @@ obj-$(CONFIG_VIDEO_RENESAS_JPU) += rcar_jpu.o @@ -845413,7 +845413,7 @@ index 62b6cdc8c..c7cb2135b 100644 diff --git a/drivers/media/platform/rockchip-tsp/Kconfig b/drivers/media/platform/rockchip-tsp/Kconfig new file mode 100755 -index 000000000..5394bfa7c +index 000000000000..5394bfa7c63c --- /dev/null +++ b/drivers/media/platform/rockchip-tsp/Kconfig @@ -0,0 +1,12 @@ @@ -845431,7 +845431,7 @@ index 000000000..5394bfa7c + diff --git a/drivers/media/platform/rockchip-tsp/Makefile b/drivers/media/platform/rockchip-tsp/Makefile new file mode 100755 -index 000000000..ca555d0ef +index 000000000000..ca555d0ef9e9 --- /dev/null +++ b/drivers/media/platform/rockchip-tsp/Makefile @@ -0,0 +1,6 @@ @@ -845443,7 +845443,7 @@ index 000000000..ca555d0ef +obj-$(CONFIG_ROCKCHIP_TSP) += rockchip_tsp.o diff --git a/drivers/media/platform/rockchip-tsp/rockchip_tsp.c b/drivers/media/platform/rockchip-tsp/rockchip_tsp.c new file mode 100755 -index 000000000..830147909 +index 000000000000..830147909eeb --- /dev/null +++ b/drivers/media/platform/rockchip-tsp/rockchip_tsp.c @@ -0,0 +1,1182 @@ @@ -846631,7 +846631,7 @@ index 000000000..830147909 +MODULE_ALIAS("platform:" MODE_NAME); diff --git a/drivers/media/platform/rockchip-tsp/rockchip_tsp.h b/drivers/media/platform/rockchip-tsp/rockchip_tsp.h new file mode 100755 -index 000000000..bafe641cd +index 000000000000..bafe641cdf9f --- /dev/null +++ b/drivers/media/platform/rockchip-tsp/rockchip_tsp.h @@ -0,0 +1,230 @@ @@ -846867,7 +846867,7 @@ index 000000000..bafe641cd +#endif diff --git a/drivers/media/platform/rockchip/cif/Kconfig b/drivers/media/platform/rockchip/cif/Kconfig new file mode 100755 -index 000000000..592842bf3 +index 000000000000..592842bf3386 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/Kconfig @@ -0,0 +1,40 @@ @@ -846913,7 +846913,7 @@ index 000000000..592842bf3 + diff --git a/drivers/media/platform/rockchip/cif/Makefile b/drivers/media/platform/rockchip/cif/Makefile new file mode 100755 -index 000000000..279be843e +index 000000000000..279be843e093 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/Makefile @@ -0,0 +1,11 @@ @@ -846930,7 +846930,7 @@ index 000000000..279be843e + common.o diff --git a/drivers/media/platform/rockchip/cif/capture.c b/drivers/media/platform/rockchip/cif/capture.c new file mode 100755 -index 000000000..9832721da +index 000000000000..9832721da8e3 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/capture.c @@ -0,0 +1,7915 @@ @@ -854851,7 +854851,7 @@ index 000000000..9832721da + diff --git a/drivers/media/platform/rockchip/cif/cif-luma.c b/drivers/media/platform/rockchip/cif/cif-luma.c new file mode 100755 -index 000000000..9d751df3c +index 000000000000..9d751df3c4e5 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/cif-luma.c @@ -0,0 +1,520 @@ @@ -855377,7 +855377,7 @@ index 000000000..9d751df3c +} diff --git a/drivers/media/platform/rockchip/cif/cif-luma.h b/drivers/media/platform/rockchip/cif/cif-luma.h new file mode 100755 -index 000000000..f57d19c41 +index 000000000000..f57d19c4123a --- /dev/null +++ b/drivers/media/platform/rockchip/cif/cif-luma.h @@ -0,0 +1,83 @@ @@ -855466,7 +855466,7 @@ index 000000000..f57d19c41 +#endif /* _RKCIF_LUMA_H */ diff --git a/drivers/media/platform/rockchip/cif/cif-scale.c b/drivers/media/platform/rockchip/cif/cif-scale.c new file mode 100755 -index 000000000..afcf8801f +index 000000000000..afcf8801f425 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/cif-scale.c @@ -0,0 +1,1202 @@ @@ -856674,7 +856674,7 @@ index 000000000..afcf8801f + diff --git a/drivers/media/platform/rockchip/cif/common.c b/drivers/media/platform/rockchip/cif/common.c new file mode 100755 -index 000000000..7442dfe82 +index 000000000000..7442dfe82c14 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/common.c @@ -0,0 +1,187 @@ @@ -856867,7 +856867,7 @@ index 000000000..7442dfe82 + diff --git a/drivers/media/platform/rockchip/cif/common.h b/drivers/media/platform/rockchip/cif/common.h new file mode 100755 -index 000000000..86dbd55d1 +index 000000000000..86dbd55d1283 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/common.h @@ -0,0 +1,27 @@ @@ -856900,7 +856900,7 @@ index 000000000..86dbd55d1 + diff --git a/drivers/media/platform/rockchip/cif/dev.c b/drivers/media/platform/rockchip/cif/dev.c new file mode 100755 -index 000000000..5f59c9401 +index 000000000000..5f59c9401059 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/dev.c @@ -0,0 +1,1928 @@ @@ -858834,7 +858834,7 @@ index 000000000..5f59c9401 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/cif/dev.h b/drivers/media/platform/rockchip/cif/dev.h new file mode 100755 -index 000000000..a6f210bd8 +index 000000000000..a6f210bd8166 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/dev.h @@ -0,0 +1,786 @@ @@ -859626,7 +859626,7 @@ index 000000000..a6f210bd8 +#endif diff --git a/drivers/media/platform/rockchip/cif/hw.c b/drivers/media/platform/rockchip/cif/hw.c new file mode 100755 -index 000000000..a85f2e14c +index 000000000000..a85f2e14c8e7 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/hw.c @@ -0,0 +1,1186 @@ @@ -860818,7 +860818,7 @@ index 000000000..a85f2e14c +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/cif/hw.h b/drivers/media/platform/rockchip/cif/hw.h new file mode 100755 -index 000000000..b5698f7c3 +index 000000000000..b5698f7c35e6 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/hw.h @@ -0,0 +1,130 @@ @@ -860954,7 +860954,7 @@ index 000000000..b5698f7c3 +#endif diff --git a/drivers/media/platform/rockchip/cif/mipi-csi2.c b/drivers/media/platform/rockchip/cif/mipi-csi2.c new file mode 100755 -index 000000000..fb2312e2b +index 000000000000..fb2312e2bb63 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/mipi-csi2.c @@ -0,0 +1,940 @@ @@ -861900,7 +861900,7 @@ index 000000000..fb2312e2b +MODULE_LICENSE("GPL"); diff --git a/drivers/media/platform/rockchip/cif/mipi-csi2.h b/drivers/media/platform/rockchip/cif/mipi-csi2.h new file mode 100755 -index 000000000..e04a7dd2e +index 000000000000..e04a7dd2eef3 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/mipi-csi2.h @@ -0,0 +1,159 @@ @@ -862065,7 +862065,7 @@ index 000000000..e04a7dd2e +#endif diff --git a/drivers/media/platform/rockchip/cif/procfs.c b/drivers/media/platform/rockchip/cif/procfs.c new file mode 100755 -index 000000000..43d6e2c23 +index 000000000000..43d6e2c232b0 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/procfs.c @@ -0,0 +1,406 @@ @@ -862477,7 +862477,7 @@ index 000000000..43d6e2c23 +#endif diff --git a/drivers/media/platform/rockchip/cif/procfs.h b/drivers/media/platform/rockchip/cif/procfs.h new file mode 100755 -index 000000000..798533849 +index 000000000000..798533849cd9 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/procfs.h @@ -0,0 +1,25 @@ @@ -862508,7 +862508,7 @@ index 000000000..798533849 +#endif diff --git a/drivers/media/platform/rockchip/cif/regs.h b/drivers/media/platform/rockchip/cif/regs.h new file mode 100755 -index 000000000..d9a1303c1 +index 000000000000..d9a1303c16af --- /dev/null +++ b/drivers/media/platform/rockchip/cif/regs.h @@ -0,0 +1,979 @@ @@ -863493,7 +863493,7 @@ index 000000000..d9a1303c1 +#endif diff --git a/drivers/media/platform/rockchip/cif/subdev-itf.c b/drivers/media/platform/rockchip/cif/subdev-itf.c new file mode 100755 -index 000000000..3cf240ee4 +index 000000000000..3cf240ee4945 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/subdev-itf.c @@ -0,0 +1,635 @@ @@ -864134,7 +864134,7 @@ index 000000000..3cf240ee4 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/cif/subdev-itf.h b/drivers/media/platform/rockchip/cif/subdev-itf.h new file mode 100755 -index 000000000..a1ebbe02a +index 000000000000..a1ebbe02a820 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/subdev-itf.h @@ -0,0 +1,69 @@ @@ -864209,7 +864209,7 @@ index 000000000..a1ebbe02a +#endif diff --git a/drivers/media/platform/rockchip/cif/version.h b/drivers/media/platform/rockchip/cif/version.h new file mode 100755 -index 000000000..627b4a3a1 +index 000000000000..627b4a3a11e5 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/version.h @@ -0,0 +1,74 @@ @@ -864289,7 +864289,7 @@ index 000000000..627b4a3a1 +#endif diff --git a/drivers/media/platform/rockchip/isp/Kconfig b/drivers/media/platform/rockchip/isp/Kconfig new file mode 100755 -index 000000000..98a530a17 +index 000000000000..98a530a171f1 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/Kconfig @@ -0,0 +1,39 @@ @@ -864334,7 +864334,7 @@ index 000000000..98a530a17 +endif diff --git a/drivers/media/platform/rockchip/isp/Makefile b/drivers/media/platform/rockchip/isp/Makefile new file mode 100755 -index 000000000..52cac6290 +index 000000000000..52cac629003f --- /dev/null +++ b/drivers/media/platform/rockchip/isp/Makefile @@ -0,0 +1,42 @@ @@ -864382,7 +864382,7 @@ index 000000000..52cac6290 +video_rkisp-$(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) += rkisp_tb_helper.o diff --git a/drivers/media/platform/rockchip/isp/bridge.c b/drivers/media/platform/rockchip/isp/bridge.c new file mode 100755 -index 000000000..51c8254cc +index 000000000000..51c8254ccfe2 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge.c @@ -0,0 +1,629 @@ @@ -865017,7 +865017,7 @@ index 000000000..51c8254cc +EXPORT_SYMBOL(rkisp_get_bridge_sd); diff --git a/drivers/media/platform/rockchip/isp/bridge.h b/drivers/media/platform/rockchip/isp/bridge.h new file mode 100755 -index 000000000..8310b13df +index 000000000000..8310b13df88a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge.h @@ -0,0 +1,105 @@ @@ -865128,7 +865128,7 @@ index 000000000..8310b13df +#endif diff --git a/drivers/media/platform/rockchip/isp/bridge_v20.c b/drivers/media/platform/rockchip/isp/bridge_v20.c new file mode 100755 -index 000000000..ff1d4af07 +index 000000000000..ff1d4af07424 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge_v20.c @@ -0,0 +1,1094 @@ @@ -866228,7 +866228,7 @@ index 000000000..ff1d4af07 +} diff --git a/drivers/media/platform/rockchip/isp/bridge_v30.c b/drivers/media/platform/rockchip/isp/bridge_v30.c new file mode 100755 -index 000000000..c0b639bdd +index 000000000000..c0b639bddd56 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge_v30.c @@ -0,0 +1,236 @@ @@ -866470,7 +866470,7 @@ index 000000000..c0b639bdd +} diff --git a/drivers/media/platform/rockchip/isp/capture.c b/drivers/media/platform/rockchip/isp/capture.c new file mode 100755 -index 000000000..476c147b5 +index 000000000000..476c147b5f60 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture.c @@ -0,0 +1,1717 @@ @@ -868193,7 +868193,7 @@ index 000000000..476c147b5 +} diff --git a/drivers/media/platform/rockchip/isp/capture.h b/drivers/media/platform/rockchip/isp/capture.h new file mode 100755 -index 000000000..5a9251a9c +index 000000000000..5a9251a9c973 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture.h @@ -0,0 +1,295 @@ @@ -868494,7 +868494,7 @@ index 000000000..5a9251a9c +#endif /* _RKISP_PATH_VIDEO_H */ diff --git a/drivers/media/platform/rockchip/isp/capture_v1x.c b/drivers/media/platform/rockchip/isp/capture_v1x.c new file mode 100755 -index 000000000..b829bd5e5 +index 000000000000..b829bd5e512a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v1x.c @@ -0,0 +1,957 @@ @@ -869457,7 +869457,7 @@ index 000000000..b829bd5e5 +} diff --git a/drivers/media/platform/rockchip/isp/capture_v1x.h b/drivers/media/platform/rockchip/isp/capture_v1x.h new file mode 100755 -index 000000000..f26f1bde0 +index 000000000000..f26f1bde0010 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v1x.h @@ -0,0 +1,17 @@ @@ -869480,7 +869480,7 @@ index 000000000..f26f1bde0 +#endif diff --git a/drivers/media/platform/rockchip/isp/capture_v20.c b/drivers/media/platform/rockchip/isp/capture_v20.c new file mode 100755 -index 000000000..4dbb87110 +index 000000000000..4dbb87110d54 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v20.c @@ -0,0 +1,1969 @@ @@ -871455,7 +871455,7 @@ index 000000000..4dbb87110 +} diff --git a/drivers/media/platform/rockchip/isp/capture_v21.c b/drivers/media/platform/rockchip/isp/capture_v21.c new file mode 100755 -index 000000000..4bef12f6a +index 000000000000..4bef12f6a9a4 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v21.c @@ -0,0 +1,1699 @@ @@ -873160,7 +873160,7 @@ index 000000000..4bef12f6a +} diff --git a/drivers/media/platform/rockchip/isp/capture_v2x.h b/drivers/media/platform/rockchip/isp/capture_v2x.h new file mode 100755 -index 000000000..8ec036998 +index 000000000000..8ec036998a4a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v2x.h @@ -0,0 +1,48 @@ @@ -873214,7 +873214,7 @@ index 000000000..8ec036998 +#endif diff --git a/drivers/media/platform/rockchip/isp/capture_v30.c b/drivers/media/platform/rockchip/isp/capture_v30.c new file mode 100755 -index 000000000..05fad30e2 +index 000000000000..05fad30e2ba3 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v30.c @@ -0,0 +1,1495 @@ @@ -874715,7 +874715,7 @@ index 000000000..05fad30e2 +} diff --git a/drivers/media/platform/rockchip/isp/capture_v3x.h b/drivers/media/platform/rockchip/isp/capture_v3x.h new file mode 100755 -index 000000000..cb3d59391 +index 000000000000..cb3d59391e87 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v3x.h @@ -0,0 +1,23 @@ @@ -874744,7 +874744,7 @@ index 000000000..cb3d59391 +#endif diff --git a/drivers/media/platform/rockchip/isp/common.c b/drivers/media/platform/rockchip/isp/common.c new file mode 100755 -index 000000000..30b69b204 +index 000000000000..30b69b204914 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/common.c @@ -0,0 +1,369 @@ @@ -875119,7 +875119,7 @@ index 000000000..30b69b204 +} diff --git a/drivers/media/platform/rockchip/isp/common.h b/drivers/media/platform/rockchip/isp/common.h new file mode 100755 -index 000000000..6ff84a21b +index 000000000000..6ff84a21b216 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/common.h @@ -0,0 +1,212 @@ @@ -875337,7 +875337,7 @@ index 000000000..6ff84a21b +#endif /* _RKISP_COMMON_H */ diff --git a/drivers/media/platform/rockchip/isp/csi.c b/drivers/media/platform/rockchip/isp/csi.c new file mode 100755 -index 000000000..2ffd02c73 +index 000000000000..2ffd02c73e0d --- /dev/null +++ b/drivers/media/platform/rockchip/isp/csi.c @@ -0,0 +1,637 @@ @@ -875980,7 +875980,7 @@ index 000000000..2ffd02c73 +} diff --git a/drivers/media/platform/rockchip/isp/csi.h b/drivers/media/platform/rockchip/isp/csi.h new file mode 100755 -index 000000000..4a8c70200 +index 000000000000..4a8c7020078b --- /dev/null +++ b/drivers/media/platform/rockchip/isp/csi.h @@ -0,0 +1,83 @@ @@ -876069,7 +876069,7 @@ index 000000000..4a8c70200 +#endif diff --git a/drivers/media/platform/rockchip/isp/dev.c b/drivers/media/platform/rockchip/isp/dev.c new file mode 100755 -index 000000000..e8628681d +index 000000000000..e8628681d570 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dev.c @@ -0,0 +1,913 @@ @@ -876988,7 +876988,7 @@ index 000000000..e8628681d +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/media/platform/rockchip/isp/dev.h b/drivers/media/platform/rockchip/isp/dev.h new file mode 100755 -index 000000000..e05749111 +index 000000000000..e057491111fa --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dev.h @@ -0,0 +1,238 @@ @@ -877232,7 +877232,7 @@ index 000000000..e05749111 +#endif diff --git a/drivers/media/platform/rockchip/isp/dmarx.c b/drivers/media/platform/rockchip/isp/dmarx.c new file mode 100755 -index 000000000..0dcc080d7 +index 000000000000..0dcc080d7cdc --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dmarx.c @@ -0,0 +1,1183 @@ @@ -878421,7 +878421,7 @@ index 000000000..0dcc080d7 +} diff --git a/drivers/media/platform/rockchip/isp/dmarx.h b/drivers/media/platform/rockchip/isp/dmarx.h new file mode 100755 -index 000000000..348096e28 +index 000000000000..348096e286ef --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dmarx.h @@ -0,0 +1,67 @@ @@ -878494,7 +878494,7 @@ index 000000000..348096e28 +#endif /* _RKISP_DMARX_H */ diff --git a/drivers/media/platform/rockchip/isp/hw.c b/drivers/media/platform/rockchip/isp/hw.c new file mode 100755 -index 000000000..899bee986 +index 000000000000..899bee986397 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/hw.c @@ -0,0 +1,1019 @@ @@ -879519,7 +879519,7 @@ index 000000000..899bee986 +module_init(rkisp_hw_drv_init); diff --git a/drivers/media/platform/rockchip/isp/hw.h b/drivers/media/platform/rockchip/isp/hw.h new file mode 100755 -index 000000000..dce2f0a71 +index 000000000000..dce2f0a715ee --- /dev/null +++ b/drivers/media/platform/rockchip/isp/hw.h @@ -0,0 +1,89 @@ @@ -879614,7 +879614,7 @@ index 000000000..dce2f0a71 +#endif diff --git a/drivers/media/platform/rockchip/isp/isp_external.h b/drivers/media/platform/rockchip/isp/isp_external.h new file mode 100755 -index 000000000..655c4b943 +index 000000000000..655c4b943835 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_external.h @@ -0,0 +1,44 @@ @@ -879664,7 +879664,7 @@ index 000000000..655c4b943 +#endif diff --git a/drivers/media/platform/rockchip/isp/isp_ispp.h b/drivers/media/platform/rockchip/isp/isp_ispp.h new file mode 100755 -index 000000000..98300cae0 +index 000000000000..98300cae0347 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_ispp.h @@ -0,0 +1,138 @@ @@ -879808,7 +879808,7 @@ index 000000000..98300cae0 +#endif diff --git a/drivers/media/platform/rockchip/isp/isp_mipi_luma.c b/drivers/media/platform/rockchip/isp/isp_mipi_luma.c new file mode 100755 -index 000000000..ebca58e71 +index 000000000000..ebca58e7102f --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_mipi_luma.c @@ -0,0 +1,524 @@ @@ -880338,7 +880338,7 @@ index 000000000..ebca58e71 +} diff --git a/drivers/media/platform/rockchip/isp/isp_mipi_luma.h b/drivers/media/platform/rockchip/isp/isp_mipi_luma.h new file mode 100755 -index 000000000..537a9d6a0 +index 000000000000..537a9d6a0796 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_mipi_luma.h @@ -0,0 +1,79 @@ @@ -880423,7 +880423,7 @@ index 000000000..537a9d6a0 +#endif /* _RKISP_ISP_LUMA_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params.c b/drivers/media/platform/rockchip/isp/isp_params.c new file mode 100755 -index 000000000..c5e91d18f +index 000000000000..c5e91d18f973 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params.c @@ -0,0 +1,459 @@ @@ -880888,7 +880888,7 @@ index 000000000..c5e91d18f + diff --git a/drivers/media/platform/rockchip/isp/isp_params.h b/drivers/media/platform/rockchip/isp/isp_params.h new file mode 100755 -index 000000000..fb4e3a2d7 +index 000000000000..fb4e3a2d7569 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params.h @@ -0,0 +1,147 @@ @@ -881041,7 +881041,7 @@ index 000000000..fb4e3a2d7 +#endif /* _RKISP_ISP_PARAM_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params_v1x.c b/drivers/media/platform/rockchip/isp/isp_params_v1x.c new file mode 100755 -index 000000000..4ca6c6dbb +index 000000000000..4ca6c6dbbd2c --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v1x.c @@ -0,0 +1,2352 @@ @@ -883399,7 +883399,7 @@ index 000000000..4ca6c6dbb + diff --git a/drivers/media/platform/rockchip/isp/isp_params_v1x.h b/drivers/media/platform/rockchip/isp/isp_params_v1x.h new file mode 100755 -index 000000000..316bef51e +index 000000000000..316bef51eaca --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v1x.h @@ -0,0 +1,87 @@ @@ -883492,7 +883492,7 @@ index 000000000..316bef51e +#endif /* _RKISP_ISP_PARAM_V1X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params_v21.c b/drivers/media/platform/rockchip/isp/isp_params_v21.c new file mode 100755 -index 000000000..eeb242a14 +index 000000000000..eeb242a14a79 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v21.c @@ -0,0 +1,4195 @@ @@ -887693,7 +887693,7 @@ index 000000000..eeb242a14 +} diff --git a/drivers/media/platform/rockchip/isp/isp_params_v21.h b/drivers/media/platform/rockchip/isp/isp_params_v21.h new file mode 100755 -index 000000000..860b9156f +index 000000000000..860b9156f761 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v21.h @@ -0,0 +1,175 @@ @@ -887874,7 +887874,7 @@ index 000000000..860b9156f +#endif /* _RKISP_ISP_PARAM_V21_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params_v2x.c b/drivers/media/platform/rockchip/isp/isp_params_v2x.c new file mode 100755 -index 000000000..656834e2a +index 000000000000..656834e2a922 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v2x.c @@ -0,0 +1,4466 @@ @@ -892346,7 +892346,7 @@ index 000000000..656834e2a + diff --git a/drivers/media/platform/rockchip/isp/isp_params_v2x.h b/drivers/media/platform/rockchip/isp/isp_params_v2x.h new file mode 100755 -index 000000000..707ada182 +index 000000000000..707ada18205b --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v2x.h @@ -0,0 +1,359 @@ @@ -892711,7 +892711,7 @@ index 000000000..707ada182 +#endif /* _RKISP_ISP_PARAM_V2X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params_v3x.c b/drivers/media/platform/rockchip/isp/isp_params_v3x.c new file mode 100755 -index 000000000..2f35b42e1 +index 000000000000..2f35b42e1d7c --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v3x.c @@ -0,0 +1,4688 @@ @@ -897405,7 +897405,7 @@ index 000000000..2f35b42e1 +} diff --git a/drivers/media/platform/rockchip/isp/isp_params_v3x.h b/drivers/media/platform/rockchip/isp/isp_params_v3x.h new file mode 100755 -index 000000000..3f9d6989d +index 000000000000..3f9d6989d453 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v3x.h @@ -0,0 +1,210 @@ @@ -897621,7 +897621,7 @@ index 000000000..3f9d6989d +#endif /* _RKISP_ISP_PARAM_V3X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats.c b/drivers/media/platform/rockchip/isp/isp_stats.c new file mode 100755 -index 000000000..e472dbdb7 +index 000000000000..e472dbdb7bee --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats.c @@ -0,0 +1,373 @@ @@ -898000,7 +898000,7 @@ index 000000000..e472dbdb7 + diff --git a/drivers/media/platform/rockchip/isp/isp_stats.h b/drivers/media/platform/rockchip/isp/isp_stats.h new file mode 100755 -index 000000000..249ed2535 +index 000000000000..249ed2535585 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats.h @@ -0,0 +1,89 @@ @@ -898095,7 +898095,7 @@ index 000000000..249ed2535 +#endif /* _RKISP_ISP_STATS_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v1x.c b/drivers/media/platform/rockchip/isp/isp_stats_v1x.c new file mode 100755 -index 000000000..dce904b5f +index 000000000000..dce904b5f7c5 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v1x.c @@ -0,0 +1,420 @@ @@ -898521,7 +898521,7 @@ index 000000000..dce904b5f + diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v1x.h b/drivers/media/platform/rockchip/isp/isp_stats_v1x.h new file mode 100755 -index 000000000..8f1853d4b +index 000000000000..8f1853d4b01d --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v1x.h @@ -0,0 +1,42 @@ @@ -898569,7 +898569,7 @@ index 000000000..8f1853d4b +#endif /* _RKISP_ISP_STATS_V1X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v21.c b/drivers/media/platform/rockchip/isp/isp_stats_v21.c new file mode 100755 -index 000000000..956775f3b +index 000000000000..956775f3bbaf --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v21.c @@ -0,0 +1,1166 @@ @@ -899741,7 +899741,7 @@ index 000000000..956775f3b +} diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v21.h b/drivers/media/platform/rockchip/isp/isp_stats_v21.h new file mode 100755 -index 000000000..c1dba6c65 +index 000000000000..c1dba6c65933 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v21.h @@ -0,0 +1,52 @@ @@ -899799,7 +899799,7 @@ index 000000000..c1dba6c65 +#endif /* _RKISP_ISP_STATS_V21_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v2x.c b/drivers/media/platform/rockchip/isp/isp_stats_v2x.c new file mode 100755 -index 000000000..6e458a571 +index 000000000000..6e458a571b18 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v2x.c @@ -0,0 +1,1526 @@ @@ -901331,7 +901331,7 @@ index 000000000..6e458a571 + diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v2x.h b/drivers/media/platform/rockchip/isp/isp_stats_v2x.h new file mode 100755 -index 000000000..5793ebfef +index 000000000000..5793ebfefcbb --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v2x.h @@ -0,0 +1,70 @@ @@ -901407,7 +901407,7 @@ index 000000000..5793ebfef +#endif /* _RKISP_ISP_STATS_V2X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v3x.c b/drivers/media/platform/rockchip/isp/isp_stats_v3x.c new file mode 100755 -index 000000000..7d1883c37 +index 000000000000..7d1883c37ba8 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v3x.c @@ -0,0 +1,1309 @@ @@ -902722,7 +902722,7 @@ index 000000000..7d1883c37 +} diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v3x.h b/drivers/media/platform/rockchip/isp/isp_stats_v3x.h new file mode 100755 -index 000000000..1b40c571f +index 000000000000..1b40c571f19e --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v3x.h @@ -0,0 +1,52 @@ @@ -902780,7 +902780,7 @@ index 000000000..1b40c571f +#endif /* _RKISP_ISP_STATS_V3X_H */ diff --git a/drivers/media/platform/rockchip/isp/procfs.c b/drivers/media/platform/rockchip/isp/procfs.c new file mode 100755 -index 000000000..4594789ac +index 000000000000..4594789ac355 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/procfs.c @@ -0,0 +1,805 @@ @@ -903591,7 +903591,7 @@ index 000000000..4594789ac +#endif /* CONFIG_PROC_FS */ diff --git a/drivers/media/platform/rockchip/isp/procfs.h b/drivers/media/platform/rockchip/isp/procfs.h new file mode 100755 -index 000000000..09c650abc +index 000000000000..09c650abc5cb --- /dev/null +++ b/drivers/media/platform/rockchip/isp/procfs.h @@ -0,0 +1,21 @@ @@ -903618,7 +903618,7 @@ index 000000000..09c650abc +#endif diff --git a/drivers/media/platform/rockchip/isp/regs.c b/drivers/media/platform/rockchip/isp/regs.c new file mode 100755 -index 000000000..908e05d8c +index 000000000000..908e05d8c6a0 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs.c @@ -0,0 +1,328 @@ @@ -903952,7 +903952,7 @@ index 000000000..908e05d8c +} diff --git a/drivers/media/platform/rockchip/isp/regs.h b/drivers/media/platform/rockchip/isp/regs.h new file mode 100755 -index 000000000..7b7f5972a +index 000000000000..7b7f5972a3a9 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs.h @@ -0,0 +1,2031 @@ @@ -905989,7 +905989,7 @@ index 000000000..7b7f5972a +#endif /* _RKISP_REGS_H */ diff --git a/drivers/media/platform/rockchip/isp/regs_v2x.h b/drivers/media/platform/rockchip/isp/regs_v2x.h new file mode 100755 -index 000000000..9e55bdfa7 +index 000000000000..9e55bdfa7783 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs_v2x.h @@ -0,0 +1,2717 @@ @@ -908712,7 +908712,7 @@ index 000000000..9e55bdfa7 +#endif /* _RKISP_REGS_V2X_H */ diff --git a/drivers/media/platform/rockchip/isp/regs_v3x.h b/drivers/media/platform/rockchip/isp/regs_v3x.h new file mode 100755 -index 000000000..b8db3e46f +index 000000000000..b8db3e46f439 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs_v3x.h @@ -0,0 +1,1822 @@ @@ -910540,7 +910540,7 @@ index 000000000..b8db3e46f +#endif /* _RKISP_REGS_V3X_H */ diff --git a/drivers/media/platform/rockchip/isp/rkisp.c b/drivers/media/platform/rockchip/isp/rkisp.c new file mode 100755 -index 000000000..31bbb5eb0 +index 000000000000..31bbb5eb09d0 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp.c @@ -0,0 +1,3578 @@ @@ -914124,7 +914124,7 @@ index 000000000..31bbb5eb0 + diff --git a/drivers/media/platform/rockchip/isp/rkisp.h b/drivers/media/platform/rockchip/isp/rkisp.h new file mode 100755 -index 000000000..bb19692e8 +index 000000000000..bb19692e8a87 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp.h @@ -0,0 +1,197 @@ @@ -914327,7 +914327,7 @@ index 000000000..bb19692e8 +#endif /* _RKISP_H */ diff --git a/drivers/media/platform/rockchip/isp/rkisp_tb_helper.c b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.c new file mode 100755 -index 000000000..a32e5fe5e +index 000000000000..a32e5fe5e370 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.c @@ -0,0 +1,266 @@ @@ -914599,7 +914599,7 @@ index 000000000..a32e5fe5e +EXPORT_SYMBOL(rkisp_tb_get_state); diff --git a/drivers/media/platform/rockchip/isp/rkisp_tb_helper.h b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.h new file mode 100755 -index 000000000..79d06469a +index 000000000000..79d06469a354 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.h @@ -0,0 +1,33 @@ @@ -914638,7 +914638,7 @@ index 000000000..79d06469a +#endif diff --git a/drivers/media/platform/rockchip/isp/version.h b/drivers/media/platform/rockchip/isp/version.h new file mode 100755 -index 000000000..fd1055386 +index 000000000000..fd10553869e9 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/version.h @@ -0,0 +1,224 @@ @@ -914868,7 +914868,7 @@ index 000000000..fd1055386 +#endif diff --git a/drivers/media/platform/rockchip/isp/videobuf2-rdma-sg.c b/drivers/media/platform/rockchip/isp/videobuf2-rdma-sg.c new file mode 100755 -index 000000000..5fe71b21d +index 000000000000..5fe71b21d930 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/videobuf2-rdma-sg.c @@ -0,0 +1,608 @@ @@ -915482,7 +915482,7 @@ index 000000000..5fe71b21d +EXPORT_SYMBOL_GPL(vb2_rdma_sg_memops); diff --git a/drivers/media/platform/rockchip/isp1/Kconfig b/drivers/media/platform/rockchip/isp1/Kconfig new file mode 100755 -index 000000000..5637cc758 +index 000000000000..5637cc758cc5 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/Kconfig @@ -0,0 +1,12 @@ @@ -915500,7 +915500,7 @@ index 000000000..5637cc758 + Support for ISP1 on the rockchip SoC. diff --git a/drivers/media/platform/rockchip/isp1/Makefile b/drivers/media/platform/rockchip/isp1/Makefile new file mode 100755 -index 000000000..788e3d979 +index 000000000000..788e3d97978a --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/Makefile @@ -0,0 +1,10 @@ @@ -915516,7 +915516,7 @@ index 000000000..788e3d979 + dmarx.o diff --git a/drivers/media/platform/rockchip/isp1/capture.c b/drivers/media/platform/rockchip/isp1/capture.c new file mode 100755 -index 000000000..e61d59a40 +index 000000000000..e61d59a4000a --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/capture.c @@ -0,0 +1,2313 @@ @@ -917835,7 +917835,7 @@ index 000000000..e61d59a40 +} diff --git a/drivers/media/platform/rockchip/isp1/capture.h b/drivers/media/platform/rockchip/isp1/capture.h new file mode 100755 -index 000000000..861361835 +index 000000000000..8613618352e9 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/capture.h @@ -0,0 +1,219 @@ @@ -918060,7 +918060,7 @@ index 000000000..861361835 +#endif /* _RKISP1_PATH_VIDEO_H */ diff --git a/drivers/media/platform/rockchip/isp1/common.h b/drivers/media/platform/rockchip/isp1/common.h new file mode 100755 -index 000000000..f20a0829c +index 000000000000..f20a0829c96c --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/common.h @@ -0,0 +1,133 @@ @@ -918199,7 +918199,7 @@ index 000000000..f20a0829c +#endif /* _RKISP1_COMMON_H */ diff --git a/drivers/media/platform/rockchip/isp1/dev.c b/drivers/media/platform/rockchip/isp1/dev.c new file mode 100755 -index 000000000..4e548f0ae +index 000000000000..4e548f0ae81b --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dev.c @@ -0,0 +1,1200 @@ @@ -919405,7 +919405,7 @@ index 000000000..4e548f0ae +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/media/platform/rockchip/isp1/dev.h b/drivers/media/platform/rockchip/isp1/dev.h new file mode 100755 -index 000000000..980f77113 +index 000000000000..980f7711302d --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dev.h @@ -0,0 +1,173 @@ @@ -919584,7 +919584,7 @@ index 000000000..980f77113 +#endif diff --git a/drivers/media/platform/rockchip/isp1/dmarx.c b/drivers/media/platform/rockchip/isp1/dmarx.c new file mode 100755 -index 000000000..7ac08d249 +index 000000000000..7ac08d249c0b --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dmarx.c @@ -0,0 +1,687 @@ @@ -920277,7 +920277,7 @@ index 000000000..7ac08d249 +} diff --git a/drivers/media/platform/rockchip/isp1/dmarx.h b/drivers/media/platform/rockchip/isp1/dmarx.h new file mode 100755 -index 000000000..abc3b39aa +index 000000000000..abc3b39aa0b5 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dmarx.h @@ -0,0 +1,29 @@ @@ -920312,7 +920312,7 @@ index 000000000..abc3b39aa +#endif /* _RKISP1_DMARX_H */ diff --git a/drivers/media/platform/rockchip/isp1/isp_params.c b/drivers/media/platform/rockchip/isp1/isp_params.c new file mode 100755 -index 000000000..5315aabf3 +index 000000000000..5315aabf3957 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_params.c @@ -0,0 +1,2655 @@ @@ -922973,7 +922973,7 @@ index 000000000..5315aabf3 +} diff --git a/drivers/media/platform/rockchip/isp1/isp_params.h b/drivers/media/platform/rockchip/isp1/isp_params.h new file mode 100755 -index 000000000..ea707b7cf +index 000000000000..ea707b7cf0e4 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_params.h @@ -0,0 +1,151 @@ @@ -923130,7 +923130,7 @@ index 000000000..ea707b7cf +#endif /* _RKISP1_ISP_H */ diff --git a/drivers/media/platform/rockchip/isp1/isp_stats.c b/drivers/media/platform/rockchip/isp1/isp_stats.c new file mode 100755 -index 000000000..b682f6a4f +index 000000000000..b682f6a4f9d1 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_stats.c @@ -0,0 +1,684 @@ @@ -923820,7 +923820,7 @@ index 000000000..b682f6a4f +} diff --git a/drivers/media/platform/rockchip/isp1/isp_stats.h b/drivers/media/platform/rockchip/isp1/isp_stats.h new file mode 100755 -index 000000000..bdb4779b1 +index 000000000000..bdb4779b1f69 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_stats.h @@ -0,0 +1,112 @@ @@ -923938,7 +923938,7 @@ index 000000000..bdb4779b1 +#endif /* _RKISP1_ISP_STATS_H */ diff --git a/drivers/media/platform/rockchip/isp1/regs.c b/drivers/media/platform/rockchip/isp1/regs.c new file mode 100755 -index 000000000..82f6cd924 +index 000000000000..82f6cd92475e --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/regs.c @@ -0,0 +1,244 @@ @@ -924188,7 +924188,7 @@ index 000000000..82f6cd924 +} diff --git a/drivers/media/platform/rockchip/isp1/regs.h b/drivers/media/platform/rockchip/isp1/regs.h new file mode 100755 -index 000000000..d31ef1b12 +index 000000000000..d31ef1b127f5 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/regs.h @@ -0,0 +1,1994 @@ @@ -926188,7 +926188,7 @@ index 000000000..d31ef1b12 +#endif /* _RKISP1_REGS_H */ diff --git a/drivers/media/platform/rockchip/isp1/rkisp1.c b/drivers/media/platform/rockchip/isp1/rkisp1.c new file mode 100755 -index 000000000..07246bca8 +index 000000000000..07246bca865c --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/rkisp1.c @@ -0,0 +1,1873 @@ @@ -928067,7 +928067,7 @@ index 000000000..07246bca8 + diff --git a/drivers/media/platform/rockchip/isp1/rkisp1.h b/drivers/media/platform/rockchip/isp1/rkisp1.h new file mode 100755 -index 000000000..afafc2c0f +index 000000000000..afafc2c0f78f --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/rkisp1.h @@ -0,0 +1,163 @@ @@ -928236,7 +928236,7 @@ index 000000000..afafc2c0f +#endif /* _RKISP1_H */ diff --git a/drivers/media/platform/rockchip/isp1/version.h b/drivers/media/platform/rockchip/isp1/version.h new file mode 100755 -index 000000000..3bfb0c98f +index 000000000000..3bfb0c98fd6e --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/version.h @@ -0,0 +1,61 @@ @@ -928303,7 +928303,7 @@ index 000000000..3bfb0c98f +#endif diff --git a/drivers/media/platform/rockchip/ispp/Kconfig b/drivers/media/platform/rockchip/ispp/Kconfig new file mode 100755 -index 000000000..7de4f6886 +index 000000000000..7de4f688633b --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/Kconfig @@ -0,0 +1,31 @@ @@ -928340,7 +928340,7 @@ index 000000000..7de4f6886 +endif diff --git a/drivers/media/platform/rockchip/ispp/Makefile b/drivers/media/platform/rockchip/ispp/Makefile new file mode 100755 -index 000000000..6148f70ff +index 000000000000..6148f70ff50a --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/Makefile @@ -0,0 +1,23 @@ @@ -928369,7 +928369,7 @@ index 000000000..6148f70ff +endif diff --git a/drivers/media/platform/rockchip/ispp/common.c b/drivers/media/platform/rockchip/ispp/common.c new file mode 100755 -index 000000000..91bd4cb96 +index 000000000000..91bd4cb96840 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/common.c @@ -0,0 +1,595 @@ @@ -928970,7 +928970,7 @@ index 000000000..91bd4cb96 +} diff --git a/drivers/media/platform/rockchip/ispp/common.h b/drivers/media/platform/rockchip/ispp/common.h new file mode 100755 -index 000000000..0d24cbb6c +index 000000000000..0d24cbb6c2d0 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/common.h @@ -0,0 +1,145 @@ @@ -929121,7 +929121,7 @@ index 000000000..0d24cbb6c +#endif diff --git a/drivers/media/platform/rockchip/ispp/dev.c b/drivers/media/platform/rockchip/ispp/dev.c new file mode 100755 -index 000000000..54fa571f8 +index 000000000000..54fa571f8de1 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/dev.c @@ -0,0 +1,385 @@ @@ -929512,7 +929512,7 @@ index 000000000..54fa571f8 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/ispp/dev.h b/drivers/media/platform/rockchip/ispp/dev.h new file mode 100755 -index 000000000..32a6736bb +index 000000000000..32a6736bbb1c --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/dev.h @@ -0,0 +1,60 @@ @@ -929578,7 +929578,7 @@ index 000000000..32a6736bb +#endif diff --git a/drivers/media/platform/rockchip/ispp/fec.c b/drivers/media/platform/rockchip/ispp/fec.c new file mode 100755 -index 000000000..a742dc18b +index 000000000000..a742dc18b8c7 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/fec.c @@ -0,0 +1,480 @@ @@ -930064,7 +930064,7 @@ index 000000000..a742dc18b +} diff --git a/drivers/media/platform/rockchip/ispp/fec.h b/drivers/media/platform/rockchip/ispp/fec.h new file mode 100755 -index 000000000..b89615a07 +index 000000000000..b89615a0747d --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/fec.h @@ -0,0 +1,27 @@ @@ -930097,7 +930097,7 @@ index 000000000..b89615a07 +#endif diff --git a/drivers/media/platform/rockchip/ispp/hw.c b/drivers/media/platform/rockchip/ispp/hw.c new file mode 100755 -index 000000000..2d0466070 +index 000000000000..2d0466070fd6 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/hw.c @@ -0,0 +1,510 @@ @@ -930613,7 +930613,7 @@ index 000000000..2d0466070 +#endif diff --git a/drivers/media/platform/rockchip/ispp/hw.h b/drivers/media/platform/rockchip/ispp/hw.h new file mode 100755 -index 000000000..8eb2585ec +index 000000000000..8eb2585ecb71 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/hw.h @@ -0,0 +1,67 @@ @@ -930686,7 +930686,7 @@ index 000000000..8eb2585ec +#endif diff --git a/drivers/media/platform/rockchip/ispp/ispp.c b/drivers/media/platform/rockchip/ispp/ispp.c new file mode 100755 -index 000000000..e1efba145 +index 000000000000..e1efba145533 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/ispp.c @@ -0,0 +1,590 @@ @@ -931282,7 +931282,7 @@ index 000000000..e1efba145 +} diff --git a/drivers/media/platform/rockchip/ispp/ispp.h b/drivers/media/platform/rockchip/ispp/ispp.h new file mode 100755 -index 000000000..baa07a093 +index 000000000000..baa07a09352c --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/ispp.h @@ -0,0 +1,50 @@ @@ -931338,7 +931338,7 @@ index 000000000..baa07a093 +#endif diff --git a/drivers/media/platform/rockchip/ispp/params.c b/drivers/media/platform/rockchip/ispp/params.c new file mode 100755 -index 000000000..9d82b959b +index 000000000000..9d82b959b3c9 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params.c @@ -0,0 +1,427 @@ @@ -931771,7 +931771,7 @@ index 000000000..9d82b959b +} diff --git a/drivers/media/platform/rockchip/ispp/params.h b/drivers/media/platform/rockchip/ispp/params.h new file mode 100755 -index 000000000..a5083891a +index 000000000000..a5083891ac1f --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params.h @@ -0,0 +1,69 @@ @@ -931846,7 +931846,7 @@ index 000000000..a5083891a +#endif diff --git a/drivers/media/platform/rockchip/ispp/params_v10.c b/drivers/media/platform/rockchip/ispp/params_v10.c new file mode 100755 -index 000000000..9430d0b84 +index 000000000000..9430d0b84797 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params_v10.c @@ -0,0 +1,739 @@ @@ -932591,7 +932591,7 @@ index 000000000..9430d0b84 +} diff --git a/drivers/media/platform/rockchip/ispp/params_v20.c b/drivers/media/platform/rockchip/ispp/params_v20.c new file mode 100755 -index 000000000..03c944c8a +index 000000000000..03c944c8af0d --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params_v20.c @@ -0,0 +1,209 @@ @@ -932806,7 +932806,7 @@ index 000000000..03c944c8a +} diff --git a/drivers/media/platform/rockchip/ispp/procfs.c b/drivers/media/platform/rockchip/ispp/procfs.c new file mode 100755 -index 000000000..9cee3fc71 +index 000000000000..9cee3fc71ce1 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/procfs.c @@ -0,0 +1,143 @@ @@ -932955,7 +932955,7 @@ index 000000000..9cee3fc71 +#endif /* CONFIG_PROC_FS */ diff --git a/drivers/media/platform/rockchip/ispp/procfs.h b/drivers/media/platform/rockchip/ispp/procfs.h new file mode 100755 -index 000000000..21ea0c471 +index 000000000000..21ea0c471b58 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/procfs.h @@ -0,0 +1,21 @@ @@ -932982,7 +932982,7 @@ index 000000000..21ea0c471 +#endif diff --git a/drivers/media/platform/rockchip/ispp/regs.h b/drivers/media/platform/rockchip/ispp/regs.h new file mode 100755 -index 000000000..bc9f66766 +index 000000000000..bc9f66766e0c --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/regs.h @@ -0,0 +1,523 @@ @@ -933511,7 +933511,7 @@ index 000000000..bc9f66766 +#endif /* _RKISPP_REGS_H */ diff --git a/drivers/media/platform/rockchip/ispp/stats.c b/drivers/media/platform/rockchip/ispp/stats.c new file mode 100755 -index 000000000..df011710b +index 000000000000..df011710b1aa --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stats.c @@ -0,0 +1,388 @@ @@ -933905,7 +933905,7 @@ index 000000000..df011710b + diff --git a/drivers/media/platform/rockchip/ispp/stats.h b/drivers/media/platform/rockchip/ispp/stats.h new file mode 100755 -index 000000000..e4d43bf25 +index 000000000000..e4d43bf25bde --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stats.h @@ -0,0 +1,53 @@ @@ -933964,7 +933964,7 @@ index 000000000..e4d43bf25 +#endif /* _RKISPP_STATS_H */ diff --git a/drivers/media/platform/rockchip/ispp/stream.c b/drivers/media/platform/rockchip/ispp/stream.c new file mode 100755 -index 000000000..a2f4a96bd +index 000000000000..a2f4a96bdec2 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream.c @@ -0,0 +1,2016 @@ @@ -935986,7 +935986,7 @@ index 000000000..a2f4a96bd +} diff --git a/drivers/media/platform/rockchip/ispp/stream.h b/drivers/media/platform/rockchip/ispp/stream.h new file mode 100755 -index 000000000..8ffde0261 +index 000000000000..8ffde026109d --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream.h @@ -0,0 +1,280 @@ @@ -936272,7 +936272,7 @@ index 000000000..8ffde0261 +#endif diff --git a/drivers/media/platform/rockchip/ispp/stream_v10.c b/drivers/media/platform/rockchip/ispp/stream_v10.c new file mode 100755 -index 000000000..9a6ed6d89 +index 000000000000..9a6ed6d89fda --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream_v10.c @@ -0,0 +1,1733 @@ @@ -938011,7 +938011,7 @@ index 000000000..9a6ed6d89 +} diff --git a/drivers/media/platform/rockchip/ispp/stream_v20.c b/drivers/media/platform/rockchip/ispp/stream_v20.c new file mode 100755 -index 000000000..728a9c0af +index 000000000000..728a9c0afdf8 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream_v20.c @@ -0,0 +1,463 @@ @@ -938480,7 +938480,7 @@ index 000000000..728a9c0af +} diff --git a/drivers/media/platform/rockchip/ispp/version.h b/drivers/media/platform/rockchip/ispp/version.h new file mode 100755 -index 000000000..b7f01737a +index 000000000000..b7f01737aa92 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/version.h @@ -0,0 +1,138 @@ @@ -938623,7 +938623,7 @@ index 000000000..b7f01737a + +#endif diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c -index 6334f99f1..e4603e283 100644 +index 6334f99f1854..e4603e2833d7 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -12,6 +12,7 @@ @@ -938648,7 +938648,7 @@ index 6334f99f1..e4603e283 100644 error: diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c -index 33babe6e8..1b5d4d99e 100644 +index 33babe6e8b3a..1b5d4d99ec68 100644 --- a/drivers/media/v4l2-core/v4l2-async.c +++ b/drivers/media/v4l2-core/v4l2-async.c @@ -555,6 +555,60 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev, @@ -938713,7 +938713,7 @@ index 33babe6e8..1b5d4d99e 100644 struct v4l2_async_notifier *notifier) { diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c -index d109b9f14..fd755d98a 100644 +index d109b9f14407..fd755d98af84 100644 --- a/drivers/mfd/rk808.c +++ b/drivers/mfd/rk808.c @@ -2,7 +2,7 @@ @@ -939949,7 +939949,7 @@ index d109b9f14..fd755d98a 100644 MODULE_LICENSE("GPL"); MODULE_AUTHOR("Chris Zhong "); diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c -index 599b7317b..f3f8000f0 100644 +index 599b7317b59a..f3f8000f0bb0 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -2902,6 +2902,9 @@ static void mmc_blk_remove_debugfs(struct mmc_card *card, @@ -939963,7 +939963,7 @@ index 599b7317b..f3f8000f0 100644 { struct mmc_blk_data *md, *part_md; diff --git a/drivers/mmc/core/block.h b/drivers/mmc/core/block.h -index 31153f656..b71b3ec14 100644 +index 31153f656f41..b71b3ec148f3 100644 --- a/drivers/mmc/core/block.h +++ b/drivers/mmc/core/block.h @@ -17,4 +17,5 @@ struct work_struct; @@ -939973,7 +939973,7 @@ index 31153f656..b71b3ec14 100644 +extern struct mmc_card *this_card; #endif diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h -index a6c814fdb..16746d211 100644 +index a6c814fdbf0a..16746d211718 100644 --- a/drivers/mmc/core/core.h +++ b/drivers/mmc/core/core.h @@ -81,6 +81,8 @@ int mmc_attach_mmc(struct mmc_host *host); @@ -939986,7 +939986,7 @@ index a6c814fdb..16746d211 100644 extern bool use_spi_crc; diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c -index 03e2f965a..8d5e68527 100644 +index 03e2f965a96a..8d5e68527880 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -523,6 +523,9 @@ static int mmc_validate_host_caps(struct mmc_host *host) @@ -940046,7 +940046,7 @@ index 03e2f965a..8d5e68527 100644 +} +EXPORT_SYMBOL(mmc_host_rescan); diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c -index 99a4ce68d..11b4cc339 100644 +index 99a4ce68d82f..11b4cc339309 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -3,9 +3,15 @@ @@ -940757,7 +940757,7 @@ index 99a4ce68d..11b4cc339 100644 +} +EXPORT_SYMBOL(sdio_reset_comm); diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile -index 451c25fc2..6dfb791fa 100644 +index 451c25fc2c69..6dfb791fa621 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -61,6 +61,7 @@ obj-$(CONFIG_MMC_DW_HI3798CV200) += dw_mmc-hi3798cv200.o @@ -940769,7 +940769,7 @@ index 451c25fc2..6dfb791fa 100644 obj-$(CONFIG_MMC_SH_MMCIF) += sh_mmcif.o obj-$(CONFIG_MMC_JZ4740) += jz4740_mmc.o diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c -index 753502ce3..ac2ef5ea0 100644 +index 753502ce3c85..ac2ef5ea0c8d 100644 --- a/drivers/mmc/host/dw_mmc-rockchip.c +++ b/drivers/mmc/host/dw_mmc-rockchip.c @@ -22,6 +22,9 @@ struct dw_mci_rockchip_priv_data { @@ -940946,7 +940946,7 @@ index 753502ce3..ac2ef5ea0 100644 return 0; } diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h -index da5923a92..0b53484e9 100644 +index da5923a92e60..0b53484e9306 100644 --- a/drivers/mmc/host/dw_mmc.h +++ b/drivers/mmc/host/dw_mmc.h @@ -230,6 +230,8 @@ struct dw_mci { @@ -940960,7 +940960,7 @@ index da5923a92..0b53484e9 100644 /* DMA ops for Internal/External DMAC interface */ diff --git a/drivers/mmc/host/rk_sdmmc.h b/drivers/mmc/host/rk_sdmmc.h new file mode 100755 -index 000000000..cad989246 +index 000000000000..cad989246002 --- /dev/null +++ b/drivers/mmc/host/rk_sdmmc.h @@ -0,0 +1,387 @@ @@ -941353,7 +941353,7 @@ index 000000000..cad989246 +#endif /* _DW_MMC_H_ */ diff --git a/drivers/mmc/host/rk_sdmmc_ops.c b/drivers/mmc/host/rk_sdmmc_ops.c new file mode 100755 -index 000000000..96f20d2dc +index 000000000000..96f20d2dcfc7 --- /dev/null +++ b/drivers/mmc/host/rk_sdmmc_ops.c @@ -0,0 +1,194 @@ @@ -941553,7 +941553,7 @@ index 000000000..96f20d2dc +MODULE_LICENSE("GPL"); diff --git a/drivers/mmc/host/rk_sdmmc_ops.h b/drivers/mmc/host/rk_sdmmc_ops.h new file mode 100755 -index 000000000..8261d69f5 +index 000000000000..8261d69f561d --- /dev/null +++ b/drivers/mmc/host/rk_sdmmc_ops.h @@ -0,0 +1,11 @@ @@ -941569,7 +941569,7 @@ index 000000000..8261d69f5 + +#endif diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c -index 59d8d96ce..f344bd300 100644 +index 59d8d96ce206..f344bd300018 100644 --- a/drivers/mmc/host/sdhci-of-dwcmshc.c +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c @@ -9,9 +9,12 @@ @@ -941925,7 +941925,7 @@ index 59d8d96ce..f344bd300 100644 MODULE_DEVICE_TABLE(of, sdhci_dwcmshc_dt_ids); diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig -index 6c46f25b5..2cc533e4e 100644 +index 6c46f25b57e2..2cc533e4e239 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -462,6 +462,18 @@ config MTD_NAND_ARASAN @@ -941948,7 +941948,7 @@ index 6c46f25b5..2cc533e4e 100644 config MTD_SM_COMMON diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile -index 2930f5b90..960c9be25 100644 +index 2930f5b9015d..960c9be25204 100644 --- a/drivers/mtd/nand/raw/Makefile +++ b/drivers/mtd/nand/raw/Makefile @@ -58,6 +58,7 @@ obj-$(CONFIG_MTD_NAND_STM32_FMC2) += stm32_fmc2_nand.o @@ -941961,7 +941961,7 @@ index 2930f5b90..960c9be25 100644 nand-objs += nand_onfi.o diff --git a/drivers/mtd/nand/raw/rockchip-nand-controller.c b/drivers/mtd/nand/raw/rockchip-nand-controller.c new file mode 100644 -index 000000000..796b678cb +index 000000000000..796b678cb108 --- /dev/null +++ b/drivers/mtd/nand/raw/rockchip-nand-controller.c @@ -0,0 +1,1495 @@ @@ -943461,7 +943461,7 @@ index 000000000..796b678cb +MODULE_DESCRIPTION("Rockchip Nand Flash Controller Driver"); +MODULE_ALIAS("platform:rockchip-nand-controller"); diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c -index 65b9e5846..7b25d960d 100644 +index 65b9e5846be4..7b25d960d0a2 100644 --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c @@ -559,11 +559,6 @@ int hw_atl_utils_fw_rpc_wait(struct aq_hw_s *self, @@ -943489,7 +943489,7 @@ index 65b9e5846..7b25d960d 100644 hw_atl_utils_fw_downld_dwords(self, self->rpc_addr, diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile -index 24e6145d4..be661832c 100644 +index 24e6145d4eae..be661832cef8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Makefile +++ b/drivers/net/ethernet/stmicro/stmmac/Makefile @@ -19,7 +19,8 @@ obj-$(CONFIG_DWMAC_MEDIATEK) += dwmac-mediatek.o @@ -943504,7 +943504,7 @@ index 24e6145d4..be661832c 100644 obj-$(CONFIG_DWMAC_STM32) += dwmac-stm32.o diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.c new file mode 100755 -index 000000000..541788f9e +index 000000000000..541788f9e2c8 --- /dev/null +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.c @@ -0,0 +1,1613 @@ @@ -945123,7 +945123,7 @@ index 000000000..541788f9e +} diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.h b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.h new file mode 100755 -index 000000000..d71989b0f +index 000000000000..d71989b0fc74 --- /dev/null +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.h @@ -0,0 +1,25 @@ @@ -945153,7 +945153,7 @@ index 000000000..d71989b0f +#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 d0d47d91b..31560a312 100644 +index d0d47d91b460..31560a312fe2 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -11,6 +11,7 @@ @@ -946372,7 +946372,7 @@ index d0d47d91b..31560a312 100644 }; MODULE_DEVICE_TABLE(of, rk_gmac_dwmac_match); diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig -index 170a64e67..46f5cc407 100644 +index 170a64e67709..46f5cc40788a 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -48,6 +48,7 @@ source "drivers/net/wireless/st/Kconfig" @@ -946384,7 +946384,7 @@ index 170a64e67..46f5cc407 100644 config PCMCIA_RAYCS tristate "Aviator/Raytheon 2.4GHz wireless support" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile -index 80b324499..5671364ae 100644 +index 80b324499786..5671364ae98d 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -30,3 +30,4 @@ obj-$(CONFIG_USB_NET_RNDIS_WLAN) += rndis_wlan.o @@ -946393,7 +946393,7 @@ index 80b324499..5671364ae 100644 obj-$(CONFIG_VIRT_WIFI) += virt_wifi.o +obj-$(CONFIG_WL_ROCKCHIP) += rockchip_wlan/ diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c -index 8f01fcbe9..9736aa0ab 100644 +index 8f01fcbe9396..9736aa0ab7fd 100644 --- a/drivers/net/wireless/marvell/mwifiex/usb.c +++ b/drivers/net/wireless/marvell/mwifiex/usb.c @@ -130,8 +130,7 @@ static int mwifiex_usb_recv(struct mwifiex_adapter *adapter, @@ -946408,7 +946408,7 @@ index 8f01fcbe9..9736aa0ab 100644 case MWIFIEX_USB_EP_DATA: diff --git a/drivers/net/wireless/rockchip_wlan/Kconfig b/drivers/net/wireless/rockchip_wlan/Kconfig new file mode 100755 -index 000000000..d77741df5 +index 000000000000..d77741df5cc0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/Kconfig @@ -0,0 +1,39 @@ @@ -946453,7 +946453,7 @@ index 000000000..d77741df5 +endif # WL_ROCKCHIP diff --git a/drivers/net/wireless/rockchip_wlan/Makefile b/drivers/net/wireless/rockchip_wlan/Makefile new file mode 100755 -index 000000000..8279a3937 +index 000000000000..8279a393719f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/Makefile @@ -0,0 +1,3 @@ @@ -946462,7 +946462,7 @@ index 000000000..8279a3937 +obj-$(CONFIG_WL_ROCKCHIP) += rkwifi/rk_wifi_config.o diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/Kconfig b/drivers/net/wireless/rockchip_wlan/rkwifi/Kconfig new file mode 100755 -index 000000000..2ec5138b7 +index 000000000000..2ec5138b79a7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/Kconfig @@ -0,0 +1,33 @@ @@ -946501,7 +946501,7 @@ index 000000000..2ec5138b7 + default to add wlan1 interface diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/Makefile b/drivers/net/wireless/rockchip_wlan/rkwifi/Makefile new file mode 100755 -index 000000000..e4e2c6964 +index 000000000000..e4e2c6964a6b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/Makefile @@ -0,0 +1,10 @@ @@ -946517,7 +946517,7 @@ index 000000000..e4e2c6964 + 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 000000000..3e6e78888 +index 000000000000..3e6e78888be2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Kconfig @@ -0,0 +1,59 @@ @@ -946582,7 +946582,7 @@ index 000000000..3e6e78888 +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 000000000..b8b4c353e +index 000000000000..b8b4c353ee61 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Makefile @@ -0,0 +1,258 @@ @@ -946846,7 +946846,7 @@ index 000000000..b8b4c353e +EXTRA_CFLAGS += -Wno-non-literal-null-conversion diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/aiutils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/aiutils.c new file mode 100755 -index 000000000..cc0b854d3 +index 000000000000..cc0b854d34d5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/aiutils.c @@ -0,0 +1,2099 @@ @@ -948951,7 +948951,7 @@ index 000000000..cc0b854d3 +} 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 000000000..76490b575 +index 000000000000..76490b575fae --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcm_app_utils.c @@ -0,0 +1,1033 @@ @@ -949990,7 +949990,7 @@ index 000000000..76490b575 +} 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 000000000..80eb786f0 +index 000000000000..80eb786f035a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmbloom.c @@ -0,0 +1,243 @@ @@ -950239,7 +950239,7 @@ index 000000000..80eb786f0 +} 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 000000000..40bdb4bfd +index 000000000000..40bdb4bfda4f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmevent.c @@ -0,0 +1,396 @@ @@ -950641,7 +950641,7 @@ index 000000000..40bdb4bfd +} 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 000000000..b59edd754 +index 000000000000..b59edd7540ca --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh.c @@ -0,0 +1,893 @@ @@ -951540,7 +951540,7 @@ index 000000000..b59edd754 +#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 000000000..84cc71992 +index 000000000000..84cc71992635 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_linux.c @@ -0,0 +1,524 @@ @@ -952070,7 +952070,7 @@ index 000000000..84cc71992 +#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 000000000..01f7fa23b +index 000000000000..01f7fa23b2b3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc.c @@ -0,0 +1,1801 @@ @@ -953877,7 +953877,7 @@ index 000000000..01f7fa23b +} 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 000000000..a2d34724f +index 000000000000..a2d34724f6c4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc_linux.c @@ -0,0 +1,381 @@ @@ -954264,7 +954264,7 @@ index 000000000..a2d34724f +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdspi_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdspi_linux.c new file mode 100755 -index 000000000..86d4cb9e3 +index 000000000000..86d4cb9e3575 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdspi_linux.c @@ -0,0 +1,438 @@ @@ -954708,7 +954708,7 @@ index 000000000..86d4cb9e3 +#endif /* !BCMSPI_ANDROID */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmspibrcm.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmspibrcm.c new file mode 100755 -index 000000000..c0431638b +index 000000000000..c0431638b995 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmspibrcm.c @@ -0,0 +1,1800 @@ @@ -956514,7 +956514,7 @@ index 000000000..c0431638b +} 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 000000000..269db4c3c +index 000000000000..269db4c3c0c1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmstdlib_s.c @@ -0,0 +1,314 @@ @@ -956834,7 +956834,7 @@ index 000000000..269db4c3c +} 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 000000000..c9b01bd66 +index 000000000000..c9b01bd66820 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmutils.c @@ -0,0 +1,4379 @@ @@ -961219,7 +961219,7 @@ index 000000000..c9b01bd66 +} 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 000000000..fc916db9c +index 000000000000..fc916db9cb61 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.c @@ -0,0 +1,1494 @@ @@ -962719,7 +962719,7 @@ index 000000000..fc916db9c +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.h new file mode 100755 -index 000000000..ad3a6a4ae +index 000000000000..ad3a6a4ae693 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.h @@ -0,0 +1,816 @@ @@ -963541,7 +963541,7 @@ index 000000000..ad3a6a4ae +#endif /* _bcmwifi_channels_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rates.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rates.h new file mode 100755 -index 000000000..196ff0fe0 +index 000000000000..196ff0fe0eff --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rates.h @@ -0,0 +1,832 @@ @@ -964379,7 +964379,7 @@ index 000000000..196ff0fe0 +#endif /* _bcmwifi_rates_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rspec.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rspec.h new file mode 100755 -index 000000000..5c3d4a674 +index 000000000000..5c3d4a674814 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rspec.h @@ -0,0 +1,213 @@ @@ -964598,7 +964598,7 @@ index 000000000..5c3d4a674 +#endif /* _bcmwifi_rspec_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmxtlv.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmxtlv.c new file mode 100755 -index 000000000..51d0f5aaf +index 000000000000..51d0f5aaf623 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmxtlv.c @@ -0,0 +1,623 @@ @@ -965227,7 +965227,7 @@ index 000000000..51d0f5aaf +} 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 000000000..3de52fac5 +index 000000000000..3de52fac5172 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus.c @@ -0,0 +1,2903 @@ @@ -968136,7 +968136,7 @@ index 000000000..3de52fac5 +#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 000000000..3be28b2da +index 000000000000..3be28b2da9d4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb.c @@ -0,0 +1,1173 @@ @@ -969315,7 +969315,7 @@ index 000000000..3be28b2da +} /* dbus_bus_fw_get */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb_linux.c new file mode 100755 -index 000000000..2d999b12b +index 000000000000..2d999b12bc94 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb_linux.c @@ -0,0 +1,3404 @@ @@ -972725,7 +972725,7 @@ index 000000000..2d999b12b +#endif /* BCMUSBDEV_COMPOSITE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd.h new file mode 100755 -index 000000000..427e96ea3 +index 000000000000..427e96ea33bb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd.h @@ -0,0 +1,3433 @@ @@ -976164,7 +976164,7 @@ index 000000000..427e96ea3 +#endif /* _dhd_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bus.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bus.h new file mode 100755 -index 000000000..c5b07cf49 +index 000000000000..c5b07cf493d9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bus.h @@ -0,0 +1,357 @@ @@ -976527,7 +976527,7 @@ index 000000000..c5b07cf49 +#endif /* _dhd_bus_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_buzzz.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_buzzz.h new file mode 100755 -index 000000000..342cc004d +index 000000000000..342cc004d25a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_buzzz.h @@ -0,0 +1,38 @@ @@ -976571,7 +976571,7 @@ index 000000000..342cc004d +#endif /* _DHD_BUZZZ_H_INCLUDED_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ccode.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ccode.c new file mode 100755 -index 000000000..fe9a82632 +index 000000000000..fe9a826325e6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ccode.c @@ -0,0 +1,274 @@ @@ -976851,7 +976851,7 @@ index 000000000..fe9a82632 +#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 000000000..44cd1cbf2 +index 000000000000..44cd1cbf24e6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cdc.c @@ -0,0 +1,981 @@ @@ -977838,7 +977838,7 @@ index 000000000..44cd1cbf2 +} 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 000000000..51a13e092 +index 000000000000..51a13e092a3e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.c @@ -0,0 +1,332 @@ @@ -978176,7 +978176,7 @@ index 000000000..51a13e092 +} 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 000000000..88c2e0a16 +index 000000000000..88c2e0a16bcc --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.h @@ -0,0 +1,55 @@ @@ -978237,7 +978237,7 @@ index 000000000..88c2e0a16 +#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 000000000..df11fa183 +index 000000000000..df11fa183e60 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_common.c @@ -0,0 +1,7496 @@ @@ -985739,7 +985739,7 @@ index 000000000..df11fa183 +#endif /* DISABLE_HE_ENAB || CUSTOM_CONTROL_HE_ENAB */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.c new file mode 100755 -index 000000000..c4713ded8 +index 000000000000..c4713ded8a23 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.c @@ -0,0 +1,4730 @@ @@ -990475,7 +990475,7 @@ index 000000000..c4713ded8 +} 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 000000000..6af9c7b18 +index 000000000000..6af9c7b18013 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.h @@ -0,0 +1,384 @@ @@ -990865,7 +990865,7 @@ index 000000000..6af9c7b18 +#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 000000000..dd1a0681b +index 000000000000..dd1a0681bf4f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.c @@ -0,0 +1,220 @@ @@ -991091,7 +991091,7 @@ index 000000000..dd1a0681b + 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 000000000..bcc712c29 +index 000000000000..bcc712c2999b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.h @@ -0,0 +1,77 @@ @@ -991174,7 +991174,7 @@ index 000000000..bcc712c29 + 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 000000000..8553e7456 +index 000000000000..8553e74562dc --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_gpio.c @@ -0,0 +1,279 @@ @@ -991459,7 +991459,7 @@ index 000000000..8553e7456 +} 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 000000000..8acb153a4 +index 000000000000..8acb153a45e3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_hikey.c @@ -0,0 +1,294 @@ @@ -991759,7 +991759,7 @@ index 000000000..8acb153a4 +#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 000000000..1c0f3ca65 +index 000000000000..1c0f3ca65e7a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_memprealloc.c @@ -0,0 +1,562 @@ @@ -992327,7 +992327,7 @@ index 000000000..1c0f3ca65 +#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 000000000..4bc2511c6 +index 000000000000..4bc2511c6da2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg.h @@ -0,0 +1,367 @@ @@ -992700,7 +992700,7 @@ index 000000000..4bc2511c6 +#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 000000000..c909431c0 +index 000000000000..c909431c0b46 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.c @@ -0,0 +1,426 @@ @@ -993132,7 +993132,7 @@ index 000000000..c909431c0 +} 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 000000000..c6deb98f2 +index 000000000000..c6deb98f2ace --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.h @@ -0,0 +1,141 @@ @@ -993279,7 +993279,7 @@ index 000000000..c6deb98f2 +#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 000000000..a6066289c +index 000000000000..a6066289c543 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.c @@ -0,0 +1,2411 @@ @@ -995696,7 +995696,7 @@ index 000000000..a6066289c +} 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 000000000..008c45316 +index 000000000000..008c45316f1c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.h @@ -0,0 +1,853 @@ @@ -996555,7 +996555,7 @@ index 000000000..008c45316 +#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 000000000..2f33db421 +index 000000000000..2f33db421877 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug_linux.c @@ -0,0 +1,516 @@ @@ -997077,7 +997077,7 @@ index 000000000..2f33db421 +} 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 000000000..d457437d3 +index 000000000000..d457437d39ed --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.c @@ -0,0 +1,1238 @@ @@ -998321,7 +998321,7 @@ index 000000000..d457437d3 +} 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 000000000..ac2639d19 +index 000000000000..ac2639d19396 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.h @@ -0,0 +1,289 @@ @@ -998616,7 +998616,7 @@ index 000000000..ac2639d19 +#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 000000000..cdb70099f +index 000000000000..cdb70099fb19 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_gpio.c @@ -0,0 +1,350 @@ @@ -998972,7 +998972,7 @@ index 000000000..cdb70099f + 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 000000000..3772fdfca +index 000000000000..3772fdfca4e5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.c @@ -0,0 +1,1429 @@ @@ -1000407,7 +1000407,7 @@ index 000000000..3772fdfca +#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 000000000..45be081e3 +index 000000000000..45be081e3473 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.h @@ -0,0 +1,97 @@ @@ -1000510,7 +1000510,7 @@ index 000000000..45be081e3 +#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 000000000..b6d43d44d +index 000000000000..b6d43d44d222 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.c @@ -0,0 +1,22453 @@ @@ -1022969,7 +1022969,7 @@ index 000000000..b6d43d44d +#endif /* defiend(WLDWDS) && defined(FOURADDR_AUTO_BRG) */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.h new file mode 100755 -index 000000000..f2b295f54 +index 000000000000..f2b295f54f5b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.h @@ -0,0 +1,448 @@ @@ -1023423,7 +1023423,7 @@ index 000000000..f2b295f54 +#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 000000000..6518b357a +index 000000000000..6518b357aa30 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_exportfs.c @@ -0,0 +1,1420 @@ @@ -1024849,7 +1024849,7 @@ index 000000000..6518b357a +} 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 000000000..30dfaa2b7 +index 000000000000..30dfaa2b7e41 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_lb.c @@ -0,0 +1,1324 @@ @@ -1026179,7 +1026179,7 @@ index 000000000..30dfaa2b7 +#endif /* DHD_LB_TXP */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.c new file mode 100755 -index 000000000..3efe02c9e +index 000000000000..3efe02c9ed49 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.c @@ -0,0 +1,1472 @@ @@ -1027657,7 +1027657,7 @@ index 000000000..3efe02c9e +#endif /* DHD_RX_DUMP */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.h new file mode 100755 -index 000000000..12bb32fd5 +index 000000000000..12bb32fd5dae --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.h @@ -0,0 +1,125 @@ @@ -1027788,7 +1027788,7 @@ index 000000000..12bb32fd5 +#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 000000000..93961824a +index 000000000000..93961824abae --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_platdev.c @@ -0,0 +1,1041 @@ @@ -1028835,7 +1028835,7 @@ index 000000000..93961824a +} 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 000000000..9959c2c50 +index 000000000000..9959c2c50141 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_priv.h @@ -0,0 +1,432 @@ @@ -1029273,7 +1029273,7 @@ index 000000000..9959c2c50 +#endif /* __DHD_LINUX_PRIV_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sched.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sched.c new file mode 100755 -index 000000000..7980b02c6 +index 000000000000..7980b02c65ab --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sched.c @@ -0,0 +1,52 @@ @@ -1029331,7 +1029331,7 @@ index 000000000..7980b02c6 +} 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 000000000..26c66add8 +index 000000000000..26c66add8aa3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.c @@ -0,0 +1,397 @@ @@ -1029734,7 +1029734,7 @@ index 000000000..26c66add8 +} 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 000000000..f6c77c4b3 +index 000000000000..f6c77c4b30b0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.h @@ -0,0 +1,93 @@ @@ -1029833,7 +1029833,7 @@ index 000000000..f6c77c4b3 +#endif /* _dhd_linux_wq_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.c new file mode 100755 -index 000000000..713422a71 +index 000000000000..713422a713cc --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.c @@ -0,0 +1,789 @@ @@ -1030628,7 +1030628,7 @@ index 000000000..713422a71 +#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 000000000..4645ccb89 +index 000000000000..4645ccb890ab --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.h @@ -0,0 +1,40 @@ @@ -1030674,7 +1030674,7 @@ index 000000000..4645ccb89 +#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 000000000..ab8c9b399 +index 000000000000..ab8c9b399308 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_msgbuf.c @@ -0,0 +1,11162 @@ @@ -1041842,7 +1041842,7 @@ index 000000000..ab8c9b399 +#endif /* DHD_MAP_LOGGING */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.c new file mode 100755 -index 000000000..45dd0e66e +index 000000000000..45dd0e66ea04 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.c @@ -0,0 +1,11618 @@ @@ -1053466,7 +1053466,7 @@ index 000000000..45dd0e66e +} 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 000000000..9fe53dcf0 +index 000000000000..9fe53dcf0b02 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.h @@ -0,0 +1,596 @@ @@ -1054068,7 +1054068,7 @@ index 000000000..9fe53dcf0 +#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 000000000..3fb799247 +index 000000000000..3fb799247421 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie_linux.c @@ -0,0 +1,2738 @@ @@ -1056812,7 +1056812,7 @@ index 000000000..3fb799247 +EXPORT_SYMBOL(dhd_bus_check_driver_up); diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.c new file mode 100755 -index 000000000..005c03e3d +index 000000000000..005c03e3d181 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.c @@ -0,0 +1,4458 @@ @@ -1061276,7 +1061276,7 @@ index 000000000..005c03e3d +#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 000000000..903a73255 +index 000000000000..903a732554c0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.h @@ -0,0 +1,590 @@ @@ -1061872,7 +1061872,7 @@ index 000000000..903a73255 +#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 000000000..b83c1bdc0 +index 000000000000..b83c1bdc0b83 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_proto.h @@ -0,0 +1,243 @@ @@ -1062121,7 +1062121,7 @@ index 000000000..b83c1bdc0 +#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 000000000..49e367890 +index 000000000000..49e367890f47 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.c @@ -0,0 +1,4103 @@ @@ -1066230,7 +1066230,7 @@ index 000000000..49e367890 +} 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 000000000..d0c6af209 +index 000000000000..d0c6af209db6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.h @@ -0,0 +1,537 @@ @@ -1066773,7 +1066773,7 @@ index 000000000..d0c6af209 +#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 000000000..3638be21d +index 000000000000..3638be21d754 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_sdio.c @@ -0,0 +1,10489 @@ @@ -1077269,7 +1077269,7 @@ index 000000000..3638be21d \ No newline at end of file diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_static_buf.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_static_buf.c new file mode 100755 -index 000000000..2df6b62cd +index 000000000000..2df6b62cd6b2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_static_buf.c @@ -0,0 +1,586 @@ @@ -1077861,7 +1077861,7 @@ index 000000000..2df6b62cd +module_exit(dhd_static_buf_exit); diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.c new file mode 100755 -index 000000000..bafcb0b5c +index 000000000000..bafcb0b5c7e4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.c @@ -0,0 +1,4616 @@ @@ -1082483,7 +1082483,7 @@ index 000000000..bafcb0b5c +#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 000000000..b8ee0f14e +index 000000000000..b8ee0f14efe2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.h @@ -0,0 +1,796 @@ @@ -1083285,7 +1083285,7 @@ index 000000000..b8ee0f14e +#endif /* __wlfc_host_driver_definitions_h__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_stats.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_stats.h new file mode 100755 -index 000000000..5bd8e4613 +index 000000000000..5bd8e4613da0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_stats.h @@ -0,0 +1,387 @@ @@ -1083678,7 +1083678,7 @@ index 000000000..5bd8e4613 +#endif /* _dngl_stats_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_wlhdr.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_wlhdr.h new file mode 100755 -index 000000000..d71ebb65d +index 000000000000..d71ebb65d63d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_wlhdr.h @@ -0,0 +1,44 @@ @@ -1083728,7 +1083728,7 @@ index 000000000..d71ebb65d +#endif /* _dngl_wlhdr_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.c new file mode 100755 -index 000000000..fa9ff43e5 +index 000000000000..fa9ff43e5c2c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.c @@ -0,0 +1,113 @@ @@ -1083847,7 +1083847,7 @@ index 000000000..fa9ff43e5 +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.h new file mode 100755 -index 000000000..57c149dfd +index 000000000000..57c149dfdff3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.h @@ -0,0 +1,39 @@ @@ -1083892,7 +1083892,7 @@ index 000000000..57c149dfd +#endif /* __FRAG_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hdf_public_ap6275s.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hdf_public_ap6275s.h new file mode 100755 -index 000000000..5daf2bfb6 +index 000000000000..5daf2bfb6c49 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hdf_public_ap6275s.h @@ -0,0 +1,125 @@ @@ -1084023,7 +1084023,7 @@ index 000000000..5daf2bfb6 +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktpool.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktpool.c new file mode 100755 -index 000000000..09c2520b8 +index 000000000000..09c2520b8fec --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktpool.c @@ -0,0 +1,1428 @@ @@ -1085457,7 +1085457,7 @@ index 000000000..09c2520b8 +#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 000000000..f4768ff69 +index 000000000000..f4768ff69096 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktq.c @@ -0,0 +1,1429 @@ @@ -1086892,7 +1086892,7 @@ index 000000000..f4768ff69 +#endif /* HND_PKTQ_THREAD_SAFE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndlhl.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndlhl.c new file mode 100755 -index 000000000..fd229c2f5 +index 000000000000..fd229c2f585b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndlhl.c @@ -0,0 +1,538 @@ @@ -1087436,7 +1087436,7 @@ index 000000000..fd229c2f5 +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndmem.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndmem.c new file mode 100755 -index 000000000..fde6108c5 +index 000000000000..fde6108c50e2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndmem.c @@ -0,0 +1,430 @@ @@ -1087872,7 +1087872,7 @@ index 000000000..fde6108c5 +} 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 000000000..cb8294f25 +index 000000000000..cb8294f25274 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndpmu.c @@ -0,0 +1,789 @@ @@ -1088667,7 +1088667,7 @@ index 000000000..cb8294f25 +#endif /* BCMPMU_STATS */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11.h new file mode 100755 -index 000000000..cd46e747c +index 000000000000..cd46e747cc8b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11.h @@ -0,0 +1,5364 @@ @@ -1094037,7 +1094037,7 @@ index 000000000..cd46e747c +#endif /* _802_11_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11e.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11e.h new file mode 100755 -index 000000000..7b1414961 +index 000000000000..7b1414961ee1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11e.h @@ -0,0 +1,140 @@ @@ -1094183,7 +1094183,7 @@ index 000000000..7b1414961 +#endif /* _802_11e_CAC_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11s.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11s.h new file mode 100755 -index 000000000..91ca2f3b1 +index 000000000000..91ca2f3b1ce4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11s.h @@ -0,0 +1,335 @@ @@ -1094524,7 +1094524,7 @@ index 000000000..91ca2f3b1 +#endif /* #ifndef _802_11s_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.1d.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.1d.h new file mode 100755 -index 000000000..06364be73 +index 000000000000..06364be73fa8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.1d.h @@ -0,0 +1,54 @@ @@ -1094584,7 +1094584,7 @@ index 000000000..06364be73 +#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 000000000..496ca3a37 +index 000000000000..496ca3a3795e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.3.h @@ -0,0 +1,56 @@ @@ -1094646,7 +1094646,7 @@ index 000000000..496ca3a37 +#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 000000000..8c826062d +index 000000000000..8c826062d436 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/aidmp.h @@ -0,0 +1,430 @@ @@ -1095082,7 +1095082,7 @@ index 000000000..8c826062d +#endif /* _AIDMP_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_cfg.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_cfg.h new file mode 100755 -index 000000000..63c72e481 +index 000000000000..63c72e481fe8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_cfg.h @@ -0,0 +1,33 @@ @@ -1095121,7 +1095121,7 @@ index 000000000..63c72e481 +#endif /* _bcm_cfg_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_mpool_pub.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_mpool_pub.h new file mode 100755 -index 000000000..347d53a86 +index 000000000000..347d53a862d2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_mpool_pub.h @@ -0,0 +1,351 @@ @@ -1095478,7 +1095478,7 @@ index 000000000..347d53a86 +#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 000000000..978e5dd2f +index 000000000000..978e5dd2f554 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_ring.h @@ -0,0 +1,614 @@ @@ -1096098,7 +1096098,7 @@ index 000000000..978e5dd2f +#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 000000000..f0fc3e32f +index 000000000000..f0fc3e32fda9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmarp.h @@ -0,0 +1,91 @@ @@ -1096195,7 +1096195,7 @@ index 000000000..f0fc3e32f +#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 000000000..cb572307e +index 000000000000..cb572307e126 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmbloom.h @@ -0,0 +1,80 @@ @@ -1096281,7 +1096281,7 @@ index 000000000..cb572307e +#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 000000000..e88366426 +index 000000000000..e88366426909 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmcdc.h @@ -0,0 +1,122 @@ @@ -1096409,7 +1096409,7 @@ index 000000000..e88366426 +#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 000000000..393ec7d10 +index 000000000000..393ec7d10e12 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdefs.h @@ -0,0 +1,616 @@ @@ -1097031,7 +1097031,7 @@ index 000000000..393ec7d10 +#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 000000000..afc6b54d9 +index 000000000000..afc6b54d9e0b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdevs.h @@ -0,0 +1,945 @@ @@ -1097982,7 +1097982,7 @@ index 000000000..afc6b54d9 +#endif /* _BCMDEVS_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdhcp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdhcp.h new file mode 100755 -index 000000000..da46d1a71 +index 000000000000..da46d1a717b5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdhcp.h @@ -0,0 +1,93 @@ @@ -1098081,7 +1098081,7 @@ index 000000000..da46d1a71 +#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 000000000..7eecf9f16 +index 000000000000..7eecf9f16115 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmendian.h @@ -0,0 +1,417 @@ @@ -1098504,7 +1098504,7 @@ index 000000000..7eecf9f16 +#endif /* !_BCMENDIAN_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmeth.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmeth.h new file mode 100755 -index 000000000..4ac3c376c +index 000000000000..4ac3c376ca98 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmeth.h @@ -0,0 +1,116 @@ @@ -1098626,7 +1098626,7 @@ index 000000000..4ac3c376c +#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 000000000..fc47263e8 +index 000000000000..fc47263e81e2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmevent.h @@ -0,0 +1,1297 @@ @@ -1099929,7 +1099929,7 @@ index 000000000..fc47263e8 +#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 000000000..472ec7223 +index 000000000000..472ec722339b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmicmp.h @@ -0,0 +1,90 @@ @@ -1100025,7 +1100025,7 @@ index 000000000..472ec7223 +#endif /* #ifndef _bcmicmp_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmiov.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmiov.h new file mode 100755 -index 000000000..42633f8c7 +index 000000000000..42633f8c7d32 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmiov.h @@ -0,0 +1,357 @@ @@ -1100388,7 +1100388,7 @@ index 000000000..42633f8c7 +#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 000000000..cec5b903c +index 000000000000..cec5b903c6f4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmip.h @@ -0,0 +1,251 @@ @@ -1100645,7 +1100645,7 @@ index 000000000..cec5b903c +#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 000000000..88cac9009 +index 000000000000..88cac9009183 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmipv6.h @@ -0,0 +1,162 @@ @@ -1100813,7 +1100813,7 @@ index 000000000..88cac9009 +#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 000000000..4215d3298 +index 000000000000..4215d3298c21 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmmsgbuf.h @@ -0,0 +1,1395 @@ @@ -1102214,7 +1102214,7 @@ index 000000000..4215d3298 +#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 000000000..988ac4813 +index 000000000000..988ac4813a5f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmnvram.h @@ -0,0 +1,329 @@ @@ -1102549,7 +1102549,7 @@ index 000000000..988ac4813 +#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 000000000..8f80018ac +index 000000000000..8f80018ac9dd --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcie.h @@ -0,0 +1,537 @@ @@ -1103092,7 +1103092,7 @@ index 000000000..8f80018ac +#endif /* _bcmpcie_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcispi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcispi.h new file mode 100755 -index 000000000..6308a3aaf +index 000000000000..6308a3aaf7f5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcispi.h @@ -0,0 +1,182 @@ @@ -1103280,7 +1103280,7 @@ index 000000000..6308a3aaf +#endif /* _BCM_PCI_SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmperf.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmperf.h new file mode 100755 -index 000000000..8ac9001f5 +index 000000000000..8ac9001f55eb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmperf.h @@ -0,0 +1,40 @@ @@ -1103326,7 +1103326,7 @@ index 000000000..8ac9001f5 +#endif /* _BCMPERF_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdbus.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdbus.h new file mode 100755 -index 000000000..b9759b9b1 +index 000000000000..b9759b9b186e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdbus.h @@ -0,0 +1,184 @@ @@ -1103516,7 +1103516,7 @@ index 000000000..b9759b9b1 +#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 000000000..b2300ec63 +index 000000000000..b2300ec635c6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh.h @@ -0,0 +1,279 @@ @@ -1103801,7 +1103801,7 @@ index 000000000..b2300ec63 +#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 000000000..4e3c72d19 +index 000000000000..4e3c72d194ce --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh_sdmmc.h @@ -0,0 +1,130 @@ @@ -1103937,7 +1103937,7 @@ index 000000000..4e3c72d19 +#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 000000000..09a81c243 +index 000000000000..09a81c24398f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdpcm.h @@ -0,0 +1,310 @@ @@ -1104253,7 +1104253,7 @@ index 000000000..09a81c243 +#endif /* _bcmsdpcm_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdspi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdspi.h new file mode 100755 -index 000000000..2d299a140 +index 000000000000..2d299a140cb3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdspi.h @@ -0,0 +1,139 @@ @@ -1104398,7 +1104398,7 @@ index 000000000..2d299a140 +#endif /* _BCM_SD_SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdstd.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdstd.h new file mode 100755 -index 000000000..5132d4340 +index 000000000000..5132d4340ecd --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdstd.h @@ -0,0 +1,282 @@ @@ -1104686,7 +1104686,7 @@ index 000000000..5132d4340 +#endif /* _BCM_SD_STD_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspi.h new file mode 100755 -index 000000000..6f71ddc95 +index 000000000000..6f71ddc9519e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspi.h @@ -0,0 +1,44 @@ @@ -1104736,7 +1104736,7 @@ index 000000000..6f71ddc95 +#endif /* _BCM_SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspibrcm.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspibrcm.h new file mode 100755 -index 000000000..2d9f97249 +index 000000000000..2d9f972496c3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspibrcm.h @@ -0,0 +1,168 @@ @@ -1104910,7 +1104910,7 @@ index 000000000..2d9f97249 +#endif /* _BCM_SPI_BRCM_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_fmt.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_fmt.h new file mode 100755 -index 000000000..e1bd05548 +index 000000000000..e1bd05548c1f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_fmt.h @@ -0,0 +1,1014 @@ @@ -1105930,7 +1105930,7 @@ index 000000000..e1bd05548 +#endif /* _bcmsrom_fmt_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_tbl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_tbl.h new file mode 100755 -index 000000000..aa72338de +index 000000000000..aa72338de34f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_tbl.h @@ -0,0 +1,1459 @@ @@ -1107395,7 +1107395,7 @@ index 000000000..aa72338de +#endif /* _bcmsrom_tbl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmstdlib_s.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmstdlib_s.h new file mode 100755 -index 000000000..b80b3195f +index 000000000000..b80b3195fda5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmstdlib_s.h @@ -0,0 +1,52 @@ @@ -1107453,7 +1107453,7 @@ index 000000000..b80b3195f +#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 000000000..6803cad80 +index 000000000000..6803cad809c3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtcp.h @@ -0,0 +1,93 @@ @@ -1107552,7 +1107552,7 @@ index 000000000..6803cad80 +#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 000000000..279840e41 +index 000000000000..279840e41a35 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtlv.h @@ -0,0 +1,343 @@ @@ -1107901,7 +1107901,7 @@ index 000000000..279840e41 +#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 000000000..397bc5985 +index 000000000000..397bc5985e25 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmudp.h @@ -0,0 +1,61 @@ @@ -1107968,7 +1107968,7 @@ index 000000000..397bc5985 +#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 000000000..c779ea07e +index 000000000000..c779ea07ea2d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmutils.h @@ -0,0 +1,1342 @@ @@ -1109316,7 +1109316,7 @@ index 000000000..c779ea07e +#endif /* _bcmutils_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/brcm_nl80211.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/brcm_nl80211.h new file mode 100755 -index 000000000..0e0aa766a +index 000000000000..0e0aa766a678 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/brcm_nl80211.h @@ -0,0 +1,73 @@ @@ -1109395,7 +1109395,7 @@ index 000000000..0e0aa766a +#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 000000000..e4b87288b +index 000000000000..e4b87288b3d6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dbus.h @@ -0,0 +1,599 @@ @@ -1110000,7 +1110000,7 @@ index 000000000..e4b87288b +#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 000000000..785b44011 +index 000000000000..785b440116cc --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhd_daemon.h @@ -0,0 +1,67 @@ @@ -1110073,7 +1110073,7 @@ index 000000000..785b44011 +#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 000000000..f7012a0f5 +index 000000000000..f7012a0f5115 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhdioctl.h @@ -0,0 +1,278 @@ @@ -1110357,7 +1110357,7 @@ index 000000000..f7012a0f5 +#endif /* _dhdioctl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglevent.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglevent.h new file mode 100755 -index 000000000..ec2cbbaf0 +index 000000000000..ec2cbbaf0b1f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglevent.h @@ -0,0 +1,142 @@ @@ -1110505,7 +1110505,7 @@ index 000000000..ec2cbbaf0 +#endif /* _DNGLEVENT_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/eapol.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/eapol.h new file mode 100755 -index 000000000..08a296828 +index 000000000000..08a296828189 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/eapol.h @@ -0,0 +1,283 @@ @@ -1110794,7 +1110794,7 @@ index 000000000..08a296828 +#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 000000000..23f8d3243 +index 000000000000..23f8d324361b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/epivers.h @@ -0,0 +1,52 @@ @@ -1110852,7 +1110852,7 @@ index 000000000..23f8d3243 +#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 000000000..a2181daf5 +index 000000000000..a2181daf525e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/etd.h @@ -0,0 +1,626 @@ @@ -1111484,7 +1111484,7 @@ index 000000000..a2181daf5 +#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 000000000..41c9b62b0 +index 000000000000..41c9b62b0d5c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/ethernet.h @@ -0,0 +1,225 @@ @@ -1111715,7 +1111715,7 @@ index 000000000..41c9b62b0 +#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 000000000..e43715d72 +index 000000000000..e43715d72646 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log.h @@ -0,0 +1,423 @@ @@ -1112144,7 +1112144,7 @@ index 000000000..e43715d72 +#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 000000000..fc110219e +index 000000000000..fc110219ec75 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_payload.h @@ -0,0 +1,1017 @@ @@ -1113167,7 +1113167,7 @@ index 000000000..fc110219e +#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 000000000..47c991c20 +index 000000000000..47c991c20019 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_set.h @@ -0,0 +1,124 @@ @@ -1113297,7 +1113297,7 @@ index 000000000..47c991c20 +#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 000000000..144ed7275 +index 000000000000..144ed7275932 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_tag.h @@ -0,0 +1,479 @@ @@ -1113782,7 +1113782,7 @@ index 000000000..144ed7275 +#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 000000000..0c6fc6b26 +index 000000000000..0c6fc6b262a0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_trace.h @@ -0,0 +1,124 @@ @@ -1113912,7 +1113912,7 @@ index 000000000..0c6fc6b26 +#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 000000000..1d3c8e0b5 +index 000000000000..1d3c8e0b52a8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/fils.h @@ -0,0 +1,295 @@ @@ -1114213,7 +1114213,7 @@ index 000000000..1d3c8e0b5 +#endif /* __FILSAUTH_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_armtrap.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_armtrap.h new file mode 100755 -index 000000000..177ef5314 +index 000000000000..177ef53141fe --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_armtrap.h @@ -0,0 +1,90 @@ @@ -1114309,7 +1114309,7 @@ index 000000000..177ef5314 +#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 000000000..81a699d8b +index 000000000000..81a699d8b5de --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_cons.h @@ -0,0 +1,87 @@ @@ -1114402,7 +1114402,7 @@ index 000000000..81a699d8b +#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 000000000..b8dca36b8 +index 000000000000..b8dca36b84c6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_debug.h @@ -0,0 +1,169 @@ @@ -1114577,7 +1114577,7 @@ index 000000000..b8dca36b8 +#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 000000000..57f222967 +index 000000000000..57f222967488 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktpool.h @@ -0,0 +1,244 @@ @@ -1114827,7 +1114827,7 @@ index 000000000..57f222967 +#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 000000000..824bbc142 +index 000000000000..824bbc1420d9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktq.h @@ -0,0 +1,326 @@ @@ -1115159,7 +1115159,7 @@ index 000000000..824bbc142 +#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 000000000..caf006ee2 +index 000000000000..caf006ee26d9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_trap.h @@ -0,0 +1,40 @@ @@ -1115205,7 +1115205,7 @@ index 000000000..caf006ee2 +#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 000000000..be9a2e65c +index 000000000000..be9a2e65cb55 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndchipc.h @@ -0,0 +1,54 @@ @@ -1115265,7 +1115265,7 @@ index 000000000..be9a2e65c +#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 000000000..c6794464e +index 000000000000..c6794464ebe7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndlhl.h @@ -0,0 +1,62 @@ @@ -1115333,7 +1115333,7 @@ index 000000000..c6794464e +#endif /* _hndlhl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndmem.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndmem.h new file mode 100755 -index 000000000..de348e7d3 +index 000000000000..de348e7d3c45 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndmem.h @@ -0,0 +1,81 @@ @@ -1115420,7 +1115420,7 @@ index 000000000..de348e7d3 +#endif /* _HNDMEM_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndoobr.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndoobr.h new file mode 100755 -index 000000000..88e2952cf +index 000000000000..88e2952cf7c5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndoobr.h @@ -0,0 +1,76 @@ @@ -1115502,7 +1115502,7 @@ index 000000000..88e2952cf +#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 000000000..df3b31bf4 +index 000000000000..df3b31bf46ee --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndpmu.h @@ -0,0 +1,80 @@ @@ -1115588,7 +1115588,7 @@ index 000000000..df3b31bf4 +#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 000000000..b4cb16001 +index 000000000000..b4cb16001b97 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndsoc.h @@ -0,0 +1,351 @@ @@ -1115945,7 +1115945,7 @@ index 000000000..b4cb16001 +#endif /* _HNDSOC_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_osl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_osl.h new file mode 100755 -index 000000000..bb9167067 +index 000000000000..bb916706702d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_osl.h @@ -0,0 +1,636 @@ @@ -1116587,7 +1116587,7 @@ index 000000000..bb9167067 +#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 000000000..30fff1847 +index 000000000000..30fff18479f3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_pkt.h @@ -0,0 +1,236 @@ @@ -1116829,7 +1116829,7 @@ index 000000000..30fff1847 +#endif /* _linux_pkt_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxver.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxver.h new file mode 100755 -index 000000000..32ad78f6c +index 000000000000..32ad78f6c932 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxver.h @@ -0,0 +1,900 @@ @@ -1117735,7 +1117735,7 @@ index 000000000..32ad78f6c +#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 000000000..ed0ff7825 +index 000000000000..ed0ff7825b08 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/lpflags.h @@ -0,0 +1,46 @@ @@ -1117787,7 +1117787,7 @@ index 000000000..ed0ff7825 +#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 000000000..eef005063 +index 000000000000..eef005063065 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/mbo.h @@ -0,0 +1,286 @@ @@ -1118079,7 +1118079,7 @@ index 000000000..eef005063 +#endif /* __MBO_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/miniopt.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/miniopt.h new file mode 100755 -index 000000000..1c1d8e9e2 +index 000000000000..1c1d8e9e2004 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/miniopt.h @@ -0,0 +1,80 @@ @@ -1118165,7 +1118165,7 @@ index 000000000..1c1d8e9e2 +#endif /* MINI_OPT_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msf.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msf.h new file mode 100755 -index 000000000..5f0022e53 +index 000000000000..5f0022e53250 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msf.h @@ -0,0 +1,67 @@ @@ -1118238,7 +1118238,7 @@ index 000000000..5f0022e53 +#endif /* _WLC_MSF_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msgtrace.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msgtrace.h new file mode 100755 -index 000000000..c871c7ce6 +index 000000000000..c871c7ce620d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msgtrace.h @@ -0,0 +1,63 @@ @@ -1118307,7 +1118307,7 @@ index 000000000..c871c7ce6 +#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 000000000..bdb07f846 +index 000000000000..bdb07f8460da --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/nan.h @@ -0,0 +1,1559 @@ @@ -1119872,7 +1119872,7 @@ index 000000000..bdb07f846 +#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 000000000..2a7aec17d +index 000000000000..2a7aec17d1db --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl.h @@ -0,0 +1,378 @@ @@ -1120256,7 +1120256,7 @@ index 000000000..2a7aec17d +#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 000000000..a5643079c +index 000000000000..a5643079c831 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_decl.h @@ -0,0 +1,38 @@ @@ -1120300,7 +1120300,7 @@ index 000000000..a5643079c +#endif // endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_ext.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_ext.h new file mode 100755 -index 000000000..2c182ca29 +index 000000000000..2c182ca29bd1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_ext.h @@ -0,0 +1,766 @@ @@ -1121072,7 +1121072,7 @@ index 000000000..2c182ca29 +#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 000000000..b68d5c32e +index 000000000000..b68d5c32e466 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/p2p.h @@ -0,0 +1,702 @@ @@ -1121780,7 +1121780,7 @@ index 000000000..b68d5c32e +#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 000000000..64c7579ae +index 000000000000..64c7579ae26c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_end.h @@ -0,0 +1,60 @@ @@ -1121846,7 +1121846,7 @@ index 000000000..64c7579ae +#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 000000000..097611ed4 +index 000000000000..097611ed404a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_start.h @@ -0,0 +1,105 @@ @@ -1121957,7 +1121957,7 @@ index 000000000..097611ed4 +#endif // endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcicfg.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcicfg.h new file mode 100755 -index 000000000..c8ec32a62 +index 000000000000..c8ec32a62406 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcicfg.h @@ -0,0 +1,402 @@ @@ -1122365,7 +1122365,7 @@ index 000000000..c8ec32a62 +#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 000000000..592ad25e4 +index 000000000000..592ad25e4832 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcie_core.h @@ -0,0 +1,1193 @@ @@ -1123564,7 +1123564,7 @@ index 000000000..592ad25e4 +#endif /* _PCIE_CORE_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/rte_ioctl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/rte_ioctl.h new file mode 100755 -index 000000000..90669be87 +index 000000000000..90669be876b4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/rte_ioctl.h @@ -0,0 +1,104 @@ @@ -1123674,7 +1123674,7 @@ index 000000000..90669be87 +#endif /* _rte_ioctl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbchipc.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbchipc.h new file mode 100755 -index 000000000..f7eb1cfde +index 000000000000..f7eb1cfde400 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbchipc.h @@ -0,0 +1,4619 @@ @@ -1128299,7 +1128299,7 @@ index 000000000..f7eb1cfde +#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 000000000..b05cd510a +index 000000000000..b05cd510aa0b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbconfig.h @@ -0,0 +1,286 @@ @@ -1128591,7 +1128591,7 @@ index 000000000..b05cd510a +#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 000000000..bbf0e4337 +index 000000000000..bbf0e4337124 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbgci.h @@ -0,0 +1,274 @@ @@ -1128871,7 +1128871,7 @@ index 000000000..bbf0e4337 +#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 000000000..ee1279a4a +index 000000000000..ee1279a4a807 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhndarm.h @@ -0,0 +1,142 @@ @@ -1129019,7 +1129019,7 @@ index 000000000..ee1279a4a +#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 000000000..52a39dc6d +index 000000000000..52a39dc6d415 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhnddma.h @@ -0,0 +1,450 @@ @@ -1129475,7 +1129475,7 @@ index 000000000..52a39dc6d +#endif /* _sbhnddma_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbpcmcia.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbpcmcia.h new file mode 100755 -index 000000000..8b6c6cf45 +index 000000000000..8b6c6cf45556 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbpcmcia.h @@ -0,0 +1,138 @@ @@ -1129619,7 +1129619,7 @@ index 000000000..8b6c6cf45 +#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 000000000..ba7d66266 +index 000000000000..ba7d66266afb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdio.h @@ -0,0 +1,189 @@ @@ -1129814,7 +1129814,7 @@ index 000000000..ba7d66266 +#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 000000000..7134247e7 +index 000000000000..7134247e7cf4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdpcmdev.h @@ -0,0 +1,312 @@ @@ -1130132,7 +1130132,7 @@ index 000000000..7134247e7 +#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 000000000..5e709aa52 +index 000000000000..5e709aa52d4e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsocram.h @@ -0,0 +1,205 @@ @@ -1130343,7 +1130343,7 @@ index 000000000..5e709aa52 +#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 000000000..065b3f198 +index 000000000000..065b3f1980f6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsysmem.h @@ -0,0 +1,181 @@ @@ -1130530,7 +1130530,7 @@ index 000000000..065b3f198 +#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 000000000..844fc2780 +index 000000000000..844fc2780d5b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdio.h @@ -0,0 +1,626 @@ @@ -1131162,7 +1131162,7 @@ index 000000000..844fc2780 +#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 000000000..327d1c4d0 +index 000000000000..327d1c4d0e1f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdioh.h @@ -0,0 +1,451 @@ @@ -1131619,7 +1131619,7 @@ index 000000000..327d1c4d0 +#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 000000000..bfbe2bf94 +index 000000000000..bfbe2bf94390 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdiovar.h @@ -0,0 +1,125 @@ @@ -1131750,7 +1131750,7 @@ index 000000000..bfbe2bf94 +#endif /* _sdiovar_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdspi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdspi.h new file mode 100755 -index 000000000..d42f4c783 +index 000000000000..d42f4c783490 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdspi.h @@ -0,0 +1,79 @@ @@ -1131835,7 +1131835,7 @@ index 000000000..d42f4c783 +#endif /* _SD_SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/siutils.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/siutils.h new file mode 100755 -index 000000000..eba0d0a97 +index 000000000000..eba0d0a97c89 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/siutils.h @@ -0,0 +1,810 @@ @@ -1132651,7 +1132651,7 @@ index 000000000..eba0d0a97 +#endif /* _siutils_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/spid.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/spid.h new file mode 100755 -index 000000000..3a08b5998 +index 000000000000..3a08b59986ac --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/spid.h @@ -0,0 +1,169 @@ @@ -1132826,7 +1132826,7 @@ index 000000000..3a08b5998 +#endif /* _SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/trxhdr.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/trxhdr.h new file mode 100755 -index 000000000..b717e6201 +index 000000000000..b717e62017d9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/trxhdr.h @@ -0,0 +1,96 @@ @@ -1132928,7 +1132928,7 @@ index 000000000..b717e6201 +#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 000000000..c44600566 +index 000000000000..c446005668db --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/typedefs.h @@ -0,0 +1,368 @@ @@ -1133302,7 +1133302,7 @@ index 000000000..c44600566 +#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 000000000..f15fbd697 +index 000000000000..f15fbd697cea --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/usbrdl.h @@ -0,0 +1,135 @@ @@ -1133443,7 +1133443,7 @@ index 000000000..f15fbd697 +#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 000000000..ddc64a938 +index 000000000000..ddc64a9381cb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/vlan.h @@ -0,0 +1,98 @@ @@ -1133547,7 +1133547,7 @@ index 000000000..ddc64a938 +#endif /* _vlan_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlfc_proto.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlfc_proto.h new file mode 100755 -index 000000000..0b592c6a2 +index 000000000000..0b592c6a2bc6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlfc_proto.h @@ -0,0 +1,414 @@ @@ -1133967,7 +1133967,7 @@ index 000000000..0b592c6a2 +#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 000000000..7f14967db +index 000000000000..7f14967db99d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl.h @@ -0,0 +1,20752 @@ @@ -1154725,7 +1154725,7 @@ index 000000000..7f14967db +#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 000000000..100b83628 +index 000000000000..100b836284ce --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_defs.h @@ -0,0 +1,2466 @@ @@ -1157197,7 +1157197,7 @@ index 000000000..100b83628 +#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 000000000..6dee521a3 +index 000000000000..6dee521a3853 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_utils.h @@ -0,0 +1,62 @@ @@ -1157265,7 +1157265,7 @@ index 000000000..6dee521a3 +#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 000000000..d618ea91b +index 000000000000..d618ea91b1ee --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wpa.h @@ -0,0 +1,312 @@ @@ -1157583,7 +1157583,7 @@ index 000000000..d618ea91b +#endif /* _proto_wpa_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wps.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wps.h new file mode 100755 -index 000000000..c2ebace54 +index 000000000000..c2ebace54013 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wps.h @@ -0,0 +1,386 @@ @@ -1157975,7 +1157975,7 @@ index 000000000..c2ebace54 +#endif /* _WPS_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl.c new file mode 100755 -index 000000000..321ee05c4 +index 000000000000..321ee05c4ccb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl.c @@ -0,0 +1,2124 @@ @@ -1160106,7 +1160106,7 @@ index 000000000..321ee05c4 \ No newline at end of file diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl_priv.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl_priv.h new file mode 100755 -index 000000000..f56f292c0 +index 000000000000..f56f292c0ecf --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl_priv.h @@ -0,0 +1,185 @@ @@ -1160297,7 +1160297,7 @@ index 000000000..f56f292c0 +#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 000000000..e66ea740c +index 000000000000..e66ea740c092 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_pkt.c @@ -0,0 +1,694 @@ @@ -1160997,7 +1160997,7 @@ index 000000000..e66ea740c +#endif /* LINUX_VERSION >= 3.6.0 && TSQ_MULTIPLIER */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/otpdefs.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/otpdefs.h new file mode 100755 -index 000000000..542e5a90b +index 000000000000..542e5a90b3f3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/otpdefs.h @@ -0,0 +1,122 @@ @@ -1161125,7 +1161125,7 @@ index 000000000..542e5a90b +#endif /* _OTPDEFS_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/pcie_core.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/pcie_core.c new file mode 100755 -index 000000000..dd54c675a +index 000000000000..dd54c675a180 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/pcie_core.c @@ -0,0 +1,159 @@ @@ -1161290,7 +1161290,7 @@ index 000000000..dd54c675a +#endif /* BCMDRIVER */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/sbutils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/sbutils.c new file mode 100755 -index 000000000..bd22c9aab +index 000000000000..bd22c9aab076 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/sbutils.c @@ -0,0 +1,1094 @@ @@ -1162390,7 +1162390,7 @@ index 000000000..bd22c9aab +#endif // endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils.c new file mode 100755 -index 000000000..1f9cc39d1 +index 000000000000..1f9cc39d17a4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils.c @@ -0,0 +1,3801 @@ @@ -1166197,7 +1166197,7 @@ index 000000000..1f9cc39d1 +} 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 000000000..1686e8882 +index 000000000000..1686e888248d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils_priv.h @@ -0,0 +1,356 @@ @@ -1166559,7 +1166559,7 @@ index 000000000..1686e8882 +#endif /* _siutils_priv_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.c new file mode 100755 -index 000000000..f1ca3f227 +index 000000000000..f1ca3f2270c9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.c @@ -0,0 +1,6644 @@ @@ -1173209,7 +1173209,7 @@ index 000000000..f1ca3f227 +#endif /* WL_STATIC_IF */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.h new file mode 100755 -index 000000000..46af4b736 +index 000000000000..46af4b736f77 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.h @@ -0,0 +1,420 @@ @@ -1173635,7 +1173635,7 @@ index 000000000..46af4b736 +#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 000000000..dd9784bc0 +index 000000000000..dd9784bc0733 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android_ext.c @@ -0,0 +1,7974 @@ @@ -1181615,7 +1181615,7 @@ index 000000000..dd9784bc0 + 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 000000000..1534f3919 +index 000000000000..1534f3919a3e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.c @@ -0,0 +1,25039 @@ @@ -1206660,7 +1206660,7 @@ index 000000000..1534f3919 +} 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 000000000..39e827d8b +index 000000000000..39e827d8b887 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.h @@ -0,0 +1,2451 @@ @@ -1209117,7 +1209117,7 @@ index 000000000..39e827d8b +#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 000000000..4780d116e +index 000000000000..4780d116e5fe --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg_btcoex.c @@ -0,0 +1,569 @@ @@ -1209692,7 +1209692,7 @@ index 000000000..4780d116e +} 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 000000000..70a2022b0 +index 000000000000..70a2022b0c9f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.c @@ -0,0 +1,8182 @@ @@ -1217880,7 +1217880,7 @@ index 000000000..70a2022b0 +#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 000000000..6eca82b80 +index 000000000000..6eca82b8067c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.h @@ -0,0 +1,899 @@ @@ -1218785,7 +1218785,7 @@ index 000000000..6eca82b80 +#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 000000000..673566e4a +index 000000000000..673566e4a696 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.c @@ -0,0 +1,2792 @@ @@ -1221583,7 +1221583,7 @@ index 000000000..673566e4a +} 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 000000000..e47f8af9b +index 000000000000..e47f8af9b4d6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.h @@ -0,0 +1,458 @@ @@ -1222047,7 +1222047,7 @@ index 000000000..e47f8af9b +#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 000000000..6de12e143 +index 000000000000..6de12e1432d7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.c @@ -0,0 +1,3348 @@ @@ -1225401,7 +1225401,7 @@ index 000000000..6de12e143 +} 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 000000000..ddd133514 +index 000000000000..ddd133514b6f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.h @@ -0,0 +1,101 @@ @@ -1225508,7 +1225508,7 @@ index 000000000..ddd133514 +#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 000000000..b2f6cb508 +index 000000000000..b2f6cb5087d0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.c @@ -0,0 +1,8751 @@ @@ -1234265,7 +1234265,7 @@ index 000000000..b2f6cb508 +#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(3, 13, 0)) || defined(WL_VENDOR_EXT_SUPPORT) */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.h new file mode 100755 -index 000000000..b70aa354d +index 000000000000..b70aa354dad3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.h @@ -0,0 +1,721 @@ @@ -1234992,7 +1234992,7 @@ index 000000000..b70aa354d +#endif /* _wl_cfgvendor_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_dbg.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_dbg.h new file mode 100755 -index 000000000..640907ea8 +index 000000000000..640907ea81ff --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_dbg.h @@ -0,0 +1,381 @@ @@ -1235379,7 +1235379,7 @@ index 000000000..640907ea8 +#endif /* _wl_dbg_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.c new file mode 100755 -index 000000000..9403d0600 +index 000000000000..9403d0600998 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.c @@ -0,0 +1,1692 @@ @@ -1237077,7 +1237077,7 @@ index 000000000..9403d0600 + 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 000000000..7e4241eae +index 000000000000..7e4241eae508 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.h @@ -0,0 +1,78 @@ @@ -1237161,7 +1237161,7 @@ index 000000000..7e4241eae + 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 000000000..fd2cb3cd0 +index 000000000000..fd2cb3cd0eee --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_event.c @@ -0,0 +1,506 @@ @@ -1237673,7 +1237673,7 @@ index 000000000..fd2cb3cd0 +#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 000000000..316f9ea6c +index 000000000000..316f9ea6cbf2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_ext_genl.c @@ -0,0 +1,569 @@ @@ -1238248,7 +1238248,7 @@ index 000000000..316f9ea6c + 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 000000000..3eee7339f +index 000000000000..3eee7339f455 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.c @@ -0,0 +1,4342 @@ @@ -1242596,7 +1242596,7 @@ index 000000000..3eee7339f +#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 000000000..ba2cae8bd +index 000000000000..ba2cae8bd7c6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.h @@ -0,0 +1,178 @@ @@ -1242780,7 +1242780,7 @@ index 000000000..ba2cae8bd +#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 000000000..920eb42db +index 000000000000..920eb42dba27 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_linux_mon.c @@ -0,0 +1,474 @@ @@ -1243260,7 +1243260,7 @@ index 000000000..920eb42db +} 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 000000000..a7d49bddc +index 000000000000..a7d49bddc3e6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_roam.c @@ -0,0 +1,375 @@ @@ -1243641,7 +1243641,7 @@ index 000000000..a7d49bddc +#endif /* ESCAN_CHANNEL_CACHE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.c new file mode 100755 -index 000000000..4a1aae731 +index 000000000000..4a1aae7316e0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.c @@ -0,0 +1,535 @@ @@ -1244182,7 +1244182,7 @@ index 000000000..4a1aae731 +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.h new file mode 100755 -index 000000000..772152e79 +index 000000000000..772152e79070 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.h @@ -0,0 +1,135 @@ @@ -1244323,7 +1244323,7 @@ index 000000000..772152e79 +#endif /* __WLDEV_COMMON_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c b/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c new file mode 100755 -index 000000000..82799df98 +index 000000000000..82799df987e8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c @@ -0,0 +1,30 @@ @@ -1244358,7 +1244358,7 @@ index 000000000..82799df98 +EXPORT_SYMBOL(rkwifi_set_firmware); +MODULE_LICENSE("GPL"); diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c -index 1505c7451..b9ed2b7e4 100644 +index 1505c745154e..b9ed2b7e4e0f 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -1668,7 +1668,11 @@ static void __exit nvmem_exit(void) @@ -1244374,7 +1244374,7 @@ index 1505c7451..b9ed2b7e4 100644 MODULE_AUTHOR("Srinivas Kandagatla "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/pinctrl/pinctrl-rk805.c b/drivers/pinctrl/pinctrl-rk805.c -index c6f4229eb..46e426cf4 100644 +index c6f4229eb106..46e426cf4e20 100644 --- a/drivers/pinctrl/pinctrl-rk805.c +++ b/drivers/pinctrl/pinctrl-rk805.c @@ -78,6 +78,7 @@ struct rk805_pctrl_info { @@ -1287448,7 +1287448,7 @@ index c6f4229eb..46e426cf4 100644 MODULE_DESCRIPTION("RK805 pin control and GPIO driver"); MODULE_AUTHOR("Joseph Chen "); diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c -index 2a454098e..7af6f74df 100644 +index 2a454098eaaa..7af6f74df96a 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -16,12 +16,14 @@ @@ -1289626,7 +1289626,7 @@ index 2a454098e..7af6f74df 100644 +MODULE_DEVICE_TABLE(of, rockchip_pinctrl_dt_match); diff --git a/drivers/pinctrl/pinctrl-rockchip.h b/drivers/pinctrl/pinctrl-rockchip.h new file mode 100755 -index 000000000..cd1662db5 +index 000000000000..cd1662db5c97 --- /dev/null +++ b/drivers/pinctrl/pinctrl-rockchip.h @@ -0,0 +1,277 @@ @@ -1289909,7 +1289909,7 @@ index 000000000..cd1662db5 +#endif diff --git a/drivers/power/ec_battery.c b/drivers/power/ec_battery.c new file mode 100755 -index 000000000..9627cd1a0 +index 000000000000..9627cd1a0a11 --- /dev/null +++ b/drivers/power/ec_battery.c @@ -0,0 +1,466 @@ @@ -1290380,7 +1290380,7 @@ index 000000000..9627cd1a0 +MODULE_ALIAS("platform:ec-charger"); +MODULE_AUTHOR("Shunqing Chen"); diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c -index 1c5af2fef..c5067eb75 100644 +index 1c5af2fef142..c5067eb75370 100644 --- a/drivers/power/reset/gpio-poweroff.c +++ b/drivers/power/reset/gpio-poweroff.c @@ -90,7 +90,6 @@ static const struct of_device_id of_gpio_poweroff_match[] = { @@ -1290393,7 +1290393,7 @@ index 1c5af2fef..c5067eb75 100644 .probe = gpio_poweroff_probe, diff --git a/drivers/power/reset/reboot-mode.h b/drivers/power/reset/reboot-mode.h new file mode 100755 -index 000000000..342df786d +index 000000000000..342df786d043 --- /dev/null +++ b/drivers/power/reset/reboot-mode.h @@ -0,0 +1,7 @@ @@ -1290405,7 +1290405,7 @@ index 000000000..342df786d + +#endif diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig -index 0aa46b451..31abccec4 100644 +index 0aa46b451017..31abccec4d93 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -629,6 +629,12 @@ config CHARGER_BQ2515X @@ -1290474,7 +1290474,7 @@ index 0aa46b451..31abccec4 100644 + endif # POWER_SUPPLY diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile -index dd4b86318..eec17d90f 100644 +index dd4b86318cd9..eec17d90f846 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -83,6 +83,7 @@ obj-$(CONFIG_CHARGER_BQ24190) += bq24190_charger.o @@ -1290496,7 +1290496,7 @@ index dd4b86318..eec17d90f 100644 +obj-$(CONFIG_BATTERY_RK818) += rk818_battery.o +obj-$(CONFIG_CHARGER_RK818) += rk818_charger.o diff --git a/drivers/power/supply/ab8500_btemp.c b/drivers/power/supply/ab8500_btemp.c -index 5a1adceb6..56e6bc66a 100644 +index 5a1adceb6974..56e6bc66aa2c 100644 --- a/drivers/power/supply/ab8500_btemp.c +++ b/drivers/power/supply/ab8500_btemp.c @@ -1140,7 +1140,6 @@ static const struct of_device_id ab8500_btemp_match[] = { @@ -1290508,7 +1290508,7 @@ index 5a1adceb6..56e6bc66a 100644 static struct platform_driver ab8500_btemp_driver = { .probe = ab8500_btemp_probe, diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/ab8500_charger.c -index 3d627768a..db65be026 100644 +index 3d627768ad7b..db65be026920 100644 --- a/drivers/power/supply/ab8500_charger.c +++ b/drivers/power/supply/ab8500_charger.c @@ -413,14 +413,6 @@ static void ab8500_enable_disable_sw_fallback(struct ab8500_charger *di, @@ -1290552,7 +1290552,7 @@ index 3d627768a..db65be026 100644 static struct platform_driver ab8500_charger_driver = { .probe = ab8500_charger_probe, diff --git a/drivers/power/supply/ab8500_fg.c b/drivers/power/supply/ab8500_fg.c -index a88590563..47297c406 100644 +index a88590563647..47297c4069e6 100644 --- a/drivers/power/supply/ab8500_fg.c +++ b/drivers/power/supply/ab8500_fg.c @@ -3249,7 +3249,6 @@ static const struct of_device_id ab8500_fg_match[] = { @@ -1290564,7 +1290564,7 @@ index a88590563..47297c406 100644 static struct platform_driver ab8500_fg_driver = { .probe = ab8500_fg_probe, diff --git a/drivers/power/supply/axp288_fuel_gauge.c b/drivers/power/supply/axp288_fuel_gauge.c -index be2452915..148eb8105 100644 +index be24529157be..148eb8105803 100644 --- a/drivers/power/supply/axp288_fuel_gauge.c +++ b/drivers/power/supply/axp288_fuel_gauge.c @@ -149,7 +149,7 @@ static int fuel_gauge_reg_readb(struct axp288_fg_info *info, int reg) @@ -1290587,7 +1290587,7 @@ index be2452915..148eb8105 100644 } diff --git a/drivers/power/supply/bq25700_charger.c b/drivers/power/supply/bq25700_charger.c new file mode 100755 -index 000000000..5b2a51650 +index 000000000000..5b2a516509ed --- /dev/null +++ b/drivers/power/supply/bq25700_charger.c @@ -0,0 +1,2105 @@ @@ -1292697,7 +1292697,7 @@ index 000000000..5b2a51650 +MODULE_AUTHOR("shengfeixu "); +MODULE_DESCRIPTION("TI bq25700 Charger Driver"); diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c -index 333349275..6fcebe441 100644 +index 333349275b96..6fcebe441552 100644 --- a/drivers/power/supply/charger-manager.c +++ b/drivers/power/supply/charger-manager.c @@ -1279,7 +1279,6 @@ static const struct of_device_id charger_manager_match[] = { @@ -1292709,7 +1292709,7 @@ index 333349275..6fcebe441 100644 static struct charger_desc *of_cm_parse_desc(struct device *dev) { diff --git a/drivers/power/supply/cw2015_battery.c b/drivers/power/supply/cw2015_battery.c -index de1fa71be..0146f1bfc 100644 +index de1fa71be1e8..0146f1bfc29b 100644 --- a/drivers/power/supply/cw2015_battery.c +++ b/drivers/power/supply/cw2015_battery.c @@ -673,9 +673,7 @@ static int cw_bat_probe(struct i2c_client *client) @@ -1292724,7 +1292724,7 @@ index de1fa71be..0146f1bfc 100644 } diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c -index 76b0f45a2..fb4399a90 100644 +index 76b0f45a20b4..fb4399a90758 100644 --- a/drivers/power/supply/max17042_battery.c +++ b/drivers/power/supply/max17042_battery.c @@ -741,7 +741,7 @@ static inline void max17042_override_por_values(struct max17042_chip *chip) @@ -1292760,7 +1292760,7 @@ index 76b0f45a2..fb4399a90 100644 /* * On ACPI systems the IRQ may be handled by ACPI-event code, diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c -index 5c8c117b3..631fcaa68 100644 +index 5c8c117b396e..631fcaa68d64 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -32,6 +32,13 @@ EXPORT_SYMBOL_GPL(power_supply_notifier); @@ -1292856,7 +1292856,7 @@ index 5c8c117b3..631fcaa68 100644 { struct power_supply **psy = res; diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c -index 2b1df9c33..932b890a8 100644 +index 2b1df9c33969..932b890a8f3d 100644 --- a/drivers/power/supply/power_supply_sysfs.c +++ b/drivers/power/supply/power_supply_sysfs.c @@ -89,6 +89,7 @@ static const char * const POWER_SUPPLY_CHARGE_TYPE_TEXT[] = { @@ -1292869,7 +1292869,7 @@ index 2b1df9c33..932b890a8 100644 static const char * const POWER_SUPPLY_HEALTH_TEXT[] = { diff --git a/drivers/power/supply/rk816_battery.c b/drivers/power/supply/rk816_battery.c new file mode 100755 -index 000000000..d204a0129 +index 000000000000..d204a0129a8d --- /dev/null +++ b/drivers/power/supply/rk816_battery.c @@ -0,0 +1,5172 @@ @@ -1298047,7 +1298047,7 @@ index 000000000..d204a0129 +MODULE_AUTHOR("chenjh"); diff --git a/drivers/power/supply/rk816_battery.h b/drivers/power/supply/rk816_battery.h new file mode 100755 -index 000000000..b8b467114 +index 000000000000..b8b467114c1f --- /dev/null +++ b/drivers/power/supply/rk816_battery.h @@ -0,0 +1,286 @@ @@ -1298339,7 +1298339,7 @@ index 000000000..b8b467114 +#endif diff --git a/drivers/power/supply/rk817_battery.c b/drivers/power/supply/rk817_battery.c new file mode 100755 -index 000000000..d9003ad9e +index 000000000000..d9003ad9e534 --- /dev/null +++ b/drivers/power/supply/rk817_battery.c @@ -0,0 +1,3418 @@ @@ -1301763,7 +1301763,7 @@ index 000000000..d9003ad9e +MODULE_LICENSE("GPL"); diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c new file mode 100755 -index 000000000..b7e4f7627 +index 000000000000..b7e4f7627bdb --- /dev/null +++ b/drivers/power/supply/rk817_charger.c @@ -0,0 +1,1798 @@ @@ -1303567,7 +1303567,7 @@ index 000000000..b7e4f7627 +MODULE_LICENSE("GPL"); diff --git a/drivers/power/supply/rk818_battery.c b/drivers/power/supply/rk818_battery.c new file mode 100755 -index 000000000..90ff1fac1 +index 000000000000..90ff1fac163c --- /dev/null +++ b/drivers/power/supply/rk818_battery.c @@ -0,0 +1,3622 @@ @@ -1307195,7 +1307195,7 @@ index 000000000..90ff1fac1 +MODULE_AUTHOR("chenjh"); diff --git a/drivers/power/supply/rk818_battery.h b/drivers/power/supply/rk818_battery.h new file mode 100755 -index 000000000..66cbbe9da +index 000000000000..66cbbe9dac4c --- /dev/null +++ b/drivers/power/supply/rk818_battery.h @@ -0,0 +1,168 @@ @@ -1307369,7 +1307369,7 @@ index 000000000..66cbbe9da +#endif diff --git a/drivers/power/supply/rk818_charger.c b/drivers/power/supply/rk818_charger.c new file mode 100755 -index 000000000..56961effd +index 000000000000..56961effd13c --- /dev/null +++ b/drivers/power/supply/rk818_charger.c @@ -0,0 +1,1889 @@ @@ -1309263,7 +1309263,7 @@ index 000000000..56961effd +MODULE_ALIAS("platform:rk818-charger"); +MODULE_AUTHOR("chenjh"); diff --git a/drivers/power/supply/rt5033_battery.c b/drivers/power/supply/rt5033_battery.c -index 7a23c70f4..11768892d 100644 +index 7a23c70f4879..11768892d078 100644 --- a/drivers/power/supply/rt5033_battery.c +++ b/drivers/power/supply/rt5033_battery.c @@ -164,16 +164,9 @@ static const struct i2c_device_id rt5033_battery_id[] = { @@ -1309284,7 +1309284,7 @@ index 7a23c70f4..11768892d 100644 .probe = rt5033_battery_probe, .remove = rt5033_battery_remove, diff --git a/drivers/power/supply/sc2731_charger.c b/drivers/power/supply/sc2731_charger.c -index 288b79836..335cb857e 100644 +index 288b79836c13..335cb857ef30 100644 --- a/drivers/power/supply/sc2731_charger.c +++ b/drivers/power/supply/sc2731_charger.c @@ -524,7 +524,6 @@ static const struct of_device_id sc2731_charger_of_match[] = { @@ -1309296,7 +1309296,7 @@ index 288b79836..335cb857e 100644 static struct platform_driver sc2731_charger_driver = { .driver = { diff --git a/drivers/power/supply/sc27xx_fuel_gauge.c b/drivers/power/supply/sc27xx_fuel_gauge.c -index 3bf4b2639..ad2265834 100644 +index 3bf4b263950d..ad2265834314 100644 --- a/drivers/power/supply/sc27xx_fuel_gauge.c +++ b/drivers/power/supply/sc27xx_fuel_gauge.c @@ -1335,7 +1335,6 @@ static const struct of_device_id sc27xx_fgu_of_match[] = { @@ -1309308,7 +1309308,7 @@ index 3bf4b2639..ad2265834 100644 static struct platform_driver sc27xx_fgu_driver = { .probe = sc27xx_fgu_probe, diff --git a/drivers/power/supply/smb347-charger.c b/drivers/power/supply/smb347-charger.c -index 912e2184f..8cfbd8d6b 100644 +index 912e2184f918..8cfbd8d6b478 100644 --- a/drivers/power/supply/smb347-charger.c +++ b/drivers/power/supply/smb347-charger.c @@ -56,7 +56,6 @@ @@ -1309337,7 +1309337,7 @@ index 912e2184f..8cfbd8d6b 100644 * command register unless pin control is specified in the platform diff --git a/drivers/power/sy6982c_charger.c b/drivers/power/sy6982c_charger.c new file mode 100755 -index 000000000..dfa82c3f8 +index 000000000000..dfa82c3f8d27 --- /dev/null +++ b/drivers/power/sy6982c_charger.c @@ -0,0 +1,401 @@ @@ -1309744,7 +1309744,7 @@ index 000000000..dfa82c3f8 +MODULE_AUTHOR("chen Shunqing"); diff --git a/drivers/power/universal_charger.c b/drivers/power/universal_charger.c new file mode 100755 -index 000000000..0f7b4c9e8 +index 000000000000..0f7b4c9e8003 --- /dev/null +++ b/drivers/power/universal_charger.c @@ -0,0 +1,419 @@ @@ -1310168,7 +1310168,7 @@ index 000000000..0f7b4c9e8 +MODULE_ALIAS("platform:universal-charger"); +MODULE_AUTHOR("chen Shunqing"); diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig -index 63be5362f..ca5db4311 100644 +index 63be5362fd3a..ca5db43118d4 100644 --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig @@ -408,6 +408,12 @@ config PWM_ROCKCHIP @@ -1310185,7 +1310185,7 @@ index 63be5362f..ca5db4311 100644 tristate "Samsung PWM support" depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST diff --git a/drivers/pwm/pwm-rockchip.c b/drivers/pwm/pwm-rockchip.c -index 1f3079562..e6394eb81 100644 +index 1f3079562b38..e6394eb8176b 100644 --- a/drivers/pwm/pwm-rockchip.c +++ b/drivers/pwm/pwm-rockchip.c @@ -11,6 +11,7 @@ @@ -1310469,7 +1310469,7 @@ index 1f3079562..e6394eb81 100644 MODULE_AUTHOR("Beniamino Galvani "); MODULE_DESCRIPTION("Rockchip SoC PWM driver"); diff --git a/drivers/pwm/sysfs.c b/drivers/pwm/sysfs.c -index 9903c3a7e..54619969d 100644 +index 9903c3a7eced..54619969dce6 100644 --- a/drivers/pwm/sysfs.c +++ b/drivers/pwm/sysfs.c @@ -103,6 +103,43 @@ static ssize_t duty_cycle_store(struct device *child, @@ -1310537,7 +1310537,7 @@ index 9903c3a7e..54619969d 100644 &dev_attr_polarity.attr, &dev_attr_capture.attr, diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig -index 020a00d66..2da933776 100644 +index 020a00d6696b..2da933776c81 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -1279,5 +1279,11 @@ config REGULATOR_QCOM_LABIBB @@ -1310553,7 +1310553,7 @@ index 020a00d66..2da933776 100644 endif diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile -index 6ebae5162..17e3300e7 100644 +index 6ebae516258e..17e3300e71d5 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -24,6 +24,7 @@ obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o @@ -1310588,7 +1310588,7 @@ index 6ebae5162..17e3300e7 100644 ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c -index 40aadf9e6..0af1d5038 100644 +index c2b6b1befcf2..ee4f9a653635 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -51,6 +51,7 @@ static LIST_HEAD(regulator_map_list); @@ -1310611,7 +1310611,7 @@ index 40aadf9e6..0af1d5038 100644 static int _regulator_is_enabled(struct regulator_dev *rdev); static int _regulator_disable(struct regulator *regulator); static int _regulator_get_current_limit(struct regulator_dev *rdev); -@@ -5024,11 +5030,265 @@ static void regulator_dev_release(struct device *dev) +@@ -5022,11 +5028,265 @@ static void regulator_dev_release(struct device *dev) kfree(rdev); } @@ -1310877,7 +1310877,7 @@ index 40aadf9e6..0af1d5038 100644 /* Avoid duplicate debugfs directory names */ if (parent && rname == rdev->desc->name) { -@@ -5049,8 +5309,88 @@ static void rdev_init_debugfs(struct regulator_dev *rdev) +@@ -5045,8 +5305,88 @@ static void rdev_init_debugfs(struct regulator_dev *rdev) &rdev->open_count); debugfs_create_u32("bypass_count", 0444, rdev->debugfs, &rdev->bypass_count); @@ -1310966,7 +1310966,7 @@ index 40aadf9e6..0af1d5038 100644 static int regulator_register_resolve_supply(struct device *dev, void *data) { struct regulator_dev *rdev = dev_to_rdev(dev); -@@ -5530,6 +5870,7 @@ void regulator_unregister(struct regulator_dev *rdev) +@@ -5526,6 +5866,7 @@ void regulator_unregister(struct regulator_dev *rdev) mutex_lock(®ulator_list_mutex); @@ -1310974,7 +1310974,7 @@ index 40aadf9e6..0af1d5038 100644 WARN_ON(rdev->open_count); regulator_remove_coupling(rdev); unset_regulator_supplies(rdev); -@@ -5961,7 +6302,11 @@ static int __init regulator_init(void) +@@ -5957,7 +6298,11 @@ static int __init regulator_init(void) } /* init early to allow our consumers to complete system booting */ @@ -1310987,7 +1310987,7 @@ index 40aadf9e6..0af1d5038 100644 static int regulator_late_cleanup(struct device *dev, void *data) { diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c -index 1af12074a..534028ec1 100644 +index 1af12074a75a..534028ec15c2 100644 --- a/drivers/regulator/fan53555.c +++ b/drivers/regulator/fan53555.c @@ -18,6 +18,8 @@ @@ -1311684,7 +1311684,7 @@ index 1af12074a..534028ec1 100644 diff --git a/drivers/regulator/lp8752.c b/drivers/regulator/lp8752.c new file mode 100755 -index 000000000..cf8e685f3 +index 000000000000..cf8e685f304a --- /dev/null +++ b/drivers/regulator/lp8752.c @@ -0,0 +1,316 @@ @@ -1312006,7 +1312006,7 @@ index 000000000..cf8e685f3 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/regulator/mp8865-regulator.c b/drivers/regulator/mp8865-regulator.c new file mode 100755 -index 000000000..607e3a8f2 +index 000000000000..607e3a8f2df4 --- /dev/null +++ b/drivers/regulator/mp8865-regulator.c @@ -0,0 +1,248 @@ @@ -1312259,7 +1312259,7 @@ index 000000000..607e3a8f2 +MODULE_DESCRIPTION("mp8865 voltage regulator driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c -index 5d844697c..b11a434ec 100644 +index 5d844697c7b6..b11a434ec9fd 100644 --- a/drivers/regulator/of_regulator.c +++ b/drivers/regulator/of_regulator.c @@ -417,8 +417,12 @@ device_node *regulator_of_get_init_node(struct device *dev, @@ -1312278,7 +1312278,7 @@ index 5d844697c..b11a434ec 100644 if (!strcmp(desc->of_match, name)) { of_node_put(search); diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c -index e926c1a85..bb8b2f604 100644 +index e926c1a85846..bb8b2f604a24 100644 --- a/drivers/regulator/rk808-regulator.c +++ b/drivers/regulator/rk808-regulator.c @@ -34,6 +34,11 @@ @@ -1313168,7 +1313168,7 @@ index e926c1a85..bb8b2f604 100644 MODULE_AUTHOR("Zhang Qing "); diff --git a/drivers/regulator/scmi-regulator.c b/drivers/regulator/scmi-regulator.c new file mode 100755 -index 000000000..9a4297276 +index 000000000000..9a4297276098 --- /dev/null +++ b/drivers/regulator/scmi-regulator.c @@ -0,0 +1,421 @@ @@ -1313595,7 +1313595,7 @@ index 000000000..9a4297276 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/regulator/syr82x.c b/drivers/regulator/syr82x.c new file mode 100755 -index 000000000..4f7b0892a +index 000000000000..4f7b0892a3bc --- /dev/null +++ b/drivers/regulator/syr82x.c @@ -0,0 +1,520 @@ @@ -1314121,7 +1314121,7 @@ index 000000000..4f7b0892a + diff --git a/drivers/regulator/tps549b22-regulator.c b/drivers/regulator/tps549b22-regulator.c new file mode 100755 -index 000000000..bae2a67f4 +index 000000000000..bae2a67f4345 --- /dev/null +++ b/drivers/regulator/tps549b22-regulator.c @@ -0,0 +1,437 @@ @@ -1314564,7 +1314564,7 @@ index 000000000..bae2a67f4 +MODULE_DESCRIPTION(" tps549b22 dcdc driver"); diff --git a/drivers/regulator/xz3216.c b/drivers/regulator/xz3216.c new file mode 100755 -index 000000000..54182559b +index 000000000000..54182559b161 --- /dev/null +++ b/drivers/regulator/xz3216.c @@ -0,0 +1,404 @@ @@ -1314974,7 +1314974,7 @@ index 000000000..54182559b +MODULE_DESCRIPTION("xz3216 PMIC driver"); diff --git a/drivers/rk_nand/Kconfig b/drivers/rk_nand/Kconfig new file mode 100755 -index 000000000..c49a1c28b +index 000000000000..c49a1c28b702 --- /dev/null +++ b/drivers/rk_nand/Kconfig @@ -0,0 +1,10 @@ @@ -1314990,7 +1314990,7 @@ index 000000000..c49a1c28b +endif diff --git a/drivers/rk_nand/Makefile b/drivers/rk_nand/Makefile new file mode 100755 -index 000000000..dbd156f6e +index 000000000000..dbd156f6e78b --- /dev/null +++ b/drivers/rk_nand/Makefile @@ -0,0 +1,9 @@ @@ -1315005,7 +1315005,7 @@ index 000000000..dbd156f6e +endif diff --git a/drivers/rk_nand/rk_ftl_api.h b/drivers/rk_nand/rk_ftl_api.h new file mode 100755 -index 000000000..ebde01e3d +index 000000000000..ebde01e3dbb6 --- /dev/null +++ b/drivers/rk_nand/rk_ftl_api.h @@ -0,0 +1,41 @@ @@ -1315052,7 +1315052,7 @@ index 000000000..ebde01e3d + 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 000000000..db549c3b2 +index 000000000000..db549c3b269e --- /dev/null +++ b/drivers/rk_nand/rk_ftl_arm_v7.S @@ -0,0 +1,30165 @@ @@ -1345223,7 +1345223,7 @@ index 000000000..db549c3b2 + .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 000000000..a67898acb +index 000000000000..a67898acb677 --- /dev/null +++ b/drivers/rk_nand/rk_ftl_arm_v7_thumb.S @@ -0,0 +1,30192 @@ @@ -1375421,7 +1375421,7 @@ index 000000000..a67898acb + .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 000000000..537155f1f +index 000000000000..537155f1fcde --- /dev/null +++ b/drivers/rk_nand/rk_ftl_arm_v8.S @@ -0,0 +1,27968 @@ @@ -1403395,7 +1403395,7 @@ index 000000000..537155f1f + .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 000000000..26e2a694f +index 000000000000..26e2a694fb6d --- /dev/null +++ b/drivers/rk_nand/rk_ftlv5_arm32.S @@ -0,0 +1,27612 @@ @@ -1431013,7 +1431013,7 @@ index 000000000..26e2a694f + .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 000000000..260a57d85 +index 000000000000..260a57d855b5 --- /dev/null +++ b/drivers/rk_nand/rk_ftlv5_arm64.S @@ -0,0 +1,25632 @@ @@ -1456651,7 +1456651,7 @@ index 000000000..260a57d85 + .string "erase power lost blk = %x vpc=%x\n" diff --git a/drivers/rk_nand/rk_nand_base.c b/drivers/rk_nand/rk_nand_base.c new file mode 100755 -index 000000000..9d5e2fb02 +index 000000000000..9d5e2fb02baa --- /dev/null +++ b/drivers/rk_nand/rk_nand_base.c @@ -0,0 +1,456 @@ @@ -1457113,7 +1457113,7 @@ index 000000000..9d5e2fb02 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/rk_nand/rk_nand_base.h b/drivers/rk_nand/rk_nand_base.h new file mode 100755 -index 000000000..023e58d5f +index 000000000000..023e58d5fc5c --- /dev/null +++ b/drivers/rk_nand/rk_nand_base.h @@ -0,0 +1,46 @@ @@ -1457165,7 +1457165,7 @@ index 000000000..023e58d5f +#endif diff --git a/drivers/rk_nand/rk_nand_blk.c b/drivers/rk_nand/rk_nand_blk.c new file mode 100755 -index 000000000..7d1c46966 +index 000000000000..7d1c46966481 --- /dev/null +++ b/drivers/rk_nand/rk_nand_blk.c @@ -0,0 +1,711 @@ @@ -1457882,7 +1457882,7 @@ index 000000000..7d1c46966 +} diff --git a/drivers/rk_nand/rk_nand_blk.h b/drivers/rk_nand/rk_nand_blk.h new file mode 100755 -index 000000000..681c625f5 +index 000000000000..681c625f5081 --- /dev/null +++ b/drivers/rk_nand/rk_nand_blk.h @@ -0,0 +1,67 @@ @@ -1457955,7 +1457955,7 @@ index 000000000..681c625f5 +#endif diff --git a/drivers/rk_nand/rk_zftl_arm32.S b/drivers/rk_nand/rk_zftl_arm32.S new file mode 100755 -index 000000000..ec6959a4c +index 000000000000..ec6959a4c9c9 --- /dev/null +++ b/drivers/rk_nand/rk_zftl_arm32.S @@ -0,0 +1,37095 @@ @@ -1495056,7 +1495056,7 @@ index 000000000..ec6959a4c + .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 000000000..943e37110 +index 000000000000..943e37110677 --- /dev/null +++ b/drivers/rk_nand/rk_zftl_arm64.S @@ -0,0 +1,35207 @@ @@ -1530269,7 +1530269,7 @@ index 000000000..943e37110 + .string "\0013vendor storage %x,%x,%x\n" diff --git a/drivers/rkflash/Kconfig b/drivers/rkflash/Kconfig new file mode 100755 -index 000000000..4c791915e +index 000000000000..4c791915e7bc --- /dev/null +++ b/drivers/rkflash/Kconfig @@ -0,0 +1,80 @@ @@ -1530355,7 +1530355,7 @@ index 000000000..4c791915e +endif # ARCH_ROCKCHIP diff --git a/drivers/rkflash/Makefile b/drivers/rkflash/Makefile new file mode 100755 -index 000000000..283a217eb +index 000000000000..283a217eb6ca --- /dev/null +++ b/drivers/rkflash/Makefile @@ -0,0 +1,14 @@ @@ -1530375,7 +1530375,7 @@ index 000000000..283a217eb +endif diff --git a/drivers/rkflash/flash.c b/drivers/rkflash/flash.c new file mode 100755 -index 000000000..52be15969 +index 000000000000..52be15969cda --- /dev/null +++ b/drivers/rkflash/flash.c @@ -0,0 +1,505 @@ @@ -1530886,7 +1530886,7 @@ index 000000000..52be15969 +} diff --git a/drivers/rkflash/flash.h b/drivers/rkflash/flash.h new file mode 100755 -index 000000000..8f1284c90 +index 000000000000..8f1284c9026a --- /dev/null +++ b/drivers/rkflash/flash.h @@ -0,0 +1,132 @@ @@ -1531024,7 +1531024,7 @@ index 000000000..8f1284c90 +#endif diff --git a/drivers/rkflash/flash_com.h b/drivers/rkflash/flash_com.h new file mode 100755 -index 000000000..da6eb2996 +index 000000000000..da6eb29968a1 --- /dev/null +++ b/drivers/rkflash/flash_com.h @@ -0,0 +1,77 @@ @@ -1531107,7 +1531107,7 @@ index 000000000..da6eb2996 +#endif diff --git a/drivers/rkflash/nand_boot.c b/drivers/rkflash/nand_boot.c new file mode 100755 -index 000000000..7db6ff9e7 +index 000000000000..7db6ff9e7f48 --- /dev/null +++ b/drivers/rkflash/nand_boot.c @@ -0,0 +1,83 @@ @@ -1531196,7 +1531196,7 @@ index 000000000..7db6ff9e7 + diff --git a/drivers/rkflash/nandc.c b/drivers/rkflash/nandc.c new file mode 100755 -index 000000000..69e3b0ed5 +index 000000000000..69e3b0ed5598 --- /dev/null +++ b/drivers/rkflash/nandc.c @@ -0,0 +1,467 @@ @@ -1531669,7 +1531669,7 @@ index 000000000..69e3b0ed5 +} diff --git a/drivers/rkflash/nandc.h b/drivers/rkflash/nandc.h new file mode 100755 -index 000000000..e650493db +index 000000000000..e650493dbe4d --- /dev/null +++ b/drivers/rkflash/nandc.h @@ -0,0 +1,346 @@ @@ -1532021,7 +1532021,7 @@ index 000000000..e650493db +#endif diff --git a/drivers/rkflash/rk_sftl.h b/drivers/rkflash/rk_sftl.h new file mode 100755 -index 000000000..378f83714 +index 000000000000..378f83714b5d --- /dev/null +++ b/drivers/rkflash/rk_sftl.h @@ -0,0 +1,48 @@ @@ -1532075,7 +1532075,7 @@ index 000000000..378f83714 +#endif diff --git a/drivers/rkflash/rk_sftl_arm_v7.S b/drivers/rkflash/rk_sftl_arm_v7.S new file mode 100755 -index 000000000..a8119e884 +index 000000000000..a8119e884d35 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v7.S @@ -0,0 +1,15787 @@ @@ -1547868,7 +1547868,7 @@ index 000000000..a8119e884 + .ascii "vendor_storage\000" diff --git a/drivers/rkflash/rk_sftl_arm_v7_thumb.S b/drivers/rkflash/rk_sftl_arm_v7_thumb.S new file mode 100755 -index 000000000..d4429f7f1 +index 000000000000..d4429f7f1db4 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v7_thumb.S @@ -0,0 +1,15586 @@ @@ -1563460,7 +1563460,7 @@ index 000000000..d4429f7f1 + .ascii "vendor_storage\000" diff --git a/drivers/rkflash/rk_sftl_arm_v8.S b/drivers/rkflash/rk_sftl_arm_v8.S new file mode 100755 -index 000000000..7e2944e55 +index 000000000000..7e2944e55a76 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v8.S @@ -0,0 +1,15768 @@ @@ -1579234,7 +1579234,7 @@ index 000000000..7e2944e55 + .align 3 diff --git a/drivers/rkflash/rkflash_api.h b/drivers/rkflash/rkflash_api.h new file mode 100755 -index 000000000..402109b60 +index 000000000000..402109b60521 --- /dev/null +++ b/drivers/rkflash/rkflash_api.h @@ -0,0 +1,58 @@ @@ -1579298,7 +1579298,7 @@ index 000000000..402109b60 +#endif diff --git a/drivers/rkflash/rkflash_blk.c b/drivers/rkflash/rkflash_blk.c new file mode 100755 -index 000000000..17ffe7386 +index 000000000000..17ffe73865fe --- /dev/null +++ b/drivers/rkflash/rkflash_blk.c @@ -0,0 +1,789 @@ @@ -1580093,7 +1580093,7 @@ index 000000000..17ffe7386 +} diff --git a/drivers/rkflash/rkflash_blk.h b/drivers/rkflash/rkflash_blk.h new file mode 100755 -index 000000000..3d95436c5 +index 000000000000..3d95436c55e7 --- /dev/null +++ b/drivers/rkflash/rkflash_blk.h @@ -0,0 +1,121 @@ @@ -1580220,7 +1580220,7 @@ index 000000000..3d95436c5 +#endif diff --git a/drivers/rkflash/rkflash_debug.c b/drivers/rkflash/rkflash_debug.c new file mode 100755 -index 000000000..ce742b038 +index 000000000000..ce742b0382ef --- /dev/null +++ b/drivers/rkflash/rkflash_debug.c @@ -0,0 +1,116 @@ @@ -1580342,7 +1580342,7 @@ index 000000000..ce742b038 +MODULE_PARM_DESC(rkflash_debug, "config rkflash_debug module"); diff --git a/drivers/rkflash/rkflash_debug.h b/drivers/rkflash/rkflash_debug.h new file mode 100755 -index 000000000..3fe406832 +index 000000000000..3fe4068322e7 --- /dev/null +++ b/drivers/rkflash/rkflash_debug.h @@ -0,0 +1,42 @@ @@ -1580390,7 +1580390,7 @@ index 000000000..3fe406832 + diff --git a/drivers/rkflash/rknandc_base.c b/drivers/rkflash/rknandc_base.c new file mode 100755 -index 000000000..d2e97883d +index 000000000000..d2e97883dec4 --- /dev/null +++ b/drivers/rkflash/rknandc_base.c @@ -0,0 +1,192 @@ @@ -1580588,7 +1580588,7 @@ index 000000000..d2e97883d +MODULE_ALIAS("rknandc"); diff --git a/drivers/rkflash/rksfc_base.c b/drivers/rkflash/rksfc_base.c new file mode 100755 -index 000000000..6cf74e103 +index 000000000000..6cf74e103972 --- /dev/null +++ b/drivers/rkflash/rksfc_base.c @@ -0,0 +1,267 @@ @@ -1580861,7 +1580861,7 @@ index 000000000..6cf74e103 +MODULE_ALIAS("rksfc"); diff --git a/drivers/rkflash/sfc.c b/drivers/rkflash/sfc.c new file mode 100755 -index 000000000..9ee5d6a97 +index 000000000000..9ee5d6a97f13 --- /dev/null +++ b/drivers/rkflash/sfc.c @@ -0,0 +1,255 @@ @@ -1581122,7 +1581122,7 @@ index 000000000..9ee5d6a97 +} diff --git a/drivers/rkflash/sfc.h b/drivers/rkflash/sfc.h new file mode 100755 -index 000000000..355cd2617 +index 000000000000..355cd26170c6 --- /dev/null +++ b/drivers/rkflash/sfc.h @@ -0,0 +1,224 @@ @@ -1581352,7 +1581352,7 @@ index 000000000..355cd2617 +#endif diff --git a/drivers/rkflash/sfc_nand.c b/drivers/rkflash/sfc_nand.c new file mode 100755 -index 000000000..cf3d3e887 +index 000000000000..cf3d3e887198 --- /dev/null +++ b/drivers/rkflash/sfc_nand.c @@ -0,0 +1,1051 @@ @@ -1582409,7 +1582409,7 @@ index 000000000..cf3d3e887 +} diff --git a/drivers/rkflash/sfc_nand.h b/drivers/rkflash/sfc_nand.h new file mode 100755 -index 000000000..43f4adf45 +index 000000000000..43f4adf4508b --- /dev/null +++ b/drivers/rkflash/sfc_nand.h @@ -0,0 +1,133 @@ @@ -1582548,7 +1582548,7 @@ index 000000000..43f4adf45 +#endif diff --git a/drivers/rkflash/sfc_nand_boot.c b/drivers/rkflash/sfc_nand_boot.c new file mode 100755 -index 000000000..8db7f8df9 +index 000000000000..8db7f8df968f --- /dev/null +++ b/drivers/rkflash/sfc_nand_boot.c @@ -0,0 +1,89 @@ @@ -1582643,7 +1582643,7 @@ index 000000000..8db7f8df9 +}; diff --git a/drivers/rkflash/sfc_nand_mtd.c b/drivers/rkflash/sfc_nand_mtd.c new file mode 100755 -index 000000000..1b4d30605 +index 000000000000..1b4d306050cf --- /dev/null +++ b/drivers/rkflash/sfc_nand_mtd.c @@ -0,0 +1,423 @@ @@ -1583072,7 +1583072,7 @@ index 000000000..1b4d30605 +#endif diff --git a/drivers/rkflash/sfc_nand_mtd.h b/drivers/rkflash/sfc_nand_mtd.h new file mode 100755 -index 000000000..0d49c7465 +index 000000000000..0d49c74654ab --- /dev/null +++ b/drivers/rkflash/sfc_nand_mtd.h @@ -0,0 +1,82 @@ @@ -1583160,7 +1583160,7 @@ index 000000000..0d49c7465 +#endif diff --git a/drivers/rkflash/sfc_nand_mtd_bbt.c b/drivers/rkflash/sfc_nand_mtd_bbt.c new file mode 100755 -index 000000000..eb641f893 +index 000000000000..eb641f89306c --- /dev/null +++ b/drivers/rkflash/sfc_nand_mtd_bbt.c @@ -0,0 +1,441 @@ @@ -1583607,7 +1583607,7 @@ index 000000000..eb641f893 +EXPORT_SYMBOL_GPL(snanddev_bbt_set_block_status); diff --git a/drivers/rkflash/sfc_nor.c b/drivers/rkflash/sfc_nor.c new file mode 100755 -index 000000000..f7abe75a5 +index 000000000000..f7abe75a5b09 --- /dev/null +++ b/drivers/rkflash/sfc_nor.c @@ -0,0 +1,783 @@ @@ -1584396,7 +1584396,7 @@ index 000000000..f7abe75a5 + diff --git a/drivers/rkflash/sfc_nor.h b/drivers/rkflash/sfc_nor.h new file mode 100755 -index 000000000..950af6a5e +index 000000000000..950af6a5e686 --- /dev/null +++ b/drivers/rkflash/sfc_nor.h @@ -0,0 +1,176 @@ @@ -1584578,7 +1584578,7 @@ index 000000000..950af6a5e +#endif diff --git a/drivers/rkflash/sfc_nor_boot.c b/drivers/rkflash/sfc_nor_boot.c new file mode 100755 -index 000000000..791c1291b +index 000000000000..791c1291b475 --- /dev/null +++ b/drivers/rkflash/sfc_nor_boot.c @@ -0,0 +1,180 @@ @@ -1584764,7 +1584764,7 @@ index 000000000..791c1291b +}; diff --git a/drivers/rkflash/sfc_nor_mtd.c b/drivers/rkflash/sfc_nor_mtd.c new file mode 100755 -index 000000000..8c9d69a58 +index 000000000000..8c9d69a581f2 --- /dev/null +++ b/drivers/rkflash/sfc_nor_mtd.c @@ -0,0 +1,266 @@ @@ -1585036,7 +1585036,7 @@ index 000000000..8c9d69a58 +} diff --git a/drivers/rkflash/typedef.h b/drivers/rkflash/typedef.h new file mode 100755 -index 000000000..5808ec281 +index 000000000000..5808ec281fa2 --- /dev/null +++ b/drivers/rkflash/typedef.h @@ -0,0 +1,30 @@ @@ -1585071,7 +1585071,7 @@ index 000000000..5808ec281 + +#endif /*__TYPEDEF_H */ diff --git a/drivers/soc/rockchip/Kconfig b/drivers/soc/rockchip/Kconfig -index 25eb2c1e3..a9d09b3e9 100644 +index 25eb2c1e31bb..a9d09b3e902e 100644 --- a/drivers/soc/rockchip/Kconfig +++ b/drivers/soc/rockchip/Kconfig @@ -1,19 +1,85 @@ @@ -1585375,7 +1585375,7 @@ index 25eb2c1e3..a9d09b3e9 100644 endif diff --git a/drivers/soc/rockchip/Kconfig.cpu b/drivers/soc/rockchip/Kconfig.cpu new file mode 100755 -index 000000000..1ffc76343 +index 000000000000..1ffc763434bf --- /dev/null +++ b/drivers/soc/rockchip/Kconfig.cpu @@ -0,0 +1,72 @@ @@ -1585452,7 +1585452,7 @@ index 000000000..1ffc76343 + +endmenu diff --git a/drivers/soc/rockchip/Makefile b/drivers/soc/rockchip/Makefile -index 875032f73..7a1ae8d8a 100644 +index 875032f7344e..7a1ae8d8a6bb 100644 --- a/drivers/soc/rockchip/Makefile +++ b/drivers/soc/rockchip/Makefile @@ -2,6 +2,35 @@ @@ -1585493,7 +1585493,7 @@ index 875032f73..7a1ae8d8a 100644 +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 000000000..4805100b1 +index 000000000000..4805100b127a --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/Kconfig @@ -0,0 +1,87 @@ @@ -1585586,7 +1585586,7 @@ index 000000000..4805100b1 + 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 000000000..6ac2cd61b +index 000000000000..6ac2cd61bf8e --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/Makefile @@ -0,0 +1,3 @@ @@ -1585595,7 +1585595,7 @@ index 000000000..6ac2cd61b +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 000000000..4647144ea +index 000000000000..4647144ea757 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger.c @@ -0,0 +1,1730 @@ @@ -1587331,7 +1587331,7 @@ index 000000000..4647144ea +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 000000000..e2003e479 +index 000000000000..e2003e47904d --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger.h @@ -0,0 +1,81 @@ @@ -1587418,7 +1587418,7 @@ index 000000000..e2003e479 +#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 000000000..d44287eba +index 000000000000..d44287eba4bd --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm.c @@ -0,0 +1,270 @@ @@ -1587694,7 +1587694,7 @@ index 000000000..d44287eba +#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 000000000..ee8052bfd +index 000000000000..ee8052bfd817 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm64.c @@ -0,0 +1,199 @@ @@ -1587899,7 +1587899,7 @@ index 000000000..ee8052bfd +#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 000000000..915860a6b +index 000000000000..915860a6b38a --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_priv.h @@ -0,0 +1,39 @@ @@ -1587944,7 +1587944,7 @@ index 000000000..915860a6b +#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 000000000..10c3c5d09 +index 000000000000..10c3c5d09098 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_ringbuf.h @@ -0,0 +1,94 @@ @@ -1588044,7 +1588044,7 @@ index 000000000..10c3c5d09 +} 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 000000000..194b54138 +index 000000000000..194b54138417 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_watchdog.c @@ -0,0 +1,56 @@ @@ -1588106,7 +1588106,7 @@ index 000000000..194b54138 +} 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 000000000..c6b507f8d +index 000000000000..c6b507f8d976 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_watchdog.h @@ -0,0 +1,20 @@ @@ -1588132,7 +1588132,7 @@ index 000000000..c6b507f8d +#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 000000000..6dafdde7b +index 000000000000..6dafdde7b6b0 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/rk_fiq_debugger.c @@ -0,0 +1,1136 @@ @@ -1589274,7 +1589274,7 @@ index 000000000..6dafdde7b +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 000000000..f5ec8d143 +index 000000000000..f5ec8d143b22 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/rk_fiq_debugger.h @@ -0,0 +1,22 @@ @@ -1589302,7 +1589302,7 @@ index 000000000..f5ec8d143 +#endif diff --git a/drivers/soc/rockchip/flash_vendor_storage.c b/drivers/soc/rockchip/flash_vendor_storage.c new file mode 100755 -index 000000000..7c8cd338d +index 000000000000..7c8cd338d286 --- /dev/null +++ b/drivers/soc/rockchip/flash_vendor_storage.c @@ -0,0 +1,342 @@ @@ -1589650,7 +1589650,7 @@ index 000000000..7c8cd338d +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/flash_vendor_storage.h b/drivers/soc/rockchip/flash_vendor_storage.h new file mode 100755 -index 000000000..55ca52486 +index 000000000000..55ca52486de7 --- /dev/null +++ b/drivers/soc/rockchip/flash_vendor_storage.h @@ -0,0 +1,16 @@ @@ -1589671,7 +1589671,7 @@ index 000000000..55ca52486 +#endif + diff --git a/drivers/soc/rockchip/grf.c b/drivers/soc/rockchip/grf.c -index 343ff61cc..890158d0d 100644 +index 343ff61ccccb..890158d0da7f 100644 --- a/drivers/soc/rockchip/grf.c +++ b/drivers/soc/rockchip/grf.c @@ -5,12 +5,105 @@ @@ -1589918,7 +1589918,7 @@ index 343ff61cc..890158d0d 100644 +MODULE_DESCRIPTION("Rockchip GRF"); +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/io-domain.c b/drivers/soc/rockchip/io-domain.c -index b29e829e8..f5ec81667 100644 +index b29e829e815e..f5ec81667ef3 100644 --- a/drivers/soc/rockchip/io-domain.c +++ b/drivers/soc/rockchip/io-domain.c @@ -14,6 +14,13 @@ @@ -1590407,7 +1590407,7 @@ index b29e829e8..f5ec81667 100644 MODULE_AUTHOR("Heiko Stuebner "); diff --git a/drivers/soc/rockchip/iomux.c b/drivers/soc/rockchip/iomux.c new file mode 100644 -index 000000000..110feb7f8 +index 000000000000..110feb7f839d --- /dev/null +++ b/drivers/soc/rockchip/iomux.c @@ -0,0 +1,88 @@ @@ -1590501,7 +1590501,7 @@ index 000000000..110feb7f8 +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 000000000..64dc14650 +index 000000000000..64dc1465004b --- /dev/null +++ b/drivers/soc/rockchip/minidump/Kconfig @@ -0,0 +1,40 @@ @@ -1590547,7 +1590547,7 @@ index 000000000..64dc14650 +endmenu diff --git a/drivers/soc/rockchip/minidump/Makefile b/drivers/soc/rockchip/minidump/Makefile new file mode 100644 -index 000000000..7f799a034 +index 000000000000..7f799a034c01 --- /dev/null +++ b/drivers/soc/rockchip/minidump/Makefile @@ -0,0 +1,3 @@ @@ -1590556,7 +1590556,7 @@ index 000000000..7f799a034 +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 000000000..dbccd0316 +index 000000000000..dbccd0316008 --- /dev/null +++ b/drivers/soc/rockchip/minidump/elf.h @@ -0,0 +1,45 @@ @@ -1590607,7 +1590607,7 @@ index 000000000..dbccd0316 +#endif diff --git a/drivers/soc/rockchip/minidump/minidump_log.c b/drivers/soc/rockchip/minidump/minidump_log.c new file mode 100644 -index 000000000..18b1934e9 +index 000000000000..18b1934e9356 --- /dev/null +++ b/drivers/soc/rockchip/minidump/minidump_log.c @@ -0,0 +1,1508 @@ @@ -1592121,7 +1592121,7 @@ index 000000000..18b1934e9 +} diff --git a/drivers/soc/rockchip/minidump/minidump_memory.c b/drivers/soc/rockchip/minidump/minidump_memory.c new file mode 100644 -index 000000000..d7f93e2f1 +index 000000000000..d7f93e2f12b6 --- /dev/null +++ b/drivers/soc/rockchip/minidump/minidump_memory.c @@ -0,0 +1,1350 @@ @@ -1593477,7 +1593477,7 @@ index 000000000..d7f93e2f1 +} diff --git a/drivers/soc/rockchip/minidump/minidump_memory.h b/drivers/soc/rockchip/minidump/minidump_memory.h new file mode 100644 -index 000000000..086f1f89a +index 000000000000..086f1f89a090 --- /dev/null +++ b/drivers/soc/rockchip/minidump/minidump_memory.h @@ -0,0 +1,51 @@ @@ -1593534,7 +1593534,7 @@ index 000000000..086f1f89a +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 000000000..f2dadce35 +index 000000000000..f2dadce35bf0 --- /dev/null +++ b/drivers/soc/rockchip/minidump/minidump_private.h @@ -0,0 +1,90 @@ @@ -1593630,7 +1593630,7 @@ index 000000000..f2dadce35 +#endif diff --git a/drivers/soc/rockchip/minidump/rk_minidump.c b/drivers/soc/rockchip/minidump/rk_minidump.c new file mode 100644 -index 000000000..d742b7e2e +index 000000000000..d742b7e2eda6 --- /dev/null +++ b/drivers/soc/rockchip/minidump/rk_minidump.c @@ -0,0 +1,779 @@ @@ -1594415,7 +1594415,7 @@ index 000000000..d742b7e2e +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 100644 -index 000000000..c8fa137be +index 000000000000..c8fa137be25e --- /dev/null +++ b/drivers/soc/rockchip/minidump/rk_minidump_asm.S @@ -0,0 +1,23 @@ @@ -1594444,7 +1594444,7 @@ index 000000000..c8fa137be +SYM_FUNC_END_PI(rk_md_flush_dcache_area) diff --git a/drivers/soc/rockchip/mtd_vendor_storage.c b/drivers/soc/rockchip/mtd_vendor_storage.c new file mode 100755 -index 000000000..1f32930d9 +index 000000000000..1f32930d906c --- /dev/null +++ b/drivers/soc/rockchip/mtd_vendor_storage.c @@ -0,0 +1,445 @@ @@ -1594894,7 +1594894,7 @@ index 000000000..1f32930d9 +module_exit(vendor_storage_deinit); +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c -index 54eb6cfc5..6e98b2a9e 100644 +index 54eb6cfc5d5b..6e98b2a9ef81 100644 --- a/drivers/soc/rockchip/pm_domains.c +++ b/drivers/soc/rockchip/pm_domains.c @@ -5,6 +5,7 @@ @@ -1596751,7 +1596751,7 @@ index 54eb6cfc5..6e98b2a9e 100644 +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 000000000..eb9768d88 +index 000000000000..eb9768d88d3d --- /dev/null +++ b/drivers/soc/rockchip/ram_vendor_storage.c @@ -0,0 +1,214 @@ @@ -1596971,7 +1596971,7 @@ index 000000000..eb9768d88 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rk_camera_sensor_info.h b/drivers/soc/rockchip/rk_camera_sensor_info.h new file mode 100755 -index 000000000..55823b383 +index 000000000000..55823b3839b2 --- /dev/null +++ b/drivers/soc/rockchip/rk_camera_sensor_info.h @@ -0,0 +1,421 @@ @@ -1597398,7 +1597398,7 @@ index 000000000..55823b383 +#endif diff --git a/drivers/soc/rockchip/rk_cma_procfs.c b/drivers/soc/rockchip/rk_cma_procfs.c new file mode 100644 -index 000000000..3fbfef095 +index 000000000000..3fbfef095834 --- /dev/null +++ b/drivers/soc/rockchip/rk_cma_procfs.c @@ -0,0 +1,92 @@ @@ -1597496,7 +1597496,7 @@ index 000000000..3fbfef095 +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 000000000..0d82f0a38 +index 000000000000..0d82f0a38b91 --- /dev/null +++ b/drivers/soc/rockchip/rk_dmabuf_procfs.c @@ -0,0 +1,206 @@ @@ -1597708,7 +1597708,7 @@ index 000000000..0d82f0a38 +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 000000000..f888c9c18 +index 000000000000..f888c9c18738 --- /dev/null +++ b/drivers/soc/rockchip/rk_memblock_procfs.c @@ -0,0 +1,50 @@ @@ -1597764,7 +1597764,7 @@ index 000000000..f888c9c18 +late_initcall_sync(rk_memblock_procfs_init); diff --git a/drivers/soc/rockchip/rk_vendor_storage.c b/drivers/soc/rockchip/rk_vendor_storage.c new file mode 100755 -index 000000000..a8a316e47 +index 000000000000..a8a316e47ff9 --- /dev/null +++ b/drivers/soc/rockchip/rk_vendor_storage.c @@ -0,0 +1,50 @@ @@ -1597820,7 +1597820,7 @@ index 000000000..a8a316e47 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip-cpuinfo.c b/drivers/soc/rockchip/rockchip-cpuinfo.c new file mode 100755 -index 000000000..02befb165 +index 000000000000..02befb165d98 --- /dev/null +++ b/drivers/soc/rockchip/rockchip-cpuinfo.c @@ -0,0 +1,309 @@ @@ -1598135,7 +1598135,7 @@ index 000000000..02befb165 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_amp.c b/drivers/soc/rockchip/rockchip_amp.c new file mode 100644 -index 000000000..6f5bdc678 +index 000000000000..6f5bdc678756 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_amp.c @@ -0,0 +1,660 @@ @@ -1598801,7 +1598801,7 @@ index 000000000..6f5bdc678 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_csu.c b/drivers/soc/rockchip/rockchip_csu.c new file mode 100644 -index 000000000..04a6a5b39 +index 000000000000..04a6a5b39715 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_csu.c @@ -0,0 +1,377 @@ @@ -1599184,7 +1599184,7 @@ index 000000000..04a6a5b39 +MODULE_DESCRIPTION("Rockchip clock subunit driver"); diff --git a/drivers/soc/rockchip/rockchip_debug.c b/drivers/soc/rockchip/rockchip_debug.c new file mode 100755 -index 000000000..2f9eac20b +index 000000000000..2f9eac20bc4b --- /dev/null +++ b/drivers/soc/rockchip/rockchip_debug.c @@ -0,0 +1,679 @@ @@ -1599869,7 +1599869,7 @@ index 000000000..2f9eac20b +MODULE_ALIAS("platform:rockchip-debugger"); diff --git a/drivers/soc/rockchip/rockchip_debug.h b/drivers/soc/rockchip/rockchip_debug.h new file mode 100755 -index 000000000..82036d8eb +index 000000000000..82036d8ebf72 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_debug.h @@ -0,0 +1,14 @@ @@ -1599889,7 +1599889,7 @@ index 000000000..82036d8eb +#endif diff --git a/drivers/soc/rockchip/rockchip_decompress.c b/drivers/soc/rockchip/rockchip_decompress.c new file mode 100755 -index 000000000..275a605cf +index 000000000000..275a605cfccb --- /dev/null +++ b/drivers/soc/rockchip/rockchip_decompress.c @@ -0,0 +1,388 @@ @@ -1600283,7 +1600283,7 @@ index 000000000..275a605cf +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 000000000..4e47e810c +index 000000000000..4e47e810c48f --- /dev/null +++ b/drivers/soc/rockchip/rockchip_decompress_user.c @@ -0,0 +1,287 @@ @@ -1600576,7 +1600576,7 @@ index 000000000..4e47e810c +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 000000000..5f9a9b3b9 +index 000000000000..5f9a9b3b9338 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_disable_unused.c @@ -0,0 +1,24 @@ @@ -1600606,7 +1600606,7 @@ index 000000000..5f9a9b3b9 +#endif diff --git a/drivers/soc/rockchip/rockchip_ipa.c b/drivers/soc/rockchip/rockchip_ipa.c new file mode 100755 -index 000000000..e8982b7de +index 000000000000..e8982b7defee --- /dev/null +++ b/drivers/soc/rockchip/rockchip_ipa.c @@ -0,0 +1,232 @@ @@ -1600844,7 +1600844,7 @@ index 000000000..e8982b7de +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 000000000..1c92541ce +index 000000000000..1c92541ce2ae --- /dev/null +++ b/drivers/soc/rockchip/rockchip_npor_powergood.c @@ -0,0 +1,101 @@ @@ -1600951,7 +1600951,7 @@ index 000000000..1c92541ce +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_opp_select.c b/drivers/soc/rockchip/rockchip_opp_select.c new file mode 100755 -index 000000000..6c496ad05 +index 000000000000..6c496ad051f6 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_opp_select.c @@ -0,0 +1,2106 @@ @@ -1603063,7 +1603063,7 @@ index 000000000..6c496ad05 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_performance.c b/drivers/soc/rockchip/rockchip_performance.c new file mode 100644 -index 000000000..13d077548 +index 000000000000..13d077548167 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_performance.c @@ -0,0 +1,185 @@ @@ -1603254,7 +1603254,7 @@ index 000000000..13d077548 +#endif /* CONFIG_SMP */ diff --git a/drivers/soc/rockchip/rockchip_pm_config.c b/drivers/soc/rockchip/rockchip_pm_config.c new file mode 100755 -index 000000000..c319b790e +index 000000000000..c319b790ee24 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_pm_config.c @@ -0,0 +1,606 @@ @@ -1603866,7 +1603866,7 @@ index 000000000..c319b790e +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_pvtm.c b/drivers/soc/rockchip/rockchip_pvtm.c new file mode 100755 -index 000000000..75006737f +index 000000000000..75006737f421 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_pvtm.c @@ -0,0 +1,1046 @@ @@ -1604918,7 +1604918,7 @@ index 000000000..75006737f +MODULE_LICENSE("GPL v2"); diff --git a/drivers/soc/rockchip/rockchip_ramdisk.c b/drivers/soc/rockchip/rockchip_ramdisk.c new file mode 100755 -index 000000000..e2118ac52 +index 000000000000..e2118ac52d2a --- /dev/null +++ b/drivers/soc/rockchip/rockchip_ramdisk.c @@ -0,0 +1,365 @@ @@ -1605289,7 +1605289,7 @@ index 000000000..e2118ac52 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_system_monitor.c b/drivers/soc/rockchip/rockchip_system_monitor.c new file mode 100755 -index 000000000..51844a9c8 +index 000000000000..51844a9c8025 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_system_monitor.c @@ -0,0 +1,1946 @@ @@ -1607241,7 +1607241,7 @@ index 000000000..51844a9c8 +MODULE_DESCRIPTION("rockchip system monitor driver"); diff --git a/drivers/soc/rockchip/rockchip_thunderboot_crypto.c b/drivers/soc/rockchip/rockchip_thunderboot_crypto.c new file mode 100755 -index 000000000..7a3c93a03 +index 000000000000..7a3c93a0304e --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_crypto.c @@ -0,0 +1,440 @@ @@ -1607687,7 +1607687,7 @@ index 000000000..7a3c93a03 +pure_initcall(rk_tb_crypto_init); diff --git a/drivers/soc/rockchip/rockchip_thunderboot_mmc.c b/drivers/soc/rockchip/rockchip_thunderboot_mmc.c new file mode 100755 -index 000000000..10618811f +index 000000000000..10618811f0e9 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_mmc.c @@ -0,0 +1,165 @@ @@ -1607858,7 +1607858,7 @@ index 000000000..10618811f +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 000000000..6002d64c8 +index 000000000000..6002d64c8b05 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_service.c @@ -0,0 +1,192 @@ @@ -1608056,7 +1608056,7 @@ index 000000000..6002d64c8 +arch_initcall(rk_tb_serv_init); diff --git a/drivers/soc/rockchip/rockchip_thunderboot_sfc.c b/drivers/soc/rockchip/rockchip_thunderboot_sfc.c new file mode 100755 -index 000000000..d81ca755a +index 000000000000..d81ca755aa12 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_sfc.c @@ -0,0 +1,141 @@ @@ -1608203,7 +1608203,7 @@ index 000000000..d81ca755a +pure_initcall(rk_tb_sfc_init); diff --git a/drivers/soc/rockchip/sdmmc_vendor_storage.c b/drivers/soc/rockchip/sdmmc_vendor_storage.c new file mode 100755 -index 000000000..ea1d9410b +index 000000000000..ea1d9410b8eb --- /dev/null +++ b/drivers/soc/rockchip/sdmmc_vendor_storage.c @@ -0,0 +1,586 @@ @@ -1608794,7 +1608794,7 @@ index 000000000..ea1d9410b +module_exit(vendor_storage_deinit); +MODULE_LICENSE("GPL"); diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c -index a9f97023d..63ffccb1e 100644 +index a9f97023d5a0..63ffccb1eb46 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -10,6 +10,7 @@ @@ -1609194,7 +1609194,7 @@ index a9f97023d..63ffccb1e 100644 }; MODULE_DEVICE_TABLE(of, rockchip_spi_dt_match); diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c -index aee960a7d..e08de32ea 100644 +index aee960a7d7f9..e08de32ea454 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -691,6 +691,7 @@ static const struct of_device_id spidev_dt_ids[] = { @@ -1609206,7 +1609206,7 @@ index aee960a7d..e08de32ea 100644 }; MODULE_DEVICE_TABLE(of, spidev_dt_ids); diff --git a/drivers/staging/android/ion/Kconfig b/drivers/staging/android/ion/Kconfig -index 989fe84a9..7b7da9799 100644 +index 989fe84a9f9d..7b7da979991e 100644 --- a/drivers/staging/android/ion/Kconfig +++ b/drivers/staging/android/ion/Kconfig @@ -11,17 +11,4 @@ menuconfig ION @@ -1609229,7 +1609229,7 @@ index 989fe84a9..7b7da9799 100644 - regions, you should say Y here. +source "drivers/staging/android/ion/heaps/Kconfig" diff --git a/drivers/staging/android/ion/Makefile b/drivers/staging/android/ion/Makefile -index 5f4487b1a..7f8fd0f53 100644 +index 5f4487b1a224..7f8fd0f537b4 100644 --- a/drivers/staging/android/ion/Makefile +++ b/drivers/staging/android/ion/Makefile @@ -1,4 +1,4 @@ @@ -1609242,7 +1609242,7 @@ index 5f4487b1a..7f8fd0f53 100644 +obj-y += heaps/ diff --git a/drivers/staging/android/ion/heaps/Kconfig b/drivers/staging/android/ion/heaps/Kconfig new file mode 100755 -index 000000000..5034c45a3 +index 000000000000..5034c45a397d --- /dev/null +++ b/drivers/staging/android/ion/heaps/Kconfig @@ -0,0 +1,15 @@ @@ -1609263,7 +1609263,7 @@ index 000000000..5034c45a3 + regions, you should say Y here. diff --git a/drivers/staging/android/ion/heaps/Makefile b/drivers/staging/android/ion/heaps/Makefile new file mode 100755 -index 000000000..82e36e89e +index 000000000000..82e36e89e978 --- /dev/null +++ b/drivers/staging/android/ion/heaps/Makefile @@ -0,0 +1,5 @@ @@ -1609278,7 +1609278,7 @@ new mode 100755 similarity index 72% rename from drivers/staging/android/ion/ion_cma_heap.c rename to drivers/staging/android/ion/heaps/ion_cma_heap.c -index bf65e67ef..6ba7fd84c +index bf65e67ef9d8..6ba7fd84c9ee --- a/drivers/staging/android/ion/ion_cma_heap.c +++ b/drivers/staging/android/ion/heaps/ion_cma_heap.c @@ -7,6 +7,7 @@ @@ -1609397,7 +1609397,7 @@ new mode 100755 similarity index 87% rename from drivers/staging/android/ion/ion_page_pool.c rename to drivers/staging/android/ion/heaps/ion_page_pool.c -index 0198b886d..efd6ce4cc +index 0198b886d906..efd6ce4cc0ad --- a/drivers/staging/android/ion/ion_page_pool.c +++ b/drivers/staging/android/ion/heaps/ion_page_pool.c @@ -10,7 +10,7 @@ @@ -1609465,7 +1609465,7 @@ index 0198b886d..efd6ce4cc +EXPORT_SYMBOL_GPL(ion_page_pool_destroy); diff --git a/drivers/staging/android/ion/heaps/ion_page_pool.h b/drivers/staging/android/ion/heaps/ion_page_pool.h new file mode 100755 -index 000000000..10c79090c +index 000000000000..10c79090c7a0 --- /dev/null +++ b/drivers/staging/android/ion/heaps/ion_page_pool.h @@ -0,0 +1,67 @@ @@ -1609542,7 +1609542,7 @@ new mode 100755 similarity index 65% rename from drivers/staging/android/ion/ion_system_heap.c rename to drivers/staging/android/ion/heaps/ion_system_heap.c -index eac0632ab..45d23bea3 +index eac0632ab4e8..45d23bea3822 --- a/drivers/staging/android/ion/ion_system_heap.c +++ b/drivers/staging/android/ion/heaps/ion_system_heap.c @@ -9,12 +9,14 @@ @@ -1609858,7 +1609858,7 @@ index eac0632ab..45d23bea3 +module_exit(ion_system_heap_exit); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c -index e6d4a3ee6..3d9ec5f10 100644 +index e6d4a3ee6cda..3d9ec5f1045c 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -3,8 +3,11 @@ @@ -1610579,7 +1610579,7 @@ index e6d4a3ee6..3d9ec5f10 100644 subsys_initcall(ion_device_create); diff --git a/drivers/staging/android/ion/ion.h b/drivers/staging/android/ion/ion.h deleted file mode 100644 -index c199e88af..000000000 +index c199e88afc6c..000000000000 --- a/drivers/staging/android/ion/ion.h +++ /dev/null @@ -1,302 +0,0 @@ @@ -1610887,7 +1610887,7 @@ index c199e88af..000000000 -#endif /* _ION_H */ diff --git a/drivers/staging/android/ion/ion_buffer.c b/drivers/staging/android/ion/ion_buffer.c new file mode 100755 -index 000000000..9baca1a47 +index 000000000000..9baca1a472b6 --- /dev/null +++ b/drivers/staging/android/ion/ion_buffer.c @@ -0,0 +1,278 @@ @@ -1611171,7 +1611171,7 @@ index 000000000..9baca1a47 +} diff --git a/drivers/staging/android/ion/ion_dma_buf.c b/drivers/staging/android/ion/ion_dma_buf.c new file mode 100755 -index 000000000..47ae54af5 +index 000000000000..47ae54af5ccf --- /dev/null +++ b/drivers/staging/android/ion/ion_dma_buf.c @@ -0,0 +1,359 @@ @@ -1611535,7 +1611535,7 @@ index 000000000..47ae54af5 + return dmabuf; +} diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c -index ea7e0a244..aa29a4ee4 100644 +index ea7e0a244ffc..aa29a4ee48a3 100644 --- a/drivers/staging/android/ion/ion_heap.c +++ b/drivers/staging/android/ion/ion_heap.c @@ -15,12 +15,118 @@ @@ -1611941,7 +1611941,7 @@ index ea7e0a244..aa29a4ee4 100644 } diff --git a/drivers/staging/android/ion/ion_private.h b/drivers/staging/android/ion/ion_private.h new file mode 100755 -index 000000000..db4e90683 +index 000000000000..db4e90683f4c --- /dev/null +++ b/drivers/staging/android/ion/ion_private.h @@ -0,0 +1,58 @@ @@ -1612005,7 +1612005,7 @@ index 000000000..db4e90683 +#endif /* _ION_PRIVATE_H */ diff --git a/drivers/staging/android/ion/ion_protected_heap.c b/drivers/staging/android/ion/ion_protected_heap.c new file mode 100755 -index 000000000..c7f25373a +index 000000000000..c7f25373a744 --- /dev/null +++ b/drivers/staging/android/ion/ion_protected_heap.c @@ -0,0 +1,526 @@ @@ -1612537,7 +1612537,7 @@ index 000000000..c7f25373a +#endif diff --git a/drivers/staging/android/ion/ion_trace.h b/drivers/staging/android/ion/ion_trace.h new file mode 100755 -index 000000000..eacb47d4f +index 000000000000..eacb47d4f135 --- /dev/null +++ b/drivers/staging/android/ion/ion_trace.h @@ -0,0 +1,55 @@ @@ -1612598,7 +1612598,7 @@ index 000000000..eacb47d4f +#include diff --git a/drivers/staging/android/ion/rockchip/Makefile b/drivers/staging/android/ion/rockchip/Makefile new file mode 100755 -index 000000000..89265fcbb +index 000000000000..89265fcbbe6f --- /dev/null +++ b/drivers/staging/android/ion/rockchip/Makefile @@ -0,0 +1,3 @@ @@ -1612607,7 +1612607,7 @@ index 000000000..89265fcbb +obj-$(CONFIG_ION_ROCKCHIP_SNAPSHOT) += rockchip_ion_snapshot.o diff --git a/drivers/staging/android/ion/rockchip/rockchip_ion.c b/drivers/staging/android/ion/rockchip/rockchip_ion.c new file mode 100755 -index 000000000..d3c3d0685 +index 000000000000..d3c3d06856ad --- /dev/null +++ b/drivers/staging/android/ion/rockchip/rockchip_ion.c @@ -0,0 +1,224 @@ @@ -1612837,7 +1612837,7 @@ index 000000000..d3c3d0685 +MODULE_DEVICE_TABLE(of, rk_ion_match); diff --git a/drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c b/drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c new file mode 100755 -index 000000000..ab27d0531 +index 000000000000..ab27d05319ae --- /dev/null +++ b/drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c @@ -0,0 +1,145 @@ @@ -1612987,7 +1612987,7 @@ index 000000000..ab27d0531 + +postcore_initcall(rockchip_ion_snapshot_init); diff --git a/drivers/staging/blackbox/Kconfig b/drivers/staging/blackbox/Kconfig -index 0e985823c..7f1eb0e16 100644 +index 0e985823c2e8..7f1eb0e16e2d 100644 --- a/drivers/staging/blackbox/Kconfig +++ b/drivers/staging/blackbox/Kconfig @@ -106,3 +106,14 @@ config DEF_BLACKBOX_STORAGE @@ -1613006,7 +1613006,7 @@ index 0e985823c..7f1eb0e16 100644 + +endif diff --git a/drivers/staging/blackbox/Makefile b/drivers/staging/blackbox/Makefile -index 9befa81a1..77c1a37e5 100644 +index 9befa81a176e..77c1a37e5102 100644 --- a/drivers/staging/blackbox/Makefile +++ b/drivers/staging/blackbox/Makefile @@ -3,3 +3,5 @@ @@ -1613016,7 +1613016,7 @@ index 9befa81a1..77c1a37e5 100644 + +obj-$(CONFIG_BLACKBOX_ROCKCHIP) += rockchip/ diff --git a/drivers/staging/blackbox/blackbox_storage.c b/drivers/staging/blackbox/blackbox_storage.c -index 635e3aa03..aad08c729 100644 +index 635e3aa036ab..aad08c7291f1 100644 --- a/drivers/staging/blackbox/blackbox_storage.c +++ b/drivers/staging/blackbox/blackbox_storage.c @@ -62,7 +62,7 @@ static void do_kmsg_dump(struct kmsg_dumper *dumper, @@ -1613030,7 +1613030,7 @@ index 635e3aa03..aad08c729 100644 #define PSTORE_MOUNT_POINT "/sys/fs/pstore/" diff --git a/drivers/staging/blackbox/rockchip/Makefile b/drivers/staging/blackbox/rockchip/Makefile new file mode 100644 -index 000000000..8bef3d728 +index 000000000000..8bef3d7285ed --- /dev/null +++ b/drivers/staging/blackbox/rockchip/Makefile @@ -0,0 +1,4 @@ @@ -1613040,7 +1613040,7 @@ index 000000000..8bef3d728 +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 000000000..538f8fbd7 +index 000000000000..538f8fbd745d --- /dev/null +++ b/drivers/staging/blackbox/rockchip/system_adapter.c @@ -0,0 +1,312 @@ @@ -1613358,7 +1613358,7 @@ index 000000000..538f8fbd7 +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 000000000..30757db43 +index 000000000000..30757db43e42 --- /dev/null +++ b/drivers/staging/blackbox/rockchip/system_adapter_by_memory.c @@ -0,0 +1,313 @@ @@ -1613676,7 +1613676,7 @@ index 000000000..30757db43 +MODULE_DESCRIPTION("Blackbox for system"); +MODULE_AUTHOR("OHOS"); diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c -index aa9e0e31e..e1c667e8f 100644 +index aa9e0e31ef98..e1c667e8fe2a 100644 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -18,6 +18,7 @@ @@ -1614639,7 +1614639,7 @@ index aa9e0e31e..e1c667e8f 100644 module_platform_driver(rockchip_thermal_driver); diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c -index dd449945e..560b1b83d 100644 +index dd449945e1e5..560b1b83d057 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -542,6 +542,7 @@ int thermal_zone_device_is_enabled(struct thermal_zone_device *tz) @@ -1614651,7 +1614651,7 @@ index dd449945e..560b1b83d 100644 void thermal_zone_device_update(struct thermal_zone_device *tz, enum thermal_notify_event event) diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h -index 681209db4..5e80cb326 100644 +index 681209db42a8..5e80cb3264d9 100644 --- a/drivers/thermal/thermal_core.h +++ b/drivers/thermal/thermal_core.h @@ -179,6 +179,4 @@ of_thermal_get_trip_points(struct thermal_zone_device *tz) @@ -1614662,7 +1614662,7 @@ index 681209db4..5e80cb326 100644 - #endif /* __THERMAL_CORE_H__ */ diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h -index 0771cd226..fcbd557f3 100644 +index 0771cd226581..fcbd557f3866 100644 --- a/drivers/tty/serial/8250/8250.h +++ b/drivers/tty/serial/8250/8250.h @@ -48,6 +48,9 @@ struct uart_8250_dma { @@ -1614709,7 +1614709,7 @@ index 0771cd226..fcbd557f3 100644 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 43f2eed6d..c3953e7a5 100644 +index 43f2eed6df78..c3953e7a5e94 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -565,6 +565,7 @@ static void __init serial8250_isa_init_ports(void) @@ -1614752,7 +1614752,7 @@ index 43f2eed6d..c3953e7a5 100644 MODULE_LICENSE("GPL"); diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c -index 33ce4b218..13c0161fa 100644 +index 33ce4b218d9e..13c0161fa04c 100644 --- a/drivers/tty/serial/8250/8250_dma.c +++ b/drivers/tty/serial/8250/8250_dma.c @@ -11,6 +11,12 @@ @@ -1615042,7 +1615042,7 @@ index 33ce4b218..13c0161fa 100644 } EXPORT_SYMBOL_GPL(serial8250_release_dma); diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c -index ace221afe..c5bba750f 100644 +index ace221afeb03..c5bba750fcbc 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -33,6 +33,7 @@ @@ -1615233,7 +1615233,7 @@ index ace221afe..c5bba750f 100644 return 0; } diff --git a/drivers/tty/serial/8250/8250_dwlib.c b/drivers/tty/serial/8250/8250_dwlib.c -index 6d6a78eea..fee4f2933 100644 +index 6d6a78eead3e..fee4f2933919 100644 --- a/drivers/tty/serial/8250/8250_dwlib.c +++ b/drivers/tty/serial/8250/8250_dwlib.c @@ -106,6 +106,15 @@ void dw8250_setup_port(struct uart_port *p) @@ -1615263,7 +1615263,7 @@ index 6d6a78eea..fee4f2933 100644 } diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c -index b19908779..aa4f2f1ec 100644 +index b19908779e3b..aa4f2f1eccda 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -1538,8 +1538,13 @@ static inline void __start_tx(struct uart_port *port) @@ -1615476,7 +1615476,7 @@ index b19908779..aa4f2f1ec 100644 serial8250_rpm_put(up); diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c -index aa0026a98..379fe28f0 100644 +index aa0026a9839c..379fe28f0f63 100644 --- a/drivers/tty/vt/keyboard.c +++ b/drivers/tty/vt/keyboard.c @@ -488,6 +488,7 @@ static void fn_hold(struct vc_data *vc) @@ -1615490,7 +1615490,7 @@ index aa0026a98..379fe28f0 100644 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c old mode 100644 new mode 100755 -index 580604596..bc1d3385e +index 580604596499..bc1d3385e790 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1832,7 +1832,8 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) @@ -1615514,7 +1615514,7 @@ index 580604596..bc1d3385e } } diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c -index 4ac1c22f1..16befba71 100644 +index 4ac1c22f13be..16befba71a79 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[] = { @@ -1615542,7 +1615542,7 @@ index 4ac1c22f1..16befba71 100644 diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h old mode 100644 new mode 100755 -index 03d16a082..9bb4b8994 +index 03d16a08261d..9bb4b8994f5c --- a/drivers/usb/dwc2/core.h +++ b/drivers/usb/dwc2/core.h @@ -1061,6 +1061,7 @@ struct dwc2_hsotg { @@ -1615566,7 +1615566,7 @@ index 03d16a082..9bb4b8994 diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c old mode 100644 new mode 100755 -index da0df69cc..1b3dbb880 +index da0df69cc234..1b3dbb880008 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -4529,6 +4529,14 @@ static int dwc2_hsotg_udc_start(struct usb_gadget *gadget, @@ -1615599,7 +1615599,7 @@ index da0df69cc..1b3dbb880 diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c old mode 100644 new mode 100755 -index 9279d3d36..76ef2f024 +index 9279d3d3698c..76ef2f024478 --- a/drivers/usb/dwc2/hcd.c +++ b/drivers/usb/dwc2/hcd.c @@ -812,11 +812,13 @@ void dwc2_hc_halt(struct dwc2_hsotg *hsotg, struct dwc2_host_chan *chan, @@ -1615725,7 +1615725,7 @@ index 9279d3d36..76ef2f024 diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c old mode 100644 new mode 100755 -index d5f4ec1b7..4989ec761 +index d5f4ec1b73b1..4989ec761667 --- a/drivers/usb/dwc2/hcd_intr.c +++ b/drivers/usb/dwc2/hcd_intr.c @@ -1180,7 +1180,10 @@ static void dwc2_update_urb_state_abn(struct dwc2_hsotg *hsotg, @@ -1615761,7 +1615761,7 @@ index d5f4ec1b7..4989ec761 diff --git a/drivers/usb/dwc2/hcd_queue.c b/drivers/usb/dwc2/hcd_queue.c old mode 100644 new mode 100755 -index 94af71e98..b2e0721a3 +index 94af71e9856f..b2e0721a3eb8 --- a/drivers/usb/dwc2/hcd_queue.c +++ b/drivers/usb/dwc2/hcd_queue.c @@ -730,8 +730,14 @@ static int dwc2_uframe_schedule_split(struct dwc2_hsotg *hsotg, @@ -1615783,7 +1615783,7 @@ index 94af71e98..b2e0721a3 diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c old mode 100644 new mode 100755 -index 267543c3d..195cca1fe +index 267543c3dc38..195cca1fe3c6 --- a/drivers/usb/dwc2/params.c +++ b/drivers/usb/dwc2/params.c @@ -90,6 +90,8 @@ static void dwc2_set_rk_params(struct dwc2_hsotg *hsotg) @@ -1615822,7 +1615822,7 @@ index 267543c3d..195cca1fe diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c old mode 100644 new mode 100755 -index 9d0dd09a2..74c2ff080 +index 9d0dd09a2015..74c2ff080f3e --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c @@ -121,6 +121,74 @@ static int dwc2_get_dr_mode(struct dwc2_hsotg *hsotg) @@ -1616012,7 +1616012,7 @@ index 9d0dd09a2..74c2ff080 diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig old mode 100644 new mode 100755 -index 7a2304565..2133acf8e +index 7a2304565a73..2133acf8ee69 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -139,4 +139,14 @@ config USB_DWC3_QCOM @@ -1616033,7 +1616033,7 @@ index 7a2304565..2133acf8e diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile old mode 100644 new mode 100755 -index ae86da0dc..2259f8876 +index ae86da0dc5bd..2259f8876fb2 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile @@ -51,3 +51,4 @@ obj-$(CONFIG_USB_DWC3_MESON_G12A) += dwc3-meson-g12a.o @@ -1616044,7 +1616044,7 @@ index ae86da0dc..2259f8876 diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c old mode 100644 new mode 100755 -index 5709b959b..922247b81 +index 5709b959b1d9..922247b818b4 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -119,6 +119,7 @@ static void __dwc3_set_mode(struct work_struct *work) @@ -1616504,7 +1616504,7 @@ index 5709b959b..922247b81 diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h old mode 100644 new mode 100755 -index cbebe541f..6de6e6892 +index cbebe541f7e8..6de6e689265c --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -31,6 +31,8 @@ @@ -1616746,7 +1616746,7 @@ index cbebe541f..6de6e6892 diff --git a/drivers/usb/dwc3/debug.h b/drivers/usb/dwc3/debug.h old mode 100644 new mode 100755 -index 74d9c2c38..b2aa7272f +index 74d9c2c38193..b2aa7272f5de --- a/drivers/usb/dwc3/debug.h +++ b/drivers/usb/dwc3/debug.h @@ -221,8 +221,8 @@ static inline const char *dwc3_gadget_event_string(char *str, size_t size, @@ -1616774,7 +1616774,7 @@ index 74d9c2c38..b2aa7272f diff --git a/drivers/usb/dwc3/debugfs.c b/drivers/usb/dwc3/debugfs.c old mode 100644 new mode 100755 -index da8b62db4..f0f04d7b1 +index da8b62db49fb..f0f04d7b10ea --- a/drivers/usb/dwc3/debugfs.c +++ b/drivers/usb/dwc3/debugfs.c @@ -454,6 +454,10 @@ static ssize_t dwc3_mode_write(struct file *file, @@ -1616831,7 +1616831,7 @@ index da8b62db4..f0f04d7b1 diff --git a/drivers/usb/dwc3/drd.c b/drivers/usb/dwc3/drd.c old mode 100644 new mode 100755 -index 0a96f44cc..347795a8b +index 0a96f44ccca7..347795a8b3c1 --- a/drivers/usb/dwc3/drd.c +++ b/drivers/usb/dwc3/drd.c @@ -420,6 +420,12 @@ static void dwc3_drd_update(struct dwc3 *dwc) @@ -1616917,7 +1616917,7 @@ index 0a96f44cc..347795a8b mode = DWC3_GCTL_PRTCAP_HOST; diff --git a/drivers/usb/dwc3/dwc3-imx8mp.c b/drivers/usb/dwc3/dwc3-imx8mp.c new file mode 100755 -index 000000000..84c1a4ac2 +index 000000000000..84c1a4ac2444 --- /dev/null +++ b/drivers/usb/dwc3/dwc3-imx8mp.c @@ -0,0 +1,364 @@ @@ -1617288,7 +1617288,7 @@ index 000000000..84c1a4ac2 diff --git a/drivers/usb/dwc3/dwc3-keystone.c b/drivers/usb/dwc3/dwc3-keystone.c old mode 100644 new mode 100755 -index 9a99253d5..057056c09 +index 9a99253d5ba3..057056c0975e --- a/drivers/usb/dwc3/dwc3-keystone.c +++ b/drivers/usb/dwc3/dwc3-keystone.c @@ -99,13 +99,8 @@ static int kdwc3_probe(struct platform_device *pdev) @@ -1617310,7 +1617310,7 @@ index 9a99253d5..057056c09 diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c old mode 100644 new mode 100755 -index a5a8c5712..73c20a932 +index a5a8c5712bce..73c20a93208e --- a/drivers/usb/dwc3/dwc3-pci.c +++ b/drivers/usb/dwc3/dwc3-pci.c @@ -40,7 +40,9 @@ @@ -1617475,7 +1617475,7 @@ index a5a8c5712..73c20a932 diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c old mode 100644 new mode 100755 -index 416c94c61..ec51e2859 +index 416c94c612f5..ec51e2859d6e --- a/drivers/usb/dwc3/dwc3-qcom.c +++ b/drivers/usb/dwc3/dwc3-qcom.c @@ -678,6 +678,20 @@ static int dwc3_qcom_of_register_core(struct platform_device *pdev) @@ -1617502,7 +1617502,7 @@ index 416c94c61..ec51e2859 diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c old mode 100644 new mode 100755 -index 3cd294264..658739410 +index 3cd294264372..658739410992 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c @@ -597,11 +597,13 @@ static int dwc3_ep0_set_address(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl) @@ -1617535,7 +1617535,7 @@ index 3cd294264..658739410 diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c old mode 100644 new mode 100755 -index 076032128..18f771201 +index 076032128c34..18f7712010da --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -418,6 +418,7 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned int cmd, @@ -1618429,7 +1618429,7 @@ index 076032128..18f771201 diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h old mode 100644 new mode 100755 -index 0cd281949..77df4b6d6 +index 0cd281949970..77df4b6d6c13 --- a/drivers/usb/dwc3/gadget.h +++ b/drivers/usb/dwc3/gadget.h @@ -90,15 +90,17 @@ static inline void dwc3_gadget_move_started_request(struct dwc3_request *req) @@ -1618455,7 +1618455,7 @@ index 0cd281949..77df4b6d6 diff --git a/drivers/usb/dwc3/trace.c b/drivers/usb/dwc3/trace.c old mode 100644 new mode 100755 -index 1b45a9723..8a4fe12bb +index 1b45a9723eeb..8a4fe12bb2e3 --- a/drivers/usb/dwc3/trace.c +++ b/drivers/usb/dwc3/trace.c @@ -9,3 +9,10 @@ @@ -1618470,7 +1618470,7 @@ index 1b45a9723..8a4fe12bb +EXPORT_TRACEPOINT_SYMBOL_GPL(dwc3_ctrl_req); +EXPORT_TRACEPOINT_SYMBOL_GPL(dwc3_complete_trb); diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig -index 2d152571a..b5deb1be2 100644 +index 2d152571a7de..b5deb1be21b7 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -216,6 +216,12 @@ config USB_F_PRINTER @@ -1618541,7 +1618541,7 @@ index 2d152571a..b5deb1be2 100644 endif # USB_GADGET diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c -index a98079990..553382ce3 100644 +index a980799900e7..553382ce3837 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -13,6 +13,7 @@ @@ -1618701,7 +1618701,7 @@ index a98079990..553382ce3 100644 diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c old mode 100644 new mode 100755 -index d51ea1c05..f2a2f1193 +index d51ea1c052f2..f2a2f11936b3 --- a/drivers/usb/gadget/configfs.c +++ b/drivers/usb/gadget/configfs.c @@ -10,6 +10,32 @@ @@ -1619118,7 +1619118,7 @@ index d51ea1c05..f2a2f1193 } module_exit(gadget_cfs_exit); diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c -index 1eb4fa2e6..177645f32 100644 +index 1eb4fa2e623f..177645f3250a 100644 --- a/drivers/usb/gadget/epautoconf.c +++ b/drivers/usb/gadget/epautoconf.c @@ -67,6 +67,9 @@ struct usb_ep *usb_ep_autoconfig_ss( @@ -1619162,7 +1619162,7 @@ index 1eb4fa2e6..177645f32 100644 diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile old mode 100644 new mode 100755 -index 5d3a6cf02..14e5c906a +index 5d3a6cf02218..14e5c906a6e0 --- a/drivers/usb/gadget/function/Makefile +++ b/drivers/usb/gadget/function/Makefile @@ -50,3 +50,9 @@ usb_f_printer-y := f_printer.o @@ -1619178,7 +1619178,7 @@ index 5d3a6cf02..14e5c906a \ No newline at end of file diff --git a/drivers/usb/gadget/function/f_accessory.c b/drivers/usb/gadget/function/f_accessory.c new file mode 100755 -index 000000000..73185410d +index 000000000000..73185410d3a0 --- /dev/null +++ b/drivers/usb/gadget/function/f_accessory.c @@ -0,0 +1,1556 @@ @@ -1620740,7 +1620740,7 @@ index 000000000..73185410d +MODULE_LICENSE("GPL"); diff --git a/drivers/usb/gadget/function/f_audio_source.c b/drivers/usb/gadget/function/f_audio_source.c new file mode 100755 -index 000000000..c768a526b +index 000000000000..c768a526b315 --- /dev/null +++ b/drivers/usb/gadget/function/f_audio_source.c @@ -0,0 +1,1071 @@ @@ -1621818,7 +1621818,7 @@ index 000000000..c768a526b diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c old mode 100644 new mode 100755 -index b17acab77..7c30858fc +index b17acab77fe2..7c30858fc156 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -71,7 +71,7 @@ struct ffs_function { @@ -1621884,7 +1621884,7 @@ index b17acab77..7c30858fc diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c old mode 100644 new mode 100755 -index 950c9435b..73a28f8a3 +index 950c9435beec..73a28f8a38a7 --- a/drivers/usb/gadget/function/f_mass_storage.c +++ b/drivers/usb/gadget/function/f_mass_storage.c @@ -2301,6 +2301,16 @@ static void fsg_disable(struct usb_function *f) @@ -1621907,7 +1621907,7 @@ index 950c9435b..73a28f8a3 diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c old mode 100644 new mode 100755 -index 8fff995b8..566531bf6 +index 8fff995b8dd5..566531bf6cab --- a/drivers/usb/gadget/function/f_midi.c +++ b/drivers/usb/gadget/function/f_midi.c @@ -1222,6 +1222,65 @@ static void f_midi_free_inst(struct usb_function_instance *f) @@ -1622007,7 +1622007,7 @@ index 8fff995b8..566531bf6 diff --git a/drivers/usb/gadget/function/f_printer.c b/drivers/usb/gadget/function/f_printer.c old mode 100644 new mode 100755 -index c13bb29a1..939f174a9 +index c13bb29a160e..939f174a956c --- a/drivers/usb/gadget/function/f_printer.c +++ b/drivers/usb/gadget/function/f_printer.c @@ -51,6 +51,8 @@ @@ -1622030,7 +1622030,7 @@ index c13bb29a1..939f174a9 if (ida_is_empty(&printer_ida)) { diff --git a/drivers/usb/gadget/function/f_rndis.c b/drivers/usb/gadget/function/f_rndis.c -index ee95e8f5f..b550fcb23 100644 +index ee95e8f5f9d4..b550fcb234ff 100644 --- a/drivers/usb/gadget/function/f_rndis.c +++ b/drivers/usb/gadget/function/f_rndis.c @@ -115,9 +115,9 @@ static struct usb_interface_descriptor rndis_control_intf = { @@ -1622084,7 +1622084,7 @@ diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/ old mode 100644 new mode 100755 diff --git a/drivers/usb/gadget/function/f_uac1_legacy.c b/drivers/usb/gadget/function/f_uac1_legacy.c -index e2d7f6912..1519ac654 100644 +index e2d7f69128a0..1519ac654803 100644 --- a/drivers/usb/gadget/function/f_uac1_legacy.c +++ b/drivers/usb/gadget/function/f_uac1_legacy.c @@ -670,6 +670,11 @@ static int f_audio_get_alt(struct usb_function *f, unsigned intf) @@ -1622110,7 +1622110,7 @@ index e2d7f6912..1519ac654 100644 diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c old mode 100644 new mode 100755 -index 11cc6056b..f1ba000ac +index 11cc6056b590..f1ba000ac3f7 --- a/drivers/usb/gadget/function/f_uac2.c +++ b/drivers/usb/gadget/function/f_uac2.c @@ -44,6 +44,7 @@ @@ -1622666,7 +1622666,7 @@ index 11cc6056b..f1ba000ac } diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c -index 5d39aff26..ea8e0a34a 100644 +index 5d39aff263f0..ea8e0a34a6e0 100644 --- a/drivers/usb/gadget/function/f_uvc.c +++ b/drivers/usb/gadget/function/f_uvc.c @@ -124,6 +124,18 @@ static struct usb_interface_descriptor uvc_streaming_intf_alt0 = { @@ -1623391,7 +1623391,7 @@ index 5d39aff26..ea8e0a34a 100644 diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c old mode 100644 new mode 100755 -index 6c8b8f5b7..3482a26a6 +index 6c8b8f5b7e0f..3482a26a61a5 --- a/drivers/usb/gadget/function/u_audio.c +++ b/drivers/usb/gadget/function/u_audio.c @@ -16,6 +16,7 @@ @@ -1624004,7 +1624004,7 @@ index 6c8b8f5b7..3482a26a6 diff --git a/drivers/usb/gadget/function/u_audio.h b/drivers/usb/gadget/function/u_audio.h old mode 100644 new mode 100755 -index 5ea6b86f1..a218cdf77 +index 5ea6b86f1fda..a218cdf771fe --- a/drivers/usb/gadget/function/u_audio.h +++ b/drivers/usb/gadget/function/u_audio.h @@ -11,6 +11,14 @@ @@ -1624044,7 +1624044,7 @@ index 5ea6b86f1..a218cdf77 diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c old mode 100644 new mode 100755 -index 5e5f699a4..b47f498a7 +index 5e5f699a434f..b47f498a7daf --- a/drivers/usb/gadget/function/u_ether.c +++ b/drivers/usb/gadget/function/u_ether.c @@ -81,6 +81,7 @@ struct eth_dev { @@ -1624105,7 +1624105,7 @@ index 5e5f699a4..b47f498a7 diff --git a/drivers/usb/gadget/function/u_ether.h b/drivers/usb/gadget/function/u_ether.h old mode 100644 new mode 100755 -index 10dd64068..40144546d +index 10dd640684e2..40144546d1b0 --- a/drivers/usb/gadget/function/u_ether.h +++ b/drivers/usb/gadget/function/u_ether.h @@ -244,6 +244,18 @@ unsigned gether_get_qmult(struct net_device *net); @@ -1624130,7 +1624130,7 @@ index 10dd64068..40144546d diff --git a/drivers/usb/gadget/function/u_ether_configfs.h b/drivers/usb/gadget/function/u_ether_configfs.h old mode 100644 new mode 100755 -index f982e18a5..f558c3139 +index f982e18a5a78..f558c3139ebe --- a/drivers/usb/gadget/function/u_ether_configfs.h +++ b/drivers/usb/gadget/function/u_ether_configfs.h @@ -148,7 +148,20 @@ out: \ @@ -1624158,7 +1624158,7 @@ index f982e18a5..f558c3139 diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c old mode 100644 new mode 100755 -index 7b54e814a..948eabf3c +index 7b54e814aefb..948eabf3cebd --- a/drivers/usb/gadget/function/u_serial.c +++ b/drivers/usb/gadget/function/u_serial.c @@ -261,9 +261,7 @@ __acquires(&port->port_lock) @@ -1624192,7 +1624192,7 @@ index 7b54e814a..948eabf3c kfifo_free(&port->port_write_buf); diff --git a/drivers/usb/gadget/function/u_uac.h b/drivers/usb/gadget/function/u_uac.h new file mode 100755 -index 000000000..224ddc397 +index 000000000000..224ddc397c70 --- /dev/null +++ b/drivers/usb/gadget/function/u_uac.h @@ -0,0 +1,194 @@ @@ -1624394,7 +1624394,7 @@ diff --git a/drivers/usb/gadget/function/u_uac1.h b/drivers/usb/gadget/function/ old mode 100644 new mode 100755 diff --git a/drivers/usb/gadget/function/u_uac1_legacy.c b/drivers/usb/gadget/function/u_uac1_legacy.c -index 60ae8b2d3..2f149853a 100644 +index 60ae8b2d3f6a..2f149853a91b 100644 --- a/drivers/usb/gadget/function/u_uac1_legacy.c +++ b/drivers/usb/gadget/function/u_uac1_legacy.c @@ -119,6 +119,10 @@ static int playback_default_hw_params(struct gaudio_snd_dev *snd) @@ -1624411,7 +1624411,7 @@ index 60ae8b2d3..2f149853a 100644 diff --git a/drivers/usb/gadget/function/u_uac2.h b/drivers/usb/gadget/function/u_uac2.h old mode 100644 new mode 100755 -index b50357111..179d3ef6a +index b5035711172d..179d3ef6a195 --- a/drivers/usb/gadget/function/u_uac2.h +++ b/drivers/usb/gadget/function/u_uac2.h @@ -21,7 +21,9 @@ @@ -1624435,7 +1624435,7 @@ index b50357111..179d3ef6a struct mutex lock; diff --git a/drivers/usb/gadget/function/u_uvc.h b/drivers/usb/gadget/function/u_uvc.h -index 9a01a7d4f..3e92a28d8 100644 +index 9a01a7d4f17f..3e92a28d8d78 100644 --- a/drivers/usb/gadget/function/u_uvc.h +++ b/drivers/usb/gadget/function/u_uvc.h @@ -18,15 +18,18 @@ @@ -1624485,7 +1624485,7 @@ index 9a01a7d4f..3e92a28d8 100644 #endif /* U_UVC_H */ diff --git a/drivers/usb/gadget/function/uvc.h b/drivers/usb/gadget/function/uvc.h -index 6c4fc4913..499a5f8de 100644 +index 6c4fc4913f4f..499a5f8de73c 100644 --- a/drivers/usb/gadget/function/uvc.h +++ b/drivers/usb/gadget/function/uvc.h @@ -15,6 +15,7 @@ @@ -1624533,7 +1624533,7 @@ index 6c4fc4913..499a5f8de 100644 static inline struct uvc_device *to_uvc(struct usb_function *f) diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c -index 2db01170d..8a65f590f 100644 +index 2db01170d096..8a65f590fab1 100644 --- a/drivers/usb/gadget/function/uvc_configfs.c +++ b/drivers/usb/gadget/function/uvc_configfs.c @@ -12,6 +12,7 @@ @@ -1625047,7 +1625047,7 @@ index 2db01170d..8a65f590f 100644 }; diff --git a/drivers/usb/gadget/function/uvc_queue.c b/drivers/usb/gadget/function/uvc_queue.c -index cab1e3046..0f5e6fb93 100644 +index cab1e30462c2..0f5e6fb93d27 100644 --- a/drivers/usb/gadget/function/uvc_queue.c +++ b/drivers/usb/gadget/function/uvc_queue.c @@ -124,6 +124,14 @@ int uvcg_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type, @@ -1625066,7 +1625066,7 @@ index cab1e3046..0f5e6fb93 100644 if (ret) return ret; diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c -index 65abd55ce..4216c9147 100644 +index 65abd55ce234..4216c9147477 100644 --- a/drivers/usb/gadget/function/uvc_v4l2.c +++ b/drivers/usb/gadget/function/uvc_v4l2.c @@ -41,6 +41,7 @@ uvc_send_response(struct uvc_device *uvc, struct uvc_request_data *data) @@ -1625123,7 +1625123,7 @@ index 65abd55ce..4216c9147 100644 .poll = uvc_v4l2_poll, #ifndef CONFIG_MMU diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c -index 5ce548c23..cae5c2b62 100644 +index 5ce548c2359d..cae5c2b6283d 100644 --- a/drivers/usb/gadget/function/uvc_video.c +++ b/drivers/usb/gadget/function/uvc_video.c @@ -12,12 +12,14 @@ @@ -1625242,7 +1625242,7 @@ diff --git a/drivers/usb/gadget/legacy/audio.c b/drivers/usb/gadget/legacy/audio old mode 100644 new mode 100755 diff --git a/drivers/usb/gadget/legacy/webcam.c b/drivers/usb/gadget/legacy/webcam.c -index ff970a943..059deaed1 100644 +index ff970a943347..059deaed133b 100644 --- a/drivers/usb/gadget/legacy/webcam.c +++ b/drivers/usb/gadget/legacy/webcam.c @@ -386,6 +386,8 @@ webcam_bind(struct usb_composite_dev *cdev) @@ -1625257,7 +1625257,7 @@ index ff970a943..059deaed1 100644 diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c old mode 100644 new mode 100755 -index 3a3b5a03d..a0c281293 +index 3a3b5a03dda7..a0c281293530 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -29,6 +29,7 @@ @@ -1625462,7 +1625462,7 @@ index 3a3b5a03d..a0c281293 diff --git a/drivers/usb/gadget/udc/snps_udc_core.c b/drivers/usb/gadget/udc/snps_udc_core.c old mode 100644 new mode 100755 -index 6c726d2e1..d046c09fa +index 6c726d2e1788..d046c09fa566 --- a/drivers/usb/gadget/udc/snps_udc_core.c +++ b/drivers/usb/gadget/udc/snps_udc_core.c @@ -36,7 +36,6 @@ @@ -1625543,7 +1625543,7 @@ index 6c726d2e1..d046c09fa diff --git a/drivers/usb/gadget/udc/trace.c b/drivers/usb/gadget/udc/trace.c old mode 100644 new mode 100755 -index 7430624c0..e0e617280 +index 7430624c0bd7..e0e617280b12 --- a/drivers/usb/gadget/udc/trace.c +++ b/drivers/usb/gadget/udc/trace.c @@ -8,3 +8,6 @@ @@ -1625556,7 +1625556,7 @@ index 7430624c0..e0e617280 diff --git a/drivers/usb/gadget/udc/udc-xilinx.c b/drivers/usb/gadget/udc/udc-xilinx.c old mode 100644 new mode 100755 -index 096f56a09..78561630a +index 096f56a09e6a..78561630a9d7 --- a/drivers/usb/gadget/udc/udc-xilinx.c +++ b/drivers/usb/gadget/udc/udc-xilinx.c @@ -1960,7 +1960,7 @@ static void xudc_nonctrl_ep_handler(struct xusb_udc *udc, u8 epnum, @@ -1625571,7 +1625571,7 @@ index 096f56a09..78561630a diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile old mode 100644 new mode 100755 -index bc731332f..2c7155fae +index bc731332fed9..2c7155fae179 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -19,9 +19,7 @@ ifneq ($(CONFIG_USB_XHCI_DBGCAP), ) @@ -1625597,7 +1625597,7 @@ index bc731332f..2c7155fae diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c old mode 100644 new mode 100755 -index 2dcfc67f2..3e48737f8 +index 2dcfc67f2ba8..3e48737f893f --- a/drivers/usb/host/ehci-platform.c +++ b/drivers/usb/host/ehci-platform.c @@ -28,6 +28,7 @@ @@ -1625701,7 +1625701,7 @@ index 2dcfc67f2..3e48737f8 diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c old mode 100644 new mode 100755 -index 4a8456f12..492353678 +index 4a8456f12a73..4923536780ee --- a/drivers/usb/host/ohci-platform.c +++ b/drivers/usb/host/ohci-platform.c @@ -32,7 +32,7 @@ @@ -1625725,7 +1625725,7 @@ index 4a8456f12..492353678 diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c old mode 100644 new mode 100755 -index 7bb306741..ecc65c6b0 +index 7bb306741807..ecc65c6b011e --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c @@ -449,8 +449,13 @@ static int xhci_stop_device(struct xhci_hcd *xhci, int slot_id, int suspend) @@ -1625761,7 +1625761,7 @@ index 7bb306741..ecc65c6b0 diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c old mode 100644 new mode 100755 -index a8a9addb4..10c5eae5c +index a8a9addb4d25..10c5eae5c8f3 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -65,7 +65,7 @@ static struct xhci_segment *xhci_segment_alloc(struct xhci_hcd *xhci, @@ -1626127,7 +1626127,7 @@ index a8a9addb4..10c5eae5c diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c old mode 100644 new mode 100755 -index 86c4bc9df..7f0461750 +index 86c4bc9df3b8..7f0461750146 --- a/drivers/usb/host/xhci-mtk-sch.c +++ b/drivers/usb/host/xhci-mtk-sch.c @@ -32,6 +32,15 @@ @@ -1626606,7 +1626606,7 @@ index 86c4bc9df..7f0461750 diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c old mode 100644 new mode 100755 -index 1c331577f..09f2ddbfe +index 1c331577fca9..09f2ddbfe8b9 --- a/drivers/usb/host/xhci-mtk.c +++ b/drivers/usb/host/xhci-mtk.c @@ -344,15 +344,6 @@ static void usb_wakeup_set(struct xhci_hcd_mtk *mtk, bool enable) @@ -1626645,7 +1626645,7 @@ index 1c331577f..09f2ddbfe diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci-mtk.h old mode 100644 new mode 100755 -index 3e2c607b5..607dbe474 +index 3e2c607b5d64..607dbe474d91 --- a/drivers/usb/host/xhci-mtk.h +++ b/drivers/usb/host/xhci-mtk.h @@ -22,14 +22,10 @@ @@ -1626717,7 +1626717,7 @@ index 3e2c607b5..607dbe474 - #endif /* _XHCI_MTK_H_ */ diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index aff65cefe..8b6ae499c 100644 +index aff65cefead2..8b6ae499c3a5 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -288,10 +288,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) @@ -1626735,7 +1626735,7 @@ index aff65cefe..8b6ae499c 100644 diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c old mode 100644 new mode 100755 -index 972a44b2a..045383d38 +index 972a44b2a7f1..045383d38470 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -184,6 +184,41 @@ static const struct of_device_id usb_xhci_of_match[] = { @@ -1626806,7 +1626806,7 @@ index 972a44b2a..045383d38 diff --git a/drivers/usb/host/xhci-plat.h b/drivers/usb/host/xhci-plat.h old mode 100644 new mode 100755 -index 561d0b7bc..e726a5723 +index 561d0b7bce09..e726a572321d --- a/drivers/usb/host/xhci-plat.h +++ b/drivers/usb/host/xhci-plat.h @@ -13,6 +13,7 @@ @@ -1626832,7 +1626832,7 @@ index 561d0b7bc..e726a5723 diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c old mode 100644 new mode 100755 -index b69b8c7e7..78345e425 +index b69b8c7e7966..78345e425264 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -57,8 +57,10 @@ @@ -1628323,7 +1628323,7 @@ index b69b8c7e7..78345e425 diff --git a/drivers/usb/host/xhci-trace.c b/drivers/usb/host/xhci-trace.c old mode 100644 new mode 100755 -index d0070814d..c4178357b +index d0070814d1ea..c4178357bd92 --- a/drivers/usb/host/xhci-trace.c +++ b/drivers/usb/host/xhci-trace.c @@ -12,3 +12,6 @@ @@ -1628336,7 +1628336,7 @@ index d0070814d..c4178357b diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c old mode 100644 new mode 100755 -index b069fe3f8..3f9596d36 +index b069fe3f8ab0..3f9596d36366 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -21,7 +21,6 @@ @@ -1628764,7 +1628764,7 @@ index b069fe3f8..3f9596d36 diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h old mode 100644 new mode 100755 -index c7749f6e3..06243f940 +index c7749f6e3474..06243f940bd4 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1422,7 +1422,7 @@ union xhci_trb { @@ -1628936,7 +1628936,7 @@ index c7749f6e3..06243f940 * TODO: As per spec Isochronous IDT transmissions are supported. We bypass * them anyways as we where unable to find a device that matches the diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c -index b8e1109f0..9cffdd43c 100644 +index b8e1109f0e0d..9cffdd43cf01 100644 --- a/drivers/usb/storage/scsiglue.c +++ b/drivers/usb/storage/scsiglue.c @@ -102,6 +102,10 @@ static int slave_configure(struct scsi_device *sdev) @@ -1628951,7 +1628951,7 @@ index b8e1109f0..9cffdd43c 100644 max_sectors = PAGE_SIZE >> 9; if (queue_max_hw_sectors(sdev->request_queue) > max_sectors) diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h -index 20dcbccb2..ede0d8c9b 100644 +index 20dcbccb290b..ede0d8c9b3d0 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h @@ -927,6 +927,12 @@ UNUSUAL_DEV( 0x05e3, 0x0723, 0x9451, 0x9451, @@ -1628968,7 +1628968,7 @@ index 20dcbccb2..ede0d8c9b 100644 * Reported by Hanno Boeck * Taken from the Lycoris Kernel diff --git a/drivers/usb/storage/unusual_uas.h b/drivers/usb/storage/unusual_uas.h -index 1f8c9b16a..c22b02648 100644 +index 1f8c9b16a0fb..c22b026481f2 100644 --- a/drivers/usb/storage/unusual_uas.h +++ b/drivers/usb/storage/unusual_uas.h @@ -76,6 +76,12 @@ UNUSUAL_DEV(0x0b05, 0x1932, 0x0000, 0x9999, @@ -1629013,7 +1629013,7 @@ index 1f8c9b16a..c22b02648 100644 diff --git a/drivers/usb/typec/altmodes/Kconfig b/drivers/usb/typec/altmodes/Kconfig old mode 100644 new mode 100755 -index 60d375e9c..1a6b5e872 +index 60d375e9c3c7..1a6b5e872b0d --- a/drivers/usb/typec/altmodes/Kconfig +++ b/drivers/usb/typec/altmodes/Kconfig @@ -4,6 +4,7 @@ menu "USB Type-C Alternate Mode drivers" @@ -1629027,7 +1629027,7 @@ index 60d375e9c..1a6b5e872 diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c old mode 100644 new mode 100755 -index 0d4b1c0ee..5021ea910 +index 0d4b1c0eeefb..5021ea91075e --- a/drivers/usb/typec/altmodes/displayport.c +++ b/drivers/usb/typec/altmodes/displayport.c @@ -11,12 +11,14 @@ @@ -1629228,7 +1629228,7 @@ index 0d4b1c0ee..5021ea910 diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c old mode 100644 new mode 100755 -index 9d3a35b20..4fd17c662 +index 9d3a35b2046d..4fd17c662d15 --- a/drivers/usb/typec/class.c +++ b/drivers/usb/typec/class.c @@ -11,6 +11,7 @@ @@ -1629895,7 +1629895,7 @@ index 9d3a35b20..4fd17c662 diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c old mode 100644 new mode 100755 -index 1276112ed..271e27409 +index 1276112edeff..271e2740992f --- a/drivers/usb/typec/mux/intel_pmc_mux.c +++ b/drivers/usb/typec/mux/intel_pmc_mux.c @@ -176,6 +176,7 @@ static int hsl_orientation(struct pmc_usb_port *port) @@ -1629954,7 +1629954,7 @@ index 1276112ed..271e27409 diff --git a/drivers/usb/typec/tcpm/Kconfig b/drivers/usb/typec/tcpm/Kconfig old mode 100644 new mode 100755 -index 073fd2ea5..82a6cd2b2 +index 073fd2ea5e0b..82a6cd2b2493 --- a/drivers/usb/typec/tcpm/Kconfig +++ b/drivers/usb/typec/tcpm/Kconfig @@ -20,6 +20,13 @@ config TYPEC_TCPCI @@ -1629974,7 +1629974,7 @@ index 073fd2ea5..82a6cd2b2 diff --git a/drivers/usb/typec/tcpm/Makefile b/drivers/usb/typec/tcpm/Makefile old mode 100644 new mode 100755 -index 7d499f356..d2ca41aea +index 7d499f3569fd..d2ca41aea970 --- a/drivers/usb/typec/tcpm/Makefile +++ b/drivers/usb/typec/tcpm/Makefile @@ -4,6 +4,7 @@ obj-$(CONFIG_TYPEC_FUSB302) += fusb302.o @@ -1629988,7 +1629988,7 @@ index 7d499f356..d2ca41aea diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c old mode 100644 new mode 100755 -index 700e38e92..3b36e5353 +index 700e38e92152..3b36e5353a94 --- a/drivers/usb/typec/tcpm/fusb302.c +++ b/drivers/usb/typec/tcpm/fusb302.c @@ -343,12 +343,11 @@ static int fusb302_sw_reset(struct fusb302_chip *chip) @@ -1630068,7 +1630068,7 @@ index 700e38e92..3b36e5353 diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c old mode 100644 new mode 100755 -index 069affa5c..fde55279d +index 069affa5cb1e..fde55279da6d --- a/drivers/usb/typec/tcpm/tcpci.c +++ b/drivers/usb/typec/tcpm/tcpci.c @@ -18,7 +18,20 @@ @@ -1630368,7 +1630368,7 @@ index 069affa5c..fde55279d diff --git a/drivers/usb/typec/tcpm/tcpci.h b/drivers/usb/typec/tcpm/tcpci.h old mode 100644 new mode 100755 -index 5ef07a56d..2be7a77d4 +index 5ef07a56d67a..2be7a77d400e --- a/drivers/usb/typec/tcpm/tcpci.h +++ b/drivers/usb/typec/tcpm/tcpci.h @@ -8,6 +8,8 @@ @@ -1630491,7 +1630491,7 @@ index 5ef07a56d..2be7a77d4 struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data); diff --git a/drivers/usb/typec/tcpm/tcpci_husb311.c b/drivers/usb/typec/tcpm/tcpci_husb311.c new file mode 100755 -index 000000000..72a524b5c +index 000000000000..72a524b5cc98 --- /dev/null +++ b/drivers/usb/typec/tcpm/tcpci_husb311.c @@ -0,0 +1,298 @@ @@ -1630796,7 +1630796,7 @@ index 000000000..72a524b5c diff --git a/drivers/usb/typec/tcpm/tcpci_maxim.c b/drivers/usb/typec/tcpm/tcpci_maxim.c old mode 100644 new mode 100755 -index 723d7dd38..7b39cbd09 +index 723d7dd38f75..7b39cbd099c2 --- a/drivers/usb/typec/tcpm/tcpci_maxim.c +++ b/drivers/usb/typec/tcpm/tcpci_maxim.c @@ -22,6 +22,9 @@ @@ -1630938,7 +1630938,7 @@ index 723d7dd38..7b39cbd09 diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c old mode 100644 new mode 100755 -index cf0e6a808..e28c57d19 +index cf0e6a80815a..e28c57d194a3 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -76,6 +76,8 @@ @@ -1633031,7 +1633031,7 @@ index cf0e6a808..e28c57d19 diff --git a/drivers/usb/typec/tcpm/wcove.c b/drivers/usb/typec/tcpm/wcove.c old mode 100644 new mode 100755 -index 7e9c279bf..5d1253396 +index 7e9c279bf49d..5d125339687a --- a/drivers/usb/typec/tcpm/wcove.c +++ b/drivers/usb/typec/tcpm/wcove.c @@ -356,7 +356,8 @@ static int wcove_set_pd_rx(struct tcpc_dev *tcpc, bool on) @@ -1633047,7 +1633047,7 @@ index 7e9c279bf..5d1253396 diff --git a/drivers/usb/typec/ucsi/Kconfig b/drivers/usb/typec/ucsi/Kconfig old mode 100644 new mode 100755 -index 2192d7c4f..5e9b37b3f +index 2192d7c4fec7..5e9b37b3f25e --- a/drivers/usb/typec/ucsi/Kconfig +++ b/drivers/usb/typec/ucsi/Kconfig @@ -3,6 +3,7 @@ @@ -1633061,7 +1633061,7 @@ index 2192d7c4f..5e9b37b3f diff --git a/drivers/usb/typec/ucsi/displayport.c b/drivers/usb/typec/ucsi/displayport.c old mode 100644 new mode 100755 -index 261131c9e..73cd5bf35 +index 261131c9e37c..73cd5bf35047 --- a/drivers/usb/typec/ucsi/displayport.c +++ b/drivers/usb/typec/ucsi/displayport.c @@ -49,6 +49,7 @@ static int ucsi_displayport_enter(struct typec_altmode *alt, u32 *vdo) @@ -1633143,7 +1633143,7 @@ index 261131c9e..73cd5bf35 diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c old mode 100644 new mode 100755 -index cd3689005..8ed0f49e6 +index cd3689005c31..8ed0f49e6df8 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -613,6 +613,7 @@ static void ucsi_unregister_partner(struct ucsi_connector *con) @@ -1633287,7 +1633287,7 @@ index cd3689005..8ed0f49e6 diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h old mode 100644 new mode 100755 -index fce23ad16..b3450d87f +index fce23ad16c6d..b3450d87f324 --- a/drivers/usb/typec/ucsi/ucsi.h +++ b/drivers/usb/typec/ucsi/ucsi.h @@ -9,6 +9,8 @@ @@ -1633309,7 +1633309,7 @@ index fce23ad16..b3450d87f int ucsi_send_command(struct ucsi *ucsi, u64 command, diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig -index 427a993c7..e4c52ca82 100644 +index 427a993c7f57..e4c52ca82e88 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -18,6 +18,7 @@ source "drivers/gpu/host1x/Kconfig" @@ -1633332,7 +1633332,7 @@ index 427a993c7..e4c52ca82 100644 tristate default n diff --git a/drivers/video/Makefile b/drivers/video/Makefile -index df7650ade..b355e2fcb 100644 +index df7650adede9..b355e2fcb423 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -6,6 +6,7 @@ obj-$(CONFIG_VT) += console/ @@ -1633344,7 +1633344,7 @@ index df7650ade..b355e2fcb 100644 obj-y += fbdev/ diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c -index 1cf924f3a..cd3676b96 100644 +index 1cf924f3aecc..cd3676b96fb0 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -603,6 +603,8 @@ static int pwm_backlight_probe(struct platform_device *pdev) @@ -1633358,7 +1633358,7 @@ index 1cf924f3a..cd3676b96 100644 diff --git a/drivers/video/rockchip/Kconfig b/drivers/video/rockchip/Kconfig new file mode 100755 -index 000000000..6548dd38b +index 000000000000..6548dd38b534 --- /dev/null +++ b/drivers/video/rockchip/Kconfig @@ -0,0 +1,11 @@ @@ -1633375,7 +1633375,7 @@ index 000000000..6548dd38b +source "drivers/video/rockchip/vtunnel/Kconfig" diff --git a/drivers/video/rockchip/Makefile b/drivers/video/rockchip/Makefile new file mode 100755 -index 000000000..867ac56fe +index 000000000000..867ac56fe5b7 --- /dev/null +++ b/drivers/video/rockchip/Makefile @@ -0,0 +1,11 @@ @@ -1633392,7 +1633392,7 @@ index 000000000..867ac56fe +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 000000000..bfbd396b2 +index 000000000000..bfbd396b2706 --- /dev/null +++ b/drivers/video/rockchip/dvbm/Kconfig @@ -0,0 +1,18 @@ @@ -1633416,7 +1633416,7 @@ index 000000000..bfbd396b2 +endif diff --git a/drivers/video/rockchip/dvbm/Makefile b/drivers/video/rockchip/dvbm/Makefile new file mode 100644 -index 000000000..9096c3472 +index 000000000000..9096c34720ec --- /dev/null +++ b/drivers/video/rockchip/dvbm/Makefile @@ -0,0 +1,5 @@ @@ -1633427,7 +1633427,7 @@ index 000000000..9096c3472 +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 000000000..abff28da7 +index 000000000000..abff28da714e --- /dev/null +++ b/drivers/video/rockchip/dvbm/rockchip_dvbm.c @@ -0,0 +1,752 @@ @@ -1634185,7 +1634185,7 @@ index 000000000..abff28da7 +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 000000000..9f298b7dd +index 000000000000..9f298b7dd47d --- /dev/null +++ b/drivers/video/rockchip/dvbm/rockchip_dvbm.h @@ -0,0 +1,214 @@ @@ -1634405,7 +1634405,7 @@ index 000000000..9f298b7dd +#endif diff --git a/drivers/video/rockchip/iep/Kconfig b/drivers/video/rockchip/iep/Kconfig new file mode 100755 -index 000000000..cd8ba653f +index 000000000000..cd8ba653f9ea --- /dev/null +++ b/drivers/video/rockchip/iep/Kconfig @@ -0,0 +1,10 @@ @@ -1634421,7 +1634421,7 @@ index 000000000..cd8ba653f +endmenu diff --git a/drivers/video/rockchip/iep/Makefile b/drivers/video/rockchip/iep/Makefile new file mode 100755 -index 000000000..f4dba6e93 +index 000000000000..f4dba6e9379a --- /dev/null +++ b/drivers/video/rockchip/iep/Makefile @@ -0,0 +1,4 @@ @@ -1634431,7 +1634431,7 @@ index 000000000..f4dba6e93 +obj-$(CONFIG_IEP) += iep.o diff --git a/drivers/video/rockchip/iep/hw_iep_config_addr.h b/drivers/video/rockchip/iep/hw_iep_config_addr.h new file mode 100755 -index 000000000..1f4a07062 +index 000000000000..1f4a0706233f --- /dev/null +++ b/drivers/video/rockchip/iep/hw_iep_config_addr.h @@ -0,0 +1,99 @@ @@ -1634536,7 +1634536,7 @@ index 000000000..1f4a07062 +#endif diff --git a/drivers/video/rockchip/iep/hw_iep_reg.c b/drivers/video/rockchip/iep/hw_iep_reg.c new file mode 100755 -index 000000000..331a50865 +index 000000000000..331a50865045 --- /dev/null +++ b/drivers/video/rockchip/iep/hw_iep_reg.c @@ -0,0 +1,1530 @@ @@ -1636072,7 +1636072,7 @@ index 000000000..331a50865 + diff --git a/drivers/video/rockchip/iep/hw_iep_reg.h b/drivers/video/rockchip/iep/hw_iep_reg.h new file mode 100755 -index 000000000..03d9fe92c +index 000000000000..03d9fe92ca23 --- /dev/null +++ b/drivers/video/rockchip/iep/hw_iep_reg.h @@ -0,0 +1,525 @@ @@ -1636603,7 +1636603,7 @@ index 000000000..03d9fe92c +#endif diff --git a/drivers/video/rockchip/iep/iep.h b/drivers/video/rockchip/iep/iep.h new file mode 100755 -index 000000000..94e372e6a +index 000000000000..94e372e6a471 --- /dev/null +++ b/drivers/video/rockchip/iep/iep.h @@ -0,0 +1,276 @@ @@ -1636885,7 +1636885,7 @@ index 000000000..94e372e6a +#endif diff --git a/drivers/video/rockchip/iep/iep_drv.c b/drivers/video/rockchip/iep/iep_drv.c new file mode 100755 -index 000000000..f0cfc7164 +index 000000000000..f0cfc7164e39 --- /dev/null +++ b/drivers/video/rockchip/iep/iep_drv.c @@ -0,0 +1,1320 @@ @@ -1638211,7 +1638211,7 @@ index 000000000..f0cfc7164 +#endif diff --git a/drivers/video/rockchip/iep/iep_drv.h b/drivers/video/rockchip/iep/iep_drv.h new file mode 100755 -index 000000000..19160c6ff +index 000000000000..19160c6ffccd --- /dev/null +++ b/drivers/video/rockchip/iep/iep_drv.h @@ -0,0 +1,159 @@ @@ -1638376,7 +1638376,7 @@ index 000000000..19160c6ff + diff --git a/drivers/video/rockchip/iep/iep_iommu_drm.c b/drivers/video/rockchip/iep/iep_iommu_drm.c new file mode 100755 -index 000000000..411f567a6 +index 000000000000..411f567a6e4e --- /dev/null +++ b/drivers/video/rockchip/iep/iep_iommu_drm.c @@ -0,0 +1,465 @@ @@ -1638847,7 +1638847,7 @@ index 000000000..411f567a6 +} diff --git a/drivers/video/rockchip/iep/iep_iommu_ops.c b/drivers/video/rockchip/iep/iep_iommu_ops.c new file mode 100755 -index 000000000..e84772237 +index 000000000000..e84772237b89 --- /dev/null +++ b/drivers/video/rockchip/iep/iep_iommu_ops.c @@ -0,0 +1,244 @@ @@ -1639097,7 +1639097,7 @@ index 000000000..e84772237 +} diff --git a/drivers/video/rockchip/iep/iep_iommu_ops.h b/drivers/video/rockchip/iep/iep_iommu_ops.h new file mode 100755 -index 000000000..9b71d53a5 +index 000000000000..9b71d53a51eb --- /dev/null +++ b/drivers/video/rockchip/iep/iep_iommu_ops.h @@ -0,0 +1,121 @@ @@ -1639224,7 +1639224,7 @@ index 000000000..9b71d53a5 +#endif diff --git a/drivers/video/rockchip/mpp/Kconfig b/drivers/video/rockchip/mpp/Kconfig new file mode 100755 -index 000000000..53342703a +index 000000000000..53342703a6ee --- /dev/null +++ b/drivers/video/rockchip/mpp/Kconfig @@ -0,0 +1,78 @@ @@ -1639308,7 +1639308,7 @@ index 000000000..53342703a +endif diff --git a/drivers/video/rockchip/mpp/Makefile b/drivers/video/rockchip/mpp/Makefile new file mode 100755 -index 000000000..42ec696bc +index 000000000000..42ec696bc9d7 --- /dev/null +++ b/drivers/video/rockchip/mpp/Makefile @@ -0,0 +1,30 @@ @@ -1639344,7 +1639344,7 @@ index 000000000..42ec696bc +obj-$(CONFIG_ROCKCHIP_MPP_SERVICE) += rk_vcodec.o diff --git a/drivers/video/rockchip/mpp/hack/mpp_hack_px30.c b/drivers/video/rockchip/mpp/hack/mpp_hack_px30.c new file mode 100755 -index 000000000..07912bcc3 +index 000000000000..07912bcc3436 --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_hack_px30.c @@ -0,0 +1,241 @@ @@ -1639591,7 +1639591,7 @@ index 000000000..07912bcc3 +} diff --git a/drivers/video/rockchip/mpp/hack/mpp_hack_px30.h b/drivers/video/rockchip/mpp/hack/mpp_hack_px30.h new file mode 100755 -index 000000000..c8402e30d +index 000000000000..c8402e30d810 --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_hack_px30.h @@ -0,0 +1,27 @@ @@ -1639624,7 +1639624,7 @@ index 000000000..c8402e30d +#endif diff --git a/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_hack_rk3568.c b/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_hack_rk3568.c new file mode 100755 -index 000000000..c2bb2687f +index 000000000000..c2bb2687fc3d --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_hack_rk3568.c @@ -0,0 +1,732 @@ @@ -1640362,7 +1640362,7 @@ index 000000000..c2bb2687f +} diff --git a/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_link_hack_rk3568.c b/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_link_hack_rk3568.c new file mode 100755 -index 000000000..900b63a57 +index 000000000000..900b63a57673 --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_link_hack_rk3568.c @@ -0,0 +1,213 @@ @@ -1640581,7 +1640581,7 @@ index 000000000..900b63a57 +} diff --git a/drivers/video/rockchip/mpp/mpp_av1dec.c b/drivers/video/rockchip/mpp/mpp_av1dec.c new file mode 100644 -index 000000000..33e118ae6 +index 000000000000..33e118ae6450 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_av1dec.c @@ -0,0 +1,1343 @@ @@ -1641930,7 +1641930,7 @@ index 000000000..33e118ae6 +}; diff --git a/drivers/video/rockchip/mpp/mpp_common.c b/drivers/video/rockchip/mpp/mpp_common.c new file mode 100755 -index 000000000..d43ebf450 +index 000000000000..d43ebf450ed2 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_common.c @@ -0,0 +1,2610 @@ @@ -1644546,7 +1644546,7 @@ index 000000000..d43ebf450 +#endif diff --git a/drivers/video/rockchip/mpp/mpp_common.h b/drivers/video/rockchip/mpp/mpp_common.h new file mode 100755 -index 000000000..8daeb0838 +index 000000000000..8daeb0838170 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_common.h @@ -0,0 +1,853 @@ @@ -1645405,7 +1645405,7 @@ index 000000000..8daeb0838 +#endif diff --git a/drivers/video/rockchip/mpp/mpp_debug.h b/drivers/video/rockchip/mpp/mpp_debug.h new file mode 100755 -index 000000000..4108c69da +index 000000000000..4108c69da894 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_debug.h @@ -0,0 +1,138 @@ @@ -1645549,7 +1645549,7 @@ index 000000000..4108c69da +#endif diff --git a/drivers/video/rockchip/mpp/mpp_iep2.c b/drivers/video/rockchip/mpp/mpp_iep2.c new file mode 100755 -index 000000000..8d1926957 +index 000000000000..8d1926957f69 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iep2.c @@ -0,0 +1,1038 @@ @@ -1646593,7 +1646593,7 @@ index 000000000..8d1926957 + diff --git a/drivers/video/rockchip/mpp/mpp_iommu.c b/drivers/video/rockchip/mpp/mpp_iommu.c new file mode 100755 -index 000000000..1abbfb74f +index 000000000000..1abbfb74f4e2 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iommu.c @@ -0,0 +1,645 @@ @@ -1647244,7 +1647244,7 @@ index 000000000..1abbfb74f +} diff --git a/drivers/video/rockchip/mpp/mpp_iommu.h b/drivers/video/rockchip/mpp/mpp_iommu.h new file mode 100755 -index 000000000..87d1b5c61 +index 000000000000..87d1b5c612d2 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iommu.h @@ -0,0 +1,170 @@ @@ -1647420,7 +1647420,7 @@ index 000000000..87d1b5c61 +#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 000000000..39ff16c21 +index 000000000000..39ff16c21ee9 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iommu_av1d.c @@ -0,0 +1,997 @@ @@ -1648423,7 +1648423,7 @@ index 000000000..39ff16c21 +}; diff --git a/drivers/video/rockchip/mpp/mpp_jpgdec.c b/drivers/video/rockchip/mpp/mpp_jpgdec.c new file mode 100755 -index 000000000..753b061f2 +index 000000000000..753b061f22ea --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_jpgdec.c @@ -0,0 +1,643 @@ @@ -1649072,7 +1649072,7 @@ index 000000000..753b061f2 +EXPORT_SYMBOL(rockchip_jpgdec_driver); diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec.c b/drivers/video/rockchip/mpp/mpp_rkvdec.c new file mode 100755 -index 000000000..4310a09a5 +index 000000000000..4310a09a5ce0 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec.c @@ -0,0 +1,2039 @@ @@ -1651117,7 +1651117,7 @@ index 000000000..4310a09a5 +EXPORT_SYMBOL(rockchip_rkvdec_driver); diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2.c b/drivers/video/rockchip/mpp/mpp_rkvdec2.c new file mode 100755 -index 000000000..a463fc2ee +index 000000000000..a463fc2eeccc --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2.c @@ -0,0 +1,1800 @@ @@ -1652923,7 +1652923,7 @@ index 000000000..a463fc2ee +EXPORT_SYMBOL(rockchip_rkvdec2_driver); diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2.h b/drivers/video/rockchip/mpp/mpp_rkvdec2.h new file mode 100755 -index 000000000..3eabdace7 +index 000000000000..3eabdace77f4 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2.h @@ -0,0 +1,242 @@ @@ -1653171,7 +1653171,7 @@ index 000000000..3eabdace7 +#endif diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c new file mode 100755 -index 000000000..7c5a58df1 +index 000000000000..7c5a58df1865 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c @@ -0,0 +1,2511 @@ @@ -1655688,7 +1655688,7 @@ index 000000000..7c5a58df1 +} diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2_link.h b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.h new file mode 100755 -index 000000000..518927e94 +index 000000000000..518927e9481e --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.h @@ -0,0 +1,238 @@ @@ -1655932,7 +1655932,7 @@ index 000000000..518927e94 +#endif diff --git a/drivers/video/rockchip/mpp/mpp_rkvenc.c b/drivers/video/rockchip/mpp/mpp_rkvenc.c new file mode 100755 -index 000000000..c71c03fb9 +index 000000000000..c71c03fb91eb --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvenc.c @@ -0,0 +1,1506 @@ @@ -1657444,7 +1657444,7 @@ index 000000000..c71c03fb9 +}; diff --git a/drivers/video/rockchip/mpp/mpp_rkvenc2.c b/drivers/video/rockchip/mpp/mpp_rkvenc2.c new file mode 100755 -index 000000000..111c106ae +index 000000000000..111c106ae65c --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvenc2.c @@ -0,0 +1,2693 @@ @@ -1660143,7 +1660143,7 @@ index 000000000..111c106ae +}; diff --git a/drivers/video/rockchip/mpp/mpp_service.c b/drivers/video/rockchip/mpp/mpp_service.c new file mode 100755 -index 000000000..c04d6fbf5 +index 000000000000..c04d6fbf553b --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_service.c @@ -0,0 +1,499 @@ @@ -1660648,7 +1660648,7 @@ index 000000000..c04d6fbf5 +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 000000000..c0dc382a1 +index 000000000000..c0dc382a1872 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vdpp.c @@ -0,0 +1,784 @@ @@ -1661438,7 +1661438,7 @@ index 000000000..c0dc382a1 +EXPORT_SYMBOL(rockchip_vdpp_driver); diff --git a/drivers/video/rockchip/mpp/mpp_vdpu1.c b/drivers/video/rockchip/mpp/mpp_vdpu1.c new file mode 100755 -index 000000000..6ddf5dae7 +index 000000000000..6ddf5dae73f3 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vdpu1.c @@ -0,0 +1,972 @@ @@ -1662416,7 +1662416,7 @@ index 000000000..6ddf5dae7 +EXPORT_SYMBOL(rockchip_vdpu1_driver); diff --git a/drivers/video/rockchip/mpp/mpp_vdpu2.c b/drivers/video/rockchip/mpp/mpp_vdpu2.c new file mode 100755 -index 000000000..d5a6a3017 +index 000000000000..d5a6a3017208 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vdpu2.c @@ -0,0 +1,808 @@ @@ -1663230,7 +1663230,7 @@ index 000000000..d5a6a3017 +EXPORT_SYMBOL(rockchip_vdpu2_driver); diff --git a/drivers/video/rockchip/mpp/mpp_vepu1.c b/drivers/video/rockchip/mpp/mpp_vepu1.c new file mode 100755 -index 000000000..18f685a2e +index 000000000000..18f685a2e948 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vepu1.c @@ -0,0 +1,795 @@ @@ -1664031,7 +1664031,7 @@ index 000000000..18f685a2e +EXPORT_SYMBOL(rockchip_vepu1_driver); diff --git a/drivers/video/rockchip/mpp/mpp_vepu2.c b/drivers/video/rockchip/mpp/mpp_vepu2.c new file mode 100755 -index 000000000..fb5f5e5c2 +index 000000000000..fb5f5e5c28e3 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vepu2.c @@ -0,0 +1,1278 @@ @@ -1665315,7 +1665315,7 @@ index 000000000..fb5f5e5c2 +EXPORT_SYMBOL(rockchip_vepu2_driver); diff --git a/drivers/video/rockchip/mpp/rockchip_iep2_regs.h b/drivers/video/rockchip/mpp/rockchip_iep2_regs.h new file mode 100755 -index 000000000..d85a30dfb +index 000000000000..d85a30dfb84f --- /dev/null +++ b/drivers/video/rockchip/mpp/rockchip_iep2_regs.h @@ -0,0 +1,183 @@ @@ -1665504,7 +1665504,7 @@ index 000000000..d85a30dfb + diff --git a/drivers/video/rockchip/mpp_osal/Kconfig b/drivers/video/rockchip/mpp_osal/Kconfig new file mode 100644 -index 000000000..75cd70286 +index 000000000000..75cd7028615f --- /dev/null +++ b/drivers/video/rockchip/mpp_osal/Kconfig @@ -0,0 +1,8 @@ @@ -1665518,7 +1665518,7 @@ index 000000000..75cd70286 + 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 000000000..f4ca9643f +index 000000000000..f4ca9643fff2 --- /dev/null +++ b/drivers/video/rockchip/mpp_osal/Makefile @@ -0,0 +1,2 @@ @@ -1665526,7 +1665526,7 @@ index 000000000..f4ca9643f +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 000000000..a778b1904 +index 000000000000..a778b1904044 --- /dev/null +++ b/drivers/video/rockchip/mpp_osal/mpp_osal.c @@ -0,0 +1,30 @@ @@ -1665562,7 +1665562,7 @@ index 000000000..a778b1904 +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 000000000..d798dfd0c +index 000000000000..d798dfd0c293 --- /dev/null +++ b/drivers/video/rockchip/mpp_osal/mpp_osal.h @@ -0,0 +1,18 @@ @@ -1665586,7 +1665586,7 @@ index 000000000..d798dfd0c +#endif diff --git a/drivers/video/rockchip/rga/Kconfig b/drivers/video/rockchip/rga/Kconfig new file mode 100755 -index 000000000..6023b2eb2 +index 000000000000..6023b2eb23a7 --- /dev/null +++ b/drivers/video/rockchip/rga/Kconfig @@ -0,0 +1,10 @@ @@ -1665602,7 +1665602,7 @@ index 000000000..6023b2eb2 +endmenu diff --git a/drivers/video/rockchip/rga/Makefile b/drivers/video/rockchip/rga/Makefile new file mode 100755 -index 000000000..58dd4c6a3 +index 000000000000..58dd4c6a3e42 --- /dev/null +++ b/drivers/video/rockchip/rga/Makefile @@ -0,0 +1,4 @@ @@ -1665612,7 +1665612,7 @@ index 000000000..58dd4c6a3 +obj-$(CONFIG_ROCKCHIP_RGA) += rga.o diff --git a/drivers/video/rockchip/rga/RGA_API.c b/drivers/video/rockchip/rga/RGA_API.c new file mode 100755 -index 000000000..947a9b925 +index 000000000000..947a9b925f60 --- /dev/null +++ b/drivers/video/rockchip/rga/RGA_API.c @@ -0,0 +1,201 @@ @@ -1665819,7 +1665819,7 @@ index 000000000..947a9b925 + diff --git a/drivers/video/rockchip/rga/RGA_API.h b/drivers/video/rockchip/rga/RGA_API.h new file mode 100755 -index 000000000..ade17d03e +index 000000000000..ade17d03e85c --- /dev/null +++ b/drivers/video/rockchip/rga/RGA_API.h @@ -0,0 +1,40 @@ @@ -1665865,7 +1665865,7 @@ index 000000000..ade17d03e +#endif diff --git a/drivers/video/rockchip/rga/rga.h b/drivers/video/rockchip/rga/rga.h new file mode 100755 -index 000000000..e54a6efba +index 000000000000..e54a6efba39f --- /dev/null +++ b/drivers/video/rockchip/rga/rga.h @@ -0,0 +1,508 @@ @@ -1666379,7 +1666379,7 @@ index 000000000..e54a6efba +#endif /*_RK29_IPP_DRIVER_H_*/ diff --git a/drivers/video/rockchip/rga/rga_drv.c b/drivers/video/rockchip/rga/rga_drv.c new file mode 100755 -index 000000000..2498023d4 +index 000000000000..2498023d4a4a --- /dev/null +++ b/drivers/video/rockchip/rga/rga_drv.c @@ -0,0 +1,2549 @@ @@ -1668934,7 +1668934,7 @@ index 000000000..2498023d4 +MODULE_LICENSE("GPL"); diff --git a/drivers/video/rockchip/rga/rga_mmu_info.c b/drivers/video/rockchip/rga/rga_mmu_info.c new file mode 100755 -index 000000000..8825183d9 +index 000000000000..8825183d92fc --- /dev/null +++ b/drivers/video/rockchip/rga/rga_mmu_info.c @@ -0,0 +1,1315 @@ @@ -1670255,7 +1670255,7 @@ index 000000000..8825183d9 + diff --git a/drivers/video/rockchip/rga/rga_mmu_info.h b/drivers/video/rockchip/rga/rga_mmu_info.h new file mode 100755 -index 000000000..3e70894c7 +index 000000000000..3e70894c7ee7 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_mmu_info.h @@ -0,0 +1,24 @@ @@ -1670285,7 +1670285,7 @@ index 000000000..3e70894c7 + diff --git a/drivers/video/rockchip/rga/rga_reg_info.c b/drivers/video/rockchip/rga/rga_reg_info.c new file mode 100755 -index 000000000..94a6305b8 +index 000000000000..94a6305b870b --- /dev/null +++ b/drivers/video/rockchip/rga/rga_reg_info.c @@ -0,0 +1,1587 @@ @@ -1671878,7 +1671878,7 @@ index 000000000..94a6305b8 + diff --git a/drivers/video/rockchip/rga/rga_reg_info.h b/drivers/video/rockchip/rga/rga_reg_info.h new file mode 100755 -index 000000000..565e8f72d +index 000000000000..565e8f72d7f0 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_reg_info.h @@ -0,0 +1,467 @@ @@ -1672351,7 +1672351,7 @@ index 000000000..565e8f72d + diff --git a/drivers/video/rockchip/rga/rga_rop.h b/drivers/video/rockchip/rga/rga_rop.h new file mode 100755 -index 000000000..ed9758711 +index 000000000000..ed9758711022 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_rop.h @@ -0,0 +1,56 @@ @@ -1672413,7 +1672413,7 @@ index 000000000..ed9758711 +#endif diff --git a/drivers/video/rockchip/rga/rga_type.h b/drivers/video/rockchip/rga/rga_type.h new file mode 100755 -index 000000000..ce3610ab9 +index 000000000000..ce3610ab9b67 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_type.h @@ -0,0 +1,49 @@ @@ -1672468,7 +1672468,7 @@ index 000000000..ce3610ab9 + diff --git a/drivers/video/rockchip/rga2/Kconfig b/drivers/video/rockchip/rga2/Kconfig new file mode 100755 -index 000000000..49a0f62b9 +index 000000000000..49a0f62b99a0 --- /dev/null +++ b/drivers/video/rockchip/rga2/Kconfig @@ -0,0 +1,30 @@ @@ -1672504,7 +1672504,7 @@ index 000000000..49a0f62b9 +endif diff --git a/drivers/video/rockchip/rga2/Makefile b/drivers/video/rockchip/rga2/Makefile new file mode 100755 -index 000000000..60181fffa +index 000000000000..60181fffa4c8 --- /dev/null +++ b/drivers/video/rockchip/rga2/Makefile @@ -0,0 +1,5 @@ @@ -1672515,7 +1672515,7 @@ index 000000000..60181fffa +obj-$(CONFIG_ROCKCHIP_RGA2) += rga2.o diff --git a/drivers/video/rockchip/rga2/RGA2_API.c b/drivers/video/rockchip/rga2/RGA2_API.c new file mode 100755 -index 000000000..0be2c1ae6 +index 000000000000..0be2c1ae64b6 --- /dev/null +++ b/drivers/video/rockchip/rga2/RGA2_API.c @@ -0,0 +1,23 @@ @@ -1672544,7 +1672544,7 @@ index 000000000..0be2c1ae6 + diff --git a/drivers/video/rockchip/rga2/RGA2_API.h b/drivers/video/rockchip/rga2/RGA2_API.h new file mode 100755 -index 000000000..1fa38ed6c +index 000000000000..1fa38ed6cffe --- /dev/null +++ b/drivers/video/rockchip/rga2/RGA2_API.h @@ -0,0 +1,59 @@ @@ -1672609,7 +1672609,7 @@ index 000000000..1fa38ed6c +#endif diff --git a/drivers/video/rockchip/rga2/rga2.h b/drivers/video/rockchip/rga2/rga2.h new file mode 100755 -index 000000000..335970c44 +index 000000000000..335970c44ed6 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2.h @@ -0,0 +1,792 @@ @@ -1673407,7 +1673407,7 @@ index 000000000..335970c44 +#endif /*_RK29_IPP_DRIVER_H_*/ diff --git a/drivers/video/rockchip/rga2/rga2_debugger.c b/drivers/video/rockchip/rga2/rga2_debugger.c new file mode 100755 -index 000000000..589241322 +index 000000000000..589241322cf4 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_debugger.c @@ -0,0 +1,396 @@ @@ -1673809,7 +1673809,7 @@ index 000000000..589241322 +#endif /* #ifdef CONFIG_ROCKCHIP_RGA2_PROC_FS */ diff --git a/drivers/video/rockchip/rga2/rga2_debugger.h b/drivers/video/rockchip/rga2/rga2_debugger.h new file mode 100755 -index 000000000..33b2f43e9 +index 000000000000..33b2f43e9f8a --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_debugger.h @@ -0,0 +1,120 @@ @@ -1673935,7 +1673935,7 @@ index 000000000..33b2f43e9 + diff --git a/drivers/video/rockchip/rga2/rga2_drv.c b/drivers/video/rockchip/rga2/rga2_drv.c new file mode 100755 -index 000000000..ca5218f3e +index 000000000000..ca5218f3e09f --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_drv.c @@ -0,0 +1,2273 @@ @@ -1676214,7 +1676214,7 @@ index 000000000..ca5218f3e +MODULE_LICENSE("GPL"); diff --git a/drivers/video/rockchip/rga2/rga2_mmu_info.c b/drivers/video/rockchip/rga2/rga2_mmu_info.c new file mode 100755 -index 000000000..2b05c9356 +index 000000000000..2b05c9356c3a --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_mmu_info.c @@ -0,0 +1,1831 @@ @@ -1678051,7 +1678051,7 @@ index 000000000..2b05c9356 + diff --git a/drivers/video/rockchip/rga2/rga2_mmu_info.h b/drivers/video/rockchip/rga2/rga2_mmu_info.h new file mode 100755 -index 000000000..a823f2fe7 +index 000000000000..a823f2fe7c3a --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_mmu_info.h @@ -0,0 +1,35 @@ @@ -1678092,7 +1678092,7 @@ index 000000000..a823f2fe7 + diff --git a/drivers/video/rockchip/rga2/rga2_reg_info.c b/drivers/video/rockchip/rga2/rga2_reg_info.c new file mode 100755 -index 000000000..a6c154989 +index 000000000000..a6c154989dd1 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_reg_info.c @@ -0,0 +1,1689 @@ @@ -1679787,7 +1679787,7 @@ index 000000000..a6c154989 +} diff --git a/drivers/video/rockchip/rga2/rga2_reg_info.h b/drivers/video/rockchip/rga2/rga2_reg_info.h new file mode 100755 -index 000000000..7aaac7d35 +index 000000000000..7aaac7d3502b --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_reg_info.h @@ -0,0 +1,331 @@ @@ -1680124,7 +1680124,7 @@ index 000000000..7aaac7d35 + diff --git a/drivers/video/rockchip/rga2/rga2_rop.h b/drivers/video/rockchip/rga2/rga2_rop.h new file mode 100755 -index 000000000..dc2a343f4 +index 000000000000..dc2a343f4c5c --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_rop.h @@ -0,0 +1,56 @@ @@ -1680186,7 +1680186,7 @@ index 000000000..dc2a343f4 +#endif diff --git a/drivers/video/rockchip/rga2/rga2_type.h b/drivers/video/rockchip/rga2/rga2_type.h new file mode 100755 -index 000000000..30f5df2f3 +index 000000000000..30f5df2f38e5 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_type.h @@ -0,0 +1,49 @@ @@ -1680241,7 +1680241,7 @@ index 000000000..30f5df2f3 + diff --git a/drivers/video/rockchip/rga3/Kconfig b/drivers/video/rockchip/rga3/Kconfig new file mode 100644 -index 000000000..c8c96b2d6 +index 000000000000..c8c96b2d67ff --- /dev/null +++ b/drivers/video/rockchip/rga3/Kconfig @@ -0,0 +1,37 @@ @@ -1680284,7 +1680284,7 @@ index 000000000..c8c96b2d6 +endif diff --git a/drivers/video/rockchip/rga3/Makefile b/drivers/video/rockchip/rga3/Makefile new file mode 100644 -index 000000000..11f401de2 +index 000000000000..11f401de2ae0 --- /dev/null +++ b/drivers/video/rockchip/rga3/Makefile @@ -0,0 +1,9 @@ @@ -1680299,7 +1680299,7 @@ index 000000000..11f401de2 +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 000000000..2a60a1ae7 +index 000000000000..2a60a1ae72db --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga.h @@ -0,0 +1,944 @@ @@ -1681249,7 +1681249,7 @@ index 000000000..2a60a1ae7 +#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 000000000..add2f41bd +index 000000000000..add2f41bda78 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga2_reg_info.h @@ -0,0 +1,477 @@ @@ -1681732,7 +1681732,7 @@ index 000000000..add2f41bd + 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 000000000..4db80cfb0 +index 000000000000..4db80cfb09ee --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga3_reg_info.h @@ -0,0 +1,521 @@ @@ -1682259,7 +1682259,7 @@ index 000000000..4db80cfb0 + 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 000000000..32e83cc9c +index 000000000000..32e83cc9c9f9 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_common.h @@ -0,0 +1,49 @@ @@ -1682314,7 +1682314,7 @@ index 000000000..32e83cc9c +#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 000000000..c274fe87f +index 000000000000..c274fe87f070 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_debugger.h @@ -0,0 +1,145 @@ @@ -1682465,7 +1682465,7 @@ index 000000000..c274fe87f + 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 000000000..2ff0857a6 +index 000000000000..2ff0857a66a9 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_dma_buf.h @@ -0,0 +1,46 @@ @@ -1682517,7 +1682517,7 @@ index 000000000..2ff0857a6 + 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 000000000..e9743a403 +index 000000000000..e9743a40327b --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_drv.h @@ -0,0 +1,463 @@ @@ -1682986,7 +1682986,7 @@ index 000000000..e9743a403 +#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 000000000..7e3bbeebb +index 000000000000..7e3bbeebbc3a --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_fence.h @@ -0,0 +1,101 @@ @@ -1683093,7 +1683093,7 @@ index 000000000..7e3bbeebb +#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 000000000..46f7531aa +index 000000000000..46f7531aa88f --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_hw_config.h @@ -0,0 +1,81 @@ @@ -1683180,7 +1683180,7 @@ index 000000000..46f7531aa +#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 000000000..b80a1f48b +index 000000000000..b80a1f48bb25 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_iommu.h @@ -0,0 +1,79 @@ @@ -1683265,7 +1683265,7 @@ index 000000000..b80a1f48b + 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 000000000..0fc776173 +index 000000000000..0fc776173f16 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_job.h @@ -0,0 +1,53 @@ @@ -1683324,7 +1683324,7 @@ index 000000000..0fc776173 +#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 000000000..d68fd75dc +index 000000000000..d68fd75dcb45 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_mm.h @@ -0,0 +1,67 @@ @@ -1683397,7 +1683397,7 @@ index 000000000..d68fd75dc +#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 000000000..8792e8d64 +index 000000000000..8792e8d64dfc --- /dev/null +++ b/drivers/video/rockchip/rga3/rga2_reg_info.c @@ -0,0 +1,2742 @@ @@ -1686145,7 +1686145,7 @@ index 000000000..8792e8d64 +}; 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 000000000..2b61833aa +index 000000000000..2b61833aa4a3 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga3_reg_info.c @@ -0,0 +1,2191 @@ @@ -1688342,7 +1688342,7 @@ index 000000000..2b61833aa +}; diff --git a/drivers/video/rockchip/rga3/rga_common.c b/drivers/video/rockchip/rga3/rga_common.c new file mode 100644 -index 000000000..80d4821fb +index 000000000000..80d4821fb321 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_common.c @@ -0,0 +1,772 @@ @@ -1689120,7 +1689120,7 @@ index 000000000..80d4821fb +} diff --git a/drivers/video/rockchip/rga3/rga_debugger.c b/drivers/video/rockchip/rga3/rga_debugger.c new file mode 100644 -index 000000000..fe2103147 +index 000000000000..fe2103147845 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_debugger.c @@ -0,0 +1,970 @@ @@ -1690096,7 +1690096,7 @@ index 000000000..fe2103147 +#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 000000000..db34db5af +index 000000000000..db34db5af86c --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_dma_buf.c @@ -0,0 +1,546 @@ @@ -1690648,7 +1690648,7 @@ index 000000000..db34db5af +} diff --git a/drivers/video/rockchip/rga3/rga_drv.c b/drivers/video/rockchip/rga3/rga_drv.c new file mode 100644 -index 000000000..ec3c3451d +index 000000000000..ec3c3451d76c --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_drv.c @@ -0,0 +1,1614 @@ @@ -1692268,7 +1692268,7 @@ index 000000000..ec3c3451d +#endif diff --git a/drivers/video/rockchip/rga3/rga_fence.c b/drivers/video/rockchip/rga3/rga_fence.c new file mode 100644 -index 000000000..7d831d55d +index 000000000000..7d831d55d15d --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_fence.c @@ -0,0 +1,146 @@ @@ -1692420,7 +1692420,7 @@ index 000000000..7d831d55d +} 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 000000000..0cf2599b9 +index 000000000000..0cf2599b931e --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_hw_config.c @@ -0,0 +1,352 @@ @@ -1692778,7 +1692778,7 @@ index 000000000..0cf2599b9 +}; diff --git a/drivers/video/rockchip/rga3/rga_iommu.c b/drivers/video/rockchip/rga3/rga_iommu.c new file mode 100644 -index 000000000..6ef9cbc0d +index 000000000000..6ef9cbc0d5d2 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_iommu.c @@ -0,0 +1,425 @@ @@ -1693209,7 +1693209,7 @@ index 000000000..6ef9cbc0d +} diff --git a/drivers/video/rockchip/rga3/rga_job.c b/drivers/video/rockchip/rga3/rga_job.c new file mode 100644 -index 000000000..fae613bbf +index 000000000000..fae613bbf716 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_job.c @@ -0,0 +1,1423 @@ @@ -1694638,7 +1694638,7 @@ index 000000000..fae613bbf +} diff --git a/drivers/video/rockchip/rga3/rga_mm.c b/drivers/video/rockchip/rga3/rga_mm.c new file mode 100644 -index 000000000..de7e9a6fd +index 000000000000..de7e9a6fd7fa --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_mm.c @@ -0,0 +1,2229 @@ @@ -1696873,7 +1696873,7 @@ index 000000000..de7e9a6fd +} diff --git a/drivers/video/rockchip/rga3/rga_policy.c b/drivers/video/rockchip/rga3/rga_policy.c new file mode 100644 -index 000000000..c87ce1881 +index 000000000000..c87ce1881cff --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_policy.c @@ -0,0 +1,426 @@ @@ -1697305,7 +1697305,7 @@ index 000000000..c87ce1881 +} diff --git a/drivers/video/rockchip/rve/Kconfig b/drivers/video/rockchip/rve/Kconfig new file mode 100644 -index 000000000..d28b9d059 +index 000000000000..d28b9d0599cf --- /dev/null +++ b/drivers/video/rockchip/rve/Kconfig @@ -0,0 +1,29 @@ @@ -1697340,7 +1697340,7 @@ index 000000000..d28b9d059 +endif diff --git a/drivers/video/rockchip/rve/Makefile b/drivers/video/rockchip/rve/Makefile new file mode 100644 -index 000000000..e475b7717 +index 000000000000..e475b7717510 --- /dev/null +++ b/drivers/video/rockchip/rve/Makefile @@ -0,0 +1,9 @@ @@ -1697355,7 +1697355,7 @@ index 000000000..e475b7717 +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 000000000..922e9e3bf +index 000000000000..922e9e3bfb47 --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve.h @@ -0,0 +1,72 @@ @@ -1697433,7 +1697433,7 @@ index 000000000..922e9e3bf +#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 000000000..8dbb46850 +index 000000000000..8dbb46850532 --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_debugger.h @@ -0,0 +1,132 @@ @@ -1697571,7 +1697571,7 @@ index 000000000..8dbb46850 + 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 000000000..8d9f188c9 +index 000000000000..8d9f188c93e2 --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_drv.h @@ -0,0 +1,332 @@ @@ -1697909,7 +1697909,7 @@ index 000000000..8d9f188c9 +#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 000000000..e70b6ac04 +index 000000000000..e70b6ac0442b --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_fence.h @@ -0,0 +1,32 @@ @@ -1697947,7 +1697947,7 @@ index 000000000..e70b6ac04 +#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 000000000..b2a86f317 +index 000000000000..b2a86f317e5f --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_job.h @@ -0,0 +1,53 @@ @@ -1698006,7 +1698006,7 @@ index 000000000..b2a86f317 +#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 000000000..05df28037 +index 000000000000..05df28037a83 --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_reg.h @@ -0,0 +1,88 @@ @@ -1698100,7 +1698100,7 @@ index 000000000..05df28037 + diff --git a/drivers/video/rockchip/rve/rve_debugger.c b/drivers/video/rockchip/rve/rve_debugger.c new file mode 100644 -index 000000000..f15643540 +index 000000000000..f156435405cf --- /dev/null +++ b/drivers/video/rockchip/rve/rve_debugger.c @@ -0,0 +1,566 @@ @@ -1698672,7 +1698672,7 @@ index 000000000..f15643540 + diff --git a/drivers/video/rockchip/rve/rve_drv.c b/drivers/video/rockchip/rve/rve_drv.c new file mode 100644 -index 000000000..b4b460437 +index 000000000000..b4b460437b65 --- /dev/null +++ b/drivers/video/rockchip/rve/rve_drv.c @@ -0,0 +1,897 @@ @@ -1699575,7 +1699575,7 @@ index 000000000..b4b460437 +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 000000000..8d48f8033 +index 000000000000..8d48f8033fa7 --- /dev/null +++ b/drivers/video/rockchip/rve/rve_fence.c @@ -0,0 +1,136 @@ @@ -1699717,7 +1699717,7 @@ index 000000000..8d48f8033 +} diff --git a/drivers/video/rockchip/rve/rve_job.c b/drivers/video/rockchip/rve/rve_job.c new file mode 100644 -index 000000000..36b6ab63e +index 000000000000..36b6ab63e36f --- /dev/null +++ b/drivers/video/rockchip/rve/rve_job.c @@ -0,0 +1,1028 @@ @@ -1700751,7 +1700751,7 @@ index 000000000..36b6ab63e +} diff --git a/drivers/video/rockchip/rve/rve_reg.c b/drivers/video/rockchip/rve/rve_reg.c new file mode 100644 -index 000000000..44b305cce +index 000000000000..44b305cce0db --- /dev/null +++ b/drivers/video/rockchip/rve/rve_reg.c @@ -0,0 +1,277 @@ @@ -1701034,7 +1701034,7 @@ index 000000000..44b305cce +} diff --git a/drivers/video/rockchip/vehicle/Kconfig b/drivers/video/rockchip/vehicle/Kconfig new file mode 100644 -index 000000000..e61c86484 +index 000000000000..e61c864842f2 --- /dev/null +++ b/drivers/video/rockchip/vehicle/Kconfig @@ -0,0 +1,41 @@ @@ -1701081,7 +1701081,7 @@ index 000000000..e61c86484 +endif diff --git a/drivers/video/rockchip/vehicle/Makefile b/drivers/video/rockchip/vehicle/Makefile new file mode 100644 -index 000000000..7da28b305 +index 000000000000..7da28b30548a --- /dev/null +++ b/drivers/video/rockchip/vehicle/Makefile @@ -0,0 +1,26 @@ @@ -1701113,7 +1701113,7 @@ index 000000000..7da28b305 + 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 000000000..8f7ac2429 +index 000000000000..8f7ac2429bef --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle-csi2-dphy-common.h @@ -0,0 +1,381 @@ @@ -1701500,7 +1701500,7 @@ index 000000000..8f7ac2429 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_ad.h b/drivers/video/rockchip/vehicle/vehicle_ad.h new file mode 100644 -index 000000000..a83233b79 +index 000000000000..a83233b791e0 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad.h @@ -0,0 +1,83 @@ @@ -1701589,7 +1701589,7 @@ index 000000000..a83233b79 +#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 000000000..9547e8870 +index 000000000000..9547e887031a --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_7181.c @@ -0,0 +1,608 @@ @@ -1702203,7 +1702203,7 @@ index 000000000..9547e8870 + 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 000000000..b4e572ed0 +index 000000000000..b4e572ed0ef8 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_7181.h @@ -0,0 +1,19 @@ @@ -1702228,7 +1702228,7 @@ index 000000000..b4e572ed0 + 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 000000000..a015f0d7a +index 000000000000..a015f0d7a204 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_gc2145.c @@ -0,0 +1,1149 @@ @@ -1703383,7 +1703383,7 @@ index 000000000..a015f0d7a + 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 000000000..1934bc217 +index 000000000000..1934bc2172ad --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_gc2145.h @@ -0,0 +1,18 @@ @@ -1703407,7 +1703407,7 @@ index 000000000..1934bc217 +#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 000000000..e3926a513 +index 000000000000..e3926a5139ae --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_max96714.c @@ -0,0 +1,539 @@ @@ -1703952,7 +1703952,7 @@ index 000000000..e3926a513 +} 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 000000000..5f1ce6fcd +index 000000000000..5f1ce6fcda6a --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_max96714.h @@ -0,0 +1,18 @@ @@ -1703976,7 +1703976,7 @@ index 000000000..5f1ce6fcd +#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 000000000..3c6784832 +index 000000000000..3c67848320d8 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6188.c @@ -0,0 +1,1206 @@ @@ -1705188,7 +1705188,7 @@ index 000000000..3c6784832 +} 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 000000000..4e9c6a61e +index 000000000000..4e9c6a61ed61 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6188.h @@ -0,0 +1,18 @@ @@ -1705212,7 +1705212,7 @@ index 000000000..4e9c6a61e +#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 000000000..af9274dd3 +index 000000000000..af9274dd35e7 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6324.c @@ -0,0 +1,2238 @@ @@ -1707456,7 +1707456,7 @@ index 000000000..af9274dd3 +} 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 000000000..b28780737 +index 000000000000..b28780737969 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6324.h @@ -0,0 +1,18 @@ @@ -1707480,7 +1707480,7 @@ index 000000000..b28780737 +#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 000000000..08888dbe6 +index 000000000000..08888dbe6c1b --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_tp2825.c @@ -0,0 +1,1039 @@ @@ -1708525,7 +1708525,7 @@ index 000000000..08888dbe6 + 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 000000000..451912580 +index 000000000000..451912580de8 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_tp2825.h @@ -0,0 +1,18 @@ @@ -1708549,7 +1708549,7 @@ index 000000000..451912580 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_cfg.h b/drivers/video/rockchip/vehicle/vehicle_cfg.h new file mode 100644 -index 000000000..96241b7b5 +index 000000000000..96241b7b5128 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_cfg.h @@ -0,0 +1,145 @@ @@ -1708700,7 +1708700,7 @@ index 000000000..96241b7b5 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_cif.c b/drivers/video/rockchip/vehicle/vehicle_cif.c new file mode 100644 -index 000000000..96c2bfb95 +index 000000000000..96c2bfb95785 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_cif.c @@ -0,0 +1,5332 @@ @@ -1714038,7 +1714038,7 @@ index 000000000..96c2bfb95 +} diff --git a/drivers/video/rockchip/vehicle/vehicle_cif.h b/drivers/video/rockchip/vehicle/vehicle_cif.h new file mode 100644 -index 000000000..3c75694ac +index 000000000000..3c75694acd89 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_cif.h @@ -0,0 +1,189 @@ @@ -1714233,7 +1714233,7 @@ index 000000000..3c75694ac +#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 000000000..08e1b1f89 +index 000000000000..08e1b1f892d2 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_cif_regs.h @@ -0,0 +1,19 @@ @@ -1714258,7 +1714258,7 @@ index 000000000..08e1b1f89 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_dev.c b/drivers/video/rockchip/vehicle/vehicle_dev.c new file mode 100644 -index 000000000..29c0f6711 +index 000000000000..29c0f67111ed --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_dev.c @@ -0,0 +1,116 @@ @@ -1714380,7 +1714380,7 @@ index 000000000..29c0f6711 +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 000000000..e2c0e676b +index 000000000000..e2c0e676ba85 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_flinger.c @@ -0,0 +1,1552 @@ @@ -1715938,7 +1715938,7 @@ index 000000000..e2c0e676b +} diff --git a/drivers/video/rockchip/vehicle/vehicle_flinger.h b/drivers/video/rockchip/vehicle/vehicle_flinger.h new file mode 100644 -index 000000000..4b6cf8f3d +index 000000000000..4b6cf8f3d5b2 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_flinger.h @@ -0,0 +1,115 @@ @@ -1716059,7 +1716059,7 @@ index 000000000..4b6cf8f3d +#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 000000000..ccb45fd01 +index 000000000000..ccb45fd01051 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_generic_sensor.c @@ -0,0 +1,441 @@ @@ -1716506,7 +1716506,7 @@ index 000000000..ccb45fd01 +} diff --git a/drivers/video/rockchip/vehicle/vehicle_gpio.c b/drivers/video/rockchip/vehicle/vehicle_gpio.c new file mode 100644 -index 000000000..baab6aa28 +index 000000000000..baab6aa28e34 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_gpio.c @@ -0,0 +1,178 @@ @@ -1716690,7 +1716690,7 @@ index 000000000..baab6aa28 +} diff --git a/drivers/video/rockchip/vehicle/vehicle_gpio.h b/drivers/video/rockchip/vehicle/vehicle_gpio.h new file mode 100644 -index 000000000..6c36392cd +index 000000000000..6c36392cd6b7 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_gpio.h @@ -0,0 +1,33 @@ @@ -1716729,7 +1716729,7 @@ index 000000000..6c36392cd +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_main.c b/drivers/video/rockchip/vehicle/vehicle_main.c new file mode 100644 -index 000000000..a3ffdd1e3 +index 000000000000..a3ffdd1e3f8a --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_main.c @@ -0,0 +1,502 @@ @@ -1717237,7 +1717237,7 @@ index 000000000..a3ffdd1e3 +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 000000000..4d66db14a +index 000000000000..4d66db14a978 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_main.h @@ -0,0 +1,19 @@ @@ -1717262,7 +1717262,7 @@ index 000000000..4d66db14a +#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 000000000..65189b720 +index 000000000000..65189b720a02 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_samsung_dcphy_common.h @@ -0,0 +1,246 @@ @@ -1717514,7 +1717514,7 @@ index 000000000..65189b720 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_version.h b/drivers/video/rockchip/vehicle/vehicle_version.h new file mode 100644 -index 000000000..9e5da4de3 +index 000000000000..9e5da4de3c75 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_version.h @@ -0,0 +1,78 @@ @@ -1717598,7 +1717598,7 @@ index 000000000..9e5da4de3 +#endif diff --git a/drivers/video/rockchip/vtunnel/Kconfig b/drivers/video/rockchip/vtunnel/Kconfig new file mode 100644 -index 000000000..49ad2a592 +index 000000000000..49ad2a592bb0 --- /dev/null +++ b/drivers/video/rockchip/vtunnel/Kconfig @@ -0,0 +1,12 @@ @@ -1717616,7 +1717616,7 @@ index 000000000..49ad2a592 +endmenu diff --git a/drivers/video/rockchip/vtunnel/Makefile b/drivers/video/rockchip/vtunnel/Makefile new file mode 100644 -index 000000000..fdfd79a1c +index 000000000000..fdfd79a1c0a2 --- /dev/null +++ b/drivers/video/rockchip/vtunnel/Makefile @@ -0,0 +1,3 @@ @@ -1717625,7 +1717625,7 @@ index 000000000..fdfd79a1c +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 000000000..2a879ab5f +index 000000000000..2a879ab5f83d --- /dev/null +++ b/drivers/video/rockchip/vtunnel/rkvtunnel.c @@ -0,0 +1,1527 @@ @@ -1719158,7 +1719158,7 @@ index 000000000..2a879ab5f +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 000000000..1781aa785 +index 000000000000..1781aa785bc0 --- /dev/null +++ b/drivers/video/rockchip/vtunnel/rkvtunnel.h @@ -0,0 +1,81 @@ @@ -1719244,7 +1719244,7 @@ index 000000000..1781aa785 + +#endif diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c -index f0d51dd21..c81fbe355 100644 +index f0d51dd21c9e..c81fbe355adc 100644 --- a/fs/ubifs/recovery.c +++ b/fs/ubifs/recovery.c @@ -662,10 +662,43 @@ struct ubifs_scan_leb *ubifs_recover_leb(struct ubifs_info *c, int lnum, @@ -1719296,7 +1719296,7 @@ index f0d51dd21..c81fbe355 100644 ret, lnum, offs); break; diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c -index b3ac7c98f..929ed3bc5 100644 +index b3ac7c98fe8c..929ed3bc5619 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -802,7 +802,6 @@ xfs_ialloc( @@ -1719333,7 +1719333,7 @@ index b3ac7c98f..929ed3bc5 100644 /* diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h -index b0dcc0733..09f0dfeff 100644 +index b0dcc07334a1..09f0dfeff6e8 100644 --- a/include/drm/bridge/analogix_dp.h +++ b/include/drm/bridge/analogix_dp.h @@ -8,6 +8,7 @@ @@ -1719419,7 +1719419,7 @@ index b0dcc0733..09f0dfeff 100644 + #endif /* _ANALOGIX_DP_H_ */ diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h -index ea34ca146..aca7ae836 100644 +index ea34ca146b82..aca7ae836796 100644 --- a/include/drm/bridge/dw_hdmi.h +++ b/include/drm/bridge/dw_hdmi.h @@ -6,12 +6,16 @@ @@ -1719655,7 +1719655,7 @@ index ea34ca146..aca7ae836 100644 #endif /* __IMX_HDMI_H__ */ diff --git a/include/drm/bridge/dw_mipi_dsi.h b/include/drm/bridge/dw_mipi_dsi.h -index bda8aa7c2..3b86b7d8b 100644 +index bda8aa7c2280..3b86b7d8b009 100644 --- a/include/drm/bridge/dw_mipi_dsi.h +++ b/include/drm/bridge/dw_mipi_dsi.h @@ -55,6 +55,7 @@ struct dw_mipi_dsi_plat_data { @@ -1719674,7 +1719674,7 @@ index bda8aa7c2..3b86b7d8b 100644 #endif /* __DW_MIPI_DSI__ */ diff --git a/include/drm/drm_auth.h b/include/drm/drm_auth.h -index f99d3417f..6bf8b2b78 100644 +index f99d3417f304..6bf8b2b78991 100644 --- a/include/drm/drm_auth.h +++ b/include/drm/drm_auth.h @@ -107,7 +107,6 @@ struct drm_master { @@ -1719686,7 +1719686,7 @@ index f99d3417f..6bf8b2b78 100644 bool drm_is_current_master(struct drm_file *fpriv); diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h -index 928136556..f8cd5d8e5 100644 +index 928136556174..f8cd5d8e58ee 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -175,6 +175,48 @@ struct drm_scdc { @@ -1719765,7 +1719765,7 @@ index 928136556..f8cd5d8e5 100644 const char *drm_get_connector_status_name(enum drm_connector_status status); const char *drm_get_subpixel_order_name(enum subpixel_order order); diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h -index 59b51a09c..3a3d9d887 100644 +index 59b51a09cae6..3a3d9d887cad 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -287,7 +287,16 @@ struct drm_crtc_state { @@ -1719787,7 +1719787,7 @@ index 59b51a09c..3a3d9d887 100644 * @target_vblank: * diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h -index e57d0440f..e395d1fc1 100644 +index e57d0440f00f..e395d1fc186e 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -29,6 +29,7 @@ @@ -1719815,7 +1719815,7 @@ index e57d0440f..e395d1fc1 100644 * @dumb_create: * diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h -index 4526b6a1e..6f082761e 100644 +index 4526b6a1e583..6f082761e245 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -229,6 +229,38 @@ struct detailed_timing { @@ -1719858,7 +1719858,7 @@ index 4526b6a1e..6f082761e 100644 #define DRM_ELD_HEADER_BLOCK_SIZE 4 diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h -index 42d04607d..b81b3bfb0 100644 +index 42d04607d091..b81b3bfb08c8 100644 --- a/include/drm/drm_file.h +++ b/include/drm/drm_file.h @@ -226,27 +226,15 @@ struct drm_file { @@ -1719903,7 +1719903,7 @@ index 42d04607d..b81b3bfb0 100644 struct file *mock_drm_getfile(struct drm_minor *minor, unsigned int flags); diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h -index 31ba85a41..05592c17d 100644 +index 31ba85a4110a..05592c17da0c 100644 --- a/include/drm/drm_mipi_dsi.h +++ b/include/drm/drm_mipi_dsi.h @@ -19,12 +19,18 @@ struct drm_dsc_picture_parameter_set; @@ -1719946,7 +1719946,7 @@ index 31ba85a41..05592c17d 100644 enum mipi_dsi_pixel_format { MIPI_DSI_FMT_RGB888, diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h -index a18f73eb3..76d114569 100644 +index a18f73eb3cf6..76d114569484 100644 --- a/include/drm/drm_mode_config.h +++ b/include/drm/drm_mode_config.h @@ -794,6 +794,19 @@ struct drm_mode_config { @@ -1719970,7 +1719970,7 @@ index a18f73eb3..76d114569 100644 * @suggested_x_property: Optional connector property with a hint for * the position of the output on the host's screen. diff --git a/include/drm/drm_mode_object.h b/include/drm/drm_mode_object.h -index c34a3e803..6292fa663 100644 +index c34a3e8030e1..6292fa663844 100644 --- a/include/drm/drm_mode_object.h +++ b/include/drm/drm_mode_object.h @@ -60,7 +60,7 @@ struct drm_mode_object { @@ -1719983,7 +1719983,7 @@ index c34a3e803..6292fa663 100644 * struct drm_object_properties - property tracking for &drm_mode_object */ diff --git a/include/drm/drm_prime.h b/include/drm/drm_prime.h -index 0f69f9fbf..a9d0c6b08 100644 +index 0f69f9fbf12c..a9d0c6b0854e 100644 --- a/include/drm/drm_prime.h +++ b/include/drm/drm_prime.h @@ -107,5 +107,6 @@ void drm_prime_gem_destroy(struct drm_gem_object *obj, struct sg_table *sg); @@ -1719995,7 +1719995,7 @@ index 0f69f9fbf..a9d0c6b08 100644 #endif /* __DRM_PRIME_H__ */ diff --git a/include/drm/drm_sync_helper.h b/include/drm/drm_sync_helper.h new file mode 100755 -index 000000000..a5586c674 +index 000000000000..a5586c674fec --- /dev/null +++ b/include/drm/drm_sync_helper.h @@ -0,0 +1,156 @@ @@ -1720156,7 +1720156,7 @@ index 000000000..a5586c674 + +#endif diff --git a/include/dt-bindings/clock/px30-cru.h b/include/dt-bindings/clock/px30-cru.h -index 5b1416fcd..33eac20e9 100644 +index 5b1416fcde6f..33eac20e9ad4 100644 --- a/include/dt-bindings/clock/px30-cru.h +++ b/include/dt-bindings/clock/px30-cru.h @@ -87,6 +87,8 @@ @@ -1720170,7 +1720170,7 @@ index 5b1416fcd..33eac20e9 100644 #define DCLK_VOPB 150 diff --git a/include/dt-bindings/clock/rk1808-cru.h b/include/dt-bindings/clock/rk1808-cru.h new file mode 100755 -index 000000000..994896d11 +index 000000000000..994896d111f1 --- /dev/null +++ b/include/dt-bindings/clock/rk1808-cru.h @@ -0,0 +1,473 @@ @@ -1720648,7 +1720648,7 @@ index 000000000..994896d11 + +#endif diff --git a/include/dt-bindings/clock/rk3036-cru.h b/include/dt-bindings/clock/rk3036-cru.h -index 35a5a01f9..ec8c3e748 100644 +index 35a5a01f9697..ec8c3e748463 100644 --- a/include/dt-bindings/clock/rk3036-cru.h +++ b/include/dt-bindings/clock/rk3036-cru.h @@ -43,6 +43,8 @@ @@ -1720677,7 +1720677,7 @@ index 35a5a01f9..ec8c3e748 100644 #define HCLK_SDIO 457 #define HCLK_EMMC 459 diff --git a/include/dt-bindings/clock/rk3128-cru.h b/include/dt-bindings/clock/rk3128-cru.h -index 6a47825da..e5269025d 100644 +index 6a47825dac5d..e5269025da79 100644 --- a/include/dt-bindings/clock/rk3128-cru.h +++ b/include/dt-bindings/clock/rk3128-cru.h @@ -118,6 +118,7 @@ @@ -1720689,7 +1720689,7 @@ index 6a47825da..e5269025d 100644 #define HCLK_GPS 441 #define HCLK_USBHOST 442 diff --git a/include/dt-bindings/clock/rk3188-cru-common.h b/include/dt-bindings/clock/rk3188-cru-common.h -index afad90680..a5de0f65f 100644 +index afad90680fce..a5de0f65fe06 100644 --- a/include/dt-bindings/clock/rk3188-cru-common.h +++ b/include/dt-bindings/clock/rk3188-cru-common.h @@ -67,6 +67,7 @@ @@ -1720714,7 +1720714,7 @@ index afad90680..a5de0f65f 100644 #define HCLK_HSIC 458 #define HCLK_HSADC 459 diff --git a/include/dt-bindings/clock/rk3288-cru.h b/include/dt-bindings/clock/rk3288-cru.h -index 33819acbf..7c94bc10b 100644 +index 33819acbfc56..7c94bc10baae 100644 --- a/include/dt-bindings/clock/rk3288-cru.h +++ b/include/dt-bindings/clock/rk3288-cru.h @@ -161,6 +161,10 @@ @@ -1720729,7 +1720729,7 @@ index 33819acbf..7c94bc10b 100644 /* hclk gates */ #define HCLK_GPS 448 diff --git a/include/dt-bindings/clock/rk3368-cru.h b/include/dt-bindings/clock/rk3368-cru.h -index 0a06c5f51..7f2d1882e 100644 +index 0a06c5f514d7..7f2d1882ed31 100644 --- a/include/dt-bindings/clock/rk3368-cru.h +++ b/include/dt-bindings/clock/rk3368-cru.h @@ -101,6 +101,7 @@ @@ -1720741,7 +1720741,7 @@ index 0a06c5f51..7f2d1882e 100644 /* pclk gates */ #define PCLK_GPIO0 320 diff --git a/include/dt-bindings/clock/rk3399-cru.h b/include/dt-bindings/clock/rk3399-cru.h -index 44e0a319f..a06e18ebc 100644 +index 44e0a319f077..a06e18ebc4dd 100644 --- a/include/dt-bindings/clock/rk3399-cru.h +++ b/include/dt-bindings/clock/rk3399-cru.h @@ -7,6 +7,8 @@ @@ -1720802,7 +1720802,7 @@ index 44e0a319f..a06e18ebc 100644 #define SRST_PVTM_CORE_B 47 diff --git a/include/dt-bindings/clock/rk3568-cru.h b/include/dt-bindings/clock/rk3568-cru.h new file mode 100755 -index 000000000..aecfdd4ce +index 000000000000..aecfdd4ce084 --- /dev/null +++ b/include/dt-bindings/clock/rk3568-cru.h @@ -0,0 +1,932 @@ @@ -1721740,7 +1721740,7 @@ index 000000000..aecfdd4ce +#endif diff --git a/include/dt-bindings/clock/rk618-cru.h b/include/dt-bindings/clock/rk618-cru.h new file mode 100755 -index 000000000..72ae0aef1 +index 000000000000..72ae0aef1378 --- /dev/null +++ b/include/dt-bindings/clock/rk618-cru.h @@ -0,0 +1,38 @@ @@ -1721784,7 +1721784,7 @@ index 000000000..72ae0aef1 +#endif diff --git a/include/dt-bindings/clock/rk628-cgu.h b/include/dt-bindings/clock/rk628-cgu.h new file mode 100755 -index 000000000..d1690907d +index 000000000000..d1690907d208 --- /dev/null +++ b/include/dt-bindings/clock/rk628-cgu.h @@ -0,0 +1,50 @@ @@ -1721840,7 +1721840,7 @@ index 000000000..d1690907d +#endif diff --git a/include/dt-bindings/clock/rockchip,rk3036.h b/include/dt-bindings/clock/rockchip,rk3036.h new file mode 100755 -index 000000000..019550c7d +index 000000000000..019550c7d0c1 --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3036.h @@ -0,0 +1,155 @@ @@ -1722001,7 +1722001,7 @@ index 000000000..019550c7d +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3036_H */ diff --git a/include/dt-bindings/clock/rockchip,rk312x.h b/include/dt-bindings/clock/rockchip,rk312x.h new file mode 100755 -index 000000000..0af5abca3 +index 000000000000..0af5abca3470 --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk312x.h @@ -0,0 +1,167 @@ @@ -1722174,7 +1722174,7 @@ index 000000000..0af5abca3 +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3128_H */ diff --git a/include/dt-bindings/clock/rockchip,rk3188.h b/include/dt-bindings/clock/rockchip,rk3188.h new file mode 100755 -index 000000000..b8c57e1cf +index 000000000000..b8c57e1cfed8 --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3188.h @@ -0,0 +1,13 @@ @@ -1722193,7 +1722193,7 @@ index 000000000..b8c57e1cf +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3188_H */ diff --git a/include/dt-bindings/clock/rockchip,rk3228.h b/include/dt-bindings/clock/rockchip,rk3228.h new file mode 100755 -index 000000000..b86e44536 +index 000000000000..b86e44536722 --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3228.h @@ -0,0 +1,167 @@ @@ -1722366,7 +1722366,7 @@ index 000000000..b86e44536 +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3228_H */ diff --git a/include/dt-bindings/clock/rockchip,rk3288.h b/include/dt-bindings/clock/rockchip,rk3288.h new file mode 100755 -index 000000000..1a2803c4f +index 000000000000..1a2803c4f168 --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3288.h @@ -0,0 +1,220 @@ @@ -1722592,7 +1722592,7 @@ index 000000000..1a2803c4f +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3288_H */ diff --git a/include/dt-bindings/clock/rockchip,rk3368.h b/include/dt-bindings/clock/rockchip,rk3368.h new file mode 100755 -index 000000000..76630794b +index 000000000000..76630794b4d9 --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3368.h @@ -0,0 +1,263 @@ @@ -1722861,7 +1722861,7 @@ index 000000000..76630794b +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3368_H */ diff --git a/include/dt-bindings/clock/rockchip-ddr.h b/include/dt-bindings/clock/rockchip-ddr.h new file mode 100755 -index 000000000..b065432e7 +index 000000000000..b065432e7793 --- /dev/null +++ b/include/dt-bindings/clock/rockchip-ddr.h @@ -0,0 +1,63 @@ @@ -1722930,7 +1722930,7 @@ index 000000000..b065432e7 +#endif diff --git a/include/dt-bindings/clock/rockchip.h b/include/dt-bindings/clock/rockchip.h new file mode 100755 -index 000000000..b438f7bd4 +index 000000000000..b438f7bd4083 --- /dev/null +++ b/include/dt-bindings/clock/rockchip.h @@ -0,0 +1,101 @@ @@ -1723037,7 +1723037,7 @@ index 000000000..b438f7bd4 +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_H */ diff --git a/include/dt-bindings/clock/rv1126-cru.h b/include/dt-bindings/clock/rv1126-cru.h new file mode 100755 -index 000000000..474bcbc54 +index 000000000000..474bcbc546af --- /dev/null +++ b/include/dt-bindings/clock/rv1126-cru.h @@ -0,0 +1,633 @@ @@ -1723676,7 +1723676,7 @@ index 000000000..474bcbc54 +#endif diff --git a/include/dt-bindings/display/drm_mipi_dsi.h b/include/dt-bindings/display/drm_mipi_dsi.h new file mode 100755 -index 000000000..bc24ce4dd +index 000000000000..bc24ce4ddd08 --- /dev/null +++ b/include/dt-bindings/display/drm_mipi_dsi.h @@ -0,0 +1,53 @@ @@ -1723735,7 +1723735,7 @@ index 000000000..bc24ce4dd +#endif /* __DRM_MIPI_DSI__ */ diff --git a/include/dt-bindings/display/media-bus-format.h b/include/dt-bindings/display/media-bus-format.h new file mode 100755 -index 000000000..b8e9a1bb3 +index 000000000000..b8e9a1bb3f95 --- /dev/null +++ b/include/dt-bindings/display/media-bus-format.h @@ -0,0 +1,152 @@ @@ -1723893,7 +1723893,7 @@ index 000000000..b8e9a1bb3 +#endif /* __LINUX_MEDIA_BUS_FORMAT_H */ diff --git a/include/dt-bindings/display/mipi_dsi.h b/include/dt-bindings/display/mipi_dsi.h new file mode 100755 -index 000000000..38aeee0ed +index 000000000000..38aeee0ed51d --- /dev/null +++ b/include/dt-bindings/display/mipi_dsi.h @@ -0,0 +1,106 @@ @@ -1724005,7 +1724005,7 @@ index 000000000..38aeee0ed +#endif /* end of MIPI_DSI_H_ */ diff --git a/include/dt-bindings/display/rockchip_vop.h b/include/dt-bindings/display/rockchip_vop.h new file mode 100644 -index 000000000..3e14128e7 +index 000000000000..3e14128e7ab1 --- /dev/null +++ b/include/dt-bindings/display/rockchip_vop.h @@ -0,0 +1,21 @@ @@ -1724032,7 +1724032,7 @@ index 000000000..3e14128e7 +#endif diff --git a/include/dt-bindings/dram/rockchip,rk322x.h b/include/dt-bindings/dram/rockchip,rk322x.h new file mode 100755 -index 000000000..1ab3317d7 +index 000000000000..1ab3317d700e --- /dev/null +++ b/include/dt-bindings/dram/rockchip,rk322x.h @@ -0,0 +1,90 @@ @@ -1724128,7 +1724128,7 @@ index 000000000..1ab3317d7 +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK322X_H */ diff --git a/include/dt-bindings/dram/rockchip,rk3368.h b/include/dt-bindings/dram/rockchip,rk3368.h new file mode 100755 -index 000000000..993f1eed9 +index 000000000000..993f1eed9816 --- /dev/null +++ b/include/dt-bindings/dram/rockchip,rk3368.h @@ -0,0 +1,80 @@ @@ -1724214,7 +1724214,7 @@ index 000000000..993f1eed9 +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK3368_H*/ diff --git a/include/dt-bindings/input/rk-input.h b/include/dt-bindings/input/rk-input.h new file mode 100755 -index 000000000..00b412927 +index 000000000000..00b412927890 --- /dev/null +++ b/include/dt-bindings/input/rk-input.h @@ -0,0 +1,814 @@ @@ -1725034,7 +1725034,7 @@ index 000000000..00b412927 +#define FF_STATUS_MAX 0x01 diff --git a/include/dt-bindings/memory/px30-dram.h b/include/dt-bindings/memory/px30-dram.h new file mode 100755 -index 000000000..17d799d80 +index 000000000000..17d799d802d9 --- /dev/null +++ b/include/dt-bindings/memory/px30-dram.h @@ -0,0 +1,132 @@ @@ -1725172,7 +1725172,7 @@ index 000000000..17d799d80 +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_PX30_H*/ diff --git a/include/dt-bindings/memory/rk1808-dram.h b/include/dt-bindings/memory/rk1808-dram.h new file mode 100755 -index 000000000..522bd75a4 +index 000000000000..522bd75a4a55 --- /dev/null +++ b/include/dt-bindings/memory/rk1808-dram.h @@ -0,0 +1,180 @@ @@ -1725358,7 +1725358,7 @@ index 000000000..522bd75a4 +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK1808_H*/ diff --git a/include/dt-bindings/memory/rk3128-dram.h b/include/dt-bindings/memory/rk3128-dram.h new file mode 100755 -index 000000000..2598ac98e +index 000000000000..2598ac98e525 --- /dev/null +++ b/include/dt-bindings/memory/rk3128-dram.h @@ -0,0 +1,95 @@ @@ -1725459,7 +1725459,7 @@ index 000000000..2598ac98e +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK3128_H */ diff --git a/include/dt-bindings/memory/rk3288-dram.h b/include/dt-bindings/memory/rk3288-dram.h new file mode 100755 -index 000000000..1c531dca7 +index 000000000000..1c531dca755c --- /dev/null +++ b/include/dt-bindings/memory/rk3288-dram.h @@ -0,0 +1,127 @@ @@ -1725592,7 +1725592,7 @@ index 000000000..1c531dca7 +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK3288_H*/ diff --git a/include/dt-bindings/memory/rk3328-dram.h b/include/dt-bindings/memory/rk3328-dram.h new file mode 100755 -index 000000000..171f41c25 +index 000000000000..171f41c256d3 --- /dev/null +++ b/include/dt-bindings/memory/rk3328-dram.h @@ -0,0 +1,159 @@ @@ -1725757,7 +1725757,7 @@ index 000000000..171f41c25 +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK3328_H*/ diff --git a/include/dt-bindings/memory/rk3368-dram.h b/include/dt-bindings/memory/rk3368-dram.h new file mode 100755 -index 000000000..c1f23d32d +index 000000000000..c1f23d32d987 --- /dev/null +++ b/include/dt-bindings/memory/rk3368-dram.h @@ -0,0 +1,109 @@ @@ -1725872,7 +1725872,7 @@ index 000000000..c1f23d32d +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK3368_H*/ diff --git a/include/dt-bindings/memory/rk3399-dram.h b/include/dt-bindings/memory/rk3399-dram.h new file mode 100755 -index 000000000..44abb0aaf +index 000000000000..44abb0aafb05 --- /dev/null +++ b/include/dt-bindings/memory/rk3399-dram.h @@ -0,0 +1,107 @@ @@ -1725985,7 +1725985,7 @@ index 000000000..44abb0aaf +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK3399_H */ diff --git a/include/dt-bindings/memory/rk3568-dram.h b/include/dt-bindings/memory/rk3568-dram.h new file mode 100755 -index 000000000..c05eae7fe +index 000000000000..c05eae7fe32e --- /dev/null +++ b/include/dt-bindings/memory/rk3568-dram.h @@ -0,0 +1,111 @@ @@ -1726102,7 +1726102,7 @@ index 000000000..c05eae7fe +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK3568_H */ diff --git a/include/dt-bindings/memory/rockchip-dram.h b/include/dt-bindings/memory/rockchip-dram.h new file mode 100755 -index 000000000..17e5e34b0 +index 000000000000..17e5e34b05c5 --- /dev/null +++ b/include/dt-bindings/memory/rockchip-dram.h @@ -0,0 +1,94 @@ @@ -1726202,7 +1726202,7 @@ index 000000000..17e5e34b0 +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_H */ diff --git a/include/dt-bindings/memory/rv1126-dram.h b/include/dt-bindings/memory/rv1126-dram.h new file mode 100755 -index 000000000..208227825 +index 000000000000..208227825044 --- /dev/null +++ b/include/dt-bindings/memory/rv1126-dram.h @@ -0,0 +1,161 @@ @@ -1726369,7 +1726369,7 @@ index 000000000..208227825 +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RV1126_H*/ diff --git a/include/dt-bindings/phy/phy-snps-pcie3.h b/include/dt-bindings/phy/phy-snps-pcie3.h new file mode 100755 -index 000000000..5006947f2 +index 000000000000..5006947f2285 --- /dev/null +++ b/include/dt-bindings/phy/phy-snps-pcie3.h @@ -0,0 +1,21 @@ @@ -1726396,7 +1726396,7 @@ index 000000000..5006947f2 +#endif /* _DT_BINDINGS_PHY_SNPS_PCIE3 */ diff --git a/include/dt-bindings/pinctrl/rockchip-rk3036.h b/include/dt-bindings/pinctrl/rockchip-rk3036.h new file mode 100755 -index 000000000..553c33579 +index 000000000000..553c33579065 --- /dev/null +++ b/include/dt-bindings/pinctrl/rockchip-rk3036.h @@ -0,0 +1,267 @@ @@ -1726669,7 +1726669,7 @@ index 000000000..553c33579 +#endif diff --git a/include/dt-bindings/pinctrl/rockchip-rk312x.h b/include/dt-bindings/pinctrl/rockchip-rk312x.h new file mode 100755 -index 000000000..e0fa5976c +index 000000000000..e0fa5976c18f --- /dev/null +++ b/include/dt-bindings/pinctrl/rockchip-rk312x.h @@ -0,0 +1,384 @@ @@ -1727059,7 +1727059,7 @@ index 000000000..e0fa5976c +#endif diff --git a/include/dt-bindings/pinctrl/rockchip-rk3188.h b/include/dt-bindings/pinctrl/rockchip-rk3188.h new file mode 100755 -index 000000000..58bba225d +index 000000000000..58bba225d1de --- /dev/null +++ b/include/dt-bindings/pinctrl/rockchip-rk3188.h @@ -0,0 +1,457 @@ @@ -1727522,7 +1727522,7 @@ index 000000000..58bba225d +#endif diff --git a/include/dt-bindings/pinctrl/rockchip-rk3288.h b/include/dt-bindings/pinctrl/rockchip-rk3288.h new file mode 100755 -index 000000000..97aa66e2b +index 000000000000..97aa66e2b329 --- /dev/null +++ b/include/dt-bindings/pinctrl/rockchip-rk3288.h @@ -0,0 +1,666 @@ @@ -1728194,7 +1728194,7 @@ index 000000000..97aa66e2b +#endif diff --git a/include/dt-bindings/power/rk1808-power.h b/include/dt-bindings/power/rk1808-power.h new file mode 100755 -index 000000000..32342c1e7 +index 000000000000..32342c1e7ded --- /dev/null +++ b/include/dt-bindings/power/rk1808-power.h @@ -0,0 +1,20 @@ @@ -1728220,7 +1728220,7 @@ index 000000000..32342c1e7 +#endif diff --git a/include/dt-bindings/power/rk3528-power.h b/include/dt-bindings/power/rk3528-power.h new file mode 100644 -index 000000000..4f7c97865 +index 000000000000..4f7c978651b5 --- /dev/null +++ b/include/dt-bindings/power/rk3528-power.h @@ -0,0 +1,18 @@ @@ -1728244,7 +1728244,7 @@ index 000000000..4f7c97865 +#endif diff --git a/include/dt-bindings/power/rk3562-power.h b/include/dt-bindings/power/rk3562-power.h new file mode 100644 -index 000000000..94b26b5be +index 000000000000..94b26b5bea5f --- /dev/null +++ b/include/dt-bindings/power/rk3562-power.h @@ -0,0 +1,32 @@ @@ -1728282,7 +1728282,7 @@ index 000000000..94b26b5be +#endif diff --git a/include/dt-bindings/power/rk3568-power.h b/include/dt-bindings/power/rk3568-power.h new file mode 100755 -index 000000000..6cc1af1a9 +index 000000000000..6cc1af1a9d26 --- /dev/null +++ b/include/dt-bindings/power/rk3568-power.h @@ -0,0 +1,32 @@ @@ -1728320,7 +1728320,7 @@ index 000000000..6cc1af1a9 +#endif diff --git a/include/dt-bindings/power/rk3588-power.h b/include/dt-bindings/power/rk3588-power.h new file mode 100755 -index 000000000..69f7e9060 +index 000000000000..69f7e9060250 --- /dev/null +++ b/include/dt-bindings/power/rk3588-power.h @@ -0,0 +1,69 @@ @@ -1728395,7 +1728395,7 @@ index 000000000..69f7e9060 +#endif diff --git a/include/dt-bindings/power/rv1126-power.h b/include/dt-bindings/power/rv1126-power.h new file mode 100755 -index 000000000..3e2101036 +index 000000000000..3e210103646f --- /dev/null +++ b/include/dt-bindings/power/rv1126-power.h @@ -0,0 +1,34 @@ @@ -1728435,7 +1728435,7 @@ index 000000000..3e2101036 +#endif diff --git a/include/dt-bindings/reset/rk628-rgu.h b/include/dt-bindings/reset/rk628-rgu.h new file mode 100755 -index 000000000..e0c714bef +index 000000000000..e0c714bef00c --- /dev/null +++ b/include/dt-bindings/reset/rk628-rgu.h @@ -0,0 +1,43 @@ @@ -1728484,7 +1728484,7 @@ index 000000000..e0c714bef +#endif diff --git a/include/dt-bindings/sensor-dev.h b/include/dt-bindings/sensor-dev.h new file mode 100755 -index 000000000..e03f0027d +index 000000000000..e03f0027d325 --- /dev/null +++ b/include/dt-bindings/sensor-dev.h @@ -0,0 +1,18 @@ @@ -1728507,7 +1728507,7 @@ index 000000000..e03f0027d + +#endif diff --git a/include/dt-bindings/soc/rockchip,boot-mode.h b/include/dt-bindings/soc/rockchip,boot-mode.h -index 4b0914c09..a0f63a040 100644 +index 4b0914c0989d..a0f63a040613 100644 --- a/include/dt-bindings/soc/rockchip,boot-mode.h +++ b/include/dt-bindings/soc/rockchip,boot-mode.h @@ -10,7 +10,19 @@ @@ -1728533,7 +1728533,7 @@ index 4b0914c09..a0f63a040 100644 #endif diff --git a/include/dt-bindings/soc/rockchip-amp.h b/include/dt-bindings/soc/rockchip-amp.h new file mode 100644 -index 000000000..0681e92ef +index 000000000000..0681e92ef4da --- /dev/null +++ b/include/dt-bindings/soc/rockchip-amp.h @@ -0,0 +1,7 @@ @@ -1728546,7 +1728546,7 @@ index 000000000..0681e92ef +#endif diff --git a/include/dt-bindings/soc/rockchip-csu.h b/include/dt-bindings/soc/rockchip-csu.h new file mode 100644 -index 000000000..8b0442533 +index 000000000000..8b0442533c3f --- /dev/null +++ b/include/dt-bindings/soc/rockchip-csu.h @@ -0,0 +1,15 @@ @@ -1728567,7 +1728567,7 @@ index 000000000..8b0442533 +#endif diff --git a/include/dt-bindings/soc/rockchip-system-status.h b/include/dt-bindings/soc/rockchip-system-status.h new file mode 100755 -index 000000000..6a0d198a2 +index 000000000000..6a0d198a2e6e --- /dev/null +++ b/include/dt-bindings/soc/rockchip-system-status.h @@ -0,0 +1,59 @@ @@ -1728632,7 +1728632,7 @@ index 000000000..6a0d198a2 +#endif diff --git a/include/dt-bindings/suspend/rockchip-px30.h b/include/dt-bindings/suspend/rockchip-px30.h new file mode 100755 -index 000000000..4362028f6 +index 000000000000..4362028f677c --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-px30.h @@ -0,0 +1,53 @@ @@ -1728691,7 +1728691,7 @@ index 000000000..4362028f6 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk1808.h b/include/dt-bindings/suspend/rockchip-rk1808.h new file mode 100755 -index 000000000..3d565faab +index 000000000000..3d565faabf4d --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk1808.h @@ -0,0 +1,46 @@ @@ -1728743,7 +1728743,7 @@ index 000000000..3d565faab +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk322x.h b/include/dt-bindings/suspend/rockchip-rk322x.h new file mode 100755 -index 000000000..882ae053f +index 000000000000..882ae053fa22 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk322x.h @@ -0,0 +1,57 @@ @@ -1728806,7 +1728806,7 @@ index 000000000..882ae053f +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3288.h b/include/dt-bindings/suspend/rockchip-rk3288.h new file mode 100755 -index 000000000..d07cced43 +index 000000000000..d07cced43877 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3288.h @@ -0,0 +1,59 @@ @@ -1728871,7 +1728871,7 @@ index 000000000..d07cced43 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3308.h b/include/dt-bindings/suspend/rockchip-rk3308.h new file mode 100755 -index 000000000..a3e015e22 +index 000000000000..a3e015e2209a --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3308.h @@ -0,0 +1,104 @@ @@ -1728981,7 +1728981,7 @@ index 000000000..a3e015e22 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3328.h b/include/dt-bindings/suspend/rockchip-rk3328.h new file mode 100755 -index 000000000..972f8bb5e +index 000000000000..972f8bb5e281 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3328.h @@ -0,0 +1,19 @@ @@ -1729006,7 +1729006,7 @@ index 000000000..972f8bb5e +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3368.h b/include/dt-bindings/suspend/rockchip-rk3368.h new file mode 100755 -index 000000000..9873f8236 +index 000000000000..9873f8236a8b --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3368.h @@ -0,0 +1,56 @@ @@ -1729068,7 +1729068,7 @@ index 000000000..9873f8236 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3399.h b/include/dt-bindings/suspend/rockchip-rk3399.h new file mode 100755 -index 000000000..176c7cfcd +index 000000000000..176c7cfcd989 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3399.h @@ -0,0 +1,61 @@ @@ -1729135,7 +1729135,7 @@ index 000000000..176c7cfcd +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3568.h b/include/dt-bindings/suspend/rockchip-rk3568.h new file mode 100755 -index 000000000..91e89f64a +index 000000000000..91e89f64a067 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3568.h @@ -0,0 +1,57 @@ @@ -1729198,7 +1729198,7 @@ index 000000000..91e89f64a +#endif diff --git a/include/dt-bindings/suspend/rockchip-rv1126.h b/include/dt-bindings/suspend/rockchip-rv1126.h new file mode 100755 -index 000000000..7c28c2bd7 +index 000000000000..7c28c2bd7619 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rv1126.h @@ -0,0 +1,46 @@ @@ -1729250,7 +1729250,7 @@ index 000000000..7c28c2bd7 +#endif diff --git a/include/linux/android_kabi.h b/include/linux/android_kabi.h new file mode 100755 -index 000000000..efa52953f +index 000000000000..efa52953fe35 --- /dev/null +++ b/include/linux/android_kabi.h @@ -0,0 +1,113 @@ @@ -1729368,7 +1729368,7 @@ index 000000000..efa52953f + +#endif /* _ANDROID_KABI_H */ diff --git a/include/linux/bpf.h b/include/linux/bpf.h -index a75abe994..e49f60809 100644 +index a75abe994918..e49f608096dd 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -173,7 +173,7 @@ struct bpf_map { @@ -1729389,7 +1729389,7 @@ index a75abe994..e49f60809 100644 int generic_map_lookup_batch(struct bpf_map *map, const union bpf_attr *attr, diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h -index 03a5de5f9..d9897d0b1 100644 +index 03a5de5f99f4..d9897d0b10a2 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -599,6 +599,7 @@ struct clk_divider { @@ -1729445,7 +1729445,7 @@ index 03a5de5f9..d9897d0b1 100644 const struct clk_ops *rate_ops; diff --git a/include/linux/clk/rockchip.h b/include/linux/clk/rockchip.h new file mode 100755 -index 000000000..07c563a42 +index 000000000000..07c563a42c60 --- /dev/null +++ b/include/linux/clk/rockchip.h @@ -0,0 +1,18 @@ @@ -1729468,7 +1729468,7 @@ index 000000000..07c563a42 + +#endif /* __LINUX_CLK_ROCKCHIP_H_ */ diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h -index 04c20de66..047f449d3 100644 +index 04c20de66afc..047f449d3658 100644 --- a/include/linux/cpuset.h +++ b/include/linux/cpuset.h @@ -15,6 +15,7 @@ @@ -1729508,7 +1729508,7 @@ index 04c20de66..047f449d3 100644 #endif /* _LINUX_CPUSET_H */ diff --git a/include/linux/dma-buf-cache.h b/include/linux/dma-buf-cache.h new file mode 100755 -index 000000000..d97545560 +index 000000000000..d97545560990 --- /dev/null +++ b/include/linux/dma-buf-cache.h @@ -0,0 +1,32 @@ @@ -1729545,7 +1729545,7 @@ index 000000000..d97545560 + +#endif /* _LINUX_DMA_BUF_CACHE_H */ diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h -index 0c5706abb..f635c237d 100644 +index 0c5706abb7fe..f635c237d109 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -209,6 +209,41 @@ struct dma_buf_ops { @@ -1729735,7 +1729735,7 @@ index 0c5706abb..f635c237d 100644 #ifdef CONFIG_DMABUF_PROCESS_INFO /** diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h -index 09e23adb3..9f12efaaa 100644 +index 09e23adb351d..9f12efaaa93a 100644 --- a/include/linux/dma-fence.h +++ b/include/linux/dma-fence.h @@ -372,6 +372,9 @@ static inline void __dma_fence_might_wait(void) {} @@ -1729749,7 +1729749,7 @@ index 09e23adb3..9f12efaaa 100644 bool intr, signed long timeout); int dma_fence_add_callback(struct dma_fence *fence, diff --git a/include/linux/dma-heap.h b/include/linux/dma-heap.h -index 83b8cfb2d..e8f0e92c2 100644 +index 83b8cfb2d760..e8f0e92c27dd 100644 --- a/include/linux/dma-heap.h +++ b/include/linux/dma-heap.h @@ -16,15 +16,17 @@ struct dma_heap; @@ -1729840,7 +1729840,7 @@ index 83b8cfb2d..e8f0e92c2 100644 + unsigned int heap_flags); #endif /* _DMA_HEAPS_H */ diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h -index 2112f21f7..f51561eda 100644 +index 2112f21f73d8..f51561eda33b 100644 --- a/include/linux/dma-iommu.h +++ b/include/linux/dma-iommu.h @@ -37,6 +37,11 @@ void iommu_dma_compose_msi_msg(struct msi_desc *desc, @@ -1729873,7 +1729873,7 @@ index 2112f21f7..f51561eda 100644 #endif /* CONFIG_IOMMU_DMA */ #endif /* __DMA_IOMMU_H */ diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h -index a5f89fc4d..84c14dbcd 100644 +index a5f89fc4d6df..84c14dbcdb66 100644 --- a/include/linux/dma-map-ops.h +++ b/include/linux/dma-map-ops.h @@ -8,6 +8,7 @@ @@ -1729912,7 +1729912,7 @@ index a5f89fc4d..84c14dbcd 100644 #else static inline pgprot_t dma_pgprot(struct device *dev, pgprot_t prot, diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h -index a7d70cdee..7270f12e2 100644 +index a7d70cdee25e..7270f12e2c78 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -61,6 +61,23 @@ @@ -1729940,7 +1729940,7 @@ index a7d70cdee..7270f12e2 100644 * A dma_addr_t can hold any valid DMA or bus address for the platform. It can * be given to a device to use as a DMA source or target. It is specific to a diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h -index dd357a747..493a047ed 100644 +index dd357a747780..493a047ed0a2 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -418,6 +418,9 @@ enum dma_slave_buswidth { @@ -1729963,7 +1729963,7 @@ index dd357a747..493a047ed 100644 /** diff --git a/include/linux/energy_model.h b/include/linux/energy_model.h -index 5f04a2b35..9ca1ea02f 100644 +index 5f04a2b35e80..9ca1ea02fa72 100644 --- a/include/linux/energy_model.h +++ b/include/linux/energy_model.h @@ -29,6 +29,8 @@ struct em_perf_state { @@ -1730014,7 +1730014,7 @@ index 5f04a2b35..9ca1ea02f 100644 return -EINVAL; } diff --git a/include/linux/extcon.h b/include/linux/extcon.h -index fa1e431ee..6f851be8c 100644 +index fa1e431ee6d9..6f851be8cb25 100644 --- a/include/linux/extcon.h +++ b/include/linux/extcon.h @@ -37,6 +37,7 @@ @@ -1730026,7 +1730026,7 @@ index fa1e431ee..6f851be8c 100644 /* * Charging external connector diff --git a/include/linux/freezer.h b/include/linux/freezer.h -index 27828145c..f753c307b 100644 +index 27828145ca09..f753c307b8b3 100644 --- a/include/linux/freezer.h +++ b/include/linux/freezer.h @@ -27,6 +27,11 @@ static inline bool frozen(struct task_struct *p) @@ -1730051,7 +1730051,7 @@ index 27828145c..f753c307b 100644 diff --git a/include/linux/initramfs.h b/include/linux/initramfs.h new file mode 100755 -index 000000000..269531716 +index 000000000000..26953171620f --- /dev/null +++ b/include/linux/initramfs.h @@ -0,0 +1,40 @@ @@ -1730096,7 +1730096,7 @@ index 000000000..269531716 + +#endif /* _LINUX_INITRAMFS_H */ diff --git a/include/linux/iommu.h b/include/linux/iommu.h -index e90c267e7..f94cfde78 100644 +index e90c267e7f3e..f94cfde78201 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -31,6 +31,26 @@ @@ -1730186,7 +1730186,7 @@ index e90c267e7..f94cfde78 100644 /** diff --git a/include/linux/iova.h b/include/linux/iova.h -index 6c19b09e9..0b6e1fb34 100644 +index 6c19b09e9663..0b6e1fb344d4 100644 --- a/include/linux/iova.h +++ b/include/linux/iova.h @@ -95,6 +95,7 @@ struct iova_domain { @@ -1730198,7 +1730198,7 @@ index 6c19b09e9..0b6e1fb34 100644 static inline unsigned long iova_size(struct iova *iova) diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h -index f6d092fdb..ffb0a8705 100644 +index f6d092fdb93d..ffb0a87055b1 100644 --- a/include/linux/irqchip/arm-gic-v3.h +++ b/include/linux/irqchip/arm-gic-v3.h @@ -708,6 +708,8 @@ static inline bool gic_enable_sre(void) @@ -1730211,7 +1730211,7 @@ index f6d092fdb..ffb0a8705 100644 #endif diff --git a/include/linux/irqchip/arm-gic-v4.h b/include/linux/irqchip/arm-gic-v4.h -index 6976b8331..943c3411c 100644 +index 6976b8331b60..943c3411ca10 100644 --- a/include/linux/irqchip/arm-gic-v4.h +++ b/include/linux/irqchip/arm-gic-v4.h @@ -39,6 +39,8 @@ struct its_vpe { @@ -1730240,7 +1730240,7 @@ index 6976b8331..943c3411c 100644 int its_map_vlpi(int irq, struct its_vlpi_map *map); int its_get_vlpi(int irq, struct its_vlpi_map *map); diff --git a/include/linux/memblock.h b/include/linux/memblock.h -index 3baea2ef3..2b770134c 100644 +index 3baea2ef33fb..2b770134cc97 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -25,6 +25,10 @@ extern unsigned long max_pfn; @@ -1730338,7 +1730338,7 @@ index 3baea2ef3..2b770134c 100644 } diff --git a/include/linux/memory_group_manager.h b/include/linux/memory_group_manager.h new file mode 100755 -index 000000000..786e3b995 +index 000000000000..786e3b995f29 --- /dev/null +++ b/include/linux/memory_group_manager.h @@ -0,0 +1,223 @@ @@ -1730566,7 +1730566,7 @@ index 000000000..786e3b995 + +#endif /* _MEMORY_GROUP_MANAGER_H_ */ diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h -index e07f6e61c..7cdc5dfa4 100644 +index e07f6e61cd38..7cdc5dfa4fce 100644 --- a/include/linux/mfd/rk808.h +++ b/include/linux/mfd/rk808.h @@ -113,6 +113,235 @@ enum rk808_reg { @@ -1731118,7 +1731118,7 @@ index e07f6e61c..7cdc5dfa4 100644 }; #endif /* __LINUX_REGULATOR_RK808_H */ diff --git a/include/linux/mm.h b/include/linux/mm.h -index 9ed1be47c..9d52a0c60 100644 +index 9ed1be47c8cb..9d52a0c60677 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2944,6 +2944,8 @@ extern bool page_poisoning_enabled(void); @@ -1731131,7 +1731131,7 @@ index 9ed1be47c..9d52a0c60 100644 int enable) { } #endif diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h -index 40d7e98fc..819f6119d 100644 +index 40d7e98fc990..819f6119dff3 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -141,6 +141,7 @@ struct mmc_host_ops { @@ -1731153,7 +1731153,7 @@ index 40d7e98fc..819f6119d 100644 { return (void *)host->private; diff --git a/include/linux/mmu_context.h b/include/linux/mmu_context.h -index 03dee12d2..bc4ac3c52 100644 +index 03dee12d2b61..bc4ac3c525e6 100644 --- a/include/linux/mmu_context.h +++ b/include/linux/mmu_context.h @@ -14,4 +14,12 @@ @@ -1731171,7 +1731171,7 @@ index 03dee12d2..bc4ac3c52 100644 #endif diff --git a/include/linux/phy/pcie.h b/include/linux/phy/pcie.h new file mode 100755 -index 000000000..93c997f52 +index 000000000000..93c997f520fe --- /dev/null +++ b/include/linux/phy/pcie.h @@ -0,0 +1,12 @@ @@ -1731189,7 +1731189,7 @@ index 000000000..93c997f52 +#endif diff --git a/include/linux/phy/phy-rockchip-typec.h b/include/linux/phy/phy-rockchip-typec.h new file mode 100755 -index 000000000..1d6af83d3 +index 000000000000..1d6af83d3b89 --- /dev/null +++ b/include/linux/phy/phy-rockchip-typec.h @@ -0,0 +1,34 @@ @@ -1731229,7 +1731229,7 @@ index 000000000..1d6af83d3 +#endif diff --git a/include/linux/power/bq25700-charge.h b/include/linux/power/bq25700-charge.h new file mode 100755 -index 000000000..5e7d3e40d +index 000000000000..5e7d3e40d2ea --- /dev/null +++ b/include/linux/power/bq25700-charge.h @@ -0,0 +1,20 @@ @@ -1731255,7 +1731255,7 @@ index 000000000..5e7d3e40d +#endif /* __CHARGER_BQ25700_H_ */ diff --git a/include/linux/power/cw2015_battery.h b/include/linux/power/cw2015_battery.h new file mode 100755 -index 000000000..8e6b1fc7e +index 000000000000..8e6b1fc7e344 --- /dev/null +++ b/include/linux/power/cw2015_battery.h @@ -0,0 +1,119 @@ @@ -1731380,7 +1731380,7 @@ index 000000000..8e6b1fc7e +#endif diff --git a/include/linux/power/rk_usbbc.h b/include/linux/power/rk_usbbc.h new file mode 100755 -index 000000000..45f7128b3 +index 000000000000..45f7128b3a69 --- /dev/null +++ b/include/linux/power/rk_usbbc.h @@ -0,0 +1,44 @@ @@ -1731429,7 +1731429,7 @@ index 000000000..45f7128b3 + +#endif diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h -index e6fe2f581..26ca45b7b 100644 +index e6fe2f581bda..26ca45b7b9b9 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -49,6 +49,12 @@ enum { @@ -1731487,7 +1731487,7 @@ index e6fe2f581..26ca45b7b 100644 extern void power_supply_external_power_changed(struct power_supply *psy); diff --git a/include/linux/priority_control_manager.h b/include/linux/priority_control_manager.h new file mode 100644 -index 000000000..a6b151916 +index 000000000000..a6b151916b37 --- /dev/null +++ b/include/linux/priority_control_manager.h @@ -0,0 +1,77 @@ @@ -1731569,7 +1731569,7 @@ index 000000000..a6b151916 + +#endif /* _PRIORITY_CONTROL_MANAGER_H_ */ diff --git a/include/linux/pwm.h b/include/linux/pwm.h -index a13ff383f..6b2a7fb80 100644 +index a13ff383fa1d..6b2a7fb80de8 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h @@ -59,6 +59,9 @@ struct pwm_state { @@ -1731583,7 +1731583,7 @@ index a13ff383f..6b2a7fb80 100644 }; diff --git a/include/linux/reboot.h b/include/linux/reboot.h -index 3734cd8f3..1c8d7856c 100644 +index 3734cd8f38a8..1c8d7856c559 100644 --- a/include/linux/reboot.h +++ b/include/linux/reboot.h @@ -49,6 +49,26 @@ extern int register_restart_handler(struct notifier_block *); @@ -1731614,7 +1731614,7 @@ index 3734cd8f3..1c8d7856c 100644 * Architecture-specific implementations of sys_reboot commands. */ diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h -index 633e7a2ab..521e48c34 100644 +index 633e7a2ab01d..521e48c34d07 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -223,6 +223,8 @@ enum regulator_type { @@ -1731635,7 +1731635,7 @@ index 633e7a2ab..521e48c34 100644 int (*of_parse_cb)(struct device_node *, const struct regulator_desc *, diff --git a/include/linux/regulator/fan53555.h b/include/linux/regulator/fan53555.h -index ce8df2186..e8703b6fc 100644 +index ce8df21863f0..e8703b6fc13d 100644 --- a/include/linux/regulator/fan53555.h +++ b/include/linux/regulator/fan53555.h @@ -52,6 +52,8 @@ struct fan53555_platform_data { @@ -1731649,7 +1731649,7 @@ index ce8df2186..e8703b6fc 100644 #endif /* __FAN53555_H__ */ diff --git a/include/linux/rfkill-bt.h b/include/linux/rfkill-bt.h new file mode 100755 -index 000000000..c4174b156 +index 000000000000..c4174b156580 --- /dev/null +++ b/include/linux/rfkill-bt.h @@ -0,0 +1,73 @@ @@ -1731728,7 +1731728,7 @@ index 000000000..c4174b156 + diff --git a/include/linux/rfkill-wlan.h b/include/linux/rfkill-wlan.h new file mode 100755 -index 000000000..431e71a7a +index 000000000000..431e71a7a844 --- /dev/null +++ b/include/linux/rfkill-wlan.h @@ -0,0 +1,62 @@ @@ -1731796,7 +1731796,7 @@ index 000000000..431e71a7a +#endif diff --git a/include/linux/rk_keys.h b/include/linux/rk_keys.h new file mode 100755 -index 000000000..aee656daf +index 000000000000..aee656daf2c8 --- /dev/null +++ b/include/linux/rk_keys.h @@ -0,0 +1,19 @@ @@ -1731821,7 +1731821,7 @@ index 000000000..aee656daf +#endif diff --git a/include/linux/rockchip-iovmm.h b/include/linux/rockchip-iovmm.h new file mode 100755 -index 000000000..3005c745e +index 000000000000..3005c745e5b8 --- /dev/null +++ b/include/linux/rockchip-iovmm.h @@ -0,0 +1,91 @@ @@ -1731918,7 +1731918,7 @@ index 000000000..3005c745e +#endif /*__ASM_PLAT_IOVMM_H*/ diff --git a/include/linux/rockchip/cpu.h b/include/linux/rockchip/cpu.h new file mode 100755 -index 000000000..beaaf923f +index 000000000000..beaaf923f9ec --- /dev/null +++ b/include/linux/rockchip/cpu.h @@ -0,0 +1,272 @@ @@ -1732196,7 +1732196,7 @@ index 000000000..beaaf923f +#endif diff --git a/include/linux/rockchip/grf.h b/include/linux/rockchip/grf.h new file mode 100755 -index 000000000..fae512322 +index 000000000000..fae51232297c --- /dev/null +++ b/include/linux/rockchip/grf.h @@ -0,0 +1,700 @@ @@ -1732902,7 +1732902,7 @@ index 000000000..fae512322 +#endif diff --git a/include/linux/rockchip/nvmem.h b/include/linux/rockchip/nvmem.h new file mode 100644 -index 000000000..741887856 +index 000000000000..741887856e33 --- /dev/null +++ b/include/linux/rockchip/nvmem.h @@ -0,0 +1,26 @@ @@ -1732934,7 +1732934,7 @@ index 000000000..741887856 +#endif diff --git a/include/linux/rockchip/psci.h b/include/linux/rockchip/psci.h new file mode 100755 -index 000000000..870da27ed +index 000000000000..870da27edf65 --- /dev/null +++ b/include/linux/rockchip/psci.h @@ -0,0 +1,76 @@ @@ -1733016,7 +1733016,7 @@ index 000000000..870da27ed +#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 000000000..2c95b04b0 +index 000000000000..2c95b04b092d --- /dev/null +++ b/include/linux/rockchip/rockchip_pm_config.h @@ -0,0 +1,32 @@ @@ -1733054,7 +1733054,7 @@ index 000000000..2c95b04b0 +#endif /* __ROCKCHIP_PM_CONFIG_H */ diff --git a/include/linux/rockchip/rockchip_sip.h b/include/linux/rockchip/rockchip_sip.h new file mode 100755 -index 000000000..70b1493ef +index 000000000000..70b1493ef697 --- /dev/null +++ b/include/linux/rockchip/rockchip_sip.h @@ -0,0 +1,549 @@ @@ -1733609,7 +1733609,7 @@ index 000000000..70b1493ef +#endif diff --git a/include/linux/rockchip_ion.h b/include/linux/rockchip_ion.h new file mode 100755 -index 000000000..39c497774 +index 000000000000..39c497774fb0 --- /dev/null +++ b/include/linux/rockchip_ion.h @@ -0,0 +1,41 @@ @@ -1733655,7 +1733655,7 @@ index 000000000..39c497774 + +#endif diff --git a/include/linux/sched.h b/include/linux/sched.h -index d590141f0..b5d9a9ce8 100644 +index d590141f04d1..b5d9a9ce8d86 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1369,7 +1369,7 @@ struct task_struct { @@ -1733668,7 +1733668,7 @@ index d590141f0..b5d9a9ce8 100644 #endif diff --git a/include/linux/sched/signal.h b/include/linux/sched/signal.h -index ae60f838e..9a0e2a1d6 100644 +index ae60f838ebb9..9a0e2a1d626c 100644 --- a/include/linux/sched/signal.h +++ b/include/linux/sched/signal.h @@ -12,6 +12,7 @@ @@ -1733680,7 +1733680,7 @@ index ae60f838e..9a0e2a1d6 100644 /* * Types defining task->signal and task->sighand and APIs using them: diff --git a/include/linux/sched/xacct.h b/include/linux/sched/xacct.h -index c078f0a94..9544c9d9d 100644 +index c078f0a94cec..9544c9d9d534 100644 --- a/include/linux/sched/xacct.h +++ b/include/linux/sched/xacct.h @@ -28,6 +28,11 @@ static inline void inc_syscw(struct task_struct *tsk) @@ -1733708,7 +1733708,7 @@ index c078f0a94..9544c9d9d 100644 #endif /* _LINUX_SCHED_XACCT_H */ diff --git a/include/linux/sensor-dev.h b/include/linux/sensor-dev.h new file mode 100755 -index 000000000..6ae9c16e6 +index 000000000000..6ae9c16e67a3 --- /dev/null +++ b/include/linux/sensor-dev.h @@ -0,0 +1,350 @@ @@ -1734064,7 +1734064,7 @@ index 000000000..6ae9c16e6 + diff --git a/include/linux/soc/rockchip/pvtm.h b/include/linux/soc/rockchip/pvtm.h new file mode 100755 -index 000000000..3d2495cfd +index 000000000000..3d2495cfd6e5 --- /dev/null +++ b/include/linux/soc/rockchip/pvtm.h @@ -0,0 +1,17 @@ @@ -1734087,7 +1734087,7 @@ index 000000000..3d2495cfd +#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 000000000..14f70f72e +index 000000000000..14f70f72e383 --- /dev/null +++ b/include/linux/soc/rockchip/rk_sdmmc.h @@ -0,0 +1,13 @@ @@ -1734106,7 +1734106,7 @@ index 000000000..14f70f72e +#endif diff --git a/include/linux/soc/rockchip/rk_vendor_storage.h b/include/linux/soc/rockchip/rk_vendor_storage.h new file mode 100755 -index 000000000..d30b775e6 +index 000000000000..d30b775e6a5f --- /dev/null +++ b/include/linux/soc/rockchip/rk_vendor_storage.h @@ -0,0 +1,96 @@ @@ -1734208,7 +1734208,7 @@ index 000000000..d30b775e6 +#endif diff --git a/include/linux/soc/rockchip/rockchip_decompress.h b/include/linux/soc/rockchip/rockchip_decompress.h new file mode 100755 -index 000000000..120ae907c +index 000000000000..120ae907c2aa --- /dev/null +++ b/include/linux/soc/rockchip/rockchip_decompress.h @@ -0,0 +1,42 @@ @@ -1734256,7 +1734256,7 @@ index 000000000..120ae907c +#endif diff --git a/include/linux/soc/rockchip/rockchip_thunderboot_crypto.h b/include/linux/soc/rockchip/rockchip_thunderboot_crypto.h new file mode 100755 -index 000000000..2fe176649 +index 000000000000..2fe176649409 --- /dev/null +++ b/include/linux/soc/rockchip/rockchip_thunderboot_crypto.h @@ -0,0 +1,9 @@ @@ -1734271,7 +1734271,7 @@ index 000000000..2fe176649 +#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 000000000..d0a08a07c +index 000000000000..d0a08a07c21d --- /dev/null +++ b/include/linux/soc/rockchip/rockchip_thunderboot_service.h @@ -0,0 +1,37 @@ @@ -1734313,7 +1734313,7 @@ index 000000000..d0a08a07c +#endif +#endif diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h -index abf7b8ec1..bf41c178e 100644 +index abf7b8ec1fb6..bf41c178e22e 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -183,6 +183,7 @@ struct plat_stmmacenet_data { @@ -1734325,7 +1734325,7 @@ index abf7b8ec1..bf41c178e 100644 void *bsp_priv; struct clk *stmmac_clk; diff --git a/include/linux/thermal.h b/include/linux/thermal.h -index 7097d4dcf..781e5bfbb 100644 +index 7097d4dcfdd0..781e5bfbb9b4 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -399,6 +399,7 @@ void thermal_cdev_update(struct thermal_cooling_device *); @@ -1734354,7 +1734354,7 @@ diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h old mode 100644 new mode 100755 diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h -index a2d229ab6..4d352204e 100644 +index a2d229ab63ba..4d352204e819 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h @@ -525,6 +525,8 @@ extern struct usb_string *usb_gstrings_attach(struct usb_composite_dev *cdev, @@ -1734376,7 +1734376,7 @@ index a2d229ab6..4d352204e 100644 void (*free_func_inst)(struct usb_function_instance *inst); diff --git a/include/linux/usb/f_accessory.h b/include/linux/usb/f_accessory.h new file mode 100755 -index 000000000..ebe3c4d59 +index 000000000000..ebe3c4d59309 --- /dev/null +++ b/include/linux/usb/f_accessory.h @@ -0,0 +1,23 @@ @@ -1734406,7 +1734406,7 @@ index 000000000..ebe3c4d59 diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h old mode 100644 new mode 100755 -index e7351d64f..daf43d1af +index e7351d64f11f..daf43d1af134 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -217,6 +217,7 @@ struct usb_ep_caps { @@ -1734482,7 +1734482,7 @@ index e7351d64f..daf43d1af /*-------------------------------------------------------------------------*/ diff --git a/include/linux/usb/pd.h b/include/linux/usb/pd.h -index 433040ff8..96b7ff66f 100644 +index 433040ff840a..96b7ff66f074 100644 --- a/include/linux/usb/pd.h +++ b/include/linux/usb/pd.h @@ -225,6 +225,7 @@ enum pd_pdo_type { @@ -1734522,7 +1734522,7 @@ index 433040ff8..96b7ff66f 100644 + #endif /* __LINUX_USB_PD_H */ diff --git a/include/linux/usb/pd_ext_sdb.h b/include/linux/usb/pd_ext_sdb.h -index 0eb83ce19..b517ebc8f 100644 +index 0eb83ce19597..b517ebc8f0ff 100644 --- a/include/linux/usb/pd_ext_sdb.h +++ b/include/linux/usb/pd_ext_sdb.h @@ -24,8 +24,4 @@ enum usb_pd_ext_sdb_fields { @@ -1734535,7 +1734535,7 @@ index 0eb83ce19..b517ebc8f 100644 - #endif /* __LINUX_USB_PD_EXT_SDB_H */ diff --git a/include/linux/usb/pd_vdo.h b/include/linux/usb/pd_vdo.h -index 68bdc4e2f..7f5e330a6 100644 +index 68bdc4e2f5a9..7f5e330a68a6 100644 --- a/include/linux/usb/pd_vdo.h +++ b/include/linux/usb/pd_vdo.h @@ -21,22 +21,24 @@ @@ -1734978,7 +1734978,7 @@ index 68bdc4e2f..7f5e330a6 100644 * SVDM Discover SVIDs request -> response * diff --git a/include/linux/usb/quirks.h b/include/linux/usb/quirks.h -index 5e4c497f5..6567f7445 100644 +index 5e4c497f54d6..6567f7445c2d 100644 --- a/include/linux/usb/quirks.h +++ b/include/linux/usb/quirks.h @@ -72,4 +72,7 @@ @@ -1734990,7 +1734990,7 @@ index 5e4c497f5..6567f7445 100644 + #endif /* __LINUX_USB_QUIRKS_H */ diff --git a/include/linux/usb/tcpm.h b/include/linux/usb/tcpm.h -index 09762d26f..cb69546f8 100644 +index 09762d26fa0c..cb69546f87af 100644 --- a/include/linux/usb/tcpm.h +++ b/include/linux/usb/tcpm.h @@ -19,6 +19,10 @@ enum typec_cc_status { @@ -1735102,7 +1735102,7 @@ index 09762d26f..cb69546f8 100644 diff --git a/include/linux/usb/typec.h b/include/linux/usb/typec.h old mode 100644 new mode 100755 -index 6be558045..a5e685dd6 +index 6be558045942..a5e685dd6dad --- a/include/linux/usb/typec.h +++ b/include/linux/usb/typec.h @@ -17,6 +17,7 @@ struct typec_partner; @@ -1735223,7 +1735223,7 @@ index 6be558045..a5e685dd6 +int typec_get_negotiated_svdm_version(struct typec_port *port); #endif /* __LINUX_USB_TYPEC_H */ diff --git a/include/linux/usb/typec_altmode.h b/include/linux/usb/typec_altmode.h -index 5e0a7b764..65933cbe9 100644 +index 5e0a7b7647c3..65933cbe9129 100644 --- a/include/linux/usb/typec_altmode.h +++ b/include/linux/usb/typec_altmode.h @@ -132,6 +132,16 @@ typec_altmode_get_orientation(struct typec_altmode *altmode) @@ -1735244,7 +1735244,7 @@ index 5e0a7b764..65933cbe9 100644 * struct typec_altmode_driver - USB Type-C alternate mode device driver * @id_table: Null terminated array of SVIDs diff --git a/include/linux/usb/typec_tbt.h b/include/linux/usb/typec_tbt.h -index 47c2d501d..63dd44b72 100644 +index 47c2d501ddce..63dd44b72e0c 100644 --- a/include/linux/usb/typec_tbt.h +++ b/include/linux/usb/typec_tbt.h @@ -39,12 +39,16 @@ struct typec_thunderbolt_data { @@ -1735266,7 +1735266,7 @@ index 47c2d501d..63dd44b72 100644 /* TBT3 Device Enter Mode VDO bits */ #define TBT_ENTER_MODE_CABLE_SPEED(s) TBT_SET_CABLE_SPEED(s) diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h -index 8110c29fa..2e4f7721f 100644 +index 8110c29fab42..2e4f7721fc4e 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@ -83,8 +83,6 @@ struct usbnet { @@ -1735280,7 +1735280,7 @@ index 8110c29fa..2e4f7721f 100644 static inline struct usb_driver *driver_of(struct usb_interface *intf) diff --git a/include/linux/version_compat_defs.h b/include/linux/version_compat_defs.h new file mode 100644 -index 000000000..c9b1f6268 +index 000000000000..c9b1f62684d1 --- /dev/null +++ b/include/linux/version_compat_defs.h @@ -0,0 +1,79 @@ @@ -1735365,7 +1735365,7 @@ index 000000000..c9b1f6268 +#endif /* _VERSION_COMPAT_DEFS_H_ */ diff --git a/include/linux/wakelock.h b/include/linux/wakelock.h new file mode 100755 -index 000000000..7b4825ba9 +index 000000000000..7b4825ba9521 --- /dev/null +++ b/include/linux/wakelock.h @@ -0,0 +1,76 @@ @@ -1735447,7 +1735447,7 @@ index 000000000..7b4825ba9 +#endif diff --git a/include/linux/wakeup_reason.h b/include/linux/wakeup_reason.h new file mode 100755 -index 000000000..54f5caaa5 +index 000000000000..54f5caaa5cde --- /dev/null +++ b/include/linux/wakeup_reason.h @@ -0,0 +1,37 @@ @@ -1735489,7 +1735489,7 @@ index 000000000..54f5caaa5 + +#endif /* _LINUX_WAKEUP_REASON_H */ diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h -index 92cd9f038..03b43b0f7 100644 +index 92cd9f038fed..03b43b0f706e 100644 --- a/include/media/v4l2-async.h +++ b/include/media/v4l2-async.h @@ -266,6 +266,21 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev, @@ -1735516,7 +1735516,7 @@ index 92cd9f038..03b43b0f7 100644 * asynchronous notifier diff --git a/include/soc/rockchip/android-version.h b/include/soc/rockchip/android-version.h new file mode 100755 -index 000000000..e0d865bab +index 000000000000..e0d865bab335 --- /dev/null +++ b/include/soc/rockchip/android-version.h @@ -0,0 +1,17 @@ @@ -1735539,7 +1735539,7 @@ index 000000000..e0d865bab +#endif diff --git a/include/soc/rockchip/pm_domains.h b/include/soc/rockchip/pm_domains.h new file mode 100755 -index 000000000..0e1fadd3d +index 000000000000..0e1fadd3d52e --- /dev/null +++ b/include/soc/rockchip/pm_domains.h @@ -0,0 +1,61 @@ @@ -1735606,7 +1735606,7 @@ index 000000000..0e1fadd3d +#endif diff --git a/include/soc/rockchip/rk_minidump.h b/include/soc/rockchip/rk_minidump.h new file mode 100644 -index 000000000..c9e9efd22 +index 000000000000..c9e9efd2222b --- /dev/null +++ b/include/soc/rockchip/rk_minidump.h @@ -0,0 +1,75 @@ @@ -1735687,7 +1735687,7 @@ index 000000000..c9e9efd22 +#endif /* __RK_MINIDUMP_H */ diff --git a/include/soc/rockchip/rkfb_dmc.h b/include/soc/rockchip/rkfb_dmc.h new file mode 100755 -index 000000000..5e82b3194 +index 000000000000..5e82b3194dd3 --- /dev/null +++ b/include/soc/rockchip/rkfb_dmc.h @@ -0,0 +1,11 @@ @@ -1735704,7 +1735704,7 @@ index 000000000..5e82b3194 +#endif diff --git a/include/soc/rockchip/rockchip-mailbox.h b/include/soc/rockchip/rockchip-mailbox.h new file mode 100644 -index 000000000..e3698b9e1 +index 000000000000..e3698b9e10fe --- /dev/null +++ b/include/soc/rockchip/rockchip-mailbox.h @@ -0,0 +1,30 @@ @@ -1735740,7 +1735740,7 @@ index 000000000..e3698b9e1 +#endif /* __SOC_ROCKCHIP_MAILBOX_H__ */ diff --git a/include/soc/rockchip/rockchip-system-status.h b/include/soc/rockchip/rockchip-system-status.h new file mode 100755 -index 000000000..5eb53ff2f +index 000000000000..5eb53ff2f3f3 --- /dev/null +++ b/include/soc/rockchip/rockchip-system-status.h @@ -0,0 +1,55 @@ @@ -1735801,7 +1735801,7 @@ index 000000000..5eb53ff2f +#endif diff --git a/include/soc/rockchip/rockchip_amp.h b/include/soc/rockchip/rockchip_amp.h new file mode 100644 -index 000000000..851c0f47d +index 000000000000..851c0f47d54a --- /dev/null +++ b/include/soc/rockchip/rockchip_amp.h @@ -0,0 +1,48 @@ @@ -1735855,7 +1735855,7 @@ index 000000000..851c0f47d +#endif /* _ROCKCHIP_AMP */ diff --git a/include/soc/rockchip/rockchip_csu.h b/include/soc/rockchip/rockchip_csu.h new file mode 100644 -index 000000000..4338d6835 +index 000000000000..4338d68359f7 --- /dev/null +++ b/include/soc/rockchip/rockchip_csu.h @@ -0,0 +1,46 @@ @@ -1735907,7 +1735907,7 @@ index 000000000..4338d6835 +#endif diff --git a/include/soc/rockchip/rockchip_dmc.h b/include/soc/rockchip/rockchip_dmc.h new file mode 100755 -index 000000000..f115cdcec +index 000000000000..f115cdcec291 --- /dev/null +++ b/include/soc/rockchip/rockchip_dmc.h @@ -0,0 +1,131 @@ @@ -1736044,7 +1736044,7 @@ index 000000000..f115cdcec +#endif diff --git a/include/soc/rockchip/rockchip_dvbm.h b/include/soc/rockchip/rockchip_dvbm.h new file mode 100644 -index 000000000..19596f1bd +index 000000000000..19596f1bd4c6 --- /dev/null +++ b/include/soc/rockchip/rockchip_dvbm.h @@ -0,0 +1,161 @@ @@ -1736211,7 +1736211,7 @@ index 000000000..19596f1bd +#endif diff --git a/include/soc/rockchip/rockchip_iommu.h b/include/soc/rockchip/rockchip_iommu.h new file mode 100755 -index 000000000..191a2fda8 +index 000000000000..191a2fda8f1a --- /dev/null +++ b/include/soc/rockchip/rockchip_iommu.h @@ -0,0 +1,52 @@ @@ -1736269,7 +1736269,7 @@ index 000000000..191a2fda8 +#endif diff --git a/include/soc/rockchip/rockchip_ipa.h b/include/soc/rockchip/rockchip_ipa.h new file mode 100755 -index 000000000..cb333f463 +index 000000000000..cb333f463c7b --- /dev/null +++ b/include/soc/rockchip/rockchip_ipa.h @@ -0,0 +1,40 @@ @@ -1736315,7 +1736315,7 @@ index 000000000..cb333f463 +#endif diff --git a/include/soc/rockchip/rockchip_opp_select.h b/include/soc/rockchip/rockchip_opp_select.h new file mode 100755 -index 000000000..e7669f29c +index 000000000000..e7669f29cbd5 --- /dev/null +++ b/include/soc/rockchip/rockchip_opp_select.h @@ -0,0 +1,286 @@ @@ -1736607,7 +1736607,7 @@ index 000000000..e7669f29c +#endif diff --git a/include/soc/rockchip/rockchip_performance.h b/include/soc/rockchip/rockchip_performance.h new file mode 100644 -index 000000000..c080fb65c +index 000000000000..c080fb65c7a5 --- /dev/null +++ b/include/soc/rockchip/rockchip_performance.h @@ -0,0 +1,33 @@ @@ -1736646,7 +1736646,7 @@ index 000000000..c080fb65c +#endif diff --git a/include/soc/rockchip/rockchip_rockit.h b/include/soc/rockchip/rockchip_rockit.h new file mode 100644 -index 000000000..760a864d2 +index 000000000000..760a864d24bc --- /dev/null +++ b/include/soc/rockchip/rockchip_rockit.h @@ -0,0 +1,187 @@ @@ -1736838,7 +1736838,7 @@ index 000000000..760a864d2 + +#endif diff --git a/include/soc/rockchip/rockchip_sip.h b/include/soc/rockchip/rockchip_sip.h -index c46a9ae2a..269cf14c3 100644 +index c46a9ae2a2ab..269cf14c38fb 100644 --- a/include/soc/rockchip/rockchip_sip.h +++ b/include/soc/rockchip/rockchip_sip.h @@ -15,6 +15,14 @@ @@ -1736859,7 +1736859,7 @@ index c46a9ae2a..269cf14c3 100644 #endif diff --git a/include/soc/rockchip/rockchip_system_monitor.h b/include/soc/rockchip/rockchip_system_monitor.h new file mode 100755 -index 000000000..0ca822d10 +index 000000000000..0ca822d1041f --- /dev/null +++ b/include/soc/rockchip/rockchip_system_monitor.h @@ -0,0 +1,237 @@ @@ -1737101,7 +1737101,7 @@ index 000000000..0ca822d10 + +#endif diff --git a/include/sound/hdmi-codec.h b/include/sound/hdmi-codec.h -index b55970859..4fc733c8c 100644 +index b55970859a13..4fc733c8c570 100644 --- a/include/sound/hdmi-codec.h +++ b/include/sound/hdmi-codec.h @@ -34,6 +34,11 @@ struct hdmi_codec_daifmt { @@ -1737141,7 +1737141,7 @@ index b55970859..4fc733c8c 100644 * Shuts down the audio stream. * Mandatory diff --git a/include/trace/events/cpuhp.h b/include/trace/events/cpuhp.h -index ad16f7731..f302ab6db 100644 +index ad16f77310c6..f302ab6dbfb8 100644 --- a/include/trace/events/cpuhp.h +++ b/include/trace/events/cpuhp.h @@ -89,6 +89,28 @@ TRACE_EVENT(cpuhp_exit, @@ -1737174,7 +1737174,7 @@ index ad16f7731..f302ab6db 100644 /* This part must be outside protection */ diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h -index dd5fff2bb..6c6a23b4b 100644 +index dd5fff2bb1b2..6c6a23b4b3c1 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h @@ -203,6 +203,7 @@ TRACE_EVENT(sched_migrate_task, @@ -1737203,7 +1737203,7 @@ index dd5fff2bb..6c6a23b4b 100644 DECLARE_EVENT_CLASS(sched_process_template, diff --git a/include/trace/events/thermal_ipa_power.h b/include/trace/events/thermal_ipa_power.h new file mode 100755 -index 000000000..a3a932c75 +index 000000000000..a3a932c75d6a --- /dev/null +++ b/include/trace/events/thermal_ipa_power.h @@ -0,0 +1,47 @@ @@ -1737255,7 +1737255,7 @@ index 000000000..a3a932c75 +/* This part must be outside protection */ +#include diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h -index dad9d3b4a..1c10ff522 100644 +index dad9d3b4a97a..1c10ff522c6d 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -242,6 +242,8 @@ extern "C" { @@ -1737322,7 +1737322,7 @@ index dad9d3b4a..1c10ff522 100644 #endif diff --git a/include/uapi/drm/rockchip_drm.h b/include/uapi/drm/rockchip_drm.h new file mode 100755 -index 000000000..2ac71b43d +index 000000000000..2ac71b43dba0 --- /dev/null +++ b/include/uapi/drm/rockchip_drm.h @@ -0,0 +1,139 @@ @@ -1737467,7 +1737467,7 @@ index 000000000..2ac71b43d +#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 000000000..a44da7beb +index 000000000000..a44da7beb041 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.h @@ -0,0 +1,77 @@ @@ -1737550,7 +1737550,7 @@ index 000000000..a44da7beb +#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 000000000..c83cedd6a +index 000000000000..c83cedd6a775 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.h @@ -0,0 +1,36 @@ @@ -1737592,7 +1737592,7 @@ index 000000000..c83cedd6a +#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 000000000..c18c6fc8a +index 000000000000..c18c6fc8a7ae --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/csf/mali_base_csf_kernel.h @@ -0,0 +1,613 @@ @@ -1738211,7 +1738211,7 @@ index 000000000..c18c6fc8a +#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 000000000..f49ab0036 +index 000000000000..f49ab0036fc3 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/csf/mali_kbase_csf_errors_dumpfault.h @@ -0,0 +1,81 @@ @@ -1738298,7 +1738298,7 @@ index 000000000..f49ab0036 +#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 000000000..7c37cfc07 +index 000000000000..7c37cfc077f8 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/csf/mali_kbase_csf_ioctl.h @@ -0,0 +1,614 @@ @@ -1738918,7 +1738918,7 @@ index 000000000..7c37cfc07 +#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 000000000..0ca5d902f +index 000000000000..0ca5d902f174 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h @@ -0,0 +1,41 @@ @@ -1738965,7 +1738965,7 @@ index 000000000..0ca5d902f +#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 000000000..9bfd6d2fc +index 000000000000..9bfd6d2fc529 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h @@ -0,0 +1,50 @@ @@ -1739021,7 +1739021,7 @@ index 000000000..9bfd6d2fc +#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 000000000..83d84137a +index 000000000000..83d84137a034 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_coherency.h @@ -0,0 +1,30 @@ @@ -1739057,7 +1739057,7 @@ index 000000000..83d84137a +#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 000000000..784e09a7e +index 000000000000..784e09a7edc2 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_id.h @@ -0,0 +1,145 @@ @@ -1739208,7 +1739208,7 @@ index 000000000..784e09a7e +#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 000000000..1f331671b +index 000000000000..1f331671b6b4 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h @@ -0,0 +1,98 @@ @@ -1739312,7 +1739312,7 @@ index 000000000..1f331671b +#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 000000000..1a3098d6c +index 000000000000..1a3098d6cad8 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/jm/mali_base_jm_kernel.h @@ -0,0 +1,1055 @@ @@ -1740373,7 +1740373,7 @@ index 000000000..1a3098d6c +#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 000000000..ac6affe8c +index 000000000000..ac6affe8c76c --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/jm/mali_kbase_jm_ioctl.h @@ -0,0 +1,247 @@ @@ -1740626,7 +1740626,7 @@ index 000000000..ac6affe8c +#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 000000000..f8378146a +index 000000000000..f8378146aceb --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_base_common_kernel.h @@ -0,0 +1,231 @@ @@ -1740863,7 +1740863,7 @@ index 000000000..f8378146a +#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 000000000..e6cac0eb2 +index 000000000000..e6cac0eb2a1a --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_base_kernel.h @@ -0,0 +1,643 @@ @@ -1741512,7 +1741512,7 @@ index 000000000..e6cac0eb2 +#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 000000000..70f5b0977 +index 000000000000..70f5b0977520 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_base_mem_priv.h @@ -0,0 +1,57 @@ @@ -1741575,7 +1741575,7 @@ index 000000000..70f5b0977 +#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 000000000..5089bf249 +index 000000000000..5089bf249528 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_kbase_hwcnt_reader.h @@ -0,0 +1,503 @@ @@ -1742084,7 +1742084,7 @@ index 000000000..5089bf249 +#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 000000000..c8a54f911 +index 000000000000..c8a54f91165e --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_kbase_ioctl.h @@ -0,0 +1,789 @@ @@ -1742879,7 +1742879,7 @@ index 000000000..c8a54f911 +#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 000000000..72e1b9dbf +index 000000000000..72e1b9dbf245 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_kbase_kinstr_jm_reader.h @@ -0,0 +1,69 @@ @@ -1742954,7 +1742954,7 @@ index 000000000..72e1b9dbf +#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 000000000..329845005 +index 000000000000..329845005341 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs_buf_size.h @@ -0,0 +1,35 @@ @@ -1742994,7 +1742994,7 @@ index 000000000..329845005 + +#endif /*_UAPI_KBASE_MEM_PROFILE_DEBUGFS_BUF_SIZE_H_*/ diff --git a/include/uapi/linux/cec.h b/include/uapi/linux/cec.h -index 7d1a06c52..ebbcb9b01 100644 +index 7d1a06c52469..ebbcb9b0104a 100644 --- a/include/uapi/linux/cec.h +++ b/include/uapi/linux/cec.h @@ -516,6 +516,12 @@ struct cec_event { @@ -1743012,7 +1743012,7 @@ index 7d1a06c52..ebbcb9b01 100644 * The format matters since it the cec-ctl utility parses it to generate diff --git a/include/uapi/linux/fec-config.h b/include/uapi/linux/fec-config.h new file mode 100755 -index 000000000..2b3f97fb2 +index 000000000000..2b3f97fb2a3e --- /dev/null +++ b/include/uapi/linux/fec-config.h @@ -0,0 +1,33 @@ @@ -1743050,7 +1743050,7 @@ index 000000000..2b3f97fb2 + +#endif diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h -index 84fa53ffb..f16dff5b4 100644 +index 84fa53ffb13f..f16dff5b49cc 100644 --- a/include/uapi/linux/media-bus-format.h +++ b/include/uapi/linux/media-bus-format.h @@ -34,7 +34,7 @@ @@ -1743076,7 +1743076,7 @@ index 84fa53ffb..f16dff5b4 100644 #define MEDIA_BUS_FMT_Y8_1X8 0x2001 diff --git a/include/uapi/linux/rk-camera-module.h b/include/uapi/linux/rk-camera-module.h new file mode 100755 -index 000000000..68e57c0a9 +index 000000000000..68e57c0a9e41 --- /dev/null +++ b/include/uapi/linux/rk-camera-module.h @@ -0,0 +1,813 @@ @@ -1743895,7 +1743895,7 @@ index 000000000..68e57c0a9 +#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 000000000..b7a7fd1dd +index 000000000000..b7a7fd1ddb3b --- /dev/null +++ b/include/uapi/linux/rk-decom.h @@ -0,0 +1,34 @@ @@ -1743935,7 +1743935,7 @@ index 000000000..b7a7fd1dd +#endif diff --git a/include/uapi/linux/rk-dma-heap.h b/include/uapi/linux/rk-dma-heap.h new file mode 100644 -index 000000000..4e83d7181 +index 000000000000..4e83d71811ce --- /dev/null +++ b/include/uapi/linux/rk-dma-heap.h @@ -0,0 +1,55 @@ @@ -1743996,7 +1743996,7 @@ index 000000000..4e83d7181 +#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 000000000..58da85c9c +index 000000000000..58da85c9cb2e --- /dev/null +++ b/include/uapi/linux/rk-iomux.h @@ -0,0 +1,20 @@ @@ -1744022,7 +1744022,7 @@ index 000000000..58da85c9c +#endif diff --git a/include/uapi/linux/rk-isp1-config.h b/include/uapi/linux/rk-isp1-config.h new file mode 100644 -index 000000000..72b8755dd +index 000000000000..72b8755dd707 --- /dev/null +++ b/include/uapi/linux/rk-isp1-config.h @@ -0,0 +1,872 @@ @@ -1744900,7 +1744900,7 @@ index 000000000..72b8755dd +#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 000000000..50949e075 +index 000000000000..50949e0752bc --- /dev/null +++ b/include/uapi/linux/rk-isp2-config.h @@ -0,0 +1,2018 @@ @@ -1746924,7 +1746924,7 @@ index 000000000..50949e075 +#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 000000000..aad8fbad7 +index 000000000000..aad8fbad705c --- /dev/null +++ b/include/uapi/linux/rk-isp21-config.h @@ -0,0 +1,813 @@ @@ -1747743,7 +1747743,7 @@ index 000000000..aad8fbad7 +#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 000000000..e14492674 +index 000000000000..e14492674b3e --- /dev/null +++ b/include/uapi/linux/rk-isp3-config.h @@ -0,0 +1,1077 @@ @@ -1748826,7 +1748826,7 @@ index 000000000..e14492674 +#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 000000000..ecd4eaef2 +index 000000000000..ecd4eaef2cd3 --- /dev/null +++ b/include/uapi/linux/rk-isp32-config.h @@ -0,0 +1,1528 @@ @@ -1750360,7 +1750360,7 @@ index 000000000..ecd4eaef2 +#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 000000000..616ddff9e +index 000000000000..616ddff9ed64 --- /dev/null +++ b/include/uapi/linux/rk-ispp-config.h @@ -0,0 +1,422 @@ @@ -1750788,7 +1750788,7 @@ index 000000000..616ddff9e +#endif diff --git a/include/uapi/linux/rk-led-flash.h b/include/uapi/linux/rk-led-flash.h new file mode 100755 -index 000000000..c679cb9eb +index 000000000000..c679cb9eb39a --- /dev/null +++ b/include/uapi/linux/rk-led-flash.h @@ -0,0 +1,9 @@ @@ -1750803,7 +1750803,7 @@ index 000000000..c679cb9eb +#endif diff --git a/include/uapi/linux/rk-mpp.h b/include/uapi/linux/rk-mpp.h new file mode 100644 -index 000000000..9a2440700 +index 000000000000..9a24407001ec --- /dev/null +++ b/include/uapi/linux/rk-mpp.h @@ -0,0 +1,82 @@ @@ -1750891,7 +1750891,7 @@ index 000000000..9a2440700 +#endif /* _UAPI_RK_MPP_H */ diff --git a/include/uapi/linux/rk-pcie-dma.h b/include/uapi/linux/rk-pcie-dma.h new file mode 100755 -index 000000000..bf4a96b5e +index 000000000000..bf4a96b5eea7 --- /dev/null +++ b/include/uapi/linux/rk-pcie-dma.h @@ -0,0 +1,57 @@ @@ -1750954,7 +1750954,7 @@ index 000000000..bf4a96b5e +#endif diff --git a/include/uapi/linux/rk-pcie-ep.h b/include/uapi/linux/rk-pcie-ep.h new file mode 100644 -index 000000000..d89748eed +index 000000000000..d89748eed925 --- /dev/null +++ b/include/uapi/linux/rk-pcie-ep.h @@ -0,0 +1,122 @@ @@ -1751082,7 +1751082,7 @@ index 000000000..d89748eed +#endif diff --git a/include/uapi/linux/rk-preisp.h b/include/uapi/linux/rk-preisp.h new file mode 100755 -index 000000000..4cd51a84a +index 000000000000..4cd51a84ada8 --- /dev/null +++ b/include/uapi/linux/rk-preisp.h @@ -0,0 +1,118 @@ @@ -1751206,7 +1751206,7 @@ index 000000000..4cd51a84a +#endif /* _UAPI_RKPREISP_H */ diff --git a/include/uapi/linux/rk-video-format.h b/include/uapi/linux/rk-video-format.h new file mode 100755 -index 000000000..938d5adff +index 000000000000..938d5adff737 --- /dev/null +++ b/include/uapi/linux/rk-video-format.h @@ -0,0 +1,37 @@ @@ -1751249,7 +1751249,7 @@ index 000000000..938d5adff +#endif /* _UAPI_RK_VIDEO_FORMAT_H */ diff --git a/include/uapi/linux/rk803.h b/include/uapi/linux/rk803.h new file mode 100755 -index 000000000..448468da9 +index 000000000000..448468da9e8d --- /dev/null +++ b/include/uapi/linux/rk803.h @@ -0,0 +1,16 @@ @@ -1751271,7 +1751271,7 @@ index 000000000..448468da9 +#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 000000000..571488235 +index 000000000000..571488235471 --- /dev/null +++ b/include/uapi/linux/rk_cryptodev.h @@ -0,0 +1,85 @@ @@ -1751362,7 +1751362,7 @@ index 000000000..571488235 +#endif diff --git a/include/uapi/linux/rk_hdmirx_config.h b/include/uapi/linux/rk_hdmirx_config.h new file mode 100644 -index 000000000..26dcea790 +index 000000000000..26dcea790013 --- /dev/null +++ b/include/uapi/linux/rk_hdmirx_config.h @@ -0,0 +1,88 @@ @@ -1751456,7 +1751456,7 @@ index 000000000..26dcea790 +#endif /* _UAPI_RK_HDMIRX_CONFIG_H */ diff --git a/include/uapi/linux/rk_vcm_head.h b/include/uapi/linux/rk_vcm_head.h new file mode 100755 -index 000000000..4e663ae26 +index 000000000000..4e663ae260d8 --- /dev/null +++ b/include/uapi/linux/rk_vcm_head.h @@ -0,0 +1,137 @@ @@ -1751599,7 +1751599,7 @@ index 000000000..4e663ae26 + diff --git a/include/uapi/linux/rkcif-config.h b/include/uapi/linux/rkcif-config.h new file mode 100755 -index 000000000..c9b9bbf0d +index 000000000000..c9b9bbf0d301 --- /dev/null +++ b/include/uapi/linux/rkcif-config.h @@ -0,0 +1,91 @@ @@ -1751696,7 +1751696,7 @@ index 000000000..c9b9bbf0d +#endif diff --git a/include/uapi/linux/rkisp1-config.h b/include/uapi/linux/rkisp1-config.h new file mode 100755 -index 000000000..c26d4bb69 +index 000000000000..c26d4bb69261 --- /dev/null +++ b/include/uapi/linux/rkisp1-config.h @@ -0,0 +1,872 @@ @@ -1752574,7 +1752574,7 @@ index 000000000..c26d4bb69 +#endif /* _UAPI_RKISP1_CONFIG_H */ diff --git a/include/uapi/linux/rkisp2-config.h b/include/uapi/linux/rkisp2-config.h new file mode 100755 -index 000000000..9d41f9e8a +index 000000000000..9d41f9e8a097 --- /dev/null +++ b/include/uapi/linux/rkisp2-config.h @@ -0,0 +1,1853 @@ @@ -1754433,7 +1754433,7 @@ index 000000000..9d41f9e8a +#endif /* _UAPI_RKISP2_CONFIG_H */ diff --git a/include/uapi/linux/rkisp21-config.h b/include/uapi/linux/rkisp21-config.h new file mode 100755 -index 000000000..203022b62 +index 000000000000..203022b62361 --- /dev/null +++ b/include/uapi/linux/rkisp21-config.h @@ -0,0 +1,804 @@ @@ -1755243,7 +1755243,7 @@ index 000000000..203022b62 +#endif /* _UAPI_RKISP21_CONFIG_H */ diff --git a/include/uapi/linux/rkisp3-config.h b/include/uapi/linux/rkisp3-config.h new file mode 100755 -index 000000000..25bbe1a9a +index 000000000000..25bbe1a9a146 --- /dev/null +++ b/include/uapi/linux/rkisp3-config.h @@ -0,0 +1,1072 @@ @@ -1756321,7 +1756321,7 @@ index 000000000..25bbe1a9a +#endif /* _UAPI_RKISP3_CONFIG_H */ diff --git a/include/uapi/linux/rkispp-config.h b/include/uapi/linux/rkispp-config.h new file mode 100755 -index 000000000..b4a27f74f +index 000000000000..b4a27f74f9c9 --- /dev/null +++ b/include/uapi/linux/rkispp-config.h @@ -0,0 +1,370 @@ @@ -1756696,7 +1756696,7 @@ index 000000000..b4a27f74f + +#endif diff --git a/include/uapi/linux/serial_reg.h b/include/uapi/linux/serial_reg.h -index f51bc8f36..7e3fe68af 100644 +index f51bc8f36813..7e3fe68af328 100644 --- a/include/uapi/linux/serial_reg.h +++ b/include/uapi/linux/serial_reg.h @@ -30,6 +30,7 @@ @@ -1756709,7 +1756709,7 @@ index f51bc8f36..7e3fe68af 100644 #define UART_IIR_NO_INT 0x01 /* No interrupts pending */ diff --git a/include/uapi/linux/usb/f_accessory.h b/include/uapi/linux/usb/f_accessory.h new file mode 100755 -index 000000000..0baeb7d0d +index 000000000000..0baeb7d0d74c --- /dev/null +++ b/include/uapi/linux/usb/f_accessory.h @@ -0,0 +1,146 @@ @@ -1756860,7 +1756860,7 @@ index 000000000..0baeb7d0d + +#endif /* _UAPI_LINUX_USB_F_ACCESSORY_H */ diff --git a/include/uapi/linux/usb/g_uvc.h b/include/uapi/linux/usb/g_uvc.h -index 652f169a0..428926e35 100644 +index 652f169a019e..428926e35973 100644 --- a/include/uapi/linux/usb/g_uvc.h +++ b/include/uapi/linux/usb/g_uvc.h @@ -19,7 +19,9 @@ @@ -1756875,7 +1756875,7 @@ index 652f169a0..428926e35 100644 struct uvc_request_data { __s32 length; diff --git a/include/uapi/linux/usb/video.h b/include/uapi/linux/usb/video.h -index c58854fb7..d160d5bdd 100644 +index c58854fb7d94..d160d5bdd730 100644 --- a/include/uapi/linux/usb/video.h +++ b/include/uapi/linux/usb/video.h @@ -597,5 +597,63 @@ struct UVC_FRAME_MJPEG(n) { \ @@ -1756943,7 +1756943,7 @@ index c58854fb7..d160d5bdd 100644 #endif /* __LINUX_USB_VIDEO_H */ diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index b28817c59..622e97c10 100644 +index b28817c59fdf..622e97c1060f 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -689,6 +689,7 @@ struct v4l2_pix_format { @@ -1756956,7 +1756956,7 @@ index b28817c59..622e97c10 100644 #define V4L2_PIX_FMT_H264_MVC v4l2_fourcc('M', '2', '6', '4') /* H264 MVC */ diff --git a/include/uapi/misc/rkflash_vendor_storage.h b/include/uapi/misc/rkflash_vendor_storage.h new file mode 100644 -index 000000000..c217380d1 +index 000000000000..c217380d1713 --- /dev/null +++ b/include/uapi/misc/rkflash_vendor_storage.h @@ -0,0 +1,22 @@ @@ -1756983,7 +1756983,7 @@ index 000000000..c217380d1 + +#endif diff --git a/init/Kconfig b/init/Kconfig -index 70bd7f690..4ce9ca666 100644 +index 70bd7f69076a..4ce9ca666ce7 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1365,6 +1365,12 @@ if BLK_DEV_INITRD @@ -1757000,7 +1757000,7 @@ index 70bd7f690..4ce9ca666 100644 config BOOT_CONFIG diff --git a/init/initramfs.c b/init/initramfs.c -index 55b74d7e5..f4c4e2404 100644 +index 55b74d7e5260..f4c4e2404dfd 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -12,6 +12,7 @@ @@ -1757046,7 +1757046,7 @@ index 55b74d7e5..f4c4e2404 100644 rootfs_initcall(populate_rootfs); +#endif diff --git a/init/main.c b/init/main.c -index 30d6afeae..bc383f09d 100644 +index 30d6afeae932..bc383f09d3c6 100644 --- a/init/main.c +++ b/init/main.c @@ -1524,6 +1524,10 @@ static noinline void __init kernel_init_freeable(void) @@ -1757072,7 +1757072,7 @@ index 30d6afeae..bc383f09d 100644 /* diff --git a/ipc/msg.c b/ipc/msg.c -index 8ded6b8f1..6e6c8e0c9 100644 +index 8ded6b8f10a2..6e6c8e0c9380 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -147,7 +147,7 @@ static int newque(struct ipc_namespace *ns, struct ipc_params *params) @@ -1757085,7 +1757085,7 @@ index 8ded6b8f1..6e6c8e0c9 100644 return -ENOMEM; diff --git a/ipc/sem.c b/ipc/sem.c -index 916f7a90b..d735cecd9 100644 +index 916f7a90be31..d735cecd9c1d 100644 --- a/ipc/sem.c +++ b/ipc/sem.c @@ -511,7 +511,7 @@ static struct sem_array *sem_alloc(size_t nsems) @@ -1757116,7 +1757116,7 @@ index 916f7a90b..d735cecd9 100644 ipc_rcu_putref(&sma->sem_perm, sem_rcu_free); return ERR_PTR(-ENOMEM); diff --git a/ipc/shm.c b/ipc/shm.c -index b418731d6..471ac3e74 100644 +index b418731d66e8..471ac3e7498d 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -711,7 +711,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params) @@ -1757129,7 +1757129,7 @@ index b418731d6..471ac3e74 100644 return -ENOMEM; diff --git a/ipc/util.c b/ipc/util.c -index 7c3601dad..bbb5190af 100644 +index 7c3601dad9bd..bbb5190af6d9 100644 --- a/ipc/util.c +++ b/ipc/util.c @@ -754,13 +754,21 @@ struct pid_namespace *ipc_seq_pid_ns(struct seq_file *s) @@ -1757159,7 +1757159,7 @@ index 7c3601dad..bbb5190af 100644 if (ipc != NULL) { rcu_read_lock(); diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index aaad2dce2..22d490959 100644 +index aaad2dce2be6..22d4909597d0 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -128,21 +128,6 @@ static struct bpf_map *find_and_alloc_map(union bpf_attr *attr) @@ -1757322,7 +1757322,7 @@ index aaad2dce2..22d490959 100644 return err; } diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c -index 2f60dffee..538774b57 100644 +index f1deefc9bdcd..a27746e4b7c9 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -3577,22 +3577,7 @@ static void coerce_reg_to_size(struct bpf_reg_state *reg, int size) @@ -1757350,7 +1757350,7 @@ index 2f60dffee..538774b57 100644 static int bpf_map_direct_read(struct bpf_map *map, int off, int size, u64 *val) diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c -index 1592411cb..3090a66cc 100644 +index 1592411cbdd5..3090a66cc509 100644 --- a/kernel/cgroup/cgroup-v1.c +++ b/kernel/cgroup/cgroup-v1.c @@ -520,7 +520,8 @@ static ssize_t __cgroup1_procs_write(struct kernfs_open_file *of, @@ -1757364,7 +1757364,7 @@ index 1592411cb..3090a66cc 100644 put_cred(tcred); if (ret) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c -index b68de0d09..cbab2f812 100644 +index b68de0d09632..cbab2f812db6 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -335,6 +335,8 @@ static struct cpuset top_cpuset = { @@ -1757847,7 +1757847,7 @@ index b68de0d09..cbab2f812 100644 /* diff --git a/kernel/cgroup/legacy_freezer.c b/kernel/cgroup/legacy_freezer.c -index 08236798d..081d026f1 100644 +index 08236798d173..081d026f13db 100644 --- a/kernel/cgroup/legacy_freezer.c +++ b/kernel/cgroup/legacy_freezer.c @@ -479,3 +479,4 @@ struct cgroup_subsys freezer_cgrp_subsys = { @@ -1757856,7 +1757856,7 @@ index 08236798d..081d026f1 100644 }; +EXPORT_SYMBOL_GPL(freezer_cgrp_subsys); diff --git a/kernel/cpu.c b/kernel/cpu.c -index 2cda6a3ef..356baa1b6 100644 +index 2cda6a3efd76..356baa1b6c9d 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -40,6 +40,8 @@ @@ -1757892,7 +1757892,7 @@ index 2cda6a3ef..356baa1b6 100644 if (!cpu_present(cpu)) diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c -index e2999a070..79cb6d063 100644 +index e2999a070a99..79cb6d063b80 100644 --- a/kernel/irq/generic-chip.c +++ b/kernel/irq/generic-chip.c @@ -200,6 +200,7 @@ int irq_gc_set_wake(struct irq_data *d, unsigned int on) @@ -1757904,7 +1757904,7 @@ index e2999a070..79cb6d063 100644 static u32 irq_readl_be(void __iomem *addr) { diff --git a/kernel/power/Makefile b/kernel/power/Makefile -index 5899260a8..97705757f 100644 +index 5899260a8bef..97705757f9c6 100644 --- a/kernel/power/Makefile +++ b/kernel/power/Makefile @@ -17,4 +17,5 @@ obj-$(CONFIG_PM_WAKELOCKS) += wakelock.o @@ -1757914,7 +1757914,7 @@ index 5899260a8..97705757f 100644 +obj-$(CONFIG_SUSPEND) += wakeup_reason.o obj-$(CONFIG_ENERGY_MODEL) += energy_model.o diff --git a/kernel/power/energy_model.c b/kernel/power/energy_model.c -index 334173fe6..c2c858c6d 100644 +index 334173fe6940..c2c858c6d56d 100644 --- a/kernel/power/energy_model.c +++ b/kernel/power/energy_model.c @@ -52,6 +52,17 @@ static int em_debug_cpus_show(struct seq_file *s, void *unused) @@ -1757980,7 +1757980,7 @@ index 334173fe6..c2c858c6d 100644 dev_info(dev, "EM: created perf domain\n"); diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c -index 59a1b126c..b6875ebd1 100644 +index 59a1b126c369..b6875ebd184d 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -326,7 +326,7 @@ static int create_image(int platform_mode) @@ -1757993,7 +1757993,7 @@ index 59a1b126c..b6875ebd1 100644 platform_leave(platform_mode); diff --git a/kernel/power/power.h b/kernel/power/power.h -index 24f12d534..778bf431e 100644 +index 24f12d534515..778bf431ec02 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -106,7 +106,7 @@ extern int create_basic_memory_bitmaps(void); @@ -1758006,7 +1758006,7 @@ index 24f12d534..778bf431e 100644 /** * Auxiliary structure used for reading the snapshot image data and diff --git a/kernel/power/process.c b/kernel/power/process.c -index b9faa363c..41053c3b4 100644 +index b9faa363c46a..41053c3b4ead 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c @@ -85,18 +85,21 @@ static int try_to_freeze_tasks(bool user_only) @@ -1758037,7 +1758037,7 @@ index b9faa363c..41053c3b4 100644 for_each_process_thread(g, p) { if (p != current && !freezer_should_skip(p) diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c -index f5dccd445..c60ed74e3 100644 +index f5dccd445d36..c60ed74e3cc7 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -1137,7 +1137,15 @@ void free_basic_memory_bitmaps(void) @@ -1758073,7 +1758073,7 @@ index f5dccd445..c60ed74e3 100644 pfn = memory_bm_next_pfn(bm); } diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c -index 4aa4d5d39..0b20b2a45 100644 +index 4aa4d5d3947f..b776c3db6828 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -30,6 +30,7 @@ @@ -1758154,9 +1758154,19 @@ index 4aa4d5d39..0b20b2a45 100644 goto Recover_platform; } suspend_test_finish("suspend devices"); +@@ -606,6 +621,9 @@ int pm_suspend(suspend_state_t state) + return -EINVAL; + + pr_info("suspend entry (%s)\n", mem_sleep_labels[state]); ++ if (strcmp(mem_sleep_labels[state], "deep") == 0) { ++ return -EINVAL; ++ } + error = enter_state(state); + if (error) { + suspend_stats.fail++; diff --git a/kernel/power/wakeup_reason.c b/kernel/power/wakeup_reason.c new file mode 100755 -index 000000000..8fefaa3fd +index 000000000000..8fefaa3fdba2 --- /dev/null +++ b/kernel/power/wakeup_reason.c @@ -0,0 +1,438 @@ @@ -1758599,7 +1758609,7 @@ index 000000000..8fefaa3fd + +late_initcall(wakeup_reason_init); diff --git a/kernel/rcu/tree_stall.h b/kernel/rcu/tree_stall.h -index 251a9af37..52cf14bff 100644 +index 251a9af3709a..52cf14bff824 100644 --- a/kernel/rcu/tree_stall.h +++ b/kernel/rcu/tree_stall.h @@ -15,6 +15,7 @@ @@ -1758620,7 +1758630,7 @@ index 251a9af37..52cf14bff 100644 rcu_force_quiescent_state(); /* Kick them all. */ diff --git a/kernel/reboot.c b/kernel/reboot.c -index af6f23d8b..bce629531 100644 +index af6f23d8bea1..bce629531d2a 100644 --- a/kernel/reboot.c +++ b/kernel/reboot.c @@ -215,6 +215,27 @@ void do_kernel_restart(char *cmd) @@ -1758652,7 +1758662,7 @@ index af6f23d8b..bce629531 100644 { /* The boot cpu is always logical cpu 0 */ diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 9afa1dd0f..867ee64a3 100644 +index 9afa1dd0f7e2..867ee64a35a3 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -50,6 +50,13 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(sched_overutilized_tp); @@ -1758810,7 +1758820,7 @@ index 9afa1dd0f..867ee64a3 100644 /* * There's this thread running, bail when that's the only diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index e5e72262e..6ea17f110 100644 +index e5e72262e2ef..6ea17f110de9 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -86,6 +86,7 @@ enum sched_tunable_scaling sysctl_sched_tunable_scaling = SCHED_TUNABLESCALING_L @@ -1758845,7 +1758855,7 @@ index e5e72262e..6ea17f110 100644 /* Spare idle load balancing on CPUs that don't want to be disturbed: */ if (!housekeeping_cpu(cpu, HK_FLAG_SCHED)) diff --git a/kernel/sched/loadavg.c b/kernel/sched/loadavg.c -index d2a655643..b5837e277 100644 +index d2a655643a02..b5837e27718e 100644 --- a/kernel/sched/loadavg.c +++ b/kernel/sched/loadavg.c @@ -75,6 +75,7 @@ void get_avenrun(unsigned long *loads, unsigned long offset, int shift) @@ -1758857,7 +1758867,7 @@ index d2a655643..b5837e277 100644 long calc_load_fold_active(struct rq *this_rq, long adjust) { diff --git a/kernel/sched/pelt.c b/kernel/sched/pelt.c -index 2c613e1cf..e2890b677 100644 +index 2c613e1cff3a..e2890b677e43 100644 --- a/kernel/sched/pelt.c +++ b/kernel/sched/pelt.c @@ -28,6 +28,42 @@ @@ -1758913,7 +1758923,7 @@ index 2c613e1cf..e2890b677 100644 } diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c -index 15b4cc7b8..dce6e444c 100644 +index 15b4cc7b8f7a..dce6e444ce86 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -1393,6 +1393,27 @@ static void dequeue_rt_entity(struct sched_rt_entity *rt_se, unsigned int flags) @@ -1759000,7 +1759010,7 @@ index 15b4cc7b8..dce6e444c 100644 int target = find_lowest_rq(p); diff --git a/kernel/sched/sched-pelt.h b/kernel/sched/sched-pelt.h -index c529706be..92a6875bc 100644 +index c529706bed11..92a6875bc2d3 100644 --- a/kernel/sched/sched-pelt.h +++ b/kernel/sched/sched-pelt.h @@ -1,7 +1,7 @@ @@ -1759036,7 +1759046,7 @@ index c529706be..92a6875bc 100644 +#define LOAD_AVG_PERIOD pelt_load_avg_period +#define LOAD_AVG_MAX pelt_load_avg_max diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h -index 23cd54413..9e264d895 100644 +index 23cd54413f2e..9e264d895775 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1915,6 +1915,8 @@ extern const int sched_latency_to_weight[40]; @@ -1759049,7 +1759059,7 @@ index 23cd54413..9e264d895 100644 struct sched_class { diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c -index 9191e5daa..58d840c62 100644 +index 9191e5daaa3c..58d840c624d7 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -5,6 +5,9 @@ @@ -1759063,7 +1759073,7 @@ index 9191e5daa..58d840c62 100644 /* Protected by sched_domains_mutex: */ static cpumask_var_t sched_domains_tmpmask; diff --git a/kernel/sched/wait.c b/kernel/sched/wait.c -index a55642aa3..6911bbca0 100644 +index a55642aa3f68..6911bbca018c 100644 --- a/kernel/sched/wait.c +++ b/kernel/sched/wait.c @@ -396,7 +396,8 @@ void finish_wait(struct wait_queue_head *wq_head, struct wait_queue_entry *wq_en @@ -1759097,7 +1759107,7 @@ index a55642aa3..6911bbca0 100644 smp_mb(); /* C */ diff --git a/make-boot.sh b/make-boot.sh new file mode 100755 -index 000000000..f4cd4c452 +index 000000000000..f4cd4c4524b5 --- /dev/null +++ b/make-boot.sh @@ -0,0 +1,31 @@ @@ -1759134,7 +1759144,7 @@ index 000000000..f4cd4c452 +cp ${BOOT_LINUX}/boot_linux.img ${OUT_IMAGE} diff --git a/make-ohos.sh b/make-ohos.sh new file mode 100755 -index 000000000..70ad2c5cc +index 000000000000..70ad2c5ccf41 --- /dev/null +++ b/make-ohos.sh @@ -0,0 +1,142 @@ @@ -1759281,7 +1759291,7 @@ index 000000000..70ad2c5cc + fi +done diff --git a/mm/hugetlb.c b/mm/hugetlb.c -index feac38090..2738f5741 100644 +index feac38090a9e..2738f5741696 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3932,7 +3932,6 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, @@ -1759329,7 +1759339,7 @@ index feac38090..2738f5741 100644 void __unmap_hugepage_range_final(struct mmu_gather *tlb, diff --git a/mm/memblock.c b/mm/memblock.c -index f72d53957..ba21b5b13 100644 +index f72d53957033..ba21b5b13f39 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -97,6 +97,26 @@ struct pglist_data __refdata contig_page_data; @@ -1759405,7 +1759415,7 @@ index f72d53957..ba21b5b13 100644 return end_pfn - start_pfn; diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 6993c6b27..3078e59b7 100644 +index 6993c6b27dcf..3078e59b72af 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1445,9 +1445,15 @@ static void free_one_page(struct zone *zone, @@ -1759483,7 +1759493,7 @@ index 6993c6b27..3078e59b7 100644 pgcnt++; } diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c -index 756523e54..f0a4377c3 100644 +index 756523e5402a..f0a4377c3b7d 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -1539,9 +1539,6 @@ static void l2cap_sock_close_cb(struct l2cap_chan *chan) @@ -1759519,7 +1759529,7 @@ index 756523e54..f0a4377c3 100644 if (l2cap_pi(sk)->rx_busy_skb) { kfree_skb(l2cap_pi(sk)->rx_busy_skb); diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c -index 081d1ee3d..8244d3ae1 100644 +index 081d1ee3ddb8..8244d3ae185b 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -93,10 +93,10 @@ static void sco_sock_timeout(struct work_struct *work) @@ -1759586,7 +1759596,7 @@ index 081d1ee3d..8244d3ae1 100644 sco_conn_unlock(conn); } diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig -index 83a7af898..33ab1f7a3 100644 +index 83a7af8982bb..33ab1f7a3cc0 100644 --- a/net/rfkill/Kconfig +++ b/net/rfkill/Kconfig @@ -32,3 +32,12 @@ config RFKILL_GPIO @@ -1759603,7 +1759613,7 @@ index 83a7af898..33ab1f7a3 100644 + help + Rockchip rfkill driver for rk29/rk3X diff --git a/net/rfkill/Makefile b/net/rfkill/Makefile -index dc47b6174..beed5b506 100644 +index dc47b6174ec5..beed5b506307 100644 --- a/net/rfkill/Makefile +++ b/net/rfkill/Makefile @@ -7,3 +7,5 @@ rfkill-y += core.o @@ -1759614,7 +1759624,7 @@ index dc47b6174..beed5b506 100644 +obj-$(CONFIG_RFKILL_RK) += rfkill-rk.o diff --git a/net/rfkill/rfkill-bt.c b/net/rfkill/rfkill-bt.c new file mode 100755 -index 000000000..7c943871a +index 000000000000..7c943871a379 --- /dev/null +++ b/net/rfkill/rfkill-bt.c @@ -0,0 +1,827 @@ @@ -1760447,7 +1760457,7 @@ index 000000000..7c943871a +MODULE_LICENSE("GPL"); diff --git a/net/rfkill/rfkill-wlan.c b/net/rfkill/rfkill-wlan.c new file mode 100755 -index 000000000..6a581c847 +index 000000000000..6a581c847a68 --- /dev/null +++ b/net/rfkill/rfkill-wlan.c @@ -0,0 +1,979 @@ @@ -1761431,7 +1761441,7 @@ index 000000000..6a581c847 +MODULE_AUTHOR("gwl@rock-chips.com"); +MODULE_LICENSE("GPL"); diff --git a/scripts/Makefile b/scripts/Makefile -index 9adb6d247..b7b7ad547 100644 +index 9adb6d247818..b7b7ad5475e6 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -9,6 +9,7 @@ CRYPTO_CFLAGS = $(shell pkg-config --cflags libcrypto 2> /dev/null) @@ -1761443,7 +1761453,7 @@ index 9adb6d247..b7b7ad547 100644 hostprogs-always-$(CONFIG_ASN1) += asn1_compiler hostprogs-always-$(CONFIG_MODULE_SIG_FORMAT) += sign-file diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 53aa3e18c..7ca0ddfa6 100644 +index 53aa3e18ce8a..7ca0ddfa6e19 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -318,8 +318,9 @@ $(obj)/%.dtb.S: $(obj)/%.dtb FORCE @@ -1761460,7 +1761470,7 @@ index 53aa3e18c..7ca0ddfa6 100644 cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) diff --git a/scripts/clang-wrapper.py b/scripts/clang-wrapper.py new file mode 100755 -index 000000000..5486902f1 +index 000000000000..5486902f1f76 --- /dev/null +++ b/scripts/clang-wrapper.py @@ -0,0 +1,102 @@ @@ -1761567,7 +1761577,7 @@ index 000000000..5486902f1 + status = run_clang() + sys.exit(status) diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c -index 17cb6890d..913fb08af 100644 +index 17cb6890d45a..913fb08af475 100644 --- a/scripts/dtc/checks.c +++ b/scripts/dtc/checks.c @@ -649,6 +649,24 @@ static void fixup_omit_unused_nodes(struct check *c, struct dt_info *dti, @@ -1761597,7 +1761607,7 @@ index 17cb6890d..913fb08af 100644 diff --git a/scripts/mkimg b/scripts/mkimg new file mode 100755 -index 000000000..63e3da6f4 +index 000000000000..63e3da6f402c --- /dev/null +++ b/scripts/mkimg @@ -0,0 +1,235 @@ @@ -1761838,7 +1761848,7 @@ index 000000000..63e3da6f4 +fi diff --git a/scripts/repack-bootimg b/scripts/repack-bootimg new file mode 100755 -index 000000000..69065d28e +index 000000000000..69065d28e0ea --- /dev/null +++ b/scripts/repack-bootimg @@ -0,0 +1,153 @@ @@ -1761997,7 +1762007,7 @@ index 000000000..69065d28e +--output $output diff --git a/scripts/resource_tool.c b/scripts/resource_tool.c new file mode 100755 -index 000000000..8465c578b +index 000000000000..8465c578b2d7 --- /dev/null +++ b/scripts/resource_tool.c @@ -0,0 +1,1575 @@ @@ -1763577,7 +1763587,7 @@ index 000000000..8465c578b + +/************pack code end****************/ diff --git a/security/Kconfig.hardening b/security/Kconfig.hardening -index b54eb7177..b02e64e84 100644 +index b54eb7177a31..b02e64e8461a 100644 --- a/security/Kconfig.hardening +++ b/security/Kconfig.hardening @@ -39,7 +39,7 @@ choice @@ -1763598,7 +1763608,7 @@ index b54eb7177..b02e64e84 100644 This has the effect of setting "init_on_alloc=1" on the kernel command line. This can be disabled with "init_on_alloc=0". diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c -index fb45a32d9..0ec5bf47d 100644 +index fb45a32d99cd..0ec5bf47d96e 100644 --- a/sound/drivers/aloop.c +++ b/sound/drivers/aloop.c @@ -37,6 +37,7 @@ MODULE_SUPPORTED_DEVICE("{{ALSA,Loopback soundcard}}"); @@ -1763677,7 +1763687,7 @@ index fb45a32d9..0ec5bf47d 100644 } diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig -index f1c9e5639..d3f815d7c 100644 +index f1c9e563994b..d3f815d7c867 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -89,11 +89,16 @@ config SND_SOC_ALL_CODECS @@ -1763817,7 +1763827,7 @@ index f1c9e5639..d3f815d7c 100644 config SND_SOC_RT5659 diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile -index 11ce98c25..d94d074c1 100644 +index 11ce98c25d6c..d94d074c18ad 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -84,12 +84,19 @@ snd-soc-da7219-objs := da7219.o da7219-aad.o @@ -1763889,7 +1763899,7 @@ index 11ce98c25..d94d074c1 100644 obj-$(CONFIG_SND_SOC_RL6347A) += snd-soc-rl6347a.o obj-$(CONFIG_SND_SOC_RT1011) += snd-soc-rt1011.o diff --git a/sound/soc/codecs/bt-sco.c b/sound/soc/codecs/bt-sco.c -index 4d286844e..2be7ba425 100644 +index 4d286844e3c8..2be7ba425ee4 100644 --- a/sound/soc/codecs/bt-sco.c +++ b/sound/soc/codecs/bt-sco.c @@ -26,14 +26,14 @@ static struct snd_soc_dai_driver bt_sco_dai[] = { @@ -1763928,7 +1763938,7 @@ index 4d286844e..2be7ba425 100644 }, diff --git a/sound/soc/codecs/dummy-codec.c b/sound/soc/codecs/dummy-codec.c new file mode 100755 -index 000000000..35756c753 +index 000000000000..35756c753357 --- /dev/null +++ b/sound/soc/codecs/dummy-codec.c @@ -0,0 +1,115 @@ @@ -1764049,7 +1764059,7 @@ index 000000000..35756c753 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/es7202.c b/sound/soc/codecs/es7202.c new file mode 100755 -index 000000000..49035e8ca +index 000000000000..49035e8ca52d --- /dev/null +++ b/sound/soc/codecs/es7202.c @@ -0,0 +1,1170 @@ @@ -1765225,7 +1765235,7 @@ index 000000000..49035e8ca +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/es7202.h b/sound/soc/codecs/es7202.h new file mode 100755 -index 000000000..fb8643c0a +index 000000000000..fb8643c0a3b2 --- /dev/null +++ b/sound/soc/codecs/es7202.h @@ -0,0 +1,95 @@ @@ -1765326,7 +1765336,7 @@ index 000000000..fb8643c0a +#endif diff --git a/sound/soc/codecs/es7210.c b/sound/soc/codecs/es7210.c new file mode 100755 -index 000000000..dfb0e24e2 +index 000000000000..dfb0e24e23c7 --- /dev/null +++ b/sound/soc/codecs/es7210.c @@ -0,0 +1,1754 @@ @@ -1767086,7 +1767096,7 @@ index 000000000..dfb0e24e2 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/es7210.h b/sound/soc/codecs/es7210.h new file mode 100755 -index 000000000..234a365c3 +index 000000000000..234a365c398e --- /dev/null +++ b/sound/soc/codecs/es7210.h @@ -0,0 +1,76 @@ @@ -1767168,7 +1767178,7 @@ index 000000000..234a365c3 +#endif /* _ES7210_H_ */ diff --git a/sound/soc/codecs/es7243e.c b/sound/soc/codecs/es7243e.c new file mode 100755 -index 000000000..e2bf03c52 +index 000000000000..e2bf03c526d8 --- /dev/null +++ b/sound/soc/codecs/es7243e.c @@ -0,0 +1,2671 @@ @@ -1769845,7 +1769855,7 @@ index 000000000..e2bf03c52 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/es7243e_usr_cfg.h b/sound/soc/codecs/es7243e_usr_cfg.h new file mode 100755 -index 000000000..1d9760ada +index 000000000000..1d9760ada940 --- /dev/null +++ b/sound/soc/codecs/es7243e_usr_cfg.h @@ -0,0 +1,274 @@ @@ -1770125,7 +1770135,7 @@ index 000000000..1d9760ada +#define VDDA_VOLTAGE VDDA_3V3 diff --git a/sound/soc/codecs/es8311.c b/sound/soc/codecs/es8311.c new file mode 100755 -index 000000000..b13ece8be +index 000000000000..b13ece8be069 --- /dev/null +++ b/sound/soc/codecs/es8311.c @@ -0,0 +1,756 @@ @@ -1770887,7 +1770897,7 @@ index 000000000..b13ece8be +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/es8311.h b/sound/soc/codecs/es8311.h new file mode 100755 -index 000000000..94d8472bd +index 000000000000..94d8472bd5de --- /dev/null +++ b/sound/soc/codecs/es8311.h @@ -0,0 +1,69 @@ @@ -1770962,7 +1770972,7 @@ index 000000000..94d8472bd +#endif diff --git a/sound/soc/codecs/es8323.c b/sound/soc/codecs/es8323.c new file mode 100755 -index 000000000..636510849 +index 000000000000..636510849a6d --- /dev/null +++ b/sound/soc/codecs/es8323.c @@ -0,0 +1,998 @@ @@ -1771966,7 +1771976,7 @@ index 000000000..636510849 +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/es8323.h b/sound/soc/codecs/es8323.h new file mode 100755 -index 000000000..355a6a7d3 +index 000000000000..355a6a7d3149 --- /dev/null +++ b/sound/soc/codecs/es8323.h @@ -0,0 +1,151 @@ @@ -1772122,7 +1772132,7 @@ index 000000000..355a6a7d3 + +#endif diff --git a/sound/soc/codecs/es8328.c b/sound/soc/codecs/es8328.c -index 081b5f189..3e2de7034 100644 +index 081b5f189632..3e2de70340cc 100644 --- a/sound/soc/codecs/es8328.c +++ b/sound/soc/codecs/es8328.c @@ -36,6 +36,16 @@ static const struct snd_pcm_hw_constraint_list constraints_12288 = { @@ -1772159,7 +1772169,7 @@ index 081b5f189..3e2de7034 100644 } diff --git a/sound/soc/codecs/es8396.c b/sound/soc/codecs/es8396.c new file mode 100755 -index 000000000..4cd7916b0 +index 000000000000..4cd7916b026f --- /dev/null +++ b/sound/soc/codecs/es8396.c @@ -0,0 +1,3207 @@ @@ -1775372,7 +1775382,7 @@ index 000000000..4cd7916b0 +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/es8396.h b/sound/soc/codecs/es8396.h new file mode 100755 -index 000000000..e6f2f3907 +index 000000000000..e6f2f390707d --- /dev/null +++ b/sound/soc/codecs/es8396.h @@ -0,0 +1,354 @@ @@ -1775732,7 +1775742,7 @@ index 000000000..e6f2f3907 +#endif diff --git a/sound/soc/codecs/rk1000_codec.c b/sound/soc/codecs/rk1000_codec.c new file mode 100755 -index 000000000..9cabd0977 +index 000000000000..9cabd0977813 --- /dev/null +++ b/sound/soc/codecs/rk1000_codec.c @@ -0,0 +1,580 @@ @@ -1776318,7 +1776328,7 @@ index 000000000..9cabd0977 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/rk1000_codec.h b/sound/soc/codecs/rk1000_codec.h new file mode 100755 -index 000000000..0c9169cd6 +index 000000000000..0c9169cd6fb7 --- /dev/null +++ b/sound/soc/codecs/rk1000_codec.h @@ -0,0 +1,320 @@ @@ -1776644,7 +1776654,7 @@ index 000000000..0c9169cd6 +#endif diff --git a/sound/soc/codecs/rk312x_codec.c b/sound/soc/codecs/rk312x_codec.c new file mode 100755 -index 000000000..0e3ac4008 +index 000000000000..0e3ac4008962 --- /dev/null +++ b/sound/soc/codecs/rk312x_codec.c @@ -0,0 +1,2526 @@ @@ -1779176,7 +1779186,7 @@ index 000000000..0e3ac4008 +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/rk312x_codec.h b/sound/soc/codecs/rk312x_codec.h new file mode 100755 -index 000000000..092408868 +index 000000000000..0924088681ba --- /dev/null +++ b/sound/soc/codecs/rk312x_codec.h @@ -0,0 +1,566 @@ @@ -1779748,7 +1779758,7 @@ index 000000000..092408868 +#endif /* __RK312x_CODEC_H__ */ diff --git a/sound/soc/codecs/rk3228_codec.c b/sound/soc/codecs/rk3228_codec.c new file mode 100755 -index 000000000..d82eec871 +index 000000000000..d82eec871ac8 --- /dev/null +++ b/sound/soc/codecs/rk3228_codec.c @@ -0,0 +1,543 @@ @@ -1780297,7 +1780307,7 @@ index 000000000..d82eec871 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/rk3228_codec.h b/sound/soc/codecs/rk3228_codec.h new file mode 100755 -index 000000000..7283d0ba8 +index 000000000000..7283d0ba86e8 --- /dev/null +++ b/sound/soc/codecs/rk3228_codec.h @@ -0,0 +1,218 @@ @@ -1780521,7 +1780531,7 @@ index 000000000..7283d0ba8 +#endif diff --git a/sound/soc/codecs/rk3308_codec.c b/sound/soc/codecs/rk3308_codec.c new file mode 100755 -index 000000000..a6ce7f061 +index 000000000000..a6ce7f061d73 --- /dev/null +++ b/sound/soc/codecs/rk3308_codec.c @@ -0,0 +1,5128 @@ @@ -1785655,7 +1785665,7 @@ index 000000000..a6ce7f061 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/rk3308_codec.h b/sound/soc/codecs/rk3308_codec.h new file mode 100755 -index 000000000..93e089dae +index 000000000000..93e089dae081 --- /dev/null +++ b/sound/soc/codecs/rk3308_codec.h @@ -0,0 +1,1069 @@ @@ -1786730,7 +1786740,7 @@ index 000000000..93e089dae +#endif /* __RK3308_CODEC_H__ */ diff --git a/sound/soc/codecs/rk3308_codec_provider.h b/sound/soc/codecs/rk3308_codec_provider.h new file mode 100755 -index 000000000..34c1ef86a +index 000000000000..34c1ef86a507 --- /dev/null +++ b/sound/soc/codecs/rk3308_codec_provider.h @@ -0,0 +1,28 @@ @@ -1786764,7 +1786774,7 @@ index 000000000..34c1ef86a +#endif /* __RK3308_CODEC_PROVIDER_H__ */ diff --git a/sound/soc/codecs/rk817_codec.c b/sound/soc/codecs/rk817_codec.c new file mode 100755 -index 000000000..453ea4bf5 +index 000000000000..453ea4bf5b7f --- /dev/null +++ b/sound/soc/codecs/rk817_codec.c @@ -0,0 +1,1364 @@ @@ -1788134,7 +1788144,7 @@ index 000000000..453ea4bf5 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/rk817_codec.h b/sound/soc/codecs/rk817_codec.h new file mode 100755 -index 000000000..a928c3239 +index 000000000000..a928c323928b --- /dev/null +++ b/sound/soc/codecs/rk817_codec.h @@ -0,0 +1,215 @@ @@ -1788355,7 +1788365,7 @@ index 000000000..a928c3239 +#endif /* __RK817_CODEC_H__ */ diff --git a/sound/soc/codecs/rk_codec_digital.c b/sound/soc/codecs/rk_codec_digital.c new file mode 100755 -index 000000000..ec91b72fa +index 000000000000..ec91b72fa6de --- /dev/null +++ b/sound/soc/codecs/rk_codec_digital.c @@ -0,0 +1,1109 @@ @@ -1789470,7 +1789480,7 @@ index 000000000..ec91b72fa +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/rk_codec_digital.h b/sound/soc/codecs/rk_codec_digital.h new file mode 100755 -index 000000000..4bb409b8d +index 000000000000..4bb409b8d8bc --- /dev/null +++ b/sound/soc/codecs/rk_codec_digital.h @@ -0,0 +1,319 @@ @@ -1789794,7 +1789804,7 @@ index 000000000..4bb409b8d + +#endif diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c -index a5674c227..0db73e7a0 100644 +index a5674c227b3a..0db73e7a0511 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -1335,7 +1335,9 @@ static const struct snd_soc_dapm_route rt5640_dapm_routes[] = { @@ -1789809,7 +1789819,7 @@ index a5674c227..0db73e7a0 100644 {"IN2P", NULL, "LDO2"}, {"IN3P", NULL, "LDO2"}, diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c -index e59fdc81d..2dd8d6d4f 100644 +index e59fdc81dbd4..2dd8d6d4f87d 100644 --- a/sound/soc/codecs/rt5651.c +++ b/sound/soc/codecs/rt5651.c @@ -24,6 +24,9 @@ @@ -1789971,7 +1789981,7 @@ index e59fdc81d..2dd8d6d4f 100644 &soc_component_dev_rt5651, rt5651_dai, ARRAY_SIZE(rt5651_dai)); diff --git a/sound/soc/codecs/rt5651.h b/sound/soc/codecs/rt5651.h -index 20c33a3ec..05739b178 100644 +index 20c33a3ece37..05739b17813c 100644 --- a/sound/soc/codecs/rt5651.h +++ b/sound/soc/codecs/rt5651.h @@ -2096,7 +2096,10 @@ struct rt5651_priv { @@ -1789986,7 +1789996,7 @@ index 20c33a3ec..05739b178 100644 #endif /* __RT5651_H__ */ diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c -index c86231dfc..0827b7e65 100644 +index c86231dfcf4f..0827b7e65ac1 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c @@ -7,6 +7,7 @@ @@ -1790063,7 +1790073,7 @@ index c86231dfc..0827b7e65 100644 &soc_component_dev_wm8974, &wm8974_dai, 1); diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig -index d610b553e..2925971bc 100644 +index d610b553ea3b..2925971bcd55 100644 --- a/sound/soc/rockchip/Kconfig +++ b/sound/soc/rockchip/Kconfig @@ -16,6 +16,15 @@ config SND_SOC_ROCKCHIP_I2S @@ -1790134,7 +1790144,7 @@ index d610b553e..2925971bc 100644 tristate "ASoC support multiple codecs for Rockchip RK3288 boards" depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP diff --git a/sound/soc/rockchip/Makefile b/sound/soc/rockchip/Makefile -index 65e814d46..ec17d97d0 100644 +index 65e814d46006..ec17d97d0f27 100644 --- a/sound/soc/rockchip/Makefile +++ b/sound/soc/rockchip/Makefile @@ -1,20 +1,35 @@ @@ -1790177,7 +1790187,7 @@ index 65e814d46..ec17d97d0 100644 obj-$(CONFIG_SND_SOC_RK3399_GRU_SOUND) += snd-soc-rk3399-gru-sound.o diff --git a/sound/soc/rockchip/rockchip_audio_pwm.c b/sound/soc/rockchip/rockchip_audio_pwm.c new file mode 100644 -index 000000000..44ca66f1e +index 000000000000..44ca66f1ed95 --- /dev/null +++ b/sound/soc/rockchip/rockchip_audio_pwm.c @@ -0,0 +1,372 @@ @@ -1790555,7 +1790565,7 @@ index 000000000..44ca66f1e +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 000000000..ad6866043 +index 000000000000..ad68660437c2 --- /dev/null +++ b/sound/soc/rockchip/rockchip_audio_pwm.h @@ -0,0 +1,48 @@ @@ -1790609,7 +1790619,7 @@ index 000000000..ad6866043 +#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 000000000..aafeab5b4 +index 000000000000..aafeab5b41c7 --- /dev/null +++ b/sound/soc/rockchip/rockchip_cdndp.c @@ -0,0 +1,166 @@ @@ -1790781,7 +1790791,7 @@ index 000000000..aafeab5b4 +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 000000000..bf675defb +index 000000000000..bf675defb884 --- /dev/null +++ b/sound/soc/rockchip/rockchip_da7219.c @@ -0,0 +1,235 @@ @@ -1791022,7 +1791032,7 @@ index 000000000..bf675defb +MODULE_DEVICE_TABLE(of, rockchip_da7219_of_match); diff --git a/sound/soc/rockchip/rockchip_hdmi.c b/sound/soc/rockchip/rockchip_hdmi.c new file mode 100644 -index 000000000..ed107d4d2 +index 000000000000..ed107d4d2399 --- /dev/null +++ b/sound/soc/rockchip/rockchip_hdmi.c @@ -0,0 +1,279 @@ @@ -1791307,7 +1791317,7 @@ index 000000000..ed107d4d2 +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 000000000..02a282e8f +index 000000000000..02a282e8f60a --- /dev/null +++ b/sound/soc/rockchip/rockchip_hdmi_analog.c @@ -0,0 +1,222 @@ @@ -1791535,7 +1791545,7 @@ index 000000000..02a282e8f +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 000000000..4db9fb7b7 +index 000000000000..4db9fb7b7dae --- /dev/null +++ b/sound/soc/rockchip/rockchip_hdmi_dp.c @@ -0,0 +1,193 @@ @@ -1791733,7 +1791743,7 @@ index 000000000..4db9fb7b7 +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 785baf98f..69336b77d 100644 +index 785baf98f9da..69336b77df70 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -15,11 +15,11 @@ @@ -1792124,7 +1792134,7 @@ index 785baf98f..69336b77d 100644 dev_err(&pdev->dev, "Could not register PCM\n"); goto err_suspend; diff --git a/sound/soc/rockchip/rockchip_i2s.h b/sound/soc/rockchip/rockchip_i2s.h -index fcaae24e4..251851bf4 100644 +index fcaae24e40af..251851bf4f2c 100644 --- a/sound/soc/rockchip/rockchip_i2s.h +++ b/sound/soc/rockchip/rockchip_i2s.h @@ -88,15 +88,17 @@ @@ -1792151,7 +1792161,7 @@ index fcaae24e4..251851bf4 100644 #define I2S_CKR_MDIV_MASK (0xff << I2S_CKR_MDIV_SHIFT) diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c new file mode 100644 -index 000000000..81865dcdb +index 000000000000..81865dcdb3a4 --- /dev/null +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c @@ -0,0 +1,1952 @@ @@ -1794109,7 +1794119,7 @@ index 000000000..81865dcdb +MODULE_DEVICE_TABLE(of, rockchip_i2s_tdm_match); diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.h b/sound/soc/rockchip/rockchip_i2s_tdm.h new file mode 100644 -index 000000000..fa41f8142 +index 000000000000..fa41f81429f5 --- /dev/null +++ b/sound/soc/rockchip/rockchip_i2s_tdm.h @@ -0,0 +1,393 @@ @@ -1794508,7 +1794518,7 @@ index 000000000..fa41f8142 +#endif /* _ROCKCHIP_I2S_TDM_H */ diff --git a/sound/soc/rockchip/rockchip_multi_dais.c b/sound/soc/rockchip/rockchip_multi_dais.c new file mode 100644 -index 000000000..7a789c8c7 +index 000000000000..7a789c8c7e3a --- /dev/null +++ b/sound/soc/rockchip/rockchip_multi_dais.c @@ -0,0 +1,541 @@ @@ -1795055,7 +1795065,7 @@ index 000000000..7a789c8c7 +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 000000000..5d9a076af +index 000000000000..5d9a076afb78 --- /dev/null +++ b/sound/soc/rockchip/rockchip_multi_dais.h @@ -0,0 +1,33 @@ @@ -1795094,7 +1795104,7 @@ index 000000000..5d9a076af +#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 000000000..38f2220ee +index 000000000000..38f2220eeec1 --- /dev/null +++ b/sound/soc/rockchip/rockchip_multi_dais_pcm.c @@ -0,0 +1,704 @@ @@ -1795804,7 +1795814,7 @@ index 000000000..38f2220ee +MODULE_LICENSE("GPL"); diff --git a/sound/soc/rockchip/rockchip_multicodecs.c b/sound/soc/rockchip/rockchip_multicodecs.c new file mode 100644 -index 000000000..9486a2e5d +index 000000000000..9486a2e5db2d --- /dev/null +++ b/sound/soc/rockchip/rockchip_multicodecs.c @@ -0,0 +1,809 @@ @@ -1796618,7 +1796628,7 @@ index 000000000..9486a2e5d +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 94cfbc903..d2e69dd76 100644 +index 94cfbc90390b..d2e69dd7651b 100644 --- a/sound/soc/rockchip/rockchip_pdm.c +++ b/sound/soc/rockchip/rockchip_pdm.c @@ -19,11 +19,15 @@ @@ -1796859,7 +1796869,7 @@ index 94cfbc903..d2e69dd76 100644 if (ret) { dev_err(&pdev->dev, "could not register pcm: %d\n", ret); diff --git a/sound/soc/rockchip/rockchip_pdm.h b/sound/soc/rockchip/rockchip_pdm.h -index 8e5bbafef..cab977272 100644 +index 8e5bbafef7bb..cab977272ee6 100644 --- a/sound/soc/rockchip/rockchip_pdm.h +++ b/sound/soc/rockchip/rockchip_pdm.h @@ -41,6 +41,8 @@ @@ -1796891,7 +1796901,7 @@ index 8e5bbafef..cab977272 100644 #define PDM_HPF_LE BIT(3) diff --git a/sound/soc/rockchip/rockchip_rt5651.c b/sound/soc/rockchip/rockchip_rt5651.c new file mode 100644 -index 000000000..4dc91c2a1 +index 000000000000..4dc91c2a1e75 --- /dev/null +++ b/sound/soc/rockchip/rockchip_rt5651.c @@ -0,0 +1,245 @@ @@ -1797141,7 +1797151,7 @@ index 000000000..4dc91c2a1 +MODULE_ALIAS("platform:" DRV_NAME); +MODULE_DEVICE_TABLE(of, rockchip_sound_of_match); diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c -index ccddcd992..39d8d8a4a 100644 +index ccddcd9926af..39d8d8a4a0a0 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -41,7 +41,7 @@ struct rk_spdif_dev { @@ -1797274,7 +1797284,7 @@ index ccddcd992..39d8d8a4a 100644 diff --git a/sound/soc/rockchip/rockchip_spdifrx.c b/sound/soc/rockchip/rockchip_spdifrx.c new file mode 100644 -index 000000000..0e4572321 +index 000000000000..0e457232116d --- /dev/null +++ b/sound/soc/rockchip/rockchip_spdifrx.c @@ -0,0 +1,415 @@ @@ -1797695,7 +1797705,7 @@ index 000000000..0e4572321 +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 000000000..e75b2d5af +index 000000000000..e75b2d5afd04 --- /dev/null +++ b/sound/soc/rockchip/rockchip_spdifrx.h @@ -0,0 +1,113 @@ @@ -1797814,7 +1797824,7 @@ index 000000000..e75b2d5af +#endif /* _ROCKCHIP_SPDIFRX_H */ diff --git a/sound/soc/rockchip/rockchip_vad.c b/sound/soc/rockchip/rockchip_vad.c new file mode 100644 -index 000000000..d69278aa5 +index 000000000000..d69278aa5317 --- /dev/null +++ b/sound/soc/rockchip/rockchip_vad.c @@ -0,0 +1,1316 @@ @@ -1799136,7 +1799146,7 @@ index 000000000..d69278aa5 +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 000000000..1121e7149 +index 000000000000..1121e71490e0 --- /dev/null +++ b/sound/soc/rockchip/rockchip_vad.h @@ -0,0 +1,231 @@ @@ -1799373,7 +1799383,7 @@ index 000000000..1121e7149 +#endif diff --git a/sound/soc/rockchip/vad_preprocess.h b/sound/soc/rockchip/vad_preprocess.h new file mode 100644 -index 000000000..85e4d1022 +index 000000000000..85e4d1022984 --- /dev/null +++ b/sound/soc/rockchip/vad_preprocess.h @@ -0,0 +1,29 @@ @@ -1799408,7 +1799418,7 @@ index 000000000..85e4d1022 +#endif diff --git a/sound/soc/rockchip/vad_preprocess_arm.S b/sound/soc/rockchip/vad_preprocess_arm.S new file mode 100644 -index 000000000..a0d3eabf2 +index 000000000000..a0d3eabf2ba0 --- /dev/null +++ b/sound/soc/rockchip/vad_preprocess_arm.S @@ -0,0 +1,348 @@ @@ -1799762,7 +1799772,7 @@ index 000000000..a0d3eabf2 + .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 000000000..823757c17 +index 000000000000..823757c1718f --- /dev/null +++ b/sound/soc/rockchip/vad_preprocess_arm64.S @@ -0,0 +1,273 @@ @@ -1800041,7 +1800051,7 @@ index 000000000..823757c17 + .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 000000000..a105634e6 +index 000000000000..a105634e60d0 --- /dev/null +++ b/sound/soc/rockchip/vad_preprocess_thumb.S @@ -0,0 +1,360 @@ @@ -1800406,7 +1800416,7 @@ index 000000000..a105634e6 + .ident "GCC: (GNU) 4.9 20150123 (prerelease)" + .section .note.GNU-stack,"",%progbits diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c -index 752422147..2db51d89f 100644 +index 752422147fb3..2db51d89fafd 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1524,6 +1524,9 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) @@ -1800430,7 +1800440,7 @@ index 752422147..2db51d89f 100644 /* Optoplay sets the sample rate attribute although * it seems not supporting it in fact. diff --git a/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c b/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c -index aaca1f44e..8643beaf2 100644 +index aaca1f44e788..8643beaf25a1 100644 --- a/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c +++ b/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c @@ -57,16 +57,30 @@ static const struct { @@ -1800525,7 +1800535,7 @@ index aaca1f44e..8643beaf2 100644 #define STR_INTERFACE "AIO Test" diff --git a/tools/usb/ffs-aio-example/simple/device_app/aio_simple.c b/tools/usb/ffs-aio-example/simple/device_app/aio_simple.c -index 1f44a2981..51574379f 100644 +index 1f44a29818bf..51574379ff91 100644 --- a/tools/usb/ffs-aio-example/simple/device_app/aio_simple.c +++ b/tools/usb/ffs-aio-example/simple/device_app/aio_simple.c @@ -55,16 +55,30 @@ static const struct {