diff --git a/linux-5.10/rk3568_patch/kernel.patch b/linux-5.10/rk3568_patch/kernel.patch old mode 100755 new mode 100644 index d6c51928ebaaa9330ed989abac577cb18bdc54c2..8d1e153400ed47040580b6dff9443644fa931d15 --- 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 148191b0fc15..eee2a7f7cb92 100644 +index 148191b0f..eee2a7f7c 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 148191b0fc15..eee2a7f7cb92 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 027d76c27a41..a548f404033c 100644 +index 027d76c27..a548f4040 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 027d76c27a41..a548f404033c 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 1bb76197787b..de8e78d56dea 100644 +index 1bb761977..de8e78d56 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 1bb76197787b..de8e78d56dea 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 6ecefea1c6f9..0b906fb630e2 100644 +index 6ecefea1c..0b906fb63 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 6ecefea1c6f9..0b906fb630e2 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 000000000000..0922536b1811 +index 000000000..0922536b1 --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/rockchip,nand-controller.yaml @@ -0,0 +1,161 @@ @@ -250,7 +250,7 @@ index 000000000000..0922536b1811 + +... diff --git a/Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml b/Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml -index 104dd508565e..af1b9c31862a 100644 +index 104dd5085..af1b9c318 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 104dd508565e..af1b9c31862a 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 40f649f7c2e5..6e61345829e7 100644 +index 40f649f7c..6e6134582 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 40f649f7c2e5..6e61345829e7 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 960da7fcaa9e..ac82f7b4dd58 100644 +index 960da7fca..ac82f7b4d 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 960da7fcaa9e..ac82f7b4dd58 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 e66fd4eab71c..09824bca248e 100644 +index e66fd4eab..09824bca2 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 e66fd4eab71c..09824bca248e 100644 io-domains { diff --git a/Documentation/devicetree/bindings/soc/rockchip/power_domain.txt b/Documentation/devicetree/bindings/soc/rockchip/power_domain.txt -index 8304eceb62e4..e1920b15c86f 100644 +index 8304eceb6..e1920b15c 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 8304eceb62e4..e1920b15c86f 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 56e736a1cba9..e7cd338d2b59 100644 +index 56e736a1c..e7cd338d2 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 56e736a1cba9..e7cd338d2b59 100644 * DMIC L1 diff --git a/Documentation/devicetree/bindings/spi/spi-rockchip.yaml b/Documentation/devicetree/bindings/spi/spi-rockchip.yaml -index 1e6cf29e6388..7f987e79337c 100644 +index 1e6cf29e6..7f987e793 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 1e6cf29e6388..7f987e79337c 100644 reg: diff --git a/Documentation/devicetree/bindings/thermal/rockchip-thermal.txt b/Documentation/devicetree/bindings/thermal/rockchip-thermal.txt -index 7f94669e9ebe..346e466c2006 100644 +index 7f94669e9..346e466c2 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 7f94669e9ebe..346e466c2006 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 093567022386..dc4c26a8a196 100644 +index 5f47b638f..793dd42ee 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -85,6 +85,11 @@ display-subsystem { @@ -471,7 +471,7 @@ index 093567022386..dc4c26a8a196 100644 timer { compatible = "arm,armv7-timer"; arm,cpu-registers-not-fw-configured; -@@ -360,7 +365,7 @@ pwm0: pwm@20050000 { +@@ -368,7 +373,7 @@ pwm0: pwm@20050000 { #pwm-cells = <3>; clocks = <&cru PCLK_PWM>; clock-names = "pwm"; @@ -480,7 +480,7 @@ index 093567022386..dc4c26a8a196 100644 pinctrl-0 = <&pwm0_pin>; status = "disabled"; }; -@@ -371,7 +376,7 @@ pwm1: pwm@20050010 { +@@ -379,7 +384,7 @@ pwm1: pwm@20050010 { #pwm-cells = <3>; clocks = <&cru PCLK_PWM>; clock-names = "pwm"; @@ -489,7 +489,7 @@ index 093567022386..dc4c26a8a196 100644 pinctrl-0 = <&pwm1_pin>; status = "disabled"; }; -@@ -382,7 +387,7 @@ pwm2: pwm@20050020 { +@@ -390,7 +395,7 @@ pwm2: pwm@20050020 { #pwm-cells = <3>; clocks = <&cru PCLK_PWM>; clock-names = "pwm"; @@ -498,7 +498,7 @@ index 093567022386..dc4c26a8a196 100644 pinctrl-0 = <&pwm2_pin>; status = "disabled"; }; -@@ -393,7 +398,7 @@ pwm3: pwm@20050030 { +@@ -401,7 +406,7 @@ pwm3: pwm@20050030 { #pwm-cells = <2>; clocks = <&cru PCLK_PWM>; clock-names = "pwm"; @@ -508,7 +508,7 @@ index 093567022386..dc4c26a8a196 100644 status = "disabled"; }; diff --git a/arch/arm/boot/dts/rk3066a-rayeager.dts b/arch/arm/boot/dts/rk3066a-rayeager.dts -index 309518403d86..1a9891f802f8 100644 +index 309518403..1a9891f80 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 309518403d86..1a9891f802f8 100644 compatible = "gpio-keys"; diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi -index bbc3bff50856..49b8652da097 100644 +index bbc3bff50..49b8652da 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 bbc3bff50856..49b8652da097 100644 }; diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi -index ddf23748ead4..e3fe43499c8a 100644 +index ddf23748e..e3fe43499 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 ddf23748ead4..e3fe43499c8a 100644 }; diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi -index 2f17bf35d7a6..aae403bfaff1 100644 +index 2f17bf35d..aae403bfa 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 2f17bf35d7a6..aae403bfaff1 100644 status = "disabled"; }; diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi -index 250a03a066a1..8a81801bd90d 100644 +index 250a03a06..8a81801bd 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 250a03a066a1..8a81801bd90d 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 a1a08cb9364e..b079c0008032 100644 +index a1a08cb93..b079c0008 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 a1a08cb9364e..b079c0008032 100644 #pwm-cells = <3>; status = "disabled"; diff --git a/arch/arm/kernel/psci_smp.c b/arch/arm/kernel/psci_smp.c -index d4392e177484..059db0b1c1de 100644 +index d4392e177..059db0b1c 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 d4392e177484..059db0b1c1de 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 0ce388f15422..6f874647b63b 100644 +index 0ce388f15..6f874647b 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 0ce388f15422..6f874647b63b 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 889e78f40a25..4a783983410a 100644 +index 889e78f40..4a7839834 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -224,11 +224,8 @@ config ARCH_RENESAS @@ -810,7 +810,7 @@ index 889e78f40a25..4a783983410a 100644 This enables support for the ARMv8 based Rockchip chipsets, like the RK3368. diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile -index 485b7dbd4f9e..7b56d7f760a8 100644 +index 485b7dbd4..7b56d7f76 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -198,3 +198,16 @@ define archhelp @@ -831,7 +831,7 @@ index 485b7dbd4f9e..7b56d7f760a8 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 26661c7b736b..a2386c005926 100644 +index 26661c7b7..a2386c005 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 @@ -879,8 +879,8 @@ index 26661c7b736b..a2386c005926 100644 +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nvr-demo-v12-linux.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nvr-demo-v12-linux-spi-nand.dtb diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts b/arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts -new file mode 100755 -index 000000000000..2f258286286a +new file mode 100644 +index 000000000..2f2582862 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts @@ -0,0 +1,759 @@ @@ -1644,8 +1644,8 @@ index 000000000000..2f258286286a + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-dual-lvds.dts b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-dual-lvds.dts -new file mode 100755 -index 000000000000..09fc265a8d7a +new file mode 100644 +index 000000000..09fc265a8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-dual-lvds.dts @@ -0,0 +1,147 @@ @@ -1797,8 +1797,8 @@ index 000000000000..09fc265a8d7a + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi-lvds.dts b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi-lvds.dts -new file mode 100755 -index 000000000000..d4f202189250 +new file mode 100644 +index 000000000..d4f202189 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi-lvds.dts @@ -0,0 +1,241 @@ @@ -2044,8 +2044,8 @@ index 000000000000..d4f202189250 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi.dts b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi.dts -new file mode 100755 -index 000000000000..0ea056682e57 +new file mode 100644 +index 000000000..0ea056682 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi.dts @@ -0,0 +1,105 @@ @@ -2155,8 +2155,8 @@ index 000000000000..0ea056682e57 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-lvds.dts b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-lvds.dts -new file mode 100755 -index 000000000000..8b54a9a18fcc +new file mode 100644 +index 000000000..8b54a9a18 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-lvds.dts @@ -0,0 +1,146 @@ @@ -2307,8 +2307,8 @@ index 000000000000..8b54a9a18fcc + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb.dtsi b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb.dtsi -new file mode 100755 -index 000000000000..bbcd18959dc4 +new file mode 100644 +index 000000000..bbcd18959 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb.dtsi @@ -0,0 +1,823 @@ @@ -3136,8 +3136,8 @@ index 000000000000..bbcd18959dc4 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-android.dtsi b/arch/arm64/boot/dts/rockchip/px30-android.dtsi -new file mode 100755 -index 000000000000..aecb6344f01f +new file mode 100644 +index 000000000..aecb6344f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-android.dtsi @@ -0,0 +1,131 @@ @@ -3273,8 +3273,8 @@ index 000000000000..aecb6344f01f + support-multi-area; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ddr4p416dd6-timing.dtsi b/arch/arm64/boot/dts/rockchip/px30-ddr4p416dd6-timing.dtsi -new file mode 100755 -index 000000000000..fde5895db94a +new file mode 100644 +index 000000000..fde5895db --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ddr4p416dd6-timing.dtsi @@ -0,0 +1,216 @@ @@ -3495,8 +3495,8 @@ index 000000000000..fde5895db94a + cs1_dqs3n_tx_de-skew = <10>; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/px30-dram-default-timing.dtsi -new file mode 100755 -index 000000000000..c75c5ef4ef2a +new file mode 100644 +index 000000000..c75c5ef4e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-dram-default-timing.dtsi @@ -0,0 +1,294 @@ @@ -3795,8 +3795,8 @@ index 000000000000..c75c5ef4ef2a + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts -new file mode 100755 -index 000000000000..eb60e71b77f3 +new file mode 100644 +index 000000000..eb60e71b7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts @@ -0,0 +1,689 @@ @@ -4490,8 +4490,8 @@ index 000000000000..eb60e71b77f3 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts -new file mode 100755 -index 000000000000..fca982485b16 +new file mode 100644 +index 000000000..fca982485 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts @@ -0,0 +1,109 @@ @@ -4605,8 +4605,8 @@ index 000000000000..fca982485b16 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts -new file mode 100755 -index 000000000000..ff24bdd46aea +new file mode 100644 +index 000000000..ff24bdd46 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts @@ -0,0 +1,939 @@ @@ -5550,8 +5550,8 @@ index 000000000000..ff24bdd46aea +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ + diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts -new file mode 100755 -index 000000000000..317b53b2a1eb +new file mode 100644 +index 000000000..317b53b2a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts @@ -0,0 +1,627 @@ @@ -6183,8 +6183,8 @@ index 000000000000..317b53b2a1eb +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts -new file mode 100755 -index 000000000000..81f44c36686c +new file mode 100644 +index 000000000..81f44c366 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts @@ -0,0 +1,627 @@ @@ -6816,8 +6816,8 @@ index 000000000000..81f44c36686c +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts -new file mode 100755 -index 000000000000..b814812edbe9 +new file mode 100644 +index 000000000..b814812ed --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts @@ -0,0 +1,127 @@ @@ -6949,8 +6949,8 @@ index 000000000000..b814812edbe9 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi -new file mode 100755 -index 000000000000..3d8e81009bef +new file mode 100644 +index 000000000..3d8e81009 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi @@ -0,0 +1,815 @@ @@ -7770,8 +7770,8 @@ index 000000000000..3d8e81009bef + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-avb.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-avb.dts -new file mode 100755 -index 000000000000..f2659a7f524e +new file mode 100644 +index 000000000..f2659a7f5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-avb.dts @@ -0,0 +1,276 @@ @@ -8052,8 +8052,8 @@ index 000000000000..f2659a7f524e + +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-linux.dts -new file mode 100755 -index 000000000000..54a4c19d11b3 +new file mode 100644 +index 000000000..54a4c19d1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-linux.dts @@ -0,0 +1,296 @@ @@ -8354,8 +8354,8 @@ index 000000000000..54a4c19d11b3 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts -new file mode 100755 -index 000000000000..2e59a09d3c5c +new file mode 100644 +index 000000000..2e59a09d3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts @@ -0,0 +1,293 @@ @@ -8653,8 +8653,8 @@ index 000000000000..2e59a09d3c5c + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts -new file mode 100755 -index 000000000000..7bfe640d32de +new file mode 100644 +index 000000000..7bfe640d3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts @@ -0,0 +1,853 @@ @@ -9512,8 +9512,8 @@ index 000000000000..7bfe640d32de +}; + diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618-avb.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618-avb.dts -new file mode 100755 -index 000000000000..ea44da5066af +new file mode 100644 +index 000000000..ea44da506 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618-avb.dts @@ -0,0 +1,11 @@ @@ -9529,8 +9529,8 @@ index 000000000000..ea44da5066af + compatible = "rockchip,px30-evb-ext-rk618-avb", "rockchip,px30"; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dts -new file mode 100755 -index 000000000000..69f44b4d115c +new file mode 100644 +index 000000000..69f44b4d1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dts @@ -0,0 +1,33 @@ @@ -9568,8 +9568,8 @@ index 000000000000..69f44b4d115c + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi -new file mode 100755 -index 000000000000..0eac63181407 +new file mode 100644 +index 000000000..0eac63181 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi @@ -0,0 +1,202 @@ @@ -9776,8 +9776,8 @@ index 000000000000..0eac63181407 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-robot-no-gpu.dtsi b/arch/arm64/boot/dts/rockchip/px30-robot-no-gpu.dtsi -new file mode 100755 -index 000000000000..e3f4274b2309 +new file mode 100644 +index 000000000..e3f4274b2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-robot-no-gpu.dtsi @@ -0,0 +1,57 @@ @@ -9839,8 +9839,8 @@ index 000000000000..e3f4274b2309 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-robot.dtsi b/arch/arm64/boot/dts/rockchip/px30-robot.dtsi -new file mode 100755 -index 000000000000..f48a753e6453 +new file mode 100644 +index 000000000..f48a753e6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-robot.dtsi @@ -0,0 +1,93 @@ @@ -9938,8 +9938,8 @@ index 000000000000..f48a753e6453 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-z7-a0-rk618-dsi.dts b/arch/arm64/boot/dts/rockchip/px30-z7-a0-rk618-dsi.dts -new file mode 100755 -index 000000000000..1657151c988f +new file mode 100644 +index 000000000..1657151c9 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-z7-a0-rk618-dsi.dts @@ -0,0 +1,875 @@ @@ -10819,7 +10819,7 @@ index 000000000000..1657151c988f + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/px30.dtsi b/arch/arm64/boot/dts/rockchip/px30.dtsi -index 0d6761074b11..237c0d9af325 100644 +index 0d6761074..237c0d9af 100644 --- a/arch/arm64/boot/dts/rockchip/px30.dtsi +++ b/arch/arm64/boot/dts/rockchip/px30.dtsi @@ -25,6 +25,9 @@ aliases { @@ -10973,8 +10973,8 @@ index 0d6761074b11..237c0d9af325 100644 #pwm-cells = <3>; status = "disabled"; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk1808-dram-default-timing.dtsi -new file mode 100755 -index 000000000000..0fa79e2f05c0 +new file mode 100644 +index 000000000..0fa79e2f0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-dram-default-timing.dtsi @@ -0,0 +1,302 @@ @@ -11281,8 +11281,8 @@ index 000000000000..0fa79e2f05c0 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts -new file mode 100755 -index 000000000000..a09824816188 +new file mode 100644 +index 000000000..a09824816 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts @@ -0,0 +1,305 @@ @@ -11592,8 +11592,8 @@ index 000000000000..a09824816188 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb-x4-second.dts b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4-second.dts -new file mode 100755 -index 000000000000..413d4f6fa29d +new file mode 100644 +index 000000000..413d4f6fa --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4-second.dts @@ -0,0 +1,272 @@ @@ -11870,8 +11870,8 @@ index 000000000000..413d4f6fa29d + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts -new file mode 100755 -index 000000000000..17993d1ff44a +new file mode 100644 +index 000000000..17993d1ff --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts @@ -0,0 +1,271 @@ @@ -12147,8 +12147,8 @@ index 000000000000..17993d1ff44a + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi -new file mode 100755 -index 000000000000..3b9c88660701 +new file mode 100644 +index 000000000..3b9c88660 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi @@ -0,0 +1,717 @@ @@ -12870,8 +12870,8 @@ index 000000000000..3b9c88660701 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-fpga.dts b/arch/arm64/boot/dts/rockchip/rk1808-fpga.dts -new file mode 100755 -index 000000000000..d021918cacd1 +new file mode 100644 +index 000000000..d021918ca --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-fpga.dts @@ -0,0 +1,58 @@ @@ -12934,8 +12934,8 @@ index 000000000000..d021918cacd1 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808.dtsi b/arch/arm64/boot/dts/rockchip/rk1808.dtsi -new file mode 100755 -index 000000000000..3469abac4f34 +new file mode 100644 +index 000000000..3469abac4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808.dtsi @@ -0,0 +1,3040 @@ @@ -15980,8 +15980,8 @@ index 000000000000..3469abac4f34 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808k.dtsi b/arch/arm64/boot/dts/rockchip/rk1808k.dtsi -new file mode 100755 -index 000000000000..78bd92e4c2c6 +new file mode 100644 +index 000000000..78bd92e4c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808k.dtsi @@ -0,0 +1,51 @@ @@ -16037,8 +16037,8 @@ index 000000000000..78bd92e4c2c6 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts -new file mode 100755 -index 000000000000..c77d2e963266 +new file mode 100644 +index 000000000..c77d2e963 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts @@ -0,0 +1,681 @@ @@ -16724,8 +16724,8 @@ index 000000000000..c77d2e963266 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts -new file mode 100755 -index 000000000000..557daa856132 +new file mode 100644 +index 000000000..557daa856 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts @@ -0,0 +1,55 @@ @@ -16785,8 +16785,8 @@ index 000000000000..557daa856132 + #sound-dai-cells = <0>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts -new file mode 100755 -index 000000000000..90a29a903545 +new file mode 100644 +index 000000000..90a29a903 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts @@ -0,0 +1,56 @@ @@ -16847,8 +16847,8 @@ index 000000000000..90a29a903545 + #sound-dai-cells = <0>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v10.dts -new file mode 100755 -index 000000000000..88c1e9c6c8ac +new file mode 100644 +index 000000000..88c1e9c6c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v10.dts @@ -0,0 +1,101 @@ @@ -16954,8 +16954,8 @@ index 000000000000..88c1e9c6c8ac + #sound-dai-cells = <0>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v11.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v11.dts -new file mode 100755 -index 000000000000..364f74a40d9d +new file mode 100644 +index 000000000..364f74a40 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v11.dts @@ -0,0 +1,77 @@ @@ -17037,8 +17037,8 @@ index 000000000000..364f74a40d9d + #sound-dai-cells = <0>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts -new file mode 100755 -index 000000000000..e2891ce1092c +new file mode 100644 +index 000000000..e2891ce10 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts @@ -0,0 +1,88 @@ @@ -17131,8 +17131,8 @@ index 000000000000..e2891ce1092c + #sound-dai-cells = <0>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v11.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v11.dts -new file mode 100755 -index 000000000000..c4a7178f1dc8 +new file mode 100644 +index 000000000..c4a7178f1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v11.dts @@ -0,0 +1,92 @@ @@ -17229,8 +17229,8 @@ index 000000000000..c4a7178f1dc8 + #sound-dai-cells = <0>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-ext-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-ext-v10.dtsi -new file mode 100755 -index 000000000000..1c0e66384c16 +new file mode 100644 +index 000000000..1c0e66384 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-ext-v10.dtsi @@ -0,0 +1,235 @@ @@ -17470,8 +17470,8 @@ index 000000000000..1c0e66384c16 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi -new file mode 100755 -index 000000000000..3d052d0da477 +new file mode 100644 +index 000000000..3d052d0da --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi @@ -0,0 +1,780 @@ @@ -18256,8 +18256,8 @@ index 000000000000..3d052d0da477 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi -new file mode 100755 -index 000000000000..7b692a810333 +new file mode 100644 +index 000000000..7b692a810 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi @@ -0,0 +1,835 @@ @@ -19097,8 +19097,8 @@ index 000000000000..7b692a810333 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-fpga.dts b/arch/arm64/boot/dts/rockchip/rk3308-fpga.dts -new file mode 100755 -index 000000000000..225aca323f4d +new file mode 100644 +index 000000000..225aca323 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-fpga.dts @@ -0,0 +1,51 @@ @@ -19154,7 +19154,7 @@ index 000000000000..225aca323f4d + 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 213c0759c4b8..b89eaf1075ab 100644 +index 213c0759c..b89eaf107 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 { @@ -19169,8 +19169,8 @@ index 213c0759c4b8..b89eaf1075ab 100644 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-voice-module-board-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-voice-module-board-v10.dts -new file mode 100755 -index 000000000000..2586d9905072 +new file mode 100644 +index 000000000..2586d9905 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-voice-module-board-v10.dts @@ -0,0 +1,19 @@ @@ -19194,7 +19194,7 @@ index 000000000000..2586d9905072 + console-size = <0xc0000>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi -index 2560b98771ca..cc86c0880cec 100644 +index 2560b9877..cc86c0880 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi @@ -10,6 +10,7 @@ @@ -19336,8 +19336,8 @@ index 2560b98771ca..cc86c0880cec 100644 #pwm-cells = <3>; status = "disabled"; diff --git a/arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts -new file mode 100755 -index 000000000000..d5e2d9ebd4aa +new file mode 100644 +index 000000000..d5e2d9ebd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts @@ -0,0 +1,62 @@ @@ -19404,8 +19404,8 @@ index 000000000000..d5e2d9ebd4aa + #sound-dai-cells = <0>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308b-evb-ext-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308b-evb-ext-v10.dtsi -new file mode 100755 -index 000000000000..e2414b67f0d1 +new file mode 100644 +index 000000000..e2414b67f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-ext-v10.dtsi @@ -0,0 +1,124 @@ @@ -19534,8 +19534,8 @@ index 000000000000..e2414b67f0d1 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi -new file mode 100755 -index 000000000000..902ae3544235 +new file mode 100644 +index 000000000..902ae3544 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi @@ -0,0 +1,784 @@ @@ -20324,8 +20324,8 @@ index 000000000000..902ae3544235 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308k.dtsi b/arch/arm64/boot/dts/rockchip/rk3308k.dtsi -new file mode 100755 -index 000000000000..ffd53fd158c5 +new file mode 100644 +index 000000000..ffd53fd15 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308k.dtsi @@ -0,0 +1,46 @@ @@ -20376,8 +20376,8 @@ index 000000000000..ffd53fd158c5 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-cif-sensor.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-863-cif-sensor.dtsi -new file mode 100755 -index 000000000000..c01f4d014a1b +new file mode 100644 +index 000000000..c01f4d014 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-cif-sensor.dtsi @@ -0,0 +1,54 @@ @@ -20436,8 +20436,8 @@ index 000000000000..c01f4d014a1b +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts -new file mode 100755 -index 000000000000..174d05e37ccb +new file mode 100644 +index 000000000..174d05e37 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts @@ -0,0 +1,112 @@ @@ -20554,8 +20554,8 @@ index 000000000000..174d05e37ccb + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-rkisp1.dts b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-rkisp1.dts -new file mode 100755 -index 000000000000..d80dad694c1d +new file mode 100644 +index 000000000..d80dad694 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-rkisp1.dts @@ -0,0 +1,103 @@ @@ -20663,8 +20663,8 @@ index 000000000000..d80dad694c1d + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts -new file mode 100755 -index 000000000000..7a399b3356ac +new file mode 100644 +index 000000000..7a399b335 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts @@ -0,0 +1,42 @@ @@ -20711,8 +20711,8 @@ index 000000000000..7a399b3356ac + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi -new file mode 100755 -index 000000000000..6e6e3be2f104 +new file mode 100644 +index 000000000..6e6e3be2f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi @@ -0,0 +1,833 @@ @@ -21550,8 +21550,8 @@ index 000000000000..6e6e3be2f104 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-86v-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-86v-v10.dts -new file mode 100755 -index 000000000000..86d048c0d731 +new file mode 100644 +index 000000000..86d048c0d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-86v-v10.dts @@ -0,0 +1,840 @@ @@ -22396,8 +22396,8 @@ index 000000000000..86d048c0d731 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts -new file mode 100755 -index 000000000000..02308ebae99e +new file mode 100644 +index 000000000..02308ebae --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts @@ -0,0 +1,1308 @@ @@ -23710,8 +23710,8 @@ index 000000000000..02308ebae99e + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts -new file mode 100755 -index 000000000000..0af03d1ec2a8 +new file mode 100644 +index 000000000..0af03d1ec --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts @@ -0,0 +1,1330 @@ @@ -25046,8 +25046,8 @@ index 000000000000..0af03d1ec2a8 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts -new file mode 100755 -index 000000000000..fa8b7cff619f +new file mode 100644 +index 000000000..fa8b7cff6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts @@ -0,0 +1,1317 @@ @@ -26369,8 +26369,8 @@ index 000000000000..fa8b7cff619f + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts -new file mode 100755 -index 000000000000..9669993499e0 +new file mode 100644 +index 000000000..966999349 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts @@ -0,0 +1,1317 @@ @@ -27692,8 +27692,8 @@ index 000000000000..9669993499e0 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts -new file mode 100755 -index 000000000000..4c12a79f814b +new file mode 100644 +index 000000000..4c12a79f8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts @@ -0,0 +1,91 @@ @@ -27789,8 +27789,8 @@ index 000000000000..4c12a79f814b + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts -new file mode 100755 -index 000000000000..67c131c9618a +new file mode 100644 +index 000000000..67c131c96 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts @@ -0,0 +1,1024 @@ @@ -28819,8 +28819,8 @@ index 000000000000..67c131c9618a +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts -new file mode 100755 -index 000000000000..6966806150f5 +new file mode 100644 +index 000000000..696680615 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts @@ -0,0 +1,748 @@ @@ -29573,8 +29573,8 @@ index 000000000000..6966806150f5 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts -new file mode 100755 -index 000000000000..b3b9efec92e4 +new file mode 100644 +index 000000000..b3b9efec9 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts @@ -0,0 +1,728 @@ @@ -30307,8 +30307,8 @@ index 000000000000..b3b9efec92e4 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts -new file mode 100755 -index 000000000000..58bbfdafb489 +new file mode 100644 +index 000000000..58bbfdafb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts @@ -0,0 +1,37 @@ @@ -30350,8 +30350,8 @@ index 000000000000..58bbfdafb489 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi -new file mode 100755 -index 000000000000..940c05df8304 +new file mode 100644 +index 000000000..940c05df8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi @@ -0,0 +1,887 @@ @@ -31243,8 +31243,8 @@ index 000000000000..940c05df8304 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11-avb.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11-avb.dts -new file mode 100755 -index 000000000000..2f0c3fc3a38d +new file mode 100644 +index 000000000..2f0c3fc3a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11-avb.dts @@ -0,0 +1,351 @@ @@ -31600,8 +31600,8 @@ index 000000000000..2f0c3fc3a38d + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts -new file mode 100755 -index 000000000000..139efd9d1332 +new file mode 100644 +index 000000000..139efd9d1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts @@ -0,0 +1,297 @@ @@ -31903,8 +31903,8 @@ index 000000000000..139efd9d1332 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi -new file mode 100755 -index 000000000000..a386cd291cf3 +new file mode 100644 +index 000000000..a386cd291 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi @@ -0,0 +1,120 @@ @@ -32029,8 +32029,8 @@ index 000000000000..a386cd291cf3 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-android.dtsi -new file mode 100755 -index 000000000000..809b6501b78f +new file mode 100644 +index 000000000..809b6501b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-android.dtsi @@ -0,0 +1,88 @@ @@ -32123,8 +32123,8 @@ index 000000000000..809b6501b78f + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong-avb.dts b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong-avb.dts -new file mode 100755 -index 000000000000..ee04d8988fbb +new file mode 100644 +index 000000000..ee04d8988 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong-avb.dts @@ -0,0 +1,13 @@ @@ -32142,8 +32142,8 @@ index 000000000000..ee04d8988fbb + compatible = "rockchip,rk3328-box-liantong-avb", "rockchip,rk3328"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dts b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dts -new file mode 100755 -index 000000000000..dcff87208d39 +new file mode 100644 +index 000000000..dcff87208 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dts @@ -0,0 +1,34 @@ @@ -32182,8 +32182,8 @@ index 000000000000..dcff87208d39 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi -new file mode 100755 -index 000000000000..ad7ef6be49fa +new file mode 100644 +index 000000000..ad7ef6be4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi @@ -0,0 +1,673 @@ @@ -32861,8 +32861,8 @@ index 000000000000..ad7ef6be49fa + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi -new file mode 100755 -index 000000000000..0ea270539a23 +new file mode 100644 +index 000000000..0ea270539 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi @@ -0,0 +1,221 @@ @@ -33088,8 +33088,8 @@ index 000000000000..0ea270539a23 + cs1_dqs3n_tx_de-skew = <9>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-dram-2layer-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-dram-2layer-timing.dtsi -new file mode 100755 -index 000000000000..940024920b5d +new file mode 100644 +index 000000000..940024920 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-dram-2layer-timing.dtsi @@ -0,0 +1,257 @@ @@ -33351,8 +33351,8 @@ index 000000000000..940024920b5d + cs1_dqs3n_tx_de-skew = <8>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi -new file mode 100755 -index 000000000000..a3f5ff4bdc47 +new file mode 100644 +index 000000000..a3f5ff4bd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi @@ -0,0 +1,311 @@ @@ -33668,8 +33668,8 @@ index 000000000000..a3f5ff4bdc47 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts -new file mode 100755 -index 000000000000..0d72e05e2d59 +new file mode 100644 +index 000000000..0d72e05e2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts @@ -0,0 +1,13 @@ @@ -33687,8 +33687,8 @@ index 000000000000..0d72e05e2d59 + compatible = "rockchip,rk3328-evb-avb", "rockchip,rk3328"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dts -new file mode 100755 -index 000000000000..6d50444a5a1d +new file mode 100644 +index 000000000..6d50444a5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dts @@ -0,0 +1,34 @@ @@ -33727,8 +33727,8 @@ index 000000000000..6d50444a5a1d + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi -new file mode 100755 -index 000000000000..e050047420a6 +new file mode 100644 +index 000000000..e05004742 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi @@ -0,0 +1,715 @@ @@ -34448,7 +34448,7 @@ index 000000000000..e050047420a6 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts -index a48767931af6..82d2f01a8be6 100644 +index a48767931..82d2f01a8 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 a48767931af6..82d2f01a8be6 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 83a0bdbe00d6..1eecad724f04 100644 +index 83a0bdbe0..1eecad724 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 83a0bdbe00d6..1eecad724f04 100644 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts -index 22ab5e1d7319..a0c4d321cc0b 100644 +index 22ab5e1d7..a0c4d321c 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 { @@ -34525,8 +34525,8 @@ index 22ab5e1d7319..a0c4d321cc0b 100644 regulator-type = "voltage"; regulator-min-microvolt = <1800000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android-avb.dts -new file mode 100755 -index 000000000000..adc1dd7cd4da +new file mode 100644 +index 000000000..adc1dd7cd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android-avb.dts @@ -0,0 +1,32 @@ @@ -34563,8 +34563,8 @@ index 000000000000..adc1dd7cd4da + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dts -new file mode 100755 -index 000000000000..66e83916c728 +new file mode 100644 +index 000000000..66e83916c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dts @@ -0,0 +1,34 @@ @@ -34603,8 +34603,8 @@ index 000000000000..66e83916c728 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi -new file mode 100755 -index 000000000000..3dad4f4fafcb +new file mode 100644 +index 000000000..3dad4f4fa --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi @@ -0,0 +1,612 @@ @@ -35221,7 +35221,7 @@ index 000000000000..3dad4f4fafcb + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -index 95ab6928cfd4..4c33c21eee8d 100644 +index 95ab6928c..4c33c21ee 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 95ab6928cfd4..4c33c21eee8d 100644 status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index 72112fe05a5c..a3fcf36f8ecc 100644 +index 72112fe05..a3fcf36f8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -318,13 +318,13 @@ power: power-controller { @@ -35364,8 +35364,8 @@ index 72112fe05a5c..a3fcf36f8ecc 100644 compatible = "arm,gic-400"; #interrupt-cells = <3>; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts b/arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts -new file mode 100755 -index 000000000000..7e803a8ed30c +new file mode 100644 +index 000000000..7e803a8ed --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts @@ -0,0 +1,189 @@ @@ -35559,8 +35559,8 @@ index 000000000000..7e803a8ed30c + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi -new file mode 100755 -index 000000000000..fdea0c73932e +new file mode 100644 +index 000000000..fdea0c739 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi @@ -0,0 +1,982 @@ @@ -36547,8 +36547,8 @@ index 000000000000..fdea0c73932e +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi -new file mode 100755 -index 000000000000..a3e0bbaaf7c5 +new file mode 100644 +index 000000000..a3e0bbaaf --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi @@ -0,0 +1,357 @@ @@ -36910,8 +36910,8 @@ index 000000000000..a3e0bbaaf7c5 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-cif-sensor.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-cif-sensor.dtsi -new file mode 100755 -index 000000000000..7d2aac22c020 +new file mode 100644 +index 000000000..7d2aac22c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-cif-sensor.dtsi @@ -0,0 +1,35 @@ @@ -36951,8 +36951,8 @@ index 000000000000..7d2aac22c020 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-dram-default-timing.dtsi -new file mode 100755 -index 000000000000..10bfbebda989 +new file mode 100644 +index 000000000..10bfbebda --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-dram-default-timing.dtsi @@ -0,0 +1,66 @@ @@ -37023,8 +37023,8 @@ index 000000000000..10bfbebda989 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9-avb.dts b/arch/arm64/boot/dts/rockchip/rk3368-p9-avb.dts -new file mode 100755 -index 000000000000..6a971781032a +new file mode 100644 +index 000000000..6a9717810 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-p9-avb.dts @@ -0,0 +1,35 @@ @@ -37064,8 +37064,8 @@ index 000000000000..6a971781032a + bootargs = "earlycon=uart8250,mmio32,0xff690000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 androidboot.selinux=permissive init=/init kpti=0"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9.dts b/arch/arm64/boot/dts/rockchip/rk3368-p9.dts -new file mode 100755 -index 000000000000..29658be08696 +new file mode 100644 +index 000000000..29658be08 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-p9.dts @@ -0,0 +1,34 @@ @@ -37104,8 +37104,8 @@ index 000000000000..29658be08696 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi -new file mode 100755 -index 000000000000..7eeb9db4f13b +new file mode 100644 +index 000000000..7eeb9db4f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi @@ -0,0 +1,841 @@ @@ -37951,8 +37951,8 @@ index 000000000000..7eeb9db4f13b +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts -new file mode 100755 -index 000000000000..1d50d3fa549f +new file mode 100644 +index 000000000..1d50d3fa5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts @@ -0,0 +1,993 @@ @@ -38950,8 +38950,8 @@ index 000000000000..1d50d3fa549f + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts -new file mode 100755 -index 000000000000..4a755f1207c1 +new file mode 100644 +index 000000000..4a755f120 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts @@ -0,0 +1,676 @@ @@ -39632,8 +39632,8 @@ index 000000000000..4a755f1207c1 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts b/arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts -new file mode 100755 -index 000000000000..b7b11f895cab +new file mode 100644 +index 000000000..b7b11f895 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts @@ -0,0 +1,662 @@ @@ -40300,8 +40300,8 @@ index 000000000000..b7b11f895cab + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts b/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts -new file mode 100755 -index 000000000000..b9b6b24ff37b +new file mode 100644 +index 000000000..b9b6b24ff --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts @@ -0,0 +1,746 @@ @@ -41052,8 +41052,8 @@ index 000000000000..b9b6b24ff37b + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts b/arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts -new file mode 100755 -index 000000000000..eff7c2fed990 +new file mode 100644 +index 000000000..eff7c2fed --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts @@ -0,0 +1,808 @@ @@ -41866,8 +41866,8 @@ index 000000000000..eff7c2fed990 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts -new file mode 100755 -index 000000000000..d7dc6d67e242 +new file mode 100644 +index 000000000..d7dc6d67e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts @@ -0,0 +1,1070 @@ @@ -42942,8 +42942,8 @@ index 000000000000..d7dc6d67e242 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts b/arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts -new file mode 100755 -index 000000000000..b455e32c3e29 +new file mode 100644 +index 000000000..b455e32c3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts @@ -0,0 +1,139 @@ @@ -43087,8 +43087,8 @@ index 000000000000..b455e32c3e29 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-xikp.dts b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dts -new file mode 100755 -index 000000000000..bc320ffdc3b7 +new file mode 100644 +index 000000000..bc320ffdc --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dts @@ -0,0 +1,33 @@ @@ -43127,8 +43127,8 @@ index 000000000000..bc320ffdc3b7 +}; \ No newline at end of file diff --git a/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi -new file mode 100755 -index 000000000000..aa73096aff9d +new file mode 100644 +index 000000000..aa73096af --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi @@ -0,0 +1,893 @@ @@ -44026,7 +44026,7 @@ index 000000000000..aa73096aff9d +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi -index 3746f23dc3df..e962c7962789 100644 +index 3746f23dc..e962c7962 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi @@ -562,7 +562,7 @@ pwm0: pwm@ff680000 { @@ -44092,8 +44092,8 @@ index 3746f23dc3df..e962c7962789 100644 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts -new file mode 100755 -index 000000000000..0a489bf8fc84 +new file mode 100644 +index 000000000..0a489bf8f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts @@ -0,0 +1,1074 @@ @@ -45172,8 +45172,8 @@ index 000000000000..0a489bf8fc84 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts -new file mode 100755 -index 000000000000..31f25e44504d +new file mode 100644 +index 000000000..31f25e445 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts @@ -0,0 +1,1333 @@ @@ -46511,8 +46511,8 @@ index 000000000000..31f25e44504d +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi -new file mode 100755 -index 000000000000..ffaa92b7a89e +new file mode 100644 +index 000000000..ffaa92b7a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi @@ -0,0 +1,339 @@ @@ -46856,8 +46856,8 @@ index 000000000000..ffaa92b7a89e +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts -new file mode 100755 -index 000000000000..c4572da2ec87 +new file mode 100644 +index 000000000..c4572da2e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts @@ -0,0 +1,134 @@ @@ -46996,8 +46996,8 @@ index 000000000000..c4572da2ec87 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts -new file mode 100755 -index 000000000000..1c9b884736b1 +new file mode 100644 +index 000000000..1c9b88473 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts @@ -0,0 +1,158 @@ @@ -47160,8 +47160,8 @@ index 000000000000..1c9b884736b1 + <000000000 0x0000 0x0000 0x0000>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi -new file mode 100755 -index 000000000000..704e0df4e122 +new file mode 100644 +index 000000000..704e0df4e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi @@ -0,0 +1,891 @@ @@ -48057,8 +48057,8 @@ index 000000000000..704e0df4e122 + assigned-clock-parents = <&cru PLL_CPLL>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-dram-default-timing.dtsi -new file mode 100755 -index 000000000000..981777b82329 +new file mode 100644 +index 000000000..981777b82 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-dram-default-timing.dtsi @@ -0,0 +1,80 @@ @@ -48143,8 +48143,8 @@ index 000000000000..981777b82329 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi -new file mode 100755 -index 000000000000..2a675ec7c342 +new file mode 100644 +index 000000000..2a675ec7c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi @@ -0,0 +1,127 @@ @@ -48276,8 +48276,8 @@ index 000000000000..2a675ec7c342 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi -new file mode 100755 -index 000000000000..4cac4981b267 +new file mode 100644 +index 000000000..4cac4981b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi @@ -0,0 +1,181 @@ @@ -48463,8 +48463,8 @@ index 000000000000..4cac4981b267 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts -new file mode 100755 -index 000000000000..343a9fc389e1 +new file mode 100644 +index 000000000..343a9fc38 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts @@ -0,0 +1,389 @@ @@ -48858,8 +48858,8 @@ index 000000000000..343a9fc389e1 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts -new file mode 100755 -index 000000000000..72aa97affa99 +new file mode 100644 +index 000000000..72aa97aff --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts @@ -0,0 +1,157 @@ @@ -49021,8 +49021,8 @@ index 000000000000..72aa97affa99 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts -new file mode 100755 -index 000000000000..5b6b7131fdd1 +new file mode 100644 +index 000000000..5b6b7131f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts @@ -0,0 +1,321 @@ @@ -49348,8 +49348,8 @@ index 000000000000..5b6b7131fdd1 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts -new file mode 100755 -index 000000000000..8439d91dd125 +new file mode 100644 +index 000000000..8439d91dd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts @@ -0,0 +1,425 @@ @@ -49779,8 +49779,8 @@ index 000000000000..8439d91dd125 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi -new file mode 100755 -index 000000000000..dc821a2d45c4 +new file mode 100644 +index 000000000..dc821a2d4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi @@ -0,0 +1,1430 @@ @@ -51215,8 +51215,8 @@ index 000000000000..dc821a2d45c4 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts -new file mode 100755 -index 000000000000..bb7ddac77f23 +new file mode 100644 +index 000000000..bb7ddac77 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts @@ -0,0 +1,145 @@ @@ -51366,8 +51366,8 @@ index 000000000000..bb7ddac77f23 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts -new file mode 100755 -index 000000000000..bf27556295ec +new file mode 100644 +index 000000000..bf2755629 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts @@ -0,0 +1,51 @@ @@ -51423,8 +51423,8 @@ index 000000000000..bf27556295ec + compatible = "google,rk3399evb-rev1", "rockchip,rk3399-evb-rev1", "rockchip,rk3399"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi -new file mode 100755 -index 000000000000..f35d6ee56072 +new file mode 100644 +index 000000000..f35d6ee56 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi @@ -0,0 +1,352 @@ @@ -51781,8 +51781,8 @@ index 000000000000..f35d6ee56072 + rockchip,utmi-avalid; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts -new file mode 100755 -index 000000000000..b15fb8a9d088 +new file mode 100644 +index 000000000..b15fb8a9d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts @@ -0,0 +1,156 @@ @@ -51943,8 +51943,8 @@ index 000000000000..b15fb8a9d088 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts -new file mode 100755 -index 000000000000..2daf9f1235f3 +new file mode 100644 +index 000000000..2daf9f123 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts @@ -0,0 +1,51 @@ @@ -52000,8 +52000,8 @@ index 000000000000..2daf9f1235f3 + compatible = "google,rk3399evb-rev2", "rockchip,rk3399-evb-rev2", "rockchip,rk3399"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi -new file mode 100755 -index 000000000000..4b23c1fcadd8 +new file mode 100644 +index 000000000..4b23c1fca --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi @@ -0,0 +1,366 @@ @@ -52372,8 +52372,8 @@ index 000000000000..4b23c1fcadd8 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts -new file mode 100755 -index 000000000000..7f730f5633dd +new file mode 100644 +index 000000000..7f730f563 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts @@ -0,0 +1,126 @@ @@ -52504,8 +52504,8 @@ index 000000000000..7f730f5633dd + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-lp4.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-lp4.dts -new file mode 100755 -index 000000000000..85f4356a0030 +new file mode 100644 +index 000000000..85f4356a0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-lp4.dts @@ -0,0 +1,233 @@ @@ -52743,8 +52743,8 @@ index 000000000000..85f4356a0030 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-mipi-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-mipi-edp.dts -new file mode 100755 -index 000000000000..fffd92f00ff4 +new file mode 100644 +index 000000000..fffd92f00 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-mipi-edp.dts @@ -0,0 +1,300 @@ @@ -53049,8 +53049,8 @@ index 000000000000..fffd92f00ff4 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts -new file mode 100755 -index 000000000000..9ba1b0381fed +new file mode 100644 +index 000000000..9ba1b0381 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts @@ -0,0 +1,176 @@ @@ -53231,8 +53231,8 @@ index 000000000000..9ba1b0381fed + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts -new file mode 100755 -index 000000000000..e1bb5f129680 +new file mode 100644 +index 000000000..e1bb5f129 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts @@ -0,0 +1,51 @@ @@ -53288,8 +53288,8 @@ index 000000000000..e1bb5f129680 + compatible = "google,rk3399evb-rev3", "rockchip,rk3399-evb-rev3", "rockchip,rk3399"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3.dtsi -new file mode 100755 -index 000000000000..e34379ded3a5 +new file mode 100644 +index 000000000..e34379ded --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3.dtsi @@ -0,0 +1,353 @@ @@ -53647,8 +53647,8 @@ index 000000000000..e34379ded3a5 + pinctrl-0 = <&pwm2_pin_pull_down>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi -new file mode 100755 -index 000000000000..aa8ea436ae9b +new file mode 100644 +index 000000000..aa8ea436a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi @@ -0,0 +1,646 @@ @@ -54299,8 +54299,8 @@ index 000000000000..aa8ea436ae9b +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi -new file mode 100755 -index 000000000000..adbda6ba4e0d +new file mode 100644 +index 000000000..adbda6ba4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi @@ -0,0 +1,324 @@ @@ -54629,8 +54629,8 @@ index 000000000000..adbda6ba4e0d + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts -new file mode 100755 -index 000000000000..c372ade536f2 +new file mode 100644 +index 000000000..c372ade53 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts @@ -0,0 +1,1102 @@ @@ -55737,8 +55737,8 @@ index 000000000000..c372ade536f2 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts -new file mode 100755 -index 000000000000..5a023389a033 +new file mode 100644 +index 000000000..5a023389a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts @@ -0,0 +1,1074 @@ @@ -56817,8 +56817,8 @@ index 000000000000..5a023389a033 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-fpga.dts b/arch/arm64/boot/dts/rockchip/rk3399-fpga.dts -new file mode 100755 -index 000000000000..1192dfa42940 +new file mode 100644 +index 000000000..1192dfa42 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-fpga.dts @@ -0,0 +1,64 @@ @@ -56887,8 +56887,8 @@ index 000000000000..1192dfa42940 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts -new file mode 100755 -index 000000000000..e8d771e2b90e +new file mode 100644 +index 000000000..e8d771e2b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts @@ -0,0 +1,165 @@ @@ -57058,8 +57058,8 @@ index 000000000000..e8d771e2b90e +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts -new file mode 100755 -index 000000000000..7a1c36e981d5 +new file mode 100644 +index 000000000..7a1c36e98 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts @@ -0,0 +1,118 @@ @@ -57182,8 +57182,8 @@ index 000000000000..7a1c36e981d5 + rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts -new file mode 100755 -index 000000000000..44b04e1606fc +new file mode 100644 +index 000000000..44b04e160 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts @@ -0,0 +1,85 @@ @@ -57273,7 +57273,7 @@ index 000000000000..44b04e1606fc + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi -index e9ecffc409c0..60cd1c18cd4e 100644 +index e9ecffc40..60cd1c18c 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 e9ecffc409c0..60cd1c18cd4e 100644 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi -index fb0a13cad6c9..1ce91e36aa49 100644 +index fb0a13cad..1ce91e36a 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 { @@ -57301,8 +57301,8 @@ index fb0a13cad6c9..1ce91e36aa49 100644 regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3000000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi -new file mode 100755 -index 000000000000..0549701d615e +new file mode 100644 +index 000000000..0549701d6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi @@ -0,0 +1,306 @@ @@ -57613,8 +57613,8 @@ index 000000000000..0549701d615e + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts -new file mode 100755 -index 000000000000..8610539ef284 +new file mode 100644 +index 000000000..8610539ef --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts @@ -0,0 +1,1121 @@ @@ -58740,7 +58740,7 @@ index 000000000000..8610539ef284 + 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 d6f1095abb04..f9f2cc8abec7 100644 +index d6f1095ab..f9f2cc8ab 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 d6f1095abb04..f9f2cc8abec7 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 35b7ab3bf10c..20309076dbac 100644 +index 35b7ab3bf..20309076d 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 { @@ -59159,8 +59159,8 @@ index 35b7ab3bf10c..20309076dbac 100644 regulator-state-mem { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts -new file mode 100755 -index 000000000000..86e45dc0074d +new file mode 100644 +index 000000000..86e45dc00 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts @@ -0,0 +1,1088 @@ @@ -60253,7 +60253,7 @@ index 000000000000..86e45dc0074d + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts -index c88295782e7b..1a23e8f3cdf6 100644 +index c88295782..1a23e8f3c 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 { @@ -60324,8 +60324,8 @@ index c88295782e7b..1a23e8f3cdf6 100644 dr_mode = "otg"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts -new file mode 100755 -index 000000000000..3106512b87cd +new file mode 100644 +index 000000000..3106512b8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts @@ -0,0 +1,181 @@ @@ -60511,8 +60511,8 @@ index 000000000000..3106512b87cd + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts -new file mode 100755 -index 000000000000..3e9ef7b0773b +new file mode 100644 +index 000000000..3e9ef7b07 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts @@ -0,0 +1,128 @@ @@ -60645,8 +60645,8 @@ index 000000000000..3e9ef7b0773b +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts -new file mode 100755 -index 000000000000..c2f8673198d5 +new file mode 100644 +index 000000000..c2f867319 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts @@ -0,0 +1,82 @@ @@ -60733,8 +60733,8 @@ index 000000000000..c2f8673198d5 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi -new file mode 100755 -index 000000000000..8156e5f7c795 +new file mode 100644 +index 000000000..8156e5f7c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi @@ -0,0 +1,488 @@ @@ -61227,8 +61227,8 @@ index 000000000000..8156e5f7c795 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts -new file mode 100755 -index 000000000000..e1e482938481 +new file mode 100644 +index 000000000..e1e482938 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts @@ -0,0 +1,487 @@ @@ -61720,8 +61720,8 @@ index 000000000000..e1e482938481 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts -new file mode 100755 -index 000000000000..9f370a7bff1c +new file mode 100644 +index 000000000..9f370a7bf --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts @@ -0,0 +1,452 @@ @@ -62178,8 +62178,8 @@ index 000000000000..9f370a7bff1c + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts -new file mode 100755 -index 000000000000..da471a636103 +new file mode 100644 +index 000000000..da471a636 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts @@ -0,0 +1,497 @@ @@ -62681,7 +62681,7 @@ index 000000000000..da471a636103 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi -index 701a567d7638..3d9e27750139 100644 +index 701a567d7..3d9e27750 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi @@ -515,6 +515,8 @@ &pwm0 { @@ -62694,8 +62694,8 @@ index 701a567d7638..3d9e27750139 100644 &saradc { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi -new file mode 100755 -index 000000000000..373a776b9207 +new file mode 100644 +index 000000000..373a776b9 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi @@ -0,0 +1,121 @@ @@ -62821,8 +62821,8 @@ index 000000000000..373a776b9207 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts -new file mode 100755 -index 000000000000..eeca9cf54373 +new file mode 100644 +index 000000000..eeca9cf54 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts @@ -0,0 +1,170 @@ @@ -62997,8 +62997,8 @@ index 000000000000..eeca9cf54373 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dts -new file mode 100755 -index 000000000000..28f81ee8f7f5 +new file mode 100644 +index 000000000..28f81ee8f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dts @@ -0,0 +1,42 @@ @@ -63045,8 +63045,8 @@ index 000000000000..28f81ee8f7f5 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi -new file mode 100755 -index 000000000000..fb700431e356 +new file mode 100644 +index 000000000..fb700431e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi @@ -0,0 +1,1039 @@ @@ -64090,8 +64090,8 @@ index 000000000000..fb700431e356 + assigned-clock-parents = <&cru PLL_VPLL>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts -new file mode 100755 -index 000000000000..ac9d28db5b76 +new file mode 100644 +index 000000000..ac9d28db5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts @@ -0,0 +1,1179 @@ @@ -65275,8 +65275,8 @@ index 000000000000..ac9d28db5b76 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts -new file mode 100755 -index 000000000000..10ba2048483d +new file mode 100644 +index 000000000..10ba20484 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts @@ -0,0 +1,293 @@ @@ -65574,8 +65574,8 @@ index 000000000000..10ba2048483d + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-vop-clk-set.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-vop-clk-set.dtsi -new file mode 100755 -index 000000000000..5ed8dac6cf7d +new file mode 100644 +index 000000000..5ed8dac6c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-vop-clk-set.dtsi @@ -0,0 +1,181 @@ @@ -65761,7 +65761,7 @@ index 000000000000..5ed8dac6cf7d +#endif + diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -index c5f3d4f8f4d2..7f4a812f4337 100644 +index 3180f576e..b6217e336 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -9,8 +9,13 @@ @@ -65957,8 +65957,8 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 + pd_vdu@RK3399_PD_VDU { reg = ; clocks = <&cru ACLK_VDU>, - <&cru HCLK_VDU>; -@@ -1028,94 +1029,94 @@ power-domain@RK3399_PD_VDU { + <&cru HCLK_VDU>, +@@ -1030,94 +1031,94 @@ power-domain@RK3399_PD_VDU { }; /* These power domains are grouped by VD_GPU */ @@ -66069,7 +66069,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 reg = ; clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>; -@@ -1134,6 +1135,33 @@ pmu_io_domains: io-domains { +@@ -1136,6 +1137,33 @@ pmu_io_domains: io-domains { compatible = "rockchip,rk3399-pmu-io-voltage-domain"; status = "disabled"; }; @@ -66103,7 +66103,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 }; spi3: spi@ff350000 { -@@ -1211,7 +1239,7 @@ pwm0: pwm@ff420000 { +@@ -1213,7 +1241,7 @@ pwm0: pwm@ff420000 { compatible = "rockchip,rk3399-pwm", "rockchip,rk3288-pwm"; reg = <0x0 0xff420000 0x0 0x10>; #pwm-cells = <3>; @@ -66112,7 +66112,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 pinctrl-0 = <&pwm0_pin>; clocks = <&pmucru PCLK_RKPWM_PMU>; clock-names = "pwm"; -@@ -1222,7 +1250,7 @@ pwm1: pwm@ff420010 { +@@ -1224,7 +1252,7 @@ pwm1: pwm@ff420010 { compatible = "rockchip,rk3399-pwm", "rockchip,rk3288-pwm"; reg = <0x0 0xff420010 0x0 0x10>; #pwm-cells = <3>; @@ -66121,7 +66121,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 pinctrl-0 = <&pwm1_pin>; clocks = <&pmucru PCLK_RKPWM_PMU>; clock-names = "pwm"; -@@ -1233,7 +1261,7 @@ pwm2: pwm@ff420020 { +@@ -1235,7 +1263,7 @@ pwm2: pwm@ff420020 { compatible = "rockchip,rk3399-pwm", "rockchip,rk3288-pwm"; reg = <0x0 0xff420020 0x0 0x10>; #pwm-cells = <3>; @@ -66130,7 +66130,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 pinctrl-0 = <&pwm2_pin>; clocks = <&pmucru PCLK_RKPWM_PMU>; clock-names = "pwm"; -@@ -1244,13 +1272,32 @@ pwm3: pwm@ff420030 { +@@ -1246,13 +1274,32 @@ pwm3: pwm@ff420030 { compatible = "rockchip,rk3399-pwm", "rockchip,rk3288-pwm"; reg = <0x0 0xff420030 0x0 0x10>; #pwm-cells = <3>; @@ -66164,7 +66164,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 vpu: video-codec@ff650000 { compatible = "rockchip,rk3399-vpu"; reg = <0x0 0xff650000 0x0 0x800>; -@@ -1296,6 +1343,20 @@ vdec_mmu: iommu@ff660480 { +@@ -1298,6 +1345,20 @@ vdec_mmu: iommu@ff660480 { #iommu-cells = <0>; }; @@ -66185,7 +66185,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 iep_mmu: iommu@ff670800 { compatible = "rockchip,iommu"; reg = <0x0 0xff670800 0x0 0x40>; -@@ -1327,6 +1388,10 @@ efuse0: efuse@ff690000 { +@@ -1329,6 +1390,10 @@ efuse0: efuse@ff690000 { clock-names = "pclk_efuse"; /* Data cells */ @@ -66196,7 +66196,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 cpu_id: cpu-id@7 { reg = <0x07 0x10>; }; -@@ -1348,6 +1413,10 @@ logic_leakage: logic-leakage@1b { +@@ -1350,6 +1415,10 @@ logic_leakage: logic-leakage@1b { wafer_info: wafer-info@1c { reg = <0x1c 0x1>; }; @@ -66207,7 +66207,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 }; pmucru: pmu-clock-controller@ff750000 { -@@ -1485,6 +1554,42 @@ pcie_phy: pcie-phy { +@@ -1487,6 +1556,42 @@ pcie_phy: pcie-phy { reset-names = "phy"; status = "disabled"; }; @@ -66250,7 +66250,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 }; tcphy0: phy@ff7c0000 { -@@ -1611,6 +1716,16 @@ i2s2: i2s@ff8a0000 { +@@ -1613,6 +1718,16 @@ i2s2: i2s@ff8a0000 { status = "disabled"; }; @@ -66267,7 +66267,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 vopl: vop@ff8f0000 { compatible = "rockchip,rk3399-vop-lit"; reg = <0x0 0xff8f0000 0x0 0x3efc>; -@@ -1656,6 +1771,17 @@ vopl_out_dp: endpoint@4 { +@@ -1658,6 +1773,17 @@ vopl_out_dp: endpoint@4 { }; }; @@ -66285,7 +66285,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 vopl_mmu: iommu@ff8f3f00 { compatible = "rockchip,iommu"; reg = <0x0 0xff8f3f00 0x0 0x100>; -@@ -1713,6 +1839,17 @@ vopb_out_dp: endpoint@4 { +@@ -1715,6 +1841,17 @@ vopb_out_dp: endpoint@4 { }; }; @@ -66303,7 +66303,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 vopb_mmu: iommu@ff903f00 { compatible = "rockchip,iommu"; reg = <0x0 0xff903f00 0x0 0x100>; -@@ -1915,7 +2052,95 @@ gpu: gpu@ff9a0000 { +@@ -1917,7 +2054,95 @@ gpu: gpu@ff9a0000 { clocks = <&cru ACLK_GPU>; #cooling-cells = <2>; power-domains = <&power RK3399_PD_GPU>; @@ -66399,7 +66399,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 }; pinctrl: pinctrl { -@@ -2179,6 +2404,13 @@ i2c3_xfer: i2c3-xfer { +@@ -2181,6 +2406,13 @@ i2c3_xfer: i2c3-xfer { <4 RK_PC1 1 &pcfg_pull_none>, <4 RK_PC0 1 &pcfg_pull_none>; }; @@ -66413,7 +66413,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 }; i2c4 { -@@ -2342,7 +2574,7 @@ sdmmc_wp: sdmmc-wp { +@@ -2344,7 +2576,7 @@ sdmmc_wp: sdmmc-wp { }; }; @@ -66422,7 +66422,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 ap_pwroff: ap-pwroff { rockchip,pins = <1 RK_PA5 1 &pcfg_pull_none>; }; -@@ -2644,6 +2876,11 @@ pwm3a_pin: pwm3a-pin { +@@ -2646,6 +2878,11 @@ pwm3a_pin: pwm3a-pin { rockchip,pins = <0 RK_PA6 1 &pcfg_pull_none>; }; @@ -66434,7 +66434,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 }; pwm3b { -@@ -2651,6 +2888,11 @@ pwm3b_pin: pwm3b-pin { +@@ -2653,6 +2890,11 @@ pwm3b_pin: pwm3b-pin { rockchip,pins = <1 RK_PB6 1 &pcfg_pull_none>; }; @@ -66446,7 +66446,7 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 }; hdmi { -@@ -2679,4 +2921,27 @@ pcie_clkreqnb_cpm: pci-clkreqnb-cpm { +@@ -2681,4 +2923,27 @@ pcie_clkreqnb_cpm: pci-clkreqnb-cpm { }; }; @@ -66475,8 +66475,8 @@ index c5f3d4f8f4d2..7f4a812f4337 100644 + }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399k-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399k-opp.dtsi -new file mode 100755 -index 000000000000..59f200e0b9cb +new file mode 100644 +index 000000000..59f200e0b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399k-opp.dtsi @@ -0,0 +1,24 @@ @@ -66505,8 +66505,8 @@ index 000000000000..59f200e0b9cb + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts -new file mode 100755 -index 000000000000..f975f47b76d6 +new file mode 100644 +index 000000000..f975f47b7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts @@ -0,0 +1,1293 @@ @@ -67804,8 +67804,8 @@ index 000000000000..f975f47b76d6 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts -new file mode 100755 -index 000000000000..08ac2a477852 +new file mode 100644 +index 000000000..08ac2a477 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts @@ -0,0 +1,1203 @@ @@ -69013,8 +69013,8 @@ index 000000000000..08ac2a477852 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts -new file mode 100755 -index 000000000000..398f962114cf +new file mode 100644 +index 000000000..398f96211 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts @@ -0,0 +1,1061 @@ @@ -70080,8 +70080,8 @@ index 000000000000..398f962114cf + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts -new file mode 100755 -index 000000000000..c3faaa1ba4d3 +new file mode 100644 +index 000000000..c3faaa1ba --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts @@ -0,0 +1,1223 @@ @@ -71309,8 +71309,8 @@ index 000000000000..c3faaa1ba4d3 +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ +/* DON'T PUT ANYTHING BELOW HERE. PUT IT ABOVE PINCTRL */ diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts -new file mode 100755 -index 000000000000..7d118a783353 +new file mode 100644 +index 000000000..7d118a783 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts @@ -0,0 +1,1045 @@ @@ -72360,8 +72360,8 @@ index 000000000000..7d118a783353 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v14-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v14-linux.dts -new file mode 100755 -index 000000000000..4f8546eb80bf +new file mode 100644 +index 000000000..4f8546eb8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v14-linux.dts @@ -0,0 +1,247 @@ @@ -72613,8 +72613,8 @@ index 000000000000..4f8546eb80bf + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts -new file mode 100755 -index 000000000000..96a3fb56cfe5 +new file mode 100644 +index 000000000..96a3fb56c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts @@ -0,0 +1,140 @@ @@ -72759,8 +72759,8 @@ index 000000000000..96a3fb56cfe5 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi -new file mode 100755 -index 000000000000..3f176b3bc94f +new file mode 100644 +index 000000000..3f176b3bc --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi @@ -0,0 +1,826 @@ @@ -73591,8 +73591,8 @@ index 000000000000..3f176b3bc94f + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dts -new file mode 100755 -index 000000000000..1bd285bfc695 +new file mode 100644 +index 000000000..1bd285bfc --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dts @@ -0,0 +1,15 @@ @@ -73612,8 +73612,8 @@ index 000000000000..1bd285bfc695 + compatible = "rockchip,rk3566-box-demo-v10", "rockchip,rk3566"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi -new file mode 100755 -index 000000000000..41ac0af11188 +new file mode 100644 +index 000000000..41ac0af11 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi @@ -0,0 +1,528 @@ @@ -74146,8 +74146,8 @@ index 000000000000..41ac0af11188 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi -new file mode 100755 -index 000000000000..f0feae6730e3 +new file mode 100644 +index 000000000..f0feae673 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi @@ -0,0 +1,436 @@ @@ -74588,8 +74588,8 @@ index 000000000000..f0feae6730e3 + + diff --git a/arch/arm64/boot/dts/rockchip/rk3566-eink.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-eink.dtsi -new file mode 100755 -index 000000000000..09791eb16abf +new file mode 100644 +index 000000000..09791eb16 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-eink.dtsi @@ -0,0 +1,100 @@ @@ -74694,8 +74694,8 @@ index 000000000000..09791eb16abf +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dts -new file mode 100755 -index 000000000000..3f215884a070 +new file mode 100644 +index 000000000..3f215884a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dts @@ -0,0 +1,7 @@ @@ -74707,8 +74707,8 @@ index 000000000000..3f215884a070 +#include "rk3566-evb-mipitest-v10.dtsi" +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi -new file mode 100755 -index 000000000000..227bc4e39d99 +new file mode 100644 +index 000000000..227bc4e39 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi @@ -0,0 +1,507 @@ @@ -75220,8 +75220,8 @@ index 000000000000..227bc4e39d99 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb.dtsi -new file mode 100755 -index 000000000000..d1aa123cd347 +new file mode 100644 +index 000000000..d1aa123cd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb.dtsi @@ -0,0 +1,7 @@ @@ -75233,8 +75233,8 @@ index 000000000000..d1aa123cd347 + +#include "rk3568-evb.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-linux.dts -new file mode 100755 -index 000000000000..a22cc8cec6af +new file mode 100644 +index 000000000..a22cc8cec --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-linux.dts @@ -0,0 +1,13 @@ @@ -75252,8 +75252,8 @@ index 000000000000..a22cc8cec6af + compatible = "rockchip,rk3566-evb1-ddr4-v10-linux", "rockchip,rk3566"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-lvds.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-lvds.dts -new file mode 100755 -index 000000000000..98a384041b8b +new file mode 100644 +index 000000000..98a384041 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-lvds.dts @@ -0,0 +1,99 @@ @@ -75357,8 +75357,8 @@ index 000000000000..98a384041b8b + connect = <&vp1_out_lvds>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dts -new file mode 100755 -index 000000000000..f602ed98d7ce +new file mode 100644 +index 000000000..f602ed98d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dts @@ -0,0 +1,7 @@ @@ -75370,8 +75370,8 @@ index 000000000000..f602ed98d7ce +#include "rk3566-evb1-ddr4-v10.dtsi" +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi -new file mode 100755 -index 000000000000..385933be9f45 +new file mode 100644 +index 000000000..385933be9 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi @@ -0,0 +1,489 @@ @@ -75865,8 +75865,8 @@ index 000000000000..385933be9f45 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts -new file mode 100755 -index 000000000000..83546eef6529 +new file mode 100644 +index 000000000..83546eef6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts @@ -0,0 +1,345 @@ @@ -76216,8 +76216,8 @@ index 000000000000..83546eef6529 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-i2s-mic-array.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-i2s-mic-array.dts -new file mode 100755 -index 000000000000..5ba1318bcee1 +new file mode 100644 +index 000000000..5ba1318bc --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-i2s-mic-array.dts @@ -0,0 +1,102 @@ @@ -76324,8 +76324,8 @@ index 000000000000..5ba1318bcee1 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-linux.dts -new file mode 100755 -index 000000000000..957a99b168bb +new file mode 100644 +index 000000000..957a99b16 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-linux.dts @@ -0,0 +1,8 @@ @@ -76338,8 +76338,8 @@ index 000000000000..957a99b168bb +#include "rk3566-evb2-lp4x-v10.dtsi" +#include "rk3568-linux.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-pdm-mic-array.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-pdm-mic-array.dts -new file mode 100755 -index 000000000000..55e9679194cb +new file mode 100644 +index 000000000..55e967919 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-pdm-mic-array.dts @@ -0,0 +1,111 @@ @@ -76455,8 +76455,8 @@ index 000000000000..55e9679194cb +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts -new file mode 100755 -index 000000000000..3b36bdba12b6 +new file mode 100644 +index 000000000..3b36bdba1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts @@ -0,0 +1,8 @@ @@ -76469,8 +76469,8 @@ index 000000000000..3b36bdba12b6 +#include "rk3566-evb2-lp4x-v10.dtsi" +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi -new file mode 100755 -index 000000000000..4a6bec70f33e +new file mode 100644 +index 000000000..4a6bec70f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi @@ -0,0 +1,599 @@ @@ -77074,8 +77074,8 @@ index 000000000000..4a6bec70f33e + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10-linux.dts -new file mode 100755 -index 000000000000..e292b0dd1846 +new file mode 100644 +index 000000000..e292b0dd1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10-linux.dts @@ -0,0 +1,8 @@ @@ -77088,8 +77088,8 @@ index 000000000000..e292b0dd1846 +#include "rk3566-evb3-ddr3-v10.dtsi" +#include "rk3568-linux.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dts -new file mode 100755 -index 000000000000..09f5260fb375 +new file mode 100644 +index 000000000..09f5260fb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dts @@ -0,0 +1,8 @@ @@ -77102,8 +77102,8 @@ index 000000000000..09f5260fb375 +#include "rk3566-evb3-ddr3-v10.dtsi" +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi -new file mode 100755 -index 000000000000..f936cc186cfb +new file mode 100644 +index 000000000..f936cc186 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi @@ -0,0 +1,499 @@ @@ -77607,8 +77607,8 @@ index 000000000000..f936cc186cfb + gpios = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dts -new file mode 100755 -index 000000000000..600fc3c39586 +new file mode 100644 +index 000000000..600fc3c39 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dts @@ -0,0 +1,7 @@ @@ -77620,8 +77620,8 @@ index 000000000000..600fc3c39586 +#include "rk3566-evb5-lp4x-v10.dtsi" +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi -new file mode 100755 -index 000000000000..83586659530d +new file mode 100644 +index 000000000..835866595 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi @@ -0,0 +1,317 @@ @@ -77943,8 +77943,8 @@ index 000000000000..83586659530d + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts -new file mode 100755 -index 000000000000..3f559fca27f8 +new file mode 100644 +index 000000000..3f559fca2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts @@ -0,0 +1,1115 @@ @@ -79064,8 +79064,8 @@ index 000000000000..3f559fca27f8 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts -new file mode 100755 -index 000000000000..2e6d3160aa16 +new file mode 100644 +index 000000000..2e6d3160a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts @@ -0,0 +1,968 @@ @@ -80038,8 +80038,8 @@ index 000000000000..2e6d3160aa16 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts -new file mode 100755 -index 000000000000..50412b44bb71 +new file mode 100644 +index 000000000..50412b44b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts @@ -0,0 +1,957 @@ @@ -81001,8 +81001,8 @@ index 000000000000..50412b44bb71 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts -new file mode 100755 -index 000000000000..f6f4534aad50 +new file mode 100644 +index 000000000..f6f4534aa --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts @@ -0,0 +1,1307 @@ @@ -82314,8 +82314,8 @@ index 000000000000..f6f4534aad50 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts -new file mode 100755 -index 000000000000..8102da0270fa +new file mode 100644 +index 000000000..8102da027 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts @@ -0,0 +1,1180 @@ @@ -83500,8 +83500,8 @@ index 000000000000..8102da0270fa + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts -new file mode 100755 -index 000000000000..1d4a0484473a +new file mode 100644 +index 000000000..1d4a04844 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts @@ -0,0 +1,1208 @@ @@ -84714,8 +84714,8 @@ index 000000000000..1d4a0484473a + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts -new file mode 100755 -index 000000000000..40022eb6c646 +new file mode 100644 +index 000000000..40022eb6c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts @@ -0,0 +1,1213 @@ @@ -85933,8 +85933,8 @@ index 000000000000..40022eb6c646 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566.dtsi b/arch/arm64/boot/dts/rockchip/rk3566.dtsi -new file mode 100755 -index 000000000000..01b6499b678d +new file mode 100644 +index 000000000..01b6499b6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566.dtsi @@ -0,0 +1,53 @@ @@ -85992,8 +85992,8 @@ index 000000000000..01b6499b678d +/delete-node/ &qos_sata0; +/delete-node/ &sata0; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-android.dtsi -new file mode 100755 -index 000000000000..01cd37c04e1a +new file mode 100644 +index 000000000..01cd37c04 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-android.dtsi @@ -0,0 +1,74 @@ @@ -86072,8 +86072,8 @@ index 000000000000..01cd37c04e1a + support-multi-area; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-dram-default-timing.dtsi -new file mode 100755 -index 000000000000..43f978809c02 +new file mode 100644 +index 000000000..43f978809 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-dram-default-timing.dtsi @@ -0,0 +1,81 @@ @@ -86159,8 +86159,8 @@ index 000000000000..43f978809c02 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi -new file mode 100755 -index 000000000000..2ca4a18314d2 +new file mode 100644 +index 000000000..2ca4a1831 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi @@ -0,0 +1,1807 @@ @@ -87972,8 +87972,8 @@ index 000000000000..2ca4a18314d2 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-spi-nor.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-spi-nor.dts -new file mode 100755 -index 000000000000..259b483af0f4 +new file mode 100644 +index 000000000..259b483af --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-spi-nor.dts @@ -0,0 +1,18 @@ @@ -87996,8 +87996,8 @@ index 000000000000..259b483af0f4 + +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts -new file mode 100755 -index 000000000000..55c255998473 +new file mode 100644 +index 000000000..55c255998 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts @@ -0,0 +1,8 @@ @@ -88010,8 +88010,8 @@ index 000000000000..55c255998473 +#include "rk3568-evb1-ddr4-v10.dtsi" +#include "rk3568-linux.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts -new file mode 100755 -index 000000000000..00c28f39269b +new file mode 100644 +index 000000000..00c28f392 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts @@ -0,0 +1,8 @@ @@ -88024,8 +88024,8 @@ index 000000000000..00c28f39269b +#include "rk3568-evb1-ddr4-v10.dtsi" +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi -new file mode 100755 -index 000000000000..64881d20183f +new file mode 100644 +index 000000000..64881d201 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi @@ -0,0 +1,490 @@ @@ -88520,8 +88520,8 @@ index 000000000000..64881d20183f + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts -new file mode 100755 -index 000000000000..7a5a7feb52a7 +new file mode 100644 +index 000000000..7a5a7feb5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts @@ -0,0 +1,79 @@ @@ -88605,8 +88605,8 @@ index 000000000000..7a5a7feb52a7 + enable-active-high; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dts -new file mode 100755 -index 000000000000..23f5f036c4b2 +new file mode 100644 +index 000000000..23f5f036c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dts @@ -0,0 +1,8 @@ @@ -88619,8 +88619,8 @@ index 000000000000..23f5f036c4b2 +#include "rk3568-evb2-lp4x-v10.dtsi" +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi -new file mode 100755 -index 000000000000..c2d0b697a9bd +new file mode 100644 +index 000000000..c2d0b697a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi @@ -0,0 +1,493 @@ @@ -89118,8 +89118,8 @@ index 000000000000..c2d0b697a9bd + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb4-lp3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb4-lp3-v10.dts -new file mode 100755 -index 000000000000..5884da41f121 +new file mode 100644 +index 000000000..5884da41f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb4-lp3-v10.dts @@ -0,0 +1,12 @@ @@ -89136,8 +89136,8 @@ index 000000000000..5884da41f121 + compatible = "rockchip,rk3568-evb4-lp3-v10", "rockchip,rk3568"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dts -new file mode 100755 -index 000000000000..e9eb333079a2 +new file mode 100644 +index 000000000..e9eb33307 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dts @@ -0,0 +1,8 @@ @@ -89150,8 +89150,8 @@ index 000000000000..e9eb333079a2 +#include "rk3568-evb5-ddr4-v10.dtsi" +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi -new file mode 100755 -index 000000000000..e8a00fc85483 +new file mode 100644 +index 000000000..e8a00fc85 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi @@ -0,0 +1,539 @@ @@ -89695,8 +89695,8 @@ index 000000000000..e8a00fc85483 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-linux.dts -new file mode 100755 -index 000000000000..a11975fc7d53 +new file mode 100644 +index 000000000..a11975fc7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-linux.dts @@ -0,0 +1,8 @@ @@ -89709,8 +89709,8 @@ index 000000000000..a11975fc7d53 +#include "rk3568-evb6-ddr3-v10.dtsi" +#include "rk3568-linux.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts -new file mode 100755 -index 000000000000..0c5ea5eb32ba +new file mode 100644 +index 000000000..0c5ea5eb3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts @@ -0,0 +1,127 @@ @@ -89842,8 +89842,8 @@ index 000000000000..0c5ea5eb32ba + enable-active-high; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts -new file mode 100755 -index 000000000000..597fa0b0b089 +new file mode 100644 +index 000000000..597fa0b0b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts @@ -0,0 +1,96 @@ @@ -89944,8 +89944,8 @@ index 000000000000..597fa0b0b089 + enable-active-high; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk630-bt656-to-cvbs.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk630-bt656-to-cvbs.dts -new file mode 100755 -index 000000000000..24c4debec4f3 +new file mode 100644 +index 000000000..24c4debec --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk630-bt656-to-cvbs.dts @@ -0,0 +1,70 @@ @@ -90020,8 +90020,8 @@ index 000000000000..24c4debec4f3 + enable-active-high; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dts -new file mode 100755 -index 000000000000..6e34fa48abc4 +new file mode 100644 +index 000000000..6e34fa48a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dts @@ -0,0 +1,8 @@ @@ -90034,8 +90034,8 @@ index 000000000000..6e34fa48abc4 +#include "rk3568-evb6-ddr3-v10.dtsi" +#include "rk3568-android.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi -new file mode 100755 -index 000000000000..2f3b5d74e1cf +new file mode 100644 +index 000000000..2f3b5d74e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi @@ -0,0 +1,490 @@ @@ -90530,8 +90530,8 @@ index 000000000000..2f3b5d74e1cf + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb7-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb7-ddr4-v10.dts -new file mode 100755 -index 000000000000..ecb96832c292 +new file mode 100644 +index 000000000..ecb96832c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb7-ddr4-v10.dts @@ -0,0 +1,12 @@ @@ -90548,8 +90548,8 @@ index 000000000000..ecb96832c292 + compatible = "rockchip,rk3568-evb7-ddr4-v10", "rockchip,rk3568"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10-linux.dts -new file mode 100755 -index 000000000000..d832a40d37e9 +new file mode 100644 +index 000000000..d832a40d3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10-linux.dts @@ -0,0 +1,69 @@ @@ -90623,8 +90623,8 @@ index 000000000000..d832a40d37e9 + +/delete-node/ &display_subsystem; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10.dts -new file mode 100755 -index 000000000000..489967f1318f +new file mode 100644 +index 000000000..489967f13 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10.dts @@ -0,0 +1,47 @@ @@ -90676,8 +90676,8 @@ index 000000000000..489967f1318f + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi -new file mode 100755 -index 000000000000..838606964e15 +new file mode 100644 +index 000000000..838606964 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi @@ -0,0 +1,60 @@ @@ -90742,8 +90742,8 @@ index 000000000000..838606964e15 + disable-afbc-win; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux-spi-nand.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux-spi-nand.dts -new file mode 100755 -index 000000000000..50bd024528df +new file mode 100644 +index 000000000..50bd02452 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux-spi-nand.dts @@ -0,0 +1,31 @@ @@ -90779,8 +90779,8 @@ index 000000000000..50bd024528df + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux.dts -new file mode 100755 -index 000000000000..3317db6ee671 +new file mode 100644 +index 000000000..3317db6ee --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux.dts @@ -0,0 +1,27 @@ @@ -90812,8 +90812,8 @@ index 000000000000..3317db6ee671 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dts -new file mode 100755 -index 000000000000..053d20259e93 +new file mode 100644 +index 000000000..053d20259 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dts @@ -0,0 +1,27 @@ @@ -90845,8 +90845,8 @@ index 000000000000..053d20259e93 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi -new file mode 100755 -index 000000000000..40a2096bc58b +new file mode 100644 +index 000000000..40a2096bc --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi @@ -0,0 +1,442 @@ @@ -91293,8 +91293,8 @@ index 000000000000..40a2096bc58b + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts -new file mode 100755 -index 000000000000..de8c1a1e734f +new file mode 100644 +index 000000000..de8c1a1e7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts @@ -0,0 +1,20 @@ @@ -91319,8 +91319,8 @@ index 000000000000..de8c1a1e734f +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts -new file mode 100755 -index 000000000000..b605c3d57d26 +new file mode 100644 +index 000000000..b605c3d57 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts @@ -0,0 +1,16 @@ @@ -91341,8 +91341,8 @@ index 000000000000..b605c3d57d26 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12.dtsi -new file mode 100755 -index 000000000000..6bb50368a73b +new file mode 100644 +index 000000000..6bb50368a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12.dtsi @@ -0,0 +1,39 @@ @@ -91386,8 +91386,8 @@ index 000000000000..6bb50368a73b + regulator-max-microvolt = <1100000>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr-linux.dtsi -new file mode 100755 -index 000000000000..f9908b61cb41 +new file mode 100644 +index 000000000..f9908b61c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-linux.dtsi @@ -0,0 +1,55 @@ @@ -91447,8 +91447,8 @@ index 000000000000..f9908b61cb41 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi -new file mode 100755 -index 000000000000..e1ec294b2c82 +new file mode 100644 +index 000000000..e1ec294b2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi @@ -0,0 +1,510 @@ @@ -91963,8 +91963,8 @@ index 000000000000..e1ec294b2c82 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi -new file mode 100755 -index 000000000000..30d8cedfbdc7 +new file mode 100644 +index 000000000..30d8cedfb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi @@ -0,0 +1,3119 @@ @@ -95088,8 +95088,8 @@ index 000000000000..30d8cedfbdc7 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts -new file mode 100755 -index 000000000000..0ef442123d05 +new file mode 100644 +index 000000000..0ef442123 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts @@ -0,0 +1,14 @@ @@ -95108,8 +95108,8 @@ index 000000000000..0ef442123d05 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-edp.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-edp.dtsi -new file mode 100755 -index 000000000000..459fc3b6d6a0 +new file mode 100644 +index 000000000..459fc3b6d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-edp.dtsi @@ -0,0 +1,141 @@ @@ -95255,8 +95255,8 @@ index 000000000000..459fc3b6d6a0 + enable-active-high; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0-beiqicloud.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0-beiqicloud.dtsi -new file mode 100755 -index 000000000000..25889a206778 +new file mode 100644 +index 000000000..25889a206 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0-beiqicloud.dtsi @@ -0,0 +1,395 @@ @@ -95656,8 +95656,8 @@ index 000000000000..25889a206778 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi -new file mode 100755 -index 000000000000..bd32a4246df3 +new file mode 100644 +index 000000000..bd32a4246 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi @@ -0,0 +1,91 @@ @@ -95753,8 +95753,8 @@ index 000000000000..bd32a4246df3 + enable-active-high; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx1.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx1.dtsi -new file mode 100755 -index 000000000000..70fc8ffc3e41 +new file mode 100644 +index 000000000..70fc8ffc3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx1.dtsi @@ -0,0 +1,97 @@ @@ -95856,8 +95856,8 @@ index 000000000000..70fc8ffc3e41 + enable-active-high; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-android.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-android.dts -new file mode 100755 -index 000000000000..ccfd369d0cd3 +new file mode 100644 +index 000000000..ccfd369d0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-android.dts @@ -0,0 +1,13 @@ @@ -95875,8 +95875,8 @@ index 000000000000..ccfd369d0cd3 +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts -new file mode 100755 -index 000000000000..3107e3a9937a +new file mode 100644 +index 000000000..3107e3a99 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts @@ -0,0 +1,155 @@ @@ -96036,8 +96036,8 @@ index 000000000000..3107e3a9937a +}; + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts -new file mode 100755 -index 000000000000..67e95ebf496b +new file mode 100644 +index 000000000..67e95ebf4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts @@ -0,0 +1,21 @@ @@ -96063,8 +96063,8 @@ index 000000000000..67e95ebf496b + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi -new file mode 100755 -index 000000000000..b6ec191b0107 +new file mode 100644 +index 000000000..b6ec191b0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi @@ -0,0 +1,868 @@ @@ -96937,8 +96937,8 @@ index 000000000000..b6ec191b0107 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10-linux.dts -new file mode 100755 -index 000000000000..8dd494ce3a1f +new file mode 100644 +index 000000000..8dd494ce3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10-linux.dts @@ -0,0 +1,13 @@ @@ -96956,8 +96956,8 @@ index 000000000000..8dd494ce3a1f + compatible = "rockchip,rk3568-toybrick-dev-linux-x0","rockchip,rk3568"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10.dtsi -new file mode 100755 -index 000000000000..7c1919d7d258 +new file mode 100644 +index 000000000..7c1919d7d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10.dtsi @@ -0,0 +1,816 @@ @@ -97778,8 +97778,8 @@ index 000000000000..7c1919d7d258 + status = "disabled"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi -new file mode 100755 -index 000000000000..8be2d36f38c0 +new file mode 100644 +index 000000000..a36ada7ad --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi @@ -0,0 +1,1891 @@ @@ -99675,8 +99675,8 @@ index 000000000000..8be2d36f38c0 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi -new file mode 100755 -index 000000000000..372617fee467 +new file mode 100644 +index 000000000..372617fee --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi @@ -0,0 +1,3449 @@ @@ -103130,8 +103130,8 @@ index 000000000000..372617fee467 + +#include "rk3568-pinctrl.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi b/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi -new file mode 100755 -index 000000000000..fc0145333257 +new file mode 100644 +index 000000000..fc0145333 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi @@ -0,0 +1,382 @@ @@ -103518,8 +103518,8 @@ index 000000000000..fc0145333257 +}; + diff --git a/arch/arm64/include/asm/system_info.h b/arch/arm64/include/asm/system_info.h -new file mode 100755 -index 000000000000..a82fe791b2f6 +new file mode 100644 +index 000000000..a82fe791b --- /dev/null +++ b/arch/arm64/include/asm/system_info.h @@ -0,0 +1,14 @@ @@ -103538,7 +103538,7 @@ index 000000000000..a82fe791b2f6 + +#endif /* __ASM_ARM_SYSTEM_INFO_H */ diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c -index 4c0e72781f31..7221da6cf9ef 100644 +index 4c0e72781..7221da6cf 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -25,6 +25,12 @@ @@ -103555,7 +103555,7 @@ index 4c0e72781f31..7221da6cf9ef 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 3696dbcbfa80..ead9c33ebe91 100644 +index 3696dbcbf..ead9c33eb 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 3696dbcbfa80..ead9c33ebe91 100644 * UpdateCapsule() depends on the system being reset via * ResetSystem(). diff --git a/drivers/Kconfig b/drivers/Kconfig -index 216c52363bd2..7abae88c80d0 100644 +index 216c52363..7abae88c8 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -246,4 +246,9 @@ source "drivers/hck/Kconfig" @@ -103582,7 +103582,7 @@ index 216c52363bd2..7abae88c80d0 100644 +source "drivers/rk_nand/Kconfig" endmenu diff --git a/drivers/Makefile b/drivers/Makefile -index d0ff4fdb0dfb..a1b4ece467b2 100644 +index d0ff4fdb0..a1b4ece46 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -196,3 +196,6 @@ obj-$(CONFIG_MOST) += most/ @@ -103593,10 +103593,10 @@ index d0ff4fdb0dfb..a1b4ece467b2 100644 +obj-$(CONFIG_TZDRIVER) += tzdriver/ +obj-$(CONFIG_RK_NAND) += rk_nand/ diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c -index 9a7ea4c18366..92e61f980460 100644 +index d8fe3b62b..5ee7c86c0 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c -@@ -2400,12 +2400,6 @@ static int nbd_genl_status(struct sk_buff *skb, struct genl_info *info) +@@ -2401,12 +2401,6 @@ static int nbd_genl_status(struct sk_buff *skb, struct genl_info *info) } dev_list = nla_nest_start_noflag(reply, NBD_ATTR_DEVICE_LIST); @@ -103609,8 +103609,37 @@ index 9a7ea4c18366..92e61f980460 100644 if (index == -1) { ret = idr_for_each(&nbd_index_idr, &status_cb, reply); if (ret) { +diff --git a/drivers/char/mem.c b/drivers/char/mem.c +index 7d483c332..9b839d619 100644 +--- a/drivers/char/mem.c ++++ b/drivers/char/mem.c +@@ -1066,6 +1066,12 @@ static int devmem_init_inode(void) + return 0; + } + ++static int do_wait_for_random_bytes(void * data) ++{ ++ wait_for_random_bytes(); ++ return 0; ++} ++ + static int __init chr_dev_init(void) + { + int minor; +@@ -1094,6 +1100,11 @@ static int __init chr_dev_init(void) + NULL, devlist[minor].name); + } + ++ struct task_struct *thread; ++ thread = kthread_run(do_wait_for_random_bytes,NULL,"wait_for_random_bytes_thread"); ++ if (IS_ERR(thread)){ ++ printk("wait_for_random_bytes_thread thread create fail"); ++ } + return tty_init(); + } + diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig -index 4ae49eae4586..b64457abdec3 100644 +index df739665f..1422352d7 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -38,6 +38,13 @@ menuconfig COMMON_CLK @@ -103628,10 +103657,10 @@ index 4ae49eae4586..b64457abdec3 100644 tristate "Clock driver for WM831x/2x PMICs" depends on MFD_WM831X diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c -index 3575afe16a57..d2f0c049b837 100644 +index a0927c7f8..a0c8b190d 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c -@@ -1324,7 +1324,7 @@ static int __init clk_disable_unused(void) +@@ -1417,7 +1417,7 @@ static int __init clk_disable_unused(void) return 0; } @@ -103641,7 +103670,7 @@ index 3575afe16a57..d2f0c049b837 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 47cd6c5de837..f92ce8b4c030 100644 +index 47cd6c5de..f92ce8b4c 100644 --- a/drivers/clk/rockchip/Kconfig +++ b/drivers/clk/rockchip/Kconfig @@ -2,7 +2,7 @@ @@ -103878,7 +103907,7 @@ index 47cd6c5de837..f92ce8b4c030 100644 + endif diff --git a/drivers/clk/rockchip/Makefile b/drivers/clk/rockchip/Makefile -index a99e4d9bbae1..03ddb4baaa5a 100644 +index a99e4d9bb..03ddb4baa 100644 --- a/drivers/clk/rockchip/Makefile +++ b/drivers/clk/rockchip/Makefile @@ -4,19 +4,27 @@ @@ -103921,7 +103950,7 @@ index a99e4d9bbae1..03ddb4baaa5a 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 0dc478a19451..365d4ec3057a 100644 +index 0dc478a19..365d4ec30 100644 --- a/drivers/clk/rockchip/clk-cpu.c +++ b/drivers/clk/rockchip/clk-cpu.c @@ -51,6 +51,7 @@ @@ -104350,8 +104379,8 @@ index 0dc478a19451..365d4ec3057a 100644 + return ERR_PTR(ret); +} diff --git a/drivers/clk/rockchip/clk-dclk-divider.c b/drivers/clk/rockchip/clk-dclk-divider.c -new file mode 100755 -index 000000000000..88cf7ab82a57 +new file mode 100644 +index 000000000..88cf7ab82 --- /dev/null +++ b/drivers/clk/rockchip/clk-dclk-divider.c @@ -0,0 +1,168 @@ @@ -104524,7 +104553,7 @@ index 000000000000..88cf7ab82a57 + return ERR_PTR(-ENOMEM); +} diff --git a/drivers/clk/rockchip/clk-ddr.c b/drivers/clk/rockchip/clk-ddr.c -index 86718c54e56b..46df75f1a29c 100644 +index 86718c54e..46df75f1a 100644 --- a/drivers/clk/rockchip/clk-ddr.c +++ b/drivers/clk/rockchip/clk-ddr.c @@ -8,8 +8,14 @@ @@ -104708,7 +104737,7 @@ index 86718c54e56b..46df75f1a29c 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 ccd5c270c213..b978af08d84f 100644 +index ccd5c270c..b978af08d 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 +104839,7 @@ index ccd5c270c213..b978af08d84f 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 000000000000..78ff9b53c165 +index 000000000..78ff9b53c --- /dev/null +++ b/drivers/clk/rockchip/clk-link.c @@ -0,0 +1,244 @@ @@ -105060,7 +105089,7 @@ index 000000000000..78ff9b53c165 +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-out.c b/drivers/clk/rockchip/clk-out.c new file mode 100644 -index 000000000000..97177a4626b9 +index 000000000..97177a462 --- /dev/null +++ b/drivers/clk/rockchip/clk-out.c @@ -0,0 +1,104 @@ @@ -105169,7 +105198,7 @@ index 000000000000..97177a4626b9 +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 d0bd513ff3c3..89ecdd0f7ad6 100644 +index d0bd513ff..89ecdd0f7 100644 --- a/drivers/clk/rockchip/clk-pll.c +++ b/drivers/clk/rockchip/clk-pll.c @@ -15,6 +15,9 @@ @@ -106651,8 +106680,8 @@ index d0bd513ff3c3..89ecdd0f7ad6 100644 +#endif /* CONFIG_DEBUG_FS */ +#endif /* CONFIG_ROCKCHIP_CLK_BOOST */ diff --git a/drivers/clk/rockchip/clk-pvtm.c b/drivers/clk/rockchip/clk-pvtm.c -new file mode 100755 -index 000000000000..c748589dd922 +new file mode 100644 +index 000000000..c748589dd --- /dev/null +++ b/drivers/clk/rockchip/clk-pvtm.c @@ -0,0 +1,311 @@ @@ -106968,7 +106997,7 @@ index 000000000000..c748589dd922 +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 6fb9c98b7d24..3294ce8eaf32 100644 +index 6fb9c98b7..3294ce8ea 100644 --- a/drivers/clk/rockchip/clk-px30.c +++ b/drivers/clk/rockchip/clk-px30.c @@ -6,8 +6,11 @@ @@ -107489,8 +107518,8 @@ index 6fb9c98b7d24..3294ce8eaf32 100644 +MODULE_LICENSE("GPL"); +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rk1808.c b/drivers/clk/rockchip/clk-rk1808.c -new file mode 100755 -index 000000000000..e177a3dd634c +new file mode 100644 +index 000000000..e177a3dd6 --- /dev/null +++ b/drivers/clk/rockchip/clk-rk1808.c @@ -0,0 +1,1249 @@ @@ -108744,7 +108773,7 @@ index 000000000000..e177a3dd634c +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 6a46f85ad837..ed05eb6c51f3 100644 +index 6a46f85ad..ed05eb6c5 100644 --- a/drivers/clk/rockchip/clk-rk3036.c +++ b/drivers/clk/rockchip/clk-rk3036.c @@ -9,8 +9,10 @@ @@ -109058,7 +109087,7 @@ index 6a46f85ad837..ed05eb6c51f3 100644 +MODULE_DESCRIPTION("Rockchip RK3036 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3128.c b/drivers/clk/rockchip/clk-rk3128.c -index 4b1122e98e16..1b1111e88089 100644 +index ddfe1c402..1b1111e88 100644 --- a/drivers/clk/rockchip/clk-rk3128.c +++ b/drivers/clk/rockchip/clk-rk3128.c @@ -6,8 +6,11 @@ @@ -109415,7 +109444,7 @@ index 4b1122e98e16..1b1111e88089 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 730020fcc7fe..510a70d4dc99 100644 +index 730020fcc..510a70d4d 100644 --- a/drivers/clk/rockchip/clk-rk3188.c +++ b/drivers/clk/rockchip/clk-rk3188.c @@ -5,10 +5,12 @@ @@ -109722,7 +109751,7 @@ index 730020fcc7fe..510a70d4dc99 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 47d6482dda9d..18c94343b6b6 100644 +index 47d6482dd..18c94343b 100644 --- a/drivers/clk/rockchip/clk-rk3228.c +++ b/drivers/clk/rockchip/clk-rk3228.c @@ -7,8 +7,10 @@ @@ -110138,7 +110167,7 @@ index 47d6482dda9d..18c94343b6b6 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 93c794695c46..f9c4678fcd73 100644 +index 93c794695..f9c4678fc 100644 --- a/drivers/clk/rockchip/clk-rk3288.c +++ b/drivers/clk/rockchip/clk-rk3288.c @@ -6,11 +6,14 @@ @@ -110623,7 +110652,7 @@ index 93c794695c46..f9c4678fcd73 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 5bf15f2a44b7..6a8e38f11808 100644 +index 5bf15f2a4..6a8e38f11 100644 --- a/drivers/clk/rockchip/clk-rk3308.c +++ b/drivers/clk/rockchip/clk-rk3308.c @@ -8,6 +8,9 @@ @@ -110920,7 +110949,7 @@ index 5bf15f2a44b7..6a8e38f11808 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 2429b7c2a8b3..8ec63aaae4f7 100644 +index 2429b7c2a..8ec63aaae 100644 --- a/drivers/clk/rockchip/clk-rk3328.c +++ b/drivers/clk/rockchip/clk-rk3328.c @@ -6,8 +6,10 @@ @@ -111379,7 +111408,7 @@ index 2429b7c2a8b3..8ec63aaae4f7 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 55443349439b..c56ea321e904 100644 +index 554433494..c56ea321e 100644 --- a/drivers/clk/rockchip/clk-rk3368.c +++ b/drivers/clk/rockchip/clk-rk3368.c @@ -5,8 +5,10 @@ @@ -111737,7 +111766,7 @@ index 55443349439b..c56ea321e904 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 a9cacbcc1c2a..6c4e0d248272 100644 +index a9cacbcc1..6c4e0d248 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[] = { @@ -112987,7 +113016,7 @@ index a9cacbcc1c2a..6c4e0d248272 100644 +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rk3528.c b/drivers/clk/rockchip/clk-rk3528.c new file mode 100644 -index 000000000000..1b14cd57be0a +index 000000000..1b14cd57b --- /dev/null +++ b/drivers/clk/rockchip/clk-rk3528.c @@ -0,0 +1,1174 @@ @@ -114167,7 +114196,7 @@ index 000000000000..1b14cd57be0a + diff --git a/drivers/clk/rockchip/clk-rk3562.c b/drivers/clk/rockchip/clk-rk3562.c new file mode 100644 -index 000000000000..3c6f78fecfa0 +index 000000000..3c6f78fec --- /dev/null +++ b/drivers/clk/rockchip/clk-rk3562.c @@ -0,0 +1,1134 @@ @@ -115306,8 +115335,8 @@ index 000000000000..3c6f78fecfa0 +MODULE_ALIAS("platform:clk-rk3562"); +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rk3568.c b/drivers/clk/rockchip/clk-rk3568.c -new file mode 100755 -index 000000000000..0f5ed13a4c9f +new file mode 100644 +index 000000000..0f5ed13a4 --- /dev/null +++ b/drivers/clk/rockchip/clk-rk3568.c @@ -0,0 +1,1769 @@ @@ -117082,7 +117111,7 @@ index 000000000000..0f5ed13a4c9f +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rk3588.c b/drivers/clk/rockchip/clk-rk3588.c new file mode 100644 -index 000000000000..adcc1682eab4 +index 000000000..adcc1682e --- /dev/null +++ b/drivers/clk/rockchip/clk-rk3588.c @@ -0,0 +1,2532 @@ @@ -119620,7 +119649,7 @@ index 000000000000..adcc1682eab4 +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rv1106.c b/drivers/clk/rockchip/clk-rv1106.c new file mode 100644 -index 000000000000..0833bf2adb8b +index 000000000..0833bf2ad --- /dev/null +++ b/drivers/clk/rockchip/clk-rv1106.c @@ -0,0 +1,1280 @@ @@ -120905,7 +120934,7 @@ index 000000000000..0833bf2adb8b +MODULE_LICENSE("GPL"); +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rv1108.c b/drivers/clk/rockchip/clk-rv1108.c -index 5947d3192866..0a93b93338ba 100644 +index 5947d3192..0a93b9333 100644 --- a/drivers/clk/rockchip/clk-rv1108.c +++ b/drivers/clk/rockchip/clk-rv1108.c @@ -7,8 +7,10 @@ @@ -121152,8 +121181,8 @@ index 5947d3192866..0a93b93338ba 100644 +MODULE_DESCRIPTION("Rockchip RV1108 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rv1126.c b/drivers/clk/rockchip/clk-rv1126.c -new file mode 100755 -index 000000000000..d3fc9380c359 +new file mode 100644 +index 000000000..d3fc9380c --- /dev/null +++ b/drivers/clk/rockchip/clk-rv1126.c @@ -0,0 +1,1568 @@ @@ -122726,7 +122755,7 @@ index 000000000000..d3fc9380c359 +MODULE_DESCRIPTION("Rockchip RV1126 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c -index b443169dd408..ab6f1d865eea 100644 +index b443169dd..ab6f1d865 100644 --- a/drivers/clk/rockchip/clk.c +++ b/drivers/clk/rockchip/clk.c @@ -24,6 +24,10 @@ @@ -123140,7 +123169,7 @@ index b443169dd408..ab6f1d865eea 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 2271a84124b0..3d2b8d96aefb 100644 +index 2271a8412..3d2b8d96a 100644 --- a/drivers/clk/rockchip/clk.h +++ b/drivers/clk/rockchip/clk.h @@ -37,12 +37,25 @@ struct clk; @@ -123865,8 +123894,8 @@ index 2271a84124b0..3d2b8d96aefb 100644 +#endif #endif diff --git a/drivers/clk/rockchip/regmap/Kconfig b/drivers/clk/rockchip/regmap/Kconfig -new file mode 100755 -index 000000000000..65f691bc4141 +new file mode 100644 +index 000000000..65f691bc4 --- /dev/null +++ b/drivers/clk/rockchip/regmap/Kconfig @@ -0,0 +1,16 @@ @@ -123887,8 +123916,8 @@ index 000000000000..65f691bc4141 + default MFD_RK628 + select COMMON_CLK_ROCKCHIP_REGMAP diff --git a/drivers/clk/rockchip/regmap/Makefile b/drivers/clk/rockchip/regmap/Makefile -new file mode 100755 -index 000000000000..18d075d093d9 +new file mode 100644 +index 000000000..18d075d09 --- /dev/null +++ b/drivers/clk/rockchip/regmap/Makefile @@ -0,0 +1,13 @@ @@ -123906,8 +123935,8 @@ index 000000000000..18d075d093d9 +obj-$(CONFIG_CLK_RK618) += clk-rk618.o +obj-$(CONFIG_CLK_RK628) += clk-rk628.o diff --git a/drivers/clk/rockchip/regmap/clk-regmap-composite.c b/drivers/clk/rockchip/regmap/clk-regmap-composite.c -new file mode 100755 -index 000000000000..43d2b9a45aca +new file mode 100644 +index 000000000..43d2b9a45 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-composite.c @@ -0,0 +1,400 @@ @@ -124312,8 +124341,8 @@ index 000000000000..43d2b9a45aca +} +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_composite); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-divider.c b/drivers/clk/rockchip/regmap/clk-regmap-divider.c -new file mode 100755 -index 000000000000..d57f2c7f8350 +new file mode 100644 +index 000000000..d57f2c7f8 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-divider.c @@ -0,0 +1,117 @@ @@ -124435,8 +124464,8 @@ index 000000000000..d57f2c7f8350 +} +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_divider); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c b/drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c -new file mode 100755 -index 000000000000..1acbc16e7aae +new file mode 100644 +index 000000000..1acbc16e7 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c @@ -0,0 +1,167 @@ @@ -124608,8 +124637,8 @@ index 000000000000..1acbc16e7aae +} +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_fractional_divider); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-gate.c b/drivers/clk/rockchip/regmap/clk-regmap-gate.c -new file mode 100755 -index 000000000000..36549b912fa2 +new file mode 100644 +index 000000000..36549b912 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-gate.c @@ -0,0 +1,82 @@ @@ -124696,8 +124725,8 @@ index 000000000000..36549b912fa2 +} +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_gate); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-mux.c b/drivers/clk/rockchip/regmap/clk-regmap-mux.c -new file mode 100755 -index 000000000000..eb37b5f9503c +new file mode 100644 +index 000000000..eb37b5f95 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-mux.c @@ -0,0 +1,81 @@ @@ -124783,8 +124812,8 @@ index 000000000000..eb37b5f9503c + +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-pll.c b/drivers/clk/rockchip/regmap/clk-regmap-pll.c -new file mode 100755 -index 000000000000..24ad7eda9d94 +new file mode 100644 +index 000000000..24ad7eda9 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-pll.c @@ -0,0 +1,363 @@ @@ -125152,8 +125181,8 @@ index 000000000000..24ad7eda9d94 +} +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_pll); diff --git a/drivers/clk/rockchip/regmap/clk-regmap.h b/drivers/clk/rockchip/regmap/clk-regmap.h -new file mode 100755 -index 000000000000..4626e1982beb +new file mode 100644 +index 000000000..4626e1982 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap.h @@ -0,0 +1,308 @@ @@ -125466,8 +125495,8 @@ index 000000000000..4626e1982beb + +#endif diff --git a/drivers/clk/rockchip/regmap/clk-rk618.c b/drivers/clk/rockchip/regmap/clk-rk618.c -new file mode 100755 -index 000000000000..c780f502b354 +new file mode 100644 +index 000000000..c780f502b --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-rk618.c @@ -0,0 +1,408 @@ @@ -125880,8 +125909,8 @@ index 000000000000..c780f502b354 +MODULE_DESCRIPTION("Rockchip rk618 CRU driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/clk/rockchip/regmap/clk-rk628.c b/drivers/clk/rockchip/regmap/clk-rk628.c -new file mode 100755 -index 000000000000..7f501db660e0 +new file mode 100644 +index 000000000..7f501db66 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-rk628.c @@ -0,0 +1,609 @@ @@ -126495,7 +126524,7 @@ index 000000000000..7f501db660e0 +MODULE_DESCRIPTION("Rockchip RK628 CRU driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig -index a0c6e88bebe0..9d9cb5757913 100644 +index a0c6e88be..9d9cb5757 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -85,7 +85,9 @@ config IXP4XX_TIMER @@ -126510,7 +126539,7 @@ index a0c6e88bebe0..9d9cb5757913 100644 select TIMER_OF select CLKSRC_MMIO diff --git a/drivers/clocksource/timer-rockchip.c b/drivers/clocksource/timer-rockchip.c -index 1f95d0aca08f..2f4e970d7433 100644 +index 1f95d0aca..2f4e970d7 100644 --- a/drivers/clocksource/timer-rockchip.c +++ b/drivers/clocksource/timer-rockchip.c @@ -8,11 +8,13 @@ @@ -126604,7 +126633,7 @@ index 1f95d0aca08f..2f4e970d7433 100644 +MODULE_LICENSE("GPL"); +#endif diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm -index 1f73fa75b1a0..0faef5fc6df3 100644 +index 1f73fa75b..0faef5fc6 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -158,6 +158,16 @@ config ARM_RASPBERRYPI_CPUFREQ @@ -126625,7 +126654,7 @@ index 1f73fa75b1a0..0faef5fc6df3 100644 bool help diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile -index f1b7e3dd6e5d..2e0e827afd21 100644 +index cf2d6bc97..10493212f 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -64,6 +64,7 @@ obj-$(CONFIG_PXA3xx) += pxa3xx-cpufreq.o @@ -126637,7 +126666,7 @@ index f1b7e3dd6e5d..2e0e827afd21 100644 obj-$(CONFIG_ARM_S3C2412_CPUFREQ) += s3c2412-cpufreq.o obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c -index aea285651fba..1840409d520d 100644 +index e1dcdb0ea..7f8d1b71b 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 = { @@ -126692,7 +126721,7 @@ index aea285651fba..1840409d520d 100644 { .compatible = "st,stih407", }, { .compatible = "st,stih410", }, diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c -index e363ae04aac6..f1327e7fe361 100644 +index e363ae04a..f1327e7fe 100644 --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c @@ -23,6 +23,9 @@ @@ -126982,10 +127011,10 @@ index e363ae04aac6..f1327e7fe361 100644 list_del(&priv->node); } diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c -index 58342390966b..ae35ef771900 100644 +index 162de402b..9835d260d 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c -@@ -688,8 +688,12 @@ static ssize_t show_##file_name \ +@@ -690,8 +690,12 @@ static ssize_t show_##file_name \ return sprintf(buf, "%u\n", policy->object); \ } @@ -126999,7 +127028,7 @@ index 58342390966b..ae35ef771900 100644 show_one(cpuinfo_transition_latency, cpuinfo.transition_latency); show_one(scaling_min_freq, min); show_one(scaling_max_freq, max); -@@ -2535,6 +2539,7 @@ static int cpufreq_set_policy(struct cpufreq_policy *policy, +@@ -2552,6 +2556,7 @@ static int cpufreq_set_policy(struct cpufreq_policy *policy, return ret; } @@ -127008,7 +127037,7 @@ index 58342390966b..ae35ef771900 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 50a4d7846580..1f001d281718 100644 +index 50a4d7846..1f001d281 100644 --- a/drivers/cpufreq/cpufreq_userspace.c +++ b/drivers/cpufreq/cpufreq_userspace.c @@ -78,20 +78,18 @@ static int cpufreq_userspace_policy_start(struct cpufreq_policy *policy) @@ -127035,8 +127064,8 @@ index 50a4d7846580..1f001d281718 100644 } diff --git a/drivers/cpufreq/rockchip-cpufreq.c b/drivers/cpufreq/rockchip-cpufreq.c -new file mode 100755 -index 000000000000..27c6d92edfb7 +new file mode 100644 +index 000000000..27c6d92ed --- /dev/null +++ b/drivers/cpufreq/rockchip-cpufreq.c @@ -0,0 +1,1025 @@ @@ -128066,8 +128095,8 @@ index 000000000000..27c6d92edfb7 +MODULE_DESCRIPTION("Rockchip cpufreq driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/cpufreq/rockchip-cpufreq.h b/drivers/cpufreq/rockchip-cpufreq.h -new file mode 100755 -index 000000000000..3b3dbcf73449 +new file mode 100644 +index 000000000..3b3dbcf73 --- /dev/null +++ b/drivers/cpufreq/rockchip-cpufreq.h @@ -0,0 +1,24 @@ @@ -128096,7 +128125,7 @@ index 000000000000..3b3dbcf73449 + +#endif diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c -index 4070e573bf43..557f59ac47a3 100644 +index 4070e573b..557f59ac4 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, @@ -128105,7 +128134,7 @@ index 4070e573bf43..557f59ac47a3 100644 } +EXPORT_SYMBOL_GPL(cpuidle_driver_state_disabled); diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c -index 29acaf48e575..0e51ed25665e 100644 +index 29acaf48e..0e51ed256 100644 --- a/drivers/cpuidle/governor.c +++ b/drivers/cpuidle/governor.c @@ -102,6 +102,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov) @@ -128122,7 +128151,7 @@ index 29acaf48e575..0e51ed25665e 100644 } +EXPORT_SYMBOL_GPL(cpuidle_governor_latency_req); diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig -index 37dc40d1fcfb..ab9c00a1b1c3 100644 +index 37dc40d1f..ab9c00a1b 100644 --- a/drivers/devfreq/Kconfig +++ b/drivers/devfreq/Kconfig @@ -131,15 +131,20 @@ config ARM_TEGRA20_DEVFREQ @@ -128151,7 +128180,7 @@ index 37dc40d1fcfb..ab9c00a1b1c3 100644 from hardware. diff --git a/drivers/devfreq/Makefile b/drivers/devfreq/Makefile -index 3ca1ad0ecb97..abea7adbc7da 100644 +index 3ca1ad0ec..abea7adbc 100644 --- a/drivers/devfreq/Makefile +++ b/drivers/devfreq/Makefile @@ -11,7 +11,8 @@ obj-$(CONFIG_DEVFREQ_GOV_PASSIVE) += governor_passive.o @@ -128165,10 +128194,10 @@ index 3ca1ad0ecb97..abea7adbc7da 100644 obj-$(CONFIG_ARM_TEGRA20_DEVFREQ) += tegra20-devfreq.o diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c -index c6f460550f5e..db0fe99c8d61 100644 +index 93df6cef4..8182968b9 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c -@@ -1761,6 +1761,40 @@ static ssize_t timer_store(struct device *dev, struct device_attribute *attr, +@@ -1803,6 +1803,40 @@ static ssize_t timer_store(struct device *dev, struct device_attribute *attr, } static DEVICE_ATTR_RW(timer); @@ -128209,7 +128238,7 @@ index c6f460550f5e..db0fe99c8d61 100644 static struct attribute *devfreq_attrs[] = { &dev_attr_name.attr, &dev_attr_governor.attr, -@@ -1773,6 +1807,7 @@ static struct attribute *devfreq_attrs[] = { +@@ -1815,6 +1849,7 @@ static struct attribute *devfreq_attrs[] = { &dev_attr_max_freq.attr, &dev_attr_trans_stat.attr, &dev_attr_timer.attr, @@ -128218,7 +128247,7 @@ index c6f460550f5e..db0fe99c8d61 100644 }; ATTRIBUTE_GROUPS(devfreq); diff --git a/drivers/devfreq/event/Kconfig b/drivers/devfreq/event/Kconfig -index 878825372f6f..4526c69c602e 100644 +index 878825372..4526c69c6 100644 --- a/drivers/devfreq/event/Kconfig +++ b/drivers/devfreq/event/Kconfig @@ -39,4 +39,11 @@ config DEVFREQ_EVENT_ROCKCHIP_DFI @@ -128234,7 +128263,7 @@ index 878825372f6f..4526c69c602e 100644 + endif # PM_DEVFREQ_EVENT diff --git a/drivers/devfreq/event/Makefile b/drivers/devfreq/event/Makefile -index 3c847e5d5a35..03d67f06c22e 100644 +index 3c847e5d5..03d67f06c 100644 --- a/drivers/devfreq/event/Makefile +++ b/drivers/devfreq/event/Makefile @@ -4,3 +4,4 @@ @@ -128243,7 +128272,7 @@ index 3c847e5d5a35..03d67f06c22e 100644 obj-$(CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI) += rockchip-dfi.o +obj-$(CONFIG_DEVFREQ_EVENT_ROCKCHIP_NOCP) += rockchip-nocp.o diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c -index 9a88faaf8b27..9fd6a82f79d6 100644 +index 4dafdf231..0d92c3bf1 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -20,23 +20,70 @@ @@ -128907,8 +128936,8 @@ index 9a88faaf8b27..9fd6a82f79d6 100644 platform_set_drvdata(pdev, data); diff --git a/drivers/devfreq/event/rockchip-nocp.c b/drivers/devfreq/event/rockchip-nocp.c -new file mode 100755 -index 000000000000..957b84ee3290 +new file mode 100644 +index 000000000..957b84ee3 --- /dev/null +++ b/drivers/devfreq/event/rockchip-nocp.c @@ -0,0 +1,166 @@ @@ -129079,10 +129108,9 @@ index 000000000000..957b84ee3290 +MODULE_AUTHOR("Finley Xiao "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c -deleted file mode 100644 -index 7e52375d9818..000000000000 +index 7e52375d9..e69de29bb 100644 --- a/drivers/devfreq/rk3399_dmc.c -+++ /dev/null ++++ b/drivers/devfreq/rk3399_dmc.c @@ -1,518 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* @@ -129603,8 +129631,8 @@ index 7e52375d9818..000000000000 -MODULE_AUTHOR("Lin Huang "); -MODULE_DESCRIPTION("RK3399 dmcfreq driver with devfreq framework"); diff --git a/drivers/devfreq/rockchip_bus.c b/drivers/devfreq/rockchip_bus.c -new file mode 100755 -index 000000000000..7032b4815c5a +new file mode 100644 +index 000000000..7032b4815 --- /dev/null +++ b/drivers/devfreq/rockchip_bus.c @@ -0,0 +1,500 @@ @@ -130109,8 +130137,8 @@ index 000000000000..7032b4815c5a +MODULE_AUTHOR("Tony Xie "); +MODULE_DESCRIPTION("rockchip busfreq driver with devfreq framework"); diff --git a/drivers/devfreq/rockchip_dmc.c b/drivers/devfreq/rockchip_dmc.c -new file mode 100755 -index 000000000000..e3d39bd8cea0 +new file mode 100644 +index 000000000..e3d39bd8c --- /dev/null +++ b/drivers/devfreq/rockchip_dmc.c @@ -0,0 +1,3558 @@ @@ -133673,8 +133701,8 @@ index 000000000000..e3d39bd8cea0 +MODULE_DESCRIPTION("rockchip dmcfreq driver with devfreq framework"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/devfreq/rockchip_dmc_common.c b/drivers/devfreq/rockchip_dmc_common.c -new file mode 100755 -index 000000000000..cacc7d02f6fc +new file mode 100644 +index 000000000..cacc7d02f --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_common.c @@ -0,0 +1,168 @@ @@ -133847,8 +133875,8 @@ index 000000000000..cacc7d02f6fc +MODULE_DESCRIPTION("rockchip dmcfreq driver with devfreq framework"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/devfreq/rockchip_dmc_dbg.c b/drivers/devfreq/rockchip_dmc_dbg.c -new file mode 100755 -index 000000000000..80b25e9046d1 +new file mode 100644 +index 000000000..80b25e904 --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_dbg.c @@ -0,0 +1,1061 @@ @@ -134914,8 +134942,8 @@ index 000000000000..80b25e9046d1 +MODULE_AUTHOR("YouMin Chen "); +MODULE_DESCRIPTION("rockchip dmc debug driver with devfreq framework"); diff --git a/drivers/devfreq/rockchip_dmc_timing.h b/drivers/devfreq/rockchip_dmc_timing.h -new file mode 100755 -index 000000000000..8f2e2c02bb90 +new file mode 100644 +index 000000000..8f2e2c02b --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_timing.h @@ -0,0 +1,1307 @@ @@ -136227,7 +136255,7 @@ index 000000000000..8f2e2c02bb90 +#endif /* __ROCKCHIP_DMC_TIMING_H__ */ + diff --git a/drivers/dma-buf/Kconfig b/drivers/dma-buf/Kconfig -index 594b77d8923c..c5de024009a9 100644 +index 594b77d89..c5de02400 100644 --- a/drivers/dma-buf/Kconfig +++ b/drivers/dma-buf/Kconfig @@ -21,7 +21,6 @@ config SW_SYNC @@ -136239,7 +136267,7 @@ index 594b77d8923c..c5de024009a9 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 89c10136b26f..3ef87860877a 100644 +index 89c10136b..3ef878608 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -32,8 +32,6 @@ @@ -136446,7 +136474,7 @@ index 89c10136b26f..3ef87860877a 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 7475e09b0680..d64fc03929be 100644 +index 7475e09b0..d64fc0392 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) @@ -136559,7 +136587,7 @@ index 7475e09b0680..d64fc03929be 100644 dma_fence_end_signalling(tmp); diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c -index bbbfa28b2f6c..873f789df20c 100644 +index bbbfa28b2..873f789df 100644 --- a/drivers/dma-buf/dma-heap.c +++ b/drivers/dma-buf/dma-heap.c @@ -31,6 +31,7 @@ @@ -136886,7 +136914,7 @@ index bbbfa28b2f6c..873f789df20c 100644 } subsys_initcall(dma_heap_init); diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig -index a5eef06c4226..ff52efa83f39 100644 +index a5eef06c4..ff52efa83 100644 --- a/drivers/dma-buf/heaps/Kconfig +++ b/drivers/dma-buf/heaps/Kconfig @@ -1,12 +1,22 @@ @@ -136916,7 +136944,7 @@ index a5eef06c4226..ff52efa83f39 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 6e54cdec3da0..4d4cd94a3a4a 100644 +index 6e54cdec3..4d4cd94a3 100644 --- a/drivers/dma-buf/heaps/Makefile +++ b/drivers/dma-buf/heaps/Makefile @@ -1,4 +1,5 @@ @@ -136927,7 +136955,7 @@ index 6e54cdec3da0..4d4cd94a3a4a 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 e55384dc115b..4931578df815 100644 +index e55384dc1..4931578df 100644 --- a/drivers/dma-buf/heaps/cma_heap.c +++ b/drivers/dma-buf/heaps/cma_heap.c @@ -2,76 +2,304 @@ @@ -137341,8 +137369,8 @@ index e55384dc115b..4931578df815 100644 static const struct dma_heap_ops cma_heap_ops = { diff --git a/drivers/dma-buf/heaps/deferred-free-helper.c b/drivers/dma-buf/heaps/deferred-free-helper.c -new file mode 100755 -index 000000000000..e19c8b68dfeb +new file mode 100644 +index 000000000..e19c8b68d --- /dev/null +++ b/drivers/dma-buf/heaps/deferred-free-helper.c @@ -0,0 +1,138 @@ @@ -137485,8 +137513,8 @@ index 000000000000..e19c8b68dfeb +MODULE_LICENSE("GPL v2"); + diff --git a/drivers/dma-buf/heaps/deferred-free-helper.h b/drivers/dma-buf/heaps/deferred-free-helper.h -new file mode 100755 -index 000000000000..11940328ce3f +new file mode 100644 +index 000000000..11940328c --- /dev/null +++ b/drivers/dma-buf/heaps/deferred-free-helper.h @@ -0,0 +1,55 @@ @@ -137546,10 +137574,9 @@ index 000000000000..11940328ce3f + size_t nr_pages); +#endif diff --git a/drivers/dma-buf/heaps/heap-helpers.c b/drivers/dma-buf/heaps/heap-helpers.c -deleted file mode 100644 -index 35aa65bbf0a7..000000000000 +index 35aa65bbf..e69de29bb 100644 --- a/drivers/dma-buf/heaps/heap-helpers.c -+++ /dev/null ++++ b/drivers/dma-buf/heaps/heap-helpers.c @@ -1,271 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include @@ -137823,10 +137850,9 @@ index 35aa65bbf0a7..000000000000 - .vunmap = dma_heap_dma_buf_vunmap, -}; diff --git a/drivers/dma-buf/heaps/heap-helpers.h b/drivers/dma-buf/heaps/heap-helpers.h -deleted file mode 100644 -index 805d2df88024..000000000000 +index 805d2df88..e69de29bb 100644 --- a/drivers/dma-buf/heaps/heap-helpers.h -+++ /dev/null ++++ b/drivers/dma-buf/heaps/heap-helpers.h @@ -1,53 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* @@ -137882,8 +137908,8 @@ index 805d2df88024..000000000000 -extern const struct dma_buf_ops heap_helper_ops; -#endif /* _HEAP_HELPERS_H */ diff --git a/drivers/dma-buf/heaps/page_pool.c b/drivers/dma-buf/heaps/page_pool.c -new file mode 100755 -index 000000000000..7c34a1ba48bb +new file mode 100644 +index 000000000..7c34a1ba4 --- /dev/null +++ b/drivers/dma-buf/heaps/page_pool.c @@ -0,0 +1,247 @@ @@ -138135,8 +138161,8 @@ index 000000000000..7c34a1ba48bb +module_init(dmabuf_page_pool_init_shrinker); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/heaps/page_pool.h b/drivers/dma-buf/heaps/page_pool.h -new file mode 100755 -index 000000000000..6b083b04f195 +new file mode 100644 +index 000000000..6b083b04f --- /dev/null +++ b/drivers/dma-buf/heaps/page_pool.h @@ -0,0 +1,55 @@ @@ -138196,7 +138222,7 @@ index 000000000000..6b083b04f195 + +#endif /* _DMABUF_PAGE_POOL_H */ diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c -index 0bf688e3c023..15796bc4c033 100644 +index 0bf688e3c..15796bc4c 100644 --- a/drivers/dma-buf/heaps/system_heap.c +++ b/drivers/dma-buf/heaps/system_heap.c @@ -3,7 +3,11 @@ @@ -138837,7 +138863,7 @@ index 0bf688e3c023..15796bc4c033 100644 module_init(system_heap_create); MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/sw_sync.c b/drivers/dma-buf/sw_sync.c -index 348b3a9170fa..3daa6c76b8dd 100644 +index 7f5ed1aa7..e403cde8a 100644 --- a/drivers/dma-buf/sw_sync.c +++ b/drivers/dma-buf/sw_sync.c @@ -7,6 +7,8 @@ @@ -138864,7 +138890,7 @@ index 348b3a9170fa..3daa6c76b8dd 100644 + +MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/sync_debug.c b/drivers/dma-buf/sync_debug.c -index 101394f16930..a2f906741ce0 100644 +index 237bce21d..13125226f 100644 --- a/drivers/dma-buf/sync_debug.c +++ b/drivers/dma-buf/sync_debug.c @@ -8,6 +8,7 @@ @@ -138881,7 +138907,7 @@ index 101394f16930..a2f906741ce0 100644 late_initcall(sync_debugfs_init); +#endif diff --git a/drivers/dma-buf/sync_debug.h b/drivers/dma-buf/sync_debug.h -index 6176e52ba2d7..ee84997da6b4 100644 +index 6176e52ba..ee84997da 100644 --- a/drivers/dma-buf/sync_debug.h +++ b/drivers/dma-buf/sync_debug.h @@ -62,11 +62,18 @@ struct sync_pt { @@ -138904,7 +138930,7 @@ index 6176e52ba2d7..ee84997da6b4 100644 #endif /* _LINUX_SYNC_H */ diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig -index c08968c5ddf8..d9dbfda3c5f2 100644 +index 807c5320d..77efc54c5 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -9,7 +9,7 @@ menu "Firmware Drivers" @@ -138916,7 +138942,7 @@ index c08968c5ddf8..d9dbfda3c5f2 100644 help ARM System Control and Management Interface (SCMI) protocol is a set of operating system-independent software interfaces that are -@@ -251,6 +251,13 @@ config QCOM_SCM_DOWNLOAD_MODE_DEFAULT +@@ -252,6 +252,13 @@ config QCOM_SCM_DOWNLOAD_MODE_DEFAULT Say Y here to enable "download mode" by default. @@ -138931,7 +138957,7 @@ index c08968c5ddf8..d9dbfda3c5f2 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 5e013b6a3692..850970fbacbc 100644 +index 5e013b6a3..850970fba 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o @@ -138943,8 +138969,8 @@ index 5e013b6a3692..850970fbacbc 100644 obj-$(CONFIG_QCOM_SCM) += qcom_scm.o qcom_scm-smc.o qcom_scm-legacy.o obj-$(CONFIG_TI_SCI_PROTOCOL) += ti_sci.o diff --git a/drivers/firmware/rockchip_sip.c b/drivers/firmware/rockchip_sip.c -new file mode 100755 -index 000000000000..e483899d79fe +new file mode 100644 +index 000000000..e483899d7 --- /dev/null +++ b/drivers/firmware/rockchip_sip.c @@ -0,0 +1,715 @@ @@ -139664,7 +139690,7 @@ index 000000000000..e483899d79fe +MODULE_DESCRIPTION("Rockchip SIP Call"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig -index 39f3e1366409..940774657951 100644 +index 9e4059836..8e65e6b51 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -495,6 +495,14 @@ config GPIO_REG @@ -139683,7 +139709,7 @@ index 39f3e1366409..940774657951 100644 tristate "SAMA5D2 PIOBU GPIO support" depends on MFD_SYSCON diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile -index 09dada80ac34..ce6cafb6d3de 100644 +index 09dada80a..ce6cafb6d 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -125,6 +125,7 @@ obj-$(CONFIG_GPIO_RCAR) += gpio-rcar.o @@ -139695,8 +139721,8 @@ index 09dada80ac34..ce6cafb6d3de 100644 obj-$(CONFIG_GPIO_SAMA5D2_PIOBU) += gpio-sama5d2-piobu.o obj-$(CONFIG_GPIO_SCH311X) += gpio-sch311x.o diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c -new file mode 100755 -index 000000000000..1d1e9a64cceb +new file mode 100644 +index 000000000..1d1e9a64c --- /dev/null +++ b/drivers/gpio/gpio-rockchip.c @@ -0,0 +1,746 @@ @@ -140447,7 +140473,7 @@ index 000000000000..1d1e9a64cceb +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 2e63274a4c2c..ab666917b1ab 100644 +index 2e63274a4..ab666917b 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) @@ -140466,7 +140492,7 @@ index 2e63274a4c2c..ab666917b1ab 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 ed26664f1537..8af2bc899aab 100644 +index ed26664f1..8af2bc899 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); @@ -140489,7 +140515,7 @@ index ed26664f1537..8af2bc899aab 100644 extern struct notifier_block gpio_of_notifier; diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile -index 835c88318cec..b66e520ebbdd 100644 +index 835c88318..b66e520eb 100644 --- a/drivers/gpu/Makefile +++ b/drivers/gpu/Makefile @@ -3,6 +3,6 @@ @@ -140501,8 +140527,8 @@ index 835c88318cec..b66e520ebbdd 100644 obj-$(CONFIG_IMX_IPUV3_CORE) += ipu-v3/ obj-$(CONFIG_TRACE_GPU_MEM) += trace/ diff --git a/drivers/gpu/arm/Kbuild b/drivers/gpu/arm/Kbuild -new file mode 100755 -index 000000000000..f747fc889b5b +new file mode 100644 +index 000000000..f747fc889 --- /dev/null +++ b/drivers/gpu/arm/Kbuild @@ -0,0 +1,25 @@ @@ -140532,8 +140558,8 @@ index 000000000000..f747fc889b5b + +obj-$(CONFIG_MALI_BIFROST) += bifrost/ diff --git a/drivers/gpu/arm/Kconfig b/drivers/gpu/arm/Kconfig -new file mode 100755 -index 000000000000..398a8e50a4cd +new file mode 100644 +index 000000000..398a8e50a --- /dev/null +++ b/drivers/gpu/arm/Kconfig @@ -0,0 +1,25 @@ @@ -140563,8 +140589,8 @@ index 000000000000..398a8e50a4cd + +source "drivers/gpu/arm/bifrost/Kconfig" diff --git a/drivers/gpu/arm/bifrost/Kbuild b/drivers/gpu/arm/bifrost/Kbuild -new file mode 100755 -index 000000000000..9cadda188fbc +new file mode 100644 +index 000000000..9cadda188 --- /dev/null +++ b/drivers/gpu/arm/bifrost/Kbuild @@ -0,0 +1,243 @@ @@ -140812,8 +140838,8 @@ index 000000000000..9cadda188fbc + include $(INCLUDE_SUBDIR) +endif diff --git a/drivers/gpu/arm/bifrost/Kconfig b/drivers/gpu/arm/bifrost/Kconfig -new file mode 100755 -index 000000000000..ca3da57cffd3 +new file mode 100644 +index 000000000..ca3da57cf --- /dev/null +++ b/drivers/gpu/arm/bifrost/Kconfig @@ -0,0 +1,389 @@ @@ -141207,8 +141233,8 @@ index 000000000000..ca3da57cffd3 + +endif diff --git a/drivers/gpu/arm/bifrost/Makefile b/drivers/gpu/arm/bifrost/Makefile -new file mode 100755 -index 000000000000..39df298ff01c +new file mode 100644 +index 000000000..39df298ff --- /dev/null +++ b/drivers/gpu/arm/bifrost/Makefile @@ -0,0 +1,279 @@ @@ -141492,8 +141518,8 @@ index 000000000000..39df298ff01c +clean: + $(MAKE) -C $(KDIR) M=$(CURDIR) $(MAKE_ARGS) clean diff --git a/drivers/gpu/arm/bifrost/arbiter/Kbuild b/drivers/gpu/arm/bifrost/arbiter/Kbuild -new file mode 100755 -index 000000000000..2e6b111441ca +new file mode 100644 +index 000000000..2e6b11144 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/Kbuild @@ -0,0 +1,23 @@ @@ -141521,8 +141547,8 @@ index 000000000000..2e6b111441ca + arbiter/mali_kbase_arbif.o \ + arbiter/mali_kbase_arbiter_pm.o diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.c b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.c -new file mode 100755 -index 000000000000..b5d3cd685ba5 +new file mode 100644 +index 000000000..b5d3cd685 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.c @@ -0,0 +1,357 @@ @@ -141884,8 +141910,8 @@ index 000000000000..b5d3cd685ba5 + } +} diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.h b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.h -new file mode 100755 -index 000000000000..701ffd42f6f7 +new file mode 100644 +index 000000000..701ffd42f --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.h @@ -0,0 +1,121 @@ @@ -142011,8 +142037,8 @@ index 000000000000..701ffd42f6f7 + +#endif /* _MALI_KBASE_ARBIF_H_ */ diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_defs.h b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_defs.h -new file mode 100755 -index 000000000000..1c4901b3b4d9 +new file mode 100644 +index 000000000..1c4901b3b --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_defs.h @@ -0,0 +1,76 @@ @@ -142093,8 +142119,8 @@ index 000000000000..1c4901b3b4d9 + +#endif /* _MALI_KBASE_ARBITER_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c -new file mode 100755 -index 000000000000..667552c561fb +new file mode 100644 +index 000000000..667552c56 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c @@ -0,0 +1,1138 @@ @@ -143237,8 +143263,8 @@ index 000000000000..667552c561fb + .gpu_clk_notifier_unregister = arb_gpu_clk_notifier_unregister +}; diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h -new file mode 100755 -index 000000000000..f863f88601e6 +new file mode 100644 +index 000000000..f863f8860 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h @@ -0,0 +1,196 @@ @@ -143439,8 +143465,8 @@ index 000000000000..f863f88601e6 + +#endif /*_MALI_KBASE_ARBITER_PM_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/Kbuild b/drivers/gpu/arm/bifrost/backend/gpu/Kbuild -new file mode 100755 -index 000000000000..efebc8a544d1 +new file mode 100644 +index 000000000..efebc8a54 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/Kbuild @@ -0,0 +1,58 @@ @@ -143503,8 +143529,8 @@ index 000000000000..efebc8a544d1 +bifrost_kbase-$(CONFIG_MALI_BIFROST_NO_MALI) += backend/gpu/mali_kbase_model_error_generator.o + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_backend_config.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_backend_config.h -new file mode 100755 -index 000000000000..6924fdb8a608 +new file mode 100644 +index 000000000..6924fdb8a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_backend_config.h @@ -0,0 +1,30 @@ @@ -143539,8 +143565,8 @@ index 000000000000..6924fdb8a608 +#endif /* _KBASE_BACKEND_CONFIG_H_ */ + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.c -new file mode 100755 -index 000000000000..7c0abbaf860f +new file mode 100644 +index 000000000..7c0abbaf8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.c @@ -0,0 +1,92 @@ @@ -143637,8 +143663,8 @@ index 000000000000..7c0abbaf860f + } +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.h -new file mode 100755 -index 000000000000..758e3be08c16 +new file mode 100644 +index 000000000..758e3be08 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.h @@ -0,0 +1,65 @@ @@ -143708,8 +143734,8 @@ index 000000000000..758e3be08c16 +void kbase_amba_set_invalidate_hint(struct kbase_device *kbdev, bool enable); +#endif /* _KBASE_CACHE_POLICY_BACKEND_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.c -new file mode 100755 -index 000000000000..ddd03ca23de6 +new file mode 100644 +index 000000000..ddd03ca23 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.c @@ -0,0 +1,326 @@ @@ -144040,8 +144066,8 @@ index 000000000000..ddd03ca23de6 +} +KBASE_EXPORT_TEST_API(kbase_clk_rate_trace_manager_notify_all); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.h -new file mode 100755 -index 000000000000..35b3b8d06d96 +new file mode 100644 +index 000000000..35b3b8d06 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.h @@ -0,0 +1,154 @@ @@ -144200,8 +144226,8 @@ index 000000000000..35b3b8d06d96 +#endif /* _KBASE_CLK_RATE_TRACE_MGR_ */ + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_debug_job_fault_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_debug_job_fault_backend.c -new file mode 100755 -index 000000000000..e121b417f80d +new file mode 100644 +index 000000000..e121b417f --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_debug_job_fault_backend.c @@ -0,0 +1,163 @@ @@ -144369,8 +144395,8 @@ index 000000000000..e121b417f80d + +#endif diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c -new file mode 100755 -index 000000000000..02fb00da365c +new file mode 100644 +index 000000000..02fb00da3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c @@ -0,0 +1,895 @@ @@ -145270,8 +145296,8 @@ index 000000000000..02fb00da365c +#endif +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.h -new file mode 100755 -index 000000000000..123c58cb030f +new file mode 100644 +index 000000000..123c58cb0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.h @@ -0,0 +1,63 @@ @@ -145339,8 +145365,8 @@ index 000000000000..123c58cb030f + u64 *core_mask, unsigned long *freqs, unsigned long *volts); +#endif /* _BASE_DEVFREQ_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_gpuprops_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_gpuprops_backend.c -new file mode 100755 -index 000000000000..10e92ec94d3a +new file mode 100644 +index 000000000..10e92ec94 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_gpuprops_backend.c @@ -0,0 +1,200 @@ @@ -145545,8 +145571,8 @@ index 000000000000..10e92ec94d3a + return 0; +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_backend.c -new file mode 100755 -index 000000000000..53578ded58b9 +new file mode 100644 +index 000000000..53578ded5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_backend.c @@ -0,0 +1,481 @@ @@ -146032,8 +146058,8 @@ index 000000000000..53578ded58b9 +} +#endif diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_defs.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_defs.h -new file mode 100755 -index 000000000000..bd2eb8a12047 +new file mode 100644 +index 000000000..bd2eb8a12 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_defs.h @@ -0,0 +1,60 @@ @@ -146098,8 +146124,8 @@ index 000000000000..bd2eb8a12047 + +#endif /* _KBASE_INSTR_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_internal.h -new file mode 100755 -index 000000000000..332cc6944d94 +new file mode 100644 +index 000000000..332cc6944 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_internal.h @@ -0,0 +1,41 @@ @@ -146145,8 +146171,8 @@ index 000000000000..332cc6944d94 + +#endif /* _KBASE_INSTR_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_internal.h -new file mode 100755 -index 000000000000..66cda8c0b647 +new file mode 100644 +index 000000000..66cda8c0b --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_internal.h @@ -0,0 +1,47 @@ @@ -146198,8 +146224,8 @@ index 000000000000..66cda8c0b647 + +#endif /* _KBASE_IRQ_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_linux.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_linux.c -new file mode 100755 -index 000000000000..eb63b2c56c3d +new file mode 100644 +index 000000000..eb63b2c56 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_linux.c @@ -0,0 +1,503 @@ @@ -146707,8 +146733,8 @@ index 000000000000..eb63b2c56c3d + +#endif /* IS_ENABLED(CONFIG_MALI_REAL_HW) */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_as.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_as.c -new file mode 100755 -index 000000000000..258dc6dac6c5 +new file mode 100644 +index 000000000..258dc6dac --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_as.c @@ -0,0 +1,241 @@ @@ -146954,8 +146980,8 @@ index 000000000000..258dc6dac6c5 + return true; +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_defs.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_defs.h -new file mode 100755 -index 000000000000..136aa526d41e +new file mode 100644 +index 000000000..136aa526d --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_defs.h @@ -0,0 +1,135 @@ @@ -147095,8 +147121,8 @@ index 000000000000..136aa526d41e + +#endif /* _KBASE_HWACCESS_GPU_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_hw.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_hw.c -new file mode 100755 -index 000000000000..c7257117e98a +new file mode 100644 +index 000000000..c7257117e --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_hw.c @@ -0,0 +1,1513 @@ @@ -148614,8 +148640,8 @@ index 000000000000..c7257117e98a + return result; +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_internal.h -new file mode 100755 -index 000000000000..bfd55a6e2160 +new file mode 100644 +index 000000000..bfd55a6e2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_internal.h @@ -0,0 +1,148 @@ @@ -148768,8 +148794,8 @@ index 000000000000..bfd55a6e2160 + +#endif /* _KBASE_JM_HWACCESS_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.c -new file mode 100755 -index 000000000000..7db2b353b67a +new file mode 100644 +index 000000000..7db2b353b --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.c @@ -0,0 +1,1873 @@ @@ -150647,8 +150673,8 @@ index 000000000000..7db2b353b67a + } +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.h -new file mode 100755 -index 000000000000..32be0bf44655 +new file mode 100644 +index 000000000..32be0bf44 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.h @@ -0,0 +1,77 @@ @@ -150730,8 +150756,8 @@ index 000000000000..32be0bf44655 + +#endif /* _KBASE_HWACCESS_GPU_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_backend.c -new file mode 100755 -index 000000000000..cbc88f91a400 +new file mode 100644 +index 000000000..cbc88f91a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_backend.c @@ -0,0 +1,377 @@ @@ -151113,8 +151139,8 @@ index 000000000000..cbc88f91a400 + backend->timeouts_updated = true; +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_internal.h -new file mode 100755 -index 000000000000..4f7c371a1f1a +new file mode 100644 +index 000000000..4f7c371a1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_internal.h @@ -0,0 +1,72 @@ @@ -151191,8 +151217,8 @@ index 000000000000..4f7c371a1f1a + +#endif /* _KBASE_JS_BACKEND_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.c -new file mode 100755 -index 000000000000..9ce50758c240 +new file mode 100644 +index 000000000..9ce50758c --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.c @@ -0,0 +1,131 @@ @@ -151328,8 +151354,8 @@ index 000000000000..9ce50758c240 + return 0; +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.h -new file mode 100755 -index 000000000000..07014ad360d8 +new file mode 100644 +index 000000000..07014ad36 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.h @@ -0,0 +1,36 @@ @@ -151371,7 +151397,7 @@ index 000000000000..07014ad360d8 +#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 000000000000..6db7031764ea +index 000000000..6db703176 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.c @@ -0,0 +1,2229 @@ @@ -153606,7 +153632,7 @@ index 000000000000..6db7031764ea +} 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 000000000000..84842291c0f7 +index 000000000..84842291c --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.h @@ -0,0 +1,224 @@ @@ -153836,7 +153862,7 @@ index 000000000000..84842291c0f7 +#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 000000000000..f310cc74cb24 +index 000000000..f310cc74c --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_error_generator.c @@ -0,0 +1,183 @@ @@ -154025,7 +154051,7 @@ index 000000000000..f310cc74cb24 +} 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 000000000000..e90e4df2f494 +index 000000000..e90e4df2f --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.c @@ -0,0 +1,244 @@ @@ -154275,7 +154301,7 @@ index 000000000000..e90e4df2f494 +} 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 000000000000..8f09afe3d1cc +index 000000000..8f09afe3d --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.h @@ -0,0 +1,151 @@ @@ -154431,8 +154457,8 @@ index 000000000000..8f09afe3d1cc + +#endif /* _KBASE_MODEL_LINUX_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c -new file mode 100755 -index 000000000000..bbf629065877 +new file mode 100644 +index 000000000..bbf629065 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c @@ -0,0 +1,73 @@ @@ -154510,8 +154536,8 @@ index 000000000000..bbf629065877 + +KBASE_EXPORT_TEST_API(kbase_pm_always_on_policy_ops); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.h -new file mode 100755 -index 000000000000..98d35dabec88 +new file mode 100644 +index 000000000..98d35dabe --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.h @@ -0,0 +1,78 @@ @@ -154594,8 +154620,8 @@ index 000000000000..98d35dabec88 +#endif /* MALI_KBASE_PM_ALWAYS_ON_H */ + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_backend.c -new file mode 100755 -index 000000000000..5c71fdf154b9 +new file mode 100644 +index 000000000..5c71fdf15 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_backend.c @@ -0,0 +1,1238 @@ @@ -155838,8 +155864,8 @@ index 000000000000..5c71fdf154b9 +} +#endif diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.c -new file mode 100755 -index 000000000000..e2b0a919282e +new file mode 100644 +index 000000000..e2b0a9192 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.c @@ -0,0 +1,150 @@ @@ -155994,8 +156020,8 @@ index 000000000000..e2b0a919282e +#endif +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.h -new file mode 100755 -index 000000000000..90dcaf5b67db +new file mode 100644 +index 000000000..90dcaf5b6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.h @@ -0,0 +1,88 @@ @@ -156088,8 +156114,8 @@ index 000000000000..90dcaf5b67db + +#endif /* _KBASE_PM_CA_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca_devfreq.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca_devfreq.h -new file mode 100755 -index 000000000000..d1e4b5327f8f +new file mode 100644 +index 000000000..d1e4b5327 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca_devfreq.h @@ -0,0 +1,59 @@ @@ -156153,8 +156179,8 @@ index 000000000000..d1e4b5327f8f +#endif /* MALI_KBASE_PM_CA_DEVFREQ_H */ + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.c -new file mode 100755 -index 000000000000..f40b753850df +new file mode 100644 +index 000000000..f40b75385 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.c @@ -0,0 +1,67 @@ @@ -156226,8 +156252,8 @@ index 000000000000..f40b753850df + +KBASE_EXPORT_TEST_API(kbase_pm_coarse_demand_policy_ops); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.h -new file mode 100755 -index 000000000000..a947e8f55643 +new file mode 100644 +index 000000000..a947e8f55 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.h @@ -0,0 +1,64 @@ @@ -156296,8 +156322,8 @@ index 000000000000..a947e8f55643 + +#endif /* MALI_KBASE_PM_COARSE_DEMAND_H */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_defs.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_defs.h -new file mode 100755 -index 000000000000..75d99a30efc0 +new file mode 100644 +index 000000000..75d99a30e --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_defs.h @@ -0,0 +1,649 @@ @@ -156951,8 +156977,8 @@ index 000000000000..75d99a30efc0 + +#endif /* _KBASE_PM_HWACCESS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_driver.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_driver.c -new file mode 100755 -index 000000000000..5be8acd75d0a +new file mode 100644 +index 000000000..5be8acd75 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_driver.c @@ -0,0 +1,3417 @@ @@ -160374,8 +160400,8 @@ index 000000000000..5be8acd75d0a + +KBASE_EXPORT_TEST_API(kbase_pm_release_gpu_cycle_counter); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_internal.h -new file mode 100755 -index 000000000000..e66ce57d3120 +new file mode 100644 +index 000000000..e66ce57d3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_internal.h @@ -0,0 +1,1021 @@ @@ -161401,8 +161427,8 @@ index 000000000000..e66ce57d3120 + +#endif /* _KBASE_BACKEND_PM_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_l2_states.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_l2_states.h -new file mode 100755 -index 000000000000..ef72f6083afd +new file mode 100644 +index 000000000..ef72f6083 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_l2_states.h @@ -0,0 +1,50 @@ @@ -161457,8 +161483,8 @@ index 000000000000..ef72f6083afd +KBASEP_L2_STATE(PEND_OFF) +KBASEP_L2_STATE(RESET_WAIT) diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_mcu_states.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_mcu_states.h -new file mode 100755 -index 000000000000..3b448e397e72 +new file mode 100644 +index 000000000..3b448e397 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_mcu_states.h @@ -0,0 +1,108 @@ @@ -161571,8 +161597,8 @@ index 000000000000..3b448e397e72 +KBASEP_MCU_STATE(CORESIGHT_ENABLE) +#endif /* IS_ENABLED(CONFIG_MALI_CORESIGHT) */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_metrics.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_metrics.c -new file mode 100755 -index 000000000000..865f526f61f2 +new file mode 100644 +index 000000000..865f526f6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_metrics.c @@ -0,0 +1,529 @@ @@ -162106,8 +162132,8 @@ index 000000000000..865f526f61f2 +} +#endif /* !MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.c -new file mode 100755 -index 000000000000..4788f04132c1 +new file mode 100644 +index 000000000..4788f0413 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.c @@ -0,0 +1,426 @@ @@ -162538,8 +162564,8 @@ index 000000000000..4788f04132c1 + +KBASE_EXPORT_TEST_API(kbase_pm_set_policy); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.h -new file mode 100755 -index 000000000000..e8113659b92e +new file mode 100644 +index 000000000..e8113659b --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.h @@ -0,0 +1,105 @@ @@ -162649,8 +162675,8 @@ index 000000000000..e8113659b92e + +#endif /* _KBASE_PM_POLICY_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_shader_states.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_shader_states.h -new file mode 100755 -index 000000000000..8622ef78d363 +new file mode 100644 +index 000000000..8622ef78d --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_shader_states.h @@ -0,0 +1,79 @@ @@ -162734,8 +162760,8 @@ index 000000000000..8622ef78d363 +KBASEP_SHADER_STATE(OFF_CORESTACK_OFF_TIMER_PEND_OFF) +KBASEP_SHADER_STATE(RESET_WAIT) diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_time.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_time.c -new file mode 100755 -index 000000000000..1b33461796e2 +new file mode 100644 +index 000000000..1b3346179 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_time.c @@ -0,0 +1,279 @@ @@ -163019,8 +163045,8 @@ index 000000000000..1b33461796e2 + return 0; +} diff --git a/drivers/gpu/arm/bifrost/build.bp b/drivers/gpu/arm/bifrost/build.bp -new file mode 100755 -index 000000000000..0a61a12d902a +new file mode 100644 +index 000000000..0a61a12d9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/build.bp @@ -0,0 +1,280 @@ @@ -163306,7 +163332,7 @@ index 000000000000..0a61a12d902a +} diff --git a/drivers/gpu/arm/bifrost/context/Kbuild b/drivers/gpu/arm/bifrost/context/Kbuild new file mode 100644 -index 000000000000..156b46a12870 +index 000000000..156b46a12 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/Kbuild @@ -0,0 +1,27 @@ @@ -163338,8 +163364,8 @@ index 000000000000..156b46a12870 + bifrost_kbase-y += context/backend/mali_kbase_context_jm.o +endif diff --git a/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_csf.c b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_csf.c -new file mode 100755 -index 000000000000..07d277b947d2 +new file mode 100644 +index 000000000..07d277b94 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_csf.c @@ -0,0 +1,207 @@ @@ -163551,8 +163577,8 @@ index 000000000000..07d277b947d2 +} +KBASE_EXPORT_SYMBOL(kbase_destroy_context); diff --git a/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_jm.c b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_jm.c -new file mode 100755 -index 000000000000..995a08e36f43 +new file mode 100644 +index 000000000..995a08e36 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_jm.c @@ -0,0 +1,271 @@ @@ -163828,8 +163854,8 @@ index 000000000000..995a08e36f43 +} +KBASE_EXPORT_SYMBOL(kbase_destroy_context); diff --git a/drivers/gpu/arm/bifrost/context/mali_kbase_context.c b/drivers/gpu/arm/bifrost/context/mali_kbase_context.c -new file mode 100755 -index 000000000000..88be6c2e7587 +new file mode 100644 +index 000000000..88be6c2e7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context.c @@ -0,0 +1,392 @@ @@ -164226,8 +164252,8 @@ index 000000000000..88be6c2e7587 + kbase_gpu_vm_unlock(kctx); +} diff --git a/drivers/gpu/arm/bifrost/context/mali_kbase_context.h b/drivers/gpu/arm/bifrost/context/mali_kbase_context.h -new file mode 100755 -index 000000000000..7c90e2708fa3 +new file mode 100644 +index 000000000..7c90e2708 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context.h @@ -0,0 +1,141 @@ @@ -164373,8 +164399,8 @@ index 000000000000..7c90e2708fa3 +} +#endif /* _KBASE_CONTEXT_H_ */ diff --git a/drivers/gpu/arm/bifrost/context/mali_kbase_context_internal.h b/drivers/gpu/arm/bifrost/context/mali_kbase_context_internal.h -new file mode 100755 -index 000000000000..1cde7394c705 +new file mode 100644 +index 000000000..1cde7394c --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context_internal.h @@ -0,0 +1,54 @@ @@ -164433,8 +164459,8 @@ index 000000000000..1cde7394c705 +int kbase_context_add_to_dev_list(struct kbase_context *kctx); +void kbase_context_remove_from_dev_list(struct kbase_context *kctx); diff --git a/drivers/gpu/arm/bifrost/csf/Kbuild b/drivers/gpu/arm/bifrost/csf/Kbuild -new file mode 100755 -index 000000000000..44217dba10c0 +new file mode 100644 +index 000000000..44217dba1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/Kbuild @@ -0,0 +1,58 @@ @@ -164498,7 +164524,7 @@ index 000000000000..44217dba10c0 +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 000000000000..dc30281e4781 +index 000000000..dc30281e4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/ipa_control/Kbuild @@ -0,0 +1,22 @@ @@ -164526,7 +164552,7 @@ index 000000000000..dc30281e4781 + 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 000000000000..c81d0a5a7236 +index 000000000..c81d0a5a7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.c @@ -0,0 +1,1063 @@ @@ -165595,7 +165621,7 @@ index 000000000000..c81d0a5a7236 + 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 000000000000..69ff8973bac4 +index 000000000..69ff8973b --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.h @@ -0,0 +1,271 @@ @@ -165871,8 +165897,8 @@ index 000000000000..69ff8973bac4 + +#endif /* _KBASE_CSF_IPA_CONTROL_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c -new file mode 100755 -index 000000000000..7a939fc3382d +new file mode 100644 +index 000000000..7a939fc33 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c @@ -0,0 +1,3289 @@ @@ -169166,8 +169192,8 @@ index 000000000000..7a939fc3382d + return out_priority; +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.h -new file mode 100755 -index 000000000000..dd947dcbab1c +new file mode 100644 +index 000000000..dd947dcba --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.h @@ -0,0 +1,506 @@ @@ -169679,7 +169705,7 @@ index 000000000000..dd947dcbab1c +#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 000000000000..516a33ff7465 +index 000000000..516a33ff7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.c @@ -0,0 +1,191 @@ @@ -169876,7 +169902,7 @@ index 000000000000..516a33ff7465 +#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 000000000000..435a993955fe +index 000000000..435a99395 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.h @@ -0,0 +1,90 @@ @@ -169971,8 +169997,8 @@ index 000000000000..435a993955fe + u64 buffer, size_t buf_size); +#endif /* _KBASE_CSF_CPU_QUEUE_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c -new file mode 100755 -index 000000000000..e96044ae6239 +new file mode 100644 +index 000000000..e96044ae6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c @@ -0,0 +1,767 @@ @@ -170744,8 +170770,8 @@ index 000000000000..e96044ae6239 + +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.h -new file mode 100755 -index 000000000000..16a548bf8acb +new file mode 100644 +index 000000000..16a548bf8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.h @@ -0,0 +1,54 @@ @@ -170804,8 +170830,8 @@ index 000000000000..16a548bf8acb + +#endif /* _KBASE_CSF_CSG_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_defs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_defs.h -new file mode 100755 -index 000000000000..6fa0e27d657f +new file mode 100644 +index 000000000..6fa0e27d6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_defs.h @@ -0,0 +1,1666 @@ @@ -172477,7 +172503,7 @@ index 000000000000..6fa0e27d657f +#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 000000000000..49e52938499f +index 000000000..49e529384 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.c @@ -0,0 +1,265 @@ @@ -172748,7 +172774,7 @@ index 000000000000..49e52938499f +} 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 000000000000..52122a9ef4d1 +index 000000000..52122a9ef --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.h @@ -0,0 +1,171 @@ @@ -172924,8 +172950,8 @@ index 000000000000..52122a9ef4d1 +bool kbase_csf_event_error_pending(struct kbase_context *kctx); +#endif /* _KBASE_CSF_EVENT_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.c -new file mode 100755 -index 000000000000..42bff1e91584 +new file mode 100644 +index 000000000..42bff1e91 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.c @@ -0,0 +1,3144 @@ @@ -176074,8 +176100,8 @@ index 000000000000..42bff1e91584 + kfree(csf_mapping->phys); +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.h -new file mode 100755 -index 000000000000..714a14001189 +new file mode 100644 +index 000000000..714a14001 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.h @@ -0,0 +1,916 @@ @@ -176996,8 +177022,8 @@ index 000000000000..714a14001189 + +#endif diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.c -new file mode 100755 -index 000000000000..c895b080143a +new file mode 100644 +index 000000000..c895b0801 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.c @@ -0,0 +1,354 @@ @@ -177356,8 +177382,8 @@ index 000000000000..c895b080143a +} +#endif /* CONFIG_SYSFS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.h -new file mode 100755 -index 000000000000..b227cf158925 +new file mode 100644 +index 000000000..b227cf158 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.h @@ -0,0 +1,72 @@ @@ -177435,7 +177461,7 @@ index 000000000000..b227cf158925 +#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 000000000000..f0a10d197eec +index 000000000..f0a10d197 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.c @@ -0,0 +1,807 @@ @@ -178248,7 +178274,7 @@ index 000000000000..f0a10d197eec +} 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 000000000000..0537dca4f37f +index 000000000..0537dca4f --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.h @@ -0,0 +1,65 @@ @@ -178319,7 +178345,7 @@ index 000000000000..0537dca4f37f +#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 000000000000..6e0d3c2f5071 +index 000000000..6e0d3c2f5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.c @@ -0,0 +1,451 @@ @@ -178776,7 +178802,7 @@ index 000000000000..6e0d3c2f5071 +} 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 000000000000..1008320464a9 +index 000000000..100832046 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.h @@ -0,0 +1,77 @@ @@ -178858,8 +178884,8 @@ index 000000000000..1008320464a9 + +#endif /* _KBASE_CSF_FIRMWARE_LOG_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c -new file mode 100755 -index 000000000000..833947facce3 +new file mode 100644 +index 000000000..833947fac --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c @@ -0,0 +1,1661 @@ @@ -180525,8 +180551,8 @@ index 000000000000..833947facce3 + kfree(csf_mapping->phys); +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.c -new file mode 100755 -index 000000000000..7c14b8eb554c +new file mode 100644 +index 000000000..7c14b8eb5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.c @@ -0,0 +1,236 @@ @@ -180767,8 +180793,8 @@ index 000000000000..7c14b8eb554c + mutex_unlock(&ctx_alloc->lock); +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.h -new file mode 100755 -index 000000000000..9aab7abfb649 +new file mode 100644 +index 000000000..9aab7abfb --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.h @@ -0,0 +1,75 @@ @@ -180848,8 +180874,8 @@ index 000000000000..9aab7abfb649 + +#endif /* _KBASE_CSF_HEAP_CONTEXT_ALLOC_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.c -new file mode 100755 -index 000000000000..da8dde239972 +new file mode 100644 +index 000000000..da8dde239 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.c @@ -0,0 +1,2595 @@ @@ -183449,8 +183475,8 @@ index 000000000000..da8dde239972 +} +KBASE_EXPORT_TEST_API(kbase_csf_kcpu_queue_new); diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.h -new file mode 100755 -index 000000000000..5cad8b200c93 +new file mode 100644 +index 000000000..5cad8b200 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.h @@ -0,0 +1,384 @@ @@ -183839,8 +183865,8 @@ index 000000000000..5cad8b200c93 + +#endif /* _KBASE_CSF_KCPU_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.c -new file mode 100755 -index 000000000000..fa877778ca79 +new file mode 100644 +index 000000000..fa877778c --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.c @@ -0,0 +1,193 @@ @@ -184038,8 +184064,8 @@ index 000000000000..fa877778ca79 + +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.h -new file mode 100755 -index 000000000000..08f2fda034a2 +new file mode 100644 +index 000000000..08f2fda03 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.h @@ -0,0 +1,37 @@ @@ -184082,7 +184108,7 @@ index 000000000000..08f2fda034a2 +#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 000000000000..4056a9d933d7 +index 000000000..4056a9d93 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.c @@ -0,0 +1,817 @@ @@ -184905,7 +184931,7 @@ index 000000000000..4056a9d933d7 +} 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 000000000000..61943cbbf083 +index 000000000..61943cbbf --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.h @@ -0,0 +1,139 @@ @@ -185049,8 +185075,8 @@ index 000000000000..61943cbbf083 + +#endif /* _KBASE_CSF_MCU_SHARED_REG_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.c -new file mode 100755 -index 000000000000..bf1835b5be25 +new file mode 100644 +index 000000000..bf1835b5b --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.c @@ -0,0 +1,163 @@ @@ -185218,8 +185244,8 @@ index 000000000000..bf1835b5be25 + kfree(pma); +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.h -new file mode 100755 -index 000000000000..8c1aa919fbb0 +new file mode 100644 +index 000000000..8c1aa919f --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.h @@ -0,0 +1,75 @@ @@ -185300,7 +185326,7 @@ index 000000000000..8c1aa919fbb0 +#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 000000000000..b5bf7bbbc056 +index 000000000..b5bf7bbbc --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_registers.h @@ -0,0 +1,1678 @@ @@ -186983,8 +187009,8 @@ index 000000000000..b5bf7bbbc056 + +#endif /* _KBASE_CSF_REGISTERS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_reset_gpu.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_reset_gpu.c -new file mode 100755 -index 000000000000..fe3b91a4845d +new file mode 100644 +index 000000000..fe3b91a48 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_reset_gpu.c @@ -0,0 +1,637 @@ @@ -187626,8 +187652,8 @@ index 000000000000..fe3b91a4845d + destroy_workqueue(kbdev->csf.reset.workq); +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.c -new file mode 100755 -index 000000000000..edaa6d17e304 +new file mode 100644 +index 000000000..edaa6d17e --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.c @@ -0,0 +1,6889 @@ @@ -194521,8 +194547,8 @@ index 000000000000..edaa6d17e304 + mutex_unlock(&scheduler->lock); +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.h -new file mode 100755 -index 000000000000..d22d7c8b9dce +new file mode 100644 +index 000000000..d22d7c8b9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.h @@ -0,0 +1,681 @@ @@ -195209,7 +195235,7 @@ index 000000000000..d22d7c8b9dce +#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 000000000000..a5e0ab5eaf17 +index 000000000..a5e0ab5ea --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.c @@ -0,0 +1,788 @@ @@ -196003,7 +196029,7 @@ index 000000000000..a5e0ab5eaf17 +#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 000000000000..177e15d85341 +index 000000000..177e15d85 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.h @@ -0,0 +1,37 @@ @@ -196045,8 +196071,8 @@ index 000000000000..177e15d85341 + +#endif /* _KBASE_CSF_SYNC_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.c -new file mode 100755 -index 000000000000..8072a8bd2c32 +new file mode 100644 +index 000000000..8072a8bd2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.c @@ -0,0 +1,1372 @@ @@ -197423,8 +197449,8 @@ index 000000000000..8072a8bd2c32 + return (u32)page_cnt; +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.h -new file mode 100755 -index 000000000000..1b5cb560894f +new file mode 100644 +index 000000000..1b5cb5608 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.h @@ -0,0 +1,142 @@ @@ -197571,8 +197597,8 @@ index 000000000000..1b5cb560894f +u32 kbase_csf_tiler_heap_count_kctx_unused_pages(struct kbase_context *kctx); +#endif diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.c -new file mode 100755 -index 000000000000..96e0f2829854 +new file mode 100644 +index 000000000..96e0f2829 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.c @@ -0,0 +1,162 @@ @@ -197739,8 +197765,8 @@ index 000000000000..96e0f2829854 +#endif /* CONFIG_DEBUG_FS */ + diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.h -new file mode 100755 -index 000000000000..4a1b413eff6d +new file mode 100644 +index 000000000..4a1b413ef --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.h @@ -0,0 +1,44 @@ @@ -197789,8 +197815,8 @@ index 000000000000..4a1b413eff6d + +#endif /* _KBASE_CSF_TILER_HEAP_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_def.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_def.h -new file mode 100755 -index 000000000000..96f2b03d2d31 +new file mode 100644 +index 000000000..96f2b03d2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_def.h @@ -0,0 +1,140 @@ @@ -197936,7 +197962,7 @@ index 000000000000..96f2b03d2d31 +#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 000000000000..6357e3518d87 +index 000000000..6357e3518 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.c @@ -0,0 +1,359 @@ @@ -198301,7 +198327,7 @@ index 000000000000..6357e3518d87 +} 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 000000000000..b6e580e48df6 +index 000000000..b6e580e48 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.h @@ -0,0 +1,80 @@ @@ -198386,8 +198412,8 @@ index 000000000000..b6e580e48df6 + +#endif diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c -new file mode 100755 -index 000000000000..ea6c11624157 +new file mode 100644 +index 000000000..ea6c11624 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c @@ -0,0 +1,177 @@ @@ -198569,8 +198595,8 @@ index 000000000000..ea6c11624157 + return atomic64_read(&kbdev->csf.progress_timeout); +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.h -new file mode 100755 -index 000000000000..b406eaad2d51 +new file mode 100644 +index 000000000..b406eaad2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.h @@ -0,0 +1,66 @@ @@ -198641,8 +198667,8 @@ index 000000000000..b406eaad2d51 + +#endif /* _KBASE_CSF_TIMEOUT_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.c -new file mode 100755 -index 000000000000..6859d65295c4 +new file mode 100644 +index 000000000..6859d6529 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.c @@ -0,0 +1,441 @@ @@ -199088,8 +199114,8 @@ index 000000000000..6859d65295c4 + kbase_csf_tl_reader_flush_buffer(self); +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.h -new file mode 100755 -index 000000000000..12b285fd2929 +new file mode 100644 +index 000000000..12b285fd2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.h @@ -0,0 +1,146 @@ @@ -199240,8 +199266,8 @@ index 000000000000..12b285fd2929 + +#endif /* _KBASE_CSFFW_TL_READER_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c -new file mode 100755 -index 000000000000..46872f937dbf +new file mode 100644 +index 000000000..46872f937 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c @@ -0,0 +1,555 @@ @@ -199801,8 +199827,8 @@ index 000000000000..46872f937dbf + return err; +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.h -new file mode 100755 -index 000000000000..0389d093a904 +new file mode 100644 +index 000000000..0389d093a --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.h @@ -0,0 +1,187 @@ @@ -199995,7 +200021,7 @@ index 000000000000..0389d093a904 +#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 000000000000..185779c16815 +index 000000000..185779c16 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.c @@ -0,0 +1,271 @@ @@ -200272,7 +200298,7 @@ index 000000000000..185779c16815 +#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 000000000000..6e9b1a9d51de +index 000000000..6e9b1a9d5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.h @@ -0,0 +1,137 @@ @@ -200415,7 +200441,7 @@ index 000000000000..6e9b1a9d51de +#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 000000000000..ebf3ddb763a2 +index 000000000..ebf3ddb76 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/Kbuild @@ -0,0 +1,28 @@ @@ -200449,7 +200475,7 @@ index 000000000000..ebf3ddb763a2 +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 000000000000..ff5f947e2da5 +index 000000000..ff5f947e2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_csf.c @@ -0,0 +1,851 @@ @@ -201306,7 +201332,7 @@ index 000000000000..ff5f947e2da5 +} 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 000000000000..06d62dc70182 +index 000000000..06d62dc70 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_internal_csf.h @@ -0,0 +1,182 @@ @@ -201493,8 +201519,8 @@ index 000000000000..06d62dc70182 + +#endif /* _KBASE_DEBUG_CORESIGHT_INTERNAL_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_csf.h -new file mode 100755 -index 000000000000..41b2b00f18c8 +new file mode 100644 +index 000000000..41b2b00f1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_csf.h @@ -0,0 +1,322 @@ @@ -201821,8 +201847,8 @@ index 000000000000..41b2b00f18c8 + + /* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_jm.h -new file mode 100755 -index 000000000000..6ba98b7c4a6c +new file mode 100644 +index 000000000..6ba98b7c4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_jm.h @@ -0,0 +1,206 @@ @@ -202033,8 +202059,8 @@ index 000000000000..6ba98b7c4a6c + +/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.c b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.c -new file mode 100755 -index 000000000000..cff6f8959c35 +new file mode 100644 +index 000000000..cff6f8959 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.c @@ -0,0 +1,199 @@ @@ -202238,8 +202264,8 @@ index 000000000000..cff6f8959c35 + +#endif /* KBASE_KTRACE_TARGET_RBUF */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.h -new file mode 100755 -index 000000000000..e3d03730734d +new file mode 100644 +index 000000000..e3d037307 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.h @@ -0,0 +1,203 @@ @@ -202447,8 +202473,8 @@ index 000000000000..e3d03730734d + +#endif /* _KBASE_DEBUG_KTRACE_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_csf.h -new file mode 100755 -index 000000000000..1896e10ed4ab +new file mode 100644 +index 000000000..1896e10ed --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_csf.h @@ -0,0 +1,116 @@ @@ -202569,8 +202595,8 @@ index 000000000000..1896e10ed4ab +#endif /* KBASE_KTRACE_TARGET_RBUF */ +#endif /* _KBASE_DEBUG_KTRACE_DEFS_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_jm.h -new file mode 100755 -index 000000000000..efa8ab05b1cd +new file mode 100644 +index 000000000..efa8ab05b --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_jm.h @@ -0,0 +1,112 @@ @@ -202687,8 +202713,8 @@ index 000000000000..efa8ab05b1cd + +#endif /* _KBASE_DEBUG_KTRACE_DEFS_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.c b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.c -new file mode 100755 -index 000000000000..6597a15e5000 +new file mode 100644 +index 000000000..6597a15e5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.c @@ -0,0 +1,121 @@ @@ -202814,8 +202840,8 @@ index 000000000000..6597a15e5000 + +#endif /* KBASE_KTRACE_TARGET_RBUF */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.h -new file mode 100755 -index 000000000000..41be7a120dcc +new file mode 100644 +index 000000000..41be7a120 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.h @@ -0,0 +1,309 @@ @@ -203129,8 +203155,8 @@ index 000000000000..41be7a120dcc + +#endif /* _KBASE_DEBUG_KTRACE_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_csf.h -new file mode 100755 -index 000000000000..ddcac906c492 +new file mode 100644 +index 000000000..ddcac906c --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_csf.h @@ -0,0 +1,267 @@ @@ -203402,8 +203428,8 @@ index 000000000000..ddcac906c492 + +#endif /* !defined(_KBASE_DEBUG_LINUX_KTRACE_CSF_H_) || defined(TRACE_HEADER_MULTI_READ) */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_jm.h -new file mode 100755 -index 000000000000..8fa4e2a7c10b +new file mode 100644 +index 000000000..8fa4e2a7c --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_jm.h @@ -0,0 +1,174 @@ @@ -203582,8 +203608,8 @@ index 000000000000..8fa4e2a7c10b + +#endif /* !defined(_KBASE_DEBUG_LINUX_KTRACE_JM_H_) || defined(TRACE_HEADER_MULTI_READ)*/ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.c b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.c -new file mode 100755 -index 000000000000..f521b47120fb +new file mode 100644 +index 000000000..f521b4712 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.c @@ -0,0 +1,361 @@ @@ -203949,8 +203975,8 @@ index 000000000000..f521b47120fb +#endif /* CONFIG_DEBUG_FS */ +#endif /* KBASE_KTRACE_TARGET_RBUF */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.h -new file mode 100755 -index 000000000000..11f0b5c42c89 +new file mode 100644 +index 000000000..11f0b5c42 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.h @@ -0,0 +1,238 @@ @@ -204193,8 +204219,8 @@ index 000000000000..11f0b5c42c89 + +#endif /* _KBASE_DEBUG_KTRACE_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_codes.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_codes.h -new file mode 100755 -index 000000000000..6103c3ee04a8 +new file mode 100644 +index 000000000..6103c3ee0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_codes.h @@ -0,0 +1,181 @@ @@ -204380,8 +204406,8 @@ index 000000000000..6103c3ee04a8 + +/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_defs.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_defs.h -new file mode 100755 -index 000000000000..a0fc9e51d274 +new file mode 100644 +index 000000000..a0fc9e51d --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_defs.h @@ -0,0 +1,187 @@ @@ -204573,8 +204599,8 @@ index 000000000000..a0fc9e51d274 +#endif /* KBASE_KTRACE_TARGET_RBUF */ +#endif /* _KBASE_DEBUG_KTRACE_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_internal.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_internal.h -new file mode 100755 -index 000000000000..ba93f29fe5e6 +new file mode 100644 +index 000000000..ba93f29fe --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_internal.h @@ -0,0 +1,90 @@ @@ -204669,8 +204695,8 @@ index 000000000000..ba93f29fe5e6 + +#endif /* _KBASE_DEBUG_KTRACE_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_linux_ktrace.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_linux_ktrace.h -new file mode 100755 -index 000000000000..6d96647161b4 +new file mode 100644 +index 000000000..6d9664716 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_linux_ktrace.h @@ -0,0 +1,123 @@ @@ -204799,7 +204825,7 @@ index 000000000000..6d96647161b4 +#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 000000000000..723ffd215696 +index 000000000..723ffd215 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/Kbuild @@ -0,0 +1,33 @@ @@ -204837,8 +204863,8 @@ index 000000000000..723ffd215696 + device/backend/mali_kbase_device_hw_jm.o +endif diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_csf.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_csf.c -new file mode 100755 -index 000000000000..f7054f5b0090 +new file mode 100644 +index 000000000..f7054f5b0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_csf.c @@ -0,0 +1,525 @@ @@ -205368,8 +205394,8 @@ index 000000000000..f7054f5b0090 +} +KBASE_EXPORT_TEST_API(kbase_device_firmware_init_once); diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_csf.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_csf.c -new file mode 100755 -index 000000000000..2abd62aaa8b1 +new file mode 100644 +index 000000000..2abd62aaa --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_csf.c @@ -0,0 +1,252 @@ @@ -205626,8 +205652,8 @@ index 000000000000..2abd62aaa8b1 +KBASE_EXPORT_TEST_API(kbase_reg_read); +#endif /* !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_jm.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_jm.c -new file mode 100755 -index 000000000000..38223af213d1 +new file mode 100644 +index 000000000..38223af21 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_jm.c @@ -0,0 +1,143 @@ @@ -205775,8 +205801,8 @@ index 000000000000..38223af213d1 +KBASE_EXPORT_TEST_API(kbase_reg_read); +#endif /* IS_ENABLED(CONFIG_MALI_REAL_HW) */ diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_jm.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_jm.c -new file mode 100755 -index 000000000000..2d3672383630 +new file mode 100644 +index 000000000..2d3672383 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_jm.c @@ -0,0 +1,344 @@ @@ -206125,8 +206151,8 @@ index 000000000000..2d3672383630 + return ret; +} diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device.c b/drivers/gpu/arm/bifrost/device/mali_kbase_device.c -new file mode 100755 -index 000000000000..b2b0cfd6cc97 +new file mode 100644 +index 000000000..b2b0cfd6c --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device.c @@ -0,0 +1,611 @@ @@ -206742,8 +206768,8 @@ index 000000000000..b2b0cfd6cc97 + kbasep_platform_device_late_term(kbdev); +} diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device.h b/drivers/gpu/arm/bifrost/device/mali_kbase_device.h -new file mode 100755 -index 000000000000..f025011009d5 +new file mode 100644 +index 000000000..f02501100 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device.h @@ -0,0 +1,227 @@ @@ -206975,8 +207001,8 @@ index 000000000000..f025011009d5 + */ +void kbase_gpu_interrupt(struct kbase_device *kbdev, u32 val); diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device_hw.c b/drivers/gpu/arm/bifrost/device/mali_kbase_device_hw.c -new file mode 100755 -index 000000000000..d55495045892 +new file mode 100644 +index 000000000..d55495045 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device_hw.c @@ -0,0 +1,291 @@ @@ -207272,8 +207298,8 @@ index 000000000000..d55495045892 + return (remaining ? 0 : -ETIMEDOUT); +} diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device_internal.h b/drivers/gpu/arm/bifrost/device/mali_kbase_device_internal.h -new file mode 100755 -index 000000000000..6f77592dfff2 +new file mode 100644 +index 000000000..6f77592df --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device_internal.h @@ -0,0 +1,101 @@ @@ -207380,7 +207406,7 @@ index 000000000000..6f77592dfff2 +#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 000000000000..f3a48caf6b2c +index 000000000..f3a48caf6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/Kbuild @@ -0,0 +1,27 @@ @@ -207412,8 +207438,8 @@ index 000000000000..f3a48caf6b2c + bifrost_kbase-y += gpu/backend/mali_kbase_gpu_fault_jm.o +endif diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_csf.c b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_csf.c -new file mode 100755 -index 000000000000..60ba9beab91c +new file mode 100644 +index 000000000..60ba9beab --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_csf.c @@ -0,0 +1,179 @@ @@ -207597,8 +207623,8 @@ index 000000000000..60ba9beab91c + return e; +} diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_jm.c b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_jm.c -new file mode 100755 -index 000000000000..7f3743ca6432 +new file mode 100644 +index 000000000..7f3743ca6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_jm.c @@ -0,0 +1,176 @@ @@ -207779,8 +207805,8 @@ index 000000000000..7f3743ca6432 + return e; +} diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h -new file mode 100755 -index 000000000000..e7457ddb5534 +new file mode 100644 +index 000000000..e7457ddb5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h @@ -0,0 +1,381 @@ @@ -208166,8 +208192,8 @@ index 000000000000..e7457ddb5534 + +#endif /* _KBASE_GPU_REGMAP_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h -new file mode 100755 -index 000000000000..f86f493c7f7e +new file mode 100644 +index 000000000..f86f493c7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h @@ -0,0 +1,276 @@ @@ -208448,8 +208474,8 @@ index 000000000000..f86f493c7f7e + +#endif /* _KBASE_GPU_REGMAP_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.c b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.c -new file mode 100755 -index 000000000000..8a84ef54100a +new file mode 100644 +index 000000000..8a84ef541 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.c @@ -0,0 +1,41 @@ @@ -208495,8 +208521,8 @@ index 000000000000..8a84ef54100a + } +} diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_fault.h b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_fault.h -new file mode 100755 -index 000000000000..6a937a5ed16d +new file mode 100644 +index 000000000..6a937a5ed --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_fault.h @@ -0,0 +1,48 @@ @@ -208549,8 +208575,8 @@ index 000000000000..6a937a5ed16d + +#endif /* _KBASE_GPU_FAULT_H_ */ diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h -new file mode 100755 -index 000000000000..6cef2bdd11e0 +new file mode 100644 +index 000000000..6cef2bdd1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h @@ -0,0 +1,637 @@ @@ -209193,7 +209219,7 @@ index 000000000000..6cef2bdd11e0 +#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 000000000000..c1a381b24593 +index 000000000..c1a381b24 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/Kbuild @@ -0,0 +1,37 @@ @@ -209236,7 +209262,7 @@ index 000000000000..c1a381b24593 +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 000000000000..6cfa6f5ee6f4 +index 000000000..6cfa6f5ee --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend.h @@ -0,0 +1,225 @@ @@ -209467,7 +209493,7 @@ index 000000000000..6cfa6f5ee6f4 +#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 000000000000..4a429a6cd1ae +index 000000000..4a429a6cd --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.c @@ -0,0 +1,1896 @@ @@ -211369,7 +211395,7 @@ index 000000000000..4a429a6cd1ae +} 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 000000000000..9c5a5c996ebd +index 000000000..9c5a5c996 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.h @@ -0,0 +1,153 @@ @@ -211528,7 +211554,7 @@ index 000000000000..9c5a5c996ebd +#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 000000000000..382a3adaa127 +index 000000000..382a3adaa --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if.h @@ -0,0 +1,302 @@ @@ -211836,7 +211862,7 @@ index 000000000000..382a3adaa127 +#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 000000000000..b11f3a4e50e2 +index 000000000..b11f3a4e5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.c @@ -0,0 +1,787 @@ @@ -212629,7 +212655,7 @@ index 000000000000..b11f3a4e50e2 +} 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 000000000000..71d1506694f4 +index 000000000..71d150669 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.h @@ -0,0 +1,49 @@ @@ -212684,7 +212710,7 @@ index 000000000000..71d1506694f4 +#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 000000000000..669701c29152 +index 000000000..669701c29 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.c @@ -0,0 +1,860 @@ @@ -213550,7 +213576,7 @@ index 000000000000..669701c29152 +} 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 000000000000..4a6293c25473 +index 000000000..4a6293c25 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.h @@ -0,0 +1,58 @@ @@ -213614,7 +213640,7 @@ index 000000000000..4a6293c25473 +#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 000000000000..564700b2d978 +index 000000000..564700b2d --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.c @@ -0,0 +1,829 @@ @@ -214449,7 +214475,7 @@ index 000000000000..564700b2d978 +} 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 000000000000..02a7952cced2 +index 000000000..02a7952cc --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.h @@ -0,0 +1,65 @@ @@ -214520,7 +214546,7 @@ index 000000000000..02a7952cced2 +#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 000000000000..34deb5d9e3fc +index 000000000..34deb5d9e --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt.c @@ -0,0 +1,775 @@ @@ -215301,7 +215327,7 @@ index 000000000000..34deb5d9e3fc +} 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 000000000000..069e02068902 +index 000000000..069e02068 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_accumulator.h @@ -0,0 +1,139 @@ @@ -215446,7 +215472,7 @@ index 000000000000..069e02068902 +#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 000000000000..89732a908789 +index 000000000..89732a908 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_context.h @@ -0,0 +1,148 @@ @@ -215600,7 +215626,7 @@ index 000000000000..89732a908789 +#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 000000000000..74916dab060d +index 000000000..74916dab0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.c @@ -0,0 +1,738 @@ @@ -216344,7 +216370,7 @@ index 000000000000..74916dab060d +} 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 000000000000..a49c31e52f98 +index 000000000..a49c31e52 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.h @@ -0,0 +1,407 @@ @@ -216757,7 +216783,7 @@ index 000000000000..a49c31e52f98 +#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 000000000000..0cf2f94cfb87 +index 000000000..0cf2f94cf --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.c @@ -0,0 +1,298 @@ @@ -217061,7 +217087,7 @@ index 000000000000..0cf2f94cfb87 +} 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 000000000000..afd236d71a7c +index 000000000..afd236d71 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.h @@ -0,0 +1,330 @@ @@ -217397,7 +217423,7 @@ index 000000000000..afd236d71a7c +#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 000000000000..763eb315d9a2 +index 000000000..763eb315d --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.c @@ -0,0 +1,511 @@ @@ -217914,7 +217940,7 @@ index 000000000000..763eb315d9a2 +} 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 000000000000..5c5ada401768 +index 000000000..5c5ada401 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.h @@ -0,0 +1,1231 @@ @@ -219151,7 +219177,7 @@ index 000000000000..5c5ada401768 +#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 000000000000..d618764d3b32 +index 000000000..d618764d3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.c @@ -0,0 +1,744 @@ @@ -219901,7 +219927,7 @@ index 000000000000..d618764d3b32 +} 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 000000000000..485ba74960f6 +index 000000000..485ba7496 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.h @@ -0,0 +1,151 @@ @@ -220058,7 +220084,7 @@ index 000000000000..485ba74960f6 +#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 000000000000..501c0087b7e6 +index 000000000..501c0087b --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if.h @@ -0,0 +1,89 @@ @@ -220153,7 +220179,7 @@ index 000000000000..501c0087b7e6 +#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 000000000000..4caa832cd587 +index 000000000..4caa832cd --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.c @@ -0,0 +1,157 @@ @@ -220316,7 +220342,7 @@ index 000000000000..4caa832cd587 +} 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 000000000000..a545ad3e39e3 +index 000000000..a545ad3e3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.h @@ -0,0 +1,48 @@ @@ -220369,8 +220395,8 @@ index 000000000000..a545ad3e39e3 + +#endif /* _KBASE_HWCNT_WATCHDOG_IF_TIMER_H_ */ diff --git a/drivers/gpu/arm/bifrost/ipa/Kbuild b/drivers/gpu/arm/bifrost/ipa/Kbuild -new file mode 100755 -index 000000000000..0be664c47b54 +new file mode 100644 +index 000000000..0be664c47 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/Kbuild @@ -0,0 +1,35 @@ @@ -220411,7 +220437,7 @@ index 000000000000..0be664c47b54 +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 000000000000..60b061ef623d +index 000000000..60b061ef6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.c @@ -0,0 +1,457 @@ @@ -220874,7 +220900,7 @@ index 000000000000..60b061ef623d +} 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 000000000000..37d2efc59fcc +index 000000000..37d2efc59 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.h @@ -0,0 +1,159 @@ @@ -221039,7 +221065,7 @@ index 000000000000..37d2efc59fcc +#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 000000000000..34515a934b33 +index 000000000..34515a934 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.c @@ -0,0 +1,355 @@ @@ -221400,7 +221426,7 @@ index 000000000000..34515a934b33 +} 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 000000000000..6089610847b4 +index 000000000..608961084 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.h @@ -0,0 +1,234 @@ @@ -221640,7 +221666,7 @@ index 000000000000..6089610847b4 +#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 000000000000..21b4e52884c5 +index 000000000..21b4e5288 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_csf.c @@ -0,0 +1,280 @@ @@ -221926,7 +221952,7 @@ index 000000000000..21b4e52884c5 +} 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 000000000000..2092db042dec +index 000000000..2092db042 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_jm.c @@ -0,0 +1,561 @@ @@ -222492,8 +222518,8 @@ index 000000000000..2092db042dec + } +} diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c -new file mode 100755 -index 000000000000..b2e6bc459f22 +new file mode 100644 +index 000000000..b2e6bc459 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c @@ -0,0 +1,778 @@ @@ -223276,8 +223302,8 @@ index 000000000000..b2e6bc459f22 + mutex_unlock(&kbdev->ipa.lock); +} diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h -new file mode 100755 -index 000000000000..c875ffb4990e +new file mode 100644 +index 000000000..c875ffb49 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h @@ -0,0 +1,304 @@ @@ -223586,8 +223612,8 @@ index 000000000000..c875ffb4990e + +#endif diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c -new file mode 100755 -index 000000000000..a0963bbb2068 +new file mode 100644 +index 000000000..a0963bbb2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c @@ -0,0 +1,324 @@ @@ -223916,8 +223942,8 @@ index 000000000000..a0963bbb2068 + mutex_unlock(&kbdev->ipa.lock); +} diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h -new file mode 100755 -index 000000000000..f690367757c9 +new file mode 100644 +index 000000000..f69036775 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h @@ -0,0 +1,70 @@ @@ -223992,8 +224018,8 @@ index 000000000000..f690367757c9 + +#endif /* _KBASE_IPA_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c -new file mode 100755 -index 000000000000..8557fe8723cf +new file mode 100644 +index 000000000..8557fe872 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c @@ -0,0 +1,370 @@ @@ -224368,8 +224394,8 @@ index 000000000000..8557fe8723cf +}; +KBASE_EXPORT_TEST_API(kbase_simple_ipa_model_ops); diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h -new file mode 100755 -index 000000000000..dd17786a51d9 +new file mode 100644 +index 000000000..dd17786a5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h @@ -0,0 +1,44 @@ @@ -224418,8 +224444,8 @@ index 000000000000..dd17786a51d9 + +#endif /* _KBASE_IPA_SIMPLE_H_ */ diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h -new file mode 100755 -index 000000000000..debc3ad25fd7 +new file mode 100644 +index 000000000..debc3ad25 --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h @@ -0,0 +1,878 @@ @@ -225302,8 +225328,8 @@ index 000000000000..debc3ad25fd7 + +#endif /* _KBASE_JM_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h -new file mode 100755 -index 000000000000..53819caaf616 +new file mode 100644 +index 000000000..53819caaf --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h @@ -0,0 +1,1044 @@ @@ -226352,8 +226378,8 @@ index 000000000000..53819caaf616 + +#endif /* _KBASE_JM_JS_H_ */ diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h -new file mode 100755 -index 000000000000..465cf7ec05bd +new file mode 100644 +index 000000000..465cf7ec0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h @@ -0,0 +1,447 @@ @@ -226805,8 +226831,8 @@ index 000000000000..465cf7ec05bd + +#endif /* _KBASE_JS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h b/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h -new file mode 100755 -index 000000000000..11aedef80109 +new file mode 100644 +index 000000000..11aedef80 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h @@ -0,0 +1,185 @@ @@ -226996,8 +227022,8 @@ index 000000000000..11aedef80109 + +#endif /* _BASE_HWCONFIG_FEATURES_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h b/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h -new file mode 100755 -index 000000000000..0fbdec0bb0b6 +new file mode 100644 +index 000000000..0fbdec0bb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h @@ -0,0 +1,835 @@ @@ -227837,8 +227863,8 @@ index 000000000000..0fbdec0bb0b6 + +#endif /* _BASE_HWCONFIG_ISSUES_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase.h b/drivers/gpu/arm/bifrost/mali_kbase.h -new file mode 100755 -index 000000000000..542e8f63fb5b +new file mode 100644 +index 000000000..542e8f63f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase.h @@ -0,0 +1,752 @@ @@ -228595,8 +228621,8 @@ index 000000000000..542e8f63fb5b + +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c -new file mode 100755 -index 000000000000..10dbeee02e40 +new file mode 100644 +index 000000000..10dbeee02 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c @@ -0,0 +1,109 @@ @@ -228710,8 +228736,8 @@ index 000000000000..10dbeee02e40 +#endif /* CONFIG_DEBUG_FS */ +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h -new file mode 100755 -index 000000000000..59bbcf6f4ff7 +new file mode 100644 +index 000000000..59bbcf6f4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h @@ -0,0 +1,48 @@ @@ -228764,8 +228790,8 @@ index 000000000000..59bbcf6f4ff7 + +#endif /*_KBASE_AS_FAULT_DEBUG_FS_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_bits.h b/drivers/gpu/arm/bifrost/mali_kbase_bits.h -new file mode 100755 -index 000000000000..a085fd86c488 +new file mode 100644 +index 000000000..a085fd86c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_bits.h @@ -0,0 +1,31 @@ @@ -228801,8 +228827,8 @@ index 000000000000..a085fd86c488 + +#endif /* _KBASE_BITS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c -new file mode 100755 -index 000000000000..af51ed8c2dec +new file mode 100644 +index 000000000..af51ed8c2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c @@ -0,0 +1,65 @@ @@ -228872,8 +228898,8 @@ index 000000000000..af51ed8c2dec +} +KBASE_EXPORT_TEST_API(kbase_sync_single_for_cpu); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h -new file mode 100755 -index 000000000000..598d245383fd +new file mode 100644 +index 000000000..598d24538 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h @@ -0,0 +1,47 @@ @@ -228925,8 +228951,8 @@ index 000000000000..598d245383fd + +#endif /* _KBASE_CACHE_POLICY_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_caps.h b/drivers/gpu/arm/bifrost/mali_kbase_caps.h -new file mode 100755 -index 000000000000..6aa31f3d3a79 +new file mode 100644 +index 000000000..6aa31f3d3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_caps.h @@ -0,0 +1,70 @@ @@ -229001,8 +229027,8 @@ index 000000000000..6aa31f3d3a79 + +#endif /* __KBASE_CAPS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c -new file mode 100755 -index 000000000000..6a1e7e4c5ff5 +new file mode 100644 +index 000000000..6a1e7e4c5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c @@ -0,0 +1,100 @@ @@ -229107,8 +229133,8 @@ index 000000000000..6a1e7e4c5ff5 + spin_unlock_irqrestore(&self->access, flags); +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h -new file mode 100755 -index 000000000000..f7fcf7780b35 +new file mode 100644 +index 000000000..f7fcf7780 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h @@ -0,0 +1,95 @@ @@ -229208,8 +229234,8 @@ index 000000000000..f7fcf7780b35 + +#endif /* _KBASE_CCSWE_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_config.c b/drivers/gpu/arm/bifrost/mali_kbase_config.c -new file mode 100755 -index 000000000000..37dbca129f86 +new file mode 100644 +index 000000000..37dbca129 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_config.c @@ -0,0 +1,104 @@ @@ -229318,8 +229344,8 @@ index 000000000000..37dbca129f86 +} +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_config.h b/drivers/gpu/arm/bifrost/mali_kbase_config.h -new file mode 100755 -index 000000000000..ecfdb2876618 +new file mode 100644 +index 000000000..ecfdb2876 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_config.h @@ -0,0 +1,583 @@ @@ -229907,8 +229933,8 @@ index 000000000000..ecfdb2876618 + +#endif /* _KBASE_CONFIG_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h b/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h -new file mode 100755 -index 000000000000..14493a77e1ea +new file mode 100644 +index 000000000..14493a77e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h @@ -0,0 +1,278 @@ @@ -230191,8 +230217,8 @@ index 000000000000..14493a77e1ea +#define MMU_AS_INACTIVE_WAIT_TIMEOUT_CYCLES ((u64)50 * 1024 * 1024) +#endif /* _KBASE_CONFIG_DEFAULTS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c b/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c -new file mode 100755 -index 000000000000..12d6cc8963a3 +new file mode 100644 +index 000000000..12d6cc896 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c @@ -0,0 +1,5904 @@ @@ -236101,8 +236127,8 @@ index 000000000000..12d6cc8963a3 +} +#endif /* CONFIG_MALI_BIFROST_GATOR_SUPPORT */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h b/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h -new file mode 100755 -index 000000000000..7e885ca46ce9 +new file mode 100644 +index 000000000..7e885ca46 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h @@ -0,0 +1,40 @@ @@ -236147,8 +236173,8 @@ index 000000000000..7e885ca46ce9 + + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c -new file mode 100755 -index 000000000000..dc6feb95a391 +new file mode 100644 +index 000000000..dc6feb95a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c @@ -0,0 +1,433 @@ @@ -236586,8 +236612,8 @@ index 000000000000..dc6feb95a391 +} +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h -new file mode 100755 -index 000000000000..5a8d17547b7b +new file mode 100644 +index 000000000..5a8d17547 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h @@ -0,0 +1,247 @@ @@ -236839,8 +236865,8 @@ index 000000000000..5a8d17547b7b + +#endif /* _KBASE_CTX_SCHED_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug.c b/drivers/gpu/arm/bifrost/mali_kbase_debug.c -new file mode 100755 -index 000000000000..6d3b1093b442 +new file mode 100644 +index 000000000..6d3b1093b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug.c @@ -0,0 +1,41 @@ @@ -236886,8 +236912,8 @@ index 000000000000..6d3b1093b442 +KBASE_EXPORT_SYMBOL(kbasep_debug_assert_call_hook); + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug.h b/drivers/gpu/arm/bifrost/mali_kbase_debug.h -new file mode 100755 -index 000000000000..9d6ff73aa4e0 +new file mode 100644 +index 000000000..9d6ff73aa --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug.h @@ -0,0 +1,166 @@ @@ -237058,8 +237084,8 @@ index 000000000000..9d6ff73aa4e0 + +#endif /* _KBASE_DEBUG_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c -new file mode 100755 -index 000000000000..d6518b476115 +new file mode 100644 +index 000000000..d6518b476 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c @@ -0,0 +1,573 @@ @@ -237637,8 +237663,8 @@ index 000000000000..d6518b476115 + +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h -new file mode 100755 -index 000000000000..059d9c4553bb +new file mode 100644 +index 000000000..059d9c455 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h @@ -0,0 +1,121 @@ @@ -237765,7 +237791,7 @@ index 000000000000..059d9c4553bb +#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 000000000000..418bb19086bb +index 000000000..418bb1908 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.c @@ -0,0 +1,138 @@ @@ -237909,7 +237935,7 @@ index 000000000000..418bb19086bb +#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 000000000000..8cf69c2cbaf9 +index 000000000..8cf69c2cb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.h @@ -0,0 +1,39 @@ @@ -237953,8 +237979,8 @@ index 000000000000..8cf69c2cbaf9 + +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c -new file mode 100755 -index 000000000000..ce87a0070b72 +new file mode 100644 +index 000000000..ce87a0070 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c @@ -0,0 +1,410 @@ @@ -238369,8 +238395,8 @@ index 000000000000..ce87a0070b72 + +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h -new file mode 100755 -index 000000000000..cb8050d9b32c +new file mode 100644 +index 000000000..cb8050d9b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h @@ -0,0 +1,39 @@ @@ -238415,7 +238441,7 @@ index 000000000000..cb8050d9b32c +#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 000000000000..1f8db32aa16f +index 000000000..1f8db32aa --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.c @@ -0,0 +1,116 @@ @@ -238537,7 +238563,7 @@ index 000000000000..1f8db32aa16f +#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 000000000000..acf349b608d5 +index 000000000..acf349b60 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.h @@ -0,0 +1,39 @@ @@ -238581,8 +238607,8 @@ index 000000000000..acf349b608d5 + +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c -new file mode 100755 -index 000000000000..c846491e78fb +new file mode 100644 +index 000000000..c846491e7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c @@ -0,0 +1,248 @@ @@ -238835,8 +238861,8 @@ index 000000000000..c846491e78fb + return 0; +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h -new file mode 100755 -index 000000000000..cbb24d6e0acf +new file mode 100644 +index 000000000..cbb24d6e0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h @@ -0,0 +1,162 @@ @@ -239003,8 +239029,8 @@ index 000000000000..cbb24d6e0acf +#endif /*_KBASE_DEBUGFS_HELPER_H_ */ + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_defs.h -new file mode 100755 -index 000000000000..809e73000c4d +new file mode 100644 +index 000000000..809e73000 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_defs.h @@ -0,0 +1,2105 @@ @@ -241114,8 +241140,8 @@ index 000000000000..809e73000c4d +#define KBASE_PRFCNT_ACTIVE_MAX_LOOPS 100000000 +#endif /* _KBASE_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c b/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c -new file mode 100755 -index 000000000000..7d6e475585ae +new file mode 100644 +index 000000000..7d6e47558 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c @@ -0,0 +1,80 @@ @@ -241200,8 +241226,8 @@ index 000000000000..7d6e475585ae +} +KBASE_EXPORT_TEST_API(kbase_disjoint_event_get); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c -new file mode 100755 -index 000000000000..0e0dab912145 +new file mode 100644 +index 000000000..0e0dab912 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c @@ -0,0 +1,452 @@ @@ -241658,8 +241684,8 @@ index 000000000000..0e0dab912145 + } +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h -new file mode 100755 -index 000000000000..8713ba1eaa6f +new file mode 100644 +index 000000000..8713ba1ea --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h @@ -0,0 +1,73 @@ @@ -241738,7 +241764,7 @@ index 000000000000..8713ba1eaa6f +#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 000000000000..e4cb71632aee +index 000000000..e4cb71632 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.c @@ -0,0 +1,94 @@ @@ -241838,7 +241864,7 @@ index 000000000000..e4cb71632aee +#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 000000000000..8334db7cc1ed +index 000000000..8334db7cc --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.h @@ -0,0 +1,35 @@ @@ -241878,8 +241904,8 @@ index 000000000000..8334db7cc1ed + +#endif /* _KBASE_DVFS_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_event.c b/drivers/gpu/arm/bifrost/mali_kbase_event.c -new file mode 100755 -index 000000000000..910c51170ae8 +new file mode 100644 +index 000000000..910c51170 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_event.c @@ -0,0 +1,272 @@ @@ -242156,8 +242182,8 @@ index 000000000000..910c51170ae8 + +KBASE_EXPORT_TEST_API(kbase_event_cleanup); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence.c b/drivers/gpu/arm/bifrost/mali_kbase_fence.c -new file mode 100755 -index 000000000000..b16b27659e61 +new file mode 100644 +index 000000000..b16b27659 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence.c @@ -0,0 +1,61 @@ @@ -242223,8 +242249,8 @@ index 000000000000..b16b27659e61 +} + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence.h b/drivers/gpu/arm/bifrost/mali_kbase_fence.h -new file mode 100755 -index 000000000000..f4507ac4309b +new file mode 100644 +index 000000000..f4507ac43 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence.h @@ -0,0 +1,259 @@ @@ -242488,8 +242514,8 @@ index 000000000000..f4507ac4309b + +#endif /* _KBASE_FENCE_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h -new file mode 100755 -index 000000000000..7a150bdf2947 +new file mode 100644 +index 000000000..7a150bdf2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h @@ -0,0 +1,63 @@ @@ -242557,8 +242583,8 @@ index 000000000000..7a150bdf2947 + +#endif /* _KBASE_FENCE_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c b/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c -new file mode 100755 -index 000000000000..25b4c9c03b53 +new file mode 100644 +index 000000000..25b4c9c03 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c @@ -0,0 +1,111 @@ @@ -242674,8 +242700,8 @@ index 000000000000..25b4c9c03b53 +}; +KBASE_EXPORT_TEST_API(kbase_fence_ops); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gator.h b/drivers/gpu/arm/bifrost/mali_kbase_gator.h -new file mode 100755 -index 000000000000..dd7df874640a +new file mode 100644 +index 000000000..dd7df8746 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gator.h @@ -0,0 +1,52 @@ @@ -242732,8 +242758,8 @@ index 000000000000..dd7df874640a + +#endif /* _KBASE_GATOR_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c -new file mode 100755 -index 000000000000..bf5f259a0bb6 +new file mode 100644 +index 000000000..bf5f259a0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c @@ -0,0 +1,112 @@ @@ -242850,8 +242876,8 @@ index 000000000000..bf5f259a0bb6 +void kbasep_gpu_memory_debugfs_init(struct kbase_device *kbdev) {} +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h -new file mode 100755 -index 000000000000..6d5423f379d4 +new file mode 100644 +index 000000000..6d5423f37 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h @@ -0,0 +1,50 @@ @@ -242906,8 +242932,8 @@ index 000000000000..6d5423f379d4 + +#endif /*_KBASE_GPU_MEMORY_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c -new file mode 100755 -index 000000000000..7a7d17ea5f26 +new file mode 100644 +index 000000000..7a7d17ea5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c @@ -0,0 +1,888 @@ @@ -243800,8 +243826,8 @@ index 000000000000..7a7d17ea5f26 + return 0; +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h -new file mode 100755 -index 000000000000..f0a97312c0dd +new file mode 100644 +index 000000000..f0a97312c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h @@ -0,0 +1,154 @@ @@ -243960,8 +243986,8 @@ index 000000000000..f0a97312c0dd + +#endif /* _KBASE_GPUPROPS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h -new file mode 100755 -index 000000000000..45cb603fab82 +new file mode 100644 +index 000000000..45cb603fa --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h @@ -0,0 +1,170 @@ @@ -244136,8 +244162,8 @@ index 000000000000..45cb603fab82 + +#endif /* _KBASE_GPUPROPS_TYPES_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gwt.c b/drivers/gpu/arm/bifrost/mali_kbase_gwt.c -new file mode 100755 -index 000000000000..0eba889e5b19 +new file mode 100644 +index 000000000..0eba889e5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gwt.c @@ -0,0 +1,275 @@ @@ -244417,8 +244443,8 @@ index 000000000000..0eba889e5b19 + return 0; +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gwt.h b/drivers/gpu/arm/bifrost/mali_kbase_gwt.h -new file mode 100755 -index 000000000000..9fdd68d62fb8 +new file mode 100644 +index 000000000..9fdd68d62 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gwt.h @@ -0,0 +1,54 @@ @@ -244477,8 +244503,8 @@ index 000000000000..9fdd68d62fb8 + +#endif /* _KBASE_GWT_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hw.c b/drivers/gpu/arm/bifrost/mali_kbase_hw.c -new file mode 100755 -index 000000000000..b07327a55c0a +new file mode 100644 +index 000000000..b07327a55 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hw.c @@ -0,0 +1,437 @@ @@ -244920,8 +244946,8 @@ index 000000000000..b07327a55c0a + return 0; +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hw.h b/drivers/gpu/arm/bifrost/mali_kbase_hw.h -new file mode 100755 -index 000000000000..ddcddaaa429d +new file mode 100644 +index 000000000..ddcddaaa4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hw.h @@ -0,0 +1,71 @@ @@ -244997,8 +245023,8 @@ index 000000000000..ddcddaaa429d + +#endif /* _KBASE_HW_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h -new file mode 100755 -index 000000000000..0da4eb258a24 +new file mode 100644 +index 000000000..0da4eb258 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h @@ -0,0 +1,43 @@ @@ -245046,8 +245072,8 @@ index 000000000000..0da4eb258a24 + +#endif /* _KBASE_HWACCESS_BACKEND_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h -new file mode 100755 -index 000000000000..62a6ec51b17f +new file mode 100644 +index 000000000..62a6ec51b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h @@ -0,0 +1,50 @@ @@ -245102,8 +245128,8 @@ index 000000000000..62a6ec51b17f + +#endif /* _KBASE_HWACCESS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h -new file mode 100755 -index 000000000000..f537b7f0ac90 +new file mode 100644 +index 000000000..f537b7f0a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h @@ -0,0 +1,88 @@ @@ -245196,8 +245222,8 @@ index 000000000000..f537b7f0ac90 + +#endif /* _KBASE_HWACCESS_GPUPROPS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h -new file mode 100755 -index 000000000000..37663101a346 +new file mode 100644 +index 000000000..37663101a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h @@ -0,0 +1,170 @@ @@ -245372,8 +245398,8 @@ index 000000000000..37663101a346 + +#endif /* _KBASE_HWACCESS_INSTR_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h -new file mode 100755 -index 000000000000..ca77c192deea +new file mode 100644 +index 000000000..ca77c192d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h @@ -0,0 +1,318 @@ @@ -245696,8 +245722,8 @@ index 000000000000..ca77c192deea + +#endif /* _KBASE_HWACCESS_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h -new file mode 100755 -index 000000000000..effb2ffeb349 +new file mode 100644 +index 000000000..effb2ffeb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h @@ -0,0 +1,229 @@ @@ -245931,8 +245957,8 @@ index 000000000000..effb2ffeb349 + +#endif /* _KBASE_HWACCESS_PM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h -new file mode 100755 -index 000000000000..ac2a26d28d89 +new file mode 100644 +index 000000000..ac2a26d28 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h @@ -0,0 +1,126 @@ @@ -246063,8 +246089,8 @@ index 000000000000..ac2a26d28d89 + +#endif /* _KBASE_BACKEND_TIME_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jd.c b/drivers/gpu/arm/bifrost/mali_kbase_jd.c -new file mode 100755 -index 000000000000..f44426a736ca +new file mode 100644 +index 000000000..f44426a73 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd.c @@ -0,0 +1,1660 @@ @@ -247729,8 +247755,8 @@ index 000000000000..f44426a736ca + +KBASE_EXPORT_TEST_API(kbase_jd_exit); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.c -new file mode 100755 -index 000000000000..6196c0985c7e +new file mode 100644 +index 000000000..6196c0985 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.c @@ -0,0 +1,199 @@ @@ -247934,8 +247960,8 @@ index 000000000000..6196c0985c7e + +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.h -new file mode 100755 -index 000000000000..8e6140c43538 +new file mode 100644 +index 000000000..8e6140c43 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.h @@ -0,0 +1,43 @@ @@ -247983,8 +248009,8 @@ index 000000000000..8e6140c43538 + +#endif /*_KBASE_JD_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jm.c b/drivers/gpu/arm/bifrost/mali_kbase_jm.c -new file mode 100755 -index 000000000000..1ac5cd3eafff +new file mode 100644 +index 000000000..1ac5cd3ea --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jm.c @@ -0,0 +1,153 @@ @@ -248142,8 +248168,8 @@ index 000000000000..1ac5cd3eafff +} +#endif /* !MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jm.h b/drivers/gpu/arm/bifrost/mali_kbase_jm.h -new file mode 100755 -index 000000000000..eeafcb6b1a77 +new file mode 100644 +index 000000000..eeafcb6b1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jm.h @@ -0,0 +1,117 @@ @@ -248265,8 +248291,8 @@ index 000000000000..eeafcb6b1a77 + +#endif /* _KBASE_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js.c b/drivers/gpu/arm/bifrost/mali_kbase_js.c -new file mode 100755 -index 000000000000..8ce09212a57e +new file mode 100644 +index 000000000..8ce09212a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js.c @@ -0,0 +1,4007 @@ @@ -252278,8 +252304,8 @@ index 000000000000..8ce09212a57e + return kbasep_js_sched_prio_to_atom_prio(kbdev, out_priority); +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js.h b/drivers/gpu/arm/bifrost/mali_kbase_js.h -new file mode 100755 -index 000000000000..96974c8c6439 +new file mode 100644 +index 000000000..96974c8c6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js.h @@ -0,0 +1,36 @@ @@ -252320,8 +252346,8 @@ index 000000000000..96974c8c6439 + +#endif /* _KBASE_JS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.c b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.c -new file mode 100755 -index 000000000000..04ea06b2f381 +new file mode 100644 +index 000000000..04ea06b2f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.c @@ -0,0 +1,298 @@ @@ -252624,8 +252650,8 @@ index 000000000000..04ea06b2f381 + return runpool_state_changed; +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.h b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.h -new file mode 100755 -index 000000000000..2dc640d5ab82 +new file mode 100644 +index 000000000..2dc640d5a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.h @@ -0,0 +1,147 @@ @@ -252777,8 +252803,8 @@ index 000000000000..2dc640d5ab82 + +#endif /* _KBASE_JS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.c b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.c -new file mode 100755 -index 000000000000..14a730dc5a12 +new file mode 100644 +index 000000000..14a730dc5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.c @@ -0,0 +1,896 @@ @@ -253679,8 +253705,8 @@ index 000000000000..14a730dc5a12 + kbase_kinstr_jm_atom_state_start(queued); +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.h b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.h -new file mode 100755 -index 000000000000..9451d4cd943d +new file mode 100644 +index 000000000..9451d4cd9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.h @@ -0,0 +1,273 @@ @@ -253959,7 +253985,7 @@ index 000000000000..9451d4cd943d +#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 000000000000..823f9156e19e +index 000000000..823f9156e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.c @@ -0,0 +1,2021 @@ @@ -255986,7 +256012,7 @@ index 000000000000..823f9156e19e +} 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 000000000000..bbe33796e62f +index 000000000..bbe33796e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.h @@ -0,0 +1,189 @@ @@ -256180,8 +256206,8 @@ index 000000000000..bbe33796e62f + +#endif /* _KBASE_KINSTR_PRFCNT_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_linux.h b/drivers/gpu/arm/bifrost/mali_kbase_linux.h -new file mode 100755 -index 000000000000..e5c6f7a0b217 +new file mode 100644 +index 000000000..e5c6f7a0b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_linux.h @@ -0,0 +1,44 @@ @@ -256230,8 +256256,8 @@ index 000000000000..e5c6f7a0b217 + +#endif /* _KBASE_LINUX_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem.c b/drivers/gpu/arm/bifrost/mali_kbase_mem.c -new file mode 100755 -index 000000000000..1c94e9c57b7f +new file mode 100644 +index 000000000..1c94e9c57 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem.c @@ -0,0 +1,5541 @@ @@ -261777,8 +261803,8 @@ index 000000000000..1c94e9c57b7f + } +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem.h b/drivers/gpu/arm/bifrost/mali_kbase_mem.h -new file mode 100755 -index 000000000000..490ad3c9c2e2 +new file mode 100644 +index 000000000..490ad3c9c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem.h @@ -0,0 +1,2570 @@ @@ -264353,8 +264379,8 @@ index 000000000000..490ad3c9c2e2 +} +#endif /* _KBASE_MEM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.c -new file mode 100755 -index 000000000000..f1251a4ed575 +new file mode 100644 +index 000000000..f1251a4ed --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.c @@ -0,0 +1,3831 @@ @@ -268190,8 +268216,8 @@ index 000000000000..f1251a4ed575 + +#endif /* MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.h -new file mode 100755 -index 000000000000..6dda44b9f128 +new file mode 100644 +index 000000000..6dda44b9f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.h @@ -0,0 +1,533 @@ @@ -268729,8 +268755,8 @@ index 000000000000..6dda44b9f128 + +#endif /* _KBASE_MEM_LINUX_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_lowlevel.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_lowlevel.h -new file mode 100755 -index 000000000000..5a1bb16cca01 +new file mode 100644 +index 000000000..5a1bb16cc --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_lowlevel.h @@ -0,0 +1,179 @@ @@ -268915,7 +268941,7 @@ index 000000000000..5a1bb16cca01 +#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 000000000000..737f7da5595d +index 000000000..737f7da55 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.c @@ -0,0 +1,641 @@ @@ -269562,7 +269588,7 @@ index 000000000000..737f7da5595d +} 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 000000000000..76bbc999e110 +index 000000000..76bbc999e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.h @@ -0,0 +1,108 @@ @@ -269675,8 +269701,8 @@ index 000000000000..76bbc999e110 + */ +void kbase_mem_migrate_term(struct kbase_device *kbdev); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool.c -new file mode 100755 -index 000000000000..fa8f34d86c24 +new file mode 100644 +index 000000000..fa8f34d86 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool.c @@ -0,0 +1,1029 @@ @@ -270710,8 +270736,8 @@ index 000000000000..fa8f34d86c24 + pool_dbg(pool, "free_pages_locked(%zu) done\n", nr_pages); +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.c -new file mode 100755 -index 000000000000..3b1b2bae15c8 +new file mode 100644 +index 000000000..3b1b2bae1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.c @@ -0,0 +1,184 @@ @@ -270900,8 +270926,8 @@ index 000000000000..3b1b2bae15c8 + &kctx->mem_pools.large, &kbase_mem_pool_debugfs_max_size_fops); +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.h -new file mode 100755 -index 000000000000..207b58536a58 +new file mode 100644 +index 000000000..207b58536 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.h @@ -0,0 +1,122 @@ @@ -271028,8 +271054,8 @@ index 000000000000..207b58536a58 +#endif /*_KBASE_MEM_POOL_DEBUGFS_H_ */ + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.c -new file mode 100755 -index 000000000000..49c4b041e13a +new file mode 100644 +index 000000000..49c4b041e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.c @@ -0,0 +1,107 @@ @@ -271141,8 +271167,8 @@ index 000000000000..49c4b041e13a + } +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.h -new file mode 100755 -index 000000000000..fe8ce775258f +new file mode 100644 +index 000000000..fe8ce7752 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.h @@ -0,0 +1,114 @@ @@ -271261,8 +271287,8 @@ index 000000000000..fe8ce775258f + +#endif /* _KBASE_MEM_POOL_GROUP_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.c -new file mode 100755 -index 000000000000..9317023b71bb +new file mode 100644 +index 000000000..9317023b7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.c @@ -0,0 +1,131 @@ @@ -271398,8 +271424,8 @@ index 000000000000..9317023b71bb +} +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.h -new file mode 100755 -index 000000000000..c30fca6652dc +new file mode 100644 +index 000000000..c30fca665 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.h @@ -0,0 +1,64 @@ @@ -271468,8 +271494,8 @@ index 000000000000..c30fca6652dc +#endif /*_KBASE_MEM_PROFILE_DEBUGFS_H*/ + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mipe_gen_header.h b/drivers/gpu/arm/bifrost/mali_kbase_mipe_gen_header.h -new file mode 100755 -index 000000000000..951079d11ab6 +new file mode 100644 +index 000000000..951079d11 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mipe_gen_header.h @@ -0,0 +1,229 @@ @@ -271703,8 +271729,8 @@ index 000000000000..951079d11ab6 + +/* clang-format on */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mipe_proto.h b/drivers/gpu/arm/bifrost/mali_kbase_mipe_proto.h -new file mode 100755 -index 000000000000..c35ee61ce5aa +new file mode 100644 +index 000000000..c35ee61ce --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mipe_proto.h @@ -0,0 +1,126 @@ @@ -271835,8 +271861,8 @@ index 000000000000..c35ee61ce5aa + +/* clang-format on */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.c b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.c -new file mode 100755 -index 000000000000..10a7f506b1a4 +new file mode 100644 +index 000000000..10a7f506b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.c @@ -0,0 +1,177 @@ @@ -272018,8 +272044,8 @@ index 000000000000..10a7f506b1a4 + .data = NULL +}; diff --git a/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.h b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.h -new file mode 100755 -index 000000000000..1eae2fcf98b6 +new file mode 100644 +index 000000000..1eae2fcf9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.h @@ -0,0 +1,38 @@ @@ -272063,7 +272089,7 @@ index 000000000000..1eae2fcf98b6 +#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 000000000000..b65f9e7b5162 +index 000000000..b65f9e7b5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha.c @@ -0,0 +1,306 @@ @@ -272375,7 +272401,7 @@ index 000000000000..b65f9e7b5162 +} 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 000000000000..79632194cabe +index 000000000..79632194c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha.h @@ -0,0 +1,77 @@ @@ -272458,7 +272484,7 @@ index 000000000000..79632194cabe +#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 000000000000..1cc29c700e5a +index 000000000..1cc29c700 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.c @@ -0,0 +1,227 @@ @@ -272691,7 +272717,7 @@ index 000000000000..1cc29c700e5a +} 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 000000000000..508ecdff9162 +index 000000000..508ecdff9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.h @@ -0,0 +1,34 @@ @@ -272730,8 +272756,8 @@ index 000000000000..508ecdff9162 + +#endif /* _KBASE_PBHA_DEBUGFS_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_platform_fake.c b/drivers/gpu/arm/bifrost/mali_kbase_platform_fake.c -new file mode 100755 -index 000000000000..265c676f13fa +new file mode 100644 +index 000000000..265c676f1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_platform_fake.c @@ -0,0 +1,119 @@ @@ -272855,8 +272881,8 @@ index 000000000000..265c676f13fa + +#endif /* CONFIG_OF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pm.c b/drivers/gpu/arm/bifrost/mali_kbase_pm.c -new file mode 100755 -index 000000000000..62a132816a42 +new file mode 100644 +index 000000000..62a132816 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pm.c @@ -0,0 +1,311 @@ @@ -273172,8 +273198,8 @@ index 000000000000..62a132816a42 +#endif /* CONFIG_MALI_ARBITER_SUPPORT */ +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pm.h b/drivers/gpu/arm/bifrost/mali_kbase_pm.h -new file mode 100755 -index 000000000000..4bb90a4f6542 +new file mode 100644 +index 000000000..4bb90a4f6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pm.h @@ -0,0 +1,257 @@ @@ -273436,7 +273462,7 @@ index 000000000000..4bb90a4f6542 +#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 000000000000..c517a2d2ab83 +index 000000000..c517a2d2a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_refcount_defs.h @@ -0,0 +1,57 @@ @@ -273498,8 +273524,8 @@ index 000000000000..c517a2d2ab83 + +#endif /* _KBASE_REFCOUNT_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.c -new file mode 100755 -index 000000000000..147082c15fed +new file mode 100644 +index 000000000..147082c15 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.c @@ -0,0 +1,239 @@ @@ -273743,8 +273769,8 @@ index 000000000000..147082c15fed +} +#endif /* defined(CONFIG_DEBUG_FS) && !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.h -new file mode 100755 -index 000000000000..ae327dd799a4 +new file mode 100644 +index 000000000..ae327dd79 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.h @@ -0,0 +1,84 @@ @@ -273833,8 +273859,8 @@ index 000000000000..ae327dd799a4 + +#endif /*_KBASE_REGS_HISTORY_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_reset_gpu.h b/drivers/gpu/arm/bifrost/mali_kbase_reset_gpu.h -new file mode 100755 -index 000000000000..48ea9954b17c +new file mode 100644 +index 000000000..48ea9954b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_reset_gpu.h @@ -0,0 +1,277 @@ @@ -274116,8 +274142,8 @@ index 000000000000..48ea9954b17c + +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_smc.c b/drivers/gpu/arm/bifrost/mali_kbase_smc.c -new file mode 100755 -index 000000000000..abbe8d56d082 +new file mode 100644 +index 000000000..abbe8d56d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_smc.c @@ -0,0 +1,90 @@ @@ -274212,8 +274238,8 @@ index 000000000000..abbe8d56d082 +#endif /* CONFIG_ARM64 */ + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_smc.h b/drivers/gpu/arm/bifrost/mali_kbase_smc.h -new file mode 100755 -index 000000000000..40a348388598 +new file mode 100644 +index 000000000..40a348388 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_smc.h @@ -0,0 +1,69 @@ @@ -274287,8 +274313,8 @@ index 000000000000..40a348388598 + +#endif /* _KBASE_SMC_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_softjobs.c b/drivers/gpu/arm/bifrost/mali_kbase_softjobs.c -new file mode 100755 -index 000000000000..a9312a0c433e +new file mode 100644 +index 000000000..a9312a0c4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_softjobs.c @@ -0,0 +1,1770 @@ @@ -276063,8 +276089,8 @@ index 000000000000..a9312a0c433e +} +#endif /* !MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_strings.c b/drivers/gpu/arm/bifrost/mali_kbase_strings.c -new file mode 100755 -index 000000000000..84784be6f244 +new file mode 100644 +index 000000000..84784be6f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_strings.c @@ -0,0 +1,28 @@ @@ -276097,8 +276123,8 @@ index 000000000000..84784be6f244 +const char kbase_drv_name[] = KBASE_DRV_NAME; +const char kbase_timeline_name[] = KBASE_TIMELINE_NAME; diff --git a/drivers/gpu/arm/bifrost/mali_kbase_strings.h b/drivers/gpu/arm/bifrost/mali_kbase_strings.h -new file mode 100755 -index 000000000000..c3f94f9267d5 +new file mode 100644 +index 000000000..c3f94f926 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_strings.h @@ -0,0 +1,23 @@ @@ -276126,8 +276152,8 @@ index 000000000000..c3f94f9267d5 +extern const char kbase_drv_name[]; +extern const char kbase_timeline_name[]; diff --git a/drivers/gpu/arm/bifrost/mali_kbase_sync.h b/drivers/gpu/arm/bifrost/mali_kbase_sync.h -new file mode 100755 -index 000000000000..3d2053bee08e +new file mode 100644 +index 000000000..3d2053bee --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync.h @@ -0,0 +1,216 @@ @@ -276348,8 +276374,8 @@ index 000000000000..3d2053bee08e + +#endif /* MALI_KBASE_SYNC_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_sync_common.c b/drivers/gpu/arm/bifrost/mali_kbase_sync_common.c -new file mode 100755 -index 000000000000..5ee7fc3ce72b +new file mode 100644 +index 000000000..5ee7fc3ce --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync_common.c @@ -0,0 +1,50 @@ @@ -276404,8 +276430,8 @@ index 000000000000..5ee7fc3ce72b + return "error"; +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_sync_file.c b/drivers/gpu/arm/bifrost/mali_kbase_sync_file.c -new file mode 100755 -index 000000000000..9360324cfee6 +new file mode 100644 +index 000000000..9360324cf --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync_file.c @@ -0,0 +1,409 @@ @@ -276819,8 +276845,8 @@ index 000000000000..9360324cfee6 +#endif +#endif /* !MALI_USE_CSF*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.c b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.c -new file mode 100755 -index 000000000000..7df7d79b6bc5 +new file mode 100644 +index 000000000..7df7d79b6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.c @@ -0,0 +1,225 @@ @@ -277050,8 +277076,8 @@ index 000000000000..7df7d79b6bc5 + mutex_unlock(&kbdev->dma_buf_lock); +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.h b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.h -new file mode 100755 -index 000000000000..fd871fcb352a +new file mode 100644 +index 000000000..fd871fcb3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.h @@ -0,0 +1,100 @@ @@ -277156,8 +277182,8 @@ index 000000000000..fd871fcb352a + +#endif /* _KBASE_TRACE_GPU_MEM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_utility.h b/drivers/gpu/arm/bifrost/mali_kbase_utility.h -new file mode 100755 -index 000000000000..2dad49b59f52 +new file mode 100644 +index 000000000..2dad49b59 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_utility.h @@ -0,0 +1,52 @@ @@ -277214,8 +277240,8 @@ index 000000000000..2dad49b59f52 + +#endif /* _KBASE_UTILITY_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_vinstr.c b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.c -new file mode 100755 -index 000000000000..d770913e9da5 +new file mode 100644 +index 000000000..d770913e9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.c @@ -0,0 +1,1132 @@ @@ -278352,8 +278378,8 @@ index 000000000000..d770913e9da5 + return 0; +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_vinstr.h b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.h -new file mode 100755 -index 000000000000..6747ec70a406 +new file mode 100644 +index 000000000..6747ec70a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.h @@ -0,0 +1,90 @@ @@ -278448,8 +278474,8 @@ index 000000000000..6747ec70a406 + +#endif /* _KBASE_VINSTR_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_linux_trace.h b/drivers/gpu/arm/bifrost/mali_linux_trace.h -new file mode 100755 -index 000000000000..52f17390c853 +new file mode 100644 +index 000000000..52f17390c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_linux_trace.h @@ -0,0 +1,547 @@ @@ -279001,8 +279027,8 @@ index 000000000000..52f17390c853 +/* This part must be outside protection */ +#include diff --git a/drivers/gpu/arm/bifrost/mali_malisw.h b/drivers/gpu/arm/bifrost/mali_malisw.h -new file mode 100755 -index 000000000000..d9db189e8684 +new file mode 100644 +index 000000000..d9db189e8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_malisw.h @@ -0,0 +1,108 @@ @@ -279115,8 +279141,8 @@ index 000000000000..d9db189e8684 + +#endif /* _MALISW_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.c b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.c -new file mode 100755 -index 000000000000..1db3abe2f9f6 +new file mode 100644 +index 000000000..1db3abe2f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.c @@ -0,0 +1,26 @@ @@ -279147,8 +279173,8 @@ index 000000000000..1db3abe2f9f6 +#include "mali_power_gpu_frequency_trace.h" +#endif diff --git a/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.h b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.h -new file mode 100755 -index 000000000000..f156650a40a3 +new file mode 100644 +index 000000000..f156650a4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.h @@ -0,0 +1,68 @@ @@ -279222,7 +279248,7 @@ index 000000000000..f156650a40a3 +#include diff --git a/drivers/gpu/arm/bifrost/mmu/Kbuild b/drivers/gpu/arm/bifrost/mmu/Kbuild new file mode 100644 -index 000000000000..416432397b5c +index 000000000..416432397 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/Kbuild @@ -0,0 +1,30 @@ @@ -279257,8 +279283,8 @@ index 000000000000..416432397b5c + bifrost_kbase-y += mmu/backend/mali_kbase_mmu_jm.o +endif diff --git a/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_csf.c b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_csf.c -new file mode 100755 -index 000000000000..4cac7876f5f7 +new file mode 100644 +index 000000000..4cac7876f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_csf.c @@ -0,0 +1,572 @@ @@ -279835,8 +279861,8 @@ index 000000000000..4cac7876f5f7 + return 0; +} diff --git a/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_jm.c b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_jm.c -new file mode 100755 -index 000000000000..d716ce0068fd +new file mode 100644 +index 000000000..d716ce006 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_jm.c @@ -0,0 +1,442 @@ @@ -280283,8 +280309,8 @@ index 000000000000..d716ce0068fd + return 0; +} diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.c b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.c -new file mode 100755 -index 000000000000..d6d3fcdee6e7 +new file mode 100644 +index 000000000..d6d3fcdee --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.c @@ -0,0 +1,3889 @@ @@ -284178,8 +284204,8 @@ index 000000000000..d6d3fcdee6e7 + } +} diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.h b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.h -new file mode 100755 -index 000000000000..699b1f340482 +new file mode 100644 +index 000000000..699b1f340 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.h @@ -0,0 +1,341 @@ @@ -284525,8 +284551,8 @@ index 000000000000..699b1f340482 + +#endif /* _KBASE_MMU_H_ */ diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw.h b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw.h -new file mode 100755 -index 000000000000..50d2ea5d07c8 +new file mode 100644 +index 000000000..50d2ea5d0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw.h @@ -0,0 +1,214 @@ @@ -284745,8 +284771,8 @@ index 000000000000..50d2ea5d07c8 + +#endif /* _KBASE_MMU_HW_H_ */ diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw_direct.c b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw_direct.c -new file mode 100755 -index 000000000000..3f6da35d80f2 +new file mode 100644 +index 000000000..3f6da35d8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw_direct.c @@ -0,0 +1,699 @@ @@ -285450,8 +285476,8 @@ index 000000000000..3f6da35d80f2 + spin_unlock_irqrestore(&kbdev->mmu_mask_change, flags); +} diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_internal.h b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_internal.h -new file mode 100755 -index 000000000000..9d7ce48568e4 +new file mode 100644 +index 000000000..9d7ce4856 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_internal.h @@ -0,0 +1,72 @@ @@ -285528,8 +285554,8 @@ index 000000000000..9d7ce48568e4 + +#endif /* _KBASE_MMU_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_aarch64.c b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_aarch64.c -new file mode 100755 -index 000000000000..f2c627482c18 +new file mode 100644 +index 000000000..f2c627482 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_aarch64.c @@ -0,0 +1,219 @@ @@ -285753,8 +285779,8 @@ index 000000000000..f2c627482c18 + return &aarch64_mode; +} diff --git a/drivers/gpu/arm/bifrost/platform/Kconfig b/drivers/gpu/arm/bifrost/platform/Kconfig -new file mode 100755 -index 000000000000..3e1bd235b842 +new file mode 100644 +index 000000000..3e1bd235b --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/Kconfig @@ -0,0 +1,26 @@ @@ -285785,8 +285811,8 @@ index 000000000000..3e1bd235b842 +# Where xxx is the platform name is the name set in MALI_PLATFORM_NAME +# diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild b/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild -new file mode 100755 -index 000000000000..60a52d80fa8e +new file mode 100644 +index 000000000..60a52d80f --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild @@ -0,0 +1,24 @@ @@ -285815,8 +285841,8 @@ index 000000000000..60a52d80fa8e + platform/$(MALI_PLATFORM_DIR)/mali_kbase_runtime_pm.o \ + platform/$(MALI_PLATFORM_DIR)/mali_kbase_clk_rate_trace.o diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_clk_rate_trace.c b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_clk_rate_trace.c -new file mode 100755 -index 000000000000..4bcd5854d3a3 +new file mode 100644 +index 000000000..4bcd5854d --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_clk_rate_trace.c @@ -0,0 +1,105 @@ @@ -285926,8 +285952,8 @@ index 000000000000..4bcd5854d3a3 + .gpu_clk_notifier_unregister = gpu_clk_notifier_unregister, +}; diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_devicetree.c b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_devicetree.c -new file mode 100755 -index 000000000000..a0b4a434e2a7 +new file mode 100644 +index 000000000..a0b4a434e --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_devicetree.c @@ -0,0 +1,53 @@ @@ -285985,8 +286011,8 @@ index 000000000000..a0b4a434e2a7 +} +#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_platform.h -new file mode 100755 -index 000000000000..584a7217d300 +new file mode 100644 +index 000000000..584a7217d --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_platform.h @@ -0,0 +1,47 @@ @@ -286038,8 +286064,8 @@ index 000000000000..584a7217d300 + */ +#define AUTO_SUSPEND_DELAY (100) diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_runtime_pm.c b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_runtime_pm.c -new file mode 100755 -index 000000000000..2687bee96ec9 +new file mode 100644 +index 000000000..2687bee96 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_runtime_pm.c @@ -0,0 +1,298 @@ @@ -286343,7 +286369,7 @@ index 000000000000..2687bee96ec9 +}; diff --git a/drivers/gpu/arm/bifrost/platform/meson/Kbuild b/drivers/gpu/arm/bifrost/platform/meson/Kbuild new file mode 100644 -index 000000000000..9b3de96bace8 +index 000000000..9b3de96ba --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/meson/Kbuild @@ -0,0 +1,23 @@ @@ -286372,7 +286398,7 @@ index 000000000000..9b3de96bace8 + 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 000000000000..7b896b602e96 +index 000000000..7b896b602 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_meson.c @@ -0,0 +1,53 @@ @@ -286431,7 +286457,7 @@ index 000000000000..7b896b602e96 +#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 000000000000..06279e2f62ca +index 000000000..06279e2f6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_platform.h @@ -0,0 +1,45 @@ @@ -286482,7 +286508,7 @@ index 000000000000..06279e2f62ca +#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 000000000000..910d4b4fd3e1 +index 000000000..910d4b4fd --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_runtime_pm.c @@ -0,0 +1,265 @@ @@ -286752,8 +286778,8 @@ index 000000000000..910d4b4fd3e1 +#endif /* KBASE_PM_RUNTIME */ +}; diff --git a/drivers/gpu/arm/bifrost/platform/rk/Kbuild b/drivers/gpu/arm/bifrost/platform/rk/Kbuild -new file mode 100755 -index 000000000000..a1e78cfc4ae7 +new file mode 100644 +index 000000000..a1e78cfc4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/Kbuild @@ -0,0 +1,16 @@ @@ -286774,8 +286800,8 @@ index 000000000000..a1e78cfc4ae7 +bifrost_kbase-y += \ + platform/$(MALI_PLATFORM_DIR)/mali_kbase_config_rk.o diff --git a/drivers/gpu/arm/bifrost/platform/rk/custom_log.h b/drivers/gpu/arm/bifrost/platform/rk/custom_log.h -new file mode 100755 -index 000000000000..5de70ee13d25 +new file mode 100644 +index 000000000..5de70ee13 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/custom_log.h @@ -0,0 +1,192 @@ @@ -286972,8 +286998,8 @@ index 000000000000..5de70ee13d25 + +#endif /* __CUSTOM_LOG_H__ */ diff --git a/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_platform.h -new file mode 100755 -index 000000000000..a2c93fa69e67 +new file mode 100644 +index 000000000..a2c93fa69 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_platform.h @@ -0,0 +1,93 @@ @@ -287071,8 +287097,8 @@ index 000000000000..a2c93fa69e67 +int kbase_platform_rk_init_opp_table(struct kbase_device *kbdev); +int kbase_platform_rk_enable_regulator(struct kbase_device *kbdev); diff --git a/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c -new file mode 100755 -index 000000000000..c32526a86275 +new file mode 100644 +index 000000000..c32526a86 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c @@ -0,0 +1,692 @@ @@ -287769,8 +287795,8 @@ index 000000000000..c32526a86275 + .gpu_clk_notifier_unregister = gpu_clk_notifier_unregister, +}; diff --git a/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_rk.h b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_rk.h -new file mode 100755 -index 000000000000..0a42559df2bf +new file mode 100644 +index 000000000..0a42559df --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_rk.h @@ -0,0 +1,67 @@ @@ -287842,8 +287868,8 @@ index 000000000000..0a42559df2bf +#endif /* _MALI_KBASE_RK_H_ */ + diff --git a/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild b/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild -new file mode 100755 -index 000000000000..e1398fde3976 +new file mode 100644 +index 000000000..e1398fde3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild @@ -0,0 +1,23 @@ @@ -287871,8 +287897,8 @@ index 000000000000..e1398fde3976 + platform/$(MALI_PLATFORM_DIR)/mali_kbase_config_vexpress.o \ + mali_kbase_platform_fake.o diff --git a/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_platform.h -new file mode 100755 -index 000000000000..28f453161358 +new file mode 100644 +index 000000000..28f453161 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_platform.h @@ -0,0 +1,38 @@ @@ -287915,8 +287941,8 @@ index 000000000000..28f453161358 + +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_vexpress.c -new file mode 100755 -index 000000000000..8add708d0f8a +new file mode 100644 +index 000000000..8add708d0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_vexpress.c @@ -0,0 +1,79 @@ @@ -288000,8 +288026,8 @@ index 000000000000..8add708d0f8a +} +#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/Kbuild b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/Kbuild -new file mode 100755 -index 000000000000..e1398fde3976 +new file mode 100644 +index 000000000..e1398fde3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/Kbuild @@ -0,0 +1,23 @@ @@ -288029,8 +288055,8 @@ index 000000000000..e1398fde3976 + platform/$(MALI_PLATFORM_DIR)/mali_kbase_config_vexpress.o \ + mali_kbase_platform_fake.o diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h -new file mode 100755 -index 000000000000..28f453161358 +new file mode 100644 +index 000000000..28f453161 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h @@ -0,0 +1,38 @@ @@ -288073,8 +288099,8 @@ index 000000000000..28f453161358 + +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c -new file mode 100755 -index 000000000000..835b7587cfbf +new file mode 100644 +index 000000000..835b7587c --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c @@ -0,0 +1,77 @@ @@ -288156,8 +288182,8 @@ index 000000000000..835b7587cfbf +} +#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/Kbuild b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/Kbuild -new file mode 100755 -index 000000000000..10f7dc8cf22c +new file mode 100644 +index 000000000..10f7dc8cf --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/Kbuild @@ -0,0 +1,24 @@ @@ -288186,8 +288212,8 @@ index 000000000000..10f7dc8cf22c + platform/$(MALI_PLATFORM_DIR)/mali_kbase_cpu_vexpress.o \ + mali_kbase_platform_fake.o diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h -new file mode 100755 -index 000000000000..28f453161358 +new file mode 100644 +index 000000000..28f453161 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h @@ -0,0 +1,38 @@ @@ -288230,8 +288256,8 @@ index 000000000000..28f453161358 + +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c -new file mode 100755 -index 000000000000..8be30fb25bba +new file mode 100644 +index 000000000..8be30fb25 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c @@ -0,0 +1,77 @@ @@ -288313,8 +288339,8 @@ index 000000000000..8be30fb25bba +} +#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/protected_mode_switcher.h b/drivers/gpu/arm/bifrost/protected_mode_switcher.h -new file mode 100755 -index 000000000000..9dd9253c7e95 +new file mode 100644 +index 000000000..9dd9253c7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/protected_mode_switcher.h @@ -0,0 +1,56 @@ @@ -288375,8 +288401,8 @@ index 000000000000..9dd9253c7e95 + +#endif /* _PROTECTED_MODE_SWITCH_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/Kbuild b/drivers/gpu/arm/bifrost/tests/Kbuild -new file mode 100755 -index 000000000000..38e4dd4d712a +new file mode 100644 +index 000000000..38e4dd4d7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/Kbuild @@ -0,0 +1,31 @@ @@ -288412,8 +288438,8 @@ index 000000000000..38e4dd4d712a +obj-$(CONFIG_MALI_KUTF_MGM_INTEGRATION) += mali_kutf_mgm_integration_test/ + diff --git a/drivers/gpu/arm/bifrost/tests/Kconfig b/drivers/gpu/arm/bifrost/tests/Kconfig -new file mode 100755 -index 000000000000..e9fe22771416 +new file mode 100644 +index 000000000..e9fe22771 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/Kconfig @@ -0,0 +1,69 @@ @@ -288488,7 +288514,7 @@ index 000000000000..e9fe22771416 + 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 000000000000..5581ba934cd3 +index 000000000..5581ba934 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/build.bp @@ -0,0 +1,46 @@ @@ -288539,8 +288565,8 @@ index 000000000000..5581ba934cd3 + srcs: [".*_unit_test/"], +} diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers.h -new file mode 100755 -index 000000000000..3f68efa4257d +new file mode 100644 +index 000000000..3f68efa42 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers.h @@ -0,0 +1,109 @@ @@ -288654,8 +288680,8 @@ index 000000000000..3f68efa4257d + +#endif /* _KERNEL_UTF_HELPERS_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers_user.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers_user.h -new file mode 100755 -index 000000000000..e147cbb90154 +new file mode 100644 +index 000000000..e147cbb90 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers_user.h @@ -0,0 +1,184 @@ @@ -288844,8 +288870,8 @@ index 000000000000..e147cbb90154 + +#endif /* _KERNEL_UTF_HELPERS_USER_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_mem.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_mem.h -new file mode 100755 -index 000000000000..5d4d96ef39b1 +new file mode 100644 +index 000000000..5d4d96ef3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_mem.h @@ -0,0 +1,72 @@ @@ -288922,8 +288948,8 @@ index 000000000000..5d4d96ef39b1 +void kutf_mempool_destroy(struct kutf_mempool *pool); +#endif /* _KERNEL_UTF_MEM_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_resultset.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_resultset.h -new file mode 100755 -index 000000000000..2fb1a47a59b4 +new file mode 100644 +index 000000000..2fb1a47a5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_resultset.h @@ -0,0 +1,180 @@ @@ -289108,8 +289134,8 @@ index 000000000000..2fb1a47a59b4 + +#endif /* _KERNEL_UTF_RESULTSET_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_suite.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_suite.h -new file mode 100755 -index 000000000000..9e459c556013 +new file mode 100644 +index 000000000..9e459c556 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_suite.h @@ -0,0 +1,571 @@ @@ -289685,8 +289711,8 @@ index 000000000000..9e459c556013 + +#endif /* _KERNEL_UTF_SUITE_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_utils.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_utils.h -new file mode 100755 -index 000000000000..f6e758b80d98 +new file mode 100644 +index 000000000..f6e758b80 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_utils.h @@ -0,0 +1,60 @@ @@ -289751,8 +289777,8 @@ index 000000000000..f6e758b80d98 + +#endif /* _KERNEL_UTF_UTILS_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/kutf/Kbuild b/drivers/gpu/arm/bifrost/tests/kutf/Kbuild -new file mode 100755 -index 000000000000..c4790bc66c23 +new file mode 100644 +index 000000000..c4790bc66 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/Kbuild @@ -0,0 +1,31 @@ @@ -289788,8 +289814,8 @@ index 000000000000..c4790bc66c23 + kutf_helpers_user.o +endif diff --git a/drivers/gpu/arm/bifrost/tests/kutf/build.bp b/drivers/gpu/arm/bifrost/tests/kutf/build.bp -new file mode 100755 -index 000000000000..89edae9c5e6f +new file mode 100644 +index 000000000..89edae9c5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/build.bp @@ -0,0 +1,42 @@ @@ -289836,8 +289862,8 @@ index 000000000000..89edae9c5e6f + }, +} diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers.c -new file mode 100755 -index 000000000000..42736195e071 +new file mode 100644 +index 000000000..42736195e --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers.c @@ -0,0 +1,141 @@ @@ -289983,8 +290009,8 @@ index 000000000000..42736195e071 +} +EXPORT_SYMBOL(kutf_helper_stop_ignoring_dmesg); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers_user.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers_user.c -new file mode 100755 -index 000000000000..c4e294325262 +new file mode 100644 +index 000000000..c4e294325 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers_user.c @@ -0,0 +1,474 @@ @@ -290463,8 +290489,8 @@ index 000000000000..c4e294325262 +} +EXPORT_SYMBOL(kutf_helper_output_named_val); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_mem.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_mem.c -new file mode 100755 -index 000000000000..716970abb8c4 +new file mode 100644 +index 000000000..716970abb --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_mem.c @@ -0,0 +1,107 @@ @@ -290576,8 +290602,8 @@ index 000000000000..716970abb8c4 +} +EXPORT_SYMBOL(kutf_mempool_alloc); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_resultset.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_resultset.c -new file mode 100755 -index 000000000000..3a7ade2831b3 +new file mode 100644 +index 000000000..3a7ade283 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_resultset.c @@ -0,0 +1,163 @@ @@ -290745,8 +290771,8 @@ index 000000000000..3a7ade2831b3 + spin_unlock(&kutf_result_lock); +} diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_suite.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_suite.c -new file mode 100755 -index 000000000000..4468066f1b27 +new file mode 100644 +index 000000000..4468066f1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_suite.c @@ -0,0 +1,1216 @@ @@ -291967,8 +291993,8 @@ index 000000000000..4468066f1b27 +module_init(init_kutf_core); +module_exit(exit_kutf_core); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_utils.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_utils.c -new file mode 100755 -index 000000000000..21f5fadcc5f6 +new file mode 100644 +index 000000000..21f5fadcc --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_utils.c @@ -0,0 +1,75 @@ @@ -292048,8 +292074,8 @@ index 000000000000..21f5fadcc5f6 +} +EXPORT_SYMBOL(kutf_dsprintf); diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kbuild b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kbuild -new file mode 100755 -index 000000000000..027bc27c9d3c +new file mode 100644 +index 000000000..027bc27c9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kbuild @@ -0,0 +1,25 @@ @@ -292079,8 +292105,8 @@ index 000000000000..027bc27c9d3c +mali_kutf_clk_rate_trace_test_portal-y := mali_kutf_clk_rate_trace_test.o +endif diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/build.bp b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/build.bp -new file mode 100755 -index 000000000000..225ad69c5042 +new file mode 100644 +index 000000000..225ad69c5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/build.bp @@ -0,0 +1,43 @@ @@ -292128,8 +292154,8 @@ index 000000000000..225ad69c5042 + }, +} diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c -new file mode 100755 -index 000000000000..a6f54b61d4ad +new file mode 100644 +index 000000000..a6f54b61d --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c @@ -0,0 +1,965 @@ @@ -293099,8 +293125,8 @@ index 000000000000..a6f54b61d4ad + +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h -new file mode 100755 -index 000000000000..a716b9f70135 +new file mode 100644 +index 000000000..a716b9f70 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h @@ -0,0 +1,154 @@ @@ -293259,8 +293285,8 @@ index 000000000000..a716b9f70135 + +#endif /* _KUTF_CLK_RATE_TRACE_TEST_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kbuild b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kbuild -new file mode 100755 -index 000000000000..213d6d5ea317 +new file mode 100644 +index 000000000..213d6d5ea --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kbuild @@ -0,0 +1,25 @@ @@ -293290,8 +293316,8 @@ index 000000000000..213d6d5ea317 +mali_kutf_irq_test-y := mali_kutf_irq_test_main.o +endif diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/build.bp b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/build.bp -new file mode 100755 -index 000000000000..155875b9d5cc +new file mode 100644 +index 000000000..155875b9d --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/build.bp @@ -0,0 +1,42 @@ @@ -293338,8 +293364,8 @@ index 000000000000..155875b9d5cc + }, +} diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c -new file mode 100755 -index 000000000000..f2a014d9b5ca +new file mode 100644 +index 000000000..f2a014d9b --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c @@ -0,0 +1,283 @@ @@ -293628,7 +293654,7 @@ index 000000000000..f2a014d9b5ca +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 000000000000..e9bff98b88b6 +index 000000000..e9bff98b8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/Kbuild @@ -0,0 +1,25 @@ @@ -293659,7 +293685,7 @@ index 000000000000..e9bff98b88b6 +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 000000000000..8b995f8a0a07 +index 000000000..8b995f8a0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/build.bp @@ -0,0 +1,41 @@ @@ -293706,7 +293732,7 @@ index 000000000000..8b995f8a0a07 +} 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 000000000000..5a42bd675c2a +index 000000000..5a42bd675 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/mali_kutf_mgm_integration_test_main.c @@ -0,0 +1,210 @@ @@ -293922,7 +293948,7 @@ index 000000000000..5a42bd675c2a +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 000000000000..558be077d483 +index 000000000..558be077d --- /dev/null +++ b/drivers/gpu/arm/bifrost/thirdparty/Kbuild @@ -0,0 +1,21 @@ @@ -293948,8 +293974,8 @@ index 000000000000..558be077d483 + +bifrost_kbase-y += thirdparty/mali_kbase_mmap.o diff --git a/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c b/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c -new file mode 100755 -index 000000000000..1e636b9a7759 +new file mode 100644 +index 000000000..1e636b9a7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c @@ -0,0 +1,420 @@ @@ -294375,7 +294401,7 @@ index 000000000000..1e636b9a7759 +} diff --git a/drivers/gpu/arm/bifrost/tl/Kbuild b/drivers/gpu/arm/bifrost/tl/Kbuild new file mode 100644 -index 000000000000..1c684d489d6f +index 000000000..1c684d489 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/Kbuild @@ -0,0 +1,32 @@ @@ -294412,8 +294438,8 @@ index 000000000000..1c684d489d6f + bifrost_kbase-y += tl/backend/mali_kbase_timeline_jm.o +endif diff --git a/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_csf.c b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_csf.c -new file mode 100755 -index 000000000000..a6062f170ff9 +new file mode 100644 +index 000000000..a6062f170 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_csf.c @@ -0,0 +1,190 @@ @@ -294608,8 +294634,8 @@ index 000000000000..a6062f170ff9 + kbase_timeline_streams_flush(timeline); +} diff --git a/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_jm.c b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_jm.c -new file mode 100755 -index 000000000000..9ba89f59f03b +new file mode 100644 +index 000000000..9ba89f59f --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_jm.c @@ -0,0 +1,96 @@ @@ -294710,8 +294736,8 @@ index 000000000000..9ba89f59f03b + kbase_timeline_streams_flush(timeline); +} diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.c -new file mode 100755 -index 000000000000..9ed59633c41b +new file mode 100644 +index 000000000..9ed59633c --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.c @@ -0,0 +1,412 @@ @@ -295128,8 +295154,8 @@ index 000000000000..9ed59633c41b +} +#endif /* MALI_UNIT_TEST */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.h -new file mode 100755 -index 000000000000..62be6c64c850 +new file mode 100644 +index 000000000..62be6c64c --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.h @@ -0,0 +1,128 @@ @@ -295262,8 +295288,8 @@ index 000000000000..62be6c64c850 + +#endif /* _KBASE_TIMELINE_H */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_io.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_io.c -new file mode 100755 -index 000000000000..ae570064e7d0 +new file mode 100644 +index 000000000..ae570064e --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_io.c @@ -0,0 +1,465 @@ @@ -295733,8 +295759,8 @@ index 000000000000..ae570064e7d0 + return kbase_timeline_streams_flush(filp->private_data); +} diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_priv.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_priv.h -new file mode 100755 -index 000000000000..de30bccc7cca +new file mode 100644 +index 000000000..de30bccc7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_priv.h @@ -0,0 +1,103 @@ @@ -295842,8 +295868,8 @@ index 000000000000..de30bccc7cca + +#endif /* _KBASE_TIMELINE_PRIV_H */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tl_serialize.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_tl_serialize.h -new file mode 100755 -index 000000000000..b6aaadedc6b9 +new file mode 100644 +index 000000000..b6aaadedc --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tl_serialize.h @@ -0,0 +1,123 @@ @@ -295971,8 +295997,8 @@ index 000000000000..b6aaadedc6b9 +} +#endif /* _KBASE_TL_SERIALIZE_H */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.c -new file mode 100755 -index 000000000000..47059deb4da2 +new file mode 100644 +index 000000000..47059deb4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.c @@ -0,0 +1,313 @@ @@ -296290,8 +296316,8 @@ index 000000000000..47059deb4da2 + return wb_size; +} diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.h -new file mode 100755 -index 000000000000..c1428495b11c +new file mode 100644 +index 000000000..c1428495b --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.h @@ -0,0 +1,168 @@ @@ -296464,8 +296490,8 @@ index 000000000000..c1428495b11c + +#endif /* _KBASE_TLSTREAM_H */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.c -new file mode 100755 -index 000000000000..f62c75583566 +new file mode 100644 +index 000000000..f62c75583 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.c @@ -0,0 +1,4223 @@ @@ -300693,8 +300719,8 @@ index 000000000000..f62c75583566 + +/* clang-format on */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.h -new file mode 100755 -index 000000000000..06e4ca4a6bc2 +new file mode 100644 +index 000000000..06e4ca4a6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.h @@ -0,0 +1,4382 @@ @@ -305081,30 +305107,30 @@ index 000000000000..06e4ca4a6bc2 +/* clang-format on */ +#endif diff --git a/drivers/gpu/arm/mali400/.gitignore b/drivers/gpu/arm/mali400/.gitignore -new file mode 100755 -index 000000000000..d91c8078a009 +new file mode 100644 +index 000000000..d91c8078a --- /dev/null +++ b/drivers/gpu/arm/mali400/.gitignore @@ -0,0 +1 @@ +./mali/__malidrv_build_info.c diff --git a/drivers/gpu/arm/mali400/Kbuild b/drivers/gpu/arm/mali400/Kbuild -new file mode 100755 -index 000000000000..dbb7ad3e5d85 +new file mode 100644 +index 000000000..dbb7ad3e5 --- /dev/null +++ b/drivers/gpu/arm/mali400/Kbuild @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += mali/ diff --git a/drivers/gpu/arm/mali400/mali/.gitignore b/drivers/gpu/arm/mali400/mali/.gitignore -new file mode 100755 -index 000000000000..6b1a3ed27a7f +new file mode 100644 +index 000000000..6b1a3ed27 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/.gitignore @@ -0,0 +1 @@ +__malidrv_build_info.c diff --git a/drivers/gpu/arm/mali400/mali/Kbuild b/drivers/gpu/arm/mali400/mali/Kbuild -new file mode 100755 -index 000000000000..7390ab758f22 +new file mode 100644 +index 000000000..7390ab758 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/Kbuild @@ -0,0 +1,254 @@ @@ -305363,8 +305389,8 @@ index 000000000000..7390ab758f22 +$(src)/__malidrv_build_info.c: + @echo 'const char *__malidrv_build_info(void) { return "malidrv: $(VERSION_STRINGS)";}' > $(src)/__malidrv_build_info.c diff --git a/drivers/gpu/arm/mali400/mali/Kconfig b/drivers/gpu/arm/mali400/mali/Kconfig -new file mode 100755 -index 000000000000..082919d91825 +new file mode 100644 +index 000000000..082919d91 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/Kconfig @@ -0,0 +1,119 @@ @@ -305488,8 +305514,8 @@ index 000000000000..082919d91825 + + If unsure, say N. diff --git a/drivers/gpu/arm/mali400/mali/Makefile b/drivers/gpu/arm/mali400/mali/Makefile -new file mode 100755 -index 000000000000..0b91321a5af1 +new file mode 100644 +index 000000000..0b91321a5 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/Makefile @@ -0,0 +1,206 @@ @@ -305700,8 +305726,8 @@ index 000000000000..0b91321a5af1 + +export CONFIG KBUILD_EXTRA_SYMBOLS diff --git a/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c -new file mode 100755 -index 000000000000..79a418c36ccb +new file mode 100644 +index 000000000..79a418c36 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c @@ -0,0 +1,142 @@ @@ -305848,8 +305874,8 @@ index 000000000000..79a418c36ccb + 0x0); +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_broadcast.h b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.h -new file mode 100755 -index 000000000000..0475b7171d8d +new file mode 100644 +index 000000000..0475b7171 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.h @@ -0,0 +1,57 @@ @@ -305911,8 +305937,8 @@ index 000000000000..0475b7171d8d + +#endif /* __MALI_BROADCAST_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c -new file mode 100755 -index 000000000000..5bed27a8c5c9 +new file mode 100644 +index 000000000..5bed27a8c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c @@ -0,0 +1,139 @@ @@ -306056,8 +306082,8 @@ index 000000000000..5bed27a8c5c9 + } +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h -new file mode 100755 -index 000000000000..c9e6e058ea8e +new file mode 100644 +index 000000000..c9e6e058e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h @@ -0,0 +1,30 @@ @@ -306092,8 +306118,8 @@ index 000000000000..c9e6e058ea8e +#endif /* __MALI_CONTROL_TIMER_H__ */ + diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dlbu.c b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.c -new file mode 100755 -index 000000000000..99b7f360768b +new file mode 100644 +index 000000000..99b7f3607 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.c @@ -0,0 +1,213 @@ @@ -306311,8 +306337,8 @@ index 000000000000..99b7f360768b + +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h -new file mode 100755 -index 000000000000..a7ecf41471d8 +new file mode 100644 +index 000000000..a7ecf4147 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h @@ -0,0 +1,45 @@ @@ -306362,8 +306388,8 @@ index 000000000000..a7ecf41471d8 + +#endif /* __MALI_DLBU_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c -new file mode 100755 -index 000000000000..55b21a410754 +new file mode 100644 +index 000000000..55b21a410 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c @@ -0,0 +1,308 @@ @@ -306676,8 +306702,8 @@ index 000000000000..55b21a410754 +#endif + diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.h b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.h -new file mode 100755 -index 000000000000..662348c4e6ac +new file mode 100644 +index 000000000..662348c4e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.h @@ -0,0 +1,34 @@ @@ -306716,8 +306742,8 @@ index 000000000000..662348c4e6ac + +#endif/* __MALI_DVFS_POLICY_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_executor.c b/drivers/gpu/arm/mali400/mali/common/mali_executor.c -new file mode 100755 -index 000000000000..0cf1ec0b0d02 +new file mode 100644 +index 000000000..0cf1ec0b0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_executor.c @@ -0,0 +1,2707 @@ @@ -309429,8 +309455,8 @@ index 000000000000..0cf1ec0b0d02 + mali_executor_unlock(); +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_executor.h b/drivers/gpu/arm/mali400/mali/common/mali_executor.h -new file mode 100755 -index 000000000000..4224d6a6cdc4 +new file mode 100644 +index 000000000..4224d6a6c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_executor.h @@ -0,0 +1,102 @@ @@ -309537,8 +309563,8 @@ index 000000000000..4224d6a6cdc4 +void mali_executor_unlock(void); +#endif /* __MALI_EXECUTOR_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp.c b/drivers/gpu/arm/mali400/mali/common/mali_gp.c -new file mode 100755 -index 000000000000..7d3d4aff7c3f +new file mode 100644 +index 000000000..7d3d4aff7 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp.c @@ -0,0 +1,357 @@ @@ -309900,8 +309926,8 @@ index 000000000000..7d3d4aff7c3f + } +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp.h b/drivers/gpu/arm/mali400/mali/common/mali_gp.h -new file mode 100755 -index 000000000000..3156310f21c7 +new file mode 100644 +index 000000000..3156310f2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp.h @@ -0,0 +1,127 @@ @@ -310033,8 +310059,8 @@ index 000000000000..3156310f21c7 + +#endif /* __MALI_GP_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c -new file mode 100755 -index 000000000000..5d4d9f2530d3 +new file mode 100644 +index 000000000..5d4d9f253 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c @@ -0,0 +1,306 @@ @@ -310345,8 +310371,8 @@ index 000000000000..5d4d9f2530d3 + return schedule_mask; +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp_job.h b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.h -new file mode 100755 -index 000000000000..b84333f9f810 +new file mode 100644 +index 000000000..b84333f9f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.h @@ -0,0 +1,324 @@ @@ -310675,8 +310701,8 @@ index 000000000000..b84333f9f810 + +#endif /* __MALI_GP_JOB_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_group.c b/drivers/gpu/arm/mali400/mali/common/mali_group.c -new file mode 100755 -index 000000000000..47979a2f1a35 +new file mode 100644 +index 000000000..47979a2f1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_group.c @@ -0,0 +1,1875 @@ @@ -312556,8 +312582,8 @@ index 000000000000..47979a2f1a35 +} +#endif /* #if defined(CONFIG_MALI400_PROFILING) */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_group.h b/drivers/gpu/arm/mali400/mali/common/mali_group.h -new file mode 100755 -index 000000000000..32481e4a6748 +new file mode 100644 +index 000000000..32481e4a6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_group.h @@ -0,0 +1,460 @@ @@ -313022,8 +313048,8 @@ index 000000000000..32481e4a6748 + +#endif /* __MALI_GROUP_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c -new file mode 100755 -index 000000000000..a813816e998d +new file mode 100644 +index 000000000..a813816e9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c @@ -0,0 +1,47 @@ @@ -313075,8 +313101,8 @@ index 000000000000..a813816e998d + _mali_osk_mem_unreqregion(core->phys_addr, core->size); +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_hw_core.h b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.h -new file mode 100755 -index 000000000000..38d96e240a20 +new file mode 100644 +index 000000000..38d96e240 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.h @@ -0,0 +1,111 @@ @@ -313192,8 +313218,8 @@ index 000000000000..38d96e240a20 + +#endif /* __MALI_HW_CORE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h b/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h -new file mode 100755 -index 000000000000..6a8f0f0116a4 +new file mode 100644 +index 000000000..6a8f0f011 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h @@ -0,0 +1,181 @@ @@ -313379,8 +313405,8 @@ index 000000000000..6a8f0f0116a4 + +#endif /* __MALI_KERNEL_COMMON_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c -new file mode 100755 -index 000000000000..87f97b710257 +new file mode 100644 +index 000000000..87f97b710 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c @@ -0,0 +1,1349 @@ @@ -314734,8 +314760,8 @@ index 000000000000..87f97b710257 +} +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h -new file mode 100755 -index 000000000000..c471fc955107 +new file mode 100644 +index 000000000..c471fc955 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h @@ -0,0 +1,57 @@ @@ -314797,8 +314823,8 @@ index 000000000000..c471fc955107 +} +#endif /* __MALI_KERNEL_CORE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c -new file mode 100755 -index 000000000000..d1b8dc3b0b0e +new file mode 100644 +index 000000000..d1b8dc3b0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c @@ -0,0 +1,440 @@ @@ -315243,8 +315269,8 @@ index 000000000000..d1b8dc3b0b0e + return last_utilization_pp; +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.h b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.h -new file mode 100755 -index 000000000000..06f585dcb238 +new file mode 100644 +index 000000000..06f585dcb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.h @@ -0,0 +1,72 @@ @@ -315321,8 +315347,8 @@ index 000000000000..06f585dcb238 + +#endif /* __MALI_KERNEL_UTILIZATION_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c b/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c -new file mode 100755 -index 000000000000..dd44e5e7fa03 +new file mode 100644 +index 000000000..dd44e5e7f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c @@ -0,0 +1,45 @@ @@ -315372,8 +315398,8 @@ index 000000000000..dd44e5e7fa03 +} + diff --git a/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c -new file mode 100755 -index 000000000000..fe33f561b2aa +new file mode 100644 +index 000000000..fe33f561b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c @@ -0,0 +1,534 @@ @@ -315912,8 +315938,8 @@ index 000000000000..fe33f561b2aa + return _MALI_OSK_ERR_OK; +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.h b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.h -new file mode 100755 -index 000000000000..c48a8844075f +new file mode 100644 +index 000000000..c48a88440 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.h @@ -0,0 +1,124 @@ @@ -316042,8 +316068,8 @@ index 000000000000..c48a8844075f + +#endif /* __MALI_KERNEL_L2_CACHE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c -new file mode 100755 -index 000000000000..eb95998f1469 +new file mode 100644 +index 000000000..eb95998f1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c @@ -0,0 +1,68 @@ @@ -316116,8 +316142,8 @@ index 000000000000..eb95998f1469 + return _MALI_OSK_ERR_OK; +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.h b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.h -new file mode 100755 -index 000000000000..05013f46f901 +new file mode 100644 +index 000000000..05013f46f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.h @@ -0,0 +1,19 @@ @@ -316141,8 +316167,8 @@ index 000000000000..05013f46f901 + +#endif /* __MALI_MEM_VALIDATION_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu.c b/drivers/gpu/arm/mali400/mali/common/mali_mmu.c -new file mode 100755 -index 000000000000..b82486fa66c0 +new file mode 100644 +index 000000000..b82486fa6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu.c @@ -0,0 +1,433 @@ @@ -316580,8 +316606,8 @@ index 000000000000..b82486fa66c0 +} +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu.h b/drivers/gpu/arm/mali400/mali/common/mali_mmu.h -new file mode 100755 -index 000000000000..6ed48585f3d2 +new file mode 100644 +index 000000000..6ed48585f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu.h @@ -0,0 +1,124 @@ @@ -316710,8 +316736,8 @@ index 000000000000..6ed48585f3d2 + +#endif /* __MALI_MMU_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c -new file mode 100755 -index 000000000000..9ad3e8970b7d +new file mode 100644 +index 000000000..9ad3e8970 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c @@ -0,0 +1,495 @@ @@ -317211,8 +317237,8 @@ index 000000000000..9ad3e8970b7d + MALI_SUCCESS; +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.h b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.h -new file mode 100755 -index 000000000000..3fdf07210259 +new file mode 100644 +index 000000000..3fdf07210 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.h @@ -0,0 +1,110 @@ @@ -317327,8 +317353,8 @@ index 000000000000..3fdf07210259 + +#endif /* __MALI_MMU_PAGE_DIRECTORY_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk.h b/drivers/gpu/arm/mali400/mali/common/mali_osk.h -new file mode 100755 -index 000000000000..9ade362d6b28 +new file mode 100644 +index 000000000..9ade362d6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk.h @@ -0,0 +1,1389 @@ @@ -318722,8 +318748,8 @@ index 000000000000..9ade362d6b28 + +#endif /* __MALI_OSK_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h -new file mode 100755 -index 000000000000..bb1831753a40 +new file mode 100644 +index 000000000..bb1831753 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h @@ -0,0 +1,162 @@ @@ -318890,8 +318916,8 @@ index 000000000000..bb1831753a40 + +#endif /* __MALI_OSK_BITOPS_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h -new file mode 100755 -index 000000000000..9af2d7d4d621 +new file mode 100644 +index 000000000..9af2d7d4d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h @@ -0,0 +1,273 @@ @@ -319169,8 +319195,8 @@ index 000000000000..9af2d7d4d621 + +#endif /* __MALI_OSK_LIST_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h -new file mode 100755 -index 000000000000..a4c1618e9252 +new file mode 100644 +index 000000000..a4c1618e9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h @@ -0,0 +1,155 @@ @@ -319330,8 +319356,8 @@ index 000000000000..a4c1618e9252 + +#endif /* __MALI_OSK_MALI_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h -new file mode 100755 -index 000000000000..6e4583db1c80 +new file mode 100644 +index 000000000..6e4583db1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h @@ -0,0 +1,146 @@ @@ -319482,8 +319508,8 @@ index 000000000000..6e4583db1c80 + + diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h -new file mode 100755 -index 000000000000..b6fa94ce16b3 +new file mode 100644 +index 000000000..b6fa94ce1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h @@ -0,0 +1,471 @@ @@ -319959,8 +319985,8 @@ index 000000000000..b6fa94ce16b3 + +#endif /* __MALI_OSK_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm.c b/drivers/gpu/arm/mali400/mali/common/mali_pm.c -new file mode 100755 -index 000000000000..3989a33aeaef +new file mode 100644 +index 000000000..3989a33ae --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm.c @@ -0,0 +1,1362 @@ @@ -321327,8 +321353,8 @@ index 000000000000..3989a33aeaef + return pd_mask_wanted; +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm.h b/drivers/gpu/arm/mali400/mali/common/mali_pm.h -new file mode 100755 -index 000000000000..dac69958e034 +new file mode 100644 +index 000000000..dac69958e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm.h @@ -0,0 +1,91 @@ @@ -321424,8 +321450,8 @@ index 000000000000..dac69958e034 +u32 mali_pm_get_wanted_mask(void); +#endif /* __MALI_PM_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.c b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.c -new file mode 100755 -index 000000000000..8290f7d88f6a +new file mode 100644 +index 000000000..8290f7d88 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.c @@ -0,0 +1,209 @@ @@ -321639,8 +321665,8 @@ index 000000000000..8290f7d88f6a +} +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h -new file mode 100755 -index 000000000000..5776abe39f3d +new file mode 100644 +index 000000000..5776abe39 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h @@ -0,0 +1,104 @@ @@ -321749,8 +321775,8 @@ index 000000000000..5776abe39f3d + +#endif /* __MALI_PM_DOMAIN_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c -new file mode 100755 -index 000000000000..cf74823230f7 +new file mode 100644 +index 000000000..cf7482323 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c @@ -0,0 +1,255 @@ @@ -322010,8 +322036,8 @@ index 000000000000..cf74823230f7 + _mali_osk_spinlock_irq_unlock(mdev->mali_metrics.lock); +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.h b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.h -new file mode 100755 -index 000000000000..2b136b0de4e3 +new file mode 100644 +index 000000000..2b136b0de --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.h @@ -0,0 +1,74 @@ @@ -322090,8 +322116,8 @@ index 000000000000..2b136b0de4e3 +#endif +#endif /* __MALI_PM_METRICS_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pmu.c b/drivers/gpu/arm/mali400/mali/common/mali_pmu.c -new file mode 100755 -index 000000000000..6f0af59f6fd4 +new file mode 100644 +index 000000000..6f0af59f6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pmu.c @@ -0,0 +1,270 @@ @@ -322366,8 +322392,8 @@ index 000000000000..6f0af59f6fd4 + return _MALI_OSK_ERR_OK; +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pmu.h b/drivers/gpu/arm/mali400/mali/common/mali_pmu.h -new file mode 100755 -index 000000000000..5b856240fdac +new file mode 100644 +index 000000000..5b856240f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pmu.h @@ -0,0 +1,123 @@ @@ -322495,8 +322521,8 @@ index 000000000000..5b856240fdac + +#endif /* __MALI_PMU_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp.c b/drivers/gpu/arm/mali400/mali/common/mali_pp.c -new file mode 100755 -index 000000000000..2dd8b8766f8e +new file mode 100644 +index 000000000..2dd8b8766 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp.c @@ -0,0 +1,502 @@ @@ -323003,8 +323029,8 @@ index 000000000000..2dd8b8766f8e +} +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp.h b/drivers/gpu/arm/mali400/mali/common/mali_pp.h -new file mode 100755 -index 000000000000..f98b29866ffa +new file mode 100644 +index 000000000..f98b29866 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp.h @@ -0,0 +1,138 @@ @@ -323147,8 +323173,8 @@ index 000000000000..f98b29866ffa + +#endif /* __MALI_PP_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c -new file mode 100755 -index 000000000000..b0216d4c1ac8 +new file mode 100644 +index 000000000..b0216d4c1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c @@ -0,0 +1,316 @@ @@ -323469,8 +323495,8 @@ index 000000000000..b0216d4c1ac8 + return pp_counter_per_sub_job_src1[sub_job]; +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp_job.h b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.h -new file mode 100755 -index 000000000000..d0331f398ff9 +new file mode 100644 +index 000000000..d0331f398 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.h @@ -0,0 +1,594 @@ @@ -324069,8 +324095,8 @@ index 000000000000..d0331f398ff9 + +#endif /* __MALI_PP_JOB_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c -new file mode 100755 -index 000000000000..b5e6cfddbb0e +new file mode 100644 +index 000000000..b5e6cfddb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c @@ -0,0 +1,1548 @@ @@ -325623,8 +325649,8 @@ index 000000000000..b5e6cfddbb0e + mali_executor_running_status_print(); +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_scheduler.h b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.h -new file mode 100755 -index 000000000000..de81a421ea9a +new file mode 100644 +index 000000000..de81a421e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.h @@ -0,0 +1,131 @@ @@ -325760,8 +325786,8 @@ index 000000000000..de81a421ea9a + +#endif /* __MALI_SCHEDULER_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h b/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h -new file mode 100755 -index 000000000000..ba1d71d01d46 +new file mode 100644 +index 000000000..ba1d71d01 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h @@ -0,0 +1,29 @@ @@ -325795,8 +325821,8 @@ index 000000000000..ba1d71d01d46 + +#endif /* __MALI_SCHEDULER_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_session.c b/drivers/gpu/arm/mali400/mali/common/mali_session.c -new file mode 100755 -index 000000000000..7504fb108779 +new file mode 100644 +index 000000000..7504fb108 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_session.c @@ -0,0 +1,155 @@ @@ -325956,8 +325982,8 @@ index 000000000000..7504fb108779 +#endif +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_session.h b/drivers/gpu/arm/mali400/mali/common/mali_session.h -new file mode 100755 -index 000000000000..da8b9927ee60 +new file mode 100644 +index 000000000..da8b9927e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_session.h @@ -0,0 +1,136 @@ @@ -326098,8 +326124,8 @@ index 000000000000..da8b9927ee60 + +#endif /* __MALI_SESSION_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c -new file mode 100755 -index 000000000000..35cd830bc83a +new file mode 100644 +index 000000000..35cd830bc --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c @@ -0,0 +1,438 @@ @@ -326542,8 +326568,8 @@ index 000000000000..35cd830bc83a + } +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h -new file mode 100755 -index 000000000000..018ef4c527d9 +new file mode 100644 +index 000000000..018ef4c52 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h @@ -0,0 +1,190 @@ @@ -326738,8 +326764,8 @@ index 000000000000..018ef4c527d9 + +#endif /* __MALI_SOFT_JOB_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c -new file mode 100755 -index 000000000000..f829e99f02ab +new file mode 100644 +index 000000000..f829e99f0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c @@ -0,0 +1,77 @@ @@ -326821,8 +326847,8 @@ index 000000000000..f829e99f02ab + } +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h -new file mode 100755 -index 000000000000..4d788ec1bbe4 +new file mode 100644 +index 000000000..4d788ec1b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h @@ -0,0 +1,70 @@ @@ -326897,8 +326923,8 @@ index 000000000000..4d788ec1bbe4 + +#endif /* __MALI_SPINLOCK_REENTRANT_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline.c b/drivers/gpu/arm/mali400/mali/common/mali_timeline.c -new file mode 100755 -index 000000000000..ffffee9306ce +new file mode 100644 +index 000000000..ffffee930 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline.c @@ -0,0 +1,1964 @@ @@ -328867,8 +328893,8 @@ index 000000000000..ffffee9306ce +} +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline.h b/drivers/gpu/arm/mali400/mali/common/mali_timeline.h -new file mode 100755 -index 000000000000..3e8bfc8fb733 +new file mode 100644 +index 000000000..3e8bfc8fb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline.h @@ -0,0 +1,587 @@ @@ -329460,8 +329486,8 @@ index 000000000000..3e8bfc8fb733 + +#endif /* __MALI_TIMELINE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c -new file mode 100755 -index 000000000000..1ab13f50997f +new file mode 100644 +index 000000000..1ab13f509 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c @@ -0,0 +1,218 @@ @@ -329684,8 +329710,8 @@ index 000000000000..1ab13f50997f + } +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h -new file mode 100755 -index 000000000000..9da12baeef1a +new file mode 100644 +index 000000000..9da12baee --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h @@ -0,0 +1,67 @@ @@ -329757,8 +329783,8 @@ index 000000000000..9da12baeef1a + +#endif /* __MALI_TIMELINE_FENCE_WAIT_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c -new file mode 100755 -index 000000000000..bb7f6a04e8bd +new file mode 100644 +index 000000000..bb7f6a04e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c @@ -0,0 +1,179 @@ @@ -329942,8 +329968,8 @@ index 000000000000..bb7f6a04e8bd +} +#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h -new file mode 100755 -index 000000000000..65e368ae7c9e +new file mode 100644 +index 000000000..65e368ae7 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h @@ -0,0 +1,51 @@ @@ -329999,8 +330025,8 @@ index 000000000000..65e368ae7c9e + +#endif /* __MALI_TIMELINE_SYNC_FENCE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_ukk.h b/drivers/gpu/arm/mali400/mali/common/mali_ukk.h -new file mode 100755 -index 000000000000..55a05c50436a +new file mode 100644 +index 000000000..55a05c504 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_ukk.h @@ -0,0 +1,551 @@ @@ -330556,8 +330582,8 @@ index 000000000000..55a05c50436a + +#endif /* __MALI_UKK_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c -new file mode 100755 -index 000000000000..1911eff87a72 +new file mode 100644 +index 000000000..1911eff87 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c @@ -0,0 +1,147 @@ @@ -330709,8 +330735,8 @@ index 000000000000..1911eff87a72 + return _MALI_OSK_ERR_OK; +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.h b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.h -new file mode 100755 -index 000000000000..da9c0630e371 +new file mode 100644 +index 000000000..da9c0630e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.h @@ -0,0 +1,39 @@ @@ -330754,8 +330780,8 @@ index 000000000000..da9c0630e371 +#endif +#endif /* __MALI_KERNEL_USER_SETTING__ */ diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard.h -new file mode 100755 -index 000000000000..7df55c951d6f +new file mode 100644 +index 000000000..7df55c951 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard.h @@ -0,0 +1,526 @@ @@ -331286,8 +331312,8 @@ index 000000000000..7df55c951d6f + +#endif diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h -new file mode 100755 -index 000000000000..686708eaef75 +new file mode 100644 +index 000000000..686708eae --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h @@ -0,0 +1,97 @@ @@ -331389,8 +331415,8 @@ index 000000000000..686708eaef75 + +#endif /* __MALI_UTGARD_IOCTL_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h -new file mode 100755 -index 000000000000..17d31de931d0 +new file mode 100644 +index 000000000..17d31de93 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h @@ -0,0 +1,190 @@ @@ -331585,8 +331611,8 @@ index 000000000000..17d31de931d0 + +#endif /*_MALI_UTGARD_PROFILING_EVENTS_H_*/ diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h -new file mode 100755 -index 000000000000..c1927d1450dc +new file mode 100644 +index 000000000..c1927d145 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h @@ -0,0 +1,305 @@ @@ -331896,8 +331922,8 @@ index 000000000000..c1927d1450dc + +#endif /* __MALI_UTGARD_PROFILING_GATOR_API_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h -new file mode 100755 -index 000000000000..34656f09b2ab +new file mode 100644 +index 000000000..34656f09b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h @@ -0,0 +1,1108 @@ @@ -333010,8 +333036,8 @@ index 000000000000..34656f09b2ab + +#endif /* __MALI_UTGARD_UK_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h b/drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h -new file mode 100755 -index 000000000000..6fafc6777e48 +new file mode 100644 +index 000000000..6fafc6777 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h @@ -0,0 +1,30 @@ @@ -333046,8 +333072,8 @@ index 000000000000..6fafc6777e48 + +#endif /* __MALI_KERNEL_LICENSE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c -new file mode 100755 -index 000000000000..7438cb4951e2 +new file mode 100644 +index 000000000..7438cb495 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c @@ -0,0 +1,362 @@ @@ -333414,8 +333440,8 @@ index 000000000000..7438cb4951e2 + mdev->devfreq = NULL; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h -new file mode 100755 -index 000000000000..ba7c017d88dc +new file mode 100644 +index 000000000..ba7c017d8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h @@ -0,0 +1,17 @@ @@ -333437,8 +333463,8 @@ index 000000000000..ba7c017d88dc + +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c b/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c -new file mode 100755 -index 000000000000..95c3ea12d645 +new file mode 100644 +index 000000000..95c3ea12d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c @@ -0,0 +1,36 @@ @@ -333479,8 +333505,8 @@ index 000000000000..95c3ea12d645 + +EXPORT_SYMBOL(mali_dev_resume); diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c -new file mode 100755 -index 000000000000..e026e11e4bc5 +new file mode 100644 +index 000000000..e026e11e4 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c @@ -0,0 +1,439 @@ @@ -333924,8 +333950,8 @@ index 000000000000..e026e11e4bc5 + ww_acquire_fini(ww_actx); +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.h b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.h -new file mode 100755 -index 000000000000..d44f6d1a8926 +new file mode 100644 +index 000000000..d44f6d1a8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.h @@ -0,0 +1,124 @@ @@ -334054,8 +334080,8 @@ index 000000000000..d44f6d1a8926 + u32 num_dma_reservation_object, struct ww_acquire_ctx *ww_actx); +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.c b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.c -new file mode 100755 -index 000000000000..e13cbad3e513 +new file mode 100644 +index 000000000..e13cbad3e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.c @@ -0,0 +1,783 @@ @@ -334843,8 +334869,8 @@ index 000000000000..e13cbad3e513 +}; +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h -new file mode 100755 -index 000000000000..dbb29222ba98 +new file mode 100644 +index 000000000..dbb29222b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h @@ -0,0 +1,191 @@ @@ -335040,8 +335066,8 @@ index 000000000000..dbb29222ba98 +#endif /*LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)*/ +#endif /* _MALI_INTERNAL_SYNC_H */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c -new file mode 100755 -index 000000000000..534db255ed02 +new file mode 100644 +index 000000000..534db255e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c @@ -0,0 +1,1177 @@ @@ -336223,8 +336249,8 @@ index 000000000000..534db255ed02 +MODULE_AUTHOR("ARM Ltd."); +MODULE_VERSION(SVN_REV_STRING); diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h -new file mode 100755 -index 000000000000..be754cb15646 +new file mode 100644 +index 000000000..be754cb15 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h @@ -0,0 +1,36 @@ @@ -336265,8 +336291,8 @@ index 000000000000..be754cb15646 + +#endif /* __MALI_KERNEL_LINUX_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c -new file mode 100755 -index 000000000000..7bda438fef50 +new file mode 100644 +index 000000000..7bda438fe --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c @@ -0,0 +1,1410 @@ @@ -337681,8 +337707,8 @@ index 000000000000..7bda438fef50 + +#endif /* MALI_LICENSE_IS_GPL */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h -new file mode 100755 -index 000000000000..91580a87c1e1 +new file mode 100644 +index 000000000..91580a87c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h @@ -0,0 +1,29 @@ @@ -337716,8 +337742,8 @@ index 000000000000..91580a87c1e1 + +#endif /* __MALI_KERNEL_LINUX_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h b/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h -new file mode 100755 -index 000000000000..222260823c81 +new file mode 100644 +index 000000000..222260823 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h @@ -0,0 +1,161 @@ @@ -337883,8 +337909,8 @@ index 000000000000..222260823c81 +#include + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory.c -new file mode 100755 -index 000000000000..dfc769e6cc40 +new file mode 100644 +index 000000000..dfc769e6c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory.c @@ -0,0 +1,531 @@ @@ -338420,8 +338446,8 @@ index 000000000000..dfc769e6cc40 + + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory.h -new file mode 100755 -index 000000000000..efebbef235d8 +new file mode 100644 +index 000000000..efebbef23 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory.h @@ -0,0 +1,143 @@ @@ -338569,8 +338595,8 @@ index 000000000000..efebbef235d8 + +#endif /* __MALI_MEMORY_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c -new file mode 100755 -index 000000000000..bccef3576914 +new file mode 100644 +index 000000000..bccef3576 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c @@ -0,0 +1,362 @@ @@ -338937,8 +338963,8 @@ index 000000000000..bccef3576914 + return (allocator->total_num - atomic_read(&allocator->free_num)) * _MALI_OSK_MALI_PAGE_SIZE; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.h -new file mode 100755 -index 000000000000..70fd9ec25f50 +new file mode 100644 +index 000000000..70fd9ec25 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.h @@ -0,0 +1,58 @@ @@ -339001,8 +339027,8 @@ index 000000000000..70fd9ec25f50 + +#endif /* __MALI_BLOCK_ALLOCATOR_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c -new file mode 100755 -index 000000000000..54e342a1f7ce +new file mode 100644 +index 000000000..54e342a1f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c @@ -0,0 +1,776 @@ @@ -339783,8 +339809,8 @@ index 000000000000..54e342a1f7ce + return _MALI_OSK_ERR_OK; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h -new file mode 100755 -index 000000000000..5f83a37fc8f8 +new file mode 100644 +index 000000000..5f83a37fc --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h @@ -0,0 +1,48 @@ @@ -339837,8 +339863,8 @@ index 000000000000..5f83a37fc8f8 +#endif + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.c -new file mode 100755 -index 000000000000..a9db577cb851 +new file mode 100644 +index 000000000..a9db577cb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.c @@ -0,0 +1,262 @@ @@ -340105,8 +340131,8 @@ index 000000000000..a9db577cb851 +} + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h -new file mode 100755 -index 000000000000..defa08d52a46 +new file mode 100644 +index 000000000..defa08d52 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h @@ -0,0 +1,64 @@ @@ -340175,8 +340201,8 @@ index 000000000000..defa08d52a46 + +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c -new file mode 100755 -index 000000000000..1f4565127a6b +new file mode 100644 +index 000000000..1f4565127 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c @@ -0,0 +1,369 @@ @@ -340550,8 +340576,8 @@ index 000000000000..1f4565127a6b + _mali_osk_free(mem); +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.h -new file mode 100755 -index 000000000000..a9b2870389ff +new file mode 100644 +index 000000000..a9b287038 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.h @@ -0,0 +1,53 @@ @@ -340609,8 +340635,8 @@ index 000000000000..a9b2870389ff + +#endif /* __MALI_MEMORY_DMA_BUF_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c -new file mode 100755 -index 000000000000..76018b7ab90b +new file mode 100644 +index 000000000..76018b7ab --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c @@ -0,0 +1,89 @@ @@ -340704,8 +340730,8 @@ index 000000000000..76018b7ab90b +} + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h -new file mode 100755 -index 000000000000..2db178d96233 +new file mode 100644 +index 000000000..2db178d96 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h @@ -0,0 +1,29 @@ @@ -340739,8 +340765,8 @@ index 000000000000..2db178d96233 + +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c -new file mode 100755 -index 000000000000..6c0a2e9a8a14 +new file mode 100644 +index 000000000..6c0a2e9a8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c @@ -0,0 +1,992 @@ @@ -341737,8 +341763,8 @@ index 000000000000..6c0a2e9a8a14 + return _MALI_OSK_ERR_OK; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h -new file mode 100755 -index 000000000000..23d8cde753a1 +new file mode 100644 +index 000000000..23d8cde75 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h @@ -0,0 +1,51 @@ @@ -341794,8 +341820,8 @@ index 000000000000..23d8cde753a1 +#endif + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c -new file mode 100755 -index 000000000000..9c8214ba3b8e +new file mode 100644 +index 000000000..9c8214ba3 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c @@ -0,0 +1,810 @@ @@ -342610,8 +342636,8 @@ index 000000000000..9c8214ba3b8e + return atomic_read(&mali_mem_os_allocator.allocated_pages) * _MALI_OSK_MALI_PAGE_SIZE; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h -new file mode 100755 -index 000000000000..8c9b35d0b230 +new file mode 100644 +index 000000000..8c9b35d0b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h @@ -0,0 +1,54 @@ @@ -342670,8 +342696,8 @@ index 000000000000..8c9b35d0b230 + +#endif /* __MALI_MEMORY_OS_ALLOC_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c -new file mode 100755 -index 000000000000..63506bfbe9fe +new file mode 100644 +index 000000000..63506bfbe --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c @@ -0,0 +1,170 @@ @@ -342846,8 +342872,8 @@ index 000000000000..63506bfbe9fe + + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h -new file mode 100755 -index 000000000000..48691d4790fe +new file mode 100644 +index 000000000..48691d479 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h @@ -0,0 +1,30 @@ @@ -342882,8 +342908,8 @@ index 000000000000..48691d4790fe + +#endif /* __MALI_MEMORY_SECURE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c -new file mode 100755 -index 000000000000..d682785b9673 +new file mode 100644 +index 000000000..d682785b9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c @@ -0,0 +1,943 @@ @@ -343831,8 +343857,8 @@ index 000000000000..d682785b9673 +} +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h -new file mode 100755 -index 000000000000..5810960e204a +new file mode 100644 +index 000000000..5810960e2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h @@ -0,0 +1,121 @@ @@ -343958,8 +343984,8 @@ index 000000000000..5810960e204a +#endif /* __MALI_MEMORY_SWAP_ALLOC_H__ */ + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_types.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_types.h -new file mode 100755 -index 000000000000..33db40929642 +new file mode 100644 +index 000000000..33db40929 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_types.h @@ -0,0 +1,219 @@ @@ -344183,8 +344209,8 @@ index 000000000000..33db40929642 +#define MALI_MEM_FLAG_CAN_RESIZE (_MALI_MEMORY_ALLOCATE_RESIZEABLE) +#endif /* __MALI_MEMORY_TYPES__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.c -new file mode 100755 -index 000000000000..666d4b0fb1cd +new file mode 100644 +index 000000000..666d4b0fb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.c @@ -0,0 +1,154 @@ @@ -344343,8 +344369,8 @@ index 000000000000..666d4b0fb1cd +} + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h -new file mode 100755 -index 000000000000..c314c8dcbf1c +new file mode 100644 +index 000000000..c314c8dcb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h @@ -0,0 +1,29 @@ @@ -344378,8 +344404,8 @@ index 000000000000..c314c8dcbf1c + +#endif /* __MALI_MEMORY_DMA_BUF_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c -new file mode 100755 -index 000000000000..8e13e923c3fb +new file mode 100644 +index 000000000..8e13e923c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c @@ -0,0 +1,158 @@ @@ -344542,8 +344568,8 @@ index 000000000000..8e13e923c3fb + } +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h -new file mode 100755 -index 000000000000..33ac99509740 +new file mode 100644 +index 000000000..33ac99509 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h @@ -0,0 +1,20 @@ @@ -344568,8 +344594,8 @@ index 000000000000..33ac99509740 + +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c -new file mode 100755 -index 000000000000..0b31e3a23432 +new file mode 100644 +index 000000000..0b31e3a23 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c @@ -0,0 +1,127 @@ @@ -344701,8 +344727,8 @@ index 000000000000..0b31e3a23432 +} + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h -new file mode 100755 -index 000000000000..fd03ed9f2bbb +new file mode 100644 +index 000000000..fd03ed9f2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h @@ -0,0 +1,35 @@ @@ -344742,8 +344768,8 @@ index 000000000000..fd03ed9f2bbb + +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c -new file mode 100755 -index 000000000000..5bc0e52ebe23 +new file mode 100644 +index 000000000..5bc0e52eb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c @@ -0,0 +1,59 @@ @@ -344807,8 +344833,8 @@ index 000000000000..5bc0e52ebe23 + return atomic_xchg((atomic_t *)&atom->u.val, val); +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_bitmap.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_bitmap.c -new file mode 100755 -index 000000000000..fb9ccd2ad1e2 +new file mode 100644 +index 000000000..fb9ccd2ad --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_bitmap.c @@ -0,0 +1,152 @@ @@ -344965,8 +344991,8 @@ index 000000000000..fb9ccd2ad1e2 +} + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c -new file mode 100755 -index 000000000000..5c8b9ceab9ab +new file mode 100644 +index 000000000..5c8b9ceab --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c @@ -0,0 +1,200 @@ @@ -345171,8 +345197,8 @@ index 000000000000..5c8b9ceab9ab + return ret; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.c -new file mode 100755 -index 000000000000..ed5f0b0da7cb +new file mode 100644 +index 000000000..ed5f0b0da --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.c @@ -0,0 +1,287 @@ @@ -345464,8 +345490,8 @@ index 000000000000..ed5f0b0da7cb +#endif /* LOCK_ORDER_CHECKING */ +#endif /* DEBUG */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.h b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.h -new file mode 100755 -index 000000000000..6fd5af95285b +new file mode 100644 +index 000000000..6fd5af952 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.h @@ -0,0 +1,326 @@ @@ -345796,8 +345822,8 @@ index 000000000000..6fd5af95285b + +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c -new file mode 100755 -index 000000000000..994b04dad745 +new file mode 100644 +index 000000000..994b04dad --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c @@ -0,0 +1,146 @@ @@ -345948,8 +345974,8 @@ index 000000000000..994b04dad745 + return _MALI_OSK_ERR_OK; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_mali.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_mali.c -new file mode 100755 -index 000000000000..a729d0499869 +new file mode 100644 +index 000000000..a729d0499 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_mali.c @@ -0,0 +1,505 @@ @@ -346459,8 +346485,8 @@ index 000000000000..a729d0499869 + + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c -new file mode 100755 -index 000000000000..0b2d00762771 +new file mode 100644 +index 000000000..0b2d00762 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c @@ -0,0 +1,27 @@ @@ -346492,8 +346518,8 @@ index 000000000000..0b2d00762771 + return fls(input); +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_memory.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_memory.c -new file mode 100755 -index 000000000000..174616b566c4 +new file mode 100644 +index 000000000..174616b56 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_memory.c @@ -0,0 +1,61 @@ @@ -346559,8 +346585,8 @@ index 000000000000..174616b566c4 + return MALI_TRUE; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_misc.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_misc.c -new file mode 100755 -index 000000000000..9845187f8122 +new file mode 100644 +index 000000000..9845187f8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_misc.c @@ -0,0 +1,81 @@ @@ -346646,8 +346672,8 @@ index 000000000000..9845187f8122 + return tid; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_notification.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_notification.c -new file mode 100755 -index 000000000000..a05f8f066964 +new file mode 100644 +index 000000000..a05f8f066 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_notification.c @@ -0,0 +1,182 @@ @@ -346834,8 +346860,8 @@ index 000000000000..a05f8f066964 + return _MALI_OSK_ERR_OK; /* all ok */ +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_pm.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_pm.c -new file mode 100755 -index 000000000000..e28e2eb21fe2 +new file mode 100644 +index 000000000..e28e2eb21 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_pm.c @@ -0,0 +1,83 @@ @@ -346923,8 +346949,8 @@ index 000000000000..e28e2eb21fe2 +#endif +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_profiling.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_profiling.c -new file mode 100755 -index 000000000000..9e977ea4d0ff +new file mode 100644 +index 000000000..9e977ea4d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_profiling.c @@ -0,0 +1,1282 @@ @@ -348211,8 +348237,8 @@ index 000000000000..9e977ea4d0ff +EXPORT_SYMBOL(_mali_profiling_get_api_version); +EXPORT_SYMBOL(_mali_profiling_get_mali_version); diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_specific.h b/drivers/gpu/arm/mali400/mali/linux/mali_osk_specific.h -new file mode 100755 -index 000000000000..af51161f9da1 +new file mode 100644 +index 000000000..af51161f9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_specific.h @@ -0,0 +1,74 @@ @@ -348291,8 +348317,8 @@ index 000000000000..af51161f9da1 + +#endif /* __MALI_OSK_SPECIFIC_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c -new file mode 100755 -index 000000000000..d295e712ac7a +new file mode 100644 +index 000000000..d295e712a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c @@ -0,0 +1,59 @@ @@ -348356,8 +348382,8 @@ index 000000000000..d295e712ac7a + return (u64)timespec64_to_ns(&tsval); +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_timers.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_timers.c -new file mode 100755 -index 000000000000..d01c1148272a +new file mode 100644 +index 000000000..d01c11482 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_timers.c @@ -0,0 +1,76 @@ @@ -348438,8 +348464,8 @@ index 000000000000..d01c1148272a + kfree(tim); +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_wait_queue.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wait_queue.c -new file mode 100755 -index 000000000000..fa12abd3f5dc +new file mode 100644 +index 000000000..fa12abd3f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wait_queue.c @@ -0,0 +1,78 @@ @@ -348522,8 +348548,8 @@ index 000000000000..fa12abd3f5dc + kfree(queue); +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_wq.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wq.c -new file mode 100755 -index 000000000000..d5e258a83a29 +new file mode 100644 +index 000000000..d5e258a83 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wq.c @@ -0,0 +1,240 @@ @@ -348768,8 +348794,8 @@ index 000000000000..d5e258a83a29 + +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c b/drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c -new file mode 100755 -index 000000000000..931d7f07a1d2 +new file mode 100644 +index 000000000..931d7f07a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c @@ -0,0 +1,23 @@ @@ -348797,8 +348823,8 @@ index 000000000000..931d7f07a1d2 + +EXPORT_SYMBOL(mali_perf_set_num_pp_cores); diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h -new file mode 100755 -index 000000000000..4661cac42b3f +new file mode 100644 +index 000000000..4661cac42 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h @@ -0,0 +1,17 @@ @@ -348820,8 +348846,8 @@ index 000000000000..4661cac42b3f + +#endif /* __MALI_PROFILING_EVENTS_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h -new file mode 100755 -index 000000000000..6fdaa427c4cf +new file mode 100644 +index 000000000..6fdaa427c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h @@ -0,0 +1,17 @@ @@ -348843,8 +348869,8 @@ index 000000000000..6fdaa427c4cf + +#endif /* __MALI_PROFILING_GATOR_API_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c -new file mode 100755 -index 000000000000..c3a526f0ad90 +new file mode 100644 +index 000000000..c3a526f0a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c @@ -0,0 +1,275 @@ @@ -349124,8 +349150,8 @@ index 000000000000..c3a526f0ad90 + return prof_state == MALI_PROFILING_STATE_RETURN ? MALI_TRUE : MALI_FALSE; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.h b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.h -new file mode 100755 -index 000000000000..f17b4583307a +new file mode 100644 +index 000000000..f17b45833 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.h @@ -0,0 +1,35 @@ @@ -349165,8 +349191,8 @@ index 000000000000..f17b4583307a + +#endif /* __MALI_PROFILING_INTERNAL_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_sync.c b/drivers/gpu/arm/mali400/mali/linux/mali_sync.c -new file mode 100755 -index 000000000000..0d98b518f1ac +new file mode 100644 +index 000000000..0d98b518f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_sync.c @@ -0,0 +1,665 @@ @@ -349836,8 +349862,8 @@ index 000000000000..0d98b518f1ac + + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_sync.h b/drivers/gpu/arm/mali400/mali/linux/mali_sync.h -new file mode 100755 -index 000000000000..91be8b9cf314 +new file mode 100644 +index 000000000..91be8b9cf --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_sync.h @@ -0,0 +1,169 @@ @@ -350011,8 +350037,8 @@ index 000000000000..91be8b9cf314 + +#endif /* _MALI_SYNC_H_ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h b/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h -new file mode 100755 -index 000000000000..68b27b8be067 +new file mode 100644 +index 000000000..68b27b8be --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h @@ -0,0 +1,17 @@ @@ -350034,8 +350060,8 @@ index 000000000000..68b27b8be067 + +#endif /* __MALI_UK_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c -new file mode 100755 -index 000000000000..0bd1cddb10c6 +new file mode 100644 +index 000000000..0bd1cddb1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c @@ -0,0 +1,171 @@ @@ -350211,8 +350237,8 @@ index 000000000000..0bd1cddb10c6 + return 0; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_gp.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_gp.c -new file mode 100755 -index 000000000000..68fcd971938a +new file mode 100644 +index 000000000..68fcd9719 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_gp.c @@ -0,0 +1,91 @@ @@ -350308,8 +350334,8 @@ index 000000000000..68fcd971938a + return 0; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_mem.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_mem.c -new file mode 100755 -index 000000000000..baea4c688db9 +new file mode 100644 +index 000000000..baea4c688 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_mem.c @@ -0,0 +1,333 @@ @@ -350647,8 +350673,8 @@ index 000000000000..baea4c688db9 +} + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c -new file mode 100755 -index 000000000000..a9b0958c06aa +new file mode 100644 +index 000000000..a9b0958c0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c @@ -0,0 +1,105 @@ @@ -350758,8 +350784,8 @@ index 000000000000..a9b0958c06aa + return 0; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_profiling.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_profiling.c -new file mode 100755 -index 000000000000..8b49ebc50b95 +new file mode 100644 +index 000000000..8b49ebc50 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_profiling.c @@ -0,0 +1,183 @@ @@ -350947,8 +350973,8 @@ index 000000000000..8b49ebc50b95 + return 0; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_soft_job.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_soft_job.c -new file mode 100755 -index 000000000000..1dd4a7c6fb1e +new file mode 100644 +index 000000000..1dd4a7c6f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_soft_job.c @@ -0,0 +1,90 @@ @@ -351043,8 +351069,8 @@ index 000000000000..1dd4a7c6fb1e + return map_errcode(err); +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_timeline.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_timeline.c -new file mode 100755 -index 000000000000..ff0c909393a4 +new file mode 100644 +index 000000000..ff0c90939 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_timeline.c @@ -0,0 +1,88 @@ @@ -351137,8 +351163,8 @@ index 000000000000..ff0c909393a4 + return 0; +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_vsync.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_vsync.c -new file mode 100755 -index 000000000000..52519d1f96e0 +new file mode 100644 +index 000000000..52519d1f9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_vsync.c @@ -0,0 +1,39 @@ @@ -351182,8 +351208,8 @@ index 000000000000..52519d1f96e0 +} + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h -new file mode 100755 -index 000000000000..1add628fe323 +new file mode 100644 +index 000000000..1add628fe --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h @@ -0,0 +1,82 @@ @@ -351270,8 +351296,8 @@ index 000000000000..1add628fe323 + +#endif /* __MALI_UKK_WRAPPERS_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/arm.c b/drivers/gpu/arm/mali400/mali/platform/arm/arm.c -new file mode 100755 -index 000000000000..fc7017bbfe08 +new file mode 100644 +index 000000000..fc7017bbf --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm.c @@ -0,0 +1,629 @@ @@ -351905,8 +351931,8 @@ index 000000000000..fc7017bbfe08 + } +} diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c -new file mode 100755 -index 000000000000..7a2fc8107b4f +new file mode 100644 +index 000000000..7a2fc8107 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c @@ -0,0 +1,122 @@ @@ -352033,8 +352059,8 @@ index 000000000000..7a2fc8107b4f + } +} diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h -new file mode 100755 -index 000000000000..8e0101830749 +new file mode 100644 +index 000000000..8e0101830 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h @@ -0,0 +1,44 @@ @@ -352083,8 +352109,8 @@ index 000000000000..8e0101830749 + +#endif /* __ARM_CORE_SCALING_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c b/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c -new file mode 100755 -index 000000000000..e4e7ab8b2c2e +new file mode 100644 +index 000000000..e4e7ab8b2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c @@ -0,0 +1,127 @@ @@ -352216,8 +352242,8 @@ index 000000000000..e4e7ab8b2c2e +#endif +#endif diff --git a/drivers/gpu/arm/mali400/mali/platform/rk/custom_log.h b/drivers/gpu/arm/mali400/mali/platform/rk/custom_log.h -new file mode 100755 -index 000000000000..fe5e1224149e +new file mode 100644 +index 000000000..fe5e12241 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/rk/custom_log.h @@ -0,0 +1,209 @@ @@ -352431,8 +352457,8 @@ index 000000000000..fe5e1224149e + +#endif /* __CUSTOM_LOG_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/platform/rk/rk.c b/drivers/gpu/arm/mali400/mali/platform/rk/rk.c -new file mode 100755 -index 000000000000..2b412b5ec569 +new file mode 100644 +index 000000000..2b412b5ec --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/rk/rk.c @@ -0,0 +1,721 @@ @@ -353158,8 +353184,8 @@ index 000000000000..2b412b5ec569 + rk_context_deinit(pdev); +} diff --git a/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h b/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h -new file mode 100755 -index 000000000000..bd939350c425 +new file mode 100644 +index 000000000..bd939350c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h @@ -0,0 +1,37 @@ @@ -353201,8 +353227,8 @@ index 000000000000..bd939350c425 +#endif /* __RK_EXT_H__ */ + diff --git a/drivers/gpu/arm/mali400/mali/readme.txt b/drivers/gpu/arm/mali400/mali/readme.txt -new file mode 100755 -index 000000000000..6785ac933b38 +new file mode 100644 +index 000000000..6785ac933 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/readme.txt @@ -0,0 +1,28 @@ @@ -353235,8 +353261,8 @@ index 000000000000..6785ac933b38 +device. See the mali_utgard.h header file for how to set up the Mali GPU +resources. diff --git a/drivers/gpu/arm/mali400/mali/regs/mali_200_regs.h b/drivers/gpu/arm/mali400/mali/regs/mali_200_regs.h -new file mode 100755 -index 000000000000..0345fb169a95 +new file mode 100644 +index 000000000..0345fb169 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/regs/mali_200_regs.h @@ -0,0 +1,131 @@ @@ -353372,8 +353398,8 @@ index 000000000000..0345fb169a95 + +#endif /* _MALI200_REGS_H_ */ diff --git a/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h b/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h -new file mode 100755 -index 000000000000..7f8b58fd6c49 +new file mode 100644 +index 000000000..7f8b58fd6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h @@ -0,0 +1,172 @@ @@ -353550,8 +353576,8 @@ index 000000000000..7f8b58fd6c49 + +#endif diff --git a/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c -new file mode 100755 -index 000000000000..7df934c12122 +new file mode 100644 +index 000000000..7df934c12 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c @@ -0,0 +1,13 @@ @@ -353569,8 +353595,8 @@ index 000000000000..7df934c12122 + +/* This file is intentionally left empty, as all functions are inlined in mali_profiling_sampler.h */ diff --git a/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h -new file mode 100755 -index 000000000000..f52097c1901b +new file mode 100644 +index 000000000..f52097c19 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h @@ -0,0 +1,48 @@ @@ -353623,8 +353649,8 @@ index 000000000000..f52097c1901b + +#endif /* __MALI_TIMESTAMP_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c -new file mode 100755 -index 000000000000..7df934c12122 +new file mode 100644 +index 000000000..7df934c12 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c @@ -0,0 +1,13 @@ @@ -353642,8 +353668,8 @@ index 000000000000..7df934c12122 + +/* This file is intentionally left empty, as all functions are inlined in mali_profiling_sampler.h */ diff --git a/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h -new file mode 100755 -index 000000000000..709a16a82f31 +new file mode 100644 +index 000000000..709a16a82 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h @@ -0,0 +1,26 @@ @@ -353674,8 +353700,8 @@ index 000000000000..709a16a82f31 + +#endif /* __MALI_TIMESTAMP_H__ */ diff --git a/drivers/gpu/arm/mali400/rk_ver_info.txt b/drivers/gpu/arm/mali400/rk_ver_info.txt -new file mode 100755 -index 000000000000..2a6cbbbb5a97 +new file mode 100644 +index 000000000..2a6cbbbb5 --- /dev/null +++ b/drivers/gpu/arm/mali400/rk_ver_info.txt @@ -0,0 +1,11 @@ @@ -353691,8 +353717,8 @@ index 000000000000..2a6cbbbb5a97 + 在 mali_control_timer_callback_chain 中使用 mod_timer, 而不再是 add_timer. + diff --git a/drivers/gpu/arm/mali400/ump/Kbuild b/drivers/gpu/arm/mali400/ump/Kbuild -new file mode 100755 -index 000000000000..a3067ba72459 +new file mode 100644 +index 000000000..a3067ba72 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Kbuild @@ -0,0 +1,92 @@ @@ -353789,8 +353815,8 @@ index 000000000000..a3067ba72459 +obj-$(CONFIG_UMP) := ump.o + diff --git a/drivers/gpu/arm/mali400/ump/Kconfig b/drivers/gpu/arm/mali400/ump/Kconfig -new file mode 100755 -index 000000000000..ec3509057732 +new file mode 100644 +index 000000000..ec3509057 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Kconfig @@ -0,0 +1,17 @@ @@ -353812,8 +353838,8 @@ index 000000000000..ec3509057732 + This enabled extra debug checks and messages in UMP. + diff --git a/drivers/gpu/arm/mali400/ump/Makefile b/drivers/gpu/arm/mali400/ump/Makefile -new file mode 100755 -index 000000000000..88b02a22fce5 +new file mode 100644 +index 000000000..88b02a22f --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Makefile @@ -0,0 +1,67 @@ @@ -353885,8 +353911,8 @@ index 000000000000..88b02a22fce5 + $(MAKE) -C $(KDIR) M=$(CURDIR) clean + $(MAKE) -C $(KDIR) M=$(CURDIR)/../mali clean diff --git a/drivers/gpu/arm/mali400/ump/Makefile.common b/drivers/gpu/arm/mali400/ump/Makefile.common -new file mode 100755 -index 000000000000..ad2c18da98a0 +new file mode 100644 +index 000000000..ad2c18da9 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Makefile.common @@ -0,0 +1,20 @@ @@ -353911,8 +353937,8 @@ index 000000000000..ad2c18da98a0 +EXTRA_CFLAGS += -DSVN_REV=$(SVN_REV) +EXTRA_CFLAGS += -DSVN_REV_STRING=\"$(SVN_REV)\" diff --git a/drivers/gpu/arm/mali400/ump/arch-default/config.h b/drivers/gpu/arm/mali400/ump/arch-default/config.h -new file mode 100755 -index 000000000000..d4aef9dd09c7 +new file mode 100644 +index 000000000..d4aef9dd0 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/arch-default/config.h @@ -0,0 +1,24 @@ @@ -353941,8 +353967,8 @@ index 000000000000..d4aef9dd09c7 + +#endif /* __ARCH_CONFIG_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h b/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h -new file mode 100755 -index 000000000000..182e90c1d64f +new file mode 100644 +index 000000000..182e90c1d --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h @@ -0,0 +1,18 @@ @@ -353965,8 +353991,8 @@ index 000000000000..182e90c1d64f + +#endif /* __ARCH_CONFIG_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/arch/config.h b/drivers/gpu/arm/mali400/ump/arch/config.h -new file mode 100755 -index 000000000000..d4aef9dd09c7 +new file mode 100644 +index 000000000..d4aef9dd0 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/arch/config.h @@ -0,0 +1,24 @@ @@ -353995,8 +354021,8 @@ index 000000000000..d4aef9dd09c7 + +#endif /* __ARCH_CONFIG_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c -new file mode 100755 -index 000000000000..36adb2f5383e +new file mode 100644 +index 000000000..36adb2f53 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c @@ -0,0 +1,455 @@ @@ -354456,8 +354482,8 @@ index 000000000000..36adb2f5383e + ump_random_mapping_put(mem); +} diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.c -new file mode 100755 -index 000000000000..73aa9e4c49f9 +new file mode 100644 +index 000000000..73aa9e4c4 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.c @@ -0,0 +1,358 @@ @@ -354820,8 +354846,8 @@ index 000000000000..73aa9e4c49f9 + return 0; +} diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.h -new file mode 100755 -index 000000000000..aa65f1cb6c88 +new file mode 100644 +index 000000000..aa65f1cb6 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.h @@ -0,0 +1,125 @@ @@ -354951,8 +354977,8 @@ index 000000000000..aa65f1cb6c88 + +#endif /* __UMP_KERNEL_COMMON_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c -new file mode 100755 -index 000000000000..e4642f0394c2 +new file mode 100644 +index 000000000..e4642f039 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c @@ -0,0 +1,155 @@ @@ -355112,8 +355138,8 @@ index 000000000000..e4642f0394c2 +} + diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h -new file mode 100755 -index 000000000000..a888ba833fbb +new file mode 100644 +index 000000000..a888ba833 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h @@ -0,0 +1,89 @@ @@ -355207,8 +355233,8 @@ index 000000000000..a888ba833fbb + +#endif /* __UMP_KERNEL_DESCRIPTOR_MAPPING_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h -new file mode 100755 -index 000000000000..2b69f68e87ac +new file mode 100644 +index 000000000..2b69f68e8 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h @@ -0,0 +1,48 @@ @@ -355261,8 +355287,8 @@ index 000000000000..2b69f68e87ac +#endif /*__UMP_KERNEL_MEMORY_BACKEND_H__ */ + diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_ref_drv.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_ref_drv.c -new file mode 100755 -index 000000000000..0b6434bee00f +new file mode 100644 +index 000000000..0b6434bee --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_ref_drv.c @@ -0,0 +1,181 @@ @@ -355448,8 +355474,8 @@ index 000000000000..0b6434bee00f + return _MALI_OSK_ERR_OK; +} diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_types.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_types.h -new file mode 100755 -index 000000000000..32f32ccbe9fc +new file mode 100644 +index 000000000..32f32ccbe --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_types.h @@ -0,0 +1,58 @@ @@ -355512,8 +355538,8 @@ index 000000000000..32f32ccbe9fc + +#endif /* __UMP_KERNEL_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_osk.h b/drivers/gpu/arm/mali400/ump/common/ump_osk.h -new file mode 100755 -index 000000000000..9adc4d3df3f5 +new file mode 100644 +index 000000000..9adc4d3df --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_osk.h @@ -0,0 +1,48 @@ @@ -355566,8 +355592,8 @@ index 000000000000..9adc4d3df3f5 + +#endif diff --git a/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h b/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h -new file mode 100755 -index 000000000000..db842cdcbeff +new file mode 100644 +index 000000000..db842cdcb --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h @@ -0,0 +1,202 @@ @@ -355774,8 +355800,8 @@ index 000000000000..db842cdcbeff + +#endif /* __UMP_UK_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_ukk.h b/drivers/gpu/arm/mali400/ump/common/ump_ukk.h -new file mode 100755 -index 000000000000..f2906768c37f +new file mode 100644 +index 000000000..f2906768c --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_ukk.h @@ -0,0 +1,60 @@ @@ -355840,8 +355866,8 @@ index 000000000000..f2906768c37f + +#endif /* __UMP_UKK_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h b/drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h -new file mode 100755 -index 000000000000..d0174055aa28 +new file mode 100644 +index 000000000..d0174055a --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h @@ -0,0 +1,30 @@ @@ -355876,8 +355902,8 @@ index 000000000000..d0174055aa28 + +#endif /* __UMP_KERNEL_LICENSE_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h b/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h -new file mode 100755 -index 000000000000..bfb4e8d64885 +new file mode 100644 +index 000000000..bfb4e8d64 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h @@ -0,0 +1,54 @@ @@ -355936,8 +355962,8 @@ index 000000000000..bfb4e8d64885 + +#endif /* __UMP_IOCTL_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c -new file mode 100755 -index 000000000000..71b30830c308 +new file mode 100644 +index 000000000..71b30830c --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c @@ -0,0 +1,449 @@ @@ -356391,8 +356417,8 @@ index 000000000000..71b30830c308 +MODULE_AUTHOR("ARM Ltd."); +MODULE_VERSION(SVN_REV_STRING); diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.h -new file mode 100755 -index 000000000000..8d32ddbb5449 +new file mode 100644 +index 000000000..8d32ddbb5 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.h @@ -0,0 +1,18 @@ @@ -356415,8 +356441,8 @@ index 000000000000..8d32ddbb5449 + +#endif /* __UMP_KERNEL_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c -new file mode 100755 -index 000000000000..5a1257a25b82 +new file mode 100644 +index 000000000..5a1257a25 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c @@ -0,0 +1,271 @@ @@ -356692,8 +356718,8 @@ index 000000000000..5a1257a25b82 + return (allocator->num_blocks - allocator->num_free) * UMP_BLOCK_SIZE; +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.h -new file mode 100755 -index 000000000000..949fd245c6af +new file mode 100644 +index 000000000..949fd245c --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.h @@ -0,0 +1,23 @@ @@ -356721,8 +356747,8 @@ index 000000000000..949fd245c6af +#endif /* __UMP_KERNEL_MEMORY_BACKEND_DEDICATED_H__ */ + diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.c -new file mode 100755 -index 000000000000..7cd8d5d381cf +new file mode 100644 +index 000000000..7cd8d5d38 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.c @@ -0,0 +1,235 @@ @@ -356962,8 +356988,8 @@ index 000000000000..7cd8d5d381cf + return info->num_pages_allocated * _MALI_OSK_MALI_PAGE_SIZE; +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.h -new file mode 100755 -index 000000000000..d21d503512ec +new file mode 100644 +index 000000000..d21d50351 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.h @@ -0,0 +1,23 @@ @@ -356991,8 +357017,8 @@ index 000000000000..d21d503512ec +#endif /* __UMP_KERNEL_MEMORY_BACKEND_OS_H__ */ + diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.c -new file mode 100755 -index 000000000000..6be0f86440de +new file mode 100644 +index 000000000..6be0f8644 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.c @@ -0,0 +1,222 @@ @@ -357219,8 +357245,8 @@ index 000000000000..6be0f86440de + return mem; +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.h b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.h -new file mode 100755 -index 000000000000..2cea6cedc380 +new file mode 100644 +index 000000000..2cea6cedc --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.h @@ -0,0 +1,84 @@ @@ -357309,8 +357335,8 @@ index 000000000000..2cea6cedc380 + +#endif /* __UMP_KERNEL_RANDOM_MAPPING_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c b/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c -new file mode 100755 -index 000000000000..e41931e1ea75 +new file mode 100644 +index 000000000..e41931e1e --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c @@ -0,0 +1,65 @@ @@ -357380,8 +357406,8 @@ index 000000000000..e41931e1ea75 + } +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c b/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c -new file mode 100755 -index 000000000000..2b634ba79c6e +new file mode 100644 +index 000000000..2b634ba79 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c @@ -0,0 +1,27 @@ @@ -357413,8 +357439,8 @@ index 000000000000..2b634ba79c6e + return atomic_inc_return((atomic_t *)&atom->u.val); +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_osk_low_level_mem.c b/drivers/gpu/arm/mali400/ump/linux/ump_osk_low_level_mem.c -new file mode 100755 -index 000000000000..e08bf25257b0 +new file mode 100644 +index 000000000..e08bf2525 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_low_level_mem.c @@ -0,0 +1,314 @@ @@ -357733,8 +357759,8 @@ index 000000000000..e08bf25257b0 + return; +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_osk_misc.c b/drivers/gpu/arm/mali400/ump/linux/ump_osk_misc.c -new file mode 100755 -index 000000000000..58c9f1bf27b8 +new file mode 100644 +index 000000000..58c9f1bf2 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_misc.c @@ -0,0 +1,36 @@ @@ -357775,8 +357801,8 @@ index 000000000000..58c9f1bf27b8 + return _MALI_OSK_ERR_OK; +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.c b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.c -new file mode 100755 -index 000000000000..56a787ff64dc +new file mode 100644 +index 000000000..56a787ff6 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.c @@ -0,0 +1,230 @@ @@ -358011,8 +358037,8 @@ index 000000000000..56a787ff64dc +} +#endif diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h -new file mode 100755 -index 000000000000..61a7095a6920 +new file mode 100644 +index 000000000..61a7095a6 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h @@ -0,0 +1,36 @@ @@ -358053,8 +358079,8 @@ index 000000000000..61a7095a6920 + +#endif /* __UMP_UKK_REF_WRAPPERS_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c -new file mode 100755 -index 000000000000..4d6b69608fd4 +new file mode 100644 +index 000000000..4d6b69608 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c @@ -0,0 +1,280 @@ @@ -358339,8 +358365,8 @@ index 000000000000..4d6b69608fd4 + return 0; /* success */ +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.h b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.h -new file mode 100755 -index 000000000000..5f8fc683c8f5 +new file mode 100644 +index 000000000..5f8fc683c --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.h @@ -0,0 +1,46 @@ @@ -358391,8 +358417,8 @@ index 000000000000..5f8fc683c8f5 + +#endif /* __UMP_UKK_WRAPPERS_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/readme.txt b/drivers/gpu/arm/mali400/ump/readme.txt -new file mode 100755 -index 000000000000..c238cf0f2b1f +new file mode 100644 +index 000000000..c238cf0f2 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/readme.txt @@ -0,0 +1,28 @@ @@ -358425,8 +358451,8 @@ index 000000000000..c238cf0f2b1f +by using the insmod command. The driver can also be built as a part of the +kernel itself. diff --git a/drivers/gpu/arm/mali400/umplock/Makefile b/drivers/gpu/arm/mali400/umplock/Makefile -new file mode 100755 -index 000000000000..e5549a33f91d +new file mode 100644 +index 000000000..e5549a33f --- /dev/null +++ b/drivers/gpu/arm/mali400/umplock/Makefile @@ -0,0 +1,69 @@ @@ -358500,8 +358526,8 @@ index 000000000000..e5549a33f91d + +endif diff --git a/drivers/gpu/arm/mali400/umplock/umplock_driver.c b/drivers/gpu/arm/mali400/umplock/umplock_driver.c -new file mode 100755 -index 000000000000..173f4d9bb5c7 +new file mode 100644 +index 000000000..173f4d9bb --- /dev/null +++ b/drivers/gpu/arm/mali400/umplock/umplock_driver.c @@ -0,0 +1,618 @@ @@ -359124,8 +359150,8 @@ index 000000000000..173f4d9bb5c7 +MODULE_AUTHOR("ARM Ltd."); +MODULE_DESCRIPTION("ARM UMP locker"); diff --git a/drivers/gpu/arm/mali400/umplock/umplock_ioctl.h b/drivers/gpu/arm/mali400/umplock/umplock_ioctl.h -new file mode 100755 -index 000000000000..8afdaad7000f +new file mode 100644 +index 000000000..8afdaad70 --- /dev/null +++ b/drivers/gpu/arm/mali400/umplock/umplock_ioctl.h @@ -0,0 +1,66 @@ @@ -359196,8 +359222,8 @@ index 000000000000..8afdaad7000f +#endif /* __UMPLOCK_IOCTL_H__ */ + diff --git a/drivers/gpu/arm/midgard/Kbuild b/drivers/gpu/arm/midgard/Kbuild -new file mode 100755 -index 000000000000..b2c2bbcda668 +new file mode 100644 +index 000000000..b2c2bbcda --- /dev/null +++ b/drivers/gpu/arm/midgard/Kbuild @@ -0,0 +1,221 @@ @@ -359423,8 +359449,8 @@ index 000000000000..b2c2bbcda668 +# For kutf and mali_kutf_irq_latency_test +obj-$(CONFIG_MALI_KUTF) += tests/ diff --git a/drivers/gpu/arm/midgard/Kconfig b/drivers/gpu/arm/midgard/Kconfig -new file mode 100755 -index 000000000000..043bfc0021cc +new file mode 100644 +index 000000000..043bfc002 --- /dev/null +++ b/drivers/gpu/arm/midgard/Kconfig @@ -0,0 +1,249 @@ @@ -359678,8 +359704,8 @@ index 000000000000..043bfc0021cc +source "drivers/gpu/arm/midgard/platform/Kconfig" +source "drivers/gpu/arm/midgard/tests/Kconfig" diff --git a/drivers/gpu/arm/midgard/Makefile b/drivers/gpu/arm/midgard/Makefile -new file mode 100755 -index 000000000000..9aa242c4f8c4 +new file mode 100644 +index 000000000..9aa242c4f --- /dev/null +++ b/drivers/gpu/arm/midgard/Makefile @@ -0,0 +1,42 @@ @@ -359726,8 +359752,8 @@ index 000000000000..9aa242c4f8c4 +clean: + $(MAKE) -C $(KDIR) M=$(CURDIR) clean diff --git a/drivers/gpu/arm/midgard/Makefile.kbase b/drivers/gpu/arm/midgard/Makefile.kbase -new file mode 100755 -index 000000000000..2bef9c25eaeb +new file mode 100644 +index 000000000..2bef9c25e --- /dev/null +++ b/drivers/gpu/arm/midgard/Makefile.kbase @@ -0,0 +1,17 @@ @@ -359749,8 +359775,8 @@ index 000000000000..2bef9c25eaeb +EXTRA_CFLAGS += -I$(ROOT) -I$(KBASE_PATH) -I$(OSK_PATH)/src/linux/include -I$(KBASE_PATH)/platform_$(PLATFORM) + diff --git a/drivers/gpu/arm/midgard/backend/gpu/Kbuild b/drivers/gpu/arm/midgard/backend/gpu/Kbuild -new file mode 100755 -index 000000000000..5f700e9b6b44 +new file mode 100644 +index 000000000..5f700e9b6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/Kbuild @@ -0,0 +1,60 @@ @@ -359815,8 +359841,8 @@ index 000000000000..5f700e9b6b44 + BACKEND += backend/gpu/mali_kbase_model_error_generator.c +endif diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_backend_config.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_backend_config.h -new file mode 100755 -index 000000000000..c8ae87eb84a2 +new file mode 100644 +index 000000000..c8ae87eb8 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_backend_config.h @@ -0,0 +1,29 @@ @@ -359850,8 +359876,8 @@ index 000000000000..c8ae87eb84a2 +#endif /* _KBASE_BACKEND_CONFIG_H_ */ + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.c -new file mode 100755 -index 000000000000..fef9a2cb743e +new file mode 100644 +index 000000000..fef9a2cb7 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.c @@ -0,0 +1,29 @@ @@ -359885,8 +359911,8 @@ index 000000000000..fef9a2cb743e +} + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h -new file mode 100755 -index 000000000000..fe9869109a82 +new file mode 100644 +index 000000000..fe9869109 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h @@ -0,0 +1,34 @@ @@ -359925,8 +359951,8 @@ index 000000000000..fe9869109a82 + +#endif /* _KBASE_CACHE_POLICY_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c -new file mode 100755 -index 000000000000..7851ea6466c7 +new file mode 100644 +index 000000000..7851ea646 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c @@ -0,0 +1,157 @@ @@ -360088,8 +360114,8 @@ index 000000000000..7851ea6466c7 + +#endif diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c -new file mode 100755 -index 000000000000..4e8e56e9baf2 +new file mode 100644 +index 000000000..4e8e56e9b --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c @@ -0,0 +1,474 @@ @@ -360568,8 +360594,8 @@ index 000000000000..4e8e56e9baf2 + kbase_devfreq_term_core_mask_table(kbdev); +} diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h -new file mode 100755 -index 000000000000..c0bf8b15b3bc +new file mode 100644 +index 000000000..c0bf8b15b --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h @@ -0,0 +1,24 @@ @@ -360598,8 +360624,8 @@ index 000000000000..c0bf8b15b3bc + +#endif /* _BASE_DEVFREQ_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c -new file mode 100755 -index 000000000000..dcdf15cdc3e8 +new file mode 100644 +index 000000000..dcdf15cdc --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c @@ -0,0 +1,255 @@ @@ -360859,8 +360885,8 @@ index 000000000000..dcdf15cdc3e8 + KBASE_TRACE_ADD(kbdev, CORE_GPU_IRQ_DONE, NULL, NULL, 0u, val); +} diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_internal.h -new file mode 100755 -index 000000000000..5b20445932fb +new file mode 100644 +index 000000000..5b2044593 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_internal.h @@ -0,0 +1,67 @@ @@ -360932,8 +360958,8 @@ index 000000000000..5b20445932fb + +#endif /* _KBASE_DEVICE_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c -new file mode 100755 -index 000000000000..d578fd78e825 +new file mode 100644 +index 000000000..d578fd78e --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c @@ -0,0 +1,123 @@ @@ -361061,8 +361087,8 @@ index 000000000000..d578fd78e825 +} + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c -new file mode 100755 -index 000000000000..b395325b556b +new file mode 100644 +index 000000000..b395325b5 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c @@ -0,0 +1,110 @@ @@ -361177,8 +361203,8 @@ index 000000000000..b395325b556b +} + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c -new file mode 100755 -index 000000000000..7ad309e8d7f4 +new file mode 100644 +index 000000000..7ad309e8d --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c @@ -0,0 +1,492 @@ @@ -361675,8 +361701,8 @@ index 000000000000..7ad309e8d7f4 +} + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h -new file mode 100755 -index 000000000000..4794672da8f0 +new file mode 100644 +index 000000000..4794672da --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h @@ -0,0 +1,58 @@ @@ -361739,8 +361765,8 @@ index 000000000000..4794672da8f0 +#endif /* _KBASE_INSTR_DEFS_H_ */ + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_internal.h -new file mode 100755 -index 000000000000..e96aeae786e1 +new file mode 100644 +index 000000000..e96aeae78 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_internal.h @@ -0,0 +1,45 @@ @@ -361790,8 +361816,8 @@ index 000000000000..e96aeae786e1 + +#endif /* _KBASE_INSTR_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h -new file mode 100755 -index 000000000000..8781561e73d0 +new file mode 100644 +index 000000000..8781561e7 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h @@ -0,0 +1,39 @@ @@ -361835,8 +361861,8 @@ index 000000000000..8781561e73d0 + +#endif /* _KBASE_IRQ_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c -new file mode 100755 -index 000000000000..8416b80e8b77 +new file mode 100644 +index 000000000..8416b80e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c @@ -0,0 +1,469 @@ @@ -362310,8 +362336,8 @@ index 000000000000..8416b80e8b77 + +#endif /* !defined(CONFIG_MALI_NO_MALI) */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c -new file mode 100755 -index 000000000000..92358f2bf298 +new file mode 100644 +index 000000000..92358f2bf --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c @@ -0,0 +1,237 @@ @@ -362553,8 +362579,8 @@ index 000000000000..92358f2bf298 +} + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h -new file mode 100755 -index 000000000000..08a7400e66d5 +new file mode 100644 +index 000000000..08a7400e6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h @@ -0,0 +1,123 @@ @@ -362682,8 +362708,8 @@ index 000000000000..08a7400e66d5 + +#endif /* _KBASE_HWACCESS_GPU_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c -new file mode 100755 -index 000000000000..a6fb097b94f9 +new file mode 100644 +index 000000000..a6fb097b9 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c @@ -0,0 +1,1518 @@ @@ -364206,8 +364232,8 @@ index 000000000000..a6fb097b94f9 +} +#endif /* KBASE_GPU_RESET_EN */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h -new file mode 100755 -index 000000000000..1f382b3c1af4 +new file mode 100644 +index 000000000..1f382b3c1 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h @@ -0,0 +1,164 @@ @@ -364376,8 +364402,8 @@ index 000000000000..1f382b3c1af4 + +#endif /* _KBASE_JM_HWACCESS_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c -new file mode 100755 -index 000000000000..4b4541660ec4 +new file mode 100644 +index 000000000..4b4541660 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c @@ -0,0 +1,1952 @@ @@ -366334,8 +366360,8 @@ index 000000000000..4b4541660ec4 + + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h -new file mode 100755 -index 000000000000..1e0e05ad3ea4 +new file mode 100644 +index 000000000..1e0e05ad3 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h @@ -0,0 +1,76 @@ @@ -366416,8 +366442,8 @@ index 000000000000..1e0e05ad3ea4 + +#endif /* _KBASE_HWACCESS_GPU_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c -new file mode 100755 -index 000000000000..54d8ddd80097 +new file mode 100644 +index 000000000..54d8ddd80 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c @@ -0,0 +1,303 @@ @@ -366725,8 +366751,8 @@ index 000000000000..54d8ddd80097 +} +#endif /* KBASE_TRACE_ENABLE */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h -new file mode 100755 -index 000000000000..35d9781ae092 +new file mode 100644 +index 000000000..35d9781ae --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h @@ -0,0 +1,129 @@ @@ -366860,8 +366886,8 @@ index 000000000000..35d9781ae092 + +#endif /* _KBASE_JS_AFFINITY_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c -new file mode 100755 -index 000000000000..a8c1af23a369 +new file mode 100644 +index 000000000..a8c1af23a --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c @@ -0,0 +1,356 @@ @@ -367222,8 +367248,8 @@ index 000000000000..a8c1af23a369 +} + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h -new file mode 100755 -index 000000000000..3f53779c6747 +new file mode 100644 +index 000000000..3f53779c6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h @@ -0,0 +1,69 @@ @@ -367297,8 +367323,8 @@ index 000000000000..3f53779c6747 + +#endif /* _KBASE_JS_BACKEND_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c -new file mode 100755 -index 000000000000..ba826184dd3f +new file mode 100644 +index 000000000..ba826184d --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c @@ -0,0 +1,407 @@ @@ -367710,8 +367736,8 @@ index 000000000000..ba826184dd3f + spin_unlock_irqrestore(&kbdev->mmu_mask_change, flags); +} diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.h -new file mode 100755 -index 000000000000..c02253c6acc3 +new file mode 100644 +index 000000000..c02253c6a --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.h @@ -0,0 +1,42 @@ @@ -367758,8 +367784,8 @@ index 000000000000..c02253c6acc3 + +#endif /* _MALI_KBASE_MMU_HW_DIRECT_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c -new file mode 100755 -index 000000000000..0614348e935a +new file mode 100644 +index 000000000..0614348e9 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c @@ -0,0 +1,63 @@ @@ -367827,8 +367853,8 @@ index 000000000000..0614348e935a + +KBASE_EXPORT_TEST_API(kbase_pm_always_on_policy_ops); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h -new file mode 100755 -index 000000000000..f9d244b01bc2 +new file mode 100644 +index 000000000..f9d244b01 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h @@ -0,0 +1,77 @@ @@ -367910,8 +367936,8 @@ index 000000000000..f9d244b01bc2 +#endif /* MALI_KBASE_PM_ALWAYS_ON_H */ + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_backend.c -new file mode 100755 -index 000000000000..146fd48bab92 +new file mode 100644 +index 000000000..146fd48ba --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_backend.c @@ -0,0 +1,482 @@ @@ -368398,8 +368424,8 @@ index 000000000000..146fd48bab92 + mutex_unlock(&js_devdata->runpool_mutex); +} diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.c -new file mode 100755 -index 000000000000..85890f1e85f5 +new file mode 100644 +index 000000000..85890f1e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.c @@ -0,0 +1,182 @@ @@ -368586,8 +368612,8 @@ index 000000000000..85890f1e85f5 + kbase_pm_update_cores_state_nolock(kbdev); +} diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.h -new file mode 100755 -index 000000000000..ee9e751f2d79 +new file mode 100644 +index 000000000..ee9e751f2 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.h @@ -0,0 +1,92 @@ @@ -368684,8 +368710,8 @@ index 000000000000..ee9e751f2d79 + +#endif /* _KBASE_PM_CA_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c -new file mode 100755 -index 000000000000..66bf660cffb6 +new file mode 100644 +index 000000000..66bf660cf --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c @@ -0,0 +1,129 @@ @@ -368819,8 +368845,8 @@ index 000000000000..66bf660cffb6 +}; + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h -new file mode 100755 -index 000000000000..7ab3cd4d8460 +new file mode 100644 +index 000000000..7ab3cd4d8 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h @@ -0,0 +1,55 @@ @@ -368880,8 +368906,8 @@ index 000000000000..7ab3cd4d8460 +#endif /* MALI_KBASE_PM_CA_DEVFREQ_H */ + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.c -new file mode 100755 -index 000000000000..864612d31f9b +new file mode 100644 +index 000000000..864612d31 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.c @@ -0,0 +1,65 @@ @@ -368951,8 +368977,8 @@ index 000000000000..864612d31f9b + +KBASE_EXPORT_TEST_API(kbase_pm_ca_fixed_policy_ops); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h -new file mode 100755 -index 000000000000..a763155cb703 +new file mode 100644 +index 000000000..a763155cb --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h @@ -0,0 +1,40 @@ @@ -368997,8 +369023,8 @@ index 000000000000..a763155cb703 +#endif /* MALI_KBASE_PM_CA_FIXED_H */ + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.c -new file mode 100755 -index 000000000000..f891fa225a89 +new file mode 100644 +index 000000000..f891fa225 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.c @@ -0,0 +1,70 @@ @@ -369073,8 +369099,8 @@ index 000000000000..f891fa225a89 + +KBASE_EXPORT_TEST_API(kbase_pm_coarse_demand_policy_ops); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h -new file mode 100755 -index 000000000000..749d305eee9a +new file mode 100644 +index 000000000..749d305ee --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h @@ -0,0 +1,64 @@ @@ -369143,8 +369169,8 @@ index 000000000000..749d305eee9a + +#endif /* MALI_KBASE_PM_COARSE_DEMAND_H */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h -new file mode 100755 -index 000000000000..352744ee6d73 +new file mode 100644 +index 000000000..352744ee6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h @@ -0,0 +1,519 @@ @@ -369668,8 +369694,8 @@ index 000000000000..352744ee6d73 + +#endif /* _KBASE_PM_HWACCESS_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c -new file mode 100755 -index 000000000000..81322fd0dd17 +new file mode 100644 +index 000000000..81322fd0d --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c @@ -0,0 +1,73 @@ @@ -369747,8 +369773,8 @@ index 000000000000..81322fd0dd17 + +KBASE_EXPORT_TEST_API(kbase_pm_demand_policy_ops); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h -new file mode 100755 -index 000000000000..c0c84b6e9189 +new file mode 100644 +index 000000000..c0c84b6e9 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h @@ -0,0 +1,64 @@ @@ -369817,8 +369843,8 @@ index 000000000000..c0c84b6e9189 + +#endif /* MALI_KBASE_PM_DEMAND_H */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_driver.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_driver.c -new file mode 100755 -index 000000000000..82727937c545 +new file mode 100644 +index 000000000..82727937c --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_driver.c @@ -0,0 +1,1713 @@ @@ -371536,8 +371562,8 @@ index 000000000000..82727937c545 + +KBASE_EXPORT_TEST_API(kbase_pm_release_gpu_cycle_counter); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_internal.h -new file mode 100755 -index 000000000000..6804f45ac27b +new file mode 100644 +index 000000000..6804f45ac --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_internal.h @@ -0,0 +1,548 @@ @@ -372090,8 +372116,8 @@ index 000000000000..6804f45ac27b + +#endif /* _KBASE_BACKEND_PM_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_metrics.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_metrics.c -new file mode 100755 -index 000000000000..024248ca7123 +new file mode 100644 +index 000000000..024248ca7 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_metrics.c @@ -0,0 +1,401 @@ @@ -372497,8 +372523,8 @@ index 000000000000..024248ca7123 + spin_unlock_irqrestore(&kbdev->pm.backend.metrics.lock, flags); +} diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.c -new file mode 100755 -index 000000000000..075f020c66e6 +new file mode 100644 +index 000000000..075f020c6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.c @@ -0,0 +1,973 @@ @@ -373476,8 +373502,8 @@ index 000000000000..075f020c66e6 + +KBASE_EXPORT_TEST_API(kbase_pm_release_l2_caches); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.h -new file mode 100755 -index 000000000000..611a90e66e65 +new file mode 100644 +index 000000000..611a90e66 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.h @@ -0,0 +1,227 @@ @@ -373709,8 +373735,8 @@ index 000000000000..611a90e66e65 + +#endif /* _KBASE_PM_POLICY_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c -new file mode 100755 -index 000000000000..d08c628dd433 +new file mode 100644 +index 000000000..d08c628dd --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c @@ -0,0 +1,103 @@ @@ -373818,8 +373844,8 @@ index 000000000000..d08c628dd433 +} +#endif /* CONFIG_MALI_NO_MALI */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.h -new file mode 100755 -index 000000000000..433aa4b9cb5e +new file mode 100644 +index 000000000..433aa4b9c --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.h @@ -0,0 +1,52 @@ @@ -373876,8 +373902,8 @@ index 000000000000..433aa4b9cb5e + +#endif /* _KBASE_BACKEND_TIME_H_ */ diff --git a/drivers/gpu/arm/midgard/docs/Doxyfile b/drivers/gpu/arm/midgard/docs/Doxyfile -new file mode 100755 -index 000000000000..35ff2f1ce4a0 +new file mode 100644 +index 000000000..35ff2f1ce --- /dev/null +++ b/drivers/gpu/arm/midgard/docs/Doxyfile @@ -0,0 +1,126 @@ @@ -374008,8 +374034,8 @@ index 000000000000..35ff2f1ce4a0 +DOTFILE_DIRS += ../../kernel/drivers/gpu/arm/midgard/docs + diff --git a/drivers/gpu/arm/midgard/docs/policy_operation_diagram.dot b/drivers/gpu/arm/midgard/docs/policy_operation_diagram.dot -new file mode 100755 -index 000000000000..7ae05c2f8ded +new file mode 100644 +index 000000000..7ae05c2f8 --- /dev/null +++ b/drivers/gpu/arm/midgard/docs/policy_operation_diagram.dot @@ -0,0 +1,112 @@ @@ -374126,8 +374152,8 @@ index 000000000000..7ae05c2f8ded + +} diff --git a/drivers/gpu/arm/midgard/docs/policy_overview.dot b/drivers/gpu/arm/midgard/docs/policy_overview.dot -new file mode 100755 -index 000000000000..159b993b7d61 +new file mode 100644 +index 000000000..159b993b7 --- /dev/null +++ b/drivers/gpu/arm/midgard/docs/policy_overview.dot @@ -0,0 +1,63 @@ @@ -374195,8 +374221,8 @@ index 000000000000..159b993b7d61 + jobslots->job_finish [ style=dotted ]; +} diff --git a/drivers/gpu/arm/midgard/ipa/Kbuild b/drivers/gpu/arm/midgard/ipa/Kbuild -new file mode 100755 -index 000000000000..602b15f5225c +new file mode 100644 +index 000000000..602b15f52 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/Kbuild @@ -0,0 +1,24 @@ @@ -374225,8 +374251,8 @@ index 000000000000..602b15f5225c + midgard_kbase-y += ipa/mali_kbase_ipa_tmix.o +endif diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c -new file mode 100755 -index 000000000000..01bdbb4e8eb1 +new file mode 100644 +index 000000000..01bdbb4e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c @@ -0,0 +1,585 @@ @@ -374816,8 +374842,8 @@ index 000000000000..01bdbb4e8eb1 +}; +KBASE_EXPORT_TEST_API(kbase_ipa_power_model_ops); diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h -new file mode 100755 -index 000000000000..b2d3db149579 +new file mode 100644 +index 000000000..b2d3db149 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h @@ -0,0 +1,148 @@ @@ -374970,8 +374996,8 @@ index 000000000000..b2d3db149579 + +#endif diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.c b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.c -new file mode 100755 -index 000000000000..eafc14009ddc +new file mode 100644 +index 000000000..eafc14009 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.c @@ -0,0 +1,219 @@ @@ -375195,8 +375221,8 @@ index 000000000000..eafc14009ddc + mutex_unlock(&kbdev->ipa.lock); +} diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.h b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.h -new file mode 100755 -index 000000000000..ec06e2096f94 +new file mode 100644 +index 000000000..ec06e2096 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.h @@ -0,0 +1,49 @@ @@ -375250,8 +375276,8 @@ index 000000000000..ec06e2096f94 + +#endif /* _KBASE_IPA_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_simple.c b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_simple.c -new file mode 100755 -index 000000000000..da0a4d4a0e7e +new file mode 100644 +index 000000000..da0a4d4a0 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_simple.c @@ -0,0 +1,222 @@ @@ -375478,8 +375504,8 @@ index 000000000000..da0a4d4a0e7e + .do_utilization_scaling_in_framework = true, +}; diff --git a/drivers/gpu/arm/midgard/mali_base_hwconfig_features.h b/drivers/gpu/arm/midgard/mali_base_hwconfig_features.h -new file mode 100755 -index 000000000000..6be0a334f99f +new file mode 100644 +index 000000000..6be0a334f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_hwconfig_features.h @@ -0,0 +1,311 @@ @@ -375795,8 +375821,8 @@ index 000000000000..6be0a334f99f + +#endif /* _BASE_HWCONFIG_FEATURES_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_base_hwconfig_issues.h b/drivers/gpu/arm/midgard/mali_base_hwconfig_issues.h -new file mode 100755 -index 000000000000..6d7e5c57e6a4 +new file mode 100644 +index 000000000..6d7e5c57e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_hwconfig_issues.h @@ -0,0 +1,1098 @@ @@ -376899,8 +376925,8 @@ index 000000000000..6d7e5c57e6a4 + +#endif /* _BASE_HWCONFIG_ISSUES_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_base_kernel.h b/drivers/gpu/arm/midgard/mali_base_kernel.h -new file mode 100755 -index 000000000000..ea5e473caef6 +new file mode 100644 +index 000000000..ea5e473ca --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_kernel.h @@ -0,0 +1,1858 @@ @@ -378763,8 +378789,8 @@ index 000000000000..ea5e473caef6 + +#endif /* _BASE_KERNEL_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_base_mem_priv.h b/drivers/gpu/arm/midgard/mali_base_mem_priv.h -new file mode 100755 -index 000000000000..4a98a72cc37a +new file mode 100644 +index 000000000..4a98a72cc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_mem_priv.h @@ -0,0 +1,52 @@ @@ -378821,8 +378847,8 @@ index 000000000000..4a98a72cc37a + +#endif diff --git a/drivers/gpu/arm/midgard/mali_base_vendor_specific_func.h b/drivers/gpu/arm/midgard/mali_base_vendor_specific_func.h -new file mode 100755 -index 000000000000..be454a216a39 +new file mode 100644 +index 000000000..be454a216 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_vendor_specific_func.h @@ -0,0 +1,24 @@ @@ -378851,8 +378877,8 @@ index 000000000000..be454a216a39 + +#endif /*_BASE_VENDOR_SPEC_FUNC_H_*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase.h b/drivers/gpu/arm/midgard/mali_kbase.h -new file mode 100755 -index 000000000000..0d9bf23dc685 +new file mode 100644 +index 000000000..0d9bf23dc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase.h @@ -0,0 +1,612 @@ @@ -379469,8 +379495,8 @@ index 000000000000..0d9bf23dc685 + + diff --git a/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.c b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.c -new file mode 100755 -index 000000000000..fde0f8ff8582 +new file mode 100644 +index 000000000..fde0f8ff8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.c @@ -0,0 +1,209 @@ @@ -379684,8 +379710,8 @@ index 000000000000..fde0f8ff8582 + return clamped; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.h b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.h -new file mode 100755 -index 000000000000..099a29861672 +new file mode 100644 +index 000000000..099a29861 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.h @@ -0,0 +1,23 @@ @@ -379713,8 +379739,8 @@ index 000000000000..099a29861672 + +#endif /* _KBASE_10969_WORKAROUND_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.c -new file mode 100755 -index 000000000000..f910fe970feb +new file mode 100644 +index 000000000..f910fe970 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.c @@ -0,0 +1,102 @@ @@ -379821,8 +379847,8 @@ index 000000000000..f910fe970feb + return; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.h -new file mode 100755 -index 000000000000..3ed2248897fc +new file mode 100644 +index 000000000..3ed224889 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.h @@ -0,0 +1,45 @@ @@ -379872,8 +379898,8 @@ index 000000000000..3ed2248897fc + +#endif /*_KBASE_AS_FAULT_DEBUG_FS_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_cache_policy.c b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.c -new file mode 100755 -index 000000000000..c67b3e97f1af +new file mode 100644 +index 000000000..c67b3e97f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.c @@ -0,0 +1,64 @@ @@ -379942,8 +379968,8 @@ index 000000000000..c67b3e97f1af + dma_sync_single_for_cpu(kbdev->dev, handle, size, dir); +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_cache_policy.h b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.h -new file mode 100755 -index 000000000000..0c18bdb357b0 +new file mode 100644 +index 000000000..0c18bdb35 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.h @@ -0,0 +1,45 @@ @@ -379993,8 +380019,8 @@ index 000000000000..0c18bdb357b0 + +#endif /* _KBASE_CACHE_POLICY_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_config.c b/drivers/gpu/arm/midgard/mali_kbase_config.c -new file mode 100755 -index 000000000000..fb615ae02ead +new file mode 100644 +index 000000000..fb615ae02 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_config.c @@ -0,0 +1,51 @@ @@ -380050,8 +380076,8 @@ index 000000000000..fb615ae02ead +} + diff --git a/drivers/gpu/arm/midgard/mali_kbase_config.h b/drivers/gpu/arm/midgard/mali_kbase_config.h -new file mode 100755 -index 000000000000..356d52bcd774 +new file mode 100644 +index 000000000..356d52bcd --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_config.h @@ -0,0 +1,345 @@ @@ -380401,8 +380427,8 @@ index 000000000000..356d52bcd774 + +#endif /* _KBASE_CONFIG_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h b/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h -new file mode 100755 -index 000000000000..1cf44b3500cf +new file mode 100644 +index 000000000..1cf44b350 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h @@ -0,0 +1,227 @@ @@ -380634,8 +380660,8 @@ index 000000000000..1cf44b3500cf +#endif /* _KBASE_CONFIG_DEFAULTS_H_ */ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_context.c b/drivers/gpu/arm/midgard/mali_kbase_context.c -new file mode 100755 -index 000000000000..6338a7e221ed +new file mode 100644 +index 000000000..6338a7e22 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_context.c @@ -0,0 +1,342 @@ @@ -380982,8 +381008,8 @@ index 000000000000..6338a7e221ed +} +KBASE_EXPORT_SYMBOL(kbase_context_set_create_flags); diff --git a/drivers/gpu/arm/midgard/mali_kbase_context.h b/drivers/gpu/arm/midgard/mali_kbase_context.h -new file mode 100755 -index 000000000000..a3f5bb0ce0da +new file mode 100644 +index 000000000..a3f5bb0ce --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_context.h @@ -0,0 +1,90 @@ @@ -381078,8 +381104,8 @@ index 000000000000..a3f5bb0ce0da +} +#endif /* _KBASE_CONTEXT_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c -new file mode 100755 -index 000000000000..da55cb080d00 +new file mode 100644 +index 000000000..da55cb080 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c @@ -0,0 +1,4990 @@ @@ -386074,8 +386100,8 @@ index 000000000000..da55cb080d00 +#include "mali_linux_kbase_trace.h" +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.c b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.c -new file mode 100755 -index 000000000000..ce004841403f +new file mode 100644 +index 000000000..ce0048414 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.c @@ -0,0 +1,208 @@ @@ -386288,8 +386314,8 @@ index 000000000000..ce004841403f + } +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.h b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.h -new file mode 100755 -index 000000000000..47474fecc2a9 +new file mode 100644 +index 000000000..47474fecc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.h @@ -0,0 +1,134 @@ @@ -386428,8 +386454,8 @@ index 000000000000..47474fecc2a9 + +#endif /* _KBASE_CTX_SCHED_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug.c b/drivers/gpu/arm/midgard/mali_kbase_debug.c -new file mode 100755 -index 000000000000..fb57ac2e31ad +new file mode 100644 +index 000000000..fb57ac2e3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug.c @@ -0,0 +1,39 @@ @@ -386473,8 +386499,8 @@ index 000000000000..fb57ac2e31ad +KBASE_EXPORT_SYMBOL(kbasep_debug_assert_call_hook); + diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug.h b/drivers/gpu/arm/midgard/mali_kbase_debug.h -new file mode 100755 -index 000000000000..5fff2892bb55 +new file mode 100644 +index 000000000..5fff2892b --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug.h @@ -0,0 +1,164 @@ @@ -386643,8 +386669,8 @@ index 000000000000..5fff2892bb55 + +#endif /* _KBASE_DEBUG_H */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.c b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.c -new file mode 100755 -index 000000000000..f29430ddf8f9 +new file mode 100644 +index 000000000..f29430ddf --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.c @@ -0,0 +1,499 @@ @@ -387148,8 +387174,8 @@ index 000000000000..f29430ddf8f9 + +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.h b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.h -new file mode 100755 -index 000000000000..a2bf8983c37c +new file mode 100644 +index 000000000..a2bf8983c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.h @@ -0,0 +1,96 @@ @@ -387250,8 +387276,8 @@ index 000000000000..a2bf8983c37c + +#endif /*_KBASE_DEBUG_JOB_FAULT_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c -new file mode 100755 -index 000000000000..6f2cbdf571cb +new file mode 100644 +index 000000000..6f2cbdf57 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c @@ -0,0 +1,306 @@ @@ -387562,8 +387588,8 @@ index 000000000000..6f2cbdf571cb + +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.h b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.h -new file mode 100755 -index 000000000000..20ab51a776c6 +new file mode 100644 +index 000000000..20ab51a77 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.h @@ -0,0 +1,25 @@ @@ -387593,8 +387619,8 @@ index 000000000000..20ab51a776c6 + +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_defs.h b/drivers/gpu/arm/midgard/mali_kbase_defs.h -new file mode 100755 -index 000000000000..f8a6f33df2da +new file mode 100644 +index 000000000..f8a6f33df --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_defs.h @@ -0,0 +1,1602 @@ @@ -389201,8 +389227,8 @@ index 000000000000..f8a6f33df2da + +#endif /* _KBASE_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_device.c b/drivers/gpu/arm/midgard/mali_kbase_device.c -new file mode 100755 -index 000000000000..b0eb67da8644 +new file mode 100644 +index 000000000..b0eb67da8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_device.c @@ -0,0 +1,674 @@ @@ -389881,8 +389907,8 @@ index 000000000000..b0eb67da8644 +KBASE_EXPORT_SYMBOL(_mali_profiling_control); + diff --git a/drivers/gpu/arm/midgard/mali_kbase_disjoint_events.c b/drivers/gpu/arm/midgard/mali_kbase_disjoint_events.c -new file mode 100755 -index 000000000000..f70bcccf4050 +new file mode 100644 +index 000000000..f70bcccf4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_disjoint_events.c @@ -0,0 +1,76 @@ @@ -389963,8 +389989,8 @@ index 000000000000..f70bcccf4050 +} +KBASE_EXPORT_TEST_API(kbase_disjoint_event_get); diff --git a/drivers/gpu/arm/midgard/mali_kbase_dma_fence.c b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.c -new file mode 100755 -index 000000000000..9197743c81d4 +new file mode 100644 +index 000000000..9197743c8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.c @@ -0,0 +1,449 @@ @@ -390418,8 +390444,8 @@ index 000000000000..9197743c81d4 + return 0; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_dma_fence.h b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.h -new file mode 100755 -index 000000000000..c9ab40350422 +new file mode 100644 +index 000000000..c9ab40350 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.h @@ -0,0 +1,131 @@ @@ -390555,8 +390581,8 @@ index 000000000000..c9ab40350422 +#endif /* CONFIG_MALI_DMA_FENCE */ +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_event.c b/drivers/gpu/arm/midgard/mali_kbase_event.c -new file mode 100755 -index 000000000000..188148645f37 +new file mode 100644 +index 000000000..188148645 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_event.c @@ -0,0 +1,259 @@ @@ -390820,8 +390846,8 @@ index 000000000000..188148645f37 + +KBASE_EXPORT_TEST_API(kbase_event_cleanup); diff --git a/drivers/gpu/arm/midgard/mali_kbase_fence.c b/drivers/gpu/arm/midgard/mali_kbase_fence.c -new file mode 100755 -index 000000000000..3bcfb38c31c2 +new file mode 100644 +index 000000000..3bcfb38c3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_fence.c @@ -0,0 +1,200 @@ @@ -391026,8 +391052,8 @@ index 000000000000..3bcfb38c31c2 + return err; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_fence.h b/drivers/gpu/arm/midgard/mali_kbase_fence.h -new file mode 100755 -index 000000000000..639cc2ef4348 +new file mode 100644 +index 000000000..639cc2ef4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_fence.h @@ -0,0 +1,275 @@ @@ -391307,8 +391333,8 @@ index 000000000000..639cc2ef4348 + +#endif /* _KBASE_FENCE_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h b/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h -new file mode 100755 -index 000000000000..fa2c6dfe999e +new file mode 100644 +index 000000000..fa2c6dfe9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h @@ -0,0 +1,51 @@ @@ -391364,8 +391390,8 @@ index 000000000000..fa2c6dfe999e + +#endif /* _KBASE_FENCE_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator.h b/drivers/gpu/arm/midgard/mali_kbase_gator.h -new file mode 100755 -index 000000000000..ce65b5562a2b +new file mode 100644 +index 000000000..ce65b5562 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator.h @@ -0,0 +1,45 @@ @@ -391415,8 +391441,8 @@ index 000000000000..ce65b5562a2b + +#endif /* _KBASE_GATOR_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_api.c b/drivers/gpu/arm/midgard/mali_kbase_gator_api.c -new file mode 100755 -index 000000000000..860e10159fb3 +new file mode 100644 +index 000000000..860e10159 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_api.c @@ -0,0 +1,334 @@ @@ -391755,8 +391781,8 @@ index 000000000000..860e10159fb3 +} +KBASE_EXPORT_SYMBOL(kbase_gator_instr_hwcnt_dump_irq); diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_api.h b/drivers/gpu/arm/midgard/mali_kbase_gator_api.h -new file mode 100755 -index 000000000000..ef9ac0f7b633 +new file mode 100644 +index 000000000..ef9ac0f7b --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_api.h @@ -0,0 +1,219 @@ @@ -391980,8 +392006,8 @@ index 000000000000..ef9ac0f7b633 + +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names.h -new file mode 100755 -index 000000000000..cad19b66200d +new file mode 100644 +index 000000000..cad19b662 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names.h @@ -0,0 +1,2170 @@ @@ -394156,8 +394182,8 @@ index 000000000000..cad19b66200d + +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_thex.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_thex.h -new file mode 100755 -index 000000000000..bcceef4fc9bc +new file mode 100644 +index 000000000..bcceef4fc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_thex.h @@ -0,0 +1,291 @@ @@ -394453,8 +394479,8 @@ index 000000000000..bcceef4fc9bc + +#endif /* _KBASE_GATOR_HWCNT_NAMES_THEX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tmix.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tmix.h -new file mode 100755 -index 000000000000..5ea06770fdb2 +new file mode 100644 +index 000000000..5ea06770f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tmix.h @@ -0,0 +1,291 @@ @@ -394750,8 +394776,8 @@ index 000000000000..5ea06770fdb2 + +#endif /* _KBASE_GATOR_HWCNT_NAMES_TMIX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tsix.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tsix.h -new file mode 100755 -index 000000000000..be09c4556735 +new file mode 100644 +index 000000000..be09c4556 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tsix.h @@ -0,0 +1,291 @@ @@ -395047,8 +395073,8 @@ index 000000000000..be09c4556735 + +#endif /* _KBASE_GATOR_HWCNT_NAMES_TSIX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h b/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h -new file mode 100755 -index 000000000000..42f0111c474f +new file mode 100644 +index 000000000..42f0111c4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h @@ -0,0 +1,123 @@ @@ -395176,8 +395202,8 @@ index 000000000000..42f0111c474f + +#endif /* _KBASE_GPU_ID_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.c -new file mode 100755 -index 000000000000..6df0a1cb1264 +new file mode 100644 +index 000000000..6df0a1cb1 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.c @@ -0,0 +1,97 @@ @@ -395279,8 +395305,8 @@ index 000000000000..6df0a1cb1264 +} +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.h -new file mode 100755 -index 000000000000..7045693eb910 +new file mode 100644 +index 000000000..7045693eb --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.h @@ -0,0 +1,37 @@ @@ -395322,8 +395348,8 @@ index 000000000000..7045693eb910 + +#endif /*_KBASE_GPU_MEMORY_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpuprops.c b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.c -new file mode 100755 -index 000000000000..a947a2e03a2f +new file mode 100644 +index 000000000..a947a2e03 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.c @@ -0,0 +1,510 @@ @@ -395838,8 +395864,8 @@ index 000000000000..a947a2e03a2f + return 0; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpuprops.h b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.h -new file mode 100755 -index 000000000000..57b3eaf9cd53 +new file mode 100644 +index 000000000..57b3eaf9c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.h @@ -0,0 +1,84 @@ @@ -395928,8 +395954,8 @@ index 000000000000..57b3eaf9cd53 + +#endif /* _KBASE_GPUPROPS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpuprops_types.h b/drivers/gpu/arm/midgard/mali_kbase_gpuprops_types.h -new file mode 100755 -index 000000000000..10794fc27318 +new file mode 100644 +index 000000000..10794fc27 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops_types.h @@ -0,0 +1,92 @@ @@ -396026,8 +396052,8 @@ index 000000000000..10794fc27318 + +#endif /* _KBASE_GPUPROPS_TYPES_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hw.c b/drivers/gpu/arm/midgard/mali_kbase_hw.c -new file mode 100755 -index 000000000000..9a390d233939 +new file mode 100644 +index 000000000..9a390d233 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hw.c @@ -0,0 +1,453 @@ @@ -396485,8 +396511,8 @@ index 000000000000..9a390d233939 + return 0; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_hw.h b/drivers/gpu/arm/midgard/mali_kbase_hw.h -new file mode 100755 -index 000000000000..754250ce968d +new file mode 100644 +index 000000000..754250ce9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hw.h @@ -0,0 +1,65 @@ @@ -396556,8 +396582,8 @@ index 000000000000..754250ce968d + +#endif /* _KBASE_HW_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_backend.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_backend.h -new file mode 100755 -index 000000000000..b09be99e6b4e +new file mode 100644 +index 000000000..b09be99e6 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_backend.h @@ -0,0 +1,54 @@ @@ -396616,8 +396642,8 @@ index 000000000000..b09be99e6b4e + +#endif /* _KBASE_HWACCESS_BACKEND_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_defs.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_defs.h -new file mode 100755 -index 000000000000..0acf297192fd +new file mode 100644 +index 000000000..0acf29719 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_defs.h @@ -0,0 +1,36 @@ @@ -396658,8 +396684,8 @@ index 000000000000..0acf297192fd + +#endif /* _KBASE_HWACCESS_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_gpuprops.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_gpuprops.h -new file mode 100755 -index 000000000000..cf8a8131c22e +new file mode 100644 +index 000000000..cf8a8131c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_gpuprops.h @@ -0,0 +1,47 @@ @@ -396711,8 +396737,8 @@ index 000000000000..cf8a8131c22e + +#endif /* _KBASE_HWACCESS_GPUPROPS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_instr.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_instr.h -new file mode 100755 -index 000000000000..5de2b7535bb4 +new file mode 100644 +index 000000000..5de2b7535 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_instr.h @@ -0,0 +1,116 @@ @@ -396833,8 +396859,8 @@ index 000000000000..5de2b7535bb4 + +#endif /* _KBASE_HWACCESS_INSTR_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_jm.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_jm.h -new file mode 100755 -index 000000000000..750fda2cd81d +new file mode 100644 +index 000000000..750fda2cd --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_jm.h @@ -0,0 +1,381 @@ @@ -397220,8 +397246,8 @@ index 000000000000..750fda2cd81d + +#endif /* _KBASE_HWACCESS_JM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_pm.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_pm.h -new file mode 100755 -index 000000000000..71c7d495c40a +new file mode 100644 +index 000000000..71c7d495c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_pm.h @@ -0,0 +1,209 @@ @@ -397435,8 +397461,8 @@ index 000000000000..71c7d495c40a + +#endif /* _KBASE_HWACCESS_PM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_time.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_time.h -new file mode 100755 -index 000000000000..10b65798e6cf +new file mode 100644 +index 000000000..10b65798e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_time.h @@ -0,0 +1,53 @@ @@ -397494,8 +397520,8 @@ index 000000000000..10b65798e6cf + +#endif /* _KBASE_BACKEND_TIME_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwcnt_reader.h b/drivers/gpu/arm/midgard/mali_kbase_hwcnt_reader.h -new file mode 100755 -index 000000000000..cf7bf1b35dc5 +new file mode 100644 +index 000000000..cf7bf1b35 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwcnt_reader.h @@ -0,0 +1,66 @@ @@ -397566,8 +397592,8 @@ index 000000000000..cf7bf1b35dc5 +#endif /* _KBASE_HWCNT_READER_H_ */ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_ioctl.h b/drivers/gpu/arm/midgard/mali_kbase_ioctl.h -new file mode 100755 -index 000000000000..dcbed9c774d6 +new file mode 100644 +index 000000000..dcbed9c77 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_ioctl.h @@ -0,0 +1,656 @@ @@ -398228,8 +398254,8 @@ index 000000000000..dcbed9c774d6 + +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_jd.c b/drivers/gpu/arm/midgard/mali_kbase_jd.c -new file mode 100755 -index 000000000000..d9d8658d31dc +new file mode 100644 +index 000000000..d9d8658d3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jd.c @@ -0,0 +1,1903 @@ @@ -400137,8 +400163,8 @@ index 000000000000..d9d8658d31dc + +KBASE_EXPORT_TEST_API(kbase_jd_exit); diff --git a/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c -new file mode 100755 -index 000000000000..44643abf85aa +new file mode 100644 +index 000000000..44643abf8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c @@ -0,0 +1,233 @@ @@ -400376,8 +400402,8 @@ index 000000000000..44643abf85aa + +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.h -new file mode 100755 -index 000000000000..0935f1db7296 +new file mode 100644 +index 000000000..0935f1db7 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.h @@ -0,0 +1,39 @@ @@ -400421,8 +400447,8 @@ index 000000000000..0935f1db7296 + +#endif /*_KBASE_JD_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_jm.c b/drivers/gpu/arm/midgard/mali_kbase_jm.c -new file mode 100755 -index 000000000000..0c5c6a6f78cb +new file mode 100644 +index 000000000..0c5c6a6f7 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jm.c @@ -0,0 +1,131 @@ @@ -400558,8 +400584,8 @@ index 000000000000..0c5c6a6f78cb +} + diff --git a/drivers/gpu/arm/midgard/mali_kbase_jm.h b/drivers/gpu/arm/midgard/mali_kbase_jm.h -new file mode 100755 -index 000000000000..a74ee24c8058 +new file mode 100644 +index 000000000..a74ee24c8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jm.h @@ -0,0 +1,110 @@ @@ -400674,8 +400700,8 @@ index 000000000000..a74ee24c8058 + +#endif /* _KBASE_JM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_js.c b/drivers/gpu/arm/midgard/mali_kbase_js.c -new file mode 100755 -index 000000000000..10a1d5909bbe +new file mode 100644 +index 000000000..10a1d5909 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js.c @@ -0,0 +1,2834 @@ @@ -403514,8 +403540,8 @@ index 000000000000..10a1d5909bbe + spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags); +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_js.h b/drivers/gpu/arm/midgard/mali_kbase_js.h -new file mode 100755 -index 000000000000..ddada8e468a1 +new file mode 100644 +index 000000000..ddada8e46 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js.h @@ -0,0 +1,925 @@ @@ -404445,8 +404471,8 @@ index 000000000000..ddada8e468a1 + +#endif /* _KBASE_JS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.c b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.c -new file mode 100755 -index 000000000000..321506ada835 +new file mode 100644 +index 000000000..321506ada --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.c @@ -0,0 +1,301 @@ @@ -404752,8 +404778,8 @@ index 000000000000..321506ada835 + return runpool_state_changed; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.h b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.h -new file mode 100755 -index 000000000000..ce9183326a57 +new file mode 100644 +index 000000000..ce9183326 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.h @@ -0,0 +1,158 @@ @@ -404916,8 +404942,8 @@ index 000000000000..ce9183326a57 + +#endif /* _KBASE_JS_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_js_defs.h b/drivers/gpu/arm/midgard/mali_kbase_js_defs.h -new file mode 100755 -index 000000000000..ba8b6441549b +new file mode 100644 +index 000000000..ba8b64415 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js_defs.h @@ -0,0 +1,386 @@ @@ -405308,8 +405334,8 @@ index 000000000000..ba8b6441549b + +#endif /* _KBASE_JS_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_linux.h b/drivers/gpu/arm/midgard/mali_kbase_linux.h -new file mode 100755 -index 000000000000..6d1e61fd41e0 +new file mode 100644 +index 000000000..6d1e61fd4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_linux.h @@ -0,0 +1,43 @@ @@ -405357,8 +405383,8 @@ index 000000000000..6d1e61fd41e0 + +#endif /* _KBASE_LINUX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem.c b/drivers/gpu/arm/midgard/mali_kbase_mem.c -new file mode 100755 -index 000000000000..8cbb5f6765b8 +new file mode 100644 +index 000000000..8cbb5f676 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem.c @@ -0,0 +1,2657 @@ @@ -408020,8 +408046,8 @@ index 000000000000..8cbb5f6765b8 + } +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem.h b/drivers/gpu/arm/midgard/mali_kbase_mem.h -new file mode 100755 -index 000000000000..3f3eaa3fda98 +new file mode 100644 +index 000000000..3f3eaa3fd --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem.h @@ -0,0 +1,1068 @@ @@ -409094,8 +409120,8 @@ index 000000000000..3f3eaa3fda98 + +#endif /* _KBASE_MEM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c -new file mode 100755 -index 000000000000..e20315e67242 +new file mode 100644 +index 000000000..e20315e67 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c @@ -0,0 +1,2578 @@ @@ -411678,8 +411704,8 @@ index 000000000000..e20315e67242 +KBASE_EXPORT_SYMBOL(kbase_va_free); + diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.h b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.h -new file mode 100755 -index 000000000000..33b3554f9d82 +new file mode 100644 +index 000000000..33b3554f9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.h @@ -0,0 +1,231 @@ @@ -411915,8 +411941,8 @@ index 000000000000..33b3554f9d82 + +#endif /* _KBASE_MEM_LINUX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_lowlevel.h b/drivers/gpu/arm/midgard/mali_kbase_mem_lowlevel.h -new file mode 100755 -index 000000000000..9725fd3f05df +new file mode 100644 +index 000000000..9725fd3f0 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_lowlevel.h @@ -0,0 +1,45 @@ @@ -411966,8 +411992,8 @@ index 000000000000..9725fd3f05df + +#endif /* _KBASE_LOWLEVEL_H */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_pool.c b/drivers/gpu/arm/midgard/mali_kbase_mem_pool.c -new file mode 100755 -index 000000000000..a8269940a037 +new file mode 100644 +index 000000000..a8269940a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool.c @@ -0,0 +1,569 @@ @@ -412541,8 +412567,8 @@ index 000000000000..a8269940a037 + pool_dbg(pool, "free_pages(%zu) done\n", nr_pages); +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.c -new file mode 100755 -index 000000000000..585fba036c9e +new file mode 100644 +index 000000000..585fba036 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.c @@ -0,0 +1,81 @@ @@ -412628,8 +412654,8 @@ index 000000000000..585fba036c9e + +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.h -new file mode 100755 -index 000000000000..1442854e8956 +new file mode 100644 +index 000000000..1442854e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.h @@ -0,0 +1,36 @@ @@ -412670,8 +412696,8 @@ index 000000000000..1442854e8956 +#endif /*_KBASE_MEM_POOL_DEBUGFS_H*/ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c -new file mode 100755 -index 000000000000..d58fd8d62fde +new file mode 100644 +index 000000000..d58fd8d62 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c @@ -0,0 +1,121 @@ @@ -412797,8 +412823,8 @@ index 000000000000..d58fd8d62fde +} +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.h -new file mode 100755 -index 000000000000..a1dc2e0b165b +new file mode 100644 +index 000000000..a1dc2e0b1 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.h @@ -0,0 +1,59 @@ @@ -412862,8 +412888,8 @@ index 000000000000..a1dc2e0b165b +#endif /*_KBASE_MEM_PROFILE_DEBUGFS_H*/ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs_buf_size.h b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs_buf_size.h -new file mode 100755 -index 000000000000..82f0702974c2 +new file mode 100644 +index 000000000..82f070297 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs_buf_size.h @@ -0,0 +1,33 @@ @@ -412901,8 +412927,8 @@ index 000000000000..82f0702974c2 +#endif /*_KBASE_MEM_PROFILE_DEBUGFS_BUF_SIZE_H_*/ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu.c b/drivers/gpu/arm/midgard/mali_kbase_mmu.c -new file mode 100755 -index 000000000000..26144850a588 +new file mode 100644 +index 000000000..26144850a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu.c @@ -0,0 +1,2088 @@ @@ -414995,8 +415021,8 @@ index 000000000000..26144850a588 + } +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu_hw.h b/drivers/gpu/arm/midgard/mali_kbase_mmu_hw.h -new file mode 100755 -index 000000000000..986e959e9a0c +new file mode 100644 +index 000000000..986e959e9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_hw.h @@ -0,0 +1,123 @@ @@ -415124,8 +415150,8 @@ index 000000000000..986e959e9a0c + +#endif /* _MALI_KBASE_MMU_HW_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu_mode.h b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode.h -new file mode 100755 -index 000000000000..b487c00426ae +new file mode 100644 +index 000000000..b487c0042 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode.h @@ -0,0 +1,47 @@ @@ -415177,8 +415203,8 @@ index 000000000000..b487c00426ae + +#endif /* _MALI_KBASE_MMU_MODE_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_aarch64.c b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_aarch64.c -new file mode 100755 -index 000000000000..60df171164ff +new file mode 100644 +index 000000000..60df17116 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_aarch64.c @@ -0,0 +1,200 @@ @@ -415383,8 +415409,8 @@ index 000000000000..60df171164ff + return &aarch64_mode; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_lpae.c b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_lpae.c -new file mode 100755 -index 000000000000..53fbbc73af91 +new file mode 100644 +index 000000000..53fbbc73a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_lpae.c @@ -0,0 +1,198 @@ @@ -415587,8 +415613,8 @@ index 000000000000..53fbbc73af91 + return &lpae_mode; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_platform_fake.c b/drivers/gpu/arm/midgard/mali_kbase_platform_fake.c -new file mode 100755 -index 000000000000..1a44957fe44a +new file mode 100644 +index 000000000..1a44957fe --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_platform_fake.c @@ -0,0 +1,124 @@ @@ -415717,8 +415743,8 @@ index 000000000000..1a44957fe44a +#endif /* CONFIG_MALI_PLATFORM_FAKE */ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_pm.c b/drivers/gpu/arm/midgard/mali_kbase_pm.c -new file mode 100755 -index 000000000000..97d543464c28 +new file mode 100644 +index 000000000..97d543464 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_pm.c @@ -0,0 +1,205 @@ @@ -415928,8 +415954,8 @@ index 000000000000..97d543464c28 +} + diff --git a/drivers/gpu/arm/midgard/mali_kbase_pm.h b/drivers/gpu/arm/midgard/mali_kbase_pm.h -new file mode 100755 -index 000000000000..37fa2479df74 +new file mode 100644 +index 000000000..37fa2479d --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_pm.h @@ -0,0 +1,171 @@ @@ -416105,8 +416131,8 @@ index 000000000000..37fa2479df74 + +#endif /* _KBASE_PM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_profiling_gator_api.h b/drivers/gpu/arm/midgard/mali_kbase_profiling_gator_api.h -new file mode 100755 -index 000000000000..7fb674eded37 +new file mode 100644 +index 000000000..7fb674ede --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_profiling_gator_api.h @@ -0,0 +1,40 @@ @@ -416151,8 +416177,8 @@ index 000000000000..7fb674eded37 + +#endif /* _KBASE_PROFILING_GATOR_API */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.c -new file mode 100755 -index 000000000000..c970650069cd +new file mode 100644 +index 000000000..c97065006 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.c @@ -0,0 +1,130 @@ @@ -416287,8 +416313,8 @@ index 000000000000..c970650069cd + +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.h -new file mode 100755 -index 000000000000..f10837002330 +new file mode 100644 +index 000000000..f10837002 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.h @@ -0,0 +1,50 @@ @@ -416343,8 +416369,8 @@ index 000000000000..f10837002330 + +#endif /*_KBASE_REGS_HISTORY_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_replay.c b/drivers/gpu/arm/midgard/mali_kbase_replay.c -new file mode 100755 -index 000000000000..84aa3316e435 +new file mode 100644 +index 000000000..84aa3316e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_replay.c @@ -0,0 +1,1166 @@ @@ -417515,8 +417541,8 @@ index 000000000000..84aa3316e435 + return true; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_smc.c b/drivers/gpu/arm/midgard/mali_kbase_smc.c -new file mode 100755 -index 000000000000..6c8cf73ae58c +new file mode 100644 +index 000000000..6c8cf73ae --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_smc.c @@ -0,0 +1,86 @@ @@ -417607,8 +417633,8 @@ index 000000000000..6c8cf73ae58c +#endif /* CONFIG_ARM64 */ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_smc.h b/drivers/gpu/arm/midgard/mali_kbase_smc.h -new file mode 100755 -index 000000000000..9bff3d2e8b4d +new file mode 100644 +index 000000000..9bff3d2e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_smc.h @@ -0,0 +1,67 @@ @@ -417680,8 +417706,8 @@ index 000000000000..9bff3d2e8b4d + +#endif /* _KBASE_SMC_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_softjobs.c b/drivers/gpu/arm/midgard/mali_kbase_softjobs.c -new file mode 100755 -index 000000000000..396953e780a8 +new file mode 100644 +index 000000000..396953e78 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_softjobs.c @@ -0,0 +1,1549 @@ @@ -419235,8 +419261,8 @@ index 000000000000..396953e780a8 + kbase_js_sched_all(kbdev); +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_strings.c b/drivers/gpu/arm/midgard/mali_kbase_strings.c -new file mode 100755 -index 000000000000..c98762cec244 +new file mode 100644 +index 000000000..c98762cec --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_strings.c @@ -0,0 +1,23 @@ @@ -419264,8 +419290,8 @@ index 000000000000..c98762cec244 +const char kbase_drv_name[] = KBASE_DRV_NAME; +const char kbase_timeline_name[] = KBASE_TIMELINE_NAME; diff --git a/drivers/gpu/arm/midgard/mali_kbase_strings.h b/drivers/gpu/arm/midgard/mali_kbase_strings.h -new file mode 100755 -index 000000000000..41b8fdbec6a4 +new file mode 100644 +index 000000000..41b8fdbec --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_strings.h @@ -0,0 +1,19 @@ @@ -419289,8 +419315,8 @@ index 000000000000..41b8fdbec6a4 +extern const char kbase_drv_name[]; +extern const char kbase_timeline_name[]; diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync.h b/drivers/gpu/arm/midgard/mali_kbase_sync.h -new file mode 100755 -index 000000000000..33b580595563 +new file mode 100644 +index 000000000..33b580595 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync.h @@ -0,0 +1,203 @@ @@ -419498,8 +419524,8 @@ index 000000000000..33b580595563 + +#endif /* MALI_KBASE_SYNC_H */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync_android.c b/drivers/gpu/arm/midgard/mali_kbase_sync_android.c -new file mode 100755 -index 000000000000..d7349dcae69a +new file mode 100644 +index 000000000..d7349dcae --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync_android.c @@ -0,0 +1,537 @@ @@ -420041,8 +420067,8 @@ index 000000000000..d7349dcae69a +} +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync_common.c b/drivers/gpu/arm/midgard/mali_kbase_sync_common.c -new file mode 100755 -index 000000000000..457def296684 +new file mode 100644 +index 000000000..457def296 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync_common.c @@ -0,0 +1,43 @@ @@ -420090,8 +420116,8 @@ index 000000000000..457def296684 + return "error"; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync_file.c b/drivers/gpu/arm/midgard/mali_kbase_sync_file.c -new file mode 100755 -index 000000000000..60b5d74db33e +new file mode 100644 +index 000000000..60b5d74db --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync_file.c @@ -0,0 +1,359 @@ @@ -420455,8 +420481,8 @@ index 000000000000..60b5d74db33e +} +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_tlstream.c b/drivers/gpu/arm/midgard/mali_kbase_tlstream.c -new file mode 100755 -index 000000000000..c8310c45f143 +new file mode 100644 +index 000000000..c8310c45f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_tlstream.c @@ -0,0 +1,2572 @@ @@ -423033,8 +423059,8 @@ index 000000000000..c8310c45f143 + kbasep_tlstream_msgbuf_release(TL_STREAM_TYPE_AUX, flags); +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_tlstream.h b/drivers/gpu/arm/midgard/mali_kbase_tlstream.h -new file mode 100755 -index 000000000000..c0a1117d5f25 +new file mode 100644 +index 000000000..c0a1117d5 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_tlstream.h @@ -0,0 +1,623 @@ @@ -423662,8 +423688,8 @@ index 000000000000..c0a1117d5f25 +#endif /* _KBASE_TLSTREAM_H */ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_trace_defs.h b/drivers/gpu/arm/midgard/mali_kbase_trace_defs.h -new file mode 100755 -index 000000000000..e2e0544208ce +new file mode 100644 +index 000000000..e2e054420 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_defs.h @@ -0,0 +1,264 @@ @@ -423932,8 +423958,8 @@ index 000000000000..e2e0544208ce + +/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c -new file mode 100755 -index 000000000000..5830e87f0818 +new file mode 100644 +index 000000000..5830e87f0 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c @@ -0,0 +1,236 @@ @@ -424174,8 +424200,8 @@ index 000000000000..5830e87f0818 + +#endif /* CONFIG_MALI_TRACE_TIMELINE */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.h b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.h -new file mode 100755 -index 000000000000..a04f7c1420e0 +new file mode 100644 +index 000000000..a04f7c142 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.h @@ -0,0 +1,363 @@ @@ -424543,8 +424569,8 @@ index 000000000000..a04f7c1420e0 +#endif /* _KBASE_TRACE_TIMELINE_H */ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_trace_timeline_defs.h b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline_defs.h -new file mode 100755 -index 000000000000..156a95a67f4a +new file mode 100644 +index 000000000..156a95a67 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline_defs.h @@ -0,0 +1,140 @@ @@ -424689,8 +424715,8 @@ index 000000000000..156a95a67f4a +"HW: Job Chain stop (SW approximated)", "%d,%d,%d", +"_tgid,job_slot,_producerof_atom_number_completed") diff --git a/drivers/gpu/arm/midgard/mali_kbase_uku.h b/drivers/gpu/arm/midgard/mali_kbase_uku.h -new file mode 100755 -index 000000000000..c22a59324248 +new file mode 100644 +index 000000000..c22a59324 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_uku.h @@ -0,0 +1,545 @@ @@ -425240,8 +425266,8 @@ index 000000000000..c22a59324248 +#endif /* _KBASE_UKU_H_ */ + diff --git a/drivers/gpu/arm/midgard/mali_kbase_utility.c b/drivers/gpu/arm/midgard/mali_kbase_utility.c -new file mode 100755 -index 000000000000..be474ff87401 +new file mode 100644 +index 000000000..be474ff87 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_utility.c @@ -0,0 +1,33 @@ @@ -425279,8 +425305,8 @@ index 000000000000..be474ff87401 + return false; +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_utility.h b/drivers/gpu/arm/midgard/mali_kbase_utility.h -new file mode 100755 -index 000000000000..fd7252dab0de +new file mode 100644 +index 000000000..fd7252dab --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_utility.h @@ -0,0 +1,37 @@ @@ -425322,8 +425348,8 @@ index 000000000000..fd7252dab0de + +#endif /* _KBASE_UTILITY_H */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_vinstr.c b/drivers/gpu/arm/midgard/mali_kbase_vinstr.c -new file mode 100755 -index 000000000000..8395568d0efa +new file mode 100644 +index 000000000..8395568d0 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_vinstr.c @@ -0,0 +1,2070 @@ @@ -427398,8 +427424,8 @@ index 000000000000..8395568d0efa + spin_unlock_irqrestore(&vinstr_ctx->state_lock, flags); +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_vinstr.h b/drivers/gpu/arm/midgard/mali_kbase_vinstr.h -new file mode 100755 -index 000000000000..6207d25aef06 +new file mode 100644 +index 000000000..6207d25ae --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_vinstr.h @@ -0,0 +1,155 @@ @@ -427559,8 +427585,8 @@ index 000000000000..6207d25aef06 +#endif /* _KBASE_VINSTR_H_ */ + diff --git a/drivers/gpu/arm/midgard/mali_linux_kbase_trace.h b/drivers/gpu/arm/midgard/mali_linux_kbase_trace.h -new file mode 100755 -index 000000000000..5d6b4021d626 +new file mode 100644 +index 000000000..5d6b4021d --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_linux_kbase_trace.h @@ -0,0 +1,201 @@ @@ -427766,8 +427792,8 @@ index 000000000000..5d6b4021d626 +/* This part must be outside protection */ +#include diff --git a/drivers/gpu/arm/midgard/mali_linux_trace.h b/drivers/gpu/arm/midgard/mali_linux_trace.h -new file mode 100755 -index 000000000000..2be06a552768 +new file mode 100644 +index 000000000..2be06a552 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_linux_trace.h @@ -0,0 +1,189 @@ @@ -427961,8 +427987,8 @@ index 000000000000..2be06a552768 +/* This part must be outside protection */ +#include diff --git a/drivers/gpu/arm/midgard/mali_malisw.h b/drivers/gpu/arm/midgard/mali_malisw.h -new file mode 100755 -index 000000000000..99452933eab4 +new file mode 100644 +index 000000000..99452933e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_malisw.h @@ -0,0 +1,131 @@ @@ -428098,8 +428124,8 @@ index 000000000000..99452933eab4 + +#endif /* _MALISW_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_midg_coherency.h b/drivers/gpu/arm/midgard/mali_midg_coherency.h -new file mode 100755 -index 000000000000..a509cbd5f175 +new file mode 100644 +index 000000000..a509cbd5f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_midg_coherency.h @@ -0,0 +1,26 @@ @@ -428130,8 +428156,8 @@ index 000000000000..a509cbd5f175 + +#endif /* _MIDG_COHERENCY_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_midg_regmap.h b/drivers/gpu/arm/midgard/mali_midg_regmap.h -new file mode 100755 -index 000000000000..7d7b7bcd3cc3 +new file mode 100644 +index 000000000..7d7b7bcd3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_midg_regmap.h @@ -0,0 +1,611 @@ @@ -428747,8 +428773,8 @@ index 000000000000..7d7b7bcd3cc3 + +#endif /* _MIDGARD_REGMAP_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_timeline.h b/drivers/gpu/arm/midgard/mali_timeline.h -new file mode 100755 -index 000000000000..bd5f6614b6bb +new file mode 100644 +index 000000000..bd5f6614b --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_timeline.h @@ -0,0 +1,396 @@ @@ -429149,8 +429175,8 @@ index 000000000000..bd5f6614b6bb +#include + diff --git a/drivers/gpu/arm/midgard/mali_uk.h b/drivers/gpu/arm/midgard/mali_uk.h -new file mode 100755 -index 000000000000..841d03fb5873 +new file mode 100644 +index 000000000..841d03fb5 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_uk.h @@ -0,0 +1,141 @@ @@ -429296,8 +429322,8 @@ index 000000000000..841d03fb5873 +#endif /* __cplusplus */ +#endif /* _UK_H_ */ diff --git a/drivers/gpu/arm/midgard/platform/Kconfig b/drivers/gpu/arm/midgard/platform/Kconfig -new file mode 100755 -index 000000000000..8fb4e917c4fa +new file mode 100644 +index 000000000..8fb4e917c --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/Kconfig @@ -0,0 +1,24 @@ @@ -429326,8 +429352,8 @@ index 000000000000..8fb4e917c4fa +# + diff --git a/drivers/gpu/arm/midgard/platform/devicetree/Kbuild b/drivers/gpu/arm/midgard/platform/devicetree/Kbuild -new file mode 100755 -index 000000000000..e888a42fc69a +new file mode 100644 +index 000000000..e888a42fc --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/Kbuild @@ -0,0 +1,18 @@ @@ -429350,8 +429376,8 @@ index 000000000000..e888a42fc69a + $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_config_devicetree.o \ + $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_runtime_pm.o diff --git a/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_devicetree.c b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_devicetree.c -new file mode 100755 -index 000000000000..b2a7c93f12a9 +new file mode 100644 +index 000000000..b2a7c93f1 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_devicetree.c @@ -0,0 +1,31 @@ @@ -429387,8 +429413,8 @@ index 000000000000..b2a7c93f12a9 + return &dummy_platform_config; +} diff --git a/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_platform.h -new file mode 100755 -index 000000000000..49e107f98000 +new file mode 100644 +index 000000000..49e107f98 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_platform.h @@ -0,0 +1,73 @@ @@ -429466,8 +429492,8 @@ index 000000000000..49e107f98000 + +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c -new file mode 100755 -index 000000000000..aa4376afd3ba +new file mode 100644 +index 000000000..aa4376afd --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c @@ -0,0 +1,100 @@ @@ -429572,8 +429598,8 @@ index 000000000000..aa4376afd3ba + + diff --git a/drivers/gpu/arm/midgard/platform/mali_kbase_platform_common.h b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_common.h -new file mode 100755 -index 000000000000..c11085af5f24 +new file mode 100644 +index 000000000..c11085af5 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_common.h @@ -0,0 +1,28 @@ @@ -429606,8 +429632,8 @@ index 000000000000..c11085af5f24 +int kbase_platform_early_init(void); +int kbase_platform_rk_init_opp_table(struct kbase_device *kbdev); diff --git a/drivers/gpu/arm/midgard/platform/mali_kbase_platform_fake.h b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_fake.h -new file mode 100755 -index 000000000000..01f9dfce93cc +new file mode 100644 +index 000000000..01f9dfce9 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_fake.h @@ -0,0 +1,38 @@ @@ -429650,8 +429676,8 @@ index 000000000000..01f9dfce93cc + +#endif /* CONFIG_MALI_PLATFORM_FAKE */ diff --git a/drivers/gpu/arm/midgard/platform/rk/Kbuild b/drivers/gpu/arm/midgard/platform/rk/Kbuild -new file mode 100755 -index 000000000000..db993487e3be +new file mode 100644 +index 000000000..db993487e --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/Kbuild @@ -0,0 +1,17 @@ @@ -429673,8 +429699,8 @@ index 000000000000..db993487e3be + $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_config_rk.o + diff --git a/drivers/gpu/arm/midgard/platform/rk/custom_log.h b/drivers/gpu/arm/midgard/platform/rk/custom_log.h -new file mode 100755 -index 000000000000..fe5e1224149e +new file mode 100644 +index 000000000..fe5e12241 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/custom_log.h @@ -0,0 +1,209 @@ @@ -429888,8 +429914,8 @@ index 000000000000..fe5e1224149e + +#endif /* __CUSTOM_LOG_H__ */ diff --git a/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_platform.h -new file mode 100755 -index 000000000000..07c5b6f8a760 +new file mode 100644 +index 000000000..07c5b6f8a --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_platform.h @@ -0,0 +1,88 @@ @@ -429982,8 +430008,8 @@ index 000000000000..07c5b6f8a760 +#define SECURE_CALLBACKS (NULL) + diff --git a/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c -new file mode 100755 -index 000000000000..8ad910c1256f +new file mode 100644 +index 000000000..8ad910c12 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c @@ -0,0 +1,492 @@ @@ -430480,8 +430506,8 @@ index 000000000000..8ad910c1256f + "gpu_leakage", "mali"); +} diff --git a/drivers/gpu/arm/midgard/platform/rk/mali_kbase_rk.h b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_rk.h -new file mode 100755 -index 000000000000..6eab25014d21 +new file mode 100644 +index 000000000..6eab25014 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_rk.h @@ -0,0 +1,62 @@ @@ -430548,8 +430574,8 @@ index 000000000000..6eab25014d21 +#endif /* _MALI_KBASE_RK_H_ */ + diff --git a/drivers/gpu/arm/midgard/platform/vexpress/Kbuild b/drivers/gpu/arm/midgard/platform/vexpress/Kbuild -new file mode 100755 -index 000000000000..1caa293666d3 +new file mode 100644 +index 000000000..1caa29366 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/Kbuild @@ -0,0 +1,18 @@ @@ -430572,8 +430598,8 @@ index 000000000000..1caa293666d3 + $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_config_vexpress.o \ + $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_cpu_vexpress.o diff --git a/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_platform.h -new file mode 100755 -index 000000000000..02835f129aa3 +new file mode 100644 +index 000000000..02835f129 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_platform.h @@ -0,0 +1,75 @@ @@ -430653,8 +430679,8 @@ index 000000000000..02835f129aa3 + +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_vexpress.c -new file mode 100755 -index 000000000000..15ce2bc5eea5 +new file mode 100644 +index 000000000..15ce2bc5e --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_vexpress.c @@ -0,0 +1,85 @@ @@ -430744,8 +430770,8 @@ index 000000000000..15ce2bc5eea5 + return 0; +} diff --git a/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.c -new file mode 100755 -index 000000000000..4665f98cbbe4 +new file mode 100644 +index 000000000..4665f98cb --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.c @@ -0,0 +1,279 @@ @@ -431029,8 +431055,8 @@ index 000000000000..4665f98cbbe4 + } +} diff --git a/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.h b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.h -new file mode 100755 -index 000000000000..da865698133a +new file mode 100644 +index 000000000..da8656981 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.h @@ -0,0 +1,38 @@ @@ -431073,8 +431099,8 @@ index 000000000000..da865698133a + +#endif /* _KBASE_CPU_VEXPRESS_H_ */ diff --git a/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/Kbuild b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/Kbuild -new file mode 100755 -index 000000000000..7efe8fa4263b +new file mode 100644 +index 000000000..7efe8fa42 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/Kbuild @@ -0,0 +1,16 @@ @@ -431095,8 +431121,8 @@ index 000000000000..7efe8fa4263b + +mali_kbase-y += $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_config_vexpress.o diff --git a/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h -new file mode 100755 -index 000000000000..0efbf3962f98 +new file mode 100644 +index 000000000..0efbf3962 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h @@ -0,0 +1,73 @@ @@ -431174,8 +431200,8 @@ index 000000000000..0efbf3962f98 + +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c -new file mode 100755 -index 000000000000..3ff0930fb4a3 +new file mode 100644 +index 000000000..3ff0930fb --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c @@ -0,0 +1,79 @@ @@ -431259,8 +431285,8 @@ index 000000000000..3ff0930fb4a3 + return 0; +} diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/Kbuild b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/Kbuild -new file mode 100755 -index 000000000000..1caa293666d3 +new file mode 100644 +index 000000000..1caa29366 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/Kbuild @@ -0,0 +1,18 @@ @@ -431283,8 +431309,8 @@ index 000000000000..1caa293666d3 + $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_config_vexpress.o \ + $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_cpu_vexpress.o diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h -new file mode 100755 -index 000000000000..dbdf21e009f9 +new file mode 100644 +index 000000000..dbdf21e00 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h @@ -0,0 +1,75 @@ @@ -431364,8 +431390,8 @@ index 000000000000..dbdf21e009f9 + +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c -new file mode 100755 -index 000000000000..76ffe4a1e59e +new file mode 100644 +index 000000000..76ffe4a1e --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c @@ -0,0 +1,83 @@ @@ -431453,8 +431479,8 @@ index 000000000000..76ffe4a1e59e +} + diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c -new file mode 100755 -index 000000000000..816dff49835f +new file mode 100644 +index 000000000..816dff498 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c @@ -0,0 +1,71 @@ @@ -431530,8 +431556,8 @@ index 000000000000..816dff49835f + return 0; +} diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h -new file mode 100755 -index 000000000000..23647ccb0871 +new file mode 100644 +index 000000000..23647ccb0 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h @@ -0,0 +1,28 @@ @@ -431564,8 +431590,8 @@ index 000000000000..23647ccb0871 + +#endif /* _KBASE_CPU_VEXPRESS_H_ */ diff --git a/drivers/gpu/arm/midgard/platform_dummy/mali_ukk_os.h b/drivers/gpu/arm/midgard/platform_dummy/mali_ukk_os.h -new file mode 100755 -index 000000000000..5fa9b39c4bc0 +new file mode 100644 +index 000000000..5fa9b39c4 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform_dummy/mali_ukk_os.h @@ -0,0 +1,53 @@ @@ -431623,8 +431649,8 @@ index 000000000000..5fa9b39c4bc0 + +#endif /* _UKK_OS_H__ */ diff --git a/drivers/gpu/arm/midgard/protected_mode_switcher.h b/drivers/gpu/arm/midgard/protected_mode_switcher.h -new file mode 100755 -index 000000000000..5dc2f3ba8cf6 +new file mode 100644 +index 000000000..5dc2f3ba8 --- /dev/null +++ b/drivers/gpu/arm/midgard/protected_mode_switcher.h @@ -0,0 +1,64 @@ @@ -431693,8 +431719,8 @@ index 000000000000..5dc2f3ba8cf6 + +#endif /* _PROTECTED_MODE_SWITCH_H_ */ diff --git a/drivers/gpu/arm/midgard/rename.h b/drivers/gpu/arm/midgard/rename.h -new file mode 100755 -index 000000000000..8218666183ea +new file mode 100644 +index 000000000..821866618 --- /dev/null +++ b/drivers/gpu/arm/midgard/rename.h @@ -0,0 +1,426 @@ @@ -432125,8 +432151,8 @@ index 000000000000..8218666183ea +#define rk_kbase_device_runtime_init midgard_rk_kbase_device_runtime_init +#endif diff --git a/drivers/gpu/arm/midgard/sconscript b/drivers/gpu/arm/midgard/sconscript -new file mode 100755 -index 000000000000..ff23d7aebe6e +new file mode 100644 +index 000000000..ff23d7aeb --- /dev/null +++ b/drivers/gpu/arm/midgard/sconscript @@ -0,0 +1,92 @@ @@ -432223,8 +432249,8 @@ index 000000000000..ff23d7aebe6e + +env.AppendUnique(BASE=['cutils_linked_list']) diff --git a/drivers/gpu/arm/midgard/tests/Kbuild b/drivers/gpu/arm/midgard/tests/Kbuild -new file mode 100755 -index 000000000000..b4bed0473439 +new file mode 100644 +index 000000000..b4bed0473 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/Kbuild @@ -0,0 +1,17 @@ @@ -432246,8 +432272,8 @@ index 000000000000..b4bed0473439 +obj-$(CONFIG_MALI_KUTF) += kutf/ +obj-$(CONFIG_MALI_IRQ_LATENCY) += mali_kutf_irq_test/ diff --git a/drivers/gpu/arm/midgard/tests/Kconfig b/drivers/gpu/arm/midgard/tests/Kconfig -new file mode 100755 -index 000000000000..da0515c065de +new file mode 100644 +index 000000000..da0515c06 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/Kconfig @@ -0,0 +1,17 @@ @@ -432269,8 +432295,8 @@ index 000000000000..da0515c065de +source "drivers/gpu/arm/midgard/tests/kutf/Kconfig" +source "drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig" diff --git a/drivers/gpu/arm/midgard/tests/include/kutf/kutf_mem.h b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_mem.h -new file mode 100755 -index 000000000000..0d145e42a0ca +new file mode 100644 +index 000000000..0d145e42a --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_mem.h @@ -0,0 +1,65 @@ @@ -432340,8 +432366,8 @@ index 000000000000..0d145e42a0ca +void kutf_mempool_destroy(struct kutf_mempool *pool); +#endif /* _KERNEL_UTF_MEM_H_ */ diff --git a/drivers/gpu/arm/midgard/tests/include/kutf/kutf_resultset.h b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_resultset.h -new file mode 100755 -index 000000000000..1cc85f1b7a46 +new file mode 100644 +index 000000000..1cc85f1b7 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_resultset.h @@ -0,0 +1,121 @@ @@ -432467,8 +432493,8 @@ index 000000000000..1cc85f1b7a46 + +#endif /* _KERNEL_UTF_RESULTSET_H_ */ diff --git a/drivers/gpu/arm/midgard/tests/include/kutf/kutf_suite.h b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_suite.h -new file mode 100755 -index 000000000000..754c3adb1cca +new file mode 100644 +index 000000000..754c3adb1 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_suite.h @@ -0,0 +1,508 @@ @@ -432981,8 +433007,8 @@ index 000000000000..754c3adb1cca + +#endif /* _KERNEL_UTF_SUITE_H_ */ diff --git a/drivers/gpu/arm/midgard/tests/include/kutf/kutf_utils.h b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_utils.h -new file mode 100755 -index 000000000000..c458c1f73802 +new file mode 100644 +index 000000000..c458c1f73 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_utils.h @@ -0,0 +1,55 @@ @@ -433042,8 +433068,8 @@ index 000000000000..c458c1f73802 + +#endif /* _KERNEL_UTF_UTILS_H_ */ diff --git a/drivers/gpu/arm/midgard/tests/kutf/Kbuild b/drivers/gpu/arm/midgard/tests/kutf/Kbuild -new file mode 100755 -index 000000000000..6b840c2ef7b7 +new file mode 100644 +index 000000000..6b840c2ef --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/Kbuild @@ -0,0 +1,20 @@ @@ -433068,8 +433094,8 @@ index 000000000000..6b840c2ef7b7 + +kutf-y := kutf_mem.o kutf_resultset.o kutf_suite.o kutf_utils.o diff --git a/drivers/gpu/arm/midgard/tests/kutf/Kconfig b/drivers/gpu/arm/midgard/tests/kutf/Kconfig -new file mode 100755 -index 000000000000..84364716afe3 +new file mode 100644 +index 000000000..84364716a --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/Kconfig @@ -0,0 +1,22 @@ @@ -433096,8 +433122,8 @@ index 000000000000..84364716afe3 + Enables MALI testing framework. To compile it as a module, + choose M here - this will generate a single module called kutf. diff --git a/drivers/gpu/arm/midgard/tests/kutf/Makefile b/drivers/gpu/arm/midgard/tests/kutf/Makefile -new file mode 100755 -index 000000000000..010c92ca39b9 +new file mode 100644 +index 000000000..010c92ca3 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/Makefile @@ -0,0 +1,29 @@ @@ -433131,8 +433157,8 @@ index 000000000000..010c92ca39b9 +clean: + $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean diff --git a/drivers/gpu/arm/midgard/tests/kutf/kutf_mem.c b/drivers/gpu/arm/midgard/tests/kutf/kutf_mem.c -new file mode 100755 -index 000000000000..5408e57d469a +new file mode 100644 +index 000000000..5408e57d4 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_mem.c @@ -0,0 +1,94 @@ @@ -433231,8 +433257,8 @@ index 000000000000..5408e57d469a +} +EXPORT_SYMBOL(kutf_mempool_alloc); diff --git a/drivers/gpu/arm/midgard/tests/kutf/kutf_resultset.c b/drivers/gpu/arm/midgard/tests/kutf/kutf_resultset.c -new file mode 100755 -index 000000000000..5bd04969fd55 +new file mode 100644 +index 000000000..5bd04969f --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_resultset.c @@ -0,0 +1,95 @@ @@ -433332,8 +433358,8 @@ index 000000000000..5bd04969fd55 +} + diff --git a/drivers/gpu/arm/midgard/tests/kutf/kutf_suite.c b/drivers/gpu/arm/midgard/tests/kutf/kutf_suite.c -new file mode 100755 -index 000000000000..a7cfd3be9c46 +new file mode 100644 +index 000000000..a7cfd3be9 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_suite.c @@ -0,0 +1,1041 @@ @@ -434379,8 +434405,8 @@ index 000000000000..a7cfd3be9c46 +module_init(init_kutf_core); +module_exit(exit_kutf_core); diff --git a/drivers/gpu/arm/midgard/tests/kutf/kutf_utils.c b/drivers/gpu/arm/midgard/tests/kutf/kutf_utils.c -new file mode 100755 -index 000000000000..a429a2dbf788 +new file mode 100644 +index 000000000..a429a2dbf --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_utils.c @@ -0,0 +1,71 @@ @@ -434456,8 +434482,8 @@ index 000000000000..a429a2dbf788 +} +EXPORT_SYMBOL(kutf_dsprintf); diff --git a/drivers/gpu/arm/midgard/tests/kutf/sconscript b/drivers/gpu/arm/midgard/tests/kutf/sconscript -new file mode 100755 -index 000000000000..d7f112448e42 +new file mode 100644 +index 000000000..d7f112448 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/sconscript @@ -0,0 +1,21 @@ @@ -434483,8 +434509,8 @@ index 000000000000..d7f112448e42 +mod = kutf_env.BuildKernelModule('$STATIC_LIB_PATH/kutf.ko', Glob('*.c'), make_args = make_args) +kutf_env.KernelObjTarget('kutf', mod) diff --git a/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kbuild b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kbuild -new file mode 100755 -index 000000000000..0cd9cebe9d8b +new file mode 100644 +index 000000000..0cd9cebe9 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kbuild @@ -0,0 +1,20 @@ @@ -434509,8 +434535,8 @@ index 000000000000..0cd9cebe9d8b + +mali_kutf_irq_test-y := mali_kutf_irq_test_main.o diff --git a/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig -new file mode 100755 -index 000000000000..16f68d15c46e +new file mode 100644 +index 000000000..16f68d15c --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig @@ -0,0 +1,23 @@ @@ -434538,8 +434564,8 @@ index 000000000000..16f68d15c46e + can determine the latency of the Mali GPU IRQ on your system. + Choosing M here will generate a single module called mali_kutf_irq_test. diff --git a/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Makefile b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Makefile -new file mode 100755 -index 000000000000..4e948767a4ac +new file mode 100644 +index 000000000..4e948767a --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Makefile @@ -0,0 +1,51 @@ @@ -434595,8 +434621,8 @@ index 000000000000..4e948767a4ac +clean: + $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean diff --git a/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c -new file mode 100755 -index 000000000000..e2ff4432bf80 +new file mode 100644 +index 000000000..e2ff4432b --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c @@ -0,0 +1,257 @@ @@ -434858,8 +434884,8 @@ index 000000000000..e2ff4432bf80 +MODULE_AUTHOR("ARM Ltd."); +MODULE_VERSION("1.0"); diff --git a/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/sconscript b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/sconscript -new file mode 100755 -index 000000000000..ec837f16448d +new file mode 100644 +index 000000000..ec837f164 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/sconscript @@ -0,0 +1,30 @@ @@ -434894,8 +434920,8 @@ index 000000000000..ec837f16448d + env.Depends('$STATIC_LIB_PATH/mali_kutf_irq_test.ko', '$STATIC_LIB_PATH/mali_kbase.ko') + env.KernelObjTarget('mali_kutf_irq_test', cmd) diff --git a/drivers/gpu/arm/midgard/tests/sconscript b/drivers/gpu/arm/midgard/tests/sconscript -new file mode 100755 -index 000000000000..5337e1078e20 +new file mode 100644 +index 000000000..5337e1078 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/sconscript @@ -0,0 +1,37 @@ @@ -434937,8 +434963,8 @@ index 000000000000..5337e1078e20 + SConscript('mali_kutf_ipa_test/sconscript') + SConscript('mali_kutf_vinstr_test/sconscript') diff --git a/drivers/gpu/arm/sconscript b/drivers/gpu/arm/sconscript -new file mode 100755 -index 000000000000..a06092bd5bf0 +new file mode 100644 +index 000000000..a06092bd5 --- /dev/null +++ b/drivers/gpu/arm/sconscript @@ -0,0 +1,25 @@ @@ -434968,7 +434994,7 @@ index 000000000000..a06092bd5bf0 + +SConscript('midgard/sconscript') diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig -index 4e9b3a95fa7c..95994151a360 100644 +index b37e6660d..67e8d6a63 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -32,6 +32,10 @@ config DRM_MIPI_DBI @@ -434983,7 +435009,7 @@ index 4e9b3a95fa7c..95994151a360 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 e8baa07450b7..53264c731c69 100644 +index e8baa0745..53264c731 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 @@ @@ -437095,7 +437121,7 @@ index e8baa07450b7..53264c731c69 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 c051502d7fbf..f744058e59a5 100644 +index c051502d7..f744058e5 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 @@ @@ -437261,7 +437287,7 @@ index c051502d7fbf..f744058e59a5 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 cab3f5c4e2fc..e756d7cd3d41 100644 +index cab3f5c4e..e756d7cd3 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c @@ -11,30 +11,44 @@ @@ -438950,7 +438976,7 @@ index cab3f5c4e2fc..e756d7cd3d41 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 e284ee8da58b..0a368b1722ec 100644 +index e284ee8da..0a368b172 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h @@ -15,9 +15,27 @@ @@ -439142,7 +439168,7 @@ index e284ee8da58b..0a368b1722ec 100644 + #endif /* _ANALOGIX_DP_REG_H */ diff --git a/drivers/gpu/drm/bridge/synopsys/Makefile b/drivers/gpu/drm/bridge/synopsys/Makefile -index 91d746ad5de1..757f5526fd64 100644 +index 91d746ad5..757f5526f 100644 --- a/drivers/gpu/drm/bridge/synopsys/Makefile +++ b/drivers/gpu/drm/bridge/synopsys/Makefile @@ -1,7 +1,8 @@ @@ -439158,7 +439184,7 @@ index 91d746ad5de1..757f5526fd64 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 f72d27208ebe..966d297ef41d 100644 +index f72d27208..966d297ef 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h @@ -17,6 +17,7 @@ struct dw_hdmi_i2s_audio_data { @@ -439170,7 +439196,7 @@ index f72d27208ebe..966d297ef41d 100644 }; diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c -index 70ab4fbdc23e..414d601bf216 100644 +index 70ab4fbdc..414d601bf 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c @@ -4,14 +4,17 @@ @@ -439546,7 +439572,7 @@ index 70ab4fbdc23e..414d601bf216 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 cf4dc121a2c4..ec10660a7e53 100644 +index cf4dc121a..ec10660a7 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h @@ -3,17 +3,24 @@ @@ -439575,8 +439601,8 @@ index cf4dc121a2c4..ec10660a7e53 100644 + #endif diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.c -new file mode 100755 -index 000000000000..24aab5043e61 +new file mode 100644 +index 000000000..24aab5043 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.c @@ -0,0 +1,748 @@ @@ -440329,8 +440355,8 @@ index 000000000000..24aab5043e61 +MODULE_DESCRIPTION("DW HDMI transmitter HDCP driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h -new file mode 100755 -index 000000000000..d138f91f3422 +new file mode 100644 +index 000000000..d138f91f3 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h @@ -0,0 +1,54 @@ @@ -440389,7 +440415,7 @@ index 000000000000..d138f91f3422 + +#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 9682416056ed..7ec390d46ca5 100644 +index 968241605..7ec390d46 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) @@ -440477,8 +440503,8 @@ index 9682416056ed..7ec390d46ca5 100644 .audio_shutdown = dw_hdmi_i2s_audio_shutdown, .get_eld = dw_hdmi_i2s_get_eld, diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-audio.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-audio.h -new file mode 100755 -index 000000000000..93f1a42954e7 +new file mode 100644 +index 000000000..93f1a4295 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-audio.h @@ -0,0 +1,29 @@ @@ -440513,7 +440539,7 @@ index 000000000000..93f1a42954e7 +#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 000000000000..2d2320ed0769 +index 000000000..2d2320ed0 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.c @@ -0,0 +1,336 @@ @@ -440855,7 +440881,7 @@ index 000000000000..2d2320ed0769 +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 000000000000..c0977c612e34 +index 000000000..c0977c612 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.h @@ -0,0 +1,25 @@ @@ -440886,7 +440912,7 @@ index 000000000000..c0977c612e34 +#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 000000000000..7f55f7201ff8 +index 000000000..7f55f7201 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.c @@ -0,0 +1,650 @@ @@ -441542,7 +441568,7 @@ index 000000000000..7f55f7201ff8 +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 000000000000..48c3a4843ac0 +index 000000000..48c3a4843 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.h @@ -0,0 +1,55 @@ @@ -441602,8 +441628,8 @@ index 000000000000..48c3a4843ac0 + +#endif diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c -new file mode 100755 -index 000000000000..5ece777c1afa +new file mode 100644 +index 000000000..5ece777c1 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c @@ -0,0 +1,188 @@ @@ -441796,8 +441822,8 @@ index 000000000000..5ece777c1afa +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRIVER_NAME); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c -new file mode 100755 -index 000000000000..ee29181563f9 +new file mode 100644 +index 000000000..ee2918156 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c @@ -0,0 +1,4109 @@ @@ -445911,8 +445937,8 @@ index 000000000000..ee29181563f9 +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:dw-hdmi-qp"); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h -new file mode 100755 -index 000000000000..e9b5e19a3be5 +new file mode 100644 +index 000000000..e9b5e19a3 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h @@ -0,0 +1,850 @@ @@ -446767,7 +446793,7 @@ index 000000000000..e9b5e19a3be5 + +#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 2c3c743df950..5d20a72a186f 100644 +index 2c3c743df..5d20a72a1 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -9,6 +9,8 @@ @@ -449771,7 +449797,7 @@ index 2c3c743df950..5d20a72a186f 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 1999db05bc3b..71e476bcfaf4 100644 +index 1999db05b..71e476bcf 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h @@ -509,6 +509,51 @@ @@ -449894,7 +449920,7 @@ index 1999db05bc3b..71e476bcfaf4 100644 /* diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c -index 376fa6eb46f6..71f0daa5f834 100644 +index 376fa6eb4..71f0daa5f 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 @@ @@ -450520,7 +450546,7 @@ index 376fa6eb46f6..71f0daa5f834 100644 MODULE_AUTHOR("Philippe Cornu "); MODULE_DESCRIPTION("DW MIPI DSI host controller driver"); diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c -index 7fc8e7000046..4108c7265d53 100644 +index 0fde260b7..fee489a4a 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -296,12 +296,14 @@ update_connector_routing(struct drm_atomic_state *state, @@ -450550,7 +450576,7 @@ index 7fc8e7000046..4108c7265d53 100644 DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] using [ENCODER:%d:%s] on [CRTC:%d:%s]\n", connector->base.id, -@@ -3554,6 +3557,9 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, +@@ -3563,6 +3566,9 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, replaced = drm_property_replace_blob(&crtc_state->degamma_lut, NULL); replaced |= drm_property_replace_blob(&crtc_state->ctm, NULL); replaced |= drm_property_replace_blob(&crtc_state->gamma_lut, blob); @@ -450561,7 +450587,7 @@ index 7fc8e7000046..4108c7265d53 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 9ad74045158e..c29183d2aa4e 100644 +index 9ad740451..c29183d2a 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, @@ -450586,7 +450612,7 @@ index 9ad74045158e..c29183d2aa4e 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 b6062833370f..1184ba39dafb 100644 +index b60628333..1184ba39d 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, @@ -450618,7 +450644,7 @@ index b6062833370f..1184ba39dafb 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 c7adbeaf10b1..232abbba3686 100644 +index c7adbeaf1..232abbba3 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, @@ -450693,7 +450719,7 @@ index c7adbeaf10b1..232abbba3686 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 138ff34b31db..7b270b68ade4 100644 +index 138ff34b3..7b270b68a 100644 --- a/drivers/gpu/drm/drm_color_mgmt.c +++ b/drivers/gpu/drm/drm_color_mgmt.c @@ -33,7 +33,7 @@ @@ -450761,7 +450787,7 @@ index 138ff34b31db..7b270b68ade4 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 b0a826489488..3d7182001004 100644 +index b0a826489..3d7182001 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) @@ -450782,7 +450808,7 @@ index b0a826489488..3d7182001004 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 39eb39e78d7a..efc2372d32a7 100644 +index 39eb39e78..efc2372d3 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, @@ -450931,7 +450957,7 @@ index 39eb39e78d7a..efc2372d32a7 100644 } diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c -index 537e7de8e9c3..01670305df3d 100644 +index 93da7b5d7..aa9a9191f 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) @@ -451043,7 +451069,7 @@ index 537e7de8e9c3..01670305df3d 100644 } EXPORT_SYMBOL(drm_send_event); diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c -index 8d1064061e83..e4c8aa3614a4 100644 +index 8d1064061..e4c8aa361 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) @@ -451064,7 +451090,7 @@ index 8d1064061e83..e4c8aa3614a4 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 c160a45a4274..73818ffa019b 100644 +index c160a45a4..73818ffa0 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, @@ -451097,7 +451123,7 @@ index c160a45a4274..73818ffa019b 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 aef22634005e..da4f085fc09e 100644 +index aef226340..da4f085fc 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) @@ -451334,10 +451360,10 @@ index aef22634005e..da4f085fc09e 100644 return ret; } diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c -index 0c806e99e869..fddc041aa865 100644 +index 83918ac1f..6b830f4c4 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, +@@ -369,6 +369,7 @@ static ssize_t mipi_dsi_device_transfer(struct mipi_dsi_device *dsi, if (dsi->mode_flags & MIPI_DSI_MODE_LPM) msg->flags |= MIPI_DSI_MSG_USE_LPM; @@ -451346,7 +451372,7 @@ index 0c806e99e869..fddc041aa865 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 fad2c1181127..58050d4aeabc 100644 +index fad2c1181..58050d4ae 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) @@ -451373,10 +451399,10 @@ index fad2c1181127..58050d4aeabc 100644 DRM_MODE_PROP_IMMUTABLE | DRM_MODE_PROP_BLOB, "IN_FORMATS", 0); diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c -index 0f99e5453f15..d42c7310bf09 100644 +index 8bebc29a1..1ced8f34b 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c -@@ -1940,6 +1940,7 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out, +@@ -1943,6 +1943,7 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out, strncpy(out->name, in->name, DRM_DISPLAY_MODE_LEN); out->name[DRM_DISPLAY_MODE_LEN-1] = 0; } @@ -451384,7 +451410,7 @@ index 0f99e5453f15..d42c7310bf09 100644 /** * drm_crtc_convert_umode - convert a modeinfo into a drm_display_mode -@@ -2016,6 +2017,7 @@ int drm_mode_convert_umode(struct drm_device *dev, +@@ -2019,6 +2020,7 @@ int drm_mode_convert_umode(struct drm_device *dev, return 0; } @@ -451393,10 +451419,10 @@ index 0f99e5453f15..d42c7310bf09 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 825499ea3ff5..272e5cdd61ce 100644 +index 893421d81..9a5a5a737 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) +@@ -786,6 +786,28 @@ int drm_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct *vma) } EXPORT_SYMBOL(drm_gem_dmabuf_mmap); @@ -451425,7 +451451,7 @@ index 825499ea3ff5..272e5cdd61ce 100644 static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = { .cache_sgt_mapping = true, .attach = drm_gem_map_attach, -@@ -794,6 +816,7 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = { +@@ -796,6 +818,7 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = { .mmap = drm_gem_dmabuf_mmap, .vmap = drm_gem_dmabuf_vmap, .vunmap = drm_gem_dmabuf_vunmap, @@ -451434,8 +451460,8 @@ index 825499ea3ff5..272e5cdd61ce 100644 /** diff --git a/drivers/gpu/drm/drm_sync_helper.c b/drivers/gpu/drm/drm_sync_helper.c -new file mode 100755 -index 000000000000..0c6aa875b4c6 +new file mode 100644 +index 000000000..0c6aa875b --- /dev/null +++ b/drivers/gpu/drm/drm_sync_helper.c @@ -0,0 +1,314 @@ @@ -451754,7 +451780,7 @@ index 000000000000..0c6aa875b4c6 +} +EXPORT_SYMBOL(drm_sw_fence_new); diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c -index f135b79593dd..286edbe1bf7a 100644 +index f135b7959..286edbe1b 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, @@ -451774,7 +451800,7 @@ index f135b79593dd..286edbe1bf7a 100644 /** diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c -index c940ac3aae2f..a19537706ed1 100644 +index c940ac3aa..a19537706 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) @@ -451789,7 +451815,7 @@ index c940ac3aae2f..a19537706ed1 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 6909da1e1a73..942c7c187adb 100644 +index 6909da1e1..942c7c187 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) @@ -451825,7 +451851,7 @@ index 6909da1e1a73..942c7c187adb 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 7950d28beb8c..d44061033f23 100644 +index 7950d28be..d44061033 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 @@ @@ -452028,7 +452054,7 @@ index 7950d28beb8c..d44061033f23 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 79c560d9c0b6..a6b733c146c9 100644 +index 79c560d9c..a6b733c14 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 @@ @@ -452179,7 +452205,7 @@ index 79c560d9c0b6..a6b733c146c9 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 b37fc2ffaef2..1949346e714e 100644 +index b37fc2ffa..1949346e7 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 { @@ -452195,7 +452221,7 @@ index b37fc2ffaef2..1949346e714e 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 ee4ac3922277..80e8b6c3bc8c 100644 +index ee4ac3922..80e8b6c3b 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, @@ -452243,7 +452269,7 @@ index ee4ac3922277..80e8b6c3bc8c 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 99bb1fe1af66..23d3a423ac0f 100644 +index 99bb1fe1a..23d3a423a 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 { @@ -452256,7 +452282,7 @@ index 99bb1fe1af66..23d3a423ac0f 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 e41ffc7a7fbc..029214cdedd5 100644 +index e41ffc7a7..029214cde 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 { @@ -452273,7 +452299,7 @@ index e41ffc7a7fbc..029214cdedd5 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 8e15ff95b809..92ed8d45657a 100644 +index 8e15ff95b..92ed8d456 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) @@ -452378,7 +452404,7 @@ index 8e15ff95b809..92ed8d45657a 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 8b252dca0fc3..b8025507a9e4 100644 +index 8b252dca0..b8025507a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -142,11 +142,6 @@ struct nouveau_drm { @@ -452394,7 +452420,7 @@ index 8b252dca0fc3..b8025507a9e4 100644 struct { diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig -index 6153972e0127..b9dbedf8f15e 100644 +index 6153972e0..b9dbedf8f 100644 --- a/drivers/gpu/drm/panel/Kconfig +++ b/drivers/gpu/drm/panel/Kconfig @@ -233,7 +233,6 @@ config DRM_PANEL_OLIMEX_LCD_OLINUXINO @@ -452406,7 +452432,7 @@ index 6153972e0127..b9dbedf8f15e 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 534dd7414d42..0145129d7c66 100644 +index 534dd7414..0145129d7 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 = { @@ -452431,7 +452457,7 @@ index 534dd7414d42..0145129d7c66 100644 .width_mm = 135, .height_mm = 217, diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c -index 1a87cc445b5e..d6c0bbc03c6d 100644 +index 51470020b..233297670 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -30,6 +30,7 @@ @@ -452870,7 +452896,7 @@ index 1a87cc445b5e..d6c0bbc03c6d 100644 connector_type = DRM_MODE_CONNECTOR_DPI; break; case DRM_MODE_CONNECTOR_LVDS: -@@ -3906,6 +4189,9 @@ static const struct panel_desc arm_rtsm = { +@@ -3913,6 +4196,9 @@ static const struct panel_desc arm_rtsm = { static const struct of_device_id platform_of_match[] = { { @@ -452880,7 +452906,7 @@ index 1a87cc445b5e..d6c0bbc03c6d 100644 .compatible = "ampire,am-1280800n3tzqw-t00h", .data = &ire_am_1280800n3tzqw_t00h, }, { -@@ -4314,15 +4600,132 @@ static const struct of_device_id platform_of_match[] = { +@@ -4321,15 +4607,132 @@ static const struct of_device_id platform_of_match[] = { }; MODULE_DEVICE_TABLE(of, platform_of_match); @@ -453014,7 +453040,7 @@ index 1a87cc445b5e..d6c0bbc03c6d 100644 } static int panel_simple_platform_remove(struct platform_device *pdev) -@@ -4557,6 +4960,9 @@ static const struct panel_desc_dsi osd101t2045_53ts = { +@@ -4564,6 +4967,9 @@ static const struct panel_desc_dsi osd101t2045_53ts = { static const struct of_device_id dsi_of_match[] = { { @@ -453024,7 +453050,7 @@ index 1a87cc445b5e..d6c0bbc03c6d 100644 .compatible = "auo,b080uan01", .data = &auo_b080uan01 }, { -@@ -4583,9 +4989,33 @@ static const struct of_device_id dsi_of_match[] = { +@@ -4590,9 +4996,33 @@ static const struct of_device_id dsi_of_match[] = { }; MODULE_DEVICE_TABLE(of, dsi_of_match); @@ -453058,7 +453084,7 @@ index 1a87cc445b5e..d6c0bbc03c6d 100644 const struct of_device_id *id; int err; -@@ -4593,12 +5023,47 @@ static int panel_simple_dsi_probe(struct mipi_dsi_device *dsi) +@@ -4600,12 +5030,47 @@ static int panel_simple_dsi_probe(struct mipi_dsi_device *dsi) if (!id) return -ENODEV; @@ -453108,8 +453134,8 @@ index 1a87cc445b5e..d6c0bbc03c6d 100644 dsi->format = desc->format; dsi->lanes = desc->lanes; diff --git a/drivers/gpu/drm/panel/panel-simple.h b/drivers/gpu/drm/panel/panel-simple.h -new file mode 100755 -index 000000000000..7349c35e3cb2 +new file mode 100644 +index 000000000..7349c35e3 --- /dev/null +++ b/drivers/gpu/drm/panel/panel-simple.h @@ -0,0 +1,19 @@ @@ -453133,7 +453159,7 @@ index 000000000000..7349c35e3cb2 +#endif +#endif diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig -index 310aa1546893..3154597de251 100644 +index 310aa1546..3154597de 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -1,7 +1,7 @@ @@ -453275,7 +453301,7 @@ index 310aa1546893..3154597de251 100644 + endif diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile -index 17a9e7eb2130..3287356fa0f8 100644 +index 17a9e7eb2..3287356fa 100644 --- a/drivers/gpu/drm/rockchip/Makefile +++ b/drivers/gpu/drm/rockchip/Makefile @@ -4,16 +4,33 @@ @@ -453316,7 +453342,7 @@ index 17a9e7eb2130..3287356fa0f8 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 512581698a1e..9f09525b4bc0 100644 +index 512581698..9f09525b4 100644 --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c @@ -16,6 +16,7 @@ @@ -454100,7 +454126,7 @@ index 512581698a1e..9f09525b4bc0 100644 }; MODULE_DEVICE_TABLE(of, rockchip_dp_dt_ids); diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c -index adeaa0140f0f..9804fe1ba9a5 100644 +index 53cad1003..6d4904547 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c @@ -6,7 +6,6 @@ @@ -454442,9 +454468,9 @@ index adeaa0140f0f..9804fe1ba9a5 100644 struct cdn_dp_device *dp; - struct extcon_dev *extcon; struct phy *phy; + int ret; int i; - -@@ -1156,21 +1151,18 @@ static int cdn_dp_probe(struct platform_device *pdev) +@@ -1157,21 +1152,18 @@ static int cdn_dp_probe(struct platform_device *pdev) dp_data = (struct cdn_dp_data *)match->data; for (i = 0; i < dp_data->max_phy; i++) { @@ -454468,7 +454494,7 @@ index adeaa0140f0f..9804fe1ba9a5 100644 port->phy = phy; port->dp = dp; port->id = i; -@@ -1178,7 +1170,7 @@ static int cdn_dp_probe(struct platform_device *pdev) +@@ -1179,7 +1171,7 @@ static int cdn_dp_probe(struct platform_device *pdev) } if (!dp->ports) { @@ -454478,7 +454504,7 @@ index adeaa0140f0f..9804fe1ba9a5 100644 } diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.h b/drivers/gpu/drm/rockchip/cdn-dp-core.h -index 81ac9b658a70..60a8c095b30f 100644 +index 81ac9b658..60a8c095b 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 { @@ -454517,8 +454543,8 @@ index 81ac9b658a70..60a8c095b30f 100644 u8 dpcd[DP_RECEIVER_CAP_SIZE]; bool sink_has_audio; diff --git a/drivers/gpu/drm/rockchip/cdn-dp-link-training.c b/drivers/gpu/drm/rockchip/cdn-dp-link-training.c -new file mode 100755 -index 000000000000..ec2f001c2557 +new file mode 100644 +index 000000000..ec2f001c2 --- /dev/null +++ b/drivers/gpu/drm/rockchip/cdn-dp-link-training.c @@ -0,0 +1,447 @@ @@ -454970,7 +454996,7 @@ index 000000000000..ec2f001c2557 + return ret; +} diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/rockchip/cdn-dp-reg.c -index 33fb4d05c506..2a544869e8de 100644 +index 33fb4d05c..2a544869e 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-reg.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.c @@ -181,7 +181,7 @@ static int cdn_dp_mailbox_send(struct cdn_dp_device *dp, u8 module_id, @@ -455143,7 +455169,7 @@ index 33fb4d05c506..2a544869e8de 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 441248b7a79e..656ec69be66d 100644 +index 441248b7a..656ec69be 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-reg.h +++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.h @@ -8,6 +8,7 @@ @@ -455240,8 +455266,8 @@ index 441248b7a79e..656ec69be66d 100644 +int cdn_dp_software_train_link(struct cdn_dp_device *dp); #endif /* _CDN_DP_REG_H */ diff --git a/drivers/gpu/drm/rockchip/dw-dp.c b/drivers/gpu/drm/rockchip/dw-dp.c -new file mode 100755 -index 000000000000..e6c3ac37c1b0 +new file mode 100644 +index 000000000..e6c3ac37c --- /dev/null +++ b/drivers/gpu/drm/rockchip/dw-dp.c @@ -0,0 +1,4250 @@ @@ -459496,7 +459522,7 @@ index 000000000000..e6c3ac37c1b0 + }, +}; diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c -index 82cbfccba1bc..2ff99e503224 100644 +index 82cbfccba..2ff99e503 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 @@ @@ -460449,8 +460475,8 @@ index 82cbfccba1bc..2ff99e503224 100644 /* * For dual-DSI display, one DSI pokes at the other DSI's diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c -new file mode 100755 -index 000000000000..e66df80980f4 +new file mode 100644 +index 000000000..e66df8098 --- /dev/null +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c @@ -0,0 +1,1868 @@ @@ -462324,7 +462350,7 @@ index 000000000000..e66df80980f4 +}; diff --git a/drivers/gpu/drm/rockchip/dw_hdcp2.c b/drivers/gpu/drm/rockchip/dw_hdcp2.c new file mode 100644 -index 000000000000..f8362ddea171 +index 000000000..f8362ddea --- /dev/null +++ b/drivers/gpu/drm/rockchip/dw_hdcp2.c @@ -0,0 +1,642 @@ @@ -462971,7 +462997,7 @@ index 000000000000..f8362ddea171 +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 23de359a1dec..3253cf215c5f 100644 +index 23de359a1..3253cf215 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -4,21 +4,33 @@ @@ -467053,8 +467079,8 @@ index 23de359a1dec..3253cf215c5f 100644 .name = "dwhdmi-rockchip", .pm = &dw_hdmi_rockchip_pm, diff --git a/drivers/gpu/drm/rockchip/ebc-dev/Kconfig b/drivers/gpu/drm/rockchip/ebc-dev/Kconfig -new file mode 100755 -index 000000000000..949c8e4b7b57 +new file mode 100644 +index 000000000..949c8e4b7 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/Kconfig @@ -0,0 +1,14 @@ @@ -467073,8 +467099,8 @@ index 000000000000..949c8e4b7b57 + bool "Tps65185" +endchoice diff --git a/drivers/gpu/drm/rockchip/ebc-dev/Makefile b/drivers/gpu/drm/rockchip/ebc-dev/Makefile -new file mode 100755 -index 000000000000..848ac22fd0b2 +new file mode 100644 +index 000000000..848ac22fd --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/Makefile @@ -0,0 +1,9 @@ @@ -467088,8 +467114,8 @@ index 000000000000..848ac22fd0b2 + +rkebc-$(CONFIG_ARM64) += ebc_dev_v8.o diff --git a/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/Makefile b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/Makefile -new file mode 100755 -index 000000000000..a63ef49dea04 +new file mode 100644 +index 000000000..a63ef49de --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/Makefile @@ -0,0 +1,3 @@ @@ -467097,8 +467123,8 @@ index 000000000000..a63ef49dea04 + +obj-$(CONFIG_ROCKCHIP_EBC_DEV) += buf_manage.o buf_list.o diff --git a/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.c b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.c -new file mode 100755 -index 000000000000..90f350110b70 +new file mode 100644 +index 000000000..90f350110 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.c @@ -0,0 +1,171 @@ @@ -467274,8 +467300,8 @@ index 000000000000..90f350110b70 + return 0; +} diff --git a/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.h b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.h -new file mode 100755 -index 000000000000..eaf504560fb8 +new file mode 100644 +index 000000000..eaf504560 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.h @@ -0,0 +1,95 @@ @@ -467375,8 +467401,8 @@ index 000000000000..eaf504560fb8 + +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.c b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.c -new file mode 100755 -index 000000000000..a2e47b45c148 +new file mode 100644 +index 000000000..a2e47b45c --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.c @@ -0,0 +1,327 @@ @@ -467708,8 +467734,8 @@ index 000000000000..a2e47b45c148 + return res; +} diff --git a/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.h b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.h -new file mode 100755 -index 000000000000..745cdbf9cfde +new file mode 100644 +index 000000000..745cdbf9c --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.h @@ -0,0 +1,49 @@ @@ -467763,8 +467789,8 @@ index 000000000000..745cdbf9cfde +#endif + diff --git a/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev.h b/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev.h -new file mode 100755 -index 000000000000..5fc2fecd22cb +new file mode 100644 +index 000000000..5fc2fecd2 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev.h @@ -0,0 +1,114 @@ @@ -467883,8 +467909,8 @@ index 000000000000..5fc2fecd22cb + +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev_v8.S b/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev_v8.S -new file mode 100755 -index 000000000000..65be1fdee09f +new file mode 100644 +index 000000000..65be1fdee --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev_v8.S @@ -0,0 +1,55302 @@ @@ -523191,8 +523217,8 @@ index 000000000000..65be1fdee09f + .ident "GCC: (Linaro GCC 6.3-2017.05) 6.3.1 20170404" + .section .note.GNU-stack,"",@progbits diff --git a/drivers/gpu/drm/rockchip/ebc-dev/ebc_panel.h b/drivers/gpu/drm/rockchip/ebc-dev/ebc_panel.h -new file mode 100755 -index 000000000000..dc0a72b11b21 +new file mode 100644 +index 000000000..dc0a72b11 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_panel.h @@ -0,0 +1,50 @@ @@ -523247,8 +523273,8 @@ index 000000000000..dc0a72b11b21 +}; +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/ebc_public.c b/drivers/gpu/drm/rockchip/ebc-dev/ebc_public.c -new file mode 100755 -index 000000000000..8ecccb7f6403 +new file mode 100644 +index 000000000..8ecccb7f6 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_public.c @@ -0,0 +1,36 @@ @@ -523289,8 +523315,8 @@ index 000000000000..8ecccb7f6403 + return blocking_notifier_call_chain(&ebc_notifier_list, event, NULL); +} diff --git a/drivers/gpu/drm/rockchip/ebc-dev/epdlut/Makefile b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/Makefile -new file mode 100755 -index 000000000000..6b99702b7a6f +new file mode 100644 +index 000000000..6b99702b7 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/Makefile @@ -0,0 +1,5 @@ @@ -523300,8 +523326,8 @@ index 000000000000..6b99702b7a6f + +waveform-$(CONFIG_ARM64) += pvi_waveform_v8.o rkf_waveform_v8.o diff --git a/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.c b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.c -new file mode 100755 -index 000000000000..8871b37d52cc +new file mode 100644 +index 000000000..8871b37d5 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.c @@ -0,0 +1,72 @@ @@ -523378,8 +523404,8 @@ index 000000000000..8871b37d52cc + return lut_get(output, lut_type, temperture); +} diff --git a/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.h b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.h -new file mode 100755 -index 000000000000..8d2210603a29 +new file mode 100644 +index 000000000..8d2210603 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.h @@ -0,0 +1,66 @@ @@ -523450,8 +523476,8 @@ index 000000000000..8d2210603a29 +int rkf_wf_get_lut(struct epd_lut_data *output, enum epd_lut_type lut_type, int temperture); +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/epdlut/pvi_waveform_v8.S b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/pvi_waveform_v8.S -new file mode 100755 -index 000000000000..849c81dcfc71 +new file mode 100644 +index 000000000..849c81dcf --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/pvi_waveform_v8.S @@ -0,0 +1,18656 @@ @@ -542112,8 +542138,8 @@ index 000000000000..849c81dcfc71 + .ident "GCC: (Linaro GCC 6.3-2017.05) 6.3.1 20170404" + .section .note.GNU-stack,"",@progbits diff --git a/drivers/gpu/drm/rockchip/ebc-dev/epdlut/rkf_waveform_v8.S b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/rkf_waveform_v8.S -new file mode 100755 -index 000000000000..8a17822240c5 +new file mode 100644 +index 000000000..8a1782224 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/rkf_waveform_v8.S @@ -0,0 +1,19357 @@ @@ -561475,8 +561501,8 @@ index 000000000000..8a17822240c5 + .ident "GCC: (Linaro GCC 6.3-2017.05) 6.3.1 20170404" + .section .note.GNU-stack,"",@progbits diff --git a/drivers/gpu/drm/rockchip/ebc-dev/pmic/Makefile b/drivers/gpu/drm/rockchip/ebc-dev/pmic/Makefile -new file mode 100755 -index 000000000000..a05717f1ce98 +new file mode 100644 +index 000000000..a05717f1c --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/Makefile @@ -0,0 +1,4 @@ @@ -561485,8 +561511,8 @@ index 000000000000..a05717f1ce98 +obj-$(CONFIG_ROCKCHIP_EBC_DEV) += ebc_pmic.o +obj-$(CONFIG_EPD_TPS65185_SENSOR) += tps65185.o diff --git a/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.c b/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.c -new file mode 100755 -index 000000000000..c24db23dc47d +new file mode 100644 +index 000000000..c24db23dc --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.c @@ -0,0 +1,70 @@ @@ -561561,8 +561587,8 @@ index 000000000000..c24db23dc47d + +module_param(vcom, int, 0644); diff --git a/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.h b/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.h -new file mode 100755 -index 000000000000..f95192094ba7 +new file mode 100644 +index 000000000..f95192094 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.h @@ -0,0 +1,60 @@ @@ -561627,8 +561653,8 @@ index 000000000000..f95192094ba7 +void ebc_pmic_verity_vcom(struct ebc_pmic *pmic); +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/pmic/tps65185.c b/drivers/gpu/drm/rockchip/ebc-dev/pmic/tps65185.c -new file mode 100755 -index 000000000000..f007dd0adb65 +new file mode 100644 +index 000000000..f007dd0ad --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/tps65185.c @@ -0,0 +1,672 @@ @@ -562305,8 +562331,8 @@ index 000000000000..f007dd0adb65 +MODULE_DESCRIPTION("ti tps65185 pmic"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/rockchip/ebc-dev/tcon/Makefile b/drivers/gpu/drm/rockchip/ebc-dev/tcon/Makefile -new file mode 100755 -index 000000000000..913d4813773b +new file mode 100644 +index 000000000..913d48137 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/Makefile @@ -0,0 +1,3 @@ @@ -562314,8 +562340,8 @@ index 000000000000..913d4813773b + +obj-$(CONFIG_ROCKCHIP_EBC_DEV) += ebc_tcon.o eink_tcon.o diff --git a/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.c b/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.c -new file mode 100755 -index 000000000000..23c82751bb1b +new file mode 100644 +index 000000000..23c82751b --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.c @@ -0,0 +1,416 @@ @@ -562736,8 +562762,8 @@ index 000000000000..23c82751bb1b +MODULE_DESCRIPTION("ROCKCHIP EBC tcon driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.h b/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.h -new file mode 100755 -index 000000000000..9a9ea56f3cdb +new file mode 100644 +index 000000000..9a9ea56f3 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.h @@ -0,0 +1,119 @@ @@ -562861,8 +562887,8 @@ index 000000000000..9a9ea56f3cdb +} +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/tcon/eink_tcon.c b/drivers/gpu/drm/rockchip/ebc-dev/tcon/eink_tcon.c -new file mode 100755 -index 000000000000..01b2b9629c35 +new file mode 100644 +index 000000000..01b2b9629 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/eink_tcon.c @@ -0,0 +1,301 @@ @@ -563168,7 +563194,7 @@ index 000000000000..01b2b9629c35 +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 78120da5e63a..c74e0367caf9 100644 +index 78120da5e..c74e0367c 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -21,6 +21,8 @@ @@ -563678,7 +563704,7 @@ index 78120da5e63a..c74e0367caf9 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 93245b55f967..b722afc4e41f 100644 +index 93245b55f..b722afc4e 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.h +++ b/drivers/gpu/drm/rockchip/inno_hdmi.h @@ -96,11 +96,13 @@ enum { @@ -563697,7 +563723,7 @@ index 93245b55f967..b722afc4e41f 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 000000000000..98c4443ec1bd +index 000000000..98c4443ec --- /dev/null +++ b/drivers/gpu/drm/rockchip/kernel_logo_img.h @@ -0,0 +1,21855 @@ @@ -585557,7 +585583,7 @@ index 000000000000..98c4443ec1bd + 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; diff --git a/drivers/gpu/drm/rockchip/rk3066_hdmi.c b/drivers/gpu/drm/rockchip/rk3066_hdmi.c -index 17e7c40a9e7b..46683937fc07 100644 +index 17e7c40a9..46683937f 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) @@ -585570,8 +585596,8 @@ index 17e7c40a9e7b..46683937fc07 100644 /* * If we failed to find the CRTC(s) which this encoder is diff --git a/drivers/gpu/drm/rockchip/rk618/Kconfig b/drivers/gpu/drm/rockchip/rk618/Kconfig -new file mode 100755 -index 000000000000..03ae305a93c1 +new file mode 100644 +index 000000000..03ae305a9 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/Kconfig @@ -0,0 +1,10 @@ @@ -585586,8 +585612,8 @@ index 000000000000..03ae305a93c1 + help + Rockchip rk618 display bridge chips driver. diff --git a/drivers/gpu/drm/rockchip/rk618/Makefile b/drivers/gpu/drm/rockchip/rk618/Makefile -new file mode 100755 -index 000000000000..ad3ac27b36ad +new file mode 100644 +index 000000000..ad3ac27b3 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/Makefile @@ -0,0 +1,12 @@ @@ -585604,8 +585630,8 @@ index 000000000000..ad3ac27b36ad + rk618_hdmi.o \ + rk618_dsi.o diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_dither.c b/drivers/gpu/drm/rockchip/rk618/rk618_dither.c -new file mode 100755 -index 000000000000..a9bc0c37c2d6 +new file mode 100644 +index 000000000..a9bc0c37c --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dither.c @@ -0,0 +1,53 @@ @@ -585663,8 +585689,8 @@ index 000000000000..a9bc0c37c2d6 + +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_dither.h b/drivers/gpu/drm/rockchip/rk618/rk618_dither.h -new file mode 100755 -index 000000000000..c74bb95f0ce4 +new file mode 100644 +index 000000000..c74bb95f0 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dither.h @@ -0,0 +1,17 @@ @@ -585686,8 +585712,8 @@ index 000000000000..c74bb95f0ce4 + +#endif diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c b/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c -new file mode 100755 -index 000000000000..a00825784e2d +new file mode 100644 +index 000000000..a00825784 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c @@ -0,0 +1,1195 @@ @@ -586887,8 +586913,8 @@ index 000000000000..a00825784e2d +MODULE_DESCRIPTION("Rockchip RK618 MIPI-DSI driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c b/drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c -new file mode 100755 -index 000000000000..ab3fa5bfab54 +new file mode 100644 +index 000000000..ab3fa5bfa --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c @@ -0,0 +1,1607 @@ @@ -588500,8 +588526,8 @@ index 000000000000..ab3fa5bfab54 +MODULE_DESCRIPTION("Rockchip RK618 HDMI driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c b/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c -new file mode 100755 -index 000000000000..b652e19a6a34 +new file mode 100644 +index 000000000..b652e19a6 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c @@ -0,0 +1,303 @@ @@ -588809,8 +588835,8 @@ index 000000000000..b652e19a6a34 +MODULE_DESCRIPTION("Rockchip RK618 LVDS driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c b/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c -new file mode 100755 -index 000000000000..76efc25aa216 +new file mode 100644 +index 000000000..76efc25aa --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c @@ -0,0 +1,301 @@ @@ -589116,8 +589142,8 @@ index 000000000000..76efc25aa216 +MODULE_DESCRIPTION("Rockchip RK618 RGB driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_scaler.c b/drivers/gpu/drm/rockchip/rk618/rk618_scaler.c -new file mode 100755 -index 000000000000..2c3a67664699 +new file mode 100644 +index 000000000..2c3a67664 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_scaler.c @@ -0,0 +1,425 @@ @@ -589547,8 +589573,8 @@ index 000000000000..2c3a67664699 +MODULE_DESCRIPTION("Rockchip RK618 SCALER driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_vif.c b/drivers/gpu/drm/rockchip/rk618/rk618_vif.c -new file mode 100755 -index 000000000000..9dc9e10e2d3a +new file mode 100644 +index 000000000..9dc9e10e2 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_vif.c @@ -0,0 +1,261 @@ @@ -589814,8 +589840,8 @@ index 000000000000..9dc9e10e2d3a +MODULE_DESCRIPTION("Rockchip RK618 VIF driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/Kconfig b/drivers/gpu/drm/rockchip/rk628/Kconfig -new file mode 100755 -index 000000000000..41e1fbbe1e61 +new file mode 100644 +index 000000000..41e1fbbe1 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/Kconfig @@ -0,0 +1,8 @@ @@ -589828,8 +589854,8 @@ index 000000000000..41e1fbbe1e61 + help + Rockchip RK628 display bridge chips driver. diff --git a/drivers/gpu/drm/rockchip/rk628/Makefile b/drivers/gpu/drm/rockchip/rk628/Makefile -new file mode 100755 -index 000000000000..76d768d29776 +new file mode 100644 +index 000000000..76d768d29 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/Makefile @@ -0,0 +1,14 @@ @@ -589848,8 +589874,8 @@ index 000000000000..76d768d29776 + rk628_hdmi.o \ + rk628_hdmirx.o diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_combrxphy.c b/drivers/gpu/drm/rockchip/rk628/rk628_combrxphy.c -new file mode 100755 -index 000000000000..a83eeeaf935f +new file mode 100644 +index 000000000..a83eeeaf9 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_combrxphy.c @@ -0,0 +1,1030 @@ @@ -590884,8 +590910,8 @@ index 000000000000..a83eeeaf935f +MODULE_DESCRIPTION("Rockchip RK628 HDMI Combo RX PHY driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c -new file mode 100755 -index 000000000000..cbe7923139b7 +new file mode 100644 +index 000000000..cbe792313 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c @@ -0,0 +1,520 @@ @@ -591410,8 +591436,8 @@ index 000000000000..cbe7923139b7 +MODULE_DESCRIPTION("Rockchip RK628 GVI/LVDS/MIPI Combo TX PHY driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.h b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.h -new file mode 100755 -index 000000000000..40d785eecd67 +new file mode 100644 +index 000000000..40d785eec --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.h @@ -0,0 +1,13 @@ @@ -591429,8 +591455,8 @@ index 000000000000..40d785eecd67 + +#endif diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c b/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c -new file mode 100755 -index 000000000000..fc7da77ec0e4 +new file mode 100644 +index 000000000..fc7da77ec --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c @@ -0,0 +1,1395 @@ @@ -592830,8 +592856,8 @@ index 000000000000..fc7da77ec0e4 +MODULE_DESCRIPTION("Rockchip RK628 MIPI-DSI driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_gvi.c b/drivers/gpu/drm/rockchip/rk628/rk628_gvi.c -new file mode 100755 -index 000000000000..a3c92195e2dd +new file mode 100644 +index 000000000..a3c92195e --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_gvi.c @@ -0,0 +1,664 @@ @@ -593500,8 +593526,8 @@ index 000000000000..a3c92195e2dd +MODULE_DESCRIPTION("Rockchip RK628 GVI driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_hdmi.c b/drivers/gpu/drm/rockchip/rk628/rk628_hdmi.c -new file mode 100755 -index 000000000000..29b5fcb2d3bc +new file mode 100644 +index 000000000..29b5fcb2d --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_hdmi.c @@ -0,0 +1,1622 @@ @@ -595128,8 +595154,8 @@ index 000000000000..29b5fcb2d3bc +MODULE_DESCRIPTION("Rockchip RK628 HDMI driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c b/drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c -new file mode 100755 -index 000000000000..7ff3cc0087a1 +new file mode 100644 +index 000000000..7ff3cc008 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c @@ -0,0 +1,980 @@ @@ -596114,8 +596140,8 @@ index 000000000000..7ff3cc0087a1 +MODULE_DESCRIPTION("Rockchip RK628 HDMI RX driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c b/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c -new file mode 100755 -index 000000000000..61326b1477cc +new file mode 100644 +index 000000000..61326b147 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c @@ -0,0 +1,319 @@ @@ -596439,8 +596465,8 @@ index 000000000000..61326b1477cc +MODULE_DESCRIPTION("Rockchip RK628 LVDS driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_post_process.c b/drivers/gpu/drm/rockchip/rk628/rk628_post_process.c -new file mode 100755 -index 000000000000..80fd257a6471 +new file mode 100644 +index 000000000..80fd257a6 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_post_process.c @@ -0,0 +1,495 @@ @@ -596940,8 +596966,8 @@ index 000000000000..80fd257a6471 +MODULE_DESCRIPTION("Rockchip RK628 Post Process driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_rgb.c b/drivers/gpu/drm/rockchip/rk628/rk628_rgb.c -new file mode 100755 -index 000000000000..df8cc3cee860 +new file mode 100644 +index 000000000..df8cc3cee --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_rgb.c @@ -0,0 +1,378 @@ @@ -597324,8 +597350,8 @@ index 000000000000..df8cc3cee860 +MODULE_DESCRIPTION("Rockchip RK628 RGB driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.c b/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.c -new file mode 100755 -index 000000000000..adbc11679f53 +new file mode 100644 +index 000000000..adbc11679 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.c @@ -0,0 +1,1403 @@ @@ -598733,8 +598759,8 @@ index 000000000000..adbc11679f53 +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:" DRIVER_NAME); diff --git a/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.h b/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.h -new file mode 100755 -index 000000000000..a4330df85b33 +new file mode 100644 +index 000000000..a4330df85 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.h @@ -0,0 +1,289 @@ @@ -599028,8 +599054,8 @@ index 000000000000..a4330df85b33 + +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_backlight.c b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.c -new file mode 100755 -index 000000000000..2f0a98749683 +new file mode 100644 +index 000000000..2f0a98749 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.c @@ -0,0 +1,514 @@ @@ -599548,8 +599574,8 @@ index 000000000000..2f0a98749683 +MODULE_DESCRIPTION("Rockchip Drm Backlight Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_backlight.h b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.h -new file mode 100755 -index 000000000000..4c8dc6348354 +new file mode 100644 +index 000000000..4c8dc6348 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.h @@ -0,0 +1,64 @@ @@ -599619,7 +599645,7 @@ index 000000000000..4c8dc6348354 +#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 000000000000..f606377aeb07 +index 000000000..f606377ae --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_clk.c @@ -0,0 +1,284 @@ @@ -599908,8 +599934,8 @@ index 000000000000..f606377aeb07 + return ret; +} diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.c b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.c -new file mode 100755 -index 000000000000..923bcf3b2aa9 +new file mode 100644 +index 000000000..923bcf3b2 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.c @@ -0,0 +1,287 @@ @@ -600201,8 +600227,8 @@ index 000000000000..923bcf3b2aa9 + return 0; +} diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.h b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.h -new file mode 100755 -index 000000000000..5bb39c0447f0 +new file mode 100644 +index 000000000..5bb39c044 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.h @@ -0,0 +1,79 @@ @@ -600287,7 +600313,7 @@ index 000000000000..5bb39c0447f0 +#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 000000000000..9e7276b933f9 +index 000000000..9e7276b93 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_direct_show.c @@ -0,0 +1,333 @@ @@ -600626,7 +600652,7 @@ index 000000000000..9e7276b933f9 + 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 000000000000..583f760eb1f5 +index 000000000..583f760eb --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_direct_show.h @@ -0,0 +1,67 @@ @@ -600699,7 +600725,7 @@ index 000000000000..583f760eb1f5 +#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 000000000000..58a907b6c816 +index 000000000..58a907b6c --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_display_pattern.c @@ -0,0 +1,419 @@ @@ -601124,7 +601150,7 @@ index 000000000000..58a907b6c816 +} 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 000000000000..4368f3397dbe +index 000000000..4368f3397 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_display_pattern.h @@ -0,0 +1,51 @@ @@ -601180,7 +601206,7 @@ index 000000000000..4368f3397dbe + +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c -index 0f3eb392fe39..9f64ad8ed07b 100644 +index 0f3eb392f..55ea3e6e8 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -6,17 +6,24 @@ @@ -603080,7 +603106,7 @@ index 0f3eb392fe39..9f64ad8ed07b 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 e33c2dcd0d4b..2e8739b4fcab 100644 +index e33c2dcd0..2e8739b4f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h @@ -9,32 +9,463 @@ @@ -603681,7 +603707,7 @@ index e33c2dcd0d4b..2e8739b4fcab 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 3aa37e177667..91cb11985db8 100644 +index 3aa37e177..91cb11985 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -5,6 +5,7 @@ @@ -603972,7 +603998,7 @@ index 3aa37e177667..91cb11985db8 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 1a696521096d..4442719270ab 100644 +index 1a6965210..444271927 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.h @@ -7,6 +7,10 @@ @@ -604011,7 +604037,7 @@ index 1a696521096d..4442719270ab 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 2fdc455c4ad7..bd449be5b9c0 100644 +index 2fdc455c4..bd449be5b 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c @@ -15,14 +15,12 @@ @@ -604083,7 +604109,7 @@ index 2fdc455c4ad7..bd449be5b9c0 100644 drm_fb_helper_unregister_fbi(helper); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c -index 22ff4a592976..9a4b78d04191 100644 +index 6038aafa2..412ffd7f7 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c @@ -4,7 +4,7 @@ @@ -604867,7 +604893,7 @@ index 22ff4a592976..9a4b78d04191 100644 + return 0; +} diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.h b/drivers/gpu/drm/rockchip/rockchip_drm_gem.h -index 7ffc541bea07..34bcb76b20e3 100644 +index 7ffc541be..34bcb76b2 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.h @@ -7,14 +7,24 @@ @@ -604934,8 +604960,8 @@ index 7ffc541bea07..34bcb76b20e3 100644 +void rockchip_gem_get_ddr_info(void); #endif /* _ROCKCHIP_DRM_GEM_H */ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_logo.c b/drivers/gpu/drm/rockchip/rockchip_drm_logo.c -new file mode 100755 -index 000000000000..af228f40c404 +new file mode 100644 +index 000000000..af228f40c --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_logo.c @@ -0,0 +1,1234 @@ @@ -606174,8 +606200,8 @@ index 000000000000..af228f40c404 +late_initcall_sync(rockchip_clocks_loader_unprotect); +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_logo.h b/drivers/gpu/drm/rockchip/rockchip_drm_logo.h -new file mode 100755 -index 000000000000..7e1b1d2dfdf4 +new file mode 100644 +index 000000000..7e1b1d2df --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_logo.h @@ -0,0 +1,46 @@ @@ -606227,7 +606253,7 @@ index 000000000000..7e1b1d2dfdf4 +#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 000000000000..7c764fca154d +index 000000000..7c764fca1 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_self_test.c @@ -0,0 +1,269 @@ @@ -606501,8 +606527,8 @@ index 000000000000..7c764fca154d + +subsys_initcall_sync(rockchip_drm_self_test); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_tve.c b/drivers/gpu/drm/rockchip/rockchip_drm_tve.c -new file mode 100755 -index 000000000000..6fbd17c1b003 +new file mode 100644 +index 000000000..6fbd17c1b --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_tve.c @@ -0,0 +1,1067 @@ @@ -607574,8 +607600,8 @@ index 000000000000..6fbd17c1b003 +MODULE_DESCRIPTION("ROCKCHIP TVE Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_tve.h b/drivers/gpu/drm/rockchip/rockchip_drm_tve.h -new file mode 100755 -index 000000000000..376b2ff0f422 +new file mode 100644 +index 000000000..376b2ff0f --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_tve.h @@ -0,0 +1,285 @@ @@ -607865,8 +607891,8 @@ index 000000000000..376b2ff0f422 + +#endif /* _ROCKCHIP_DRM_TVE_ */ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vconn.c b/drivers/gpu/drm/rockchip/rockchip_drm_vconn.c -new file mode 100755 -index 000000000000..f0fab09d386b +new file mode 100644 +index 000000000..f0fab09d3 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vconn.c @@ -0,0 +1,587 @@ @@ -608458,7 +608484,7 @@ index 000000000000..f0fab09d386b + }, +}; diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c -index af98bfcde518..b80ef0c6dc53 100644 +index 682d78fab..09a256b3e 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -6,21 +6,28 @@ @@ -614053,7 +614079,7 @@ index af98bfcde518..b80ef0c6dc53 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 857d97cdc67c..5f72a76beee0 100644 +index 857d97cdc..5f72a76be 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -7,112 +7,396 @@ @@ -615620,8 +615646,8 @@ index 857d97cdc67c..5f72a76beee0 100644 +extern const struct component_ops vop2_component_ops; #endif /* _ROCKCHIP_DRM_VOP_H */ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c -new file mode 100755 -index 000000000000..2c7a66adfb75 +new file mode 100644 +index 000000000..2c7a66adf --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -0,0 +1,12140 @@ @@ -627766,8 +627792,8 @@ index 000000000000..2c7a66adfb75 +}; +EXPORT_SYMBOL_GPL(vop2_component_ops); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c -new file mode 100755 -index 000000000000..3f4432ad596c +new file mode 100644 +index 000000000..3f4432ad5 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c @@ -0,0 +1,679 @@ @@ -628451,7 +628477,7 @@ index 000000000000..3f4432ad596c +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 e2487937c4e3..bc21bf48a329 100644 +index e2487937c..bc21bf48a 100644 --- a/drivers/gpu/drm/rockchip/rockchip_lvds.c +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c @@ -6,98 +6,252 @@ @@ -629800,7 +629826,7 @@ index e2487937c4e3..bc21bf48a329 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 000000000000..212a4b4b89e6 +index 000000000..212a4b4b8 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_post_csc.c @@ -0,0 +1,1573 @@ @@ -631379,7 +631405,7 @@ index 000000000000..212a4b4b89e6 +} 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 000000000000..1215a5cd1c87 +index 000000000..1215a5cd1 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_post_csc.h @@ -0,0 +1,18 @@ @@ -631402,7 +631428,7 @@ index 000000000000..1215a5cd1c87 + +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_rgb.c b/drivers/gpu/drm/rockchip/rockchip_rgb.c -index 9a771af5d0c9..a7f2057d349f 100644 +index 9a771af5d..a7f2057d3 100644 --- a/drivers/gpu/drm/rockchip/rockchip_rgb.c +++ b/drivers/gpu/drm/rockchip/rockchip_rgb.c @@ -6,29 +6,256 @@ @@ -632618,7 +632644,7 @@ index 9a771af5d0c9..a7f2057d349f 100644 + }, +}; diff --git a/drivers/gpu/drm/rockchip/rockchip_rgb.h b/drivers/gpu/drm/rockchip/rockchip_rgb.h -index 27b9635124bc..8973232e0caa 100644 +index 27b963512..8973232e0 100644 --- a/drivers/gpu/drm/rockchip/rockchip_rgb.h +++ b/drivers/gpu/drm/rockchip/rockchip_rgb.h @@ -8,12 +8,14 @@ @@ -632639,8 +632665,8 @@ index 27b9635124bc..8973232e0caa 100644 return NULL; } diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_clk.c b/drivers/gpu/drm/rockchip/rockchip_vop2_clk.c -new file mode 100755 -index 000000000000..b670e3d38a64 +new file mode 100644 +index 000000000..b670e3d38 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_clk.c @@ -0,0 +1,332 @@ @@ -632977,8 +633003,8 @@ index 000000000000..b670e3d38a64 + return 0; +} diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c -new file mode 100755 -index 000000000000..9854a23f545b +new file mode 100644 +index 000000000..9854a23f5 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c @@ -0,0 +1,4010 @@ @@ -636993,7 +637019,7 @@ index 000000000000..9854a23f545b + }, +}; diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c -index 39e1e1ebea92..069cb6e7aef9 100644 +index 39e1e1ebe..069cb6e7a 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -5,36 +5,36 @@ @@ -639819,7 +639845,7 @@ index 39e1e1ebea92..069cb6e7aef9 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 6e9fa5815d4d..a33f6fcecb78 100644 +index 6e9fa5815..a33f6fcec 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h @@ -113,6 +113,11 @@ @@ -640847,7 +640873,7 @@ index 6e9fa5815d4d..a33f6fcecb78 100644 +#define RK3528_ACM_YHS_DEL_HGAIN_SEG64 0x07d8 #endif /* _ROCKCHIP_VOP_REG_H */ diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c -index 13c14eb175e9..3a3de40fc90f 100644 +index 6abcf975a..960fbd0a9 100644 --- a/drivers/i2c/busses/i2c-rk3x.c +++ b/drivers/i2c/busses/i2c-rk3x.c @@ -23,6 +23,8 @@ @@ -641351,7 +641377,7 @@ index 13c14eb175e9..3a3de40fc90f 100644 MODULE_DESCRIPTION("Rockchip RK3xxx I2C Bus driver"); MODULE_AUTHOR("Max Schwarz "); diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c -index 34fecf97a355..d041b7fa5c9c 100644 +index e8a89e18c..3a9fc1c88 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -61,6 +61,7 @@ @@ -641456,7 +641482,7 @@ index 34fecf97a355..d041b7fa5c9c 100644 unsigned cmd; void *arg; diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig -index e39b679126a2..2760f1e52b97 100644 +index e39b67912..2760f1e52 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -876,6 +876,13 @@ config ROCKCHIP_SARADC @@ -641474,7 +641500,7 @@ index e39b679126a2..2760f1e52b97 100644 tristate "Spreadtrum SC27xx series PMICs ADC" depends on MFD_SC27XX_PMIC || COMPILE_TEST diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c -index 12584f1631d8..c266169dfe61 100644 +index deb58e232..badb07ed5 100644 --- a/drivers/iio/adc/rockchip_saradc.c +++ b/drivers/iio/adc/rockchip_saradc.c @@ -35,7 +35,7 @@ @@ -641593,7 +641619,7 @@ index 12584f1631d8..c266169dfe61 100644 }, {}, }; -@@ -278,6 +317,72 @@ static irqreturn_t rockchip_saradc_trigger_handler(int irq, void *p) +@@ -280,6 +319,72 @@ static irqreturn_t rockchip_saradc_trigger_handler(int irq, void *p) return IRQ_HANDLED; } @@ -641666,7 +641692,7 @@ index 12584f1631d8..c266169dfe61 100644 static int rockchip_saradc_probe(struct platform_device *pdev) { struct rockchip_saradc *info = NULL; -@@ -390,6 +495,13 @@ static int rockchip_saradc_probe(struct platform_device *pdev) +@@ -392,6 +497,13 @@ static int rockchip_saradc_probe(struct platform_device *pdev) return ret; } @@ -641680,7 +641706,7 @@ index 12584f1631d8..c266169dfe61 100644 ret = clk_prepare_enable(info->pclk); if (ret < 0) { dev_err(&pdev->dev, "failed to enable pclk\n"); -@@ -430,6 +542,21 @@ static int rockchip_saradc_probe(struct platform_device *pdev) +@@ -432,6 +544,21 @@ static int rockchip_saradc_probe(struct platform_device *pdev) if (ret) return ret; @@ -641703,7 +641729,7 @@ index 12584f1631d8..c266169dfe61 100644 } diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig -index 1efd3154b68d..1c80fe7b3c4a 100644 +index 1efd3154b..1c80fe7b3 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig @@ -197,6 +197,10 @@ source "drivers/input/tablet/Kconfig" @@ -641718,7 +641744,7 @@ index 1efd3154b68d..1c80fe7b3c4a 100644 source "drivers/input/rmi4/Kconfig" diff --git a/drivers/input/Makefile b/drivers/input/Makefile -index e35650930371..5cd16233ce08 100644 +index e35650930..5cd16233c 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -24,6 +24,8 @@ obj-$(CONFIG_INPUT_MOUSE) += mouse/ @@ -641731,7 +641757,7 @@ index e35650930371..5cd16233ce08 100644 obj-$(CONFIG_INPUT_APMPOWER) += apm-power.o diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig -index 3f7a5ff17a9a..7f21a0ba6ae1 100644 +index 3f7a5ff17..7f21a0ba6 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -67,6 +67,9 @@ config KEYBOARD_AMIGA @@ -641745,7 +641771,7 @@ index 3f7a5ff17a9a..7f21a0ba6ae1 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 54afb38601b9..bb29a7c9a1c0 100644 +index 54afb3860..bb29a7c9a 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) @@ -641757,8 +641783,8 @@ index 54afb38601b9..bb29a7c9a1c0 100644 } diff --git a/drivers/input/keyboard/rk_keys.c b/drivers/input/keyboard/rk_keys.c -new file mode 100755 -index 000000000000..375cfbd600ea +new file mode 100644 +index 000000000..375cfbd60 --- /dev/null +++ b/drivers/input/keyboard/rk_keys.c @@ -0,0 +1,555 @@ @@ -642318,8 +642344,8 @@ index 000000000000..375cfbd600ea +late_initcall_sync(rk_keys_driver_init); +module_exit(rk_keys_driver_exit); diff --git a/drivers/input/remotectl/Kconfig b/drivers/input/remotectl/Kconfig -new file mode 100755 -index 000000000000..67558b48869e +new file mode 100644 +index 000000000..67558b488 --- /dev/null +++ b/drivers/input/remotectl/Kconfig @@ -0,0 +1,19 @@ @@ -642343,8 +642369,8 @@ index 000000000000..67558b48869e + +endif diff --git a/drivers/input/remotectl/Makefile b/drivers/input/remotectl/Makefile -new file mode 100755 -index 000000000000..209472b4a356 +new file mode 100644 +index 000000000..209472b4a --- /dev/null +++ b/drivers/input/remotectl/Makefile @@ -0,0 +1,8 @@ @@ -642357,8 +642383,8 @@ index 000000000000..209472b4a356 + +obj-$(CONFIG_ROCKCHIP_REMOTECTL_PWM) += rockchip_pwm_remotectl.o diff --git a/drivers/input/remotectl/rockchip_pwm_remotectl.c b/drivers/input/remotectl/rockchip_pwm_remotectl.c -new file mode 100755 -index 000000000000..f24ba9edf08b +new file mode 100644 +index 000000000..f24ba9edf --- /dev/null +++ b/drivers/input/remotectl/rockchip_pwm_remotectl.c @@ -0,0 +1,828 @@ @@ -643191,8 +643217,8 @@ index 000000000000..f24ba9edf08b + +MODULE_LICENSE("GPL"); diff --git a/drivers/input/remotectl/rockchip_pwm_remotectl.h b/drivers/input/remotectl/rockchip_pwm_remotectl.h -new file mode 100755 -index 000000000000..5126a3edb5d5 +new file mode 100644 +index 000000000..5126a3edb --- /dev/null +++ b/drivers/input/remotectl/rockchip_pwm_remotectl.h @@ -0,0 +1,160 @@ @@ -643357,8 +643383,8 @@ index 000000000000..5126a3edb5d5 + +#endif diff --git a/drivers/input/sensors/Kconfig b/drivers/input/sensors/Kconfig -new file mode 100755 -index 000000000000..ebff9437aa66 +new file mode 100644 +index 000000000..ebff9437a --- /dev/null +++ b/drivers/input/sensors/Kconfig @@ -0,0 +1,23 @@ @@ -643386,8 +643412,8 @@ index 000000000000..ebff9437aa66 + +endif diff --git a/drivers/input/sensors/Makefile b/drivers/input/sensors/Makefile -new file mode 100755 -index 000000000000..df8d372dafe1 +new file mode 100644 +index 000000000..df8d372da --- /dev/null +++ b/drivers/input/sensors/Makefile @@ -0,0 +1,15 @@ @@ -643407,8 +643433,8 @@ index 000000000000..df8d372dafe1 +obj-$(CONFIG_SENSOR_DEVICE) += sensor_dev.o +sensor_dev-y = sensor-i2c.o sensor-dev.o diff --git a/drivers/input/sensors/accel/Kconfig b/drivers/input/sensors/accel/Kconfig -new file mode 100755 -index 000000000000..724cb2ca1e7a +new file mode 100644 +index 000000000..724cb2ca1 --- /dev/null +++ b/drivers/input/sensors/accel/Kconfig @@ -0,0 +1,149 @@ @@ -643562,8 +643588,8 @@ index 000000000000..724cb2ca1e7a + +endif diff --git a/drivers/input/sensors/accel/Makefile b/drivers/input/sensors/accel/Makefile -new file mode 100755 -index 000000000000..de250ef4a282 +new file mode 100644 +index 000000000..de250ef4a --- /dev/null +++ b/drivers/input/sensors/accel/Makefile @@ -0,0 +1,22 @@ @@ -643590,8 +643616,8 @@ index 000000000000..de250ef4a282 +obj-$(CONFIG_ICM2060X_ACC) += icm2060x_acc.o +da223-y := da223_cust.o da223_core.o diff --git a/drivers/input/sensors/accel/bma2xx.c b/drivers/input/sensors/accel/bma2xx.c -new file mode 100755 -index 000000000000..19f578a77295 +new file mode 100644 +index 000000000..19f578a77 --- /dev/null +++ b/drivers/input/sensors/accel/bma2xx.c @@ -0,0 +1,2268 @@ @@ -645864,8 +645890,8 @@ index 000000000000..19f578a77295 +MODULE_DESCRIPTION("bma2x2 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/da223_core.c b/drivers/input/sensors/accel/da223_core.c -new file mode 100755 -index 000000000000..b0e25eac9b5f +new file mode 100644 +index 000000000..b0e25eac9 --- /dev/null +++ b/drivers/input/sensors/accel/da223_core.c @@ -0,0 +1,1907 @@ @@ -647777,8 +647803,8 @@ index 000000000000..b0e25eac9b5f + return res; +} diff --git a/drivers/input/sensors/accel/da223_core.h b/drivers/input/sensors/accel/da223_core.h -new file mode 100755 -index 000000000000..de67d711b486 +new file mode 100644 +index 000000000..de67d711b --- /dev/null +++ b/drivers/input/sensors/accel/da223_core.h @@ -0,0 +1,303 @@ @@ -648086,8 +648112,8 @@ index 000000000000..de67d711b486 + + diff --git a/drivers/input/sensors/accel/da223_cust.c b/drivers/input/sensors/accel/da223_cust.c -new file mode 100755 -index 000000000000..c00836d5b78d +new file mode 100644 +index 000000000..c00836d5b --- /dev/null +++ b/drivers/input/sensors/accel/da223_cust.c @@ -0,0 +1,898 @@ @@ -648990,8 +649016,8 @@ index 000000000000..c00836d5b78d +MODULE_DESCRIPTION("mir3da 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/da223_cust.h b/drivers/input/sensors/accel/da223_cust.h -new file mode 100755 -index 000000000000..e6bf15a02da8 +new file mode 100644 +index 000000000..e6bf15a02 --- /dev/null +++ b/drivers/input/sensors/accel/da223_cust.h @@ -0,0 +1,44 @@ @@ -649040,8 +649066,8 @@ index 000000000000..e6bf15a02da8 + + diff --git a/drivers/input/sensors/accel/dmard10.c b/drivers/input/sensors/accel/dmard10.c -new file mode 100755 -index 000000000000..8be258c316a2 +new file mode 100644 +index 000000000..8be258c31 --- /dev/null +++ b/drivers/input/sensors/accel/dmard10.c @@ -0,0 +1,454 @@ @@ -649500,8 +649526,8 @@ index 000000000000..8be258c316a2 +MODULE_LICENSE("GPL"); + diff --git a/drivers/input/sensors/accel/icm2060x_acc.c b/drivers/input/sensors/accel/icm2060x_acc.c -new file mode 100755 -index 000000000000..80a5c96e6207 +new file mode 100644 +index 000000000..80a5c96e6 --- /dev/null +++ b/drivers/input/sensors/accel/icm2060x_acc.c @@ -0,0 +1,260 @@ @@ -649766,8 +649792,8 @@ index 000000000000..80a5c96e6207 +MODULE_DESCRIPTION("icm2060x_acc 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/kxtik.c b/drivers/input/sensors/accel/kxtik.c -new file mode 100755 -index 000000000000..734b471f5d3a +new file mode 100644 +index 000000000..734b471f5 --- /dev/null +++ b/drivers/input/sensors/accel/kxtik.c @@ -0,0 +1,359 @@ @@ -650131,8 +650157,8 @@ index 000000000000..734b471f5d3a +MODULE_DESCRIPTION("kxtik 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/kxtj9.c b/drivers/input/sensors/accel/kxtj9.c -new file mode 100755 -index 000000000000..6fc6a8c5f119 +new file mode 100644 +index 000000000..6fc6a8c5f --- /dev/null +++ b/drivers/input/sensors/accel/kxtj9.c @@ -0,0 +1,332 @@ @@ -650469,8 +650495,8 @@ index 000000000000..6fc6a8c5f119 +MODULE_DESCRIPTION("kxtj9 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/lis3dh.c b/drivers/input/sensors/accel/lis3dh.c -new file mode 100755 -index 000000000000..55f0fe526899 +new file mode 100644 +index 000000000..55f0fe526 --- /dev/null +++ b/drivers/input/sensors/accel/lis3dh.c @@ -0,0 +1,303 @@ @@ -650778,8 +650804,8 @@ index 000000000000..55f0fe526899 +MODULE_DESCRIPTION("lis3dh 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/lsm303d.c b/drivers/input/sensors/accel/lsm303d.c -new file mode 100755 -index 000000000000..ff238278f10c +new file mode 100644 +index 000000000..ff238278f --- /dev/null +++ b/drivers/input/sensors/accel/lsm303d.c @@ -0,0 +1,362 @@ @@ -651146,8 +651172,8 @@ index 000000000000..ff238278f10c +MODULE_DESCRIPTION("lsm303d 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/lsm330_acc.c b/drivers/input/sensors/accel/lsm330_acc.c -new file mode 100755 -index 000000000000..ed93bb0147ff +new file mode 100644 +index 000000000..ed93bb014 --- /dev/null +++ b/drivers/input/sensors/accel/lsm330_acc.c @@ -0,0 +1,278 @@ @@ -651430,8 +651456,8 @@ index 000000000000..ed93bb0147ff +MODULE_DESCRIPTION("lsm330_acc 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/mc3230.c b/drivers/input/sensors/accel/mc3230.c -new file mode 100755 -index 000000000000..d5827f2f2bee +new file mode 100644 +index 000000000..d5827f2f2 --- /dev/null +++ b/drivers/input/sensors/accel/mc3230.c @@ -0,0 +1,1353 @@ @@ -652789,8 +652815,8 @@ index 000000000000..d5827f2f2bee +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("mc3230 3-Axis accelerometer driver"); diff --git a/drivers/input/sensors/accel/mma7660.c b/drivers/input/sensors/accel/mma7660.c -new file mode 100755 -index 000000000000..33e2dec7bb22 +new file mode 100644 +index 000000000..33e2dec7b --- /dev/null +++ b/drivers/input/sensors/accel/mma7660.c @@ -0,0 +1,258 @@ @@ -653053,8 +653079,8 @@ index 000000000000..33e2dec7bb22 +MODULE_DESCRIPTION("mma7660 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/mma8452.c b/drivers/input/sensors/accel/mma8452.c -new file mode 100755 -index 000000000000..9c8bb48f0848 +new file mode 100644 +index 000000000..9c8bb48f0 --- /dev/null +++ b/drivers/input/sensors/accel/mma8452.c @@ -0,0 +1,424 @@ @@ -653483,8 +653509,8 @@ index 000000000000..9c8bb48f0848 +MODULE_DESCRIPTION("mma8452 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/mpu6500_acc.c b/drivers/input/sensors/accel/mpu6500_acc.c -new file mode 100755 -index 000000000000..6fc2058e0f9f +new file mode 100644 +index 000000000..6fc2058e0 --- /dev/null +++ b/drivers/input/sensors/accel/mpu6500_acc.c @@ -0,0 +1,300 @@ @@ -653789,8 +653815,8 @@ index 000000000000..6fc2058e0f9f +MODULE_DESCRIPTION("mpu6500_acc 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/mpu6880_acc.c b/drivers/input/sensors/accel/mpu6880_acc.c -new file mode 100755 -index 000000000000..4cf8c89506a5 +new file mode 100644 +index 000000000..4cf8c8950 --- /dev/null +++ b/drivers/input/sensors/accel/mpu6880_acc.c @@ -0,0 +1,296 @@ @@ -654091,8 +654117,8 @@ index 000000000000..4cf8c89506a5 +MODULE_DESCRIPTION("mpu6880 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/mxc622x.c b/drivers/input/sensors/accel/mxc622x.c -new file mode 100755 -index 000000000000..614242584e0a +new file mode 100644 +index 000000000..614242584 --- /dev/null +++ b/drivers/input/sensors/accel/mxc622x.c @@ -0,0 +1,284 @@ @@ -654381,8 +654407,8 @@ index 000000000000..614242584e0a +MODULE_DESCRIPTION("mxc6225 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/mxc6655xa.c b/drivers/input/sensors/accel/mxc6655xa.c -new file mode 100755 -index 000000000000..535a83a262f5 +new file mode 100644 +index 000000000..535a83a26 --- /dev/null +++ b/drivers/input/sensors/accel/mxc6655xa.c @@ -0,0 +1,262 @@ @@ -654649,8 +654675,8 @@ index 000000000000..535a83a262f5 +MODULE_DESCRIPTION("mxc6655 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/sc7660.c b/drivers/input/sensors/accel/sc7660.c -new file mode 100755 -index 000000000000..39106b111000 +new file mode 100644 +index 000000000..39106b111 --- /dev/null +++ b/drivers/input/sensors/accel/sc7660.c @@ -0,0 +1,1655 @@ @@ -656310,8 +656336,8 @@ index 000000000000..39106b111000 +MODULE_DESCRIPTION("sc7660 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/sc7a20.c b/drivers/input/sensors/accel/sc7a20.c -new file mode 100755 -index 000000000000..f7443f922e7e +new file mode 100644 +index 000000000..f7443f922 --- /dev/null +++ b/drivers/input/sensors/accel/sc7a20.c @@ -0,0 +1,1768 @@ @@ -658084,8 +658110,8 @@ index 000000000000..f7443f922e7e +MODULE_DESCRIPTION("sc7a20 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/sc7a30.c b/drivers/input/sensors/accel/sc7a30.c -new file mode 100755 -index 000000000000..576c9188029b +new file mode 100644 +index 000000000..576c91880 --- /dev/null +++ b/drivers/input/sensors/accel/sc7a30.c @@ -0,0 +1,1215 @@ @@ -659305,8 +659331,8 @@ index 000000000000..576c9188029b +MODULE_DESCRIPTION("sc7a30 3-Axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/accel/stk8baxx.c b/drivers/input/sensors/accel/stk8baxx.c -new file mode 100755 -index 000000000000..9ca93971d914 +new file mode 100644 +index 000000000..9ca93971d --- /dev/null +++ b/drivers/input/sensors/accel/stk8baxx.c @@ -0,0 +1,957 @@ @@ -660268,8 +660294,8 @@ index 000000000000..9ca93971d914 +MODULE_LICENSE("GPL"); +MODULE_VERSION(STK_ACC_DRIVER_VERSION); diff --git a/drivers/input/sensors/angle/Kconfig b/drivers/input/sensors/angle/Kconfig -new file mode 100755 -index 000000000000..088837f92ed8 +new file mode 100644 +index 000000000..088837f92 --- /dev/null +++ b/drivers/input/sensors/angle/Kconfig @@ -0,0 +1,27 @@ @@ -660301,8 +660327,8 @@ index 000000000000..088837f92ed8 +endif + diff --git a/drivers/input/sensors/angle/Makefile b/drivers/input/sensors/angle/Makefile -new file mode 100755 -index 000000000000..0696550b53f8 +new file mode 100644 +index 000000000..0696550b5 --- /dev/null +++ b/drivers/input/sensors/angle/Makefile @@ -0,0 +1,3 @@ @@ -660310,8 +660336,8 @@ index 000000000000..0696550b53f8 +obj-$(CONFIG_ANGLE_KXTIK) += angle_kxtik.o +obj-$(CONFIG_ANGLE_LIS3DH) += angle_lis3dh.o diff --git a/drivers/input/sensors/angle/angle_kxtik.c b/drivers/input/sensors/angle/angle_kxtik.c -new file mode 100755 -index 000000000000..7373c6bd4068 +new file mode 100644 +index 000000000..7373c6bd4 --- /dev/null +++ b/drivers/input/sensors/angle/angle_kxtik.c @@ -0,0 +1,398 @@ @@ -660714,8 +660740,8 @@ index 000000000000..7373c6bd4068 +MODULE_DESCRIPTION("kxtik angle driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/angle/angle_lis3dh.c b/drivers/input/sensors/angle/angle_lis3dh.c -new file mode 100755 -index 000000000000..ae247ffa2312 +new file mode 100644 +index 000000000..ae247ffa2 --- /dev/null +++ b/drivers/input/sensors/angle/angle_lis3dh.c @@ -0,0 +1,342 @@ @@ -661062,8 +661088,8 @@ index 000000000000..ae247ffa2312 + + diff --git a/drivers/input/sensors/compass/Kconfig b/drivers/input/sensors/compass/Kconfig -new file mode 100755 -index 000000000000..91a19ffe23ea +new file mode 100644 +index 000000000..91a19ffe2 --- /dev/null +++ b/drivers/input/sensors/compass/Kconfig @@ -0,0 +1,58 @@ @@ -661126,8 +661152,8 @@ index 000000000000..91a19ffe23ea +endif + diff --git a/drivers/input/sensors/compass/Makefile b/drivers/input/sensors/compass/Makefile -new file mode 100755 -index 000000000000..f42c2aa2dd17 +new file mode 100644 +index 000000000..f42c2aa2d --- /dev/null +++ b/drivers/input/sensors/compass/Makefile @@ -0,0 +1,8 @@ @@ -661140,8 +661166,8 @@ index 000000000000..f42c2aa2dd17 +obj-$(CONFIG_COMPASS_AK09911) += ak09911.o +obj-$(CONFIG_COMPASS_AK09918) += ak09918.o diff --git a/drivers/input/sensors/compass/ak09911.c b/drivers/input/sensors/compass/ak09911.c -new file mode 100755 -index 000000000000..b1e334d0b5a8 +new file mode 100644 +index 000000000..b1e334d0b --- /dev/null +++ b/drivers/input/sensors/compass/ak09911.c @@ -0,0 +1,667 @@ @@ -661813,8 +661839,8 @@ index 000000000000..b1e334d0b5a8 +MODULE_DESCRIPTION("akm09911 3-Axis compasss driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/compass/ak09918.c b/drivers/input/sensors/compass/ak09918.c -new file mode 100755 -index 000000000000..1c3056a824e5 +new file mode 100644 +index 000000000..1c3056a82 --- /dev/null +++ b/drivers/input/sensors/compass/ak09918.c @@ -0,0 +1,692 @@ @@ -662511,8 +662537,8 @@ index 000000000000..1c3056a824e5 +MODULE_DESCRIPTION("akm09918 3-Axis compasss driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/compass/ak8963.c b/drivers/input/sensors/compass/ak8963.c -new file mode 100755 -index 000000000000..10e91eb2d0be +new file mode 100644 +index 000000000..10e91eb2d --- /dev/null +++ b/drivers/input/sensors/compass/ak8963.c @@ -0,0 +1,714 @@ @@ -663231,8 +663257,8 @@ index 000000000000..10e91eb2d0be +MODULE_DESCRIPTION("akm8963 3-Axis compasss driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/compass/ak8975.c b/drivers/input/sensors/compass/ak8975.c -new file mode 100755 -index 000000000000..c48a808ed18d +new file mode 100644 +index 000000000..c48a808ed --- /dev/null +++ b/drivers/input/sensors/compass/ak8975.c @@ -0,0 +1,650 @@ @@ -663887,8 +663913,8 @@ index 000000000000..c48a808ed18d + + diff --git a/drivers/input/sensors/gyro/Kconfig b/drivers/input/sensors/gyro/Kconfig -new file mode 100755 -index 000000000000..fb721d4cb30d +new file mode 100644 +index 000000000..fb721d4cb --- /dev/null +++ b/drivers/input/sensors/gyro/Kconfig @@ -0,0 +1,42 @@ @@ -663935,8 +663961,8 @@ index 000000000000..fb721d4cb30d + tristate "gyroscope icm2060x_gyro" +endif diff --git a/drivers/input/sensors/gyro/Makefile b/drivers/input/sensors/gyro/Makefile -new file mode 100755 -index 000000000000..0943257a11de +new file mode 100644 +index 000000000..0943257a1 --- /dev/null +++ b/drivers/input/sensors/gyro/Makefile @@ -0,0 +1,11 @@ @@ -663952,8 +663978,8 @@ index 000000000000..0943257a11de +obj-$(CONFIG_GYRO_LSM330) += lsm330_gyro.o +obj-$(CONFIG_GYRO_ICM2060X) += icm2060x_gyro.o diff --git a/drivers/input/sensors/gyro/ewtsa.c b/drivers/input/sensors/gyro/ewtsa.c -new file mode 100755 -index 000000000000..acbc0ac4b143 +new file mode 100644 +index 000000000..acbc0ac4b --- /dev/null +++ b/drivers/input/sensors/gyro/ewtsa.c @@ -0,0 +1,461 @@ @@ -664419,8 +664445,8 @@ index 000000000000..acbc0ac4b143 +MODULE_DESCRIPTION("ewtsa 3-Axis Gyroscope driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/gyro/icm2060x_gyro.c b/drivers/input/sensors/gyro/icm2060x_gyro.c -new file mode 100755 -index 000000000000..3d4624b5dbd6 +new file mode 100644 +index 000000000..3d4624b5d --- /dev/null +++ b/drivers/input/sensors/gyro/icm2060x_gyro.c @@ -0,0 +1,216 @@ @@ -664641,8 +664667,8 @@ index 000000000000..3d4624b5dbd6 +MODULE_DESCRIPTION("icm2060x_gyro 3-Axis Gyroscope driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/gyro/l3g20d.c b/drivers/input/sensors/gyro/l3g20d.c -new file mode 100755 -index 000000000000..8822a0e3bfe0 +new file mode 100644 +index 000000000..8822a0e3b --- /dev/null +++ b/drivers/input/sensors/gyro/l3g20d.c @@ -0,0 +1,257 @@ @@ -664904,8 +664930,8 @@ index 000000000000..8822a0e3bfe0 +MODULE_DESCRIPTION("l3g20d 3-Axis Gyroscope driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/gyro/l3g4200d.c b/drivers/input/sensors/gyro/l3g4200d.c -new file mode 100755 -index 000000000000..b1e3af6589cb +new file mode 100644 +index 000000000..b1e3af658 --- /dev/null +++ b/drivers/input/sensors/gyro/l3g4200d.c @@ -0,0 +1,257 @@ @@ -665167,8 +665193,8 @@ index 000000000000..b1e3af6589cb +MODULE_DESCRIPTION("l3g4200d 3-Axis Gyroscope driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/gyro/lsm330_gyro.c b/drivers/input/sensors/gyro/lsm330_gyro.c -new file mode 100755 -index 000000000000..a488d4826acf +new file mode 100644 +index 000000000..a488d4826 --- /dev/null +++ b/drivers/input/sensors/gyro/lsm330_gyro.c @@ -0,0 +1,262 @@ @@ -665435,8 +665461,8 @@ index 000000000000..a488d4826acf +MODULE_DESCRIPTION("lsm330 3-Axis Gyroscope driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/gyro/mpu6500_gyro.c b/drivers/input/sensors/gyro/mpu6500_gyro.c -new file mode 100755 -index 000000000000..6b4f81154b7f +new file mode 100644 +index 000000000..6b4f81154 --- /dev/null +++ b/drivers/input/sensors/gyro/mpu6500_gyro.c @@ -0,0 +1,216 @@ @@ -665657,8 +665683,8 @@ index 000000000000..6b4f81154b7f +MODULE_DESCRIPTION("mpu6500_gyro 3-Axis Gyroscope driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/gyro/mpu6880_gyro.c b/drivers/input/sensors/gyro/mpu6880_gyro.c -new file mode 100755 -index 000000000000..324e66ecfab6 +new file mode 100644 +index 000000000..324e66ecf --- /dev/null +++ b/drivers/input/sensors/gyro/mpu6880_gyro.c @@ -0,0 +1,216 @@ @@ -665879,8 +665905,8 @@ index 000000000000..324e66ecfab6 +MODULE_DESCRIPTION("mpu6880_gyro 3-Axis Gyroscope driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/hall/Kconfig b/drivers/input/sensors/hall/Kconfig -new file mode 100755 -index 000000000000..33ca28c87cda +new file mode 100644 +index 000000000..33ca28c87 --- /dev/null +++ b/drivers/input/sensors/hall/Kconfig @@ -0,0 +1,16 @@ @@ -665901,8 +665927,8 @@ index 000000000000..33ca28c87cda + +endif diff --git a/drivers/input/sensors/hall/Makefile b/drivers/input/sensors/hall/Makefile -new file mode 100755 -index 000000000000..f78ba4ffb850 +new file mode 100644 +index 000000000..f78ba4ffb --- /dev/null +++ b/drivers/input/sensors/hall/Makefile @@ -0,0 +1,3 @@ @@ -665910,8 +665936,8 @@ index 000000000000..f78ba4ffb850 +obj-$(CONFIG_HS_OCH165T) += och165t_hall.o +obj-$(CONFIG_HS_MH248) += mh248.o diff --git a/drivers/input/sensors/hall/mh248.c b/drivers/input/sensors/hall/mh248.c -new file mode 100755 -index 000000000000..88ee00980514 +new file mode 100644 +index 000000000..88ee00980 --- /dev/null +++ b/drivers/input/sensors/hall/mh248.c @@ -0,0 +1,165 @@ @@ -666081,8 +666107,8 @@ index 000000000000..88ee00980514 +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("Hall Sensor MH248 driver"); diff --git a/drivers/input/sensors/hall/och165t_hall.c b/drivers/input/sensors/hall/och165t_hall.c -new file mode 100755 -index 000000000000..71711a95028d +new file mode 100644 +index 000000000..71711a950 --- /dev/null +++ b/drivers/input/sensors/hall/och165t_hall.c @@ -0,0 +1,159 @@ @@ -666246,8 +666272,8 @@ index 000000000000..71711a95028d +MODULE_DESCRIPTION("och165t hall driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/Kconfig b/drivers/input/sensors/lsensor/Kconfig -new file mode 100755 -index 000000000000..8ea493862dd3 +new file mode 100644 +index 000000000..8ea493862 --- /dev/null +++ b/drivers/input/sensors/lsensor/Kconfig @@ -0,0 +1,50 @@ @@ -666302,8 +666328,8 @@ index 000000000000..8ea493862dd3 +endif + diff --git a/drivers/input/sensors/lsensor/Makefile b/drivers/input/sensors/lsensor/Makefile -new file mode 100755 -index 000000000000..aa8bf78f440c +new file mode 100644 +index 000000000..aa8bf78f4 --- /dev/null +++ b/drivers/input/sensors/lsensor/Makefile @@ -0,0 +1,13 @@ @@ -666321,8 +666347,8 @@ index 000000000000..aa8bf78f440c +obj-$(CONFIG_LS_STK3410) += ls_stk3410.o +obj-$(CONFIG_LS_EM3071X) += ls_em3071x.o diff --git a/drivers/input/sensors/lsensor/cm3217.c b/drivers/input/sensors/lsensor/cm3217.c -new file mode 100755 -index 000000000000..182fee423993 +new file mode 100644 +index 000000000..182fee423 --- /dev/null +++ b/drivers/input/sensors/lsensor/cm3217.c @@ -0,0 +1,237 @@ @@ -666564,8 +666590,8 @@ index 000000000000..182fee423993 +MODULE_DESCRIPTION("cm3217 light driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/cm3218.c b/drivers/input/sensors/lsensor/cm3218.c -new file mode 100755 -index 000000000000..eed39578b005 +new file mode 100644 +index 000000000..eed39578b --- /dev/null +++ b/drivers/input/sensors/lsensor/cm3218.c @@ -0,0 +1,415 @@ @@ -666985,8 +667011,8 @@ index 000000000000..eed39578b005 +MODULE_DESCRIPTION("cm3218 light driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/cm3232.c b/drivers/input/sensors/lsensor/cm3232.c -new file mode 100755 -index 000000000000..6322e57bb1a9 +new file mode 100644 +index 000000000..6322e57bb --- /dev/null +++ b/drivers/input/sensors/lsensor/cm3232.c @@ -0,0 +1,245 @@ @@ -667236,8 +667262,8 @@ index 000000000000..6322e57bb1a9 +MODULE_DESCRIPTION("cm3232 light driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/isl29023.c b/drivers/input/sensors/lsensor/isl29023.c -new file mode 100755 -index 000000000000..200c4b2959c7 +new file mode 100644 +index 000000000..200c4b295 --- /dev/null +++ b/drivers/input/sensors/lsensor/isl29023.c @@ -0,0 +1,273 @@ @@ -667515,8 +667541,8 @@ index 000000000000..200c4b2959c7 +MODULE_DESCRIPTION("isl29023 light driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/ls_al3006.c b/drivers/input/sensors/lsensor/ls_al3006.c -new file mode 100755 -index 000000000000..8334d0faceaf +new file mode 100644 +index 000000000..8334d0fac --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_al3006.c @@ -0,0 +1,301 @@ @@ -667822,8 +667848,8 @@ index 000000000000..8334d0faceaf +MODULE_LICENSE("GPL"); + diff --git a/drivers/input/sensors/lsensor/ls_ap321xx.c b/drivers/input/sensors/lsensor/ls_ap321xx.c -new file mode 100755 -index 000000000000..8181cec587a0 +new file mode 100644 +index 000000000..8181cec58 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_ap321xx.c @@ -0,0 +1,415 @@ @@ -668243,8 +668269,8 @@ index 000000000000..8181cec587a0 + + diff --git a/drivers/input/sensors/lsensor/ls_em3071x.c b/drivers/input/sensors/lsensor/ls_em3071x.c -new file mode 100755 -index 000000000000..fc7500963ab5 +new file mode 100644 +index 000000000..fc7500963 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_em3071x.c @@ -0,0 +1,283 @@ @@ -668532,8 +668558,8 @@ index 000000000000..fc7500963ab5 +MODULE_DESCRIPTION("em3071x light driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/ls_stk3171.c b/drivers/input/sensors/lsensor/ls_stk3171.c -new file mode 100755 -index 000000000000..a8bc7d0e9af3 +new file mode 100644 +index 000000000..a8bc7d0e9 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_stk3171.c @@ -0,0 +1,321 @@ @@ -668859,8 +668885,8 @@ index 000000000000..a8bc7d0e9af3 + + diff --git a/drivers/input/sensors/lsensor/ls_stk3410.c b/drivers/input/sensors/lsensor/ls_stk3410.c -new file mode 100755 -index 000000000000..25722040fc31 +new file mode 100644 +index 000000000..25722040f --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_stk3410.c @@ -0,0 +1,374 @@ @@ -669239,8 +669265,8 @@ index 000000000000..25722040fc31 +MODULE_DESCRIPTION("stk3410 light driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/ls_us5152.c b/drivers/input/sensors/lsensor/ls_us5152.c -new file mode 100755 -index 000000000000..4f5b470bc735 +new file mode 100644 +index 000000000..4f5b470bc --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_us5152.c @@ -0,0 +1,440 @@ @@ -669685,8 +669711,8 @@ index 000000000000..4f5b470bc735 +MODULE_LICENSE("GPL"); +MODULE_VERSION(DRIVER_VERSION); diff --git a/drivers/input/sensors/lsensor/ls_us5152.h b/drivers/input/sensors/lsensor/ls_us5152.h -new file mode 100755 -index 000000000000..71f108572639 +new file mode 100644 +index 000000000..71f108572 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_us5152.h @@ -0,0 +1,235 @@ @@ -669926,8 +669952,8 @@ index 000000000000..71f108572639 +#define us5152_NUM_CACHABLE_REGS 0x12 +#endif diff --git a/drivers/input/sensors/pressure/Kconfig b/drivers/input/sensors/pressure/Kconfig -new file mode 100755 -index 000000000000..8bbaaa148690 +new file mode 100644 +index 000000000..8bbaaa148 --- /dev/null +++ b/drivers/input/sensors/pressure/Kconfig @@ -0,0 +1,15 @@ @@ -669947,8 +669973,8 @@ index 000000000000..8bbaaa148690 + +endif diff --git a/drivers/input/sensors/pressure/Makefile b/drivers/input/sensors/pressure/Makefile -new file mode 100755 -index 000000000000..18872b53bb4b +new file mode 100644 +index 000000000..18872b53b --- /dev/null +++ b/drivers/input/sensors/pressure/Makefile @@ -0,0 +1,7 @@ @@ -669960,8 +669986,8 @@ index 000000000000..18872b53bb4b +obj-$(CONFIG_PR_MS5607) += pr_ms5607.o + diff --git a/drivers/input/sensors/pressure/pr_ms5607.c b/drivers/input/sensors/pressure/pr_ms5607.c -new file mode 100755 -index 000000000000..9833ad5d9a9e +new file mode 100644 +index 000000000..9833ad5d9 --- /dev/null +++ b/drivers/input/sensors/pressure/pr_ms5607.c @@ -0,0 +1,297 @@ @@ -670263,8 +670289,8 @@ index 000000000000..9833ad5d9a9e +MODULE_DESCRIPTION("ms5607 pressure driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/psensor/Kconfig b/drivers/input/sensors/psensor/Kconfig -new file mode 100755 -index 000000000000..c7d32f51e7d0 +new file mode 100644 +index 000000000..c7d32f51e --- /dev/null +++ b/drivers/input/sensors/psensor/Kconfig @@ -0,0 +1,32 @@ @@ -670301,8 +670327,8 @@ index 000000000000..c7d32f51e7d0 +endif + diff --git a/drivers/input/sensors/psensor/Makefile b/drivers/input/sensors/psensor/Makefile -new file mode 100755 -index 000000000000..49210d0e71cc +new file mode 100644 +index 000000000..49210d0e7 --- /dev/null +++ b/drivers/input/sensors/psensor/Makefile @@ -0,0 +1,8 @@ @@ -670315,8 +670341,8 @@ index 000000000000..49210d0e71cc +obj-$(CONFIG_PS_STK3410) += ps_stk3410.o +obj-$(CONFIG_PS_EM3071X) += ps_em3071x.o diff --git a/drivers/input/sensors/psensor/ps_al3006.c b/drivers/input/sensors/psensor/ps_al3006.c -new file mode 100755 -index 000000000000..3242af2be23f +new file mode 100644 +index 000000000..3242af2be --- /dev/null +++ b/drivers/input/sensors/psensor/ps_al3006.c @@ -0,0 +1,261 @@ @@ -670582,8 +670608,8 @@ index 000000000000..3242af2be23f +MODULE_DESCRIPTION("al3006 proximity driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/psensor/ps_ap321xx.c b/drivers/input/sensors/psensor/ps_ap321xx.c -new file mode 100755 -index 000000000000..d3711461af20 +new file mode 100644 +index 000000000..d3711461a --- /dev/null +++ b/drivers/input/sensors/psensor/ps_ap321xx.c @@ -0,0 +1,325 @@ @@ -670913,8 +670939,8 @@ index 000000000000..d3711461af20 +MODULE_DESCRIPTION("ps_ap321xx proximity driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/psensor/ps_em3071x.c b/drivers/input/sensors/psensor/ps_em3071x.c -new file mode 100755 -index 000000000000..5f387348881b +new file mode 100644 +index 000000000..5f3873488 --- /dev/null +++ b/drivers/input/sensors/psensor/ps_em3071x.c @@ -0,0 +1,280 @@ @@ -671199,8 +671225,8 @@ index 000000000000..5f387348881b +MODULE_DESCRIPTION("em3071x proximity driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/psensor/ps_stk3171.c b/drivers/input/sensors/psensor/ps_stk3171.c -new file mode 100755 -index 000000000000..1753bbe65c19 +new file mode 100644 +index 000000000..1753bbe65 --- /dev/null +++ b/drivers/input/sensors/psensor/ps_stk3171.c @@ -0,0 +1,268 @@ @@ -671473,8 +671499,8 @@ index 000000000000..1753bbe65c19 +MODULE_DESCRIPTION("ps_stk3171 proximity driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/psensor/ps_stk3410.c b/drivers/input/sensors/psensor/ps_stk3410.c -new file mode 100755 -index 000000000000..90f9a2313d1f +new file mode 100644 +index 000000000..90f9a2313 --- /dev/null +++ b/drivers/input/sensors/psensor/ps_stk3410.c @@ -0,0 +1,377 @@ @@ -671856,8 +671882,8 @@ index 000000000000..90f9a2313d1f +MODULE_DESCRIPTION("stk3410 proximity driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/sensor-dev.c b/drivers/input/sensors/sensor-dev.c -new file mode 100755 -index 000000000000..5aeeba175edd +new file mode 100644 +index 000000000..5aeeba175 --- /dev/null +++ b/drivers/input/sensors/sensor-dev.c @@ -0,0 +1,2042 @@ @@ -673904,8 +673930,8 @@ index 000000000000..5aeeba175edd +MODULE_DESCRIPTION("User space character device interface for sensors"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/sensor-i2c.c b/drivers/input/sensors/sensor-i2c.c -new file mode 100755 -index 000000000000..35c3feec8b32 +new file mode 100644 +index 000000000..35c3feec8 --- /dev/null +++ b/drivers/input/sensors/sensor-i2c.c @@ -0,0 +1,245 @@ @@ -674155,8 +674181,8 @@ index 000000000000..35c3feec8b32 +EXPORT_SYMBOL(sensor_read_reg_normal); + diff --git a/drivers/input/sensors/temperature/Kconfig b/drivers/input/sensors/temperature/Kconfig -new file mode 100755 -index 000000000000..34edaa7838ac +new file mode 100644 +index 000000000..34edaa783 --- /dev/null +++ b/drivers/input/sensors/temperature/Kconfig @@ -0,0 +1,15 @@ @@ -674176,8 +674202,8 @@ index 000000000000..34edaa7838ac + +endif diff --git a/drivers/input/sensors/temperature/Makefile b/drivers/input/sensors/temperature/Makefile -new file mode 100755 -index 000000000000..6045760d7e93 +new file mode 100644 +index 000000000..6045760d7 --- /dev/null +++ b/drivers/input/sensors/temperature/Makefile @@ -0,0 +1,7 @@ @@ -674189,8 +674215,8 @@ index 000000000000..6045760d7e93 +obj-$(CONFIG_TMP_MS5607) += tmp_ms5607.o + diff --git a/drivers/input/sensors/temperature/tmp_ms5607.c b/drivers/input/sensors/temperature/tmp_ms5607.c -new file mode 100755 -index 000000000000..1e5183ccc11d +new file mode 100644 +index 000000000..1e5183ccc --- /dev/null +++ b/drivers/input/sensors/temperature/tmp_ms5607.c @@ -0,0 +1,314 @@ @@ -674509,7 +674535,7 @@ index 000000000000..1e5183ccc11d +MODULE_DESCRIPTION("ms5607 temperature driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig -index cc18f54ea887..b9db13edafc1 100644 +index cc18f54ea..b9db13eda 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -404,6 +404,24 @@ config TOUCHSCREEN_GOODIX @@ -674538,7 +674564,7 @@ index cc18f54ea887..b9db13edafc1 100644 tristate "HiDeep Touch IC" depends on I2C diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile -index 6233541e9173..4a3cd29bd96d 100644 +index 6233541e9..4a3cd29bd 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -45,6 +45,10 @@ obj-$(CONFIG_TOUCHSCREEN_EGALAX_SERIAL) += egalax_ts_serial.o @@ -674553,8 +674579,8 @@ index 6233541e9173..4a3cd29bd96d 100644 obj-$(CONFIG_TOUCHSCREEN_ILI210X) += ili210x.o obj-$(CONFIG_TOUCHSCREEN_IMX6UL_TSC) += imx6ul_tsc.o diff --git a/drivers/input/touchscreen/cy8c_touchpad.c b/drivers/input/touchscreen/cy8c_touchpad.c -new file mode 100755 -index 000000000000..8088cb918c79 +new file mode 100644 +index 000000000..8088cb918 --- /dev/null +++ b/drivers/input/touchscreen/cy8c_touchpad.c @@ -0,0 +1,296 @@ @@ -674855,8 +674881,8 @@ index 000000000000..8088cb918c79 +MODULE_DESCRIPTION("Cypress Cy8cxxxx touchpad driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/input/touchscreen/cyttsp5/Kconfig b/drivers/input/touchscreen/cyttsp5/Kconfig -new file mode 100755 -index 000000000000..4bdeb1b8365d +new file mode 100644 +index 000000000..4bdeb1b83 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/Kconfig @@ -0,0 +1,205 @@ @@ -675066,8 +675092,8 @@ index 000000000000..4bdeb1b8365d + + diff --git a/drivers/input/touchscreen/cyttsp5/Makefile b/drivers/input/touchscreen/cyttsp5/Makefile -new file mode 100755 -index 000000000000..ff1fe526035d +new file mode 100644 +index 000000000..ff1fe5260 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/Makefile @@ -0,0 +1,23 @@ @@ -675095,8 +675121,8 @@ index 000000000000..ff1fe526035d +obj-$(CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP5_DEVICE_ACCESS) += cyttsp5_device_access.o +obj-$(CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP5_TEST_DEVICE_ACCESS_API) += cyttsp5_test_device_access_api.o diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_btn.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_btn.c -new file mode 100755 -index 000000000000..52c0eb85d29e +new file mode 100644 +index 000000000..52c0eb85d --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_btn.c @@ -0,0 +1,369 @@ @@ -675470,8 +675496,8 @@ index 000000000000..52c0eb85d29e + return 0; +} diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_core.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_core.c -new file mode 100755 -index 000000000000..7fac39a1bbaf +new file mode 100644 +index 000000000..7fac39a1b --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_core.c @@ -0,0 +1,6292 @@ @@ -681768,8 +681794,8 @@ index 000000000000..7fac39a1bbaf +MODULE_DESCRIPTION("Parade TrueTouch(R) Standard Product Core Driver"); +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_core.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_core.h -new file mode 100755 -index 000000000000..5989613865c1 +new file mode 100644 +index 000000000..598961386 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_core.h @@ -0,0 +1,182 @@ @@ -681956,8 +681982,8 @@ index 000000000000..5989613865c1 + +#endif /* _LINUX_CYTTSP5_CORE_H */ diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_debug.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_debug.c -new file mode 100755 -index 000000000000..f4ebba784936 +new file mode 100644 +index 000000000..f4ebba784 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_debug.c @@ -0,0 +1,393 @@ @@ -682355,8 +682381,8 @@ index 000000000000..f4ebba784936 +MODULE_DESCRIPTION("Parade TrueTouch(R) Standard Product Debug Driver"); +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_device_access.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_device_access.c -new file mode 100755 -index 000000000000..51cd63dc6ac0 +new file mode 100644 +index 000000000..51cd63dc6 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_device_access.c @@ -0,0 +1,5219 @@ @@ -687580,8 +687606,8 @@ index 000000000000..51cd63dc6ac0 +MODULE_AUTHOR("Parade Technologies "); + diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_devtree.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_devtree.c -new file mode 100755 -index 000000000000..9cb9050960b6 +new file mode 100644 +index 000000000..9cb905096 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_devtree.c @@ -0,0 +1,785 @@ @@ -688371,8 +688397,8 @@ index 000000000000..9cb9050960b6 +MODULE_DESCRIPTION("Parade TrueTouch(R) Standard Product DeviceTree Driver"); +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_i2c.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_i2c.c -new file mode 100755 -index 000000000000..976db422b907 +new file mode 100644 +index 000000000..976db422b --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_i2c.c @@ -0,0 +1,248 @@ @@ -688625,8 +688651,8 @@ index 000000000000..976db422b907 +MODULE_DESCRIPTION("Parade TrueTouch(R) Standard Product I2C driver"); +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_loader.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_loader.c -new file mode 100755 -index 000000000000..c900eb206881 +new file mode 100644 +index 000000000..c900eb206 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_loader.c @@ -0,0 +1,1586 @@ @@ -690217,8 +690243,8 @@ index 000000000000..c900eb206881 +MODULE_DESCRIPTION("Parade TrueTouch(R) Standard Product FW Loader Driver"); +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_mt_common.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_mt_common.c -new file mode 100755 -index 000000000000..25e5fa7654d4 +new file mode 100644 +index 000000000..25e5fa765 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_mt_common.c @@ -0,0 +1,793 @@ @@ -691016,8 +691042,8 @@ index 000000000000..25e5fa7654d4 + return 0; +} diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_mta.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_mta.c -new file mode 100755 -index 000000000000..d457bb66d360 +new file mode 100644 +index 000000000..d457bb66d --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_mta.c @@ -0,0 +1,85 @@ @@ -691107,8 +691133,8 @@ index 000000000000..d457bb66d360 + md->mt_function.input_register_device = cyttsp5_input_register_device; +} diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_mtb.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_mtb.c -new file mode 100755 -index 000000000000..d5f51e9c836f +new file mode 100644 +index 000000000..d5f51e9c8 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_mtb.c @@ -0,0 +1,93 @@ @@ -691206,8 +691232,8 @@ index 000000000000..d5f51e9c836f +} + diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_params.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_params.h -new file mode 100755 -index 000000000000..7a92d109fa73 +new file mode 100644 +index 000000000..7a92d109f --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_params.h @@ -0,0 +1,1548 @@ @@ -692760,8 +692786,8 @@ index 000000000000..7a92d109fa73 +}; + diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid00.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid00.h -new file mode 100755 -index 000000000000..939ff2a288ae +new file mode 100644 +index 000000000..939ff2a28 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid00.h @@ -0,0 +1,1548 @@ @@ -694314,8 +694340,8 @@ index 000000000000..939ff2a288ae +}; + diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid01.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid01.h -new file mode 100755 -index 000000000000..3dcb64dd3ba7 +new file mode 100644 +index 000000000..3dcb64dd3 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid01.h @@ -0,0 +1,1548 @@ @@ -695868,8 +695894,8 @@ index 000000000000..3dcb64dd3ba7 +}; + diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.c -new file mode 100755 -index 000000000000..cc6feaef1031 +new file mode 100644 +index 000000000..cc6feaef1 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.c @@ -0,0 +1,289 @@ @@ -696163,8 +696189,8 @@ index 000000000000..cc6feaef1031 +} +#endif diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.h -new file mode 100755 -index 000000000000..289b014775c0 +new file mode 100644 +index 000000000..289b01477 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.h @@ -0,0 +1,60 @@ @@ -696229,8 +696255,8 @@ index 000000000000..289b014775c0 + +#endif /* _LINUX_CYTTSP5_PLATFORM_H */ diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_proximity.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_proximity.c -new file mode 100755 -index 000000000000..0dba2c817387 +new file mode 100644 +index 000000000..0dba2c817 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_proximity.c @@ -0,0 +1,555 @@ @@ -696790,8 +696816,8 @@ index 000000000000..0dba2c817387 + return 0; +} diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_regs.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_regs.h -new file mode 100755 -index 000000000000..ded98eff2deb +new file mode 100644 +index 000000000..ded98eff2 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_regs.h @@ -0,0 +1,1202 @@ @@ -697998,8 +698024,8 @@ index 000000000000..ded98eff2deb + +#endif /* _CYTTSP5_REGS_H */ diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_spi.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_spi.c -new file mode 100755 -index 000000000000..a01b88b0c8a9 +new file mode 100644 +index 000000000..a01b88b0c --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_spi.c @@ -0,0 +1,255 @@ @@ -698259,8 +698285,8 @@ index 000000000000..a01b88b0c8a9 +MODULE_DESCRIPTION("Parade TrueTouch(R) Standard Product SPI Driver"); +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_test_device_access_api.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_test_device_access_api.c -new file mode 100755 -index 000000000000..b9517d52d5d4 +new file mode 100644 +index 000000000..b9517d52d --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_test_device_access_api.c @@ -0,0 +1,442 @@ @@ -698707,8 +698733,8 @@ index 000000000000..b9517d52d5d4 +MODULE_DESCRIPTION("Parade TrueTouch(R) Standard Product Device Access Driver API Tester"); +MODULE_AUTHOR("Parade Technologies "); diff --git a/drivers/input/touchscreen/focaltech_touch/Makefile b/drivers/input/touchscreen/focaltech_touch/Makefile -new file mode 100755 -index 000000000000..bf7df1543b01 +new file mode 100644 +index 000000000..bf7df1543 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/Makefile @@ -0,0 +1,18 @@ @@ -698731,8 +698757,8 @@ index 000000000000..bf7df1543b01 +obj-y += focaltech_test/ + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_common.h b/drivers/input/touchscreen/focaltech_touch/focaltech_common.h -new file mode 100755 -index 000000000000..7e911d1ac36f +new file mode 100644 +index 000000000..7e911d1ac --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_common.h @@ -0,0 +1,159 @@ @@ -698896,8 +698922,8 @@ index 000000000000..7e911d1ac36f + +#endif /* __LINUX_FOCALTECH_COMMON_H__ */ diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_config.h b/drivers/input/touchscreen/focaltech_touch/focaltech_config.h -new file mode 100755 -index 000000000000..18cf1eafaa9a +new file mode 100644 +index 000000000..18cf1eafa --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_config.h @@ -0,0 +1,244 @@ @@ -699146,8 +699172,8 @@ index 000000000000..18cf1eafaa9a + +#endif /* _LINUX_FOCLATECH_CONFIG_H_ */ diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_core.c b/drivers/input/touchscreen/focaltech_touch/focaltech_core.c -new file mode 100755 -index 000000000000..c8318c0ce8c0 +new file mode 100644 +index 000000000..c8318c0ce --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_core.c @@ -0,0 +1,1783 @@ @@ -700935,8 +700961,8 @@ index 000000000000..c8318c0ce8c0 +MODULE_DESCRIPTION("FocalTech Touchscreen Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_core.h b/drivers/input/touchscreen/focaltech_touch/focaltech_core.h -new file mode 100755 -index 000000000000..6547719b94a9 +new file mode 100644 +index 000000000..6547719b9 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_core.h @@ -0,0 +1,254 @@ @@ -701195,8 +701221,8 @@ index 000000000000..6547719b94a9 + +#endif /* __LINUX_FOCALTECH_CORE_H__ */ diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_esdcheck.c b/drivers/input/touchscreen/focaltech_touch/focaltech_esdcheck.c -new file mode 100755 -index 000000000000..cb8e6ec18bcf +new file mode 100644 +index 000000000..cb8e6ec18 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_esdcheck.c @@ -0,0 +1,552 @@ @@ -701753,8 +701779,8 @@ index 000000000000..cb8e6ec18bcf +#endif /* FTS_ESDCHECK_EN */ + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_ex_fun.c b/drivers/input/touchscreen/focaltech_touch/focaltech_ex_fun.c -new file mode 100755 -index 000000000000..06511c515869 +new file mode 100644 +index 000000000..06511c515 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_ex_fun.c @@ -0,0 +1,1130 @@ @@ -702889,8 +702915,8 @@ index 000000000000..06511c515869 +} +#endif diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_ex_mode.c b/drivers/input/touchscreen/focaltech_touch/focaltech_ex_mode.c -new file mode 100755 -index 000000000000..bca972ebb040 +new file mode 100644 +index 000000000..bca972ebb --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_ex_mode.c @@ -0,0 +1,382 @@ @@ -703277,8 +703303,8 @@ index 000000000000..bca972ebb040 +} + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_flash.c b/drivers/input/touchscreen/focaltech_touch/focaltech_flash.c -new file mode 100755 -index 000000000000..43672a78ddac +new file mode 100644 +index 000000000..43672a78d --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_flash.c @@ -0,0 +1,1971 @@ @@ -705254,8 +705280,8 @@ index 000000000000..43672a78ddac + +#endif /* #if FTS_AUTO_UPGRADE_EN */ diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_flash.h b/drivers/input/touchscreen/focaltech_touch/focaltech_flash.h -new file mode 100755 -index 000000000000..d11f42ca8e1e +new file mode 100644 +index 000000000..d11f42ca8 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_flash.h @@ -0,0 +1,182 @@ @@ -705442,8 +705468,8 @@ index 000000000000..d11f42ca8e1e +u16 fts_crc16_calc_host(u8 *pbuf, u16 length); +#endif diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_flash/Makefile b/drivers/input/touchscreen/focaltech_touch/focaltech_flash/Makefile -new file mode 100755 -index 000000000000..133dbcf8d701 +new file mode 100644 +index 000000000..133dbcf8d --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_flash/Makefile @@ -0,0 +1,8 @@ @@ -705457,8 +705483,8 @@ index 000000000000..133dbcf8d701 +obj-y += focaltech_upgrade_ft8201.o \ No newline at end of file diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_flash/focaltech_upgrade_ft8201.c b/drivers/input/touchscreen/focaltech_touch/focaltech_flash/focaltech_upgrade_ft8201.c -new file mode 100755 -index 000000000000..e32de88b2435 +new file mode 100644 +index 000000000..e32de88b2 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_flash/focaltech_upgrade_ft8201.c @@ -0,0 +1,1033 @@ @@ -706496,8 +706522,8 @@ index 000000000000..e32de88b2435 + .force_upgrade = fts_ft8006m_force_upgrade, +}; diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_gesture.c b/drivers/input/touchscreen/focaltech_touch/focaltech_gesture.c -new file mode 100755 -index 000000000000..0874729e5d59 +new file mode 100644 +index 000000000..0874729e5 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_gesture.c @@ -0,0 +1,597 @@ @@ -707099,8 +707125,8 @@ index 000000000000..0874729e5d59 +} +#endif diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_i2c.c b/drivers/input/touchscreen/focaltech_touch/focaltech_i2c.c -new file mode 100755 -index 000000000000..5e8294145b28 +new file mode 100644 +index 000000000..5e8294145 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_i2c.c @@ -0,0 +1,240 @@ @@ -707345,8 +707371,8 @@ index 000000000000..5e8294145b28 +} + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_point_report_check.c b/drivers/input/touchscreen/focaltech_touch/focaltech_point_report_check.c -new file mode 100755 -index 000000000000..7157f444080d +new file mode 100644 +index 000000000..7157f4440 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_point_report_check.c @@ -0,0 +1,135 @@ @@ -707486,8 +707512,8 @@ index 000000000000..7157f444080d +#endif /* FTS_POINT_REPORT_CHECK_EN */ + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/Makefile b/drivers/input/touchscreen/focaltech_touch/focaltech_test/Makefile -new file mode 100755 -index 000000000000..2a2945ec021a +new file mode 100644 +index 000000000..2a2945ec0 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/Makefile @@ -0,0 +1,11 @@ @@ -707503,8 +707529,8 @@ index 000000000000..2a2945ec021a +obj-y += supported_ic/ + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.c b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.c -new file mode 100755 -index 000000000000..991bbba87c70 +new file mode 100644 +index 000000000..991bbba87 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.c @@ -0,0 +1,1948 @@ @@ -709457,8 +709483,8 @@ index 000000000000..991bbba87c70 + return 0; +} diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.h b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.h -new file mode 100755 -index 000000000000..bf36233363a1 +new file mode 100644 +index 000000000..bf3623336 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.h @@ -0,0 +1,589 @@ @@ -710052,8 +710078,8 @@ index 000000000000..bf36233363a1 +} while (0) +#endif diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.c b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.c -new file mode 100755 -index 000000000000..a6ea11fd6025 +new file mode 100644 +index 000000000..a6ea11fd6 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.c @@ -0,0 +1,1220 @@ @@ -711278,8 +711304,8 @@ index 000000000000..a6ea11fd6025 + return ret; +} diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.h b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.h -new file mode 100755 -index 000000000000..a6c8d50c11d2 +new file mode 100644 +index 000000000..a6c8d50c1 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.h @@ -0,0 +1,144 @@ @@ -711428,8 +711454,8 @@ index 000000000000..a6c8d50c11d2 + get_keyword_value("TestItem", name, value) +#endif /* _INI_H */ diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/Makefile b/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/Makefile -new file mode 100755 -index 000000000000..2e3a5e524418 +new file mode 100644 +index 000000000..2e3a5e524 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/Makefile @@ -0,0 +1,6 @@ @@ -711440,8 +711466,8 @@ index 000000000000..2e3a5e524418 +# Linux driver folder +obj-y += focaltech_test_ft8201.o diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/focaltech_test_ft8201.c b/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/focaltech_test_ft8201.c -new file mode 100755 -index 000000000000..a5d666724e55 +new file mode 100644 +index 000000000..a5d666724 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/focaltech_test_ft8201.c @@ -0,0 +1,1034 @@ @@ -712479,12 +712505,9 @@ index 000000000000..a5d666724e55 + .start_test = start_test_ft8201, +}; + -diff --git a/drivers/input/touchscreen/focaltech_touch/include/firmware/fw_sample.h b/drivers/input/touchscreen/focaltech_touch/include/firmware/fw_sample.h -new file mode 100755 -index 000000000000..e69de29bb2d1 diff --git a/drivers/input/touchscreen/focaltech_touch/include/pramboot/FT8006M_Pramboot_V1.6_20180426_le.h b/drivers/input/touchscreen/focaltech_touch/include/pramboot/FT8006M_Pramboot_V1.6_20180426_le.h -new file mode 100755 -index 000000000000..0db3f051175a +new file mode 100644 +index 000000000..0db3f0511 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/include/pramboot/FT8006M_Pramboot_V1.6_20180426_le.h @@ -0,0 +1,299 @@ @@ -712789,8 +712812,8 @@ index 000000000000..0db3f051175a +0x00,0x04,0x00,0x80,0x00,0x02,0x00,0x80, \ No newline at end of file diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/Makefile b/drivers/input/touchscreen/focaltech_touch_ft5436/Makefile -new file mode 100755 -index 000000000000..df8d3e5ef10a +new file mode 100644 +index 000000000..df8d3e5ef --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/Makefile @@ -0,0 +1,16 @@ @@ -712811,8 +712834,8 @@ index 000000000000..df8d3e5ef10a +obj-y += focaltech_flash.o +obj-y += focaltech_flash/ diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_common.h b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_common.h -new file mode 100755 -index 000000000000..1d7ac55572fe +new file mode 100644 +index 000000000..1d7ac5557 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_common.h @@ -0,0 +1,166 @@ @@ -712983,8 +713006,8 @@ index 000000000000..1d7ac55572fe +} while (0) +#endif /* __LINUX_FOCALTECH_COMMON_H__ */ diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_config.h b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_config.h -new file mode 100755 -index 000000000000..d30ca81df9a9 +new file mode 100644 +index 000000000..d30ca81df --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_config.h @@ -0,0 +1,241 @@ @@ -713230,8 +713253,8 @@ index 000000000000..d30ca81df9a9 + +#endif /* _LINUX_FOCLATECH_CONFIG_H_ */ diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.c -new file mode 100755 -index 000000000000..932b2f866274 +new file mode 100644 +index 000000000..932b2f866 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.c @@ -0,0 +1,1747 @@ @@ -714983,8 +715006,8 @@ index 000000000000..932b2f866274 +MODULE_DESCRIPTION("FocalTech Touchscreen Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.h b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.h -new file mode 100755 -index 000000000000..66e98371bf1c +new file mode 100644 +index 000000000..66e98371b --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.h @@ -0,0 +1,263 @@ @@ -715252,8 +715275,8 @@ index 000000000000..66e98371bf1c +void fts_irq_enable(void); +#endif /* __LINUX_FOCALTECH_CORE_H__ */ diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_esdcheck.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_esdcheck.c -new file mode 100755 -index 000000000000..b34bb26e8529 +new file mode 100644 +index 000000000..b34bb26e8 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_esdcheck.c @@ -0,0 +1,464 @@ @@ -715722,8 +715745,8 @@ index 000000000000..b34bb26e8529 +#endif /* FTS_ESDCHECK_EN */ + diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_fun.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_fun.c -new file mode 100755 -index 000000000000..b012c093b4d5 +new file mode 100644 +index 000000000..b012c093b --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_fun.c @@ -0,0 +1,1181 @@ @@ -716909,8 +716932,8 @@ index 000000000000..b012c093b4d5 + return 0; +} diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_mode.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_mode.c -new file mode 100755 -index 000000000000..c0c970b12e48 +new file mode 100644 +index 000000000..c0c970b12 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_mode.c @@ -0,0 +1,307 @@ @@ -717222,8 +717245,8 @@ index 000000000000..c0c970b12e48 + return 0; +} diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.c -new file mode 100755 -index 000000000000..83bf8f4a6039 +new file mode 100644 +index 000000000..83bf8f4a6 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.c @@ -0,0 +1,2011 @@ @@ -719239,8 +719262,8 @@ index 000000000000..83bf8f4a6039 + return 0; +} diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.h b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.h -new file mode 100755 -index 000000000000..cfebe2d12489 +new file mode 100644 +index 000000000..cfebe2d12 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.h @@ -0,0 +1,205 @@ @@ -719450,8 +719473,8 @@ index 000000000000..cfebe2d12489 +int fts_fwupg_upgrade(struct fts_upgrade *upg); +#endif diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/Makefile b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/Makefile -new file mode 100755 -index 000000000000..17c9595ca5c9 +new file mode 100644 +index 000000000..17c9595ca --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/Makefile @@ -0,0 +1,7 @@ @@ -719463,8 +719486,8 @@ index 000000000000..17c9595ca5c9 +obj-y += focaltech_upgrade_ft5436.o + diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/focaltech_upgrade_ft5436.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/focaltech_upgrade_ft5436.c -new file mode 100755 -index 000000000000..7ed7315f0d93 +new file mode 100644 +index 000000000..7ed7315f0 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/focaltech_upgrade_ft5436.c @@ -0,0 +1,154 @@ @@ -719623,8 +719646,8 @@ index 000000000000..7ed7315f0d93 + .upgrade = fts_ft5422_upgrade, +}; diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_gesture.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_gesture.c -new file mode 100755 -index 000000000000..b65cf39451d2 +new file mode 100644 +index 000000000..b65cf3945 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_gesture.c @@ -0,0 +1,460 @@ @@ -720089,8 +720112,8 @@ index 000000000000..b65cf39451d2 + return 0; +} diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_i2c.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_i2c.c -new file mode 100755 -index 000000000000..f2e335c3db4f +new file mode 100644 +index 000000000..f2e335c3d --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_i2c.c @@ -0,0 +1,193 @@ @@ -720289,8 +720312,8 @@ index 000000000000..f2e335c3db4f +} \ No newline at end of file diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_point_report_check.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_point_report_check.c -new file mode 100755 -index 000000000000..1296af1551db +new file mode 100644 +index 000000000..1296af155 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_point_report_check.c @@ -0,0 +1,135 @@ @@ -720430,8 +720453,8 @@ index 000000000000..1296af1551db +#endif /* FTS_POINT_REPORT_CHECK_EN */ + diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/include/firmware/fw_sample.h b/drivers/input/touchscreen/focaltech_touch_ft5436/include/firmware/fw_sample.h -new file mode 100755 -index 000000000000..60120df3213d +new file mode 100644 +index 000000000..60120df32 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/include/firmware/fw_sample.h @@ -0,0 +1,3223 @@ @@ -723660,8 +723683,8 @@ index 000000000000..60120df3213d +0xe4,0x93,0x7c,0xab,0x22,0xff,0xc9,0x66,0x36,0x99,0x9e,0x61,0x15,0x79, \ No newline at end of file diff --git a/drivers/input/touchscreen/gsl3673.c b/drivers/input/touchscreen/gsl3673.c -new file mode 100755 -index 000000000000..2191bb6af26b +new file mode 100644 +index 000000000..2191bb6af --- /dev/null +++ b/drivers/input/touchscreen/gsl3673.c @@ -0,0 +1,1302 @@ @@ -724968,8 +724991,8 @@ index 000000000000..2191bb6af26b +MODULE_AUTHOR("Guan Yuwei, guanyuwei@basewin.com"); +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gsl3673.h b/drivers/input/touchscreen/gsl3673.h -new file mode 100755 -index 000000000000..5d8d8ef02bec +new file mode 100644 +index 000000000..5d8d8ef02 --- /dev/null +++ b/drivers/input/touchscreen/gsl3673.h @@ -0,0 +1,5091 @@ @@ -730065,8 +730088,8 @@ index 000000000000..5d8d8ef02bec + +#endif diff --git a/drivers/input/touchscreen/gsl3673_800x1280.c b/drivers/input/touchscreen/gsl3673_800x1280.c -new file mode 100755 -index 000000000000..191029084c22 +new file mode 100644 +index 000000000..191029084 --- /dev/null +++ b/drivers/input/touchscreen/gsl3673_800x1280.c @@ -0,0 +1,1247 @@ @@ -731318,8 +731341,8 @@ index 000000000000..191029084c22 +MODULE_AUTHOR("Guan Yuwei, guanyuwei@basewin.com"); +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gsl3673_800x1280.h b/drivers/input/touchscreen/gsl3673_800x1280.h -new file mode 100755 -index 000000000000..38fa03963eb1 +new file mode 100644 +index 000000000..38fa03963 --- /dev/null +++ b/drivers/input/touchscreen/gsl3673_800x1280.h @@ -0,0 +1,5187 @@ @@ -736511,8 +736534,8 @@ index 000000000000..38fa03963eb1 + +#endif diff --git a/drivers/input/touchscreen/gsl3676/Makefile b/drivers/input/touchscreen/gsl3676/Makefile -new file mode 100755 -index 000000000000..27c3264812e1 +new file mode 100644 +index 000000000..27c326481 --- /dev/null +++ b/drivers/input/touchscreen/gsl3676/Makefile @@ -0,0 +1,3 @@ @@ -736520,8 +736543,8 @@ index 000000000000..27c3264812e1 +obj-y += gsl3676.o + diff --git a/drivers/input/touchscreen/gsl3676/gsl3676.c b/drivers/input/touchscreen/gsl3676/gsl3676.c -new file mode 100755 -index 000000000000..4b1baca365fd +new file mode 100644 +index 000000000..4b1baca36 --- /dev/null +++ b/drivers/input/touchscreen/gsl3676/gsl3676.c @@ -0,0 +1,1261 @@ @@ -737787,8 +737810,8 @@ index 000000000000..4b1baca365fd +MODULE_AUTHOR("Guan Yuwei, guanyuwei@basewin.com"); +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gsl3676/rk3368_th863c_10.h b/drivers/input/touchscreen/gsl3676/rk3368_th863c_10.h -new file mode 100755 -index 000000000000..617860f76401 +new file mode 100644 +index 000000000..617860f76 --- /dev/null +++ b/drivers/input/touchscreen/gsl3676/rk3368_th863c_10.h @@ -0,0 +1,5331 @@ @@ -743124,8 +743147,8 @@ index 000000000000..617860f76401 + +#endif diff --git a/drivers/input/touchscreen/gsl_point_id.c b/drivers/input/touchscreen/gsl_point_id.c -new file mode 100755 -index 000000000000..624502b6bacc +new file mode 100644 +index 000000000..624502b6b --- /dev/null +++ b/drivers/input/touchscreen/gsl_point_id.c @@ -0,0 +1,3100 @@ @@ -746230,8 +746253,8 @@ index 000000000000..624502b6bacc + return STATUS_SUCCESS; +}*/ diff --git a/drivers/input/touchscreen/gslx680.c b/drivers/input/touchscreen/gslx680.c -new file mode 100755 -index 000000000000..ab970845c64f +new file mode 100644 +index 000000000..ab970845c --- /dev/null +++ b/drivers/input/touchscreen/gslx680.c @@ -0,0 +1,1905 @@ @@ -748141,8 +748164,8 @@ index 000000000000..ab970845c64f +MODULE_AUTHOR("Guan Yuwei, guanyuwei@basewin.com"); +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gslx680.h b/drivers/input/touchscreen/gslx680.h -new file mode 100755 -index 000000000000..2a76ec410c81 +new file mode 100644 +index 000000000..2a76ec410 --- /dev/null +++ b/drivers/input/touchscreen/gslx680.h @@ -0,0 +1,10368 @@ @@ -758515,8 +758538,8 @@ index 000000000000..2a76ec410c81 + +#endif diff --git a/drivers/input/touchscreen/gslx6801.c b/drivers/input/touchscreen/gslx6801.c -new file mode 100755 -index 000000000000..3c1e1655c0a8 +new file mode 100644 +index 000000000..3c1e1655c --- /dev/null +++ b/drivers/input/touchscreen/gslx6801.c @@ -0,0 +1,1680 @@ @@ -760201,8 +760224,8 @@ index 000000000000..3c1e1655c0a8 +MODULE_AUTHOR("Guan Yuwei, guanyuwei@basewin.com"); +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gslx6801.h b/drivers/input/touchscreen/gslx6801.h -new file mode 100755 -index 000000000000..45bb3469d2ea +new file mode 100644 +index 000000000..45bb3469d --- /dev/null +++ b/drivers/input/touchscreen/gslx6801.h @@ -0,0 +1,4955 @@ @@ -765162,8 +765185,8 @@ index 000000000000..45bb3469d2ea +}; +#endif diff --git a/drivers/input/touchscreen/gslx680_d708/Makefile b/drivers/input/touchscreen/gslx680_d708/Makefile -new file mode 100755 -index 000000000000..86d995c5e6c5 +new file mode 100644 +index 000000000..86d995c5e --- /dev/null +++ b/drivers/input/touchscreen/gslx680_d708/Makefile @@ -0,0 +1,9 @@ @@ -765177,8 +765200,8 @@ index 000000000000..86d995c5e6c5 +obj-y += rockchip_gslX680.o + diff --git a/drivers/input/touchscreen/gslx680_d708/rockchip_gsl3670.h b/drivers/input/touchscreen/gslx680_d708/rockchip_gsl3670.h -new file mode 100755 -index 000000000000..89b74fe3e23c +new file mode 100644 +index 000000000..89b74fe3e --- /dev/null +++ b/drivers/input/touchscreen/gslx680_d708/rockchip_gsl3670.h @@ -0,0 +1,5047 @@ @@ -770230,8 +770253,8 @@ index 000000000000..89b74fe3e23c + +#endif diff --git a/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680.c b/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680.c -new file mode 100755 -index 000000000000..f75586e2d37a +new file mode 100644 +index 000000000..f75586e2d --- /dev/null +++ b/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680.c @@ -0,0 +1,1393 @@ @@ -771629,8 +771652,8 @@ index 000000000000..f75586e2d37a +MODULE_AUTHOR("Guan Yuwei, guanyuwei@basewin.com"); +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680_88v.h b/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680_88v.h -new file mode 100755 -index 000000000000..f58ba4a8a72b +new file mode 100644 +index 000000000..f58ba4a8a --- /dev/null +++ b/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680_88v.h @@ -0,0 +1,5248 @@ @@ -776883,8 +776906,8 @@ index 000000000000..f58ba4a8a72b + + diff --git a/drivers/input/touchscreen/gslx680_firefly.c b/drivers/input/touchscreen/gslx680_firefly.c -new file mode 100755 -index 000000000000..0786b5ecb311 +new file mode 100644 +index 000000000..0786b5ecb --- /dev/null +++ b/drivers/input/touchscreen/gslx680_firefly.c @@ -0,0 +1,1130 @@ @@ -778019,8 +778042,8 @@ index 000000000000..0786b5ecb311 +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("GSLX680 touchscreen controller driver"); diff --git a/drivers/input/touchscreen/gslx680_firefly.h b/drivers/input/touchscreen/gslx680_firefly.h -new file mode 100755 -index 000000000000..8f40c59d7d2d +new file mode 100644 +index 000000000..8f40c59d7 --- /dev/null +++ b/drivers/input/touchscreen/gslx680_firefly.h @@ -0,0 +1,5120 @@ @@ -783145,8 +783168,8 @@ index 000000000000..8f40c59d7d2d + +#endif diff --git a/drivers/input/touchscreen/gslx680_pad.c b/drivers/input/touchscreen/gslx680_pad.c -new file mode 100755 -index 000000000000..d61a5ec76e94 +new file mode 100644 +index 000000000..d61a5ec76 --- /dev/null +++ b/drivers/input/touchscreen/gslx680_pad.c @@ -0,0 +1,1198 @@ @@ -784349,8 +784372,8 @@ index 000000000000..d61a5ec76e94 +MODULE_AUTHOR("Guan Yuwei, guanyuwei@basewin.com"); +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gslx680_pad.h b/drivers/input/touchscreen/gslx680_pad.h -new file mode 100755 -index 000000000000..aab1786f221a +new file mode 100644 +index 000000000..aab1786f2 --- /dev/null +++ b/drivers/input/touchscreen/gslx680_pad.h @@ -0,0 +1,10232 @@ @@ -794587,8 +794610,8 @@ index 000000000000..aab1786f221a + +#endif diff --git a/drivers/input/touchscreen/gslx680a.c b/drivers/input/touchscreen/gslx680a.c -new file mode 100755 -index 000000000000..380a0fd93fa0 +new file mode 100644 +index 000000000..380a0fd93 --- /dev/null +++ b/drivers/input/touchscreen/gslx680a.c @@ -0,0 +1,1320 @@ @@ -795913,15 +795936,15 @@ index 000000000000..380a0fd93fa0 +MODULE_AUTHOR("Guan Yuwei, guanyuwei@basewin.com"); +MODULE_ALIAS("platform:gsl_ts"); diff --git a/drivers/input/touchscreen/gt1x/GT5688_Config_20170713_1080_1920.cfg b/drivers/input/touchscreen/gt1x/GT5688_Config_20170713_1080_1920.cfg -new file mode 100755 -index 000000000000..2f65c7ee0482 +new file mode 100644 +index 000000000..2f65c7ee0 --- /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 000000000000..2b3fa3680e98 +new file mode 100644 +index 000000000..2b3fa3680 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/Makefile @@ -0,0 +1,8 @@ @@ -795934,8 +795957,8 @@ index 000000000000..2b3fa3680e98 +gt1x-ts-y += gt1x_update.o + diff --git a/drivers/input/touchscreen/gt1x/gt1x.c b/drivers/input/touchscreen/gt1x/gt1x.c -new file mode 100755 -index 000000000000..f65ca3b916e4 +new file mode 100644 +index 000000000..f65ca3b91 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x.c @@ -0,0 +1,809 @@ @@ -796749,8 +796772,8 @@ index 000000000000..f65ca3b916e4 +MODULE_DESCRIPTION("GTP Series Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/touchscreen/gt1x/gt1x.h b/drivers/input/touchscreen/gt1x/gt1x.h -new file mode 100755 -index 000000000000..b9339f10b0ad +new file mode 100644 +index 000000000..b9339f10b --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x.h @@ -0,0 +1,64 @@ @@ -796819,8 +796842,8 @@ index 000000000000..b9339f10b0ad + +#endif /* _GOODIX_GT1X_H_ */ diff --git a/drivers/input/touchscreen/gt1x/gt1x_cfg.h b/drivers/input/touchscreen/gt1x/gt1x_cfg.h -new file mode 100755 -index 000000000000..6581aebfeda7 +new file mode 100644 +index 000000000..6581aebfe --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_cfg.h @@ -0,0 +1,27 @@ @@ -796852,8 +796875,8 @@ index 000000000000..6581aebfeda7 + +#endif /* _GOODIX_GT1X_CFG_H_ */ diff --git a/drivers/input/touchscreen/gt1x/gt1x_extents.c b/drivers/input/touchscreen/gt1x/gt1x_extents.c -new file mode 100755 -index 000000000000..ed087d8f0031 +new file mode 100644 +index 000000000..ed087d8f0 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_extents.c @@ -0,0 +1,928 @@ @@ -797786,8 +797809,8 @@ index 000000000000..ed087d8f0031 +#endif +} diff --git a/drivers/input/touchscreen/gt1x/gt1x_firmware.h b/drivers/input/touchscreen/gt1x/gt1x_firmware.h -new file mode 100755 -index 000000000000..7588633397f5 +new file mode 100644 +index 000000000..758863339 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_firmware.h @@ -0,0 +1,548 @@ @@ -798340,8 +798363,8 @@ index 000000000000..7588633397f5 +#endif +#endif diff --git a/drivers/input/touchscreen/gt1x/gt1x_generic.c b/drivers/input/touchscreen/gt1x/gt1x_generic.c -new file mode 100755 -index 000000000000..48b29ab50bcd +new file mode 100644 +index 000000000..48b29ab50 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_generic.c @@ -0,0 +1,2445 @@ @@ -800791,8 +800814,8 @@ index 000000000000..48b29ab50bcd +} + diff --git a/drivers/input/touchscreen/gt1x/gt1x_generic.h b/drivers/input/touchscreen/gt1x/gt1x_generic.h -new file mode 100755 -index 000000000000..7acc390d47ef +new file mode 100644 +index 000000000..7acc390d4 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_generic.h @@ -0,0 +1,595 @@ @@ -801392,8 +801415,8 @@ index 000000000000..7acc390d47ef +#endif + diff --git a/drivers/input/touchscreen/gt1x/gt1x_tools.c b/drivers/input/touchscreen/gt1x/gt1x_tools.c -new file mode 100755 -index 000000000000..1d824bdafd8a +new file mode 100644 +index 000000000..1d824bdaf --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_tools.c @@ -0,0 +1,433 @@ @@ -801831,8 +801854,8 @@ index 000000000000..1d824bdafd8a + return cmd_head.data_len; +} diff --git a/drivers/input/touchscreen/gt1x/gt1x_update.c b/drivers/input/touchscreen/gt1x/gt1x_update.c -new file mode 100755 -index 000000000000..0979bb32d52f +new file mode 100644 +index 000000000..0979bb32d --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_update.c @@ -0,0 +1,1456 @@ @@ -803293,8 +803316,8 @@ index 000000000000..0979bb32d52f + return ret; +} diff --git a/drivers/input/touchscreen/gt9xx/GT9110P(2020)V71_Config_20201028_170326.cfg b/drivers/input/touchscreen/gt9xx/GT9110P(2020)V71_Config_20201028_170326.cfg -new file mode 100755 -index 000000000000..62a3d0e496c6 +new file mode 100644 +index 000000000..62a3d0e49 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/GT9110P(2020)V71_Config_20201028_170326.cfg @@ -0,0 +1,19 @@ @@ -803319,32 +803342,32 @@ index 000000000000..62a3d0e496c6 +0x03,0x02,0x01,0x00,0x53,0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/GT9110P_Config_20160217_1526_2048_97.cfg b/drivers/input/touchscreen/gt9xx/GT9110P_Config_20160217_1526_2048_97.cfg -new file mode 100755 -index 000000000000..952ea845390e +new file mode 100644 +index 000000000..952ea8453 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/GT9110P_Config_20160217_1526_2048_97.cfg @@ -0,0 +1 @@ +0x00,0x00,0x06,0x00,0x08,0x0A,0x35,0x00,0x01,0xC8,0x28,0x08,0x5A,0x3C,0x03,0x05,0x00,0x00,0xFF,0x7F,0x00,0x00,0x04,0x18,0x1A,0x1E,0x14,0x8F,0x2F,0xAA,0x2A,0x2C,0x1E,0x14,0x00,0x00,0x00,0x21,0x33,0x2D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x29,0x19,0x32,0x94,0xC5,0x02,0x08,0x00,0x00,0x04,0x99,0x1A,0x00,0x90,0x1E,0x00,0x87,0x23,0x00,0x81,0x28,0x00,0x7D,0x2E,0x00,0x7D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x0F,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x19,0x46,0x32,0x0F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x13,0x12,0x11,0x10,0x0F,0x0E,0x0D,0x0C,0x0B,0x0A,0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x26,0x25,0x24,0x23,0x22,0x21,0x20,0x1F,0x1E,0x1D,0x19,0x18,0x17,0x16,0x15,0x12,0x11,0x10,0x0F,0x0E,0x09,0x08,0x07,0x00,0x01,0x02,0x03,0x04,0x05,0x06,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x10,0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/GT9271_Config_20170526.cfg b/drivers/input/touchscreen/gt9xx/GT9271_Config_20170526.cfg -new file mode 100755 -index 000000000000..a7ac38fe331e +new file mode 100644 +index 000000000..a7ac38fe3 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/GT9271_Config_20170526.cfg @@ -0,0 +1 @@ +0x00,0x80,0x07,0xB0,0x04,0x0A,0x3C,0x00,0x01,0x0A,0x28,0x1F,0x55,0x32,0x03,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x1A,0x1E,0x14,0x90,0x2F,0xAA,0x1E,0x20,0x31,0x0D,0x00,0x00,0x00,0x22,0x03,0x1D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x14,0x2D,0x94,0xD5,0x02,0x08,0x00,0x00,0x04,0x9A,0x15,0x00,0x8C,0x19,0x00,0x80,0x1E,0x00,0x77,0x23,0x00,0x70,0x29,0x00,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x04,0x05,0x06,0x07,0x08,0x09,0x0C,0x0D,0x0E,0x0F,0x10,0x11,0x14,0x15,0x16,0x17,0x18,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x29,0x28,0x27,0x26,0x25,0x24,0x23,0x22,0x21,0x20,0x1F,0x1E,0x1C,0x1B,0x19,0x14,0x13,0x12,0x11,0x10,0x0F,0x0E,0x0D,0x0C,0x0A,0x08,0x07,0x06,0x04,0x02,0x00,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x12,0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/HLS-0102-1398V1-1060-GT911_Config_20201204_V66.cfg b/drivers/input/touchscreen/gt9xx/HLS-0102-1398V1-1060-GT911_Config_20201204_V66.cfg -new file mode 100755 -index 000000000000..77b72c416bea +new file mode 100644 +index 000000000..77b72c416 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/HLS-0102-1398V1-1060-GT911_Config_20201204_V66.cfg @@ -0,0 +1 @@ +0x42,0x00,0x03,0x00,0x04,0x0A,0x45,0x03,0x22,0x1F,0x28,0x0F,0x64,0x3C,0x03,0x0F,0x00,0x00,0x00,0x00,0x11,0x00,0x08,0x00,0x00,0x00,0x00,0x8B,0x29,0x0E,0x71,0x6F,0xB2,0x04,0x00,0x00,0x00,0x39,0x02,0x10,0x00,0x21,0x00,0x00,0x00,0x03,0x64,0x32,0x00,0x00,0x00,0x3C,0x78,0x94,0xD5,0x02,0x07,0x00,0x00,0x04,0xC8,0x40,0x00,0xB1,0x4A,0x00,0x9E,0x55,0x00,0x8E,0x61,0x00,0x7F,0x70,0x00,0x7F,0x70,0x00,0x00,0x00,0xF0,0x90,0x3C,0xFF,0xFF,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x1A,0x18,0x16,0x14,0x12,0x10,0x0E,0x0C,0x0A,0x08,0x06,0x04,0x02,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00,0x02,0x04,0x06,0x08,0x0A,0x0C,0x0F,0x10,0x12,0x13,0x16,0x18,0x1C,0x1D,0x1E,0x1F,0x20,0x21,0x22,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF6,0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/Makefile b/drivers/input/touchscreen/gt9xx/Makefile -new file mode 100755 -index 000000000000..f63b5f2783a5 +new file mode 100644 +index 000000000..f63b5f278 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/Makefile @@ -0,0 +1,6 @@ @@ -803355,56 +803378,56 @@ index 000000000000..f63b5f2783a5 +goodix_gt9xx-y +=gt9xx.o +goodix_gt9xx-y +=gt9xx_update.o diff --git a/drivers/input/touchscreen/gt9xx/WGJ10162B_GT9271_1060_Config_20140821_1341110X42.cfg b/drivers/input/touchscreen/gt9xx/WGJ10162B_GT9271_1060_Config_20140821_1341110X42.cfg -new file mode 100755 -index 000000000000..db5ed0f34b82 +new file mode 100644 +index 000000000..db5ed0f34 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ10162B_GT9271_1060_Config_20140821_1341110X42.cfg @@ -0,0 +1 @@ +0x42,0x80,0x07,0xB0,0x04,0x0A,0x35,0x00,0x02,0x0F,0x28,0x0F,0x5A,0x3C,0x03,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x17,0x19,0x1D,0x14,0x8F,0x2F,0xAA,0x37,0x39,0xD9,0x0B,0x00,0x00,0x00,0x83,0x02,0x1D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2A,0x46,0x94,0xC5,0x02,0x07,0x00,0x00,0x04,0x95,0x2C,0x00,0x8A,0x31,0x00,0x81,0x36,0x00,0x79,0x3C,0x00,0x72,0x42,0x00,0x72,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x19,0x18,0x17,0x16,0x15,0x14,0x11,0x10,0x0F,0x0E,0x0D,0x0C,0x09,0x08,0x07,0x06,0x05,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x06,0x07,0x08,0x0A,0x0C,0x0D,0x0F,0x10,0x11,0x12,0x13,0x14,0x19,0x1B,0x1C,0x1E,0x1F,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x16,0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/WGJ10162_GT9271_Config_20140820_182456.cfg b/drivers/input/touchscreen/gt9xx/WGJ10162_GT9271_Config_20140820_182456.cfg -new file mode 100755 -index 000000000000..96bf8cb7961c +new file mode 100644 +index 000000000..96bf8cb79 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ10162_GT9271_Config_20140820_182456.cfg @@ -0,0 +1 @@ +0x41,0x80,0x07,0xB0,0x04,0x0A,0x31,0x00,0x01,0x08,0x28,0x0F,0x50,0x32,0x03,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x8F,0x2F,0xAA,0x37,0x39,0xD3,0x07,0x00,0x00,0x00,0x02,0x02,0x1D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x23,0x4B,0x94,0x45,0x02,0x07,0x00,0x00,0x00,0xB5,0x25,0x00,0x9B,0x2C,0x00,0x88,0x33,0x00,0x78,0x3B,0x00,0x6A,0x45,0x00,0x6A,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x19,0x18,0x17,0x16,0x15,0x14,0x11,0x10,0x0F,0x0E,0x0D,0x0C,0x09,0x08,0x07,0x06,0x05,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x06,0x07,0x08,0x0A,0x0C,0x0D,0x0F,0x10,0x11,0x12,0x13,0x14,0x19,0x1B,0x1C,0x1E,0x1F,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x8F,0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/WGJ10187_GT910_Config_20140623_104014_0X41.cfg b/drivers/input/touchscreen/gt9xx/WGJ10187_GT910_Config_20140623_104014_0X41.cfg -new file mode 100755 -index 000000000000..ffc4679bf2d9 +new file mode 100644 +index 000000000..ffc4679bf --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ10187_GT910_Config_20140623_104014_0X41.cfg @@ -0,0 +1 @@ +0x00, 0x00, 0x04, 0x58, 0x02, 0x05, 0x34, 0x20, 0x01, 0x1F, 0x14, 0x0F, 0x5A, 0x46, 0x03, 0x05, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x17, 0x19, 0x1B, 0x14, 0x89, 0x08, 0x0A, 0x3A, 0x00, 0x0F, 0x0A, 0x00, 0x00, 0x00, 0x1B, 0x02, 0x25, 0x3C, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x4E, 0x94, 0xC5, 0x02, 0x08, 0x00, 0x00, 0x04, 0x92, 0x2C, 0x00, 0x88, 0x32, 0x00, 0x80, 0x39, 0x00, 0x7B, 0x40, 0x00, 0x76, 0x49, 0x00, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0A, 0x0C, 0x0E, 0x10, 0x12, 0x14, 0x16, 0x18, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x28, 0x24, 0x22, 0x20, 0x1F, 0x1E, 0x1D, 0x0E, 0x0C, 0x0A, 0x08, 0x06, 0x05, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/WGJ10187_GT9271_Config_20140623_104014_0X41.cfg b/drivers/input/touchscreen/gt9xx/WGJ10187_GT9271_Config_20140623_104014_0X41.cfg -new file mode 100755 -index 000000000000..ffbfe3d547da +new file mode 100644 +index 000000000..ffbfe3d54 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ10187_GT9271_Config_20140623_104014_0X41.cfg @@ -0,0 +1 @@ +0x41,0xB0,0x04,0x80,0x07,0x0A,0xF5,0x00,0x01,0x08,0x28,0x0F,0x64,0x32,0x03,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x16,0x19,0x1E,0x14,0x8F,0x2F,0x99,0x41,0x43,0x15,0x0E,0x00,0x00,0x00,0x22,0x03,0x1D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x2D,0x62,0x94,0xC5,0x02,0x07,0x17,0x00,0x04,0x92,0x30,0x00,0x86,0x39,0x00,0x7F,0x42,0x00,0x79,0x4D,0x00,0x74,0x5A,0x00,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x17,0x16,0x15,0x14,0x11,0x10,0x0F,0x0E,0x0D,0x0C,0x09,0x08,0x07,0x06,0x05,0x04,0x01,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x06,0x07,0x08,0x0A,0x0C,0x0D,0x0F,0x10,0x11,0x12,0x13,0x14,0x29,0x28,0x27,0x26,0x25,0x24,0x23,0x22,0x21,0x20,0x1F,0x1E,0x1C,0x1B,0x19,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/WGJ89006B_GT911_Config_20140625_085816_0X43.cfg b/drivers/input/touchscreen/gt9xx/WGJ89006B_GT911_Config_20140625_085816_0X43.cfg -new file mode 100755 -index 000000000000..1c42d9ef7ce1 +new file mode 100644 +index 000000000..1c42d9ef7 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ89006B_GT911_Config_20140625_085816_0X43.cfg @@ -0,0 +1 @@ +0x43,0x00,0x10,0x00,0x10,0x0A,0x3D,0x20,0x01,0x08,0x28,0x08,0x50,0x32,0x03,0x05,0x00,0x00,0x00,0x00,0x11,0x00,0x00,0x18,0x1A,0x20,0x14,0x8C,0x2E,0x0E,0x3C,0x3E,0x0C,0x08,0x00,0x00,0x00,0x41,0x03,0x1D,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x33,0x5A,0x94,0xC5,0x02,0x08,0x00,0x00,0x04,0xA0,0x36,0x00,0x8B,0x3C,0x00,0x7C,0x43,0x00,0x6B,0x4C,0x00,0x5F,0x55,0x00,0x5F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x06,0x08,0x0A,0x0C,0x0E,0x10,0x12,0x14,0x16,0x18,0x1A,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x06,0x08,0x0A,0x0C,0x0F,0x10,0x12,0x13,0x14,0x16,0x18,0x1C,0x1D,0x1E,0x1F,0x2A,0x29,0x28,0x26,0x24,0x22,0x21,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0A,0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/WGJ89006B_GT9271_Config_20140625_085816_0X41.cfg b/drivers/input/touchscreen/gt9xx/WGJ89006B_GT9271_Config_20140625_085816_0X41.cfg -new file mode 100755 -index 000000000000..7ed0266acfaa +new file mode 100644 +index 000000000..7ed0266ac --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ89006B_GT9271_Config_20140625_085816_0X41.cfg @@ -0,0 +1 @@ +0x41,0x80,0x07,0xB0,0x04,0x0A,0x05,0x00,0x01,0x08,0x28,0x0F,0x50,0x32,0x03,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x8F,0x2F,0x99,0x2B,0x2D,0x31,0x0D,0x00,0x00,0x00,0x01,0x03,0x1D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x23,0x55,0x94,0xC5,0x02,0x07,0x00,0x00,0x00,0x8C,0x26,0x00,0x7B,0x2D,0x00,0x6C,0x36,0x00,0x61,0x41,0x00,0x58,0x4E,0x00,0x58,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x04,0x05,0x06,0x07,0x08,0x09,0x0C,0x0D,0x0E,0x0F,0x10,0x11,0x14,0x15,0x16,0x17,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x14,0x13,0x12,0x11,0x10,0x0F,0x0D,0x0C,0x0A,0x08,0x07,0x06,0x04,0x02,0x00,0x19,0x1B,0x1C,0x1E,0x1F,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xB5,0x01 \ No newline at end of file diff --git a/drivers/input/touchscreen/gt9xx/goodix_tool.c b/drivers/input/touchscreen/gt9xx/goodix_tool.c -new file mode 100755 -index 000000000000..b2dffcb5e105 +new file mode 100644 +index 000000000..b2dffcb5e --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/goodix_tool.c @@ -0,0 +1,627 @@ @@ -804036,8 +804059,8 @@ index 000000000000..b2dffcb5e105 + return -EPERM; +} diff --git a/drivers/input/touchscreen/gt9xx/gt9xx.c b/drivers/input/touchscreen/gt9xx/gt9xx.c -new file mode 100755 -index 000000000000..cdc421cfd093 +new file mode 100644 +index 000000000..cdc421cfd --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx.c @@ -0,0 +1,3236 @@ @@ -807278,8 +807301,8 @@ index 000000000000..cdc421cfd093 +MODULE_DESCRIPTION("GTP Series Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/touchscreen/gt9xx/gt9xx.h b/drivers/input/touchscreen/gt9xx/gt9xx.h -new file mode 100755 -index 000000000000..acc288575691 +new file mode 100644 +index 000000000..acc288575 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx.h @@ -0,0 +1,397 @@ @@ -807681,8 +807704,8 @@ index 000000000000..acc288575691 + +#endif /* _GOODIX_GT9XX_H_ */ diff --git a/drivers/input/touchscreen/gt9xx/gt9xx_cfg.h b/drivers/input/touchscreen/gt9xx/gt9xx_cfg.h -new file mode 100755 -index 000000000000..2b083c5655f8 +new file mode 100644 +index 000000000..2b083c565 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx_cfg.h @@ -0,0 +1,65 @@ @@ -807752,8 +807775,8 @@ index 000000000000..2b083c5655f8 + +#endif /* _GOODIX_GT9XX_CFG_H_ */ diff --git a/drivers/input/touchscreen/gt9xx/gt9xx_firmware.h b/drivers/input/touchscreen/gt9xx/gt9xx_firmware.h -new file mode 100755 -index 000000000000..7dce6045b736 +new file mode 100644 +index 000000000..7dce6045b --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx_firmware.h @@ -0,0 +1,2338 @@ @@ -810096,8 +810119,8 @@ index 000000000000..7dce6045b736 + +#endif diff --git a/drivers/input/touchscreen/gt9xx/gt9xx_update.c b/drivers/input/touchscreen/gt9xx/gt9xx_update.c -new file mode 100755 -index 000000000000..312b1f93be60 +new file mode 100644 +index 000000000..312b1f93b --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx_update.c @@ -0,0 +1,3637 @@ @@ -813739,8 +813762,8 @@ index 000000000000..312b1f93be60 + +//**************** For GT9XXF End ********************// diff --git a/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D863_7.h b/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D863_7.h -new file mode 100755 -index 000000000000..af607b6f7c6a +new file mode 100644 +index 000000000..af607b6f7 --- /dev/null +++ b/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D863_7.h @@ -0,0 +1,514 @@ @@ -814259,8 +814282,8 @@ index 000000000000..af607b6f7c6a +#endif + diff --git a/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D89.h b/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D89.h -new file mode 100755 -index 000000000000..2a2045660c0a +new file mode 100644 +index 000000000..2a2045660 --- /dev/null +++ b/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D89.h @@ -0,0 +1,514 @@ @@ -814779,16 +814802,16 @@ index 000000000000..2a2045660c0a +#endif + diff --git a/drivers/input/touchscreen/hyn_cst2xx/Makefile b/drivers/input/touchscreen/hyn_cst2xx/Makefile -new file mode 100755 -index 000000000000..247b6045dd13 +new file mode 100644 +index 000000000..247b6045d --- /dev/null +++ b/drivers/input/touchscreen/hyn_cst2xx/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_TOUCHSCREEN_HYN_CST2XX) += hyn_cst2xx.o + diff --git a/drivers/input/touchscreen/hyn_cst2xx/hyn_cst2xx.c b/drivers/input/touchscreen/hyn_cst2xx/hyn_cst2xx.c -new file mode 100755 -index 000000000000..689e0a8a7e26 +new file mode 100644 +index 000000000..689e0a8a7 --- /dev/null +++ b/drivers/input/touchscreen/hyn_cst2xx/hyn_cst2xx.c @@ -0,0 +1,1970 @@ @@ -816763,8 +816786,8 @@ index 000000000000..689e0a8a7e26 +MODULE_ALIAS("platform:hyn_ts"); + diff --git a/drivers/input/touchscreen/tp_gslx680_board.h b/drivers/input/touchscreen/tp_gslx680_board.h -new file mode 100755 -index 000000000000..bc90005e215d +new file mode 100644 +index 000000000..bc90005e2 --- /dev/null +++ b/drivers/input/touchscreen/tp_gslx680_board.h @@ -0,0 +1,4908 @@ @@ -821677,8 +821700,8 @@ index 000000000000..bc90005e215d + +#endif diff --git a/drivers/input/touchscreen/tp_suspend.h b/drivers/input/touchscreen/tp_suspend.h -new file mode 100755 -index 000000000000..e4248663febc +new file mode 100644 +index 000000000..e4248663f --- /dev/null +++ b/drivers/input/touchscreen/tp_suspend.h @@ -0,0 +1,109 @@ @@ -821792,8 +821815,8 @@ index 000000000000..e4248663febc +} +#endif diff --git a/drivers/input/touchscreen/vtl_ts/LX20JS06_A1_CT363_V03_5198_121015.dat b/drivers/input/touchscreen/vtl_ts/LX20JS06_A1_CT363_V03_5198_121015.dat -new file mode 100755 -index 000000000000..dd2c3d8b25b4 +new file mode 100644 +index 000000000..dd2c3d8b2 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/LX20JS06_A1_CT363_V03_5198_121015.dat @@ -0,0 +1,4096 @@ @@ -825895,8 +825918,8 @@ index 000000000000..dd2c3d8b25b4 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 \ No newline at end of file diff --git a/drivers/input/touchscreen/vtl_ts/Makefile b/drivers/input/touchscreen/vtl_ts/Makefile -new file mode 100755 -index 000000000000..0d15d7471f7f +new file mode 100644 +index 000000000..0d15d7471 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/Makefile @@ -0,0 +1,9 @@ @@ -825910,8 +825933,8 @@ index 000000000000..0d15d7471f7f +vtl_ts_ct36x-y +=apk.o + diff --git a/drivers/input/touchscreen/vtl_ts/apk.c b/drivers/input/touchscreen/vtl_ts/apk.c -new file mode 100755 -index 000000000000..44db1086d264 +new file mode 100644 +index 000000000..44db1086d --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/apk.c @@ -0,0 +1,232 @@ @@ -826148,8 +826171,8 @@ index 000000000000..44db1086d264 +}; + diff --git a/drivers/input/touchscreen/vtl_ts/apk.h b/drivers/input/touchscreen/vtl_ts/apk.h -new file mode 100755 -index 000000000000..a0a14b6b3cc8 +new file mode 100644 +index 000000000..a0a14b6b3 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/apk.h @@ -0,0 +1,7 @@ @@ -826161,8 +826184,8 @@ index 000000000000..a0a14b6b3cc8 + +#endif diff --git a/drivers/input/touchscreen/vtl_ts/chip.c b/drivers/input/touchscreen/vtl_ts/chip.c -new file mode 100755 -index 000000000000..50004cef1f0c +new file mode 100644 +index 000000000..50004cef1 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/chip.c @@ -0,0 +1,860 @@ @@ -827027,8 +827050,8 @@ index 000000000000..50004cef1f0c + + diff --git a/drivers/input/touchscreen/vtl_ts/chip.h b/drivers/input/touchscreen/vtl_ts/chip.h -new file mode 100755 -index 000000000000..5ebb121276ed +new file mode 100644 +index 000000000..5ebb12127 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/chip.h @@ -0,0 +1,13 @@ @@ -827046,8 +827069,8 @@ index 000000000000..5ebb121276ed + +#endif diff --git a/drivers/input/touchscreen/vtl_ts/f307&f317&f316_CT363S_01_V10_F7E9_140212.dat b/drivers/input/touchscreen/vtl_ts/f307&f317&f316_CT363S_01_V10_F7E9_140212.dat -new file mode 100755 -index 000000000000..8d43138759b3 +new file mode 100644 +index 000000000..8d4313875 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/f307&f317&f316_CT363S_01_V10_F7E9_140212.dat @@ -0,0 +1,2048 @@ @@ -829101,8 +829124,8 @@ index 000000000000..8d43138759b3 + 0x90,0x3F,0xFF,0x74,0x10,0xF0,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 \ No newline at end of file diff --git a/drivers/input/touchscreen/vtl_ts/lx--js77_97_CT365_V01_E7DA_130419.dat b/drivers/input/touchscreen/vtl_ts/lx--js77_97_CT365_V01_E7DA_130419.dat -new file mode 100755 -index 000000000000..d3fc42f43e6b +new file mode 100644 +index 000000000..d3fc42f43 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/lx--js77_97_CT365_V01_E7DA_130419.dat @@ -0,0 +1,2048 @@ @@ -831156,8 +831179,8 @@ index 000000000000..d3fc42f43e6b + 0x90,0x3F,0xFF,0x74,0x01,0xF0,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 \ No newline at end of file diff --git a/drivers/input/touchscreen/vtl_ts/tp_fw.h b/drivers/input/touchscreen/vtl_ts/tp_fw.h -new file mode 100755 -index 000000000000..df431fcabca8 +new file mode 100644 +index 000000000..df431fcab --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/tp_fw.h @@ -0,0 +1,2051 @@ @@ -833213,8 +833236,8 @@ index 000000000000..df431fcabca8 +0x90, 0x3F, 0xFF, 0x74, 0x10, 0xF0, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; diff --git a/drivers/input/touchscreen/vtl_ts/vtl_ts.c b/drivers/input/touchscreen/vtl_ts/vtl_ts.c -new file mode 100755 -index 000000000000..8c8e374ab9d2 +new file mode 100644 +index 000000000..8c8e374ab --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/vtl_ts.c @@ -0,0 +1,728 @@ @@ -833947,8 +833970,8 @@ index 000000000000..8c8e374ab9d2 + + diff --git a/drivers/input/touchscreen/vtl_ts/vtl_ts.h b/drivers/input/touchscreen/vtl_ts/vtl_ts.h -new file mode 100755 -index 000000000000..95e280688d74 +new file mode 100644 +index 000000000..95e280688 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/vtl_ts.h @@ -0,0 +1,193 @@ @@ -834146,8 +834169,8 @@ index 000000000000..95e280688d74 +#endif + diff --git a/drivers/input/touchscreen/vtl_ts/wgj36js07_A1_CT363_V01_0187_140306.dat b/drivers/input/touchscreen/vtl_ts/wgj36js07_A1_CT363_V01_0187_140306.dat -new file mode 100755 -index 000000000000..a488e98122a6 +new file mode 100644 +index 000000000..a488e9812 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/wgj36js07_A1_CT363_V01_0187_140306.dat @@ -0,0 +1,2048 @@ @@ -836201,8 +836224,8 @@ index 000000000000..a488e98122a6 + 0x90,0x3F,0xFF,0x74,0x01,0xF0,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 \ No newline at end of file diff --git a/drivers/input/touchscreen/wacom_w9013.c b/drivers/input/touchscreen/wacom_w9013.c -new file mode 100755 -index 000000000000..6bbdb01e40ac +new file mode 100644 +index 000000000..6bbdb01e4 --- /dev/null +++ b/drivers/input/touchscreen/wacom_w9013.c @@ -0,0 +1,510 @@ @@ -836717,10 +836740,10 @@ index 000000000000..6bbdb01e40ac +MODULE_DESCRIPTION("WACOM EMR I2C Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig -index 04878caf6da4..fe1256b01f7e 100644 +index 7dfd23262..6a5222bdb 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig -@@ -160,7 +160,8 @@ config OMAP_IOMMU_DEBUG +@@ -161,7 +161,8 @@ config OMAP_IOMMU_DEBUG Say N unless you know you need this. config ROCKCHIP_IOMMU @@ -836731,8 +836754,8 @@ index 04878caf6da4..fe1256b01f7e 100644 select IOMMU_API select ARM_DMA_USE_IOMMU diff --git a/drivers/iommu/dma-iommu-ops.c b/drivers/iommu/dma-iommu-ops.c -new file mode 100755 -index 000000000000..862d7823985e +new file mode 100644 +index 000000000..862d78239 --- /dev/null +++ b/drivers/iommu/dma-iommu-ops.c @@ -0,0 +1,473 @@ @@ -837210,7 +837233,7 @@ index 000000000000..862d7823985e +} +EXPORT_SYMBOL_GPL(common_iommu_teardown_dma_ops); diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c -index d1539b7399a9..d5020a7299a3 100644 +index d1539b739..d5020a729 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, @@ -837278,7 +837301,7 @@ index d1539b7399a9..d5020a7299a3 100644 switch (dir) { case DMA_BIDIRECTIONAL: diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index 9d65557dfb2c..abf1b1e6c200 100644 +index 9d65557df..abf1b1e6c 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -837530,7 +837553,7 @@ index 9d65557dfb2c..abf1b1e6c200 100644 out_err: diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c -index 12551dc11714..bb29a4e18dc8 100644 +index 12551dc11..bb29a4e18 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -19,6 +19,7 @@ @@ -838740,7 +838763,7 @@ index 12551dc11714..bb29a4e18dc8 100644 +MODULE_ALIAS("platform:rockchip-iommu"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig -index 3c24bf45263c..ddcd884d1175 100644 +index 641d20632..b88047e18 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -417,8 +417,9 @@ config IRQ_UNIPHIER_AIDET @@ -838756,10 +838779,10 @@ index 3c24bf45263c..ddcd884d1175 100644 help Support Meson SoC Family GPIO Interrupt Multiplexer diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c -index 5ec091c64d47..985d8de8445f 100644 +index 03cbd3c0c..b9c467205 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c -@@ -2167,6 +2167,8 @@ static struct page *its_allocate_prop_table(gfp_t gfp_flags) +@@ -2192,6 +2192,8 @@ static struct page *its_allocate_prop_table(gfp_t gfp_flags) { struct page *prop_page; @@ -838768,7 +838791,7 @@ index 5ec091c64d47..985d8de8445f 100644 prop_page = alloc_pages(gfp_flags, get_order(LPI_PROPBASE_SZ)); if (!prop_page) return NULL; -@@ -2290,6 +2292,7 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, +@@ -2315,6 +2317,7 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, u32 alloc_pages, psz; struct page *page; void *base; @@ -838776,7 +838799,7 @@ index 5ec091c64d47..985d8de8445f 100644 psz = baser->psz; alloc_pages = (PAGE_ORDER_TO_SIZE(order) / psz); -@@ -2301,7 +2304,10 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, +@@ -2326,7 +2329,10 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, order = get_order(GITS_BASER_PAGES_MAX * psz); } @@ -838788,7 +838811,7 @@ index 5ec091c64d47..985d8de8445f 100644 if (!page) return -ENOMEM; -@@ -2348,6 +2354,14 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, +@@ -2373,6 +2379,14 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, its_write_baser(its, baser, val); tmp = baser->val; @@ -838803,7 +838826,7 @@ index 5ec091c64d47..985d8de8445f 100644 if ((val ^ tmp) & GITS_BASER_SHAREABILITY_MASK) { /* * Shareability didn't stick. Just use -@@ -2930,6 +2944,8 @@ static struct page *its_allocate_pending_table(gfp_t gfp_flags) +@@ -2955,6 +2969,8 @@ static struct page *its_allocate_pending_table(gfp_t gfp_flags) { struct page *pend_page; @@ -838812,7 +838835,7 @@ index 5ec091c64d47..985d8de8445f 100644 pend_page = alloc_pages(gfp_flags | __GFP_ZERO, get_order(LPI_PENDBASE_SZ)); if (!pend_page) -@@ -3077,6 +3093,10 @@ static void its_cpu_init_lpis(void) +@@ -3102,6 +3118,10 @@ static void its_cpu_init_lpis(void) gicr_write_propbaser(val, rbase + GICR_PROPBASER); tmp = gicr_read_propbaser(rbase + GICR_PROPBASER); @@ -838823,7 +838846,7 @@ index 5ec091c64d47..985d8de8445f 100644 if ((tmp ^ val) & GICR_PROPBASER_SHAREABILITY_MASK) { if (!(tmp & GICR_PROPBASER_SHAREABILITY_MASK)) { /* -@@ -3101,6 +3121,10 @@ static void its_cpu_init_lpis(void) +@@ -3126,6 +3146,10 @@ static void its_cpu_init_lpis(void) gicr_write_pendbaser(val, rbase + GICR_PENDBASER); tmp = gicr_read_pendbaser(rbase + GICR_PENDBASER); @@ -838834,7 +838857,7 @@ index 5ec091c64d47..985d8de8445f 100644 if (!(tmp & GICR_PENDBASER_SHAREABILITY_MASK)) { /* * The HW reports non-shareable, we must remove the -@@ -3263,7 +3287,11 @@ static bool its_alloc_table_entry(struct its_node *its, +@@ -3288,7 +3312,11 @@ static bool its_alloc_table_entry(struct its_node *its, /* Allocate memory for 2nd level table */ if (!table[idx]) { @@ -838847,7 +838870,7 @@ index 5ec091c64d47..985d8de8445f 100644 get_order(baser->psz)); if (!page) return false; -@@ -3352,6 +3380,7 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id, +@@ -3377,6 +3405,7 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id, int nr_lpis; int nr_ites; int sz; @@ -838855,7 +838878,7 @@ index 5ec091c64d47..985d8de8445f 100644 if (!its_alloc_device_table(its, dev_id)) return NULL; -@@ -3367,7 +3396,10 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id, +@@ -3392,7 +3421,10 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id, nr_ites = max(2, nvecs); sz = nr_ites * (FIELD_GET(GITS_TYPER_ITT_ENTRY_SIZE, its->typer) + 1); sz = max(sz, ITS_ITT_ALIGN) + ITS_ITT_ALIGN - 1; @@ -838867,7 +838890,7 @@ index 5ec091c64d47..985d8de8445f 100644 if (alloc_lpis) { lpi_map = its_lpi_alloc(nvecs, &lpi_base, &nr_lpis); if (lpi_map) -@@ -3841,8 +3873,6 @@ static void its_vpe_schedule(struct its_vpe *vpe) +@@ -3887,8 +3919,6 @@ static void its_vpe_schedule(struct its_vpe *vpe) val |= vpe->idai ? GICR_VPENDBASER_IDAI : 0; val |= GICR_VPENDBASER_Valid; gicr_write_vpendbaser(val, vlpi_base + GICR_VPENDBASER); @@ -838876,7 +838899,7 @@ index 5ec091c64d47..985d8de8445f 100644 } static void its_vpe_deschedule(struct its_vpe *vpe) -@@ -3890,6 +3920,10 @@ static int its_vpe_set_vcpu_affinity(struct irq_data *d, void *vcpu_info) +@@ -3936,6 +3966,10 @@ static int its_vpe_set_vcpu_affinity(struct irq_data *d, void *vcpu_info) its_vpe_deschedule(vpe); return 0; @@ -838887,7 +838910,7 @@ index 5ec091c64d47..985d8de8445f 100644 case INVALL_VPE: its_vpe_invall(vpe); return 0; -@@ -4051,8 +4085,6 @@ static void its_vpe_4_1_schedule(struct its_vpe *vpe, +@@ -4089,8 +4123,6 @@ static void its_vpe_4_1_schedule(struct its_vpe *vpe, val |= FIELD_PREP(GICR_VPENDBASER_4_1_VPEID, vpe->vpe_id); gicr_write_vpendbaser(val, vlpi_base + GICR_VPENDBASER); @@ -838896,7 +838919,7 @@ index 5ec091c64d47..985d8de8445f 100644 } static void its_vpe_4_1_deschedule(struct its_vpe *vpe, -@@ -4127,6 +4159,10 @@ static int its_vpe_4_1_set_vcpu_affinity(struct irq_data *d, void *vcpu_info) +@@ -4165,6 +4197,10 @@ static int its_vpe_4_1_set_vcpu_affinity(struct irq_data *d, void *vcpu_info) its_vpe_4_1_deschedule(vpe, info); return 0; @@ -838907,7 +838930,7 @@ index 5ec091c64d47..985d8de8445f 100644 case INVALL_VPE: its_vpe_4_1_invall(vpe); return 0; -@@ -4945,6 +4981,7 @@ static int __init its_probe_one(struct resource *res, +@@ -4977,6 +5013,7 @@ static int __init its_probe_one(struct resource *res, u64 baser, tmp, typer; struct page *page; int err; @@ -838915,7 +838938,7 @@ index 5ec091c64d47..985d8de8445f 100644 its_base = ioremap(res->start, SZ_64K); if (!its_base) { -@@ -5013,7 +5050,10 @@ static int __init its_probe_one(struct resource *res, +@@ -5045,7 +5082,10 @@ static int __init its_probe_one(struct resource *res, its->numa_node = numa_node; @@ -838927,7 +838950,7 @@ index 5ec091c64d47..985d8de8445f 100644 get_order(ITS_CMD_QUEUE_SZ)); if (!page) { err = -ENOMEM; -@@ -5044,6 +5084,10 @@ static int __init its_probe_one(struct resource *res, +@@ -5076,6 +5116,10 @@ static int __init its_probe_one(struct resource *res, gits_write_cbaser(baser, its->base + GITS_CBASER); tmp = gits_read_cbaser(its->base + GITS_CBASER); @@ -838939,7 +838962,7 @@ index 5ec091c64d47..985d8de8445f 100644 if (!(tmp & GITS_CBASER_SHAREABILITY_MASK)) { /* diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c -index c1f8c1be8485..b9ae28cea29c 100644 +index c1f8c1be8..b9ae28cea 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -18,6 +18,9 @@ @@ -838997,7 +839020,7 @@ index c1f8c1be8485..b9ae28cea29c 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 0c18714ae13e..5d1dc9915272 100644 +index 0c18714ae..5d1dc9915 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) @@ -839034,7 +839057,7 @@ index 0c18714ae13e..5d1dc9915272 100644 { struct its_cmd_info info = { diff --git a/drivers/irqchip/irq-meson-gpio.c b/drivers/irqchip/irq-meson-gpio.c -index e50676ce2ec8..cfc5cf5224cb 100644 +index e50676ce2..cfc5cf522 100644 --- a/drivers/irqchip/irq-meson-gpio.c +++ b/drivers/irqchip/irq-meson-gpio.c @@ -15,6 +15,7 @@ @@ -839181,7 +839204,7 @@ index e50676ce2ec8..cfc5cf5224cb 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 979acc810f30..99b9421b8494 100644 +index 979acc810..99b9421b8 100644 --- a/drivers/mailbox/rockchip-mailbox.c +++ b/drivers/mailbox/rockchip-mailbox.c @@ -11,6 +11,7 @@ @@ -839414,7 +839437,7 @@ index 979acc810f30..99b9421b8494 100644 ret = devm_mbox_controller_register(&pdev->dev, &mb->mbox); diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index 878f66ef2719..ab87428481c5 100644 +index 878f66ef2..ab8742848 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -725,6 +725,17 @@ config VIDEO_APTINA_PLL @@ -839436,7 +839459,7 @@ index 878f66ef2719..ab87428481c5 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 f0a77473979d..298863171375 100644 +index f0a774739..298863171 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -111,6 +111,7 @@ obj-$(CONFIG_VIDEO_I2C) += video-i2c.o @@ -839448,8 +839471,8 @@ index f0a77473979d..298863171375 100644 obj-$(CONFIG_VIDEO_IMX214) += imx214.o obj-$(CONFIG_VIDEO_IMX219) += imx219.o diff --git a/drivers/media/i2c/gc8034.c b/drivers/media/i2c/gc8034.c -new file mode 100755 -index 000000000000..6edbf5e02995 +new file mode 100644 +index 000000000..cf4c7a290 --- /dev/null +++ b/drivers/media/i2c/gc8034.c @@ -0,0 +1,2834 @@ @@ -842288,8 +842311,8 @@ index 000000000000..6edbf5e02995 +MODULE_DESCRIPTION("GalaxyCore gc8034 sensor driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/i2c/rk628_csi.c b/drivers/media/i2c/rk628_csi.c -new file mode 100755 -index 000000000000..3fe765c148c7 +new file mode 100644 +index 000000000..3fe765c14 --- /dev/null +++ b/drivers/media/i2c/rk628_csi.c @@ -0,0 +1,2696 @@ @@ -844990,8 +845013,8 @@ index 000000000000..3fe765c148c7 +MODULE_AUTHOR("Dingxian Wen "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/i2c/rk628_csi.h b/drivers/media/i2c/rk628_csi.h -new file mode 100755 -index 000000000000..e4aa258663b8 +new file mode 100644 +index 000000000..e4aa25866 --- /dev/null +++ b/drivers/media/i2c/rk628_csi.h @@ -0,0 +1,344 @@ @@ -845340,7 +845363,7 @@ index 000000000000..e4aa258663b8 + +#endif diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig -index 7e152bbb4fa6..51d069028c3d 100644 +index 7e152bbb4..51d069028 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -153,6 +153,9 @@ source "drivers/media/platform/xilinx/Kconfig" @@ -845354,7 +845377,7 @@ index 7e152bbb4fa6..51d069028c3d 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 62b6cdc8c730..c7cb2135bb56 100644 +index 62b6cdc8c..c7cb2135b 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -53,6 +53,9 @@ obj-$(CONFIG_VIDEO_RENESAS_JPU) += rcar_jpu.o @@ -845368,8 +845391,8 @@ index 62b6cdc8c730..c7cb2135bb56 100644 obj-y += omap/ diff --git a/drivers/media/platform/rockchip-tsp/Kconfig b/drivers/media/platform/rockchip-tsp/Kconfig -new file mode 100755 -index 000000000000..5394bfa7c63c +new file mode 100644 +index 000000000..5394bfa7c --- /dev/null +++ b/drivers/media/platform/rockchip-tsp/Kconfig @@ -0,0 +1,12 @@ @@ -845386,8 +845409,8 @@ index 000000000000..5394bfa7c63c + Say N hera if you do not want to use the processor. + diff --git a/drivers/media/platform/rockchip-tsp/Makefile b/drivers/media/platform/rockchip-tsp/Makefile -new file mode 100755 -index 000000000000..ca555d0ef9e9 +new file mode 100644 +index 000000000..ca555d0ef --- /dev/null +++ b/drivers/media/platform/rockchip-tsp/Makefile @@ -0,0 +1,6 @@ @@ -845398,8 +845421,8 @@ index 000000000000..ca555d0ef9e9 + +obj-$(CONFIG_ROCKCHIP_TSP) += rockchip_tsp.o diff --git a/drivers/media/platform/rockchip-tsp/rockchip_tsp.c b/drivers/media/platform/rockchip-tsp/rockchip_tsp.c -new file mode 100755 -index 000000000000..830147909eeb +new file mode 100644 +index 000000000..830147909 --- /dev/null +++ b/drivers/media/platform/rockchip-tsp/rockchip_tsp.c @@ -0,0 +1,1182 @@ @@ -846586,8 +846609,8 @@ index 000000000000..830147909eeb +MODULE_AUTHOR("Jerry Xu "); +MODULE_ALIAS("platform:" MODE_NAME); diff --git a/drivers/media/platform/rockchip-tsp/rockchip_tsp.h b/drivers/media/platform/rockchip-tsp/rockchip_tsp.h -new file mode 100755 -index 000000000000..bafe641cdf9f +new file mode 100644 +index 000000000..bafe641cd --- /dev/null +++ b/drivers/media/platform/rockchip-tsp/rockchip_tsp.h @@ -0,0 +1,230 @@ @@ -846822,8 +846845,8 @@ index 000000000000..bafe641cdf9f + +#endif diff --git a/drivers/media/platform/rockchip/cif/Kconfig b/drivers/media/platform/rockchip/cif/Kconfig -new file mode 100755 -index 000000000000..592842bf3386 +new file mode 100644 +index 000000000..592842bf3 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/Kconfig @@ -0,0 +1,40 @@ @@ -846868,8 +846891,8 @@ index 000000000000..592842bf3386 +endchoice + diff --git a/drivers/media/platform/rockchip/cif/Makefile b/drivers/media/platform/rockchip/cif/Makefile -new file mode 100755 -index 000000000000..279be843e093 +new file mode 100644 +index 000000000..279be843e --- /dev/null +++ b/drivers/media/platform/rockchip/cif/Makefile @@ -0,0 +1,11 @@ @@ -846885,8 +846908,8 @@ index 000000000000..279be843e093 + cif-scale.o \ + common.o diff --git a/drivers/media/platform/rockchip/cif/capture.c b/drivers/media/platform/rockchip/cif/capture.c -new file mode 100755 -index 000000000000..9832721da8e3 +new file mode 100644 +index 000000000..9832721da --- /dev/null +++ b/drivers/media/platform/rockchip/cif/capture.c @@ -0,0 +1,7915 @@ @@ -854806,8 +854829,8 @@ index 000000000000..9832721da8e3 +} + diff --git a/drivers/media/platform/rockchip/cif/cif-luma.c b/drivers/media/platform/rockchip/cif/cif-luma.c -new file mode 100755 -index 000000000000..9d751df3c4e5 +new file mode 100644 +index 000000000..9d751df3c --- /dev/null +++ b/drivers/media/platform/rockchip/cif/cif-luma.c @@ -0,0 +1,520 @@ @@ -855332,8 +855355,8 @@ index 000000000000..9d751df3c4e5 + vb2_queue_release(vdev->queue); +} diff --git a/drivers/media/platform/rockchip/cif/cif-luma.h b/drivers/media/platform/rockchip/cif/cif-luma.h -new file mode 100755 -index 000000000000..f57d19c4123a +new file mode 100644 +index 000000000..f57d19c41 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/cif-luma.h @@ -0,0 +1,83 @@ @@ -855421,8 +855444,8 @@ index 000000000000..f57d19c4123a + +#endif /* _RKCIF_LUMA_H */ diff --git a/drivers/media/platform/rockchip/cif/cif-scale.c b/drivers/media/platform/rockchip/cif/cif-scale.c -new file mode 100755 -index 000000000000..afcf8801f425 +new file mode 100644 +index 000000000..afcf8801f --- /dev/null +++ b/drivers/media/platform/rockchip/cif/cif-scale.c @@ -0,0 +1,1202 @@ @@ -856629,8 +856652,8 @@ index 000000000000..afcf8801f425 +} + diff --git a/drivers/media/platform/rockchip/cif/common.c b/drivers/media/platform/rockchip/cif/common.c -new file mode 100755 -index 000000000000..7442dfe82c14 +new file mode 100644 +index 000000000..7442dfe82 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/common.c @@ -0,0 +1,187 @@ @@ -856822,8 +856845,8 @@ index 000000000000..7442dfe82c14 +} + diff --git a/drivers/media/platform/rockchip/cif/common.h b/drivers/media/platform/rockchip/cif/common.h -new file mode 100755 -index 000000000000..86dbd55d1283 +new file mode 100644 +index 000000000..86dbd55d1 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/common.h @@ -0,0 +1,27 @@ @@ -856855,8 +856878,8 @@ index 000000000000..86dbd55d1283 +#endif /* _RKCIF_COMMON_H */ + diff --git a/drivers/media/platform/rockchip/cif/dev.c b/drivers/media/platform/rockchip/cif/dev.c -new file mode 100755 -index 000000000000..5f59c9401059 +new file mode 100644 +index 000000000..5f59c9401 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/dev.c @@ -0,0 +1,1928 @@ @@ -858789,8 +858812,8 @@ index 000000000000..5f59c9401059 +MODULE_DESCRIPTION("Rockchip CIF platform driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/cif/dev.h b/drivers/media/platform/rockchip/cif/dev.h -new file mode 100755 -index 000000000000..a6f210bd8166 +new file mode 100644 +index 000000000..a6f210bd8 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/dev.h @@ -0,0 +1,786 @@ @@ -859581,8 +859604,8 @@ index 000000000000..a6f210bd8166 + +#endif diff --git a/drivers/media/platform/rockchip/cif/hw.c b/drivers/media/platform/rockchip/cif/hw.c -new file mode 100755 -index 000000000000..a85f2e14c8e7 +new file mode 100644 +index 000000000..a85f2e14c --- /dev/null +++ b/drivers/media/platform/rockchip/cif/hw.c @@ -0,0 +1,1186 @@ @@ -860773,8 +860796,8 @@ index 000000000000..a85f2e14c8e7 +MODULE_DESCRIPTION("Rockchip CIF platform driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/cif/hw.h b/drivers/media/platform/rockchip/cif/hw.h -new file mode 100755 -index 000000000000..b5698f7c35e6 +new file mode 100644 +index 000000000..b5698f7c3 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/hw.h @@ -0,0 +1,130 @@ @@ -860909,8 +860932,8 @@ index 000000000000..b5698f7c35e6 + +#endif diff --git a/drivers/media/platform/rockchip/cif/mipi-csi2.c b/drivers/media/platform/rockchip/cif/mipi-csi2.c -new file mode 100755 -index 000000000000..fb2312e2bb63 +new file mode 100644 +index 000000000..fb2312e2b --- /dev/null +++ b/drivers/media/platform/rockchip/cif/mipi-csi2.c @@ -0,0 +1,940 @@ @@ -861855,8 +861878,8 @@ index 000000000000..fb2312e2bb63 +MODULE_AUTHOR("Macrofly.xu "); +MODULE_LICENSE("GPL"); diff --git a/drivers/media/platform/rockchip/cif/mipi-csi2.h b/drivers/media/platform/rockchip/cif/mipi-csi2.h -new file mode 100755 -index 000000000000..e04a7dd2eef3 +new file mode 100644 +index 000000000..e04a7dd2e --- /dev/null +++ b/drivers/media/platform/rockchip/cif/mipi-csi2.h @@ -0,0 +1,159 @@ @@ -862020,8 +862043,8 @@ index 000000000000..e04a7dd2eef3 + +#endif diff --git a/drivers/media/platform/rockchip/cif/procfs.c b/drivers/media/platform/rockchip/cif/procfs.c -new file mode 100755 -index 000000000000..43d6e2c232b0 +new file mode 100644 +index 000000000..43d6e2c23 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/procfs.c @@ -0,0 +1,406 @@ @@ -862432,8 +862455,8 @@ index 000000000000..43d6e2c232b0 + +#endif diff --git a/drivers/media/platform/rockchip/cif/procfs.h b/drivers/media/platform/rockchip/cif/procfs.h -new file mode 100755 -index 000000000000..798533849cd9 +new file mode 100644 +index 000000000..798533849 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/procfs.h @@ -0,0 +1,25 @@ @@ -862463,8 +862486,8 @@ index 000000000000..798533849cd9 + +#endif diff --git a/drivers/media/platform/rockchip/cif/regs.h b/drivers/media/platform/rockchip/cif/regs.h -new file mode 100755 -index 000000000000..d9a1303c16af +new file mode 100644 +index 000000000..d9a1303c1 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/regs.h @@ -0,0 +1,979 @@ @@ -863448,8 +863471,8 @@ index 000000000000..d9a1303c16af + +#endif diff --git a/drivers/media/platform/rockchip/cif/subdev-itf.c b/drivers/media/platform/rockchip/cif/subdev-itf.c -new file mode 100755 -index 000000000000..3cf240ee4945 +new file mode 100644 +index 000000000..3cf240ee4 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/subdev-itf.c @@ -0,0 +1,635 @@ @@ -864089,8 +864112,8 @@ index 000000000000..3cf240ee4945 +MODULE_DESCRIPTION("Rockchip CIF platform driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/cif/subdev-itf.h b/drivers/media/platform/rockchip/cif/subdev-itf.h -new file mode 100755 -index 000000000000..a1ebbe02a820 +new file mode 100644 +index 000000000..a1ebbe02a --- /dev/null +++ b/drivers/media/platform/rockchip/cif/subdev-itf.h @@ -0,0 +1,69 @@ @@ -864164,8 +864187,8 @@ index 000000000000..a1ebbe02a820 + +#endif diff --git a/drivers/media/platform/rockchip/cif/version.h b/drivers/media/platform/rockchip/cif/version.h -new file mode 100755 -index 000000000000..627b4a3a11e5 +new file mode 100644 +index 000000000..627b4a3a1 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/version.h @@ -0,0 +1,74 @@ @@ -864244,8 +864267,8 @@ index 000000000000..627b4a3a11e5 + +#endif diff --git a/drivers/media/platform/rockchip/isp/Kconfig b/drivers/media/platform/rockchip/isp/Kconfig -new file mode 100755 -index 000000000000..98a530a171f1 +new file mode 100644 +index 000000000..98a530a17 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/Kconfig @@ -0,0 +1,39 @@ @@ -864289,8 +864312,8 @@ index 000000000000..98a530a171f1 + +endif diff --git a/drivers/media/platform/rockchip/isp/Makefile b/drivers/media/platform/rockchip/isp/Makefile -new file mode 100755 -index 000000000000..52cac629003f +new file mode 100644 +index 000000000..52cac6290 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/Makefile @@ -0,0 +1,42 @@ @@ -864337,8 +864360,8 @@ index 000000000000..52cac629003f + +video_rkisp-$(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) += rkisp_tb_helper.o diff --git a/drivers/media/platform/rockchip/isp/bridge.c b/drivers/media/platform/rockchip/isp/bridge.c -new file mode 100755 -index 000000000000..51c8254ccfe2 +new file mode 100644 +index 000000000..51c8254cc --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge.c @@ -0,0 +1,629 @@ @@ -864972,8 +864995,8 @@ index 000000000000..51c8254ccfe2 +} +EXPORT_SYMBOL(rkisp_get_bridge_sd); diff --git a/drivers/media/platform/rockchip/isp/bridge.h b/drivers/media/platform/rockchip/isp/bridge.h -new file mode 100755 -index 000000000000..8310b13df88a +new file mode 100644 +index 000000000..8310b13df --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge.h @@ -0,0 +1,105 @@ @@ -865083,8 +865106,8 @@ index 000000000000..8310b13df88a + +#endif diff --git a/drivers/media/platform/rockchip/isp/bridge_v20.c b/drivers/media/platform/rockchip/isp/bridge_v20.c -new file mode 100755 -index 000000000000..ff1d4af07424 +new file mode 100644 +index 000000000..ff1d4af07 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge_v20.c @@ -0,0 +1,1094 @@ @@ -866183,8 +866206,8 @@ index 000000000000..ff1d4af07424 + dev->frame_qst.function = rkisp_bridge_frame_done_early; +} diff --git a/drivers/media/platform/rockchip/isp/bridge_v30.c b/drivers/media/platform/rockchip/isp/bridge_v30.c -new file mode 100755 -index 000000000000..c0b639bddd56 +new file mode 100644 +index 000000000..c0b639bdd --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge_v30.c @@ -0,0 +1,236 @@ @@ -866425,8 +866448,8 @@ index 000000000000..c0b639bddd56 + dev->cfg = &mp_cfg; +} diff --git a/drivers/media/platform/rockchip/isp/capture.c b/drivers/media/platform/rockchip/isp/capture.c -new file mode 100755 -index 000000000000..476c147b5f60 +new file mode 100644 +index 000000000..476c147b5 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture.c @@ -0,0 +1,1717 @@ @@ -868148,8 +868171,8 @@ index 000000000000..476c147b5f60 + rkisp_mi_v30_isr(mis_val, dev); +} diff --git a/drivers/media/platform/rockchip/isp/capture.h b/drivers/media/platform/rockchip/isp/capture.h -new file mode 100755 -index 000000000000..5a9251a9c973 +new file mode 100644 +index 000000000..5a9251a9c --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture.h @@ -0,0 +1,295 @@ @@ -868449,8 +868472,8 @@ index 000000000000..5a9251a9c973 +int rkisp_fop_release(struct file *file); +#endif /* _RKISP_PATH_VIDEO_H */ diff --git a/drivers/media/platform/rockchip/isp/capture_v1x.c b/drivers/media/platform/rockchip/isp/capture_v1x.c -new file mode 100755 -index 000000000000..b829bd5e512a +new file mode 100644 +index 000000000..b829bd5e5 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v1x.c @@ -0,0 +1,957 @@ @@ -869412,8 +869435,8 @@ index 000000000000..b829bd5e512a + } +} diff --git a/drivers/media/platform/rockchip/isp/capture_v1x.h b/drivers/media/platform/rockchip/isp/capture_v1x.h -new file mode 100755 -index 000000000000..f26f1bde0010 +new file mode 100644 +index 000000000..f26f1bde0 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v1x.h @@ -0,0 +1,17 @@ @@ -869435,8 +869458,8 @@ index 000000000000..f26f1bde0010 + +#endif diff --git a/drivers/media/platform/rockchip/isp/capture_v20.c b/drivers/media/platform/rockchip/isp/capture_v20.c -new file mode 100755 -index 000000000000..4dbb87110d54 +new file mode 100644 +index 000000000..4dbb87110 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v20.c @@ -0,0 +1,1969 @@ @@ -871410,8 +871433,8 @@ index 000000000000..4dbb87110d54 + } +} diff --git a/drivers/media/platform/rockchip/isp/capture_v21.c b/drivers/media/platform/rockchip/isp/capture_v21.c -new file mode 100755 -index 000000000000..4bef12f6a9a4 +new file mode 100644 +index 000000000..4bef12f6a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v21.c @@ -0,0 +1,1699 @@ @@ -873115,8 +873138,8 @@ index 000000000000..4bef12f6a9a4 + } +} diff --git a/drivers/media/platform/rockchip/isp/capture_v2x.h b/drivers/media/platform/rockchip/isp/capture_v2x.h -new file mode 100755 -index 000000000000..8ec036998a4a +new file mode 100644 +index 000000000..8ec036998 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v2x.h @@ -0,0 +1,48 @@ @@ -873169,8 +873192,8 @@ index 000000000000..8ec036998a4a + +#endif diff --git a/drivers/media/platform/rockchip/isp/capture_v30.c b/drivers/media/platform/rockchip/isp/capture_v30.c -new file mode 100755 -index 000000000000..05fad30e2ba3 +new file mode 100644 +index 000000000..05fad30e2 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v30.c @@ -0,0 +1,1495 @@ @@ -874670,8 +874693,8 @@ index 000000000000..05fad30e2ba3 + v4l2_warn(&dev->v4l2_dev, "RD_SIZE_ERR:0x%08x\n", state); +} diff --git a/drivers/media/platform/rockchip/isp/capture_v3x.h b/drivers/media/platform/rockchip/isp/capture_v3x.h -new file mode 100755 -index 000000000000..cb3d59391e87 +new file mode 100644 +index 000000000..cb3d59391 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v3x.h @@ -0,0 +1,23 @@ @@ -874699,8 +874722,8 @@ index 000000000000..cb3d59391e87 + +#endif diff --git a/drivers/media/platform/rockchip/isp/common.c b/drivers/media/platform/rockchip/isp/common.c -new file mode 100755 -index 000000000000..30b69b204914 +new file mode 100644 +index 000000000..30b69b204 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/common.c @@ -0,0 +1,369 @@ @@ -875074,8 +875097,8 @@ index 000000000000..30b69b204914 + rkisp_free_buffer(dev, &hw->dummy_buf); +} diff --git a/drivers/media/platform/rockchip/isp/common.h b/drivers/media/platform/rockchip/isp/common.h -new file mode 100755 -index 000000000000..6ff84a21b216 +new file mode 100644 +index 000000000..6ff84a21b --- /dev/null +++ b/drivers/media/platform/rockchip/isp/common.h @@ -0,0 +1,212 @@ @@ -875292,8 +875315,8 @@ index 000000000000..6ff84a21b216 +void rkisp_set_clk_rate(struct clk *clk, unsigned long rate); +#endif /* _RKISP_COMMON_H */ diff --git a/drivers/media/platform/rockchip/isp/csi.c b/drivers/media/platform/rockchip/isp/csi.c -new file mode 100755 -index 000000000000..2ffd02c73e0d +new file mode 100644 +index 000000000..2ffd02c73 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/csi.c @@ -0,0 +1,637 @@ @@ -875935,8 +875958,8 @@ index 000000000000..2ffd02c73e0d + media_entity_cleanup(&sd->entity); +} diff --git a/drivers/media/platform/rockchip/isp/csi.h b/drivers/media/platform/rockchip/isp/csi.h -new file mode 100755 -index 000000000000..4a8c7020078b +new file mode 100644 +index 000000000..4a8c70200 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/csi.h @@ -0,0 +1,83 @@ @@ -876024,8 +876047,8 @@ index 000000000000..4a8c7020078b +void rkisp_csi_sof(struct rkisp_device *dev, u8 id); +#endif diff --git a/drivers/media/platform/rockchip/isp/dev.c b/drivers/media/platform/rockchip/isp/dev.c -new file mode 100755 -index 000000000000..e8628681d570 +new file mode 100644 +index 000000000..e8628681d --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dev.c @@ -0,0 +1,913 @@ @@ -876943,8 +876966,8 @@ index 000000000000..e8628681d570 +MODULE_DESCRIPTION("Rockchip ISP platform driver"); +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/media/platform/rockchip/isp/dev.h b/drivers/media/platform/rockchip/isp/dev.h -new file mode 100755 -index 000000000000..e057491111fa +new file mode 100644 +index 000000000..e05749111 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dev.h @@ -0,0 +1,238 @@ @@ -877187,8 +877210,8 @@ index 000000000000..e057491111fa +}; +#endif diff --git a/drivers/media/platform/rockchip/isp/dmarx.c b/drivers/media/platform/rockchip/isp/dmarx.c -new file mode 100755 -index 000000000000..0dcc080d7cdc +new file mode 100644 +index 000000000..0dcc080d7 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dmarx.c @@ -0,0 +1,1183 @@ @@ -878376,8 +878399,8 @@ index 000000000000..0dcc080d7cdc + } +} diff --git a/drivers/media/platform/rockchip/isp/dmarx.h b/drivers/media/platform/rockchip/isp/dmarx.h -new file mode 100755 -index 000000000000..348096e286ef +new file mode 100644 +index 000000000..348096e28 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dmarx.h @@ -0,0 +1,67 @@ @@ -878449,8 +878472,8 @@ index 000000000000..348096e286ef +int rkisp_register_dmarx_vdev(struct rkisp_device *dev); +#endif /* _RKISP_DMARX_H */ diff --git a/drivers/media/platform/rockchip/isp/hw.c b/drivers/media/platform/rockchip/isp/hw.c -new file mode 100755 -index 000000000000..899bee986397 +new file mode 100644 +index 000000000..899bee986 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/hw.c @@ -0,0 +1,1019 @@ @@ -879474,8 +879497,8 @@ index 000000000000..899bee986397 + +module_init(rkisp_hw_drv_init); diff --git a/drivers/media/platform/rockchip/isp/hw.h b/drivers/media/platform/rockchip/isp/hw.h -new file mode 100755 -index 000000000000..dce2f0a715ee +new file mode 100644 +index 000000000..dce2f0a71 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/hw.h @@ -0,0 +1,89 @@ @@ -879569,8 +879592,8 @@ index 000000000000..dce2f0a715ee +void rkisp_soft_reset(struct rkisp_hw_dev *dev, bool is_secure); +#endif diff --git a/drivers/media/platform/rockchip/isp/isp_external.h b/drivers/media/platform/rockchip/isp/isp_external.h -new file mode 100755 -index 000000000000..655c4b943835 +new file mode 100644 +index 000000000..655c4b943 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_external.h @@ -0,0 +1,44 @@ @@ -879619,8 +879642,8 @@ index 000000000000..655c4b943835 + +#endif diff --git a/drivers/media/platform/rockchip/isp/isp_ispp.h b/drivers/media/platform/rockchip/isp/isp_ispp.h -new file mode 100755 -index 000000000000..98300cae0347 +new file mode 100644 +index 000000000..98300cae0 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_ispp.h @@ -0,0 +1,138 @@ @@ -879763,8 +879786,8 @@ index 000000000000..98300cae0347 + +#endif diff --git a/drivers/media/platform/rockchip/isp/isp_mipi_luma.c b/drivers/media/platform/rockchip/isp/isp_mipi_luma.c -new file mode 100755 -index 000000000000..ebca58e7102f +new file mode 100644 +index 000000000..ebca58e71 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_mipi_luma.c @@ -0,0 +1,524 @@ @@ -880293,8 +880316,8 @@ index 000000000000..ebca58e7102f + vb2_queue_release(vdev->queue); +} diff --git a/drivers/media/platform/rockchip/isp/isp_mipi_luma.h b/drivers/media/platform/rockchip/isp/isp_mipi_luma.h -new file mode 100755 -index 000000000000..537a9d6a0796 +new file mode 100644 +index 000000000..537a9d6a0 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_mipi_luma.h @@ -0,0 +1,79 @@ @@ -880378,8 +880401,8 @@ index 000000000000..537a9d6a0796 + +#endif /* _RKISP_ISP_LUMA_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params.c b/drivers/media/platform/rockchip/isp/isp_params.c -new file mode 100755 -index 000000000000..c5e91d18f973 +new file mode 100644 +index 000000000..c5e91d18f --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params.c @@ -0,0 +1,459 @@ @@ -880843,8 +880866,8 @@ index 000000000000..c5e91d18f973 +} + diff --git a/drivers/media/platform/rockchip/isp/isp_params.h b/drivers/media/platform/rockchip/isp/isp_params.h -new file mode 100755 -index 000000000000..fb4e3a2d7569 +new file mode 100644 +index 000000000..fb4e3a2d7 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params.h @@ -0,0 +1,147 @@ @@ -880996,8 +881019,8 @@ index 000000000000..fb4e3a2d7569 + +#endif /* _RKISP_ISP_PARAM_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params_v1x.c b/drivers/media/platform/rockchip/isp/isp_params_v1x.c -new file mode 100755 -index 000000000000..4ca6c6dbbd2c +new file mode 100644 +index 000000000..4ca6c6dbb --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v1x.c @@ -0,0 +1,2352 @@ @@ -883354,8 +883377,8 @@ index 000000000000..4ca6c6dbbd2c +} + diff --git a/drivers/media/platform/rockchip/isp/isp_params_v1x.h b/drivers/media/platform/rockchip/isp/isp_params_v1x.h -new file mode 100755 -index 000000000000..316bef51eaca +new file mode 100644 +index 000000000..316bef51e --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v1x.h @@ -0,0 +1,87 @@ @@ -883447,8 +883470,8 @@ index 000000000000..316bef51eaca + +#endif /* _RKISP_ISP_PARAM_V1X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params_v21.c b/drivers/media/platform/rockchip/isp/isp_params_v21.c -new file mode 100755 -index 000000000000..eeb242a14a79 +new file mode 100644 +index 000000000..eeb242a14 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v21.c @@ -0,0 +1,4195 @@ @@ -887648,8 +887671,8 @@ index 000000000000..eeb242a14a79 + params_vdev->priv_val = NULL; +} diff --git a/drivers/media/platform/rockchip/isp/isp_params_v21.h b/drivers/media/platform/rockchip/isp/isp_params_v21.h -new file mode 100755 -index 000000000000..860b9156f761 +new file mode 100644 +index 000000000..860b9156f --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v21.h @@ -0,0 +1,175 @@ @@ -887829,8 +887852,8 @@ index 000000000000..860b9156f761 + +#endif /* _RKISP_ISP_PARAM_V21_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params_v2x.c b/drivers/media/platform/rockchip/isp/isp_params_v2x.c -new file mode 100755 -index 000000000000..656834e2a922 +new file mode 100644 +index 000000000..656834e2a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v2x.c @@ -0,0 +1,4466 @@ @@ -892301,8 +892324,8 @@ index 000000000000..656834e2a922 +} + diff --git a/drivers/media/platform/rockchip/isp/isp_params_v2x.h b/drivers/media/platform/rockchip/isp/isp_params_v2x.h -new file mode 100755 -index 000000000000..707ada18205b +new file mode 100644 +index 000000000..707ada182 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v2x.h @@ -0,0 +1,359 @@ @@ -892666,8 +892689,8 @@ index 000000000000..707ada18205b + +#endif /* _RKISP_ISP_PARAM_V2X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params_v3x.c b/drivers/media/platform/rockchip/isp/isp_params_v3x.c -new file mode 100755 -index 000000000000..2f35b42e1d7c +new file mode 100644 +index 000000000..2f35b42e1 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v3x.c @@ -0,0 +1,4688 @@ @@ -897360,8 +897383,8 @@ index 000000000000..2f35b42e1d7c + } +} diff --git a/drivers/media/platform/rockchip/isp/isp_params_v3x.h b/drivers/media/platform/rockchip/isp/isp_params_v3x.h -new file mode 100755 -index 000000000000..3f9d6989d453 +new file mode 100644 +index 000000000..3f9d6989d --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v3x.h @@ -0,0 +1,210 @@ @@ -897576,8 +897599,8 @@ index 000000000000..3f9d6989d453 + +#endif /* _RKISP_ISP_PARAM_V3X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats.c b/drivers/media/platform/rockchip/isp/isp_stats.c -new file mode 100755 -index 000000000000..e472dbdb7bee +new file mode 100644 +index 000000000..e472dbdb7 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats.c @@ -0,0 +1,373 @@ @@ -897955,8 +897978,8 @@ index 000000000000..e472dbdb7bee +} + diff --git a/drivers/media/platform/rockchip/isp/isp_stats.h b/drivers/media/platform/rockchip/isp/isp_stats.h -new file mode 100755 -index 000000000000..249ed2535585 +new file mode 100644 +index 000000000..249ed2535 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats.h @@ -0,0 +1,89 @@ @@ -898050,8 +898073,8 @@ index 000000000000..249ed2535585 + +#endif /* _RKISP_ISP_STATS_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v1x.c b/drivers/media/platform/rockchip/isp/isp_stats_v1x.c -new file mode 100755 -index 000000000000..dce904b5f7c5 +new file mode 100644 +index 000000000..dce904b5f --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v1x.c @@ -0,0 +1,420 @@ @@ -898476,8 +898499,8 @@ index 000000000000..dce904b5f7c5 +} + diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v1x.h b/drivers/media/platform/rockchip/isp/isp_stats_v1x.h -new file mode 100755 -index 000000000000..8f1853d4b01d +new file mode 100644 +index 000000000..8f1853d4b --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v1x.h @@ -0,0 +1,42 @@ @@ -898524,8 +898547,8 @@ index 000000000000..8f1853d4b01d + +#endif /* _RKISP_ISP_STATS_V1X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v21.c b/drivers/media/platform/rockchip/isp/isp_stats_v21.c -new file mode 100755 -index 000000000000..956775f3bbaf +new file mode 100644 +index 000000000..956775f3b --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v21.c @@ -0,0 +1,1166 @@ @@ -899696,8 +899719,8 @@ index 000000000000..956775f3bbaf + rkisp_free_buffer(stats_vdev->dev, &stats_vdev->stats_buf[i]); +} diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v21.h b/drivers/media/platform/rockchip/isp/isp_stats_v21.h -new file mode 100755 -index 000000000000..c1dba6c65933 +new file mode 100644 +index 000000000..c1dba6c65 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v21.h @@ -0,0 +1,52 @@ @@ -899754,8 +899777,8 @@ index 000000000000..c1dba6c65933 + +#endif /* _RKISP_ISP_STATS_V21_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v2x.c b/drivers/media/platform/rockchip/isp/isp_stats_v2x.c -new file mode 100755 -index 000000000000..6e458a571b18 +new file mode 100644 +index 000000000..6e458a571 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v2x.c @@ -0,0 +1,1526 @@ @@ -901286,8 +901309,8 @@ index 000000000000..6e458a571b18 +} + diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v2x.h b/drivers/media/platform/rockchip/isp/isp_stats_v2x.h -new file mode 100755 -index 000000000000..5793ebfefcbb +new file mode 100644 +index 000000000..5793ebfef --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v2x.h @@ -0,0 +1,70 @@ @@ -901362,8 +901385,8 @@ index 000000000000..5793ebfefcbb + +#endif /* _RKISP_ISP_STATS_V2X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v3x.c b/drivers/media/platform/rockchip/isp/isp_stats_v3x.c -new file mode 100755 -index 000000000000..7d1883c37ba8 +new file mode 100644 +index 000000000..7d1883c37 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v3x.c @@ -0,0 +1,1309 @@ @@ -902677,8 +902700,8 @@ index 000000000000..7d1883c37ba8 + +} diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v3x.h b/drivers/media/platform/rockchip/isp/isp_stats_v3x.h -new file mode 100755 -index 000000000000..1b40c571f19e +new file mode 100644 +index 000000000..1b40c571f --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v3x.h @@ -0,0 +1,52 @@ @@ -902735,8 +902758,8 @@ index 000000000000..1b40c571f19e + +#endif /* _RKISP_ISP_STATS_V3X_H */ diff --git a/drivers/media/platform/rockchip/isp/procfs.c b/drivers/media/platform/rockchip/isp/procfs.c -new file mode 100755 -index 000000000000..4594789ac355 +new file mode 100644 +index 000000000..4594789ac --- /dev/null +++ b/drivers/media/platform/rockchip/isp/procfs.c @@ -0,0 +1,805 @@ @@ -903546,8 +903569,8 @@ index 000000000000..4594789ac355 + +#endif /* CONFIG_PROC_FS */ diff --git a/drivers/media/platform/rockchip/isp/procfs.h b/drivers/media/platform/rockchip/isp/procfs.h -new file mode 100755 -index 000000000000..09c650abc5cb +new file mode 100644 +index 000000000..09c650abc --- /dev/null +++ b/drivers/media/platform/rockchip/isp/procfs.h @@ -0,0 +1,21 @@ @@ -903573,8 +903596,8 @@ index 000000000000..09c650abc5cb + +#endif diff --git a/drivers/media/platform/rockchip/isp/regs.c b/drivers/media/platform/rockchip/isp/regs.c -new file mode 100755 -index 000000000000..908e05d8c6a0 +new file mode 100644 +index 000000000..908e05d8c --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs.c @@ -0,0 +1,328 @@ @@ -903907,8 +903930,8 @@ index 000000000000..908e05d8c6a0 + update_rsz_shadow(stream, async); +} diff --git a/drivers/media/platform/rockchip/isp/regs.h b/drivers/media/platform/rockchip/isp/regs.h -new file mode 100755 -index 000000000000..7b7f5972a3a9 +new file mode 100644 +index 000000000..7b7f5972a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs.h @@ -0,0 +1,2031 @@ @@ -905944,8 +905967,8 @@ index 000000000000..7b7f5972a3a9 + +#endif /* _RKISP_REGS_H */ diff --git a/drivers/media/platform/rockchip/isp/regs_v2x.h b/drivers/media/platform/rockchip/isp/regs_v2x.h -new file mode 100755 -index 000000000000..9e55bdfa7783 +new file mode 100644 +index 000000000..9e55bdfa7 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs_v2x.h @@ -0,0 +1,2717 @@ @@ -908667,8 +908690,8 @@ index 000000000000..9e55bdfa7783 + +#endif /* _RKISP_REGS_V2X_H */ diff --git a/drivers/media/platform/rockchip/isp/regs_v3x.h b/drivers/media/platform/rockchip/isp/regs_v3x.h -new file mode 100755 -index 000000000000..b8db3e46f439 +new file mode 100644 +index 000000000..b8db3e46f --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs_v3x.h @@ -0,0 +1,1822 @@ @@ -910495,8 +910518,8 @@ index 000000000000..b8db3e46f439 + +#endif /* _RKISP_REGS_V3X_H */ diff --git a/drivers/media/platform/rockchip/isp/rkisp.c b/drivers/media/platform/rockchip/isp/rkisp.c -new file mode 100755 -index 000000000000..31bbb5eb09d0 +new file mode 100644 +index 000000000..31bbb5eb0 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp.c @@ -0,0 +1,3578 @@ @@ -914079,8 +914102,8 @@ index 000000000000..31bbb5eb09d0 +} + diff --git a/drivers/media/platform/rockchip/isp/rkisp.h b/drivers/media/platform/rockchip/isp/rkisp.h -new file mode 100755 -index 000000000000..bb19692e8a87 +new file mode 100644 +index 000000000..bb19692e8 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp.h @@ -0,0 +1,197 @@ @@ -914282,8 +914305,8 @@ index 000000000000..bb19692e8a87 + +#endif /* _RKISP_H */ diff --git a/drivers/media/platform/rockchip/isp/rkisp_tb_helper.c b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.c -new file mode 100755 -index 000000000000..a32e5fe5e370 +new file mode 100644 +index 000000000..a32e5fe5e --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.c @@ -0,0 +1,266 @@ @@ -914554,8 +914577,8 @@ index 000000000000..a32e5fe5e370 +} +EXPORT_SYMBOL(rkisp_tb_get_state); diff --git a/drivers/media/platform/rockchip/isp/rkisp_tb_helper.h b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.h -new file mode 100755 -index 000000000000..79d06469a354 +new file mode 100644 +index 000000000..79d06469a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.h @@ -0,0 +1,33 @@ @@ -914593,8 +914616,8 @@ index 000000000000..79d06469a354 + +#endif diff --git a/drivers/media/platform/rockchip/isp/version.h b/drivers/media/platform/rockchip/isp/version.h -new file mode 100755 -index 000000000000..fd10553869e9 +new file mode 100644 +index 000000000..fd1055386 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/version.h @@ -0,0 +1,224 @@ @@ -914823,8 +914846,8 @@ index 000000000000..fd10553869e9 + +#endif diff --git a/drivers/media/platform/rockchip/isp/videobuf2-rdma-sg.c b/drivers/media/platform/rockchip/isp/videobuf2-rdma-sg.c -new file mode 100755 -index 000000000000..5fe71b21d930 +new file mode 100644 +index 000000000..5fe71b21d --- /dev/null +++ b/drivers/media/platform/rockchip/isp/videobuf2-rdma-sg.c @@ -0,0 +1,608 @@ @@ -915437,8 +915460,8 @@ index 000000000000..5fe71b21d930 +}; +EXPORT_SYMBOL_GPL(vb2_rdma_sg_memops); diff --git a/drivers/media/platform/rockchip/isp1/Kconfig b/drivers/media/platform/rockchip/isp1/Kconfig -new file mode 100755 -index 000000000000..5637cc758cc5 +new file mode 100644 +index 000000000..5637cc758 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/Kconfig @@ -0,0 +1,12 @@ @@ -915455,8 +915478,8 @@ index 000000000000..5637cc758cc5 + help + Support for ISP1 on the rockchip SoC. diff --git a/drivers/media/platform/rockchip/isp1/Makefile b/drivers/media/platform/rockchip/isp1/Makefile -new file mode 100755 -index 000000000000..788e3d97978a +new file mode 100644 +index 000000000..788e3d979 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/Makefile @@ -0,0 +1,10 @@ @@ -915471,8 +915494,8 @@ index 000000000000..788e3d97978a + capture.o \ + dmarx.o diff --git a/drivers/media/platform/rockchip/isp1/capture.c b/drivers/media/platform/rockchip/isp1/capture.c -new file mode 100755 -index 000000000000..e61d59a4000a +new file mode 100644 +index 000000000..e61d59a40 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/capture.c @@ -0,0 +1,2313 @@ @@ -917790,8 +917813,8 @@ index 000000000000..e61d59a4000a + } +} diff --git a/drivers/media/platform/rockchip/isp1/capture.h b/drivers/media/platform/rockchip/isp1/capture.h -new file mode 100755 -index 000000000000..8613618352e9 +new file mode 100644 +index 000000000..861361835 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/capture.h @@ -0,0 +1,219 @@ @@ -918015,8 +918038,8 @@ index 000000000000..8613618352e9 +int rkisp1_fop_release(struct file *file); +#endif /* _RKISP1_PATH_VIDEO_H */ diff --git a/drivers/media/platform/rockchip/isp1/common.h b/drivers/media/platform/rockchip/isp1/common.h -new file mode 100755 -index 000000000000..f20a0829c96c +new file mode 100644 +index 000000000..f20a0829c --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/common.h @@ -0,0 +1,133 @@ @@ -918154,8 +918177,8 @@ index 000000000000..f20a0829c96c + +#endif /* _RKISP1_COMMON_H */ diff --git a/drivers/media/platform/rockchip/isp1/dev.c b/drivers/media/platform/rockchip/isp1/dev.c -new file mode 100755 -index 000000000000..4e548f0ae81b +new file mode 100644 +index 000000000..4e548f0ae --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dev.c @@ -0,0 +1,1200 @@ @@ -919360,8 +919383,8 @@ index 000000000000..4e548f0ae81b +MODULE_DESCRIPTION("Rockchip ISP1 platform driver"); +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/media/platform/rockchip/isp1/dev.h b/drivers/media/platform/rockchip/isp1/dev.h -new file mode 100755 -index 000000000000..980f7711302d +new file mode 100644 +index 000000000..980f77113 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dev.h @@ -0,0 +1,173 @@ @@ -919539,8 +919562,8 @@ index 000000000000..980f7711302d + +#endif diff --git a/drivers/media/platform/rockchip/isp1/dmarx.c b/drivers/media/platform/rockchip/isp1/dmarx.c -new file mode 100755 -index 000000000000..7ac08d249c0b +new file mode 100644 +index 000000000..7ac08d249 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dmarx.c @@ -0,0 +1,687 @@ @@ -920232,8 +920255,8 @@ index 000000000000..7ac08d249c0b + } +} diff --git a/drivers/media/platform/rockchip/isp1/dmarx.h b/drivers/media/platform/rockchip/isp1/dmarx.h -new file mode 100755 -index 000000000000..abc3b39aa0b5 +new file mode 100644 +index 000000000..abc3b39aa --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dmarx.h @@ -0,0 +1,29 @@ @@ -920267,8 +920290,8 @@ index 000000000000..abc3b39aa0b5 +int rkisp1_register_dmarx_vdev(struct rkisp1_device *dev); +#endif /* _RKISP1_DMARX_H */ diff --git a/drivers/media/platform/rockchip/isp1/isp_params.c b/drivers/media/platform/rockchip/isp1/isp_params.c -new file mode 100755 -index 000000000000..5315aabf3957 +new file mode 100644 +index 000000000..5315aabf3 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_params.c @@ -0,0 +1,2655 @@ @@ -922928,8 +922951,8 @@ index 000000000000..5315aabf3957 + vb2_queue_release(vdev->queue); +} diff --git a/drivers/media/platform/rockchip/isp1/isp_params.h b/drivers/media/platform/rockchip/isp1/isp_params.h -new file mode 100755 -index 000000000000..ea707b7cf0e4 +new file mode 100644 +index 000000000..ea707b7cf --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_params.h @@ -0,0 +1,151 @@ @@ -923085,8 +923108,8 @@ index 000000000000..ea707b7cf0e4 + +#endif /* _RKISP1_ISP_H */ diff --git a/drivers/media/platform/rockchip/isp1/isp_stats.c b/drivers/media/platform/rockchip/isp1/isp_stats.c -new file mode 100755 -index 000000000000..b682f6a4f9d1 +new file mode 100644 +index 000000000..b682f6a4f --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_stats.c @@ -0,0 +1,684 @@ @@ -923775,8 +923798,8 @@ index 000000000000..b682f6a4f9d1 + vb2_queue_release(vdev->queue); +} diff --git a/drivers/media/platform/rockchip/isp1/isp_stats.h b/drivers/media/platform/rockchip/isp1/isp_stats.h -new file mode 100755 -index 000000000000..bdb4779b1f69 +new file mode 100644 +index 000000000..bdb4779b1 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_stats.h @@ -0,0 +1,112 @@ @@ -923893,8 +923916,8 @@ index 000000000000..bdb4779b1f69 + +#endif /* _RKISP1_ISP_STATS_H */ diff --git a/drivers/media/platform/rockchip/isp1/regs.c b/drivers/media/platform/rockchip/isp1/regs.c -new file mode 100755 -index 000000000000..82f6cd92475e +new file mode 100644 +index 000000000..82f6cd924 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/regs.c @@ -0,0 +1,244 @@ @@ -924143,8 +924166,8 @@ index 000000000000..82f6cd92475e + return !(readl(base + CIF_MI_CTRL_SHD) & CIF_MI_CTRL_SHD_SP_IN_ENABLED); +} diff --git a/drivers/media/platform/rockchip/isp1/regs.h b/drivers/media/platform/rockchip/isp1/regs.h -new file mode 100755 -index 000000000000..d31ef1b127f5 +new file mode 100644 +index 000000000..d31ef1b12 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/regs.h @@ -0,0 +1,1994 @@ @@ -926143,8 +926166,8 @@ index 000000000000..d31ef1b127f5 + +#endif /* _RKISP1_REGS_H */ diff --git a/drivers/media/platform/rockchip/isp1/rkisp1.c b/drivers/media/platform/rockchip/isp1/rkisp1.c -new file mode 100755 -index 000000000000..07246bca865c +new file mode 100644 +index 000000000..07246bca8 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/rkisp1.c @@ -0,0 +1,1873 @@ @@ -928022,8 +928045,8 @@ index 000000000000..07246bca865c +} + diff --git a/drivers/media/platform/rockchip/isp1/rkisp1.h b/drivers/media/platform/rockchip/isp1/rkisp1.h -new file mode 100755 -index 000000000000..afafc2c0f78f +new file mode 100644 +index 000000000..afafc2c0f --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/rkisp1.h @@ -0,0 +1,163 @@ @@ -928191,8 +928214,8 @@ index 000000000000..afafc2c0f78f + +#endif /* _RKISP1_H */ diff --git a/drivers/media/platform/rockchip/isp1/version.h b/drivers/media/platform/rockchip/isp1/version.h -new file mode 100755 -index 000000000000..3bfb0c98fd6e +new file mode 100644 +index 000000000..3bfb0c98f --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/version.h @@ -0,0 +1,61 @@ @@ -928258,8 +928281,8 @@ index 000000000000..3bfb0c98fd6e + +#endif diff --git a/drivers/media/platform/rockchip/ispp/Kconfig b/drivers/media/platform/rockchip/ispp/Kconfig -new file mode 100755 -index 000000000000..7de4f688633b +new file mode 100644 +index 000000000..7de4f6886 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/Kconfig @@ -0,0 +1,31 @@ @@ -928295,8 +928318,8 @@ index 000000000000..7de4f688633b + +endif diff --git a/drivers/media/platform/rockchip/ispp/Makefile b/drivers/media/platform/rockchip/ispp/Makefile -new file mode 100755 -index 000000000000..6148f70ff50a +new file mode 100644 +index 000000000..6148f70ff --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/Makefile @@ -0,0 +1,23 @@ @@ -928324,8 +928347,8 @@ index 000000000000..6148f70ff50a +video_rkispp-objs += fec.o +endif diff --git a/drivers/media/platform/rockchip/ispp/common.c b/drivers/media/platform/rockchip/ispp/common.c -new file mode 100755 -index 000000000000..91bd4cb96840 +new file mode 100644 +index 000000000..91bd4cb96 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/common.c @@ -0,0 +1,595 @@ @@ -928925,8 +928948,8 @@ index 000000000000..91bd4cb96840 + return false; +} diff --git a/drivers/media/platform/rockchip/ispp/common.h b/drivers/media/platform/rockchip/ispp/common.h -new file mode 100755 -index 000000000000..0d24cbb6c2d0 +new file mode 100644 +index 000000000..0d24cbb6c --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/common.h @@ -0,0 +1,145 @@ @@ -929076,8 +929099,8 @@ index 000000000000..0d24cbb6c2d0 +void rkispp_set_clk_rate(struct clk *clk, unsigned long rate); +#endif diff --git a/drivers/media/platform/rockchip/ispp/dev.c b/drivers/media/platform/rockchip/ispp/dev.c -new file mode 100755 -index 000000000000..54fa571f8de1 +new file mode 100644 +index 000000000..54fa571f8 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/dev.c @@ -0,0 +1,385 @@ @@ -929467,8 +929490,8 @@ index 000000000000..54fa571f8de1 +MODULE_DESCRIPTION("Rockchip ISPP platform driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/ispp/dev.h b/drivers/media/platform/rockchip/ispp/dev.h -new file mode 100755 -index 000000000000..32a6736bbb1c +new file mode 100644 +index 000000000..32a6736bb --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/dev.h @@ -0,0 +1,60 @@ @@ -929533,8 +929556,8 @@ index 000000000000..32a6736bbb1c +}; +#endif diff --git a/drivers/media/platform/rockchip/ispp/fec.c b/drivers/media/platform/rockchip/ispp/fec.c -new file mode 100755 -index 000000000000..a742dc18b8c7 +new file mode 100644 +index 000000000..a742dc18b --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/fec.c @@ -0,0 +1,480 @@ @@ -930019,8 +930042,8 @@ index 000000000000..a742dc18b8c7 + v4l2_device_unregister(&hw->fec_dev.v4l2_dev); +} diff --git a/drivers/media/platform/rockchip/ispp/fec.h b/drivers/media/platform/rockchip/ispp/fec.h -new file mode 100755 -index 000000000000..b89615a0747d +new file mode 100644 +index 000000000..b89615a07 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/fec.h @@ -0,0 +1,27 @@ @@ -930052,8 +930075,8 @@ index 000000000000..b89615a0747d + +#endif diff --git a/drivers/media/platform/rockchip/ispp/hw.c b/drivers/media/platform/rockchip/ispp/hw.c -new file mode 100755 -index 000000000000..2d0466070fd6 +new file mode 100644 +index 000000000..2d0466070 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/hw.c @@ -0,0 +1,510 @@ @@ -930568,8 +930591,8 @@ index 000000000000..2d0466070fd6 +module_init(rkispp_hw_drv_init); +#endif diff --git a/drivers/media/platform/rockchip/ispp/hw.h b/drivers/media/platform/rockchip/ispp/hw.h -new file mode 100755 -index 000000000000..8eb2585ecb71 +new file mode 100644 +index 000000000..8eb2585ec --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/hw.h @@ -0,0 +1,67 @@ @@ -930641,8 +930664,8 @@ index 000000000000..8eb2585ecb71 +void rkispp_soft_reset(struct rkispp_hw_dev *hw_dev); +#endif diff --git a/drivers/media/platform/rockchip/ispp/ispp.c b/drivers/media/platform/rockchip/ispp/ispp.c -new file mode 100755 -index 000000000000..e1efba145533 +new file mode 100644 +index 000000000..e1efba145 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/ispp.c @@ -0,0 +1,590 @@ @@ -931237,8 +931260,8 @@ index 000000000000..e1efba145533 + media_entity_cleanup(&sd->entity); +} diff --git a/drivers/media/platform/rockchip/ispp/ispp.h b/drivers/media/platform/rockchip/ispp/ispp.h -new file mode 100755 -index 000000000000..baa07a09352c +new file mode 100644 +index 000000000..baa07a093 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/ispp.h @@ -0,0 +1,50 @@ @@ -931293,8 +931316,8 @@ index 000000000000..baa07a09352c +void rkispp_unregister_subdev(struct rkispp_device *dev); +#endif diff --git a/drivers/media/platform/rockchip/ispp/params.c b/drivers/media/platform/rockchip/ispp/params.c -new file mode 100755 -index 000000000000..9d82b959b3c9 +new file mode 100644 +index 000000000..9d82b959b --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params.c @@ -0,0 +1,427 @@ @@ -931726,8 +931749,8 @@ index 000000000000..9d82b959b3c9 + vfree(params_vdev->cur_params); +} diff --git a/drivers/media/platform/rockchip/ispp/params.h b/drivers/media/platform/rockchip/ispp/params.h -new file mode 100755 -index 000000000000..a5083891ac1f +new file mode 100644 +index 000000000..a5083891a --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params.h @@ -0,0 +1,69 @@ @@ -931801,8 +931824,8 @@ index 000000000000..a5083891ac1f + +#endif diff --git a/drivers/media/platform/rockchip/ispp/params_v10.c b/drivers/media/platform/rockchip/ispp/params_v10.c -new file mode 100755 -index 000000000000..9430d0b84797 +new file mode 100644 +index 000000000..9430d0b84 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params_v10.c @@ -0,0 +1,739 @@ @@ -932546,8 +932569,8 @@ index 000000000000..9430d0b84797 + params_vdev->params_ops = &rkispp_params_ops; +} diff --git a/drivers/media/platform/rockchip/ispp/params_v20.c b/drivers/media/platform/rockchip/ispp/params_v20.c -new file mode 100755 -index 000000000000..03c944c8af0d +new file mode 100644 +index 000000000..03c944c8a --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params_v20.c @@ -0,0 +1,209 @@ @@ -932761,8 +932784,8 @@ index 000000000000..03c944c8af0d + params_vdev->params_ops = &rkispp_params_ops; +} diff --git a/drivers/media/platform/rockchip/ispp/procfs.c b/drivers/media/platform/rockchip/ispp/procfs.c -new file mode 100755 -index 000000000000..9cee3fc71ce1 +new file mode 100644 +index 000000000..9cee3fc71 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/procfs.c @@ -0,0 +1,143 @@ @@ -932910,8 +932933,8 @@ index 000000000000..9cee3fc71ce1 +} +#endif /* CONFIG_PROC_FS */ diff --git a/drivers/media/platform/rockchip/ispp/procfs.h b/drivers/media/platform/rockchip/ispp/procfs.h -new file mode 100755 -index 000000000000..21ea0c471b58 +new file mode 100644 +index 000000000..21ea0c471 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/procfs.h @@ -0,0 +1,21 @@ @@ -932937,8 +932960,8 @@ index 000000000000..21ea0c471b58 + +#endif diff --git a/drivers/media/platform/rockchip/ispp/regs.h b/drivers/media/platform/rockchip/ispp/regs.h -new file mode 100755 -index 000000000000..bc9f66766e0c +new file mode 100644 +index 000000000..bc9f66766 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/regs.h @@ -0,0 +1,523 @@ @@ -933466,8 +933489,8 @@ index 000000000000..bc9f66766e0c + +#endif /* _RKISPP_REGS_H */ diff --git a/drivers/media/platform/rockchip/ispp/stats.c b/drivers/media/platform/rockchip/ispp/stats.c -new file mode 100755 -index 000000000000..df011710b1aa +new file mode 100644 +index 000000000..df011710b --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stats.c @@ -0,0 +1,388 @@ @@ -933860,8 +933883,8 @@ index 000000000000..df011710b1aa +} + diff --git a/drivers/media/platform/rockchip/ispp/stats.h b/drivers/media/platform/rockchip/ispp/stats.h -new file mode 100755 -index 000000000000..e4d43bf25bde +new file mode 100644 +index 000000000..e4d43bf25 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stats.h @@ -0,0 +1,53 @@ @@ -933919,8 +933942,8 @@ index 000000000000..e4d43bf25bde + +#endif /* _RKISPP_STATS_H */ diff --git a/drivers/media/platform/rockchip/ispp/stream.c b/drivers/media/platform/rockchip/ispp/stream.c -new file mode 100755 -index 000000000000..a2f4a96bdec2 +new file mode 100644 +index 000000000..a2f4a96bd --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream.c @@ -0,0 +1,2016 @@ @@ -935941,8 +935964,8 @@ index 000000000000..a2f4a96bdec2 + } +} diff --git a/drivers/media/platform/rockchip/ispp/stream.h b/drivers/media/platform/rockchip/ispp/stream.h -new file mode 100755 -index 000000000000..8ffde026109d +new file mode 100644 +index 000000000..8ffde0261 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream.h @@ -0,0 +1,280 @@ @@ -936227,8 +936250,8 @@ index 000000000000..8ffde026109d +void rkispp_start_3a_run(struct rkispp_device *dev); +#endif diff --git a/drivers/media/platform/rockchip/ispp/stream_v10.c b/drivers/media/platform/rockchip/ispp/stream_v10.c -new file mode 100755 -index 000000000000..9a6ed6d89fda +new file mode 100644 +index 000000000..9a6ed6d89 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream_v10.c @@ -0,0 +1,1733 @@ @@ -937966,8 +937989,8 @@ index 000000000000..9a6ed6d89fda + stream_vdev->stream_ops = &rkispp_stream_ops; +} diff --git a/drivers/media/platform/rockchip/ispp/stream_v20.c b/drivers/media/platform/rockchip/ispp/stream_v20.c -new file mode 100755 -index 000000000000..728a9c0afdf8 +new file mode 100644 +index 000000000..728a9c0af --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream_v20.c @@ -0,0 +1,463 @@ @@ -938435,8 +938458,8 @@ index 000000000000..728a9c0afdf8 + stream_vdev->stream_ops = &rkispp_stream_ops; +} diff --git a/drivers/media/platform/rockchip/ispp/version.h b/drivers/media/platform/rockchip/ispp/version.h -new file mode 100755 -index 000000000000..b7f01737aa92 +new file mode 100644 +index 000000000..b7f01737a --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/version.h @@ -0,0 +1,138 @@ @@ -938579,7 +938602,7 @@ index 000000000000..b7f01737aa92 + +#endif diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c -index 6334f99f1854..e4603e2833d7 100644 +index c03e7f3e7..b3a568fdb 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -12,6 +12,7 @@ @@ -938590,7 +938613,7 @@ index 6334f99f1854..e4603e2833d7 100644 #include #include #include -@@ -2331,7 +2332,11 @@ static int uvc_probe(struct usb_interface *intf, +@@ -2346,7 +2347,11 @@ static int uvc_probe(struct usb_interface *intf, } uvc_trace(UVC_TRACE_PROBE, "UVC device initialized.\n"); @@ -938604,7 +938627,7 @@ index 6334f99f1854..e4603e2833d7 100644 error: diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c -index 33babe6e8b3a..1b5d4d99ec68 100644 +index 33babe6e8..1b5d4d99e 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, @@ -938669,7 +938692,7 @@ index 33babe6e8b3a..1b5d4d99ec68 100644 struct v4l2_async_notifier *notifier) { diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c -index d109b9f14407..fd755d98af84 100644 +index d109b9f14..fd755d98a 100644 --- a/drivers/mfd/rk808.c +++ b/drivers/mfd/rk808.c @@ -2,7 +2,7 @@ @@ -939905,10 +939928,10 @@ index d109b9f14407..fd755d98af84 100644 MODULE_LICENSE("GPL"); MODULE_AUTHOR("Chris Zhong "); diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c -index 599b7317b59a..f3f8000f0bb0 100644 +index 2c9f157ac..7423e3276 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c -@@ -2902,6 +2902,9 @@ static void mmc_blk_remove_debugfs(struct mmc_card *card, +@@ -2947,6 +2947,9 @@ static void mmc_blk_remove_debugfs(struct mmc_card *card, #endif /* CONFIG_DEBUG_FS */ @@ -939919,7 +939942,7 @@ index 599b7317b59a..f3f8000f0bb0 100644 { struct mmc_blk_data *md, *part_md; diff --git a/drivers/mmc/core/block.h b/drivers/mmc/core/block.h -index 31153f656f41..b71b3ec148f3 100644 +index 31153f656..b71b3ec14 100644 --- a/drivers/mmc/core/block.h +++ b/drivers/mmc/core/block.h @@ -17,4 +17,5 @@ struct work_struct; @@ -939929,7 +939952,7 @@ index 31153f656f41..b71b3ec148f3 100644 +extern struct mmc_card *this_card; #endif diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h -index a6c814fdbf0a..16746d211718 100644 +index a6c814fdb..16746d211 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); @@ -939942,10 +939965,10 @@ index a6c814fdbf0a..16746d211718 100644 extern bool use_spi_crc; diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c -index 03e2f965a96a..8d5e68527880 100644 +index b949a4468..9ca75caa1 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c -@@ -523,6 +523,9 @@ static int mmc_validate_host_caps(struct mmc_host *host) +@@ -549,6 +549,9 @@ static int mmc_validate_host_caps(struct mmc_host *host) return 0; } @@ -939955,7 +939978,7 @@ index 03e2f965a96a..8d5e68527880 100644 /** * mmc_add_host - initialise host hardware * @host: mmc host -@@ -591,3 +594,45 @@ void mmc_free_host(struct mmc_host *host) +@@ -618,3 +621,45 @@ void mmc_free_host(struct mmc_host *host) } EXPORT_SYMBOL(mmc_free_host); @@ -940002,7 +940025,7 @@ index 03e2f965a96a..8d5e68527880 100644 +} +EXPORT_SYMBOL(mmc_host_rescan); diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c -index 99a4ce68d82f..11b4cc339309 100644 +index 85c2947ed..ccaccc009 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -3,9 +3,15 @@ @@ -940713,7 +940736,7 @@ index 99a4ce68d82f..11b4cc339309 100644 +} +EXPORT_SYMBOL(sdio_reset_comm); diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile -index 451c25fc2c69..6dfb791fa621 100644 +index 451c25fc2..6dfb791fa 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -61,6 +61,7 @@ obj-$(CONFIG_MMC_DW_HI3798CV200) += dw_mmc-hi3798cv200.o @@ -940725,7 +940748,7 @@ index 451c25fc2c69..6dfb791fa621 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 753502ce3c85..ac2ef5ea0c8d 100644 +index 753502ce3..ac2ef5ea0 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 { @@ -940902,7 +940925,7 @@ index 753502ce3c85..ac2ef5ea0c8d 100644 return 0; } diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h -index da5923a92e60..0b53484e9306 100644 +index da5923a92..0b53484e9 100644 --- a/drivers/mmc/host/dw_mmc.h +++ b/drivers/mmc/host/dw_mmc.h @@ -230,6 +230,8 @@ struct dw_mci { @@ -940915,8 +940938,8 @@ index da5923a92e60..0b53484e9306 100644 /* DMA ops for Internal/External DMAC interface */ diff --git a/drivers/mmc/host/rk_sdmmc.h b/drivers/mmc/host/rk_sdmmc.h -new file mode 100755 -index 000000000000..cad989246002 +new file mode 100644 +index 000000000..cad989246 --- /dev/null +++ b/drivers/mmc/host/rk_sdmmc.h @@ -0,0 +1,387 @@ @@ -941308,8 +941331,8 @@ index 000000000000..cad989246002 + +#endif /* _DW_MMC_H_ */ diff --git a/drivers/mmc/host/rk_sdmmc_ops.c b/drivers/mmc/host/rk_sdmmc_ops.c -new file mode 100755 -index 000000000000..96f20d2dcfc7 +new file mode 100644 +index 000000000..96f20d2dc --- /dev/null +++ b/drivers/mmc/host/rk_sdmmc_ops.c @@ -0,0 +1,194 @@ @@ -941508,8 +941531,8 @@ index 000000000000..96f20d2dcfc7 + +MODULE_LICENSE("GPL"); diff --git a/drivers/mmc/host/rk_sdmmc_ops.h b/drivers/mmc/host/rk_sdmmc_ops.h -new file mode 100755 -index 000000000000..8261d69f561d +new file mode 100644 +index 000000000..8261d69f5 --- /dev/null +++ b/drivers/mmc/host/rk_sdmmc_ops.h @@ -0,0 +1,11 @@ @@ -941525,7 +941548,7 @@ index 000000000000..8261d69f561d + +#endif diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c -index 59d8d96ce206..f344bd300018 100644 +index 59d8d96ce..f344bd300 100644 --- a/drivers/mmc/host/sdhci-of-dwcmshc.c +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c @@ -9,9 +9,12 @@ @@ -941881,7 +941904,7 @@ index 59d8d96ce206..f344bd300018 100644 MODULE_DEVICE_TABLE(of, sdhci_dwcmshc_dt_ids); diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig -index 6c46f25b57e2..2cc533e4e239 100644 +index 6c46f25b5..2cc533e4e 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -462,6 +462,18 @@ config MTD_NAND_ARASAN @@ -941904,7 +941927,7 @@ index 6c46f25b57e2..2cc533e4e239 100644 config MTD_SM_COMMON diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile -index 2930f5b9015d..960c9be25204 100644 +index 2930f5b90..960c9be25 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 @@ -941917,7 +941940,7 @@ index 2930f5b9015d..960c9be25204 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 000000000000..796b678cb108 +index 000000000..796b678cb --- /dev/null +++ b/drivers/mtd/nand/raw/rockchip-nand-controller.c @@ -0,0 +1,1495 @@ @@ -943417,7 +943440,7 @@ index 000000000000..796b678cb108 +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 65b9e5846be4..7b25d960d0a2 100644 +index 65b9e5846..7b25d960d 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, @@ -943445,7 +943468,7 @@ index 65b9e5846be4..7b25d960d0a2 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 24e6145d4eae..be661832cef8 100644 +index 11ea4569c..c8c2fc10f 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 @@ -943459,8 +943482,8 @@ index 24e6145d4eae..be661832cef8 100644 obj-$(CONFIG_DWMAC_STI) += dwmac-sti.o obj-$(CONFIG_DWMAC_STM32) += dwmac-stm32.o diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.c -new file mode 100755 -index 000000000000..541788f9e2c8 +new file mode 100644 +index 000000000..541788f9e --- /dev/null +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.c @@ -0,0 +1,1613 @@ @@ -945078,8 +945101,8 @@ index 000000000000..541788f9e2c8 + return 0; +} diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.h b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.h -new file mode 100755 -index 000000000000..d71989b0fc74 +new file mode 100644 +index 000000000..d71989b0f --- /dev/null +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.h @@ -0,0 +1,25 @@ @@ -945109,7 +945132,7 @@ index 000000000000..d71989b0fc74 +#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 d0d47d91b460..31560a312fe2 100644 +index d0d47d91b..31560a312 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -11,6 +11,7 @@ @@ -946328,7 +946351,7 @@ index d0d47d91b460..31560a312fe2 100644 }; MODULE_DEVICE_TABLE(of, rk_gmac_dwmac_match); diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig -index 170a64e67709..46f5cc40788a 100644 +index 170a64e67..46f5cc407 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -48,6 +48,7 @@ source "drivers/net/wireless/st/Kconfig" @@ -946340,7 +946363,7 @@ index 170a64e67709..46f5cc40788a 100644 config PCMCIA_RAYCS tristate "Aviator/Raytheon 2.4GHz wireless support" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile -index 80b324499786..5671364ae98d 100644 +index 80b324499..5671364ae 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -30,3 +30,4 @@ obj-$(CONFIG_USB_NET_RNDIS_WLAN) += rndis_wlan.o @@ -946349,7 +946372,7 @@ index 80b324499786..5671364ae98d 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 8f01fcbe9396..9736aa0ab7fd 100644 +index 8f01fcbe9..9736aa0ab 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, @@ -946363,8 +946386,8 @@ index 8f01fcbe9396..9736aa0ab7fd 100644 break; case MWIFIEX_USB_EP_DATA: diff --git a/drivers/net/wireless/rockchip_wlan/Kconfig b/drivers/net/wireless/rockchip_wlan/Kconfig -new file mode 100755 -index 000000000000..d77741df5cc0 +new file mode 100644 +index 000000000..d77741df5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/Kconfig @@ -0,0 +1,39 @@ @@ -946408,8 +946431,8 @@ index 000000000000..d77741df5cc0 + +endif # WL_ROCKCHIP diff --git a/drivers/net/wireless/rockchip_wlan/Makefile b/drivers/net/wireless/rockchip_wlan/Makefile -new file mode 100755 -index 000000000000..8279a393719f +new file mode 100644 +index 000000000..8279a3937 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/Makefile @@ -0,0 +1,3 @@ @@ -946417,8 +946440,8 @@ index 000000000000..8279a393719f +obj-$(CONFIG_BCMDHD) += rkwifi/ +obj-$(CONFIG_WL_ROCKCHIP) += rkwifi/rk_wifi_config.o diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/Kconfig b/drivers/net/wireless/rockchip_wlan/rkwifi/Kconfig -new file mode 100755 -index 000000000000..2ec5138b79a7 +new file mode 100644 +index 000000000..2ec5138b7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/Kconfig @@ -0,0 +1,33 @@ @@ -946456,8 +946479,8 @@ index 000000000000..2ec5138b79a7 + help + default to add wlan1 interface diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/Makefile b/drivers/net/wireless/rockchip_wlan/rkwifi/Makefile -new file mode 100755 -index 000000000000..e4e2c6964a6b +new file mode 100644 +index 000000000..e4e2c6964 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/Makefile @@ -0,0 +1,10 @@ @@ -946472,8 +946495,8 @@ index 000000000000..e4e2c6964a6b +clean: + find . -name '*.o*' -exec rm -f {} \; diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Kconfig b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Kconfig -new file mode 100755 -index 000000000000..3e6e78888be2 +new file mode 100644 +index 000000000..3e6e78888 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Kconfig @@ -0,0 +1,59 @@ @@ -946537,8 +946560,8 @@ index 000000000000..3e6e78888be2 + Interrupt from SDIO DAT[1] +endchoice diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Makefile b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Makefile -new file mode 100755 -index 000000000000..b8b4c353ee61 +new file mode 100644 +index 000000000..b8b4c353e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Makefile @@ -0,0 +1,258 @@ @@ -946801,8 +946824,8 @@ index 000000000000..b8b4c353ee61 +EXTRA_CFLAGS += -Wno-unused-const-variable +EXTRA_CFLAGS += -Wno-non-literal-null-conversion diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/aiutils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/aiutils.c -new file mode 100755 -index 000000000000..cc0b854d34d5 +new file mode 100644 +index 000000000..cc0b854d3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/aiutils.c @@ -0,0 +1,2099 @@ @@ -948906,8 +948929,8 @@ index 000000000000..cc0b854d34d5 + SPINWAIT((R_REG(sii->osh, &ai->resetstatus) != 0), 300); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcm_app_utils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcm_app_utils.c -new file mode 100755 -index 000000000000..76490b575fae +new file mode 100644 +index 000000000..76490b575 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcm_app_utils.c @@ -0,0 +1,1033 @@ @@ -949945,8 +949968,8 @@ index 000000000000..76490b575fae + return res; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmbloom.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmbloom.c -new file mode 100755 -index 000000000000..80eb786f035a +new file mode 100644 +index 000000000..80eb786f0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmbloom.c @@ -0,0 +1,243 @@ @@ -950194,8 +950217,8 @@ index 000000000000..80eb786f035a + return BCME_OK; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmevent.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmevent.c -new file mode 100755 -index 000000000000..40bdb4bfda4f +new file mode 100644 +index 000000000..40bdb4bfd --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmevent.c @@ -0,0 +1,396 @@ @@ -950596,8 +950619,8 @@ index 000000000000..40bdb4bfda4f + return err; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh.c -new file mode 100755 -index 000000000000..b59edd7540ca +new file mode 100644 +index 000000000..b59edd754 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh.c @@ -0,0 +1,893 @@ @@ -951495,8 +951518,8 @@ index 000000000000..b59edd7540ca +} +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_linux.c -new file mode 100755 -index 000000000000..84cc71992635 +new file mode 100644 +index 000000000..84cc71992 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_linux.c @@ -0,0 +1,524 @@ @@ -952025,8 +952048,8 @@ index 000000000000..84cc71992635 + +#endif /* BCMSDH_MODULE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc.c -new file mode 100755 -index 000000000000..01f7fa23b2b3 +new file mode 100644 +index 000000000..01f7fa23b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc.c @@ -0,0 +1,1801 @@ @@ -953832,8 +953855,8 @@ index 000000000000..01f7fa23b2b3 + sdmmc_set_clock_rate(sd, hz); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc_linux.c -new file mode 100755 -index 000000000000..a2d34724f6c4 +new file mode 100644 +index 000000000..a2d34724f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc_linux.c @@ -0,0 +1,381 @@ @@ -954219,8 +954242,8 @@ index 000000000000..a2d34724f6c4 + sdio_unregister_driver(&bcmsdh_sdmmc_driver); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdspi_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdspi_linux.c -new file mode 100755 -index 000000000000..86d4cb9e3575 +new file mode 100644 +index 000000000..86d4cb9e3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdspi_linux.c @@ -0,0 +1,438 @@ @@ -954663,8 +954686,8 @@ index 000000000000..86d4cb9e3575 +} +#endif /* !BCMSPI_ANDROID */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmspibrcm.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmspibrcm.c -new file mode 100755 -index 000000000000..c0431638b995 +new file mode 100644 +index 000000000..c0431638b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmspibrcm.c @@ -0,0 +1,1800 @@ @@ -956469,8 +956492,8 @@ index 000000000000..c0431638b995 + return SDIOH_API_RC_FAIL; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmstdlib_s.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmstdlib_s.c -new file mode 100755 -index 000000000000..269db4c3c0c1 +new file mode 100644 +index 000000000..269db4c3c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmstdlib_s.c @@ -0,0 +1,314 @@ @@ -956789,8 +956812,8 @@ index 000000000000..269db4c3c0c1 + return (dlen + bytes_to_copy); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmutils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmutils.c -new file mode 100755 -index 000000000000..c9b01bd66820 +new file mode 100644 +index 000000000..c9b01bd66 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmutils.c @@ -0,0 +1,4379 @@ @@ -961174,8 +961197,8 @@ index 000000000000..c9b01bd66820 + } +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.c -new file mode 100755 -index 000000000000..fc916db9cb61 +new file mode 100644 +index 000000000..fc916db9c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.c @@ -0,0 +1,1494 @@ @@ -962674,8 +962697,8 @@ index 000000000000..fc916db9cb61 + return channel_width; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.h -new file mode 100755 -index 000000000000..ad3a6a4ae693 +new file mode 100644 +index 000000000..ad3a6a4ae --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.h @@ -0,0 +1,816 @@ @@ -963496,8 +963519,8 @@ index 000000000000..ad3a6a4ae693 +extern uint8 channel_bw_to_width(chanspec_t chspec); +#endif /* _bcmwifi_channels_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rates.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rates.h -new file mode 100755 -index 000000000000..196ff0fe0eff +new file mode 100644 +index 000000000..196ff0fe0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rates.h @@ -0,0 +1,832 @@ @@ -964334,8 +964357,8 @@ index 000000000000..196ff0fe0eff + +#endif /* _bcmwifi_rates_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rspec.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rspec.h -new file mode 100755 -index 000000000000..5c3d4a674814 +new file mode 100644 +index 000000000..5c3d4a674 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rspec.h @@ -0,0 +1,213 @@ @@ -964553,8 +964576,8 @@ index 000000000000..5c3d4a674814 + +#endif /* _bcmwifi_rspec_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmxtlv.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmxtlv.c -new file mode 100755 -index 000000000000..51d0f5aaf623 +new file mode 100644 +index 000000000..51d0f5aaf --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmxtlv.c @@ -0,0 +1,623 @@ @@ -965182,8 +965205,8 @@ index 000000000000..51d0f5aaf623 + return dst_next; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus.c -new file mode 100755 -index 000000000000..3de52fac5172 +new file mode 100644 +index 000000000..3de52fac5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus.c @@ -0,0 +1,2903 @@ @@ -968091,8 +968114,8 @@ index 000000000000..3de52fac5172 + +#endif /* #ifdef LINUX_EXTERNAL_MODULE_DBUS */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb.c -new file mode 100755 -index 000000000000..3be28b2da9d4 +new file mode 100644 +index 000000000..3be28b2da --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb.c @@ -0,0 +1,1173 @@ @@ -969270,8 +969293,8 @@ index 000000000000..3be28b2da9d4 + } +} /* dbus_bus_fw_get */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb_linux.c -new file mode 100755 -index 000000000000..2d999b12bc94 +new file mode 100644 +index 000000000..2d999b12b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb_linux.c @@ -0,0 +1,3404 @@ @@ -972680,8 +972703,8 @@ index 000000000000..2d999b12bc94 +} +#endif /* BCMUSBDEV_COMPOSITE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd.h -new file mode 100755 -index 000000000000..427e96ea33bb +new file mode 100644 +index 000000000..427e96ea3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd.h @@ -0,0 +1,3433 @@ @@ -976119,8 +976142,8 @@ index 000000000000..427e96ea33bb +#endif /* WL_MONITOR */ +#endif /* _dhd_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bus.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bus.h -new file mode 100755 -index 000000000000..c5b07cf493d9 +new file mode 100644 +index 000000000..c5b07cf49 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bus.h @@ -0,0 +1,357 @@ @@ -976482,8 +976505,8 @@ index 000000000000..c5b07cf493d9 +extern void dhd_bwm_bt_resume(struct dhd_bus *bus); +#endif /* _dhd_bus_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_buzzz.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_buzzz.h -new file mode 100755 -index 000000000000..342cc004d25a +new file mode 100644 +index 000000000..342cc004d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_buzzz.h @@ -0,0 +1,38 @@ @@ -976526,8 +976549,8 @@ index 000000000000..342cc004d25a + +#endif /* _DHD_BUZZZ_H_INCLUDED_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ccode.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ccode.c -new file mode 100755 -index 000000000000..fe9a826325e6 +new file mode 100644 +index 000000000..fe9a82632 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ccode.c @@ -0,0 +1,274 @@ @@ -976806,8 +976829,8 @@ index 000000000000..fe9a826325e6 +} +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cdc.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cdc.c -new file mode 100755 -index 000000000000..44cd1cbf24e6 +new file mode 100644 +index 000000000..44cd1cbf2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cdc.c @@ -0,0 +1,981 @@ @@ -977793,8 +977816,8 @@ index 000000000000..44cd1cbf24e6 + return 0; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.c -new file mode 100755 -index 000000000000..51a13e092a3e +new file mode 100644 +index 000000000..51a13e092 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.c @@ -0,0 +1,332 @@ @@ -978131,8 +978154,8 @@ index 000000000000..51a13e092a3e + return ret; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.h -new file mode 100755 -index 000000000000..88c2e0a16bcc +new file mode 100644 +index 000000000..88c2e0a16 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.h @@ -0,0 +1,55 @@ @@ -978192,8 +978215,8 @@ index 000000000000..88c2e0a16bcc +s32 wl_dongle_roam(struct net_device *ndev, u32 roamvar, u32 bcn_timeout); +#endif /* __DHD_CFG80211__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_common.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_common.c -new file mode 100755 -index 000000000000..df11fa183e60 +new file mode 100644 +index 000000000..df11fa183 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_common.c @@ -0,0 +1,7496 @@ @@ -985694,8 +985717,8 @@ index 000000000000..df11fa183e60 +} +#endif /* DISABLE_HE_ENAB || CUSTOM_CONTROL_HE_ENAB */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.c -new file mode 100755 -index 000000000000..c4713ded8a23 +new file mode 100644 +index 000000000..c4713ded8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.c @@ -0,0 +1,4730 @@ @@ -990430,8 +990453,8 @@ index 000000000000..c4713ded8a23 + dhd->conf = NULL; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.h -new file mode 100755 -index 000000000000..6af9c7b18013 +new file mode 100644 +index 000000000..6af9c7b18 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.h @@ -0,0 +1,384 @@ @@ -990820,8 +990843,8 @@ index 000000000000..6af9c7b18013 +#endif +#endif /* _dhd_config_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.c -new file mode 100755 -index 000000000000..dd1a0681bf4f +new file mode 100644 +index 000000000..dd1a0681b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.c @@ -0,0 +1,220 @@ @@ -991046,8 +991069,8 @@ index 000000000000..dd1a0681bf4f +} + diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.h -new file mode 100755 -index 000000000000..bcc712c2999b +new file mode 100644 +index 000000000..bcc712c29 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.h @@ -0,0 +1,77 @@ @@ -991129,8 +991152,8 @@ index 000000000000..bcc712c2999b +#endif /* __DHD_CSI_H__ */ + diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_gpio.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_gpio.c -new file mode 100755 -index 000000000000..8553e74562dc +new file mode 100644 +index 000000000..8553e7456 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_gpio.c @@ -0,0 +1,279 @@ @@ -991414,8 +991437,8 @@ index 000000000000..8553e74562dc + */ +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_hikey.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_hikey.c -new file mode 100755 -index 000000000000..8acb153a45e3 +new file mode 100644 +index 000000000..8acb153a4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_hikey.c @@ -0,0 +1,294 @@ @@ -991714,8 +991737,8 @@ index 000000000000..8acb153a45e3 +device_initcall(dhd_wlan_init); +#endif /* BOARD_HIKEY_MODULAR */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_memprealloc.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_memprealloc.c -new file mode 100755 -index 000000000000..1c0f3ca65e7a +new file mode 100644 +index 000000000..1c0f3ca65 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_memprealloc.c @@ -0,0 +1,562 @@ @@ -992282,8 +992305,8 @@ index 000000000000..1c0f3ca65e7a +EXPORT_SYMBOL(dhd_exit_wlan_mem); +#endif /* CONFIG_BROADCOM_WIFI_RESERVED_MEM */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg.h -new file mode 100755 -index 000000000000..4bc2511c6da2 +new file mode 100644 +index 000000000..4bc2511c6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg.h @@ -0,0 +1,367 @@ @@ -992655,8 +992678,8 @@ index 000000000000..4bc2511c6da2 + +#endif /* _dhd_dbg_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.c -new file mode 100755 -index 000000000000..c909431c0b46 +new file mode 100644 +index 000000000..c909431c0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.c @@ -0,0 +1,426 @@ @@ -993087,8 +993110,8 @@ index 000000000000..c909431c0b46 + memset(ring->ring_buf, 0, ring->ring_size); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.h -new file mode 100755 -index 000000000000..c6deb98f2ace +new file mode 100644 +index 000000000..c6deb98f2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.h @@ -0,0 +1,141 @@ @@ -993234,8 +993257,8 @@ index 000000000000..c6deb98f2ace +void dhd_dbg_ring_start(dhd_dbg_ring_t *ring); +#endif /* __DHD_DBG_RING_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.c -new file mode 100755 -index 000000000000..a6066289c543 +new file mode 100644 +index 000000000..a6066289c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.c @@ -0,0 +1,2411 @@ @@ -995651,8 +995674,8 @@ index 000000000000..a6066289c543 + MFREE(dhdp->osh, dhdp->dbg, sizeof(dhd_dbg_t)); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.h -new file mode 100755 -index 000000000000..008c45316f1c +new file mode 100644 +index 000000000..008c45316 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.h @@ -0,0 +1,853 @@ @@ -996510,8 +996533,8 @@ index 000000000000..008c45316f1c +#endif /* DHD_DEBUG */ +#endif /* _dhd_debug_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug_linux.c -new file mode 100755 -index 000000000000..2f33db421877 +new file mode 100644 +index 000000000..2f33db421 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug_linux.c @@ -0,0 +1,516 @@ @@ -997032,8 +997055,8 @@ index 000000000000..2f33db421877 + return dhd_dbg_detach(dhdp); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.c -new file mode 100755 -index 000000000000..d457437d39ed +new file mode 100644 +index 000000000..d457437d3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.c @@ -0,0 +1,1238 @@ @@ -998276,8 +998299,8 @@ index 000000000000..d457437d39ed + return BCME_OK; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.h -new file mode 100755 -index 000000000000..ac2639d19396 +new file mode 100644 +index 000000000..ac2639d19 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.h @@ -0,0 +1,289 @@ @@ -998571,8 +998594,8 @@ index 000000000000..ac2639d19396 +extern uint8 dhd_flow_rings_ifindex2role(dhd_pub_t *dhdp, uint8 ifindex); +#endif /* _dhd_flowrings_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_gpio.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_gpio.c -new file mode 100755 -index 000000000000..cdb70099fb19 +new file mode 100644 +index 000000000..cdb70099f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_gpio.c @@ -0,0 +1,350 @@ @@ -998927,8 +998950,8 @@ index 000000000000..cdb70099fb19 +} + diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.c -new file mode 100755 -index 000000000000..3772fdfca4e5 +new file mode 100644 +index 000000000..3772fdfca --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.c @@ -0,0 +1,1429 @@ @@ -1000362,8 +1000385,8 @@ index 000000000000..3772fdfca4e5 +} +#endif /* DHDTCPSYNC_FLOOD_BLK */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.h -new file mode 100755 -index 000000000000..45be081e3473 +new file mode 100644 +index 000000000..45be081e3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.h @@ -0,0 +1,97 @@ @@ -1000465,8 +1000488,8 @@ index 000000000000..45be081e3473 + +#endif /* _dhd_ip_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.c -new file mode 100755 -index 000000000000..b6d43d44d222 +new file mode 100644 +index 000000000..ae5ed32b7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.c @@ -0,0 +1,22464 @@ @@ -1022935,8 +1022958,8 @@ index 000000000000..b6d43d44d222 +} +#endif /* defiend(WLDWDS) && defined(FOURADDR_AUTO_BRG) */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.h -new file mode 100755 -index 000000000000..f2b295f54f5b +new file mode 100644 +index 000000000..f2b295f54 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.h @@ -0,0 +1,448 @@ @@ -1023389,8 +1023412,8 @@ index 000000000000..f2b295f54f5b + +#endif /* __DHD_LINUX_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_exportfs.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_exportfs.c -new file mode 100755 -index 000000000000..6518b357aa30 +new file mode 100644 +index 000000000..6518b357a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_exportfs.c @@ -0,0 +1,1420 @@ @@ -1024815,8 +1024838,8 @@ index 000000000000..6518b357aa30 + kobject_put(&dhd->dhd_conf_file_kobj); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_lb.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_lb.c -new file mode 100755 -index 000000000000..30dfaa2b7e41 +new file mode 100644 +index 000000000..30dfaa2b7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_lb.c @@ -0,0 +1,1324 @@ @@ -1026145,8 +1026168,8 @@ index 000000000000..30dfaa2b7e41 + +#endif /* DHD_LB_TXP */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.c -new file mode 100755 -index 000000000000..3efe02c9ed49 +new file mode 100644 +index 000000000..3efe02c9e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.c @@ -0,0 +1,1472 @@ @@ -1027623,8 +1027646,8 @@ index 000000000000..3efe02c9ed49 +} +#endif /* DHD_RX_DUMP */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.h -new file mode 100755 -index 000000000000..12bb32fd5dae +new file mode 100644 +index 000000000..12bb32fd5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.h @@ -0,0 +1,125 @@ @@ -1027754,8 +1027777,8 @@ index 000000000000..12bb32fd5dae + +#endif /* __DHD_LINUX_PKTDUMP_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_platdev.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_platdev.c -new file mode 100755 -index 000000000000..93961824abae +new file mode 100644 +index 000000000..93961824a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_platdev.c @@ -0,0 +1,1041 @@ @@ -1028801,8 +1028824,8 @@ index 000000000000..93961824abae + return err; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_priv.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_priv.h -new file mode 100755 -index 000000000000..9959c2c50141 +new file mode 100644 +index 000000000..9959c2c50 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_priv.h @@ -0,0 +1,432 @@ @@ -1029239,8 +1029262,8 @@ index 000000000000..9959c2c50141 + +#endif /* __DHD_LINUX_PRIV_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sched.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sched.c -new file mode 100755 -index 000000000000..7980b02c65ab +new file mode 100644 +index 000000000..7980b02c6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sched.c @@ -0,0 +1,52 @@ @@ -1029297,8 +1029320,8 @@ index 000000000000..7980b02c65ab + return rc; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.c -new file mode 100755 -index 000000000000..26c66add8aa3 +new file mode 100644 +index 000000000..26c66add8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.c @@ -0,0 +1,397 @@ @@ -1029700,8 +1029723,8 @@ index 000000000000..26c66add8aa3 + } +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.h -new file mode 100755 -index 000000000000..f6c77c4b30b0 +new file mode 100644 +index 000000000..f6c77c4b3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.h @@ -0,0 +1,93 @@ @@ -1029799,8 +1029822,8 @@ index 000000000000..f6c77c4b30b0 +void dhd_deferred_work_set_skip(void *work, u8 event, bool set); +#endif /* _dhd_linux_wq_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.c -new file mode 100755 -index 000000000000..713422a713cc +new file mode 100644 +index 000000000..713422a71 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.c @@ -0,0 +1,789 @@ @@ -1030594,8 +1030617,8 @@ index 000000000000..713422a713cc +} +#endif /* SHOW_LOGTRACE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.h -new file mode 100755 -index 000000000000..4645ccb890ab +new file mode 100644 +index 000000000..4645ccb89 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.h @@ -0,0 +1,40 @@ @@ -1030640,8 +1030663,8 @@ index 000000000000..4645ccb890ab + +#endif /* _dhd_mschdbg_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_msgbuf.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_msgbuf.c -new file mode 100755 -index 000000000000..ab8c9b399308 +new file mode 100644 +index 000000000..ab8c9b399 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_msgbuf.c @@ -0,0 +1,11162 @@ @@ -1041808,8 +1041831,8 @@ index 000000000000..ab8c9b399308 +} +#endif /* DHD_MAP_LOGGING */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.c -new file mode 100755 -index 000000000000..45dd0e66ea04 +new file mode 100644 +index 000000000..45dd0e66e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.c @@ -0,0 +1,11618 @@ @@ -1053432,8 +1053455,8 @@ index 000000000000..45dd0e66ea04 + return TRUE; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.h -new file mode 100755 -index 000000000000..9fe53dcf0b02 +new file mode 100644 +index 000000000..9fe53dcf0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.h @@ -0,0 +1,596 @@ @@ -1054034,8 +1054057,8 @@ index 000000000000..9fe53dcf0b02 + +#endif /* dhd_pcie_h */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie_linux.c -new file mode 100755 -index 000000000000..3fb799247421 +new file mode 100644 +index 000000000..3fb799247 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie_linux.c @@ -0,0 +1,2738 @@ @@ -1056778,8 +1056801,8 @@ index 000000000000..3fb799247421 +} +EXPORT_SYMBOL(dhd_bus_check_driver_up); diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.c -new file mode 100755 -index 000000000000..005c03e3d181 +new file mode 100644 +index 000000000..005c03e3d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.c @@ -0,0 +1,4458 @@ @@ -1061242,8 +1061265,8 @@ index 000000000000..005c03e3d181 +} +#endif /* PNO_SUPPORT */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.h -new file mode 100755 -index 000000000000..903a732554c0 +new file mode 100644 +index 000000000..903a73255 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.h @@ -0,0 +1,590 @@ @@ -1061838,8 +1061861,8 @@ index 000000000000..903a732554c0 + +#endif /* __DHD_PNO_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_proto.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_proto.h -new file mode 100755 -index 000000000000..b83c1bdc0b83 +new file mode 100644 +index 000000000..b83c1bdc0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_proto.h @@ -0,0 +1,243 @@ @@ -1062087,8 +1062110,8 @@ index 000000000000..b83c1bdc0b83 +#endif /* DHD_MAP_LOGGING */ +#endif /* _dhd_proto_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.c -new file mode 100755 -index 000000000000..49e367890f47 +new file mode 100644 +index 000000000..49e367890 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.c @@ -0,0 +1,4103 @@ @@ -1066196,8 +1066219,8 @@ index 000000000000..49e367890f47 + return err; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.h -new file mode 100755 -index 000000000000..d0c6af209db6 +new file mode 100644 +index 000000000..d0c6af209 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.h @@ -0,0 +1,537 @@ @@ -1066739,8 +1066762,8 @@ index 000000000000..d0c6af209db6 + +#endif /* __DHD_RTT_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_sdio.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_sdio.c -new file mode 100755 -index 000000000000..3638be21d754 +new file mode 100644 +index 000000000..3638be21d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_sdio.c @@ -0,0 +1,10489 @@ @@ -1077235,8 +1077258,8 @@ index 000000000000..3638be21d754 +} \ No newline at end of file diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_static_buf.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_static_buf.c -new file mode 100755 -index 000000000000..2df6b62cd6b2 +new file mode 100644 +index 000000000..2df6b62cd --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_static_buf.c @@ -0,0 +1,586 @@ @@ -1077827,8 +1077850,8 @@ index 000000000000..2df6b62cd6b2 + +module_exit(dhd_static_buf_exit); diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.c -new file mode 100755 -index 000000000000..bafcb0b5c7e4 +new file mode 100644 +index 000000000..bafcb0b5c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.c @@ -0,0 +1,4616 @@ @@ -1082449,8 +1082472,8 @@ index 000000000000..bafcb0b5c7e4 + +#endif /* PROP_TXSTATUS */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.h -new file mode 100755 -index 000000000000..b8ee0f14efe2 +new file mode 100644 +index 000000000..b8ee0f14e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.h @@ -0,0 +1,796 @@ @@ -1083251,8 +1083274,8 @@ index 000000000000..b8ee0f14efe2 + +#endif /* __wlfc_host_driver_definitions_h__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_stats.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_stats.h -new file mode 100755 -index 000000000000..5bd8e4613da0 +new file mode 100644 +index 000000000..5bd8e4613 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_stats.h @@ -0,0 +1,387 @@ @@ -1083644,8 +1083667,8 @@ index 000000000000..5bd8e4613da0 + +#endif /* _dngl_stats_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_wlhdr.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_wlhdr.h -new file mode 100755 -index 000000000000..d71ebb65d63d +new file mode 100644 +index 000000000..d71ebb65d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_wlhdr.h @@ -0,0 +1,44 @@ @@ -1083694,8 +1083717,8 @@ index 000000000000..d71ebb65d63d +#define WL_HEADER_VER 1 +#endif /* _dngl_wlhdr_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.c -new file mode 100755 -index 000000000000..fa9ff43e5c2c +new file mode 100644 +index 000000000..fa9ff43e5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.c @@ -0,0 +1,113 @@ @@ -1083813,8 +1083836,8 @@ index 000000000000..fa9ff43e5c2c + return bcm_tlv_dot11_defrag(buf, buf_len, id, id_ext, NULL, ie_len); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.h -new file mode 100755 -index 000000000000..57c149dfdff3 +new file mode 100644 +index 000000000..57c149dfd --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.h @@ -0,0 +1,39 @@ @@ -1083858,8 +1083881,8 @@ index 000000000000..57c149dfdff3 + +#endif /* __FRAG_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hdf_public_ap6275s.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hdf_public_ap6275s.h -new file mode 100755 -index 000000000000..5daf2bfb6c49 +new file mode 100644 +index 000000000..5daf2bfb6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hdf_public_ap6275s.h @@ -0,0 +1,125 @@ @@ -1083989,8 +1084012,8 @@ index 000000000000..5daf2bfb6c49 +extern int32_t HdfConnect(NetDevice *hnetDev, WlanConnectParams *param); +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktpool.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktpool.c -new file mode 100755 -index 000000000000..09c2520b8fec +new file mode 100644 +index 000000000..09c2520b8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktpool.c @@ -0,0 +1,1428 @@ @@ -1085423,8 +1085446,8 @@ index 000000000000..09c2520b8fec +} +#endif /* BCMPKTPOOL */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktq.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktq.c -new file mode 100755 -index 000000000000..f4768ff69096 +new file mode 100644 +index 000000000..f4768ff69 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktq.c @@ -0,0 +1,1429 @@ @@ -1086858,8 +1086881,8 @@ index 000000000000..f4768ff69096 + +#endif /* HND_PKTQ_THREAD_SAFE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndlhl.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndlhl.c -new file mode 100755 -index 000000000000..fd229c2f585b +new file mode 100644 +index 000000000..fd229c2f5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndlhl.c @@ -0,0 +1,538 @@ @@ -1087402,8 +1087425,8 @@ index 000000000000..fd229c2f585b + } +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndmem.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndmem.c -new file mode 100755 -index 000000000000..fde6108c50e2 +new file mode 100644 +index 000000000..fde6108c5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndmem.c @@ -0,0 +1,430 @@ @@ -1087838,8 +1087861,8 @@ index 000000000000..fde6108c50e2 + return err; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndpmu.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndpmu.c -new file mode 100755 -index 000000000000..cb8294f25274 +new file mode 100644 +index 000000000..cb8294f25 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndpmu.c @@ -0,0 +1,789 @@ @@ -1088633,8 +1088656,8 @@ index 000000000000..cb8294f25274 +} +#endif /* BCMPMU_STATS */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11.h -new file mode 100755 -index 000000000000..cd46e747cc8b +new file mode 100644 +index 000000000..cd46e747c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11.h @@ -0,0 +1,5364 @@ @@ -1094003,8 +1094026,8 @@ index 000000000000..cd46e747cc8b + +#endif /* _802_11_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11e.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11e.h -new file mode 100755 -index 000000000000..7b1414961ee1 +new file mode 100644 +index 000000000..7b1414961 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11e.h @@ -0,0 +1,140 @@ @@ -1094149,8 +1094172,8 @@ index 000000000000..7b1414961ee1 + +#endif /* _802_11e_CAC_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11s.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11s.h -new file mode 100755 -index 000000000000..91ca2f3b1ce4 +new file mode 100644 +index 000000000..91ca2f3b1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11s.h @@ -0,0 +1,335 @@ @@ -1094490,8 +1094513,8 @@ index 000000000000..91ca2f3b1ce4 + +#endif /* #ifndef _802_11s_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.1d.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.1d.h -new file mode 100755 -index 000000000000..06364be73fa8 +new file mode 100644 +index 000000000..06364be73 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.1d.h @@ -0,0 +1,54 @@ @@ -1094550,8 +1094573,8 @@ index 000000000000..06364be73fa8 + +#endif /* _802_1_D__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.3.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.3.h -new file mode 100755 -index 000000000000..496ca3a3795e +new file mode 100644 +index 000000000..496ca3a37 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.3.h @@ -0,0 +1,56 @@ @@ -1094612,8 +1094635,8 @@ index 000000000000..496ca3a3795e + +#endif /* #ifndef _802_3_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/aidmp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/aidmp.h -new file mode 100755 -index 000000000000..8c826062d436 +new file mode 100644 +index 000000000..8c826062d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/aidmp.h @@ -0,0 +1,430 @@ @@ -1095048,8 +1095071,8 @@ index 000000000000..8c826062d436 + +#endif /* _AIDMP_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_cfg.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_cfg.h -new file mode 100755 -index 000000000000..63c72e481fe8 +new file mode 100644 +index 000000000..63c72e481 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_cfg.h @@ -0,0 +1,33 @@ @@ -1095087,8 +1095110,8 @@ index 000000000000..63c72e481fe8 +#define _bcm_cfg_h_ +#endif /* _bcm_cfg_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_mpool_pub.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_mpool_pub.h -new file mode 100755 -index 000000000000..347d53a862d2 +new file mode 100644 +index 000000000..347d53a86 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_mpool_pub.h @@ -0,0 +1,351 @@ @@ -1095444,8 +1095467,8 @@ index 000000000000..347d53a862d2 + +#endif /* _BCM_MPOOL_PUB_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_ring.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_ring.h -new file mode 100755 -index 000000000000..978e5dd2f554 +new file mode 100644 +index 000000000..978e5dd2f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_ring.h @@ -0,0 +1,614 @@ @@ -1096064,8 +1096087,8 @@ index 000000000000..978e5dd2f554 + +#endif /* ! __bcm_ring_h_included__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmarp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmarp.h -new file mode 100755 -index 000000000000..f0fc3e32fda9 +new file mode 100644 +index 000000000..f0fc3e32f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmarp.h @@ -0,0 +1,91 @@ @@ -1096161,8 +1096184,8 @@ index 000000000000..f0fc3e32fda9 + +#endif /* !defined(_bcmarp_h_) */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmbloom.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmbloom.h -new file mode 100755 -index 000000000000..cb572307e126 +new file mode 100644 +index 000000000..cb572307e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmbloom.h @@ -0,0 +1,80 @@ @@ -1096247,8 +1096270,8 @@ index 000000000000..cb572307e126 + +#endif /* _bcmbloom_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmcdc.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmcdc.h -new file mode 100755 -index 000000000000..e88366426909 +new file mode 100644 +index 000000000..e88366426 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmcdc.h @@ -0,0 +1,122 @@ @@ -1096375,8 +1096398,8 @@ index 000000000000..e88366426909 + +#endif /* _bcmcdc_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdefs.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdefs.h -new file mode 100755 -index 000000000000..393ec7d10e12 +new file mode 100644 +index 000000000..393ec7d10 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdefs.h @@ -0,0 +1,616 @@ @@ -1096997,8 +1097020,8 @@ index 000000000000..393ec7d10e12 + +#endif /* _bcmdefs_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdevs.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdevs.h -new file mode 100755 -index 000000000000..afc6b54d9e0b +new file mode 100644 +index 000000000..afc6b54d9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdevs.h @@ -0,0 +1,945 @@ @@ -1097948,8 +1097971,8 @@ index 000000000000..afc6b54d9e0b + +#endif /* _BCMDEVS_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdhcp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdhcp.h -new file mode 100755 -index 000000000000..da46d1a717b5 +new file mode 100644 +index 000000000..da46d1a71 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdhcp.h @@ -0,0 +1,93 @@ @@ -1098047,8 +1098070,8 @@ index 000000000000..da46d1a717b5 + +#endif /* #ifndef _bcmdhcp_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmendian.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmendian.h -new file mode 100755 -index 000000000000..7eecf9f16115 +new file mode 100644 +index 000000000..7eecf9f16 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmendian.h @@ -0,0 +1,417 @@ @@ -1098470,8 +1098493,8 @@ index 000000000000..7eecf9f16115 +#endif /* !__GNUC__ */ +#endif /* !_BCMENDIAN_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmeth.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmeth.h -new file mode 100755 -index 000000000000..4ac3c376ca98 +new file mode 100644 +index 000000000..4ac3c376c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmeth.h @@ -0,0 +1,116 @@ @@ -1098592,8 +1098615,8 @@ index 000000000000..4ac3c376ca98 + +#endif /* _BCMETH_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmevent.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmevent.h -new file mode 100755 -index 000000000000..fc47263e81e2 +new file mode 100644 +index 000000000..fc47263e8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmevent.h @@ -0,0 +1,1297 @@ @@ -1099895,8 +1099918,8 @@ index 000000000000..fc47263e81e2 + +#endif /* _BCMEVENT_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmicmp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmicmp.h -new file mode 100755 -index 000000000000..472ec722339b +new file mode 100644 +index 000000000..472ec7223 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmicmp.h @@ -0,0 +1,90 @@ @@ -1099991,8 +1100014,8 @@ index 000000000000..472ec722339b + +#endif /* #ifndef _bcmicmp_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmiov.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmiov.h -new file mode 100755 -index 000000000000..42633f8c7d32 +new file mode 100644 +index 000000000..42633f8c7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmiov.h @@ -0,0 +1,357 @@ @@ -1100354,8 +1100377,8 @@ index 000000000000..42633f8c7d32 + +#endif /* _bcmiov_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmip.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmip.h -new file mode 100755 -index 000000000000..cec5b903c6f4 +new file mode 100644 +index 000000000..cec5b903c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmip.h @@ -0,0 +1,251 @@ @@ -1100611,8 +1100634,8 @@ index 000000000000..cec5b903c6f4 + +#endif /* _bcmip_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmipv6.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmipv6.h -new file mode 100755 -index 000000000000..88cac9009183 +new file mode 100644 +index 000000000..88cac9009 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmipv6.h @@ -0,0 +1,162 @@ @@ -1100779,8 +1100802,8 @@ index 000000000000..88cac9009183 + +#endif /* !defined(_bcmipv6_h_) */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmmsgbuf.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmmsgbuf.h -new file mode 100755 -index 000000000000..4215d3298c21 +new file mode 100644 +index 000000000..4215d3298 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmmsgbuf.h @@ -0,0 +1,1395 @@ @@ -1102180,8 +1102203,8 @@ index 000000000000..4215d3298c21 + +#endif /* _bcmmsgbuf_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmnvram.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmnvram.h -new file mode 100755 -index 000000000000..988ac4813a5f +new file mode 100644 +index 000000000..988ac4813 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmnvram.h @@ -0,0 +1,329 @@ @@ -1102515,8 +1102538,8 @@ index 000000000000..988ac4813a5f + +#endif /* _bcmnvram_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcie.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcie.h -new file mode 100755 -index 000000000000..8f80018ac9dd +new file mode 100644 +index 000000000..8f80018ac --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcie.h @@ -0,0 +1,537 @@ @@ -1103058,8 +1103081,8 @@ index 000000000000..8f80018ac9dd + +#endif /* _bcmpcie_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcispi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcispi.h -new file mode 100755 -index 000000000000..6308a3aaf7f5 +new file mode 100644 +index 000000000..6308a3aaf --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcispi.h @@ -0,0 +1,182 @@ @@ -1103246,8 +1103269,8 @@ index 000000000000..6308a3aaf7f5 + +#endif /* _BCM_PCI_SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmperf.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmperf.h -new file mode 100755 -index 000000000000..8ac9001f55eb +new file mode 100644 +index 000000000..8ac9001f5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmperf.h @@ -0,0 +1,40 @@ @@ -1103292,8 +1103315,8 @@ index 000000000000..8ac9001f55eb +#define BCMPERF_GETINSTRCOUNT(x) ((x) = 0) +#endif /* _BCMPERF_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdbus.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdbus.h -new file mode 100755 -index 000000000000..b9759b9b186e +new file mode 100644 +index 000000000..b9759b9b1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdbus.h @@ -0,0 +1,184 @@ @@ -1103482,8 +1103505,8 @@ index 000000000000..b9759b9b186e + +#endif /* _sdio_api_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh.h -new file mode 100755 -index 000000000000..b2300ec635c6 +new file mode 100644 +index 000000000..b2300ec63 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh.h @@ -0,0 +1,279 @@ @@ -1103767,8 +1103790,8 @@ index 000000000000..b2300ec635c6 + +#endif /* _bcmsdh_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh_sdmmc.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh_sdmmc.h -new file mode 100755 -index 000000000000..4e3c72d194ce +new file mode 100644 +index 000000000..4e3c72d19 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh_sdmmc.h @@ -0,0 +1,130 @@ @@ -1103903,8 +1103926,8 @@ index 000000000000..4e3c72d194ce + +#endif /* __BCMSDH_SDMMC_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdpcm.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdpcm.h -new file mode 100755 -index 000000000000..09a81c24398f +new file mode 100644 +index 000000000..09a81c243 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdpcm.h @@ -0,0 +1,310 @@ @@ -1104219,8 +1104242,8 @@ index 000000000000..09a81c24398f + +#endif /* _bcmsdpcm_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdspi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdspi.h -new file mode 100755 -index 000000000000..2d299a140cb3 +new file mode 100644 +index 000000000..2d299a140 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdspi.h @@ -0,0 +1,139 @@ @@ -1104364,8 +1104387,8 @@ index 000000000000..2d299a140cb3 + +#endif /* _BCM_SD_SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdstd.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdstd.h -new file mode 100755 -index 000000000000..5132d4340ecd +new file mode 100644 +index 000000000..5132d4340 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdstd.h @@ -0,0 +1,282 @@ @@ -1104652,8 +1104675,8 @@ index 000000000000..5132d4340ecd +extern SDIOH_API_RC sdioh_detach(osl_t *osh, sdioh_info_t *sd); +#endif /* _BCM_SD_STD_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspi.h -new file mode 100755 -index 000000000000..6f71ddc9519e +new file mode 100644 +index 000000000..6f71ddc95 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspi.h @@ -0,0 +1,44 @@ @@ -1104702,8 +1104725,8 @@ index 000000000000..6f71ddc9519e + +#endif /* _BCM_SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspibrcm.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspibrcm.h -new file mode 100755 -index 000000000000..2d9f972496c3 +new file mode 100644 +index 000000000..2d9f97249 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspibrcm.h @@ -0,0 +1,168 @@ @@ -1104876,8 +1104899,8 @@ index 000000000000..2d9f972496c3 + +#endif /* _BCM_SPI_BRCM_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_fmt.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_fmt.h -new file mode 100755 -index 000000000000..e1bd05548c1f +new file mode 100644 +index 000000000..e1bd05548 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_fmt.h @@ -0,0 +1,1014 @@ @@ -1105896,8 +1105919,8 @@ index 000000000000..e1bd05548c1f + +#endif /* _bcmsrom_fmt_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_tbl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_tbl.h -new file mode 100755 -index 000000000000..aa72338de34f +new file mode 100644 +index 000000000..aa72338de --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_tbl.h @@ -0,0 +1,1459 @@ @@ -1107361,8 +1107384,8 @@ index 000000000000..aa72338de34f + +#endif /* _bcmsrom_tbl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmstdlib_s.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmstdlib_s.h -new file mode 100755 -index 000000000000..b80b3195fda5 +new file mode 100644 +index 000000000..b80b3195f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmstdlib_s.h @@ -0,0 +1,52 @@ @@ -1107419,8 +1107442,8 @@ index 000000000000..b80b3195fda5 +#endif /* !BWL_NO_INTERNAL_STDLIB_SUPPORT */ +#endif /* _bcmstdlib_s_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtcp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtcp.h -new file mode 100755 -index 000000000000..6803cad809c3 +new file mode 100644 +index 000000000..6803cad80 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtcp.h @@ -0,0 +1,93 @@ @@ -1107518,8 +1107541,8 @@ index 000000000000..6803cad809c3 + +#endif /* #ifndef _bcmtcp_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtlv.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtlv.h -new file mode 100755 -index 000000000000..279840e41a35 +new file mode 100644 +index 000000000..279840e41 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtlv.h @@ -0,0 +1,343 @@ @@ -1107867,8 +1107890,8 @@ index 000000000000..279840e41a35 + +#endif /* _bcmtlv_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmudp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmudp.h -new file mode 100755 -index 000000000000..397bc5985e25 +new file mode 100644 +index 000000000..397bc5985 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmudp.h @@ -0,0 +1,61 @@ @@ -1107934,8 +1107957,8 @@ index 000000000000..397bc5985e25 + +#endif /* #ifndef _bcmudp_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmutils.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmutils.h -new file mode 100755 -index 000000000000..c779ea07ea2d +new file mode 100644 +index 000000000..c779ea07e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmutils.h @@ -0,0 +1,1342 @@ @@ -1109282,8 +1109305,8 @@ index 000000000000..c779ea07ea2d + +#endif /* _bcmutils_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/brcm_nl80211.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/brcm_nl80211.h -new file mode 100755 -index 000000000000..0e0aa766a678 +new file mode 100644 +index 000000000..0e0aa766a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/brcm_nl80211.h @@ -0,0 +1,73 @@ @@ -1109361,8 +1109384,8 @@ index 000000000000..0e0aa766a678 + +#endif /* _brcm_nl80211_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dbus.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dbus.h -new file mode 100755 -index 000000000000..e4b87288b3d6 +new file mode 100644 +index 000000000..e4b87288b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dbus.h @@ -0,0 +1,599 @@ @@ -1109966,8 +1109989,8 @@ index 000000000000..e4b87288b3d6 +void dbus_flowctrl_tx(void *dbi, bool on); +#endif /* __DBUS_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhd_daemon.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhd_daemon.h -new file mode 100755 -index 000000000000..785b440116cc +new file mode 100644 +index 000000000..785b44011 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhd_daemon.h @@ -0,0 +1,67 @@ @@ -1110039,8 +1110062,8 @@ index 000000000000..785b440116cc + +#endif /* __BCM_DHDD_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhdioctl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhdioctl.h -new file mode 100755 -index 000000000000..f7012a0f5115 +new file mode 100644 +index 000000000..f7012a0f5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhdioctl.h @@ -0,0 +1,278 @@ @@ -1110323,8 +1110346,8 @@ index 000000000000..f7012a0f5115 + +#endif /* _dhdioctl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglevent.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglevent.h -new file mode 100755 -index 000000000000..ec2cbbaf0b1f +new file mode 100644 +index 000000000..ec2cbbaf0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglevent.h @@ -0,0 +1,142 @@ @@ -1110471,8 +1110494,8 @@ index 000000000000..ec2cbbaf0b1f + +#endif /* _DNGLEVENT_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/eapol.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/eapol.h -new file mode 100755 -index 000000000000..08a296828189 +new file mode 100644 +index 000000000..08a296828 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/eapol.h @@ -0,0 +1,283 @@ @@ -1110760,8 +1110783,8 @@ index 000000000000..08a296828189 + +#endif /* _eapol_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/epivers.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/epivers.h -new file mode 100755 -index 000000000000..23f8d324361b +new file mode 100644 +index 000000000..23f8d3243 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/epivers.h @@ -0,0 +1,52 @@ @@ -1110818,8 +1110841,8 @@ index 000000000000..23f8d324361b + +#endif /* _epivers_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/etd.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/etd.h -new file mode 100755 -index 000000000000..a2181daf525e +new file mode 100644 +index 000000000..a2181daf5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/etd.h @@ -0,0 +1,626 @@ @@ -1111450,8 +1111473,8 @@ index 000000000000..a2181daf525e + +#endif /* _ETD_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/ethernet.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/ethernet.h -new file mode 100755 -index 000000000000..41c9b62b0d5c +new file mode 100644 +index 000000000..41c9b62b0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/ethernet.h @@ -0,0 +1,225 @@ @@ -1111681,8 +1111704,8 @@ index 000000000000..41c9b62b0d5c + +#endif /* _NET_ETHERNET_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log.h -new file mode 100755 -index 000000000000..e43715d72646 +new file mode 100644 +index 000000000..e43715d72 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log.h @@ -0,0 +1,423 @@ @@ -1112110,8 +1112133,8 @@ index 000000000000..e43715d72646 + +#endif /* _EVENT_LOG_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_payload.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_payload.h -new file mode 100755 -index 000000000000..fc110219ec75 +new file mode 100644 +index 000000000..fc110219e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_payload.h @@ -0,0 +1,1017 @@ @@ -1113133,8 +1113156,8 @@ index 000000000000..fc110219ec75 + +#endif /* _EVENT_LOG_PAYLOAD_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_set.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_set.h -new file mode 100755 -index 000000000000..47c991c20019 +new file mode 100644 +index 000000000..47c991c20 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_set.h @@ -0,0 +1,124 @@ @@ -1113263,8 +1113286,8 @@ index 000000000000..47c991c20019 + +#endif /* _EVENT_LOG_SET_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_tag.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_tag.h -new file mode 100755 -index 000000000000..144ed7275932 +new file mode 100644 +index 000000000..144ed7275 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_tag.h @@ -0,0 +1,479 @@ @@ -1113748,8 +1113771,8 @@ index 000000000000..144ed7275932 +} event_log_extended_hdr_t; +#endif /* _EVENT_LOG_TAG_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_trace.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_trace.h -new file mode 100755 -index 000000000000..0c6fc6b262a0 +new file mode 100644 +index 000000000..0c6fc6b26 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_trace.h @@ -0,0 +1,124 @@ @@ -1113878,8 +1113901,8 @@ index 000000000000..0c6fc6b262a0 + +#endif /* _WL_DIAG_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/fils.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/fils.h -new file mode 100755 -index 000000000000..1d3c8e0b52a8 +new file mode 100644 +index 000000000..1d3c8e0b5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/fils.h @@ -0,0 +1,295 @@ @@ -1114179,8 +1114202,8 @@ index 000000000000..1d3c8e0b52a8 + +#endif /* __FILSAUTH_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_armtrap.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_armtrap.h -new file mode 100755 -index 000000000000..177ef53141fe +new file mode 100644 +index 000000000..177ef5314 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_armtrap.h @@ -0,0 +1,90 @@ @@ -1114275,8 +1114298,8 @@ index 000000000000..177ef53141fe + +#endif /* _hnd_armtrap_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_cons.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_cons.h -new file mode 100755 -index 000000000000..81a699d8b5de +new file mode 100644 +index 000000000..81a699d8b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_cons.h @@ -0,0 +1,87 @@ @@ -1114368,8 +1114391,8 @@ index 000000000000..81a699d8b5de + +#endif /* _hnd_cons_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_debug.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_debug.h -new file mode 100755 -index 000000000000..b8dca36b84c6 +new file mode 100644 +index 000000000..b8dca36b8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_debug.h @@ -0,0 +1,169 @@ @@ -1114543,8 +1114566,8 @@ index 000000000000..b8dca36b84c6 + +#endif /* _HND_DEBUG_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktpool.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktpool.h -new file mode 100755 -index 000000000000..57f222967488 +new file mode 100644 +index 000000000..57f222967 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktpool.h @@ -0,0 +1,244 @@ @@ -1114793,8 +1114816,8 @@ index 000000000000..57f222967488 + +#endif /* _hnd_pktpool_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktq.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktq.h -new file mode 100755 -index 000000000000..824bbc1420d9 +new file mode 100644 +index 000000000..824bbc142 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktq.h @@ -0,0 +1,326 @@ @@ -1115125,8 +1115148,8 @@ index 000000000000..824bbc1420d9 + +#endif /* _hnd_pktq_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_trap.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_trap.h -new file mode 100755 -index 000000000000..caf006ee26d9 +new file mode 100644 +index 000000000..caf006ee2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_trap.h @@ -0,0 +1,40 @@ @@ -1115171,8 +1115194,8 @@ index 000000000000..caf006ee26d9 + +#endif /* _hnd_trap_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndchipc.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndchipc.h -new file mode 100755 -index 000000000000..be9a2e65cb55 +new file mode 100644 +index 000000000..be9a2e65c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndchipc.h @@ -0,0 +1,54 @@ @@ -1115231,8 +1115254,8 @@ index 000000000000..be9a2e65cb55 + +#endif /* _hndchipc_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndlhl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndlhl.h -new file mode 100755 -index 000000000000..c6794464ebe7 +new file mode 100644 +index 000000000..c6794464e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndlhl.h @@ -0,0 +1,62 @@ @@ -1115299,8 +1115322,8 @@ index 000000000000..c6794464ebe7 +#define LHL_IS_PSMODE_1(sih) (si_lhl_ps_mode(sih) == LHL_PS_MODE_1) +#endif /* _hndlhl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndmem.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndmem.h -new file mode 100755 -index 000000000000..de348e7d3c45 +new file mode 100644 +index 000000000..de348e7d3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndmem.h @@ -0,0 +1,81 @@ @@ -1115386,8 +1115409,8 @@ index 000000000000..de348e7d3c45 + uint32 mem_start, uint32 size, hndmem_config_t config); +#endif /* _HNDMEM_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndoobr.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndoobr.h -new file mode 100755 -index 000000000000..88e2952cf7c5 +new file mode 100644 +index 000000000..88e2952cf --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndoobr.h @@ -0,0 +1,76 @@ @@ -1115468,8 +1115491,8 @@ index 000000000000..88e2952cf7c5 + +#endif /* _hndoobr_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndpmu.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndpmu.h -new file mode 100755 -index 000000000000..df3b31bf46ee +new file mode 100644 +index 000000000..df3b31bf4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndpmu.h @@ -0,0 +1,80 @@ @@ -1115554,8 +1115577,8 @@ index 000000000000..df3b31bf46ee +#endif /* BCMPMU_STATS */ +#endif /* _hndpmu_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndsoc.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndsoc.h -new file mode 100755 -index 000000000000..b4cb16001b97 +new file mode 100644 +index 000000000..b4cb16001 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndsoc.h @@ -0,0 +1,351 @@ @@ -1115911,8 +1115934,8 @@ index 000000000000..b4cb16001b97 +#define PMU_BASE_OFFSET 0x00012000 /* PMU offset is changed for ccrev >= 56 */ +#endif /* _HNDSOC_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_osl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_osl.h -new file mode 100755 -index 000000000000..bb916706702d +new file mode 100644 +index 000000000..bb9167067 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_osl.h @@ -0,0 +1,636 @@ @@ -1116553,8 +1116576,8 @@ index 000000000000..bb916706702d +extern uint32 osl_do_gettimediff(struct osl_timespec *cur_ts, struct osl_timespec *old_ts); +#endif /* _linux_osl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_pkt.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_pkt.h -new file mode 100755 -index 000000000000..30fff18479f3 +new file mode 100644 +index 000000000..30fff1847 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_pkt.h @@ -0,0 +1,236 @@ @@ -1116795,8 +1116818,8 @@ index 000000000000..30fff18479f3 + +#endif /* _linux_pkt_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxver.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxver.h -new file mode 100755 -index 000000000000..32ad78f6c932 +new file mode 100644 +index 000000000..32ad78f6c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxver.h @@ -0,0 +1,900 @@ @@ -1117701,8 +1117724,8 @@ index 000000000000..32ad78f6c932 + +#endif /* _linuxver_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/lpflags.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/lpflags.h -new file mode 100755 -index 000000000000..ed0ff7825b08 +new file mode 100644 +index 000000000..ed0ff7825 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/lpflags.h @@ -0,0 +1,46 @@ @@ -1117753,8 +1117776,8 @@ index 000000000000..ed0ff7825b08 + +#endif /* _lpflags_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/mbo.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/mbo.h -new file mode 100755 -index 000000000000..eef005063065 +new file mode 100644 +index 000000000..eef005063 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/mbo.h @@ -0,0 +1,286 @@ @@ -1118045,8 +1118068,8 @@ index 000000000000..eef005063065 + +#endif /* __MBO_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/miniopt.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/miniopt.h -new file mode 100755 -index 000000000000..1c1d8e9e2004 +new file mode 100644 +index 000000000..1c1d8e9e2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/miniopt.h @@ -0,0 +1,80 @@ @@ -1118131,8 +1118154,8 @@ index 000000000000..1c1d8e9e2004 + +#endif /* MINI_OPT_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msf.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msf.h -new file mode 100755 -index 000000000000..5f0022e53250 +new file mode 100644 +index 000000000..5f0022e53 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msf.h @@ -0,0 +1,67 @@ @@ -1118204,8 +1118227,8 @@ index 000000000000..5f0022e53250 + +#endif /* _WLC_MSF_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msgtrace.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msgtrace.h -new file mode 100755 -index 000000000000..c871c7ce620d +new file mode 100644 +index 000000000..c871c7ce6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msgtrace.h @@ -0,0 +1,63 @@ @@ -1118273,8 +1118296,8 @@ index 000000000000..c871c7ce620d + +#endif /* _MSGTRACE_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/nan.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/nan.h -new file mode 100755 -index 000000000000..bdb07f8460da +new file mode 100644 +index 000000000..bdb07f846 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/nan.h @@ -0,0 +1,1559 @@ @@ -1119838,8 +1119861,8 @@ index 000000000000..bdb07f8460da + +#endif /* _NAN_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl.h -new file mode 100755 -index 000000000000..2a7aec17d1db +new file mode 100644 +index 000000000..2a7aec17d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl.h @@ -0,0 +1,378 @@ @@ -1120222,8 +1120245,8 @@ index 000000000000..2a7aec17d1db + +#endif /* _osl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_decl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_decl.h -new file mode 100755 -index 000000000000..a5643079c831 +new file mode 100644 +index 000000000..a5643079c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_decl.h @@ -0,0 +1,38 @@ @@ -1120266,8 +1120289,8 @@ index 000000000000..a5643079c831 +extern unsigned int lmtest; /* low memory test */ +#endif // endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_ext.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_ext.h -new file mode 100755 -index 000000000000..2c182ca29bd1 +new file mode 100644 +index 000000000..2c182ca29 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_ext.h @@ -0,0 +1,766 @@ @@ -1121038,8 +1121061,8 @@ index 000000000000..2c182ca29bd1 + +#endif /* _osl_ext_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/p2p.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/p2p.h -new file mode 100755 -index 000000000000..b68d5c32e466 +new file mode 100644 +index 000000000..b68d5c32e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/p2p.h @@ -0,0 +1,702 @@ @@ -1121746,8 +1121769,8 @@ index 000000000000..b68d5c32e466 + +#endif /* _P2P_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_end.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_end.h -new file mode 100755 -index 000000000000..64c7579ae26c +new file mode 100644 +index 000000000..64c7579ae --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_end.h @@ -0,0 +1,60 @@ @@ -1121812,8 +1121835,8 @@ index 000000000000..64c7579ae26c +#undef BWL_PRE_PACKED_STRUCT +#undef BWL_POST_PACKED_STRUCT diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_start.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_start.h -new file mode 100755 -index 000000000000..097611ed404a +new file mode 100644 +index 000000000..097611ed4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_start.h @@ -0,0 +1,105 @@ @@ -1121923,8 +1121946,8 @@ index 000000000000..097611ed404a + #error "Unknown compiler!" +#endif // endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcicfg.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcicfg.h -new file mode 100755 -index 000000000000..c8ec32a62406 +new file mode 100644 +index 000000000..c8ec32a62 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcicfg.h @@ -0,0 +1,402 @@ @@ -1122331,8 +1122354,8 @@ index 000000000000..c8ec32a62406 + +#endif /* _h_pcicfg_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcie_core.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcie_core.h -new file mode 100755 -index 000000000000..592ad25e4832 +new file mode 100644 +index 000000000..592ad25e4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcie_core.h @@ -0,0 +1,1193 @@ @@ -1123530,8 +1123553,8 @@ index 000000000000..592ad25e4832 + +#endif /* _PCIE_CORE_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/rte_ioctl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/rte_ioctl.h -new file mode 100755 -index 000000000000..90669be876b4 +new file mode 100644 +index 000000000..90669be87 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/rte_ioctl.h @@ -0,0 +1,104 @@ @@ -1123640,8 +1123663,8 @@ index 000000000000..90669be876b4 +} d11_dmalpbk_args_t; +#endif /* _rte_ioctl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbchipc.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbchipc.h -new file mode 100755 -index 000000000000..f7eb1cfde400 +new file mode 100644 +index 000000000..f7eb1cfde --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbchipc.h @@ -0,0 +1,4619 @@ @@ -1128265,8 +1128288,8 @@ index 000000000000..f7eb1cfde400 + +#endif /* _SBCHIPC_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbconfig.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbconfig.h -new file mode 100755 -index 000000000000..b05cd510aa0b +new file mode 100644 +index 000000000..b05cd510a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbconfig.h @@ -0,0 +1,286 @@ @@ -1128557,8 +1128580,8 @@ index 000000000000..b05cd510aa0b + +#endif /* _SBCONFIG_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbgci.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbgci.h -new file mode 100755 -index 000000000000..bbf0e4337124 +new file mode 100644 +index 000000000..bbf0e4337 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbgci.h @@ -0,0 +1,274 @@ @@ -1128837,8 +1128860,8 @@ index 000000000000..bbf0e4337124 + +#endif /* _SBGCI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhndarm.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhndarm.h -new file mode 100755 -index 000000000000..ee1279a4a807 +new file mode 100644 +index 000000000..ee1279a4a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhndarm.h @@ -0,0 +1,142 @@ @@ -1128985,8 +1129008,8 @@ index 000000000000..ee1279a4a807 + +#endif /* _sbhndarm_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhnddma.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhnddma.h -new file mode 100755 -index 000000000000..52a39dc6d415 +new file mode 100644 +index 000000000..52a39dc6d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhnddma.h @@ -0,0 +1,450 @@ @@ -1129441,8 +1129464,8 @@ index 000000000000..52a39dc6d415 + +#endif /* _sbhnddma_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbpcmcia.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbpcmcia.h -new file mode 100755 -index 000000000000..8b6c6cf45556 +new file mode 100644 +index 000000000..8b6c6cf45 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbpcmcia.h @@ -0,0 +1,138 @@ @@ -1129585,8 +1129608,8 @@ index 000000000000..8b6c6cf45556 +#define SBTMH_INT_STATUS 0x40000 /* sb interrupt status */ +#endif /* _SBPCMCIA_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdio.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdio.h -new file mode 100755 -index 000000000000..ba7d66266afb +new file mode 100644 +index 000000000..ba7d66266 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdio.h @@ -0,0 +1,189 @@ @@ -1129780,8 +1129803,8 @@ index 000000000000..ba7d66266afb + +#endif /* _SBSDIO_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdpcmdev.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdpcmdev.h -new file mode 100755 -index 000000000000..7134247e7cf4 +new file mode 100644 +index 000000000..7134247e7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdpcmdev.h @@ -0,0 +1,312 @@ @@ -1130098,8 +1130121,8 @@ index 000000000000..7134247e7cf4 + +#endif /* _sbsdpcmdev_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsocram.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsocram.h -new file mode 100755 -index 000000000000..5e709aa52d4e +new file mode 100644 +index 000000000..5e709aa52 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsocram.h @@ -0,0 +1,205 @@ @@ -1130309,8 +1130332,8 @@ index 000000000000..5e709aa52d4e + +#endif /* _SBSOCRAM_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsysmem.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsysmem.h -new file mode 100755 -index 000000000000..065b3f1980f6 +new file mode 100644 +index 000000000..065b3f198 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsysmem.h @@ -0,0 +1,181 @@ @@ -1130496,8 +1130519,8 @@ index 000000000000..065b3f1980f6 + +#endif /* _SBSYSMEM_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdio.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdio.h -new file mode 100755 -index 000000000000..844fc2780d5b +new file mode 100644 +index 000000000..844fc2780 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdio.h @@ -0,0 +1,626 @@ @@ -1131128,8 +1131151,8 @@ index 000000000000..844fc2780d5b +#endif /* def BCMSDIO */ +#endif /* _SDIO_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdioh.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdioh.h -new file mode 100755 -index 000000000000..327d1c4d0e1f +new file mode 100644 +index 000000000..327d1c4d0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdioh.h @@ -0,0 +1,451 @@ @@ -1131585,8 +1131608,8 @@ index 000000000000..327d1c4d0e1f + +#endif /* _SDIOH_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdiovar.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdiovar.h -new file mode 100755 -index 000000000000..bfbe2bf94390 +new file mode 100644 +index 000000000..bfbe2bf94 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdiovar.h @@ -0,0 +1,125 @@ @@ -1131716,8 +1131739,8 @@ index 000000000000..bfbe2bf94390 + +#endif /* _sdiovar_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdspi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdspi.h -new file mode 100755 -index 000000000000..d42f4c783490 +new file mode 100644 +index 000000000..d42f4c783 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdspi.h @@ -0,0 +1,79 @@ @@ -1131801,8 +1131824,8 @@ index 000000000000..d42f4c783490 + +#endif /* _SD_SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/siutils.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/siutils.h -new file mode 100755 -index 000000000000..eba0d0a97c89 +new file mode 100644 +index 000000000..eba0d0a97 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/siutils.h @@ -0,0 +1,810 @@ @@ -1132617,8 +1132640,8 @@ index 000000000000..eba0d0a97c89 + +#endif /* _siutils_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/spid.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/spid.h -new file mode 100755 -index 000000000000..3a08b59986ac +new file mode 100644 +index 000000000..3a08b5998 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/spid.h @@ -0,0 +1,169 @@ @@ -1132792,8 +1132815,8 @@ index 000000000000..3a08b59986ac + +#endif /* _SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/trxhdr.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/trxhdr.h -new file mode 100755 -index 000000000000..b717e62017d9 +new file mode 100644 +index 000000000..b717e6201 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/trxhdr.h @@ -0,0 +1,96 @@ @@ -1132894,8 +1132917,8 @@ index 000000000000..b717e62017d9 + +#endif /* _TRX_HDR_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/typedefs.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/typedefs.h -new file mode 100755 -index 000000000000..c446005668db +new file mode 100644 +index 000000000..c44600566 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/typedefs.h @@ -0,0 +1,368 @@ @@ -1133268,8 +1133291,8 @@ index 000000000000..c446005668db +#include +#endif /* _TYPEDEFS_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/usbrdl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/usbrdl.h -new file mode 100755 -index 000000000000..f15fbd697cea +new file mode 100644 +index 000000000..f15fbd697 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/usbrdl.h @@ -0,0 +1,135 @@ @@ -1133409,8 +1133432,8 @@ index 000000000000..f15fbd697cea + +#endif /* _USB_RDL_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/vlan.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/vlan.h -new file mode 100755 -index 000000000000..ddc64a9381cb +new file mode 100644 +index 000000000..ddc64a938 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/vlan.h @@ -0,0 +1,98 @@ @@ -1133513,8 +1133536,8 @@ index 000000000000..ddc64a9381cb + +#endif /* _vlan_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlfc_proto.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlfc_proto.h -new file mode 100755 -index 000000000000..0b592c6a2bc6 +new file mode 100644 +index 000000000..0b592c6a2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlfc_proto.h @@ -0,0 +1,414 @@ @@ -1133933,8 +1133956,8 @@ index 000000000000..0b592c6a2bc6 + +#endif /* __wlfc_proto_definitions_h__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl.h -new file mode 100755 -index 000000000000..7f14967db99d +new file mode 100644 +index 000000000..7f14967db --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl.h @@ -0,0 +1,20752 @@ @@ -1154691,8 +1154714,8 @@ index 000000000000..7f14967db99d +} wlc_nr5gcx_status_v1_t; +#endif /* _wlioctl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_defs.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_defs.h -new file mode 100755 -index 000000000000..100b836284ce +new file mode 100644 +index 000000000..100b83628 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_defs.h @@ -0,0 +1,2466 @@ @@ -1157163,8 +1157186,8 @@ index 000000000000..100b836284ce +/* === Place holder for cnx and nan cfgs === */ +#endif /* wlioctl_defs_h */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_utils.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_utils.h -new file mode 100755 -index 000000000000..6dee521a3853 +new file mode 100644 +index 000000000..6dee521a3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_utils.h @@ -0,0 +1,62 @@ @@ -1157231,8 +1157254,8 @@ index 000000000000..6dee521a3853 + +#endif /* _wlioctl_utils_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wpa.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wpa.h -new file mode 100755 -index 000000000000..d618ea91b1ee +new file mode 100644 +index 000000000..d618ea91b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wpa.h @@ -0,0 +1,312 @@ @@ -1157549,8 +1157572,8 @@ index 000000000000..d618ea91b1ee + +#endif /* _proto_wpa_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wps.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wps.h -new file mode 100755 -index 000000000000..c2ebace54013 +new file mode 100644 +index 000000000..c2ebace54 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wps.h @@ -0,0 +1,386 @@ @@ -1157941,8 +1157964,8 @@ index 000000000000..c2ebace54013 + +#endif /* _WPS_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl.c -new file mode 100755 -index 000000000000..321ee05c4ccb +new file mode 100644 +index 000000000..321ee05c4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl.c @@ -0,0 +1,2124 @@ @@ -1160072,8 +1160095,8 @@ index 000000000000..321ee05c4ccb +} \ No newline at end of file diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl_priv.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl_priv.h -new file mode 100755 -index 000000000000..f56f292c0ecf +new file mode 100644 +index 000000000..f56f292c0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl_priv.h @@ -0,0 +1,185 @@ @@ -1160263,8 +1160286,8 @@ index 000000000000..f56f292c0ecf + +#endif /* _LINUX_OSL_PRIV_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_pkt.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_pkt.c -new file mode 100755 -index 000000000000..e66ea740c092 +new file mode 100644 +index 000000000..e66ea740c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_pkt.c @@ -0,0 +1,694 @@ @@ -1160963,8 +1160986,8 @@ index 000000000000..e66ea740c092 +} +#endif /* LINUX_VERSION >= 3.6.0 && TSQ_MULTIPLIER */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/otpdefs.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/otpdefs.h -new file mode 100755 -index 000000000000..542e5a90b3f3 +new file mode 100644 +index 000000000..542e5a90b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/otpdefs.h @@ -0,0 +1,122 @@ @@ -1161091,8 +1161114,8 @@ index 000000000000..542e5a90b3f3 +char *dhd_get_plat_sku(void); +#endif /* _OTPDEFS_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/pcie_core.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/pcie_core.c -new file mode 100755 -index 000000000000..dd54c675a180 +new file mode 100644 +index 000000000..dd54c675a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/pcie_core.c @@ -0,0 +1,159 @@ @@ -1161256,8 +1161279,8 @@ index 000000000000..dd54c675a180 + +#endif /* BCMDRIVER */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/sbutils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/sbutils.c -new file mode 100755 -index 000000000000..bd22c9aab076 +new file mode 100644 +index 000000000..bd22c9aab --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/sbutils.c @@ -0,0 +1,1094 @@ @@ -1162356,8 +1162379,8 @@ index 000000000000..bd22c9aab076 +} +#endif // endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils.c -new file mode 100755 -index 000000000000..1f9cc39d17a4 +new file mode 100644 +index 000000000..1f9cc39d1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils.c @@ -0,0 +1,3801 @@ @@ -1166163,8 +1166186,8 @@ index 000000000000..1f9cc39d17a4 + (si_numcoreunits(sih, SR_CORE_ID) > 4)); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils_priv.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils_priv.h -new file mode 100755 -index 000000000000..1686e888248d +new file mode 100644 +index 000000000..1686e8882 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils_priv.h @@ -0,0 +1,356 @@ @@ -1166525,8 +1166548,8 @@ index 000000000000..1686e888248d + +#endif /* _siutils_priv_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.c -new file mode 100755 -index 000000000000..f1ca3f2270c9 +new file mode 100644 +index 000000000..f1ca3f227 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.c @@ -0,0 +1,6644 @@ @@ -1173175,8 +1173198,8 @@ index 000000000000..f1ca3f2270c9 +} +#endif /* WL_STATIC_IF */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.h -new file mode 100755 -index 000000000000..46af4b736f77 +new file mode 100644 +index 000000000..46af4b736 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.h @@ -0,0 +1,420 @@ @@ -1173601,8 +1173624,8 @@ index 000000000000..46af4b736f77 +); +#endif /* _wl_android_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android_ext.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android_ext.c -new file mode 100755 -index 000000000000..dd9784bc0733 +new file mode 100644 +index 000000000..dd9784bc0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android_ext.c @@ -0,0 +1,7974 @@ @@ -1181581,8 +1181604,8 @@ index 000000000000..dd9784bc0733 + + diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.c -new file mode 100755 -index 000000000000..1534f3919a3e +new file mode 100644 +index 000000000..1534f3919 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.c @@ -0,0 +1,25039 @@ @@ -1206626,8 +1206649,8 @@ index 000000000000..1534f3919a3e + return ret; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.h -new file mode 100755 -index 000000000000..39e827d8b887 +new file mode 100644 +index 000000000..39e827d8b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.h @@ -0,0 +1,2451 @@ @@ -1209083,8 +1209106,8 @@ index 000000000000..39e827d8b887 +s32 wl_cfg80211_autochannel(struct net_device *dev, char* command, int total_len); +#endif /* _wl_cfg80211_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg_btcoex.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg_btcoex.c -new file mode 100755 -index 000000000000..4780d116e5fe +new file mode 100644 +index 000000000..4780d116e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg_btcoex.c @@ -0,0 +1,569 @@ @@ -1209658,8 +1209681,8 @@ index 000000000000..4780d116e5fe + return (snprintf(command, sizeof("OK"), "OK") + 1); +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.c -new file mode 100755 -index 000000000000..70a2022b0c9f +new file mode 100644 +index 000000000..70a2022b0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.c @@ -0,0 +1,8182 @@ @@ -1217846,8 +1217869,8 @@ index 000000000000..70a2022b0c9f +} +#endif /* WL_NAN */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.h -new file mode 100755 -index 000000000000..6eca82b8067c +new file mode 100644 +index 000000000..6eca82b80 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.h @@ -0,0 +1,899 @@ @@ -1218751,8 +1218774,8 @@ index 000000000000..6eca82b8067c +}; +#endif /* _wl_cfgnan_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.c -new file mode 100755 -index 000000000000..673566e4a696 +new file mode 100644 +index 000000000..673566e4a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.c @@ -0,0 +1,2792 @@ @@ -1221549,8 +1221572,8 @@ index 000000000000..673566e4a696 + return false; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.h -new file mode 100755 -index 000000000000..e47f8af9b4d6 +new file mode 100644 +index 000000000..e47f8af9b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.h @@ -0,0 +1,458 @@ @@ -1222013,8 +1222036,8 @@ index 000000000000..e47f8af9b4d6 + (len == WL_P2P_WILDCARD_SSID_LEN)) +#endif /* _wl_cfgp2p_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.c -new file mode 100755 -index 000000000000..6de12e1432d7 +new file mode 100644 +index 000000000..6de12e143 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.c @@ -0,0 +1,3348 @@ @@ -1225367,8 +1225390,8 @@ index 000000000000..6de12e1432d7 + return; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.h -new file mode 100755 -index 000000000000..ddd133514b6f +new file mode 100644 +index 000000000..ddd133514 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.h @@ -0,0 +1,101 @@ @@ -1225474,8 +1225497,8 @@ index 000000000000..ddd133514b6f +extern void wl_notify_scan_done(struct bcm_cfg80211 *cfg, bool aborted); +#endif /* _wl_cfgscan_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.c -new file mode 100755 -index 000000000000..b2f6cb5087d0 +new file mode 100644 +index 000000000..b2f6cb508 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.c @@ -0,0 +1,8751 @@ @@ -1234231,8 +1234254,8 @@ index 000000000000..b2f6cb5087d0 +} +#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(3, 13, 0)) || defined(WL_VENDOR_EXT_SUPPORT) */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.h -new file mode 100755 -index 000000000000..b70aa354dad3 +new file mode 100644 +index 000000000..b70aa354d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.h @@ -0,0 +1,721 @@ @@ -1234958,8 +1234981,8 @@ index 000000000000..b70aa354dad3 + +#endif /* _wl_cfgvendor_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_dbg.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_dbg.h -new file mode 100755 -index 000000000000..640907ea81ff +new file mode 100644 +index 000000000..640907ea8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_dbg.h @@ -0,0 +1,381 @@ @@ -1235345,8 +1235368,8 @@ index 000000000000..640907ea81ff +extern uint32 wl_msg_level2; +#endif /* _wl_dbg_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.c -new file mode 100755 -index 000000000000..9403d0600998 +new file mode 100644 +index 000000000..9403d0600 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.c @@ -0,0 +1,1692 @@ @@ -1237043,8 +1237066,8 @@ index 000000000000..9403d0600998 +#endif /* WL_ESCAN */ + diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.h -new file mode 100755 -index 000000000000..7e4241eae508 +new file mode 100644 +index 000000000..7e4241eae --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.h @@ -0,0 +1,78 @@ @@ -1237127,8 +1237150,8 @@ index 000000000000..7e4241eae508 +#endif /* _wl_escan_ */ + diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_event.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_event.c -new file mode 100755 -index 000000000000..fd2cb3cd0eee +new file mode 100644 +index 000000000..fd2cb3cd0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_event.c @@ -0,0 +1,506 @@ @@ -1237639,8 +1237662,8 @@ index 000000000000..fd2cb3cd0eee +} +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_ext_genl.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_ext_genl.c -new file mode 100755 -index 000000000000..316f9ea6cbf2 +new file mode 100644 +index 000000000..316f9ea6c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_ext_genl.c @@ -0,0 +1,569 @@ @@ -1238214,8 +1238237,8 @@ index 000000000000..316f9ea6cbf2 +#endif + diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.c -new file mode 100755 -index 000000000000..3eee7339f455 +new file mode 100644 +index 000000000..3eee7339f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.c @@ -0,0 +1,4342 @@ @@ -1242562,8 +1242585,8 @@ index 000000000000..3eee7339f455 + +#endif /* USE_IW */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.h -new file mode 100755 -index 000000000000..ba2cae8bd7c6 +new file mode 100644 +index 000000000..ba2cae8bd --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.h @@ -0,0 +1,178 @@ @@ -1242746,8 +1242769,8 @@ index 000000000000..ba2cae8bd7c6 + +#endif /* _wl_iw_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_linux_mon.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_linux_mon.c -new file mode 100755 -index 000000000000..920eb42dba27 +new file mode 100644 +index 000000000..920eb42db --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_linux_mon.c @@ -0,0 +1,474 @@ @@ -1243226,8 +1243249,8 @@ index 000000000000..920eb42dba27 + return 0; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_roam.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_roam.c -new file mode 100755 -index 000000000000..a7d49bddc3e6 +new file mode 100644 +index 000000000..a7d49bddc --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_roam.c @@ -0,0 +1,375 @@ @@ -1243607,8 +1243630,8 @@ index 000000000000..a7d49bddc3e6 +#endif /* ROAM_CHANNEL_CACHE */ +#endif /* ESCAN_CHANNEL_CACHE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.c -new file mode 100755 -index 000000000000..4a1aae7316e0 +new file mode 100644 +index 000000000..4a1aae731 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.c @@ -0,0 +1,535 @@ @@ -1244148,8 +1244171,8 @@ index 000000000000..4a1aae7316e0 + return 0; +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.h -new file mode 100755 -index 000000000000..772152e79070 +new file mode 100644 +index 000000000..772152e79 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.h @@ -0,0 +1,135 @@ @@ -1244289,8 +1244312,8 @@ index 000000000000..772152e79070 + +#endif /* __WLDEV_COMMON_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c b/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c -new file mode 100755 -index 000000000000..82799df987e8 +new file mode 100644 +index 000000000..82799df98 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c @@ -0,0 +1,30 @@ @@ -1244325,7 +1244348,7 @@ index 000000000000..82799df987e8 +EXPORT_SYMBOL(rkwifi_set_firmware); +MODULE_LICENSE("GPL"); diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c -index 1505c745154e..b9ed2b7e4e0f 100644 +index 1505c7451..b9ed2b7e4 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -1668,7 +1668,11 @@ static void __exit nvmem_exit(void) @@ -1244341,7 +1244364,7 @@ index 1505c745154e..b9ed2b7e4e0f 100644 MODULE_AUTHOR("Srinivas Kandagatla "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/pinctrl/pinctrl-rk805.c b/drivers/pinctrl/pinctrl-rk805.c -index c6f4229eb106..46e426cf4e20 100644 +index c6f4229eb..46e426cf4 100644 --- a/drivers/pinctrl/pinctrl-rk805.c +++ b/drivers/pinctrl/pinctrl-rk805.c @@ -78,6 +78,7 @@ struct rk805_pctrl_info { @@ -1287382,7 +1287405,7 @@ index c6f4229eb106..46e426cf4e20 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 2a454098eaaa..7af6f74df96a 100644 +index 2a454098e..7af6f74df 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -16,12 +16,14 @@ @@ -1289559,8 +1289582,8 @@ index 2a454098eaaa..7af6f74df96a 100644 +MODULE_ALIAS("platform:pinctrl-rockchip"); +MODULE_DEVICE_TABLE(of, rockchip_pinctrl_dt_match); diff --git a/drivers/pinctrl/pinctrl-rockchip.h b/drivers/pinctrl/pinctrl-rockchip.h -new file mode 100755 -index 000000000000..cd1662db5c97 +new file mode 100644 +index 000000000..cd1662db5 --- /dev/null +++ b/drivers/pinctrl/pinctrl-rockchip.h @@ -0,0 +1,277 @@ @@ -1289842,8 +1289865,8 @@ index 000000000000..cd1662db5c97 + +#endif diff --git a/drivers/power/ec_battery.c b/drivers/power/ec_battery.c -new file mode 100755 -index 000000000000..9627cd1a0a11 +new file mode 100644 +index 000000000..9627cd1a0 --- /dev/null +++ b/drivers/power/ec_battery.c @@ -0,0 +1,466 @@ @@ -1290314,7 +1290337,7 @@ index 000000000000..9627cd1a0a11 +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 1c5af2fef142..c5067eb75370 100644 +index 1c5af2fef..c5067eb75 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[] = { @@ -1290326,8 +1290349,8 @@ index 1c5af2fef142..c5067eb75370 100644 static struct platform_driver gpio_poweroff_driver = { .probe = gpio_poweroff_probe, diff --git a/drivers/power/reset/reboot-mode.h b/drivers/power/reset/reboot-mode.h -new file mode 100755 -index 000000000000..342df786d043 +new file mode 100644 +index 000000000..342df786d --- /dev/null +++ b/drivers/power/reset/reboot-mode.h @@ -0,0 +1,7 @@ @@ -1290339,7 +1290362,7 @@ index 000000000000..342df786d043 + +#endif diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig -index 0aa46b451017..31abccec4d93 100644 +index 0aa46b451..31abccec4 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -629,6 +629,12 @@ config CHARGER_BQ2515X @@ -1290408,7 +1290431,7 @@ index 0aa46b451017..31abccec4d93 100644 + endif # POWER_SUPPLY diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile -index dd4b86318cd9..eec17d90f846 100644 +index dd4b86318..eec17d90f 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -83,6 +83,7 @@ obj-$(CONFIG_CHARGER_BQ24190) += bq24190_charger.o @@ -1290430,7 +1290453,7 @@ index dd4b86318cd9..eec17d90f846 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 5a1adceb6974..56e6bc66aa2c 100644 +index 5a1adceb6..56e6bc66a 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[] = { @@ -1290442,7 +1290465,7 @@ index 5a1adceb6974..56e6bc66aa2c 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 3d627768ad7b..db65be026920 100644 +index 3d627768a..db65be026 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, @@ -1290486,7 +1290509,7 @@ index 3d627768ad7b..db65be026920 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 a88590563647..47297c4069e6 100644 +index a88590563..47297c406 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[] = { @@ -1290498,7 +1290521,7 @@ index a88590563647..47297c4069e6 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 be24529157be..148eb8105803 100644 +index be2452915..148eb8105 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) @@ -1290520,8 +1290543,8 @@ index be24529157be..148eb8105803 100644 return ret; } diff --git a/drivers/power/supply/bq25700_charger.c b/drivers/power/supply/bq25700_charger.c -new file mode 100755 -index 000000000000..5b2a516509ed +new file mode 100644 +index 000000000..5b2a51650 --- /dev/null +++ b/drivers/power/supply/bq25700_charger.c @@ -0,0 +1,2105 @@ @@ -1292631,7 +1292654,7 @@ index 000000000000..5b2a516509ed +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 333349275b96..6fcebe441552 100644 +index 333349275..6fcebe441 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[] = { @@ -1292643,7 +1292666,7 @@ index 333349275b96..6fcebe441552 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 de1fa71be1e8..0146f1bfc29b 100644 +index d1071dbb9..43bbd2e18 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) @@ -1292658,7 +1292681,7 @@ index de1fa71be1e8..0146f1bfc29b 100644 } diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c -index 76b0f45a20b4..fb4399a90758 100644 +index 76b0f45a2..fb4399a90 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) @@ -1292694,7 +1292717,7 @@ index 76b0f45a20b4..fb4399a90758 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 5c8c117b396e..631fcaa68d64 100644 +index 5c8c117b3..631fcaa68 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); @@ -1292790,7 +1292813,7 @@ index 5c8c117b396e..631fcaa68d64 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 2b1df9c33969..932b890a8f3d 100644 +index 2b1df9c33..932b890a8 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[] = { @@ -1292802,8 +1292825,8 @@ index 2b1df9c33969..932b890a8f3d 100644 static const char * const POWER_SUPPLY_HEALTH_TEXT[] = { diff --git a/drivers/power/supply/rk816_battery.c b/drivers/power/supply/rk816_battery.c -new file mode 100755 -index 000000000000..d204a0129a8d +new file mode 100644 +index 000000000..d204a0129 --- /dev/null +++ b/drivers/power/supply/rk816_battery.c @@ -0,0 +1,5172 @@ @@ -1297980,8 +1298003,8 @@ index 000000000000..d204a0129a8d +MODULE_ALIAS("platform:rk816-battery"); +MODULE_AUTHOR("chenjh"); diff --git a/drivers/power/supply/rk816_battery.h b/drivers/power/supply/rk816_battery.h -new file mode 100755 -index 000000000000..b8b467114c1f +new file mode 100644 +index 000000000..b8b467114 --- /dev/null +++ b/drivers/power/supply/rk816_battery.h @@ -0,0 +1,286 @@ @@ -1298272,8 +1298295,8 @@ index 000000000000..b8b467114c1f + +#endif diff --git a/drivers/power/supply/rk817_battery.c b/drivers/power/supply/rk817_battery.c -new file mode 100755 -index 000000000000..d9003ad9e534 +new file mode 100644 +index 000000000..d9003ad9e --- /dev/null +++ b/drivers/power/supply/rk817_battery.c @@ -0,0 +1,3418 @@ @@ -1301696,8 +1301719,8 @@ index 000000000000..d9003ad9e534 +MODULE_DESCRIPTION("RK817 Battery driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c -new file mode 100755 -index 000000000000..b7e4f7627bdb +new file mode 100644 +index 000000000..b7e4f7627 --- /dev/null +++ b/drivers/power/supply/rk817_charger.c @@ -0,0 +1,1798 @@ @@ -1303500,8 +1303523,8 @@ index 000000000000..b7e4f7627bdb +MODULE_DESCRIPTION("RK817 Charge driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/power/supply/rk818_battery.c b/drivers/power/supply/rk818_battery.c -new file mode 100755 -index 000000000000..90ff1fac163c +new file mode 100644 +index 000000000..90ff1fac1 --- /dev/null +++ b/drivers/power/supply/rk818_battery.c @@ -0,0 +1,3622 @@ @@ -1307128,8 +1307151,8 @@ index 000000000000..90ff1fac163c +MODULE_ALIAS("platform:rk818-battery"); +MODULE_AUTHOR("chenjh"); diff --git a/drivers/power/supply/rk818_battery.h b/drivers/power/supply/rk818_battery.h -new file mode 100755 -index 000000000000..66cbbe9dac4c +new file mode 100644 +index 000000000..66cbbe9da --- /dev/null +++ b/drivers/power/supply/rk818_battery.h @@ -0,0 +1,168 @@ @@ -1307302,8 +1307325,8 @@ index 000000000000..66cbbe9dac4c + +#endif diff --git a/drivers/power/supply/rk818_charger.c b/drivers/power/supply/rk818_charger.c -new file mode 100755 -index 000000000000..56961effd13c +new file mode 100644 +index 000000000..56961effd --- /dev/null +++ b/drivers/power/supply/rk818_charger.c @@ -0,0 +1,1889 @@ @@ -1309197,7 +1309220,7 @@ index 000000000000..56961effd13c +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 7a23c70f4879..11768892d078 100644 +index 7a23c70f4..11768892d 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[] = { @@ -1309218,7 +1309241,7 @@ index 7a23c70f4879..11768892d078 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 288b79836c13..335cb857ef30 100644 +index 288b79836..335cb857e 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[] = { @@ -1309230,7 +1309253,7 @@ index 288b79836c13..335cb857ef30 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 3bf4b263950d..ad2265834314 100644 +index 3bf4b2639..ad2265834 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[] = { @@ -1309242,7 +1309265,7 @@ index 3bf4b263950d..ad2265834314 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 912e2184f918..8cfbd8d6b478 100644 +index 912e2184f..8cfbd8d6b 100644 --- a/drivers/power/supply/smb347-charger.c +++ b/drivers/power/supply/smb347-charger.c @@ -56,7 +56,6 @@ @@ -1309270,8 +1309293,8 @@ index 912e2184f918..8cfbd8d6b478 100644 * Make the charging functionality controllable by a write to the * command register unless pin control is specified in the platform diff --git a/drivers/power/sy6982c_charger.c b/drivers/power/sy6982c_charger.c -new file mode 100755 -index 000000000000..dfa82c3f8d27 +new file mode 100644 +index 000000000..dfa82c3f8 --- /dev/null +++ b/drivers/power/sy6982c_charger.c @@ -0,0 +1,401 @@ @@ -1309677,8 +1309700,8 @@ index 000000000000..dfa82c3f8d27 +MODULE_ALIAS("platform:sy6982c-charger"); +MODULE_AUTHOR("chen Shunqing"); diff --git a/drivers/power/universal_charger.c b/drivers/power/universal_charger.c -new file mode 100755 -index 000000000000..0f7b4c9e8003 +new file mode 100644 +index 000000000..0f7b4c9e8 --- /dev/null +++ b/drivers/power/universal_charger.c @@ -0,0 +1,419 @@ @@ -1310102,7 +1310125,7 @@ index 000000000000..0f7b4c9e8003 +MODULE_ALIAS("platform:universal-charger"); +MODULE_AUTHOR("chen Shunqing"); diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig -index 63be5362fd3a..ca5db43118d4 100644 +index 63be5362f..ca5db4311 100644 --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig @@ -408,6 +408,12 @@ config PWM_ROCKCHIP @@ -1310119,7 +1310142,7 @@ index 63be5362fd3a..ca5db43118d4 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 1f3079562b38..e6394eb8176b 100644 +index 1f3079562..e6394eb81 100644 --- a/drivers/pwm/pwm-rockchip.c +++ b/drivers/pwm/pwm-rockchip.c @@ -11,6 +11,7 @@ @@ -1310403,7 +1310426,7 @@ index 1f3079562b38..e6394eb8176b 100644 MODULE_AUTHOR("Beniamino Galvani "); MODULE_DESCRIPTION("Rockchip SoC PWM driver"); diff --git a/drivers/pwm/sysfs.c b/drivers/pwm/sysfs.c -index 9903c3a7eced..54619969dce6 100644 +index b8417a8d2..937c0235b 100644 --- a/drivers/pwm/sysfs.c +++ b/drivers/pwm/sysfs.c @@ -103,6 +103,43 @@ static ssize_t duty_cycle_store(struct device *child, @@ -1310471,7 +1310494,7 @@ index 9903c3a7eced..54619969dce6 100644 &dev_attr_polarity.attr, &dev_attr_capture.attr, diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig -index 020a00d6696b..2da933776c81 100644 +index 020a00d66..2da933776 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -1279,5 +1279,11 @@ config REGULATOR_QCOM_LABIBB @@ -1310487,7 +1310510,7 @@ index 020a00d6696b..2da933776c81 100644 endif diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile -index 6ebae516258e..17e3300e71d5 100644 +index 6ebae5162..17e3300e7 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -24,6 +24,7 @@ obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o @@ -1310522,7 +1310545,7 @@ index 6ebae516258e..17e3300e71d5 100644 ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c -index c2b6b1befcf2..ee4f9a653635 100644 +index 2dcdfd459..c69f3926d 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -51,6 +51,7 @@ static LIST_HEAD(regulator_map_list); @@ -1310545,7 +1310568,7 @@ index c2b6b1befcf2..ee4f9a653635 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); -@@ -5022,11 +5028,265 @@ static void regulator_dev_release(struct device *dev) +@@ -5036,11 +5042,265 @@ static void regulator_dev_release(struct device *dev) kfree(rdev); } @@ -1310811,7 +1310834,7 @@ index c2b6b1befcf2..ee4f9a653635 100644 /* Avoid duplicate debugfs directory names */ if (parent && rname == rdev->desc->name) { -@@ -5045,8 +5305,88 @@ static void rdev_init_debugfs(struct regulator_dev *rdev) +@@ -5059,8 +5319,88 @@ static void rdev_init_debugfs(struct regulator_dev *rdev) &rdev->open_count); debugfs_create_u32("bypass_count", 0444, rdev->debugfs, &rdev->bypass_count); @@ -1310900,7 +1310923,7 @@ index c2b6b1befcf2..ee4f9a653635 100644 static int regulator_register_resolve_supply(struct device *dev, void *data) { struct regulator_dev *rdev = dev_to_rdev(dev); -@@ -5526,6 +5866,7 @@ void regulator_unregister(struct regulator_dev *rdev) +@@ -5536,6 +5876,7 @@ void regulator_unregister(struct regulator_dev *rdev) mutex_lock(®ulator_list_mutex); @@ -1310908,7 +1310931,7 @@ index c2b6b1befcf2..ee4f9a653635 100644 WARN_ON(rdev->open_count); regulator_remove_coupling(rdev); unset_regulator_supplies(rdev); -@@ -5957,7 +6298,11 @@ static int __init regulator_init(void) +@@ -5967,7 +6308,11 @@ static int __init regulator_init(void) } /* init early to allow our consumers to complete system booting */ @@ -1310921,7 +1310944,7 @@ index c2b6b1befcf2..ee4f9a653635 100644 static int regulator_late_cleanup(struct device *dev, void *data) { diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c -index 1af12074a75a..534028ec15c2 100644 +index 1af12074a..534028ec1 100644 --- a/drivers/regulator/fan53555.c +++ b/drivers/regulator/fan53555.c @@ -18,6 +18,8 @@ @@ -1311617,8 +1311640,8 @@ index 1af12074a75a..534028ec15c2 100644 }; diff --git a/drivers/regulator/lp8752.c b/drivers/regulator/lp8752.c -new file mode 100755 -index 000000000000..cf8e685f304a +new file mode 100644 +index 000000000..cf8e685f3 --- /dev/null +++ b/drivers/regulator/lp8752.c @@ -0,0 +1,316 @@ @@ -1311939,8 +1311962,8 @@ index 000000000000..cf8e685f304a +MODULE_AUTHOR("Zhang Qing "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/regulator/mp8865-regulator.c b/drivers/regulator/mp8865-regulator.c -new file mode 100755 -index 000000000000..607e3a8f2df4 +new file mode 100644 +index 000000000..607e3a8f2 --- /dev/null +++ b/drivers/regulator/mp8865-regulator.c @@ -0,0 +1,248 @@ @@ -1312193,7 +1312216,7 @@ index 000000000000..607e3a8f2df4 +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 5d844697c7b6..b11a434ec9fd 100644 +index 5d844697c..b11a434ec 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, @@ -1312212,7 +1312235,7 @@ index 5d844697c7b6..b11a434ec9fd 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 e926c1a85846..bb8b2f604a24 100644 +index e926c1a85..bb8b2f604 100644 --- a/drivers/regulator/rk808-regulator.c +++ b/drivers/regulator/rk808-regulator.c @@ -34,6 +34,11 @@ @@ -1313101,8 +1313124,8 @@ index e926c1a85846..bb8b2f604a24 100644 MODULE_AUTHOR("Chris Zhong "); MODULE_AUTHOR("Zhang Qing "); diff --git a/drivers/regulator/scmi-regulator.c b/drivers/regulator/scmi-regulator.c -new file mode 100755 -index 000000000000..9a4297276098 +new file mode 100644 +index 000000000..9a4297276 --- /dev/null +++ b/drivers/regulator/scmi-regulator.c @@ -0,0 +1,421 @@ @@ -1313528,8 +1313551,8 @@ index 000000000000..9a4297276098 +MODULE_DESCRIPTION("ARM SCMI regulator driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/regulator/syr82x.c b/drivers/regulator/syr82x.c -new file mode 100755 -index 000000000000..4f7b0892a3bc +new file mode 100644 +index 000000000..4f7b0892a --- /dev/null +++ b/drivers/regulator/syr82x.c @@ -0,0 +1,520 @@ @@ -1314054,8 +1314077,8 @@ index 000000000000..4f7b0892a3bc +MODULE_DESCRIPTION("syr82x PMIC driver"); + diff --git a/drivers/regulator/tps549b22-regulator.c b/drivers/regulator/tps549b22-regulator.c -new file mode 100755 -index 000000000000..bae2a67f4345 +new file mode 100644 +index 000000000..bae2a67f4 --- /dev/null +++ b/drivers/regulator/tps549b22-regulator.c @@ -0,0 +1,437 @@ @@ -1314497,8 +1314520,8 @@ index 000000000000..bae2a67f4345 +MODULE_AUTHOR("derrick.huang@rock-chips.com"); +MODULE_DESCRIPTION(" tps549b22 dcdc driver"); diff --git a/drivers/regulator/xz3216.c b/drivers/regulator/xz3216.c -new file mode 100755 -index 000000000000..54182559b161 +new file mode 100644 +index 000000000..54182559b --- /dev/null +++ b/drivers/regulator/xz3216.c @@ -0,0 +1,404 @@ @@ -1314907,8 +1314930,8 @@ index 000000000000..54182559b161 +MODULE_AUTHOR("zhangqing "); +MODULE_DESCRIPTION("xz3216 PMIC driver"); diff --git a/drivers/rk_nand/Kconfig b/drivers/rk_nand/Kconfig -new file mode 100755 -index 000000000000..c49a1c28b702 +new file mode 100644 +index 000000000..c49a1c28b --- /dev/null +++ b/drivers/rk_nand/Kconfig @@ -0,0 +1,10 @@ @@ -1314923,8 +1314946,8 @@ index 000000000000..c49a1c28b702 + +endif diff --git a/drivers/rk_nand/Makefile b/drivers/rk_nand/Makefile -new file mode 100755 -index 000000000000..dbd156f6e78b +new file mode 100644 +index 000000000..dbd156f6e --- /dev/null +++ b/drivers/rk_nand/Makefile @@ -0,0 +1,9 @@ @@ -1314938,8 +1314961,8 @@ index 000000000000..dbd156f6e78b +rk_ftl-$(CONFIG_ARM) += rk_zftl_arm32.o rk_ftlv5_arm32.o +endif diff --git a/drivers/rk_nand/rk_ftl_api.h b/drivers/rk_nand/rk_ftl_api.h -new file mode 100755 -index 000000000000..ebde01e3dbb6 +new file mode 100644 +index 000000000..ebde01e3d --- /dev/null +++ b/drivers/rk_nand/rk_ftl_api.h @@ -0,0 +1,41 @@ @@ -1314985,8 +1315008,8 @@ index 000000000000..ebde01e3dbb6 +#endif + diff --git a/drivers/rk_nand/rk_ftl_arm_v7.S b/drivers/rk_nand/rk_ftl_arm_v7.S -new file mode 100755 -index 000000000000..db549c3b269e +new file mode 100644 +index 000000000..db549c3b2 --- /dev/null +++ b/drivers/rk_nand/rk_ftl_arm_v7.S @@ -0,0 +1,30165 @@ @@ -1345156,8 +1345179,8 @@ index 000000000000..db549c3b269e +.LC200: + .ascii "\0013vendor storage %x,%x,%x\012\000" diff --git a/drivers/rk_nand/rk_ftl_arm_v7_thumb.S b/drivers/rk_nand/rk_ftl_arm_v7_thumb.S -new file mode 100755 -index 000000000000..a67898acb677 +new file mode 100644 +index 000000000..a67898acb --- /dev/null +++ b/drivers/rk_nand/rk_ftl_arm_v7_thumb.S @@ -0,0 +1,30192 @@ @@ -1375354,8 +1375377,8 @@ index 000000000000..a67898acb677 +.LC200: + .ascii "\0013vendor storage %x,%x,%x\012\000" diff --git a/drivers/rk_nand/rk_ftl_arm_v8.S b/drivers/rk_nand/rk_ftl_arm_v8.S -new file mode 100755 -index 000000000000..537155f1fcde +new file mode 100644 +index 000000000..537155f1f --- /dev/null +++ b/drivers/rk_nand/rk_ftl_arm_v8.S @@ -0,0 +1,27968 @@ @@ -1403328,8 +1403351,8 @@ index 000000000000..537155f1fcde +.LC199: + .string "\0013vendor storage %x,%x,%x\n" diff --git a/drivers/rk_nand/rk_ftlv5_arm32.S b/drivers/rk_nand/rk_ftlv5_arm32.S -new file mode 100755 -index 000000000000..26e2a694fb6d +new file mode 100644 +index 000000000..26e2a694f --- /dev/null +++ b/drivers/rk_nand/rk_ftlv5_arm32.S @@ -0,0 +1,27612 @@ @@ -1430946,8 +1430969,8 @@ index 000000000000..26e2a694fb6d +.LC167: + .ascii "erase power lost blk = %x vpc=%x\012\000" diff --git a/drivers/rk_nand/rk_ftlv5_arm64.S b/drivers/rk_nand/rk_ftlv5_arm64.S -new file mode 100755 -index 000000000000..260a57d855b5 +new file mode 100644 +index 000000000..260a57d85 --- /dev/null +++ b/drivers/rk_nand/rk_ftlv5_arm64.S @@ -0,0 +1,25632 @@ @@ -1456584,8 +1456607,8 @@ index 000000000000..260a57d855b5 +.LC166: + .string "erase power lost blk = %x vpc=%x\n" diff --git a/drivers/rk_nand/rk_nand_base.c b/drivers/rk_nand/rk_nand_base.c -new file mode 100755 -index 000000000000..9d5e2fb02baa +new file mode 100644 +index 000000000..9d5e2fb02 --- /dev/null +++ b/drivers/rk_nand/rk_nand_base.c @@ -0,0 +1,456 @@ @@ -1457046,8 +1457069,8 @@ index 000000000000..9d5e2fb02baa +MODULE_ALIAS("rknand"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/rk_nand/rk_nand_base.h b/drivers/rk_nand/rk_nand_base.h -new file mode 100755 -index 000000000000..023e58d5fc5c +new file mode 100644 +index 000000000..023e58d5f --- /dev/null +++ b/drivers/rk_nand/rk_nand_base.h @@ -0,0 +1,46 @@ @@ -1457098,8 +1457121,8 @@ index 000000000000..023e58d5fc5c +void rknand_dev_cache_flush(void); +#endif diff --git a/drivers/rk_nand/rk_nand_blk.c b/drivers/rk_nand/rk_nand_blk.c -new file mode 100755 -index 000000000000..7d1c46966481 +new file mode 100644 +index 000000000..7d1c46966 --- /dev/null +++ b/drivers/rk_nand/rk_nand_blk.c @@ -0,0 +1,711 @@ @@ -1457815,8 +1457838,8 @@ index 000000000000..7d1c46966481 + pr_info("rknand_shutdown:OK\n"); +} diff --git a/drivers/rk_nand/rk_nand_blk.h b/drivers/rk_nand/rk_nand_blk.h -new file mode 100755 -index 000000000000..681c625f5081 +new file mode 100644 +index 000000000..681c625f5 --- /dev/null +++ b/drivers/rk_nand/rk_nand_blk.h @@ -0,0 +1,67 @@ @@ -1457888,8 +1457911,8 @@ index 000000000000..681c625f5081 +int nand_blk_add_whole_disk(void); +#endif diff --git a/drivers/rk_nand/rk_zftl_arm32.S b/drivers/rk_nand/rk_zftl_arm32.S -new file mode 100755 -index 000000000000..ec6959a4c9c9 +new file mode 100644 +index 000000000..ec6959a4c --- /dev/null +++ b/drivers/rk_nand/rk_zftl_arm32.S @@ -0,0 +1,37095 @@ @@ -1494989,8 +1495012,8 @@ index 000000000000..ec6959a4c9c9 +.LC324: + .ascii "\0013vendor storage %x,%x,%x\012\000" diff --git a/drivers/rk_nand/rk_zftl_arm64.S b/drivers/rk_nand/rk_zftl_arm64.S -new file mode 100755 -index 000000000000..943e37110677 +new file mode 100644 +index 000000000..943e37110 --- /dev/null +++ b/drivers/rk_nand/rk_zftl_arm64.S @@ -0,0 +1,35207 @@ @@ -1530202,8 +1530225,8 @@ index 000000000000..943e37110677 +.LC324: + .string "\0013vendor storage %x,%x,%x\n" diff --git a/drivers/rkflash/Kconfig b/drivers/rkflash/Kconfig -new file mode 100755 -index 000000000000..4c791915e7bc +new file mode 100644 +index 000000000..4c791915e --- /dev/null +++ b/drivers/rkflash/Kconfig @@ -0,0 +1,80 @@ @@ -1530288,8 +1530311,8 @@ index 000000000000..4c791915e7bc + +endif # ARCH_ROCKCHIP diff --git a/drivers/rkflash/Makefile b/drivers/rkflash/Makefile -new file mode 100755 -index 000000000000..283a217eb6ca +new file mode 100644 +index 000000000..283a217eb --- /dev/null +++ b/drivers/rkflash/Makefile @@ -0,0 +1,14 @@ @@ -1530308,8 +1530331,8 @@ index 000000000000..283a217eb6ca +rksftl-$(CONFIG_ARM) += rk_sftl_arm_v7.o +endif diff --git a/drivers/rkflash/flash.c b/drivers/rkflash/flash.c -new file mode 100755 -index 000000000000..52be15969cda +new file mode 100644 +index 000000000..52be15969 --- /dev/null +++ b/drivers/rkflash/flash.c @@ -0,0 +1,505 @@ @@ -1530819,8 +1530842,8 @@ index 000000000000..52be15969cda + return 0; +} diff --git a/drivers/rkflash/flash.h b/drivers/rkflash/flash.h -new file mode 100755 -index 000000000000..8f1284c9026a +new file mode 100644 +index 000000000..8f1284c90 --- /dev/null +++ b/drivers/rkflash/flash.h @@ -0,0 +1,132 @@ @@ -1530957,8 +1530980,8 @@ index 000000000000..8f1284c9026a + +#endif diff --git a/drivers/rkflash/flash_com.h b/drivers/rkflash/flash_com.h -new file mode 100755 -index 000000000000..da6eb29968a1 +new file mode 100644 +index 000000000..da6eb2996 --- /dev/null +++ b/drivers/rkflash/flash_com.h @@ -0,0 +1,77 @@ @@ -1531040,8 +1531063,8 @@ index 000000000000..da6eb29968a1 + +#endif diff --git a/drivers/rkflash/nand_boot.c b/drivers/rkflash/nand_boot.c -new file mode 100755 -index 000000000000..7db6ff9e7f48 +new file mode 100644 +index 000000000..7db6ff9e7 --- /dev/null +++ b/drivers/rkflash/nand_boot.c @@ -0,0 +1,83 @@ @@ -1531129,8 +1531152,8 @@ index 000000000000..7db6ff9e7f48 +}; + diff --git a/drivers/rkflash/nandc.c b/drivers/rkflash/nandc.c -new file mode 100755 -index 000000000000..69e3b0ed5598 +new file mode 100644 +index 000000000..69e3b0ed5 --- /dev/null +++ b/drivers/rkflash/nandc.c @@ -0,0 +1,467 @@ @@ -1531602,8 +1531625,8 @@ index 000000000000..69e3b0ed5598 +{ +} diff --git a/drivers/rkflash/nandc.h b/drivers/rkflash/nandc.h -new file mode 100755 -index 000000000000..e650493dbe4d +new file mode 100644 +index 000000000..e650493db --- /dev/null +++ b/drivers/rkflash/nandc.h @@ -0,0 +1,346 @@ @@ -1531954,8 +1531977,8 @@ index 000000000000..e650493dbe4d + +#endif diff --git a/drivers/rkflash/rk_sftl.h b/drivers/rkflash/rk_sftl.h -new file mode 100755 -index 000000000000..378f83714b5d +new file mode 100644 +index 000000000..378f83714 --- /dev/null +++ b/drivers/rkflash/rk_sftl.h @@ -0,0 +1,48 @@ @@ -1532008,8 +1532031,8 @@ index 000000000000..378f83714b5d +void __printf(1, 2) sftl_printk(char *fmt, ...); +#endif diff --git a/drivers/rkflash/rk_sftl_arm_v7.S b/drivers/rkflash/rk_sftl_arm_v7.S -new file mode 100755 -index 000000000000..a8119e884d35 +new file mode 100644 +index 000000000..a8119e884 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v7.S @@ -0,0 +1,15787 @@ @@ -1547801,8 +1547824,8 @@ index 000000000000..a8119e884d35 +.LC134: + .ascii "vendor_storage\000" diff --git a/drivers/rkflash/rk_sftl_arm_v7_thumb.S b/drivers/rkflash/rk_sftl_arm_v7_thumb.S -new file mode 100755 -index 000000000000..d4429f7f1db4 +new file mode 100644 +index 000000000..d4429f7f1 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v7_thumb.S @@ -0,0 +1,15586 @@ @@ -1563393,8 +1563416,8 @@ index 000000000000..d4429f7f1db4 +.LC134: + .ascii "vendor_storage\000" diff --git a/drivers/rkflash/rk_sftl_arm_v8.S b/drivers/rkflash/rk_sftl_arm_v8.S -new file mode 100755 -index 000000000000..7e2944e55a76 +new file mode 100644 +index 000000000..7e2944e55 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v8.S @@ -0,0 +1,15768 @@ @@ -1579167,8 +1579190,8 @@ index 000000000000..7e2944e55a76 + .word 3 + .align 3 diff --git a/drivers/rkflash/rkflash_api.h b/drivers/rkflash/rkflash_api.h -new file mode 100755 -index 000000000000..402109b60521 +new file mode 100644 +index 000000000..402109b60 --- /dev/null +++ b/drivers/rkflash/rkflash_api.h @@ -0,0 +1,58 @@ @@ -1579231,8 +1579254,8 @@ index 000000000000..402109b60521 + +#endif diff --git a/drivers/rkflash/rkflash_blk.c b/drivers/rkflash/rkflash_blk.c -new file mode 100755 -index 000000000000..17ffe73865fe +new file mode 100644 +index 000000000..17ffe7386 --- /dev/null +++ b/drivers/rkflash/rkflash_blk.c @@ -0,0 +1,789 @@ @@ -1580026,8 +1580049,8 @@ index 000000000000..17ffe73865fe + pr_info("rkflash_shutdown:OK\n"); +} diff --git a/drivers/rkflash/rkflash_blk.h b/drivers/rkflash/rkflash_blk.h -new file mode 100755 -index 000000000000..3d95436c55e7 +new file mode 100644 +index 000000000..3d95436c5 --- /dev/null +++ b/drivers/rkflash/rkflash_blk.h @@ -0,0 +1,121 @@ @@ -1580153,8 +1580176,8 @@ index 000000000000..3d95436c55e7 + +#endif diff --git a/drivers/rkflash/rkflash_debug.c b/drivers/rkflash/rkflash_debug.c -new file mode 100755 -index 000000000000..ce742b0382ef +new file mode 100644 +index 000000000..ce742b038 --- /dev/null +++ b/drivers/rkflash/rkflash_debug.c @@ -0,0 +1,116 @@ @@ -1580275,8 +1580298,8 @@ index 000000000000..ce742b0382ef +module_param_cb(rkflash_debug, &rkflash_debug_param_ops, &rkflash_debug, 0644); +MODULE_PARM_DESC(rkflash_debug, "config rkflash_debug module"); diff --git a/drivers/rkflash/rkflash_debug.h b/drivers/rkflash/rkflash_debug.h -new file mode 100755 -index 000000000000..3fe4068322e7 +new file mode 100644 +index 000000000..3fe406832 --- /dev/null +++ b/drivers/rkflash/rkflash_debug.h @@ -0,0 +1,42 @@ @@ -1580323,8 +1580346,8 @@ index 000000000000..3fe4068322e7 +#endif + diff --git a/drivers/rkflash/rknandc_base.c b/drivers/rkflash/rknandc_base.c -new file mode 100755 -index 000000000000..d2e97883dec4 +new file mode 100644 +index 000000000..d2e97883d --- /dev/null +++ b/drivers/rkflash/rknandc_base.c @@ -0,0 +1,192 @@ @@ -1580521,8 +1580544,8 @@ index 000000000000..d2e97883dec4 +module_exit(rknandc_driver_exit); +MODULE_ALIAS("rknandc"); diff --git a/drivers/rkflash/rksfc_base.c b/drivers/rkflash/rksfc_base.c -new file mode 100755 -index 000000000000..6cf74e103972 +new file mode 100644 +index 000000000..6cf74e103 --- /dev/null +++ b/drivers/rkflash/rksfc_base.c @@ -0,0 +1,267 @@ @@ -1580794,8 +1580817,8 @@ index 000000000000..6cf74e103972 +module_exit(rksfc_driver_exit); +MODULE_ALIAS("rksfc"); diff --git a/drivers/rkflash/sfc.c b/drivers/rkflash/sfc.c -new file mode 100755 -index 000000000000..9ee5d6a97f13 +new file mode 100644 +index 000000000..9ee5d6a97 --- /dev/null +++ b/drivers/rkflash/sfc.c @@ -0,0 +1,255 @@ @@ -1581055,8 +1581078,8 @@ index 000000000000..9ee5d6a97f13 + return ret; +} diff --git a/drivers/rkflash/sfc.h b/drivers/rkflash/sfc.h -new file mode 100755 -index 000000000000..355cd26170c6 +new file mode 100644 +index 000000000..355cd2617 --- /dev/null +++ b/drivers/rkflash/sfc.h @@ -0,0 +1,224 @@ @@ -1581285,8 +1581308,8 @@ index 000000000000..355cd26170c6 +void rksfc_wait_for_irq_completed(void); +#endif diff --git a/drivers/rkflash/sfc_nand.c b/drivers/rkflash/sfc_nand.c -new file mode 100755 -index 000000000000..cf3d3e887198 +new file mode 100644 +index 000000000..cf3d3e887 --- /dev/null +++ b/drivers/rkflash/sfc_nand.c @@ -0,0 +1,1051 @@ @@ -1582342,8 +1582365,8 @@ index 000000000000..cf3d3e887198 + return p_nand_info; +} diff --git a/drivers/rkflash/sfc_nand.h b/drivers/rkflash/sfc_nand.h -new file mode 100755 -index 000000000000..43f4adf4508b +new file mode 100644 +index 000000000..43f4adf45 --- /dev/null +++ b/drivers/rkflash/sfc_nand.h @@ -0,0 +1,133 @@ @@ -1582481,8 +1582504,8 @@ index 000000000000..43f4adf4508b + +#endif diff --git a/drivers/rkflash/sfc_nand_boot.c b/drivers/rkflash/sfc_nand_boot.c -new file mode 100755 -index 000000000000..8db7f8df968f +new file mode 100644 +index 000000000..8db7f8df9 --- /dev/null +++ b/drivers/rkflash/sfc_nand_boot.c @@ -0,0 +1,89 @@ @@ -1582576,8 +1582599,8 @@ index 000000000000..8db7f8df968f + snand_discard, +}; diff --git a/drivers/rkflash/sfc_nand_mtd.c b/drivers/rkflash/sfc_nand_mtd.c -new file mode 100755 -index 000000000000..1b4d306050cf +new file mode 100644 +index 000000000..1b4d30605 --- /dev/null +++ b/drivers/rkflash/sfc_nand_mtd.c @@ -0,0 +1,423 @@ @@ -1583005,8 +1583028,8 @@ index 000000000000..1b4d306050cf + +#endif diff --git a/drivers/rkflash/sfc_nand_mtd.h b/drivers/rkflash/sfc_nand_mtd.h -new file mode 100755 -index 000000000000..0d49c74654ab +new file mode 100644 +index 000000000..0d49c7465 --- /dev/null +++ b/drivers/rkflash/sfc_nand_mtd.h @@ -0,0 +1,82 @@ @@ -1583093,8 +1583116,8 @@ index 000000000000..0d49c74654ab + +#endif diff --git a/drivers/rkflash/sfc_nand_mtd_bbt.c b/drivers/rkflash/sfc_nand_mtd_bbt.c -new file mode 100755 -index 000000000000..eb641f89306c +new file mode 100644 +index 000000000..eb641f893 --- /dev/null +++ b/drivers/rkflash/sfc_nand_mtd_bbt.c @@ -0,0 +1,441 @@ @@ -1583540,8 +1583563,8 @@ index 000000000000..eb641f89306c +} +EXPORT_SYMBOL_GPL(snanddev_bbt_set_block_status); diff --git a/drivers/rkflash/sfc_nor.c b/drivers/rkflash/sfc_nor.c -new file mode 100755 -index 000000000000..f7abe75a5b09 +new file mode 100644 +index 000000000..f7abe75a5 --- /dev/null +++ b/drivers/rkflash/sfc_nor.c @@ -0,0 +1,783 @@ @@ -1584329,8 +1584352,8 @@ index 000000000000..f7abe75a5b09 +} + diff --git a/drivers/rkflash/sfc_nor.h b/drivers/rkflash/sfc_nor.h -new file mode 100755 -index 000000000000..950af6a5e686 +new file mode 100644 +index 000000000..950af6a5e --- /dev/null +++ b/drivers/rkflash/sfc_nor.h @@ -0,0 +1,176 @@ @@ -1584511,8 +1584534,8 @@ index 000000000000..950af6a5e686 + struct snor_info_packet *packet); +#endif diff --git a/drivers/rkflash/sfc_nor_boot.c b/drivers/rkflash/sfc_nor_boot.c -new file mode 100755 -index 000000000000..791c1291b475 +new file mode 100644 +index 000000000..791c1291b --- /dev/null +++ b/drivers/rkflash/sfc_nor_boot.c @@ -0,0 +1,180 @@ @@ -1584697,8 +1584720,8 @@ index 000000000000..791c1291b475 + NULL, +}; diff --git a/drivers/rkflash/sfc_nor_mtd.c b/drivers/rkflash/sfc_nor_mtd.c -new file mode 100755 -index 000000000000..8c9d69a581f2 +new file mode 100644 +index 000000000..8c9d69a58 --- /dev/null +++ b/drivers/rkflash/sfc_nor_mtd.c @@ -0,0 +1,266 @@ @@ -1584969,8 +1584992,8 @@ index 000000000000..8c9d69a581f2 + return ret; +} diff --git a/drivers/rkflash/typedef.h b/drivers/rkflash/typedef.h -new file mode 100755 -index 000000000000..5808ec281fa2 +new file mode 100644 +index 000000000..5808ec281 --- /dev/null +++ b/drivers/rkflash/typedef.h @@ -0,0 +1,30 @@ @@ -1585005,7 +1585028,7 @@ index 000000000000..5808ec281fa2 + +#endif /*__TYPEDEF_H */ diff --git a/drivers/soc/rockchip/Kconfig b/drivers/soc/rockchip/Kconfig -index 25eb2c1e31bb..a9d09b3e902e 100644 +index 25eb2c1e3..a9d09b3e9 100644 --- a/drivers/soc/rockchip/Kconfig +++ b/drivers/soc/rockchip/Kconfig @@ -1,19 +1,85 @@ @@ -1585308,8 +1585331,8 @@ index 25eb2c1e31bb..a9d09b3e902e 100644 + endif diff --git a/drivers/soc/rockchip/Kconfig.cpu b/drivers/soc/rockchip/Kconfig.cpu -new file mode 100755 -index 000000000000..1ffc763434bf +new file mode 100644 +index 000000000..1ffc76343 --- /dev/null +++ b/drivers/soc/rockchip/Kconfig.cpu @@ -0,0 +1,72 @@ @@ -1585386,7 +1585409,7 @@ index 000000000000..1ffc763434bf + +endmenu diff --git a/drivers/soc/rockchip/Makefile b/drivers/soc/rockchip/Makefile -index 875032f7344e..7a1ae8d8a6bb 100644 +index 875032f73..7a1ae8d8a 100644 --- a/drivers/soc/rockchip/Makefile +++ b/drivers/soc/rockchip/Makefile @@ -2,6 +2,35 @@ @@ -1585427,7 +1585450,7 @@ index 875032f7344e..7a1ae8d8a6bb 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 000000000000..4805100b127a +index 000000000..4805100b1 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/Kconfig @@ -0,0 +1,87 @@ @@ -1585520,7 +1585543,7 @@ index 000000000000..4805100b127a + 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 000000000000..6ac2cd61bf8e +index 000000000..6ac2cd61b --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/Makefile @@ -0,0 +1,3 @@ @@ -1585529,7 +1585552,7 @@ index 000000000000..6ac2cd61bf8e +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 000000000000..4647144ea757 +index 000000000..4647144ea --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger.c @@ -0,0 +1,1730 @@ @@ -1587265,7 +1587288,7 @@ index 000000000000..4647144ea757 +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 000000000000..e2003e47904d +index 000000000..e2003e479 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger.h @@ -0,0 +1,81 @@ @@ -1587352,7 +1587375,7 @@ index 000000000000..e2003e47904d +#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 000000000000..d44287eba4bd +index 000000000..d44287eba --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm.c @@ -0,0 +1,270 @@ @@ -1587628,7 +1587651,7 @@ index 000000000000..d44287eba4bd +#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 000000000000..ee8052bfd817 +index 000000000..ee8052bfd --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm64.c @@ -0,0 +1,199 @@ @@ -1587833,7 +1587856,7 @@ index 000000000000..ee8052bfd817 +#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 000000000000..915860a6b38a +index 000000000..915860a6b --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_priv.h @@ -0,0 +1,39 @@ @@ -1587878,7 +1587901,7 @@ index 000000000000..915860a6b38a +#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 000000000000..10c3c5d09098 +index 000000000..10c3c5d09 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_ringbuf.h @@ -0,0 +1,94 @@ @@ -1587978,7 +1588001,7 @@ index 000000000000..10c3c5d09098 +} 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 000000000000..194b54138417 +index 000000000..194b54138 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_watchdog.c @@ -0,0 +1,56 @@ @@ -1588040,7 +1588063,7 @@ index 000000000000..194b54138417 +} 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 000000000000..c6b507f8d976 +index 000000000..c6b507f8d --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_watchdog.h @@ -0,0 +1,20 @@ @@ -1588066,7 +1588089,7 @@ index 000000000000..c6b507f8d976 +#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 000000000000..6dafdde7b6b0 +index 000000000..6dafdde7b --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/rk_fiq_debugger.c @@ -0,0 +1,1136 @@ @@ -1589208,7 +1589231,7 @@ index 000000000000..6dafdde7b6b0 +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 000000000000..f5ec8d143b22 +index 000000000..f5ec8d143 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/rk_fiq_debugger.h @@ -0,0 +1,22 @@ @@ -1589235,8 +1589258,8 @@ index 000000000000..f5ec8d143b22 + +#endif diff --git a/drivers/soc/rockchip/flash_vendor_storage.c b/drivers/soc/rockchip/flash_vendor_storage.c -new file mode 100755 -index 000000000000..7c8cd338d286 +new file mode 100644 +index 000000000..7c8cd338d --- /dev/null +++ b/drivers/soc/rockchip/flash_vendor_storage.c @@ -0,0 +1,342 @@ @@ -1589583,8 +1589606,8 @@ index 000000000000..7c8cd338d286 +module_exit(vendor_storage_deinit); +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/flash_vendor_storage.h b/drivers/soc/rockchip/flash_vendor_storage.h -new file mode 100755 -index 000000000000..55ca52486de7 +new file mode 100644 +index 000000000..55ca52486 --- /dev/null +++ b/drivers/soc/rockchip/flash_vendor_storage.h @@ -0,0 +1,16 @@ @@ -1589605,7 +1589628,7 @@ index 000000000000..55ca52486de7 +#endif + diff --git a/drivers/soc/rockchip/grf.c b/drivers/soc/rockchip/grf.c -index 343ff61ccccb..890158d0da7f 100644 +index 343ff61cc..890158d0d 100644 --- a/drivers/soc/rockchip/grf.c +++ b/drivers/soc/rockchip/grf.c @@ -5,12 +5,105 @@ @@ -1589852,7 +1589875,7 @@ index 343ff61ccccb..890158d0da7f 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 b29e829e815e..f5ec81667ef3 100644 +index b29e829e8..f5ec81667 100644 --- a/drivers/soc/rockchip/io-domain.c +++ b/drivers/soc/rockchip/io-domain.c @@ -14,6 +14,13 @@ @@ -1590341,7 +1590364,7 @@ index b29e829e815e..f5ec81667ef3 100644 MODULE_AUTHOR("Heiko Stuebner "); diff --git a/drivers/soc/rockchip/iomux.c b/drivers/soc/rockchip/iomux.c new file mode 100644 -index 000000000000..110feb7f839d +index 000000000..110feb7f8 --- /dev/null +++ b/drivers/soc/rockchip/iomux.c @@ -0,0 +1,88 @@ @@ -1590435,7 +1590458,7 @@ index 000000000000..110feb7f839d +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 000000000000..64dc1465004b +index 000000000..64dc14650 --- /dev/null +++ b/drivers/soc/rockchip/minidump/Kconfig @@ -0,0 +1,40 @@ @@ -1590481,7 +1590504,7 @@ index 000000000000..64dc1465004b +endmenu diff --git a/drivers/soc/rockchip/minidump/Makefile b/drivers/soc/rockchip/minidump/Makefile new file mode 100644 -index 000000000000..7f799a034c01 +index 000000000..7f799a034 --- /dev/null +++ b/drivers/soc/rockchip/minidump/Makefile @@ -0,0 +1,3 @@ @@ -1590490,7 +1590513,7 @@ index 000000000000..7f799a034c01 +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 000000000000..dbccd0316008 +index 000000000..dbccd0316 --- /dev/null +++ b/drivers/soc/rockchip/minidump/elf.h @@ -0,0 +1,45 @@ @@ -1590541,7 +1590564,7 @@ index 000000000000..dbccd0316008 +#endif diff --git a/drivers/soc/rockchip/minidump/minidump_log.c b/drivers/soc/rockchip/minidump/minidump_log.c new file mode 100644 -index 000000000000..18b1934e9356 +index 000000000..18b1934e9 --- /dev/null +++ b/drivers/soc/rockchip/minidump/minidump_log.c @@ -0,0 +1,1508 @@ @@ -1592055,7 +1592078,7 @@ index 000000000000..18b1934e9356 +} diff --git a/drivers/soc/rockchip/minidump/minidump_memory.c b/drivers/soc/rockchip/minidump/minidump_memory.c new file mode 100644 -index 000000000000..d7f93e2f12b6 +index 000000000..d7f93e2f1 --- /dev/null +++ b/drivers/soc/rockchip/minidump/minidump_memory.c @@ -0,0 +1,1350 @@ @@ -1593411,7 +1593434,7 @@ index 000000000000..d7f93e2f12b6 +} diff --git a/drivers/soc/rockchip/minidump/minidump_memory.h b/drivers/soc/rockchip/minidump/minidump_memory.h new file mode 100644 -index 000000000000..086f1f89a090 +index 000000000..086f1f89a --- /dev/null +++ b/drivers/soc/rockchip/minidump/minidump_memory.h @@ -0,0 +1,51 @@ @@ -1593468,7 +1593491,7 @@ index 000000000000..086f1f89a090 +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 000000000000..f2dadce35bf0 +index 000000000..f2dadce35 --- /dev/null +++ b/drivers/soc/rockchip/minidump/minidump_private.h @@ -0,0 +1,90 @@ @@ -1593564,7 +1593587,7 @@ index 000000000000..f2dadce35bf0 +#endif diff --git a/drivers/soc/rockchip/minidump/rk_minidump.c b/drivers/soc/rockchip/minidump/rk_minidump.c new file mode 100644 -index 000000000000..d742b7e2eda6 +index 000000000..d742b7e2e --- /dev/null +++ b/drivers/soc/rockchip/minidump/rk_minidump.c @@ -0,0 +1,779 @@ @@ -1594349,7 +1594372,7 @@ index 000000000000..d742b7e2eda6 +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 000000000000..c8fa137be25e +index 000000000..c8fa137be --- /dev/null +++ b/drivers/soc/rockchip/minidump/rk_minidump_asm.S @@ -0,0 +1,23 @@ @@ -1594377,8 +1594400,8 @@ index 000000000000..c8fa137be25e + ret +SYM_FUNC_END_PI(rk_md_flush_dcache_area) diff --git a/drivers/soc/rockchip/mtd_vendor_storage.c b/drivers/soc/rockchip/mtd_vendor_storage.c -new file mode 100755 -index 000000000000..1f32930d906c +new file mode 100644 +index 000000000..1f32930d9 --- /dev/null +++ b/drivers/soc/rockchip/mtd_vendor_storage.c @@ -0,0 +1,445 @@ @@ -1594828,7 +1594851,7 @@ index 000000000000..1f32930d906c +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 54eb6cfc5d5b..6e98b2a9ef81 100644 +index 54eb6cfc5..6e98b2a9e 100644 --- a/drivers/soc/rockchip/pm_domains.c +++ b/drivers/soc/rockchip/pm_domains.c @@ -5,6 +5,7 @@ @@ -1596685,7 +1596708,7 @@ index 54eb6cfc5d5b..6e98b2a9ef81 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 000000000000..eb9768d88d3d +index 000000000..eb9768d88 --- /dev/null +++ b/drivers/soc/rockchip/ram_vendor_storage.c @@ -0,0 +1,214 @@ @@ -1596904,8 +1596927,8 @@ index 000000000000..eb9768d88d3d +module_platform_driver(vendor_storage_driver); +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rk_camera_sensor_info.h b/drivers/soc/rockchip/rk_camera_sensor_info.h -new file mode 100755 -index 000000000000..55823b3839b2 +new file mode 100644 +index 000000000..55823b383 --- /dev/null +++ b/drivers/soc/rockchip/rk_camera_sensor_info.h @@ -0,0 +1,421 @@ @@ -1597332,7 +1597355,7 @@ index 000000000000..55823b3839b2 +#endif diff --git a/drivers/soc/rockchip/rk_cma_procfs.c b/drivers/soc/rockchip/rk_cma_procfs.c new file mode 100644 -index 000000000000..3fbfef095834 +index 000000000..3fbfef095 --- /dev/null +++ b/drivers/soc/rockchip/rk_cma_procfs.c @@ -0,0 +1,92 @@ @@ -1597430,7 +1597453,7 @@ index 000000000000..3fbfef095834 +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 000000000000..0d82f0a38b91 +index 000000000..0d82f0a38 --- /dev/null +++ b/drivers/soc/rockchip/rk_dmabuf_procfs.c @@ -0,0 +1,206 @@ @@ -1597642,7 +1597665,7 @@ index 000000000000..0d82f0a38b91 +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 000000000000..f888c9c18738 +index 000000000..f888c9c18 --- /dev/null +++ b/drivers/soc/rockchip/rk_memblock_procfs.c @@ -0,0 +1,50 @@ @@ -1597697,8 +1597720,8 @@ index 000000000000..f888c9c18738 +} +late_initcall_sync(rk_memblock_procfs_init); diff --git a/drivers/soc/rockchip/rk_vendor_storage.c b/drivers/soc/rockchip/rk_vendor_storage.c -new file mode 100755 -index 000000000000..a8a316e47ff9 +new file mode 100644 +index 000000000..a8a316e47 --- /dev/null +++ b/drivers/soc/rockchip/rk_vendor_storage.c @@ -0,0 +1,50 @@ @@ -1597753,8 +1597776,8 @@ index 000000000000..a8a316e47ff9 + +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip-cpuinfo.c b/drivers/soc/rockchip/rockchip-cpuinfo.c -new file mode 100755 -index 000000000000..02befb165d98 +new file mode 100644 +index 000000000..02befb165 --- /dev/null +++ b/drivers/soc/rockchip/rockchip-cpuinfo.c @@ -0,0 +1,309 @@ @@ -1598069,7 +1598092,7 @@ index 000000000000..02befb165d98 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_amp.c b/drivers/soc/rockchip/rockchip_amp.c new file mode 100644 -index 000000000000..6f5bdc678756 +index 000000000..6f5bdc678 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_amp.c @@ -0,0 +1,660 @@ @@ -1598735,7 +1598758,7 @@ index 000000000000..6f5bdc678756 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_csu.c b/drivers/soc/rockchip/rockchip_csu.c new file mode 100644 -index 000000000000..04a6a5b39715 +index 000000000..04a6a5b39 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_csu.c @@ -0,0 +1,377 @@ @@ -1599117,8 +1599140,8 @@ index 000000000000..04a6a5b39715 +MODULE_AUTHOR("Finley Xiao "); +MODULE_DESCRIPTION("Rockchip clock subunit driver"); diff --git a/drivers/soc/rockchip/rockchip_debug.c b/drivers/soc/rockchip/rockchip_debug.c -new file mode 100755 -index 000000000000..2f9eac20bc4b +new file mode 100644 +index 000000000..2f9eac20b --- /dev/null +++ b/drivers/soc/rockchip/rockchip_debug.c @@ -0,0 +1,679 @@ @@ -1599802,8 +1599825,8 @@ index 000000000000..2f9eac20bc4b +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:rockchip-debugger"); diff --git a/drivers/soc/rockchip/rockchip_debug.h b/drivers/soc/rockchip/rockchip_debug.h -new file mode 100755 -index 000000000000..82036d8ebf72 +new file mode 100644 +index 000000000..82036d8eb --- /dev/null +++ b/drivers/soc/rockchip/rockchip_debug.h @@ -0,0 +1,14 @@ @@ -1599822,8 +1599845,8 @@ index 000000000000..82036d8ebf72 + +#endif diff --git a/drivers/soc/rockchip/rockchip_decompress.c b/drivers/soc/rockchip/rockchip_decompress.c -new file mode 100755 -index 000000000000..275a605cfccb +new file mode 100644 +index 000000000..275a605cf --- /dev/null +++ b/drivers/soc/rockchip/rockchip_decompress.c @@ -0,0 +1,388 @@ @@ -1600217,7 +1600240,7 @@ index 000000000000..275a605cfccb +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 000000000000..4e47e810c48f +index 000000000..4e47e810c --- /dev/null +++ b/drivers/soc/rockchip/rockchip_decompress_user.c @@ -0,0 +1,287 @@ @@ -1600510,7 +1600533,7 @@ index 000000000000..4e47e810c48f +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 000000000000..5f9a9b3b9338 +index 000000000..5f9a9b3b9 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_disable_unused.c @@ -0,0 +1,24 @@ @@ -1600539,8 +1600562,8 @@ index 000000000000..5f9a9b3b9338 +MODULE_LICENSE("GPL"); +#endif diff --git a/drivers/soc/rockchip/rockchip_ipa.c b/drivers/soc/rockchip/rockchip_ipa.c -new file mode 100755 -index 000000000000..e8982b7defee +new file mode 100644 +index 000000000..e8982b7de --- /dev/null +++ b/drivers/soc/rockchip/rockchip_ipa.c @@ -0,0 +1,232 @@ @@ -1600778,7 +1600801,7 @@ index 000000000000..e8982b7defee +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 000000000000..1c92541ce2ae +index 000000000..1c92541ce --- /dev/null +++ b/drivers/soc/rockchip/rockchip_npor_powergood.c @@ -0,0 +1,101 @@ @@ -1600884,8 +1600907,8 @@ index 000000000000..1c92541ce2ae +MODULE_DESCRIPTION("Rockchip NPOR Powergood"); +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_opp_select.c b/drivers/soc/rockchip/rockchip_opp_select.c -new file mode 100755 -index 000000000000..6c496ad051f6 +new file mode 100644 +index 000000000..6c496ad05 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_opp_select.c @@ -0,0 +1,2106 @@ @@ -1602997,7 +1603020,7 @@ index 000000000000..6c496ad051f6 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_performance.c b/drivers/soc/rockchip/rockchip_performance.c new file mode 100644 -index 000000000000..13d077548167 +index 000000000..13d077548 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_performance.c @@ -0,0 +1,185 @@ @@ -1603187,8 +1603210,8 @@ index 000000000000..13d077548167 +} +#endif /* CONFIG_SMP */ diff --git a/drivers/soc/rockchip/rockchip_pm_config.c b/drivers/soc/rockchip/rockchip_pm_config.c -new file mode 100755 -index 000000000000..c319b790ee24 +new file mode 100644 +index 000000000..c319b790e --- /dev/null +++ b/drivers/soc/rockchip/rockchip_pm_config.c @@ -0,0 +1,606 @@ @@ -1603799,8 +1603822,8 @@ index 000000000000..c319b790ee24 +MODULE_DESCRIPTION("Rockchip suspend mode config"); +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_pvtm.c b/drivers/soc/rockchip/rockchip_pvtm.c -new file mode 100755 -index 000000000000..75006737f421 +new file mode 100644 +index 000000000..75006737f --- /dev/null +++ b/drivers/soc/rockchip/rockchip_pvtm.c @@ -0,0 +1,1046 @@ @@ -1604851,8 +1604874,8 @@ index 000000000000..75006737f421 +MODULE_AUTHOR("Finley Xiao "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/soc/rockchip/rockchip_ramdisk.c b/drivers/soc/rockchip/rockchip_ramdisk.c -new file mode 100755 -index 000000000000..e2118ac52d2a +new file mode 100644 +index 000000000..e2118ac52 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_ramdisk.c @@ -0,0 +1,365 @@ @@ -1605222,8 +1605245,8 @@ index 000000000000..e2118ac52d2a + +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_system_monitor.c b/drivers/soc/rockchip/rockchip_system_monitor.c -new file mode 100755 -index 000000000000..51844a9c8025 +new file mode 100644 +index 000000000..51844a9c8 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_system_monitor.c @@ -0,0 +1,1946 @@ @@ -1607174,8 +1607197,8 @@ index 000000000000..51844a9c8025 +MODULE_AUTHOR("Finley Xiao "); +MODULE_DESCRIPTION("rockchip system monitor driver"); diff --git a/drivers/soc/rockchip/rockchip_thunderboot_crypto.c b/drivers/soc/rockchip/rockchip_thunderboot_crypto.c -new file mode 100755 -index 000000000000..7a3c93a0304e +new file mode 100644 +index 000000000..7a3c93a03 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_crypto.c @@ -0,0 +1,440 @@ @@ -1607620,8 +1607643,8 @@ index 000000000000..7a3c93a0304e + +pure_initcall(rk_tb_crypto_init); diff --git a/drivers/soc/rockchip/rockchip_thunderboot_mmc.c b/drivers/soc/rockchip/rockchip_thunderboot_mmc.c -new file mode 100755 -index 000000000000..10618811f0e9 +new file mode 100644 +index 000000000..10618811f --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_mmc.c @@ -0,0 +1,165 @@ @@ -1607792,7 +1607815,7 @@ index 000000000000..10618811f0e9 +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 000000000000..6002d64c8b05 +index 000000000..6002d64c8 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_service.c @@ -0,0 +1,192 @@ @@ -1607989,8 +1608012,8 @@ index 000000000000..6002d64c8b05 + +arch_initcall(rk_tb_serv_init); diff --git a/drivers/soc/rockchip/rockchip_thunderboot_sfc.c b/drivers/soc/rockchip/rockchip_thunderboot_sfc.c -new file mode 100755 -index 000000000000..d81ca755aa12 +new file mode 100644 +index 000000000..d81ca755a --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_sfc.c @@ -0,0 +1,141 @@ @@ -1608136,8 +1608159,8 @@ index 000000000000..d81ca755aa12 + +pure_initcall(rk_tb_sfc_init); diff --git a/drivers/soc/rockchip/sdmmc_vendor_storage.c b/drivers/soc/rockchip/sdmmc_vendor_storage.c -new file mode 100755 -index 000000000000..ea1d9410b8eb +new file mode 100644 +index 000000000..ea1d9410b --- /dev/null +++ b/drivers/soc/rockchip/sdmmc_vendor_storage.c @@ -0,0 +1,586 @@ @@ -1608728,7 +1608751,7 @@ index 000000000000..ea1d9410b8eb +module_exit(vendor_storage_deinit); +MODULE_LICENSE("GPL"); diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c -index a9f97023d5a0..63ffccb1eb46 100644 +index a9f97023d..63ffccb1e 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -10,6 +10,7 @@ @@ -1609128,7 +1609151,7 @@ index a9f97023d5a0..63ffccb1eb46 100644 }; MODULE_DEVICE_TABLE(of, rockchip_spi_dt_match); diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c -index aee960a7d7f9..e08de32ea454 100644 +index aee960a7d..e08de32ea 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -691,6 +691,7 @@ static const struct of_device_id spidev_dt_ids[] = { @@ -1609140,7 +1609163,7 @@ index aee960a7d7f9..e08de32ea454 100644 }; MODULE_DEVICE_TABLE(of, spidev_dt_ids); diff --git a/drivers/staging/android/ion/Kconfig b/drivers/staging/android/ion/Kconfig -index 989fe84a9f9d..7b7da979991e 100644 +index 989fe84a9..7b7da9799 100644 --- a/drivers/staging/android/ion/Kconfig +++ b/drivers/staging/android/ion/Kconfig @@ -11,17 +11,4 @@ menuconfig ION @@ -1609163,7 +1609186,7 @@ index 989fe84a9f9d..7b7da979991e 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 5f4487b1a224..7f8fd0f537b4 100644 +index 5f4487b1a..7f8fd0f53 100644 --- a/drivers/staging/android/ion/Makefile +++ b/drivers/staging/android/ion/Makefile @@ -1,4 +1,4 @@ @@ -1609175,8 +1609198,8 @@ index 5f4487b1a224..7f8fd0f537b4 100644 +CFLAGS_ion_buffer.o = -I$(src) +obj-y += heaps/ diff --git a/drivers/staging/android/ion/heaps/Kconfig b/drivers/staging/android/ion/heaps/Kconfig -new file mode 100755 -index 000000000000..5034c45a397d +new file mode 100644 +index 000000000..5034c45a3 --- /dev/null +++ b/drivers/staging/android/ion/heaps/Kconfig @@ -0,0 +1,15 @@ @@ -1609196,8 +1609219,8 @@ index 000000000000..5034c45a397d + by the Contiguous Memory Allocator (CMA). If your system has these + regions, you should say Y here. diff --git a/drivers/staging/android/ion/heaps/Makefile b/drivers/staging/android/ion/heaps/Makefile -new file mode 100755 -index 000000000000..82e36e89e978 +new file mode 100644 +index 000000000..82e36e89e --- /dev/null +++ b/drivers/staging/android/ion/heaps/Makefile @@ -0,0 +1,5 @@ @@ -1609206,200 +1609229,9 @@ index 000000000000..82e36e89e978 +ion_sys_heap-y := ion_system_heap.o ion_page_pool.o + +obj-$(CONFIG_ION_CMA_HEAP) += ion_cma_heap.o -diff --git a/drivers/staging/android/ion/ion_cma_heap.c b/drivers/staging/android/ion/heaps/ion_cma_heap.c -old mode 100644 -new mode 100755 -similarity index 72% -rename from drivers/staging/android/ion/ion_cma_heap.c -rename to drivers/staging/android/ion/heaps/ion_cma_heap.c -index bf65e67ef9d8..6ba7fd84c9ee ---- a/drivers/staging/android/ion/ion_cma_heap.c -+++ b/drivers/staging/android/ion/heaps/ion_cma_heap.c -@@ -7,6 +7,7 @@ - */ - - #include -+#include - #include - #include - #include -@@ -14,12 +15,10 @@ - #include - #include - --#include "ion.h" -- - struct ion_cma_heap { - struct ion_heap heap; - struct cma *cma; --}; -+} cma_heaps[MAX_CMA_AREAS]; - - #define to_cma_heap(x) container_of(x, struct ion_cma_heap, heap) - -@@ -71,6 +70,9 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer, - - buffer->priv_virt = pages; - buffer->sg_table = table; -+ -+ ion_buffer_prep_noncached(buffer); -+ - return 0; - - free_mem: -@@ -96,43 +98,54 @@ static void ion_cma_free(struct ion_buffer *buffer) - static struct ion_heap_ops ion_cma_ops = { - .allocate = ion_cma_allocate, - .free = ion_cma_free, -- .map_user = ion_heap_map_user, -- .map_kernel = ion_heap_map_kernel, -- .unmap_kernel = ion_heap_unmap_kernel, - }; - --static struct ion_heap *__ion_cma_heap_create(struct cma *cma) -+static int __ion_add_cma_heap(struct cma *cma, void *data) - { -+ int *cma_nr = data; - struct ion_cma_heap *cma_heap; -+ int ret; - -- cma_heap = kzalloc(sizeof(*cma_heap), GFP_KERNEL); -- -- if (!cma_heap) -- return ERR_PTR(-ENOMEM); -+ if (*cma_nr >= MAX_CMA_AREAS) -+ return -EINVAL; - -+ cma_heap = &cma_heaps[*cma_nr]; - cma_heap->heap.ops = &ion_cma_ops; -- cma_heap->cma = cma; - cma_heap->heap.type = ION_HEAP_TYPE_DMA; -- return &cma_heap->heap; -+ cma_heap->heap.name = cma_get_name(cma); -+ -+ ret = ion_device_add_heap(&cma_heap->heap); -+ if (ret) -+ goto out; -+ -+ cma_heap->cma = cma; -+ *cma_nr += 1; -+out: -+ return 0; - } - --static int __ion_add_cma_heaps(struct cma *cma, void *data) -+static int __init ion_cma_heap_init(void) - { -- struct ion_heap *heap; -- -- heap = __ion_cma_heap_create(cma); -- if (IS_ERR(heap)) -- return PTR_ERR(heap); -+ int ret; -+ int nr = 0; - -- heap->name = cma_get_name(cma); -+ ret = cma_for_each_area(__ion_add_cma_heap, &nr); -+ if (ret) { -+ for (nr = 0; nr < MAX_CMA_AREAS && cma_heaps[nr].cma; nr++) -+ ion_device_remove_heap(&cma_heaps[nr].heap); -+ } - -- ion_device_add_heap(heap); -- return 0; -+ return ret; - } - --static int ion_add_cma_heaps(void) -+static void __exit ion_cma_heap_exit(void) - { -- cma_for_each_area(__ion_add_cma_heaps, NULL); -- return 0; -+ int nr; -+ -+ for (nr = 0; nr < MAX_CMA_AREAS && cma_heaps[nr].cma; nr++) -+ ion_device_remove_heap(&cma_heaps[nr].heap); - } --device_initcall(ion_add_cma_heaps); -+ -+module_init(ion_cma_heap_init); -+module_exit(ion_cma_heap_exit); -+MODULE_LICENSE("GPL v2"); -diff --git a/drivers/staging/android/ion/ion_page_pool.c b/drivers/staging/android/ion/heaps/ion_page_pool.c -old mode 100644 -new mode 100755 -similarity index 87% -rename from drivers/staging/android/ion/ion_page_pool.c -rename to drivers/staging/android/ion/heaps/ion_page_pool.c -index 0198b886d906..efd6ce4cc0ad ---- a/drivers/staging/android/ion/ion_page_pool.c -+++ b/drivers/staging/android/ion/heaps/ion_page_pool.c -@@ -10,7 +10,7 @@ - #include - #include - --#include "ion.h" -+#include "ion_page_pool.h" - - static inline struct page *ion_page_pool_alloc_pages(struct ion_page_pool *pool) - { -@@ -79,6 +79,7 @@ struct page *ion_page_pool_alloc(struct ion_page_pool *pool) - - return page; - } -+EXPORT_SYMBOL_GPL(ion_page_pool_alloc); - - void ion_page_pool_free(struct ion_page_pool *pool, struct page *page) - { -@@ -86,6 +87,7 @@ void ion_page_pool_free(struct ion_page_pool *pool, struct page *page) - - ion_page_pool_add(pool, page); - } -+EXPORT_SYMBOL_GPL(ion_page_pool_free); - - static int ion_page_pool_total(struct ion_page_pool *pool, bool high) - { -@@ -97,6 +99,18 @@ static int ion_page_pool_total(struct ion_page_pool *pool, bool high) - return count << pool->order; - } - -+int ion_page_pool_nr_pages(struct ion_page_pool *pool) -+{ -+ int nr_total_pages; -+ -+ mutex_lock(&pool->mutex); -+ nr_total_pages = ion_page_pool_total(pool, true); -+ mutex_unlock(&pool->mutex); -+ -+ return nr_total_pages; -+} -+EXPORT_SYMBOL_GPL(ion_page_pool_nr_pages); -+ - int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask, - int nr_to_scan) - { -@@ -130,6 +144,7 @@ int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask, - - return freed; - } -+EXPORT_SYMBOL_GPL(ion_page_pool_shrink); - - struct ion_page_pool *ion_page_pool_create(gfp_t gfp_mask, unsigned int order) - { -@@ -148,8 +163,10 @@ struct ion_page_pool *ion_page_pool_create(gfp_t gfp_mask, unsigned int order) - - return pool; - } -+EXPORT_SYMBOL_GPL(ion_page_pool_create); - - void ion_page_pool_destroy(struct ion_page_pool *pool) - { - kfree(pool); - } -+EXPORT_SYMBOL_GPL(ion_page_pool_destroy); diff --git a/drivers/staging/android/ion/heaps/ion_page_pool.h b/drivers/staging/android/ion/heaps/ion_page_pool.h -new file mode 100755 -index 000000000000..10c79090c7a0 +new file mode 100644 +index 000000000..10c79090c --- /dev/null +++ b/drivers/staging/android/ion/heaps/ion_page_pool.h @@ -0,0 +1,67 @@ @@ -1609470,329 +1609302,8 @@ index 000000000000..10c79090c7a0 +int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask, + int nr_to_scan); +#endif /* _ION_PAGE_POOL_H */ -diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/heaps/ion_system_heap.c -old mode 100644 -new mode 100755 -similarity index 65% -rename from drivers/staging/android/ion/ion_system_heap.c -rename to drivers/staging/android/ion/heaps/ion_system_heap.c -index eac0632ab4e8..45d23bea3822 ---- a/drivers/staging/android/ion/ion_system_heap.c -+++ b/drivers/staging/android/ion/heaps/ion_system_heap.c -@@ -9,12 +9,14 @@ - #include - #include - #include -+#include - #include -+#include - #include - #include - #include - --#include "ion.h" -+#include "ion_page_pool.h" - - #define NUM_ORDERS ARRAY_SIZE(orders) - -@@ -109,21 +111,48 @@ static int ion_system_heap_allocate(struct ion_heap *heap, - int i = 0; - unsigned long size_remaining = PAGE_ALIGN(size); - unsigned int max_order = orders[0]; -+ struct list_head lists[8]; -+ unsigned int block_index[8] = {0}; -+ unsigned int block_1M = 0; -+ unsigned int block_64K = 0; -+ unsigned int maximum; -+ int j; - - if (size / PAGE_SIZE > totalram_pages() / 2) - return -ENOMEM; - - INIT_LIST_HEAD(&pages); -+ for (i = 0; i < 8; i++) -+ INIT_LIST_HEAD(&lists[i]); -+ -+ i = 0; - while (size_remaining > 0) { - page = alloc_largest_available(sys_heap, buffer, size_remaining, - max_order); - if (!page) - goto free_pages; -- list_add_tail(&page->lru, &pages); -+ - size_remaining -= page_size(page); - max_order = compound_order(page); -+ if (max_order) { -+ if (max_order == 8) -+ block_1M++; -+ if (max_order == 4) -+ block_64K++; -+ list_add_tail(&page->lru, &pages); -+ } else { -+ dma_addr_t phys = page_to_phys(page); -+ unsigned int bit12_14 = (phys >> 12) & 0x7; -+ -+ list_add_tail(&page->lru, &lists[bit12_14]); -+ block_index[bit12_14]++; -+ } -+ - i++; - } -+ -+ pr_debug("%s, %d, i = %d, size = %ld\n", __func__, __LINE__, i, size); -+ - table = kmalloc(sizeof(*table), GFP_KERNEL); - if (!table) - goto free_pages; -@@ -131,6 +160,16 @@ static int ion_system_heap_allocate(struct ion_heap *heap, - if (sg_alloc_table(table, i, GFP_KERNEL)) - goto free_table; - -+ maximum = block_index[0]; -+ for (i = 1; i < 8; i++) -+ maximum = max(maximum, block_index[i]); -+ -+ pr_debug("%s, %d, maximum = %d, block_1M = %d, block_64K = %d\n", -+ __func__, __LINE__, maximum, block_1M, block_64K); -+ -+ for (i = 0; i < 8; i++) -+ pr_debug("block_index[%d] = %d\n", i, block_index[i]); -+ - sg = table->sgl; - list_for_each_entry_safe(page, tmp_page, &pages, lru) { - sg_set_page(sg, page, page_size(page), 0); -@@ -138,7 +177,22 @@ static int ion_system_heap_allocate(struct ion_heap *heap, - list_del(&page->lru); - } - -+ for (i = 0; i < maximum; i++) { -+ for (j = 0; j < 8; j++) { -+ if (!list_empty(&lists[j])) { -+ page = list_first_entry(&lists[j], struct page, -+ lru); -+ sg_set_page(sg, page, PAGE_SIZE, 0); -+ sg = sg_next(sg); -+ list_del(&page->lru); -+ } -+ } -+ } -+ - buffer->sg_table = table; -+ -+ ion_buffer_prep_noncached(buffer); -+ - return 0; - - free_table: -@@ -146,6 +200,11 @@ static int ion_system_heap_allocate(struct ion_heap *heap, - free_pages: - list_for_each_entry_safe(page, tmp_page, &pages, lru) - free_buffer_page(sys_heap, buffer, page); -+ -+ for (i = 0; i < 8; i++) { -+ list_for_each_entry_safe(page, tmp_page, &lists[i], lru) -+ free_buffer_page(sys_heap, buffer, page); -+ } - return -ENOMEM; - } - -@@ -160,7 +219,7 @@ static void ion_system_heap_free(struct ion_buffer *buffer) - - /* zero the buffer before goto page pool */ - if (!(buffer->private_flags & ION_PRIV_FLAG_SHRINKER_FREE)) -- ion_heap_buffer_zero(buffer); -+ ion_buffer_zero(buffer); - - for_each_sgtable_sg(table, sg, i) - free_buffer_page(sys_heap, buffer, sg_page(sg)); -@@ -203,14 +262,18 @@ static int ion_system_heap_shrink(struct ion_heap *heap, gfp_t gfp_mask, - return nr_total; - } - --static struct ion_heap_ops system_heap_ops = { -- .allocate = ion_system_heap_allocate, -- .free = ion_system_heap_free, -- .map_kernel = ion_heap_map_kernel, -- .unmap_kernel = ion_heap_unmap_kernel, -- .map_user = ion_heap_map_user, -- .shrink = ion_system_heap_shrink, --}; -+static long ion_system_get_pool_size(struct ion_heap *heap) -+{ -+ struct ion_system_heap *sys_heap; -+ long total_pages = 0; -+ int i; -+ -+ sys_heap = container_of(heap, struct ion_system_heap, heap); -+ for (i = 0; i < NUM_ORDERS; i++) -+ total_pages += ion_page_pool_nr_pages(sys_heap->pools[i]); -+ -+ return total_pages; -+} - - static void ion_system_heap_destroy_pools(struct ion_page_pool **pools) - { -@@ -245,133 +308,37 @@ static int ion_system_heap_create_pools(struct ion_page_pool **pools) - return -ENOMEM; - } - --static struct ion_heap *__ion_system_heap_create(void) --{ -- struct ion_system_heap *heap; -- -- heap = kzalloc(sizeof(*heap), GFP_KERNEL); -- if (!heap) -- return ERR_PTR(-ENOMEM); -- heap->heap.ops = &system_heap_ops; -- heap->heap.type = ION_HEAP_TYPE_SYSTEM; -- heap->heap.flags = ION_HEAP_FLAG_DEFER_FREE; -- -- if (ion_system_heap_create_pools(heap->pools)) -- goto free_heap; -- -- return &heap->heap; -- --free_heap: -- kfree(heap); -- return ERR_PTR(-ENOMEM); --} -- --static int ion_system_heap_create(void) --{ -- struct ion_heap *heap; -- -- heap = __ion_system_heap_create(); -- if (IS_ERR(heap)) -- return PTR_ERR(heap); -- heap->name = "ion_system_heap"; -- -- ion_device_add_heap(heap); -- -- return 0; --} --device_initcall(ion_system_heap_create); -- --static int ion_system_contig_heap_allocate(struct ion_heap *heap, -- struct ion_buffer *buffer, -- unsigned long len, -- unsigned long flags) --{ -- int order = get_order(len); -- struct page *page; -- struct sg_table *table; -- unsigned long i; -- int ret; -- -- page = alloc_pages(low_order_gfp_flags | __GFP_NOWARN, order); -- if (!page) -- return -ENOMEM; -- -- split_page(page, order); -- -- len = PAGE_ALIGN(len); -- for (i = len >> PAGE_SHIFT; i < (1 << order); i++) -- __free_page(page + i); -+static struct ion_heap_ops system_heap_ops = { -+ .allocate = ion_system_heap_allocate, -+ .free = ion_system_heap_free, -+ .shrink = ion_system_heap_shrink, -+ .get_pool_size = ion_system_get_pool_size, -+}; - -- table = kmalloc(sizeof(*table), GFP_KERNEL); -- if (!table) { -- ret = -ENOMEM; -- goto free_pages; -+static struct ion_system_heap system_heap = { -+ .heap = { -+ .ops = &system_heap_ops, -+ .type = ION_HEAP_TYPE_SYSTEM, -+ .flags = ION_HEAP_FLAG_DEFER_FREE, -+ .name = "ion_system_heap", - } -- -- ret = sg_alloc_table(table, 1, GFP_KERNEL); -- if (ret) -- goto free_table; -- -- sg_set_page(table->sgl, page, len, 0); -- -- buffer->sg_table = table; -- -- return 0; -- --free_table: -- kfree(table); --free_pages: -- for (i = 0; i < len >> PAGE_SHIFT; i++) -- __free_page(page + i); -- -- return ret; --} -- --static void ion_system_contig_heap_free(struct ion_buffer *buffer) --{ -- struct sg_table *table = buffer->sg_table; -- struct page *page = sg_page(table->sgl); -- unsigned long pages = PAGE_ALIGN(buffer->size) >> PAGE_SHIFT; -- unsigned long i; -- -- for (i = 0; i < pages; i++) -- __free_page(page + i); -- sg_free_table(table); -- kfree(table); --} -- --static struct ion_heap_ops kmalloc_ops = { -- .allocate = ion_system_contig_heap_allocate, -- .free = ion_system_contig_heap_free, -- .map_kernel = ion_heap_map_kernel, -- .unmap_kernel = ion_heap_unmap_kernel, -- .map_user = ion_heap_map_user, - }; - --static struct ion_heap *__ion_system_contig_heap_create(void) -+static int __init ion_system_heap_init(void) - { -- struct ion_heap *heap; -- -- heap = kzalloc(sizeof(*heap), GFP_KERNEL); -- if (!heap) -- return ERR_PTR(-ENOMEM); -- heap->ops = &kmalloc_ops; -- heap->type = ION_HEAP_TYPE_SYSTEM_CONTIG; -- heap->name = "ion_system_contig_heap"; -+ int ret = ion_system_heap_create_pools(system_heap.pools); -+ if (ret) -+ return ret; - -- return heap; -+ return ion_device_add_heap(&system_heap.heap); - } - --static int ion_system_contig_heap_create(void) -+static void __exit ion_system_heap_exit(void) - { -- struct ion_heap *heap; -- -- heap = __ion_system_contig_heap_create(); -- if (IS_ERR(heap)) -- return PTR_ERR(heap); -- -- ion_device_add_heap(heap); -- -- return 0; -+ ion_device_remove_heap(&system_heap.heap); -+ ion_system_heap_destroy_pools(system_heap.pools); - } --device_initcall(ion_system_contig_heap_create); -+ -+module_init(ion_system_heap_init); -+module_exit(ion_system_heap_exit); -+MODULE_LICENSE("GPL v2"); diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c -index e6d4a3ee6cda..3d9ec5f1045c 100644 +index e6d4a3ee6..3d9ec5f10 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -3,8 +3,11 @@ @@ -1610512,10 +1610023,9 @@ index e6d4a3ee6cda..3d9ec5f1045c 100644 } subsys_initcall(ion_device_create); diff --git a/drivers/staging/android/ion/ion.h b/drivers/staging/android/ion/ion.h -deleted file mode 100644 -index c199e88afc6c..000000000000 +index c199e88af..e69de29bb 100644 --- a/drivers/staging/android/ion/ion.h -+++ /dev/null ++++ b/drivers/staging/android/ion/ion.h @@ -1,302 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* @@ -1610820,8 +1610330,8 @@ index c199e88afc6c..000000000000 - -#endif /* _ION_H */ diff --git a/drivers/staging/android/ion/ion_buffer.c b/drivers/staging/android/ion/ion_buffer.c -new file mode 100755 -index 000000000000..9baca1a472b6 +new file mode 100644 +index 000000000..9baca1a47 --- /dev/null +++ b/drivers/staging/android/ion/ion_buffer.c @@ -0,0 +1,278 @@ @@ -1611103,9 +1610613,123 @@ index 000000000000..9baca1a472b6 +{ + return atomic_long_read(&total_heap_bytes); +} +diff --git a/drivers/staging/android/ion/ion_cma_heap.c b/drivers/staging/android/ion/ion_cma_heap.c +index bf65e67ef..6ba7fd84c 100644 +--- a/drivers/staging/android/ion/ion_cma_heap.c ++++ b/drivers/staging/android/ion/ion_cma_heap.c +@@ -7,6 +7,7 @@ + */ + + #include ++#include + #include + #include + #include +@@ -14,12 +15,10 @@ + #include + #include + +-#include "ion.h" +- + struct ion_cma_heap { + struct ion_heap heap; + struct cma *cma; +-}; ++} cma_heaps[MAX_CMA_AREAS]; + + #define to_cma_heap(x) container_of(x, struct ion_cma_heap, heap) + +@@ -71,6 +70,9 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer, + + buffer->priv_virt = pages; + buffer->sg_table = table; ++ ++ ion_buffer_prep_noncached(buffer); ++ + return 0; + + free_mem: +@@ -96,43 +98,54 @@ static void ion_cma_free(struct ion_buffer *buffer) + static struct ion_heap_ops ion_cma_ops = { + .allocate = ion_cma_allocate, + .free = ion_cma_free, +- .map_user = ion_heap_map_user, +- .map_kernel = ion_heap_map_kernel, +- .unmap_kernel = ion_heap_unmap_kernel, + }; + +-static struct ion_heap *__ion_cma_heap_create(struct cma *cma) ++static int __ion_add_cma_heap(struct cma *cma, void *data) + { ++ int *cma_nr = data; + struct ion_cma_heap *cma_heap; ++ int ret; + +- cma_heap = kzalloc(sizeof(*cma_heap), GFP_KERNEL); +- +- if (!cma_heap) +- return ERR_PTR(-ENOMEM); ++ if (*cma_nr >= MAX_CMA_AREAS) ++ return -EINVAL; + ++ cma_heap = &cma_heaps[*cma_nr]; + cma_heap->heap.ops = &ion_cma_ops; +- cma_heap->cma = cma; + cma_heap->heap.type = ION_HEAP_TYPE_DMA; +- return &cma_heap->heap; ++ cma_heap->heap.name = cma_get_name(cma); ++ ++ ret = ion_device_add_heap(&cma_heap->heap); ++ if (ret) ++ goto out; ++ ++ cma_heap->cma = cma; ++ *cma_nr += 1; ++out: ++ return 0; + } + +-static int __ion_add_cma_heaps(struct cma *cma, void *data) ++static int __init ion_cma_heap_init(void) + { +- struct ion_heap *heap; +- +- heap = __ion_cma_heap_create(cma); +- if (IS_ERR(heap)) +- return PTR_ERR(heap); ++ int ret; ++ int nr = 0; + +- heap->name = cma_get_name(cma); ++ ret = cma_for_each_area(__ion_add_cma_heap, &nr); ++ if (ret) { ++ for (nr = 0; nr < MAX_CMA_AREAS && cma_heaps[nr].cma; nr++) ++ ion_device_remove_heap(&cma_heaps[nr].heap); ++ } + +- ion_device_add_heap(heap); +- return 0; ++ return ret; + } + +-static int ion_add_cma_heaps(void) ++static void __exit ion_cma_heap_exit(void) + { +- cma_for_each_area(__ion_add_cma_heaps, NULL); +- return 0; ++ int nr; ++ ++ for (nr = 0; nr < MAX_CMA_AREAS && cma_heaps[nr].cma; nr++) ++ ion_device_remove_heap(&cma_heaps[nr].heap); + } +-device_initcall(ion_add_cma_heaps); ++ ++module_init(ion_cma_heap_init); ++module_exit(ion_cma_heap_exit); ++MODULE_LICENSE("GPL v2"); diff --git a/drivers/staging/android/ion/ion_dma_buf.c b/drivers/staging/android/ion/ion_dma_buf.c -new file mode 100755 -index 000000000000..47ae54af5ccf +new file mode 100644 +index 000000000..47ae54af5 --- /dev/null +++ b/drivers/staging/android/ion/ion_dma_buf.c @@ -0,0 +1,359 @@ @@ -1611469,7 +1611093,7 @@ index 000000000000..47ae54af5ccf + return dmabuf; +} diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c -index ea7e0a244ffc..aa29a4ee48a3 100644 +index ea7e0a244..aa29a4ee4 100644 --- a/drivers/staging/android/ion/ion_heap.c +++ b/drivers/staging/android/ion/ion_heap.c @@ -15,12 +15,118 @@ @@ -1611873,9 +1611497,76 @@ index ea7e0a244ffc..aa29a4ee48a3 100644 - return register_shrinker(&heap->shrinker); + return 0; } +diff --git a/drivers/staging/android/ion/ion_page_pool.c b/drivers/staging/android/ion/ion_page_pool.c +index 0198b886d..efd6ce4cc 100644 +--- a/drivers/staging/android/ion/ion_page_pool.c ++++ b/drivers/staging/android/ion/ion_page_pool.c +@@ -10,7 +10,7 @@ + #include + #include + +-#include "ion.h" ++#include "ion_page_pool.h" + + static inline struct page *ion_page_pool_alloc_pages(struct ion_page_pool *pool) + { +@@ -79,6 +79,7 @@ struct page *ion_page_pool_alloc(struct ion_page_pool *pool) + + return page; + } ++EXPORT_SYMBOL_GPL(ion_page_pool_alloc); + + void ion_page_pool_free(struct ion_page_pool *pool, struct page *page) + { +@@ -86,6 +87,7 @@ void ion_page_pool_free(struct ion_page_pool *pool, struct page *page) + + ion_page_pool_add(pool, page); + } ++EXPORT_SYMBOL_GPL(ion_page_pool_free); + + static int ion_page_pool_total(struct ion_page_pool *pool, bool high) + { +@@ -97,6 +99,18 @@ static int ion_page_pool_total(struct ion_page_pool *pool, bool high) + return count << pool->order; + } + ++int ion_page_pool_nr_pages(struct ion_page_pool *pool) ++{ ++ int nr_total_pages; ++ ++ mutex_lock(&pool->mutex); ++ nr_total_pages = ion_page_pool_total(pool, true); ++ mutex_unlock(&pool->mutex); ++ ++ return nr_total_pages; ++} ++EXPORT_SYMBOL_GPL(ion_page_pool_nr_pages); ++ + int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask, + int nr_to_scan) + { +@@ -130,6 +144,7 @@ int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask, + + return freed; + } ++EXPORT_SYMBOL_GPL(ion_page_pool_shrink); + + struct ion_page_pool *ion_page_pool_create(gfp_t gfp_mask, unsigned int order) + { +@@ -148,8 +163,10 @@ struct ion_page_pool *ion_page_pool_create(gfp_t gfp_mask, unsigned int order) + + return pool; + } ++EXPORT_SYMBOL_GPL(ion_page_pool_create); + + void ion_page_pool_destroy(struct ion_page_pool *pool) + { + kfree(pool); + } ++EXPORT_SYMBOL_GPL(ion_page_pool_destroy); diff --git a/drivers/staging/android/ion/ion_private.h b/drivers/staging/android/ion/ion_private.h -new file mode 100755 -index 000000000000..db4e90683f4c +new file mode 100644 +index 000000000..db4e90683 --- /dev/null +++ b/drivers/staging/android/ion/ion_private.h @@ -0,0 +1,58 @@ @@ -1611938,8 +1611629,8 @@ index 000000000000..db4e90683f4c + +#endif /* _ION_PRIVATE_H */ diff --git a/drivers/staging/android/ion/ion_protected_heap.c b/drivers/staging/android/ion/ion_protected_heap.c -new file mode 100755 -index 000000000000..c7f25373a744 +new file mode 100644 +index 000000000..c7f25373a --- /dev/null +++ b/drivers/staging/android/ion/ion_protected_heap.c @@ -0,0 +1,526 @@ @@ -1612469,9 +1612160,325 @@ index 000000000000..c7f25373a744 +#ifndef CONFIG_ION_MODULE +device_initcall(ion_protected_heap_create); +#endif +diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c +index eac0632ab..45d23bea3 100644 +--- a/drivers/staging/android/ion/ion_system_heap.c ++++ b/drivers/staging/android/ion/ion_system_heap.c +@@ -9,12 +9,14 @@ + #include + #include + #include ++#include + #include ++#include + #include + #include + #include + +-#include "ion.h" ++#include "ion_page_pool.h" + + #define NUM_ORDERS ARRAY_SIZE(orders) + +@@ -109,21 +111,48 @@ static int ion_system_heap_allocate(struct ion_heap *heap, + int i = 0; + unsigned long size_remaining = PAGE_ALIGN(size); + unsigned int max_order = orders[0]; ++ struct list_head lists[8]; ++ unsigned int block_index[8] = {0}; ++ unsigned int block_1M = 0; ++ unsigned int block_64K = 0; ++ unsigned int maximum; ++ int j; + + if (size / PAGE_SIZE > totalram_pages() / 2) + return -ENOMEM; + + INIT_LIST_HEAD(&pages); ++ for (i = 0; i < 8; i++) ++ INIT_LIST_HEAD(&lists[i]); ++ ++ i = 0; + while (size_remaining > 0) { + page = alloc_largest_available(sys_heap, buffer, size_remaining, + max_order); + if (!page) + goto free_pages; +- list_add_tail(&page->lru, &pages); ++ + size_remaining -= page_size(page); + max_order = compound_order(page); ++ if (max_order) { ++ if (max_order == 8) ++ block_1M++; ++ if (max_order == 4) ++ block_64K++; ++ list_add_tail(&page->lru, &pages); ++ } else { ++ dma_addr_t phys = page_to_phys(page); ++ unsigned int bit12_14 = (phys >> 12) & 0x7; ++ ++ list_add_tail(&page->lru, &lists[bit12_14]); ++ block_index[bit12_14]++; ++ } ++ + i++; + } ++ ++ pr_debug("%s, %d, i = %d, size = %ld\n", __func__, __LINE__, i, size); ++ + table = kmalloc(sizeof(*table), GFP_KERNEL); + if (!table) + goto free_pages; +@@ -131,6 +160,16 @@ static int ion_system_heap_allocate(struct ion_heap *heap, + if (sg_alloc_table(table, i, GFP_KERNEL)) + goto free_table; + ++ maximum = block_index[0]; ++ for (i = 1; i < 8; i++) ++ maximum = max(maximum, block_index[i]); ++ ++ pr_debug("%s, %d, maximum = %d, block_1M = %d, block_64K = %d\n", ++ __func__, __LINE__, maximum, block_1M, block_64K); ++ ++ for (i = 0; i < 8; i++) ++ pr_debug("block_index[%d] = %d\n", i, block_index[i]); ++ + sg = table->sgl; + list_for_each_entry_safe(page, tmp_page, &pages, lru) { + sg_set_page(sg, page, page_size(page), 0); +@@ -138,7 +177,22 @@ static int ion_system_heap_allocate(struct ion_heap *heap, + list_del(&page->lru); + } + ++ for (i = 0; i < maximum; i++) { ++ for (j = 0; j < 8; j++) { ++ if (!list_empty(&lists[j])) { ++ page = list_first_entry(&lists[j], struct page, ++ lru); ++ sg_set_page(sg, page, PAGE_SIZE, 0); ++ sg = sg_next(sg); ++ list_del(&page->lru); ++ } ++ } ++ } ++ + buffer->sg_table = table; ++ ++ ion_buffer_prep_noncached(buffer); ++ + return 0; + + free_table: +@@ -146,6 +200,11 @@ static int ion_system_heap_allocate(struct ion_heap *heap, + free_pages: + list_for_each_entry_safe(page, tmp_page, &pages, lru) + free_buffer_page(sys_heap, buffer, page); ++ ++ for (i = 0; i < 8; i++) { ++ list_for_each_entry_safe(page, tmp_page, &lists[i], lru) ++ free_buffer_page(sys_heap, buffer, page); ++ } + return -ENOMEM; + } + +@@ -160,7 +219,7 @@ static void ion_system_heap_free(struct ion_buffer *buffer) + + /* zero the buffer before goto page pool */ + if (!(buffer->private_flags & ION_PRIV_FLAG_SHRINKER_FREE)) +- ion_heap_buffer_zero(buffer); ++ ion_buffer_zero(buffer); + + for_each_sgtable_sg(table, sg, i) + free_buffer_page(sys_heap, buffer, sg_page(sg)); +@@ -203,14 +262,18 @@ static int ion_system_heap_shrink(struct ion_heap *heap, gfp_t gfp_mask, + return nr_total; + } + +-static struct ion_heap_ops system_heap_ops = { +- .allocate = ion_system_heap_allocate, +- .free = ion_system_heap_free, +- .map_kernel = ion_heap_map_kernel, +- .unmap_kernel = ion_heap_unmap_kernel, +- .map_user = ion_heap_map_user, +- .shrink = ion_system_heap_shrink, +-}; ++static long ion_system_get_pool_size(struct ion_heap *heap) ++{ ++ struct ion_system_heap *sys_heap; ++ long total_pages = 0; ++ int i; ++ ++ sys_heap = container_of(heap, struct ion_system_heap, heap); ++ for (i = 0; i < NUM_ORDERS; i++) ++ total_pages += ion_page_pool_nr_pages(sys_heap->pools[i]); ++ ++ return total_pages; ++} + + static void ion_system_heap_destroy_pools(struct ion_page_pool **pools) + { +@@ -245,133 +308,37 @@ static int ion_system_heap_create_pools(struct ion_page_pool **pools) + return -ENOMEM; + } + +-static struct ion_heap *__ion_system_heap_create(void) +-{ +- struct ion_system_heap *heap; +- +- heap = kzalloc(sizeof(*heap), GFP_KERNEL); +- if (!heap) +- return ERR_PTR(-ENOMEM); +- heap->heap.ops = &system_heap_ops; +- heap->heap.type = ION_HEAP_TYPE_SYSTEM; +- heap->heap.flags = ION_HEAP_FLAG_DEFER_FREE; +- +- if (ion_system_heap_create_pools(heap->pools)) +- goto free_heap; +- +- return &heap->heap; +- +-free_heap: +- kfree(heap); +- return ERR_PTR(-ENOMEM); +-} +- +-static int ion_system_heap_create(void) +-{ +- struct ion_heap *heap; +- +- heap = __ion_system_heap_create(); +- if (IS_ERR(heap)) +- return PTR_ERR(heap); +- heap->name = "ion_system_heap"; +- +- ion_device_add_heap(heap); +- +- return 0; +-} +-device_initcall(ion_system_heap_create); +- +-static int ion_system_contig_heap_allocate(struct ion_heap *heap, +- struct ion_buffer *buffer, +- unsigned long len, +- unsigned long flags) +-{ +- int order = get_order(len); +- struct page *page; +- struct sg_table *table; +- unsigned long i; +- int ret; +- +- page = alloc_pages(low_order_gfp_flags | __GFP_NOWARN, order); +- if (!page) +- return -ENOMEM; +- +- split_page(page, order); +- +- len = PAGE_ALIGN(len); +- for (i = len >> PAGE_SHIFT; i < (1 << order); i++) +- __free_page(page + i); ++static struct ion_heap_ops system_heap_ops = { ++ .allocate = ion_system_heap_allocate, ++ .free = ion_system_heap_free, ++ .shrink = ion_system_heap_shrink, ++ .get_pool_size = ion_system_get_pool_size, ++}; + +- table = kmalloc(sizeof(*table), GFP_KERNEL); +- if (!table) { +- ret = -ENOMEM; +- goto free_pages; ++static struct ion_system_heap system_heap = { ++ .heap = { ++ .ops = &system_heap_ops, ++ .type = ION_HEAP_TYPE_SYSTEM, ++ .flags = ION_HEAP_FLAG_DEFER_FREE, ++ .name = "ion_system_heap", + } +- +- ret = sg_alloc_table(table, 1, GFP_KERNEL); +- if (ret) +- goto free_table; +- +- sg_set_page(table->sgl, page, len, 0); +- +- buffer->sg_table = table; +- +- return 0; +- +-free_table: +- kfree(table); +-free_pages: +- for (i = 0; i < len >> PAGE_SHIFT; i++) +- __free_page(page + i); +- +- return ret; +-} +- +-static void ion_system_contig_heap_free(struct ion_buffer *buffer) +-{ +- struct sg_table *table = buffer->sg_table; +- struct page *page = sg_page(table->sgl); +- unsigned long pages = PAGE_ALIGN(buffer->size) >> PAGE_SHIFT; +- unsigned long i; +- +- for (i = 0; i < pages; i++) +- __free_page(page + i); +- sg_free_table(table); +- kfree(table); +-} +- +-static struct ion_heap_ops kmalloc_ops = { +- .allocate = ion_system_contig_heap_allocate, +- .free = ion_system_contig_heap_free, +- .map_kernel = ion_heap_map_kernel, +- .unmap_kernel = ion_heap_unmap_kernel, +- .map_user = ion_heap_map_user, + }; + +-static struct ion_heap *__ion_system_contig_heap_create(void) ++static int __init ion_system_heap_init(void) + { +- struct ion_heap *heap; +- +- heap = kzalloc(sizeof(*heap), GFP_KERNEL); +- if (!heap) +- return ERR_PTR(-ENOMEM); +- heap->ops = &kmalloc_ops; +- heap->type = ION_HEAP_TYPE_SYSTEM_CONTIG; +- heap->name = "ion_system_contig_heap"; ++ int ret = ion_system_heap_create_pools(system_heap.pools); ++ if (ret) ++ return ret; + +- return heap; ++ return ion_device_add_heap(&system_heap.heap); + } + +-static int ion_system_contig_heap_create(void) ++static void __exit ion_system_heap_exit(void) + { +- struct ion_heap *heap; +- +- heap = __ion_system_contig_heap_create(); +- if (IS_ERR(heap)) +- return PTR_ERR(heap); +- +- ion_device_add_heap(heap); +- +- return 0; ++ ion_device_remove_heap(&system_heap.heap); ++ ion_system_heap_destroy_pools(system_heap.pools); + } +-device_initcall(ion_system_contig_heap_create); ++ ++module_init(ion_system_heap_init); ++module_exit(ion_system_heap_exit); ++MODULE_LICENSE("GPL v2"); diff --git a/drivers/staging/android/ion/ion_trace.h b/drivers/staging/android/ion/ion_trace.h -new file mode 100755 -index 000000000000..eacb47d4f135 +new file mode 100644 +index 000000000..eacb47d4f --- /dev/null +++ b/drivers/staging/android/ion/ion_trace.h @@ -0,0 +1,55 @@ @@ -1612531,8 +1612538,8 @@ index 000000000000..eacb47d4f135 +#define TRACE_INCLUDE_FILE ion_trace +#include diff --git a/drivers/staging/android/ion/rockchip/Makefile b/drivers/staging/android/ion/rockchip/Makefile -new file mode 100755 -index 000000000000..89265fcbbe6f +new file mode 100644 +index 000000000..89265fcbb --- /dev/null +++ b/drivers/staging/android/ion/rockchip/Makefile @@ -0,0 +1,3 @@ @@ -1612540,8 +1612547,8 @@ index 000000000000..89265fcbbe6f +obj-y += rockchip_ion.o +obj-$(CONFIG_ION_ROCKCHIP_SNAPSHOT) += rockchip_ion_snapshot.o diff --git a/drivers/staging/android/ion/rockchip/rockchip_ion.c b/drivers/staging/android/ion/rockchip/rockchip_ion.c -new file mode 100755 -index 000000000000..d3c3d06856ad +new file mode 100644 +index 000000000..d3c3d0685 --- /dev/null +++ b/drivers/staging/android/ion/rockchip/rockchip_ion.c @@ -0,0 +1,224 @@ @@ -1612770,8 +1612777,8 @@ index 000000000000..d3c3d06856ad +MODULE_LICENSE("GPL v2"); +MODULE_DEVICE_TABLE(of, rk_ion_match); diff --git a/drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c b/drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c -new file mode 100755 -index 000000000000..ab27d05319ae +new file mode 100644 +index 000000000..ab27d0531 --- /dev/null +++ b/drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c @@ -0,0 +1,145 @@ @@ -1612921,7 +1612928,7 @@ index 000000000000..ab27d05319ae + +postcore_initcall(rockchip_ion_snapshot_init); diff --git a/drivers/staging/blackbox/Kconfig b/drivers/staging/blackbox/Kconfig -index 0e985823c2e8..7f1eb0e16e2d 100644 +index 0e985823c..7f1eb0e16 100644 --- a/drivers/staging/blackbox/Kconfig +++ b/drivers/staging/blackbox/Kconfig @@ -106,3 +106,14 @@ config DEF_BLACKBOX_STORAGE @@ -1612940,7 +1612947,7 @@ index 0e985823c2e8..7f1eb0e16e2d 100644 + +endif diff --git a/drivers/staging/blackbox/Makefile b/drivers/staging/blackbox/Makefile -index 9befa81a176e..77c1a37e5102 100644 +index 9befa81a1..77c1a37e5 100644 --- a/drivers/staging/blackbox/Makefile +++ b/drivers/staging/blackbox/Makefile @@ -3,3 +3,5 @@ @@ -1612950,7 +1612957,7 @@ index 9befa81a176e..77c1a37e5102 100644 + +obj-$(CONFIG_BLACKBOX_ROCKCHIP) += rockchip/ diff --git a/drivers/staging/blackbox/blackbox_storage.c b/drivers/staging/blackbox/blackbox_storage.c -index 635e3aa036ab..aad08c7291f1 100644 +index 635e3aa03..aad08c729 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, @@ -1612964,7 +1612971,7 @@ index 635e3aa036ab..aad08c7291f1 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 000000000000..8bef3d7285ed +index 000000000..8bef3d728 --- /dev/null +++ b/drivers/staging/blackbox/rockchip/Makefile @@ -0,0 +1,4 @@ @@ -1612974,7 +1612981,7 @@ index 000000000000..8bef3d7285ed +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 000000000000..538f8fbd745d +index 000000000..538f8fbd7 --- /dev/null +++ b/drivers/staging/blackbox/rockchip/system_adapter.c @@ -0,0 +1,312 @@ @@ -1613292,7 +1613299,7 @@ index 000000000000..538f8fbd745d +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 000000000000..30757db43e42 +index 000000000..30757db43 --- /dev/null +++ b/drivers/staging/blackbox/rockchip/system_adapter_by_memory.c @@ -0,0 +1,313 @@ @@ -1613610,7 +1613617,7 @@ index 000000000000..30757db43e42 +MODULE_DESCRIPTION("Blackbox for system"); +MODULE_AUTHOR("OHOS"); diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c -index aa9e0e31ef98..e1c667e8fe2a 100644 +index aa9e0e31e..e1c667e8f 100644 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -18,6 +18,7 @@ @@ -1614573,7 +1614580,7 @@ index aa9e0e31ef98..e1c667e8fe2a 100644 module_platform_driver(rockchip_thermal_driver); diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c -index dd449945e1e5..560b1b83d057 100644 +index 49e3cb07a..7b0559c19 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) @@ -1614585,7 +1614592,7 @@ index dd449945e1e5..560b1b83d057 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 681209db42a8..5e80cb3264d9 100644 +index 681209db4..5e80cb326 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) @@ -1614596,7 +1614603,7 @@ index 681209db42a8..5e80cb3264d9 100644 - #endif /* __THERMAL_CORE_H__ */ diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h -index 0771cd226581..fcbd557f3866 100644 +index 61b11490a..437f50c20 100644 --- a/drivers/tty/serial/8250/8250.h +++ b/drivers/tty/serial/8250/8250.h @@ -48,6 +48,9 @@ struct uart_8250_dma { @@ -1614609,7 +1614616,7 @@ index 0771cd226581..fcbd557f3866 100644 }; struct old_serial_port { -@@ -158,6 +161,9 @@ static inline bool serial8250_set_THRI(struct uart_8250_port *up) +@@ -157,6 +160,9 @@ static inline bool serial8250_set_THRI(struct uart_8250_port *up) if (up->ier & UART_IER_THRI) return false; up->ier |= UART_IER_THRI; @@ -1614619,7 +1614626,7 @@ index 0771cd226581..fcbd557f3866 100644 serial_out(up, UART_IER, up->ier); return true; } -@@ -327,6 +333,9 @@ static inline int is_omap1510_8250(struct uart_8250_port *pt) +@@ -326,6 +332,9 @@ static inline int is_omap1510_8250(struct uart_8250_port *pt) #ifdef CONFIG_SERIAL_8250_DMA extern int serial8250_tx_dma(struct uart_8250_port *); extern int serial8250_rx_dma(struct uart_8250_port *); @@ -1614629,7 +1614636,7 @@ index 0771cd226581..fcbd557f3866 100644 extern void serial8250_rx_dma_flush(struct uart_8250_port *); extern int serial8250_request_dma(struct uart_8250_port *); extern void serial8250_release_dma(struct uart_8250_port *); -@@ -346,6 +355,12 @@ static inline int serial8250_rx_dma(struct uart_8250_port *p) +@@ -345,6 +354,12 @@ static inline int serial8250_rx_dma(struct uart_8250_port *p) { return -1; } @@ -1614643,7 +1614650,7 @@ index 0771cd226581..fcbd557f3866 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 43f2eed6df78..c3953e7a5e94 100644 +index 355ee338d..7a55808fe 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) @@ -1614662,7 +1614669,7 @@ index 43f2eed6df78..c3953e7a5e94 100644 } #ifdef CONFIG_SERIAL_8250_CONSOLE -@@ -1030,7 +1032,9 @@ int serial8250_register_8250_port(struct uart_8250_port *up) +@@ -1031,7 +1033,9 @@ int serial8250_register_8250_port(struct uart_8250_port *up) uart->rs485_start_tx = up->rs485_start_tx; uart->rs485_stop_tx = up->rs485_stop_tx; uart->dma = up->dma; @@ -1614673,7 +1614680,7 @@ index 43f2eed6df78..c3953e7a5e94 100644 /* Take tx_loadsz from fifosize if it wasn't set separately */ if (uart->port.fifosize && !uart->tx_loadsz) uart->tx_loadsz = uart->port.fifosize; -@@ -1255,7 +1259,11 @@ static void __exit serial8250_exit(void) +@@ -1256,7 +1260,11 @@ static void __exit serial8250_exit(void) #endif } @@ -1614686,7 +1614693,7 @@ index 43f2eed6df78..c3953e7a5e94 100644 MODULE_LICENSE("GPL"); diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c -index 33ce4b218d9e..13c0161fa04c 100644 +index 33ce4b218..13c0161fa 100644 --- a/drivers/tty/serial/8250/8250_dma.c +++ b/drivers/tty/serial/8250/8250_dma.c @@ -11,6 +11,12 @@ @@ -1614976,7 +1614983,7 @@ index 33ce4b218d9e..13c0161fa04c 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 ace221afeb03..c5bba750fcbc 100644 +index ace221afe..c5bba750f 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -33,6 +33,7 @@ @@ -1615167,10 +1615174,10 @@ index ace221afeb03..c5bba750fcbc 100644 return 0; } diff --git a/drivers/tty/serial/8250/8250_dwlib.c b/drivers/tty/serial/8250/8250_dwlib.c -index 6d6a78eead3e..fee4f2933919 100644 +index 1cf229cca..da65f0658 100644 --- a/drivers/tty/serial/8250/8250_dwlib.c +++ b/drivers/tty/serial/8250/8250_dwlib.c -@@ -106,6 +106,15 @@ void dw8250_setup_port(struct uart_port *p) +@@ -108,6 +108,15 @@ void dw8250_setup_port(struct uart_port *p) } reg = dw8250_readl_ext(p, DW_UART_CPR); @@ -1615186,7 +1615193,7 @@ index 6d6a78eead3e..fee4f2933919 100644 if (!reg) return; -@@ -114,6 +123,9 @@ void dw8250_setup_port(struct uart_port *p) +@@ -116,6 +125,9 @@ void dw8250_setup_port(struct uart_port *p) p->type = PORT_16550A; p->flags |= UPF_FIXED_TYPE; p->fifosize = DW_UART_CPR_FIFO_SIZE(reg); @@ -1615197,7 +1615204,7 @@ index 6d6a78eead3e..fee4f2933919 100644 } diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c -index b19908779e3b..aa4f2f1eccda 100644 +index 8b49ac485..25ce3e58c 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -1538,8 +1538,13 @@ static inline void __start_tx(struct uart_port *port) @@ -1615263,7 +1615270,7 @@ index b19908779e3b..aa4f2f1eccda 100644 /* * If port is stopped and there are no error conditions in the * FIFO, then don't drain the FIFO, as this may lead to TTY buffer -@@ -1919,11 +1944,34 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir) +@@ -1922,11 +1947,34 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir) if (!up->dma || handle_rx_dma(up, iir)) status = serial8250_rx_chars(up, status); } @@ -1615300,7 +1615307,7 @@ index b19908779e3b..aa4f2f1eccda 100644 uart_unlock_and_check_sysrq(port, flags); return 1; } -@@ -2403,7 +2451,11 @@ int serial8250_do_startup(struct uart_port *port) +@@ -2406,7 +2454,11 @@ int serial8250_do_startup(struct uart_port *port) if (uart_console(port)) msg = "forbid DMA for kernel console"; else if (serial8250_request_dma(up)) @@ -1615341,7 +1615348,7 @@ index b19908779e3b..aa4f2f1eccda 100644 } EXPORT_SYMBOL_GPL(serial8250_do_set_divisor); -@@ -2795,6 +2862,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2794,6 +2861,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, if ((termios->c_cflag & CREAD) == 0) port->ignore_status_mask |= UART_LSR_DR; @@ -1615349,7 +1615356,7 @@ index b19908779e3b..aa4f2f1eccda 100644 /* * CTS flow control flag and modem status interrupts */ -@@ -2808,6 +2876,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2807,6 +2875,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, up->ier |= UART_IER_RTOIE; serial_port_out(port, UART_IER, up->ier); @@ -1615357,7 +1615364,7 @@ index b19908779e3b..aa4f2f1eccda 100644 if (up->capabilities & UART_CAP_EFR) { unsigned char efr = 0; -@@ -2826,16 +2895,25 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2825,16 +2894,25 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, serial_port_out(port, UART_EFR, efr); } @@ -1615385,7 +1615392,7 @@ index b19908779e3b..aa4f2f1eccda 100644 if (port->type != PORT_16750) { /* emulated UARTs (Lucent Venus 167x) need two steps */ if (up->fcr & UART_FCR_ENABLE_FIFO) -@@ -2843,6 +2921,23 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2842,6 +2920,23 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, serial_port_out(port, UART_FCR, up->fcr); /* set fcr */ } serial8250_set_mctrl(port, port->mctrl); @@ -1615410,7 +1615417,7 @@ index b19908779e3b..aa4f2f1eccda 100644 serial8250_rpm_put(up); diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c -index aa0026a9839c..379fe28f0f63 100644 +index aa0026a98..379fe28f0 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) @@ -1615422,12 +1615429,10 @@ index aa0026a9839c..379fe28f0f63 100644 return; diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -old mode 100644 -new mode 100755 -index 580604596499..bc1d3385e790 +index 0d49a2241..8a581cd40 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -1832,7 +1832,8 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) +@@ -1852,7 +1852,8 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) * bus_resume methods. */ if (hdev->parent) { /* normal device */ @@ -1615437,7 +1615442,7 @@ index 580604596499..bc1d3385e790 } else { /* root hub */ const struct hc_driver *drv = bus_to_hcd(hdev->bus)->driver; -@@ -5396,7 +5397,8 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, +@@ -5514,7 +5515,8 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, done: hub_port_disable(hub, port1, 1); if (hcd->driver->relinquish_port && !hub->hdev->parent) { @@ -1615448,7 +1615453,7 @@ index 580604596499..bc1d3385e790 } } diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c -index 4ac1c22f13be..16befba71a79 100644 +index 856947620..701e6ce38 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -322,6 +322,10 @@ static const struct usb_device_id usb_quirk_list[] = { @@ -1615474,9 +1615479,7 @@ index 4ac1c22f13be..16befba71a79 100644 { USB_DEVICE(0x0c45, 0x7056), .driver_info = USB_QUIRK_IGNORE_REMOTE_WAKEUP }, diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h -old mode 100644 -new mode 100755 -index 03d16a08261d..9bb4b8994f5c +index 03d16a082..9bb4b8994 100644 --- a/drivers/usb/dwc2/core.h +++ b/drivers/usb/dwc2/core.h @@ -1061,6 +1061,7 @@ struct dwc2_hsotg { @@ -1615498,9 +1615501,7 @@ index 03d16a08261d..9bb4b8994f5c int dwc2_hsotg_wait_bit_set(struct dwc2_hsotg *hs_otg, u32 reg, u32 bit, u32 timeout); diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c -old mode 100644 -new mode 100755 -index da0df69cc234..1b3dbb880008 +index da0df69cc..1b3dbb880 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -4529,6 +4529,14 @@ static int dwc2_hsotg_udc_start(struct usb_gadget *gadget, @@ -1615531,9 +1615532,7 @@ index da0df69cc234..1b3dbb880008 } diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c -old mode 100644 -new mode 100755 -index 9279d3d3698c..76ef2f024478 +index 14925fedb..b058764cb 100644 --- a/drivers/usb/dwc2/hcd.c +++ b/drivers/usb/dwc2/hcd.c @@ -812,11 +812,13 @@ void dwc2_hc_halt(struct dwc2_hsotg *hsotg, struct dwc2_host_chan *chan, @@ -1615657,9 +1615656,7 @@ index 9279d3d3698c..76ef2f024478 * Finish generic HCD initialization and start the HCD. This function * allocates the DMA buffer pool, registers the USB bus, requests the diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c -old mode 100644 -new mode 100755 -index d5f4ec1b73b1..4989ec761667 +index 08e2792cb..785ca412a 100644 --- a/drivers/usb/dwc2/hcd_intr.c +++ b/drivers/usb/dwc2/hcd_intr.c @@ -1180,7 +1180,10 @@ static void dwc2_update_urb_state_abn(struct dwc2_hsotg *hsotg, @@ -1615675,9 +1615672,7 @@ index d5f4ec1b73b1..4989ec761667 urb->actual_length += xfer_length; diff --git a/drivers/usb/dwc2/hcd_queue.c b/drivers/usb/dwc2/hcd_queue.c -old mode 100644 -new mode 100755 -index 94af71e9856f..b2e0721a3eb8 +index 94af71e98..b2e0721a3 100644 --- a/drivers/usb/dwc2/hcd_queue.c +++ b/drivers/usb/dwc2/hcd_queue.c @@ -730,8 +730,14 @@ static int dwc2_uframe_schedule_split(struct dwc2_hsotg *hsotg, @@ -1615697,9 +1615692,7 @@ index 94af71e9856f..b2e0721a3eb8 while (ls_search_slice < DWC2_LS_SCHEDULE_SLICES) { int start_s_uframe; diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c -old mode 100644 -new mode 100755 -index 267543c3dc38..195cca1fe3c6 +index 267543c3d..195cca1fe 100644 --- a/drivers/usb/dwc2/params.c +++ b/drivers/usb/dwc2/params.c @@ -90,6 +90,8 @@ static void dwc2_set_rk_params(struct dwc2_hsotg *hsotg) @@ -1615736,9 +1615729,7 @@ index 267543c3dc38..195cca1fe3c6 const struct of_device_id dwc2_of_match_table[] = { diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c -old mode 100644 -new mode 100755 -index 9d0dd09a2015..74c2ff080f3e +index 9d0dd09a2..74c2ff080 100644 --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c @@ -121,6 +121,74 @@ static int dwc2_get_dr_mode(struct dwc2_hsotg *hsotg) @@ -1615926,9 +1615917,7 @@ index 9d0dd09a2015..74c2ff080f3e ret = dwc2_hsotg_resume(dwc2); diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig -old mode 100644 -new mode 100755 -index 7a2304565a73..2133acf8ee69 +index 7a2304565..2133acf8e 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -139,4 +139,14 @@ config USB_DWC3_QCOM @@ -1615947,9 +1615936,7 @@ index 7a2304565a73..2133acf8ee69 + endif diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile -old mode 100644 -new mode 100755 -index ae86da0dc5bd..2259f8876fb2 +index ae86da0dc..2259f8876 100644 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile @@ -51,3 +51,4 @@ obj-$(CONFIG_USB_DWC3_MESON_G12A) += dwc3-meson-g12a.o @@ -1615958,9 +1615945,7 @@ index ae86da0dc5bd..2259f8876fb2 obj-$(CONFIG_USB_DWC3_QCOM) += dwc3-qcom.o +obj-$(CONFIG_USB_DWC3_IMX8MP) += dwc3-imx8mp.o diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c -old mode 100644 -new mode 100755 -index 5709b959b1d9..922247b818b4 +index 6e7423c35..60e740322 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -119,6 +119,7 @@ static void __dwc3_set_mode(struct work_struct *work) @@ -1616048,7 +1616033,7 @@ index 5709b959b1d9..922247b818b4 return -ETIMEDOUT; done: -@@ -562,6 +610,9 @@ static void dwc3_cache_hwparams(struct dwc3 *dwc) +@@ -583,6 +631,9 @@ static void dwc3_cache_hwparams(struct dwc3 *dwc) parms->hwparams6 = dwc3_readl(dwc->regs, DWC3_GHWPARAMS6); parms->hwparams7 = dwc3_readl(dwc->regs, DWC3_GHWPARAMS7); parms->hwparams8 = dwc3_readl(dwc->regs, DWC3_GHWPARAMS8); @@ -1616058,7 +1616043,7 @@ index 5709b959b1d9..922247b818b4 } static int dwc3_core_ulpi_init(struct dwc3 *dwc) -@@ -977,21 +1028,9 @@ static int dwc3_core_init(struct dwc3 *dwc) +@@ -998,21 +1049,9 @@ static int dwc3_core_init(struct dwc3 *dwc) dwc->phys_ready = true; } @@ -1616081,7 +1616066,7 @@ index 5709b959b1d9..922247b818b4 if (hw_mode == DWC3_GHWPARAMS0_MODE_DRD && !DWC3_VER_IS_WITHIN(DWC3, ANY, 194A)) { -@@ -1057,12 +1096,25 @@ static int dwc3_core_init(struct dwc3 *dwc) +@@ -1078,12 +1117,25 @@ static int dwc3_core_init(struct dwc3 *dwc) if (!DWC3_VER_IS_PRIOR(DWC3, 290A)) reg |= DWC3_GUCTL1_DEV_L1_EXIT_BY_HW; @@ -1616107,7 +1616092,7 @@ index 5709b959b1d9..922247b818b4 dwc3_writel(dwc->regs, DWC3_GUCTL1, reg); } -@@ -1162,11 +1214,8 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) +@@ -1167,11 +1219,8 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) ret = PTR_ERR(dwc->usb2_phy); if (ret == -ENXIO || ret == -ENODEV) { dwc->usb2_phy = NULL; @@ -1616120,7 +1616105,7 @@ index 5709b959b1d9..922247b818b4 } } -@@ -1174,11 +1223,8 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) +@@ -1179,11 +1228,8 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) ret = PTR_ERR(dwc->usb3_phy); if (ret == -ENXIO || ret == -ENODEV) { dwc->usb3_phy = NULL; @@ -1616133,7 +1616118,7 @@ index 5709b959b1d9..922247b818b4 } } -@@ -1187,11 +1233,8 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) +@@ -1192,11 +1238,8 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) ret = PTR_ERR(dwc->usb2_generic_phy); if (ret == -ENOSYS || ret == -ENODEV) { dwc->usb2_generic_phy = NULL; @@ -1616146,7 +1616131,7 @@ index 5709b959b1d9..922247b818b4 } } -@@ -1200,11 +1243,8 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) +@@ -1205,11 +1248,8 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) ret = PTR_ERR(dwc->usb3_generic_phy); if (ret == -ENOSYS || ret == -ENODEV) { dwc->usb3_generic_phy = NULL; @@ -1616159,7 +1616144,7 @@ index 5709b959b1d9..922247b818b4 } } -@@ -1226,11 +1266,8 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) +@@ -1231,11 +1271,8 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_DEVICE); ret = dwc3_gadget_init(dwc); @@ -1616173,7 +1616158,7 @@ index 5709b959b1d9..922247b818b4 break; case USB_DR_MODE_HOST: dwc3_set_prtcap(dwc, DWC3_GCTL_PRTCAP_HOST); -@@ -1241,20 +1278,14 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) +@@ -1246,20 +1283,14 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) phy_set_mode(dwc->usb3_generic_phy, PHY_MODE_USB_HOST); ret = dwc3_host_init(dwc); @@ -1616198,7 +1616183,7 @@ index 5709b959b1d9..922247b818b4 break; default: dev_err(dev, "Unsupported mode of operation %d\n", dwc->dr_mode); -@@ -1295,6 +1326,9 @@ static void dwc3_get_properties(struct dwc3 *dwc) +@@ -1300,6 +1331,9 @@ static void dwc3_get_properties(struct dwc3 *dwc) u8 rx_max_burst_prd = 0; u8 tx_thr_num_pkt_prd = 0; u8 tx_max_burst_prd = 0; @@ -1616208,7 +1616193,7 @@ index 5709b959b1d9..922247b818b4 /* default to highest possible threshold */ lpm_nyet_threshold = 0xf; -@@ -1308,7 +1342,15 @@ static void dwc3_get_properties(struct dwc3 *dwc) +@@ -1313,7 +1347,15 @@ static void dwc3_get_properties(struct dwc3 *dwc) */ hird_threshold = 12; @@ -1616224,7 +1616209,7 @@ index 5709b959b1d9..922247b818b4 dwc->dr_mode = usb_get_dr_mode(dev); dwc->hsphy_mode = of_usb_get_phy_mode(dev->of_node); -@@ -1319,6 +1361,13 @@ static void dwc3_get_properties(struct dwc3 *dwc) +@@ -1324,6 +1366,13 @@ static void dwc3_get_properties(struct dwc3 *dwc) else dwc->sysdev = dwc->dev; @@ -1616238,7 +1616223,7 @@ index 5709b959b1d9..922247b818b4 dwc->has_lpm_erratum = device_property_read_bool(dev, "snps,has-lpm-erratum"); device_property_read_u8(dev, "snps,lpm-nyet-threshold", -@@ -1343,6 +1392,11 @@ static void dwc3_get_properties(struct dwc3 *dwc) +@@ -1348,6 +1397,11 @@ static void dwc3_get_properties(struct dwc3 *dwc) &tx_thr_num_pkt_prd); device_property_read_u8(dev, "snps,tx-max-burst-prd", &tx_max_burst_prd); @@ -1616250,7 +1616235,7 @@ index 5709b959b1d9..922247b818b4 dwc->disable_scramble_quirk = device_property_read_bool(dev, "snps,disable_scramble_quirk"); -@@ -1408,6 +1462,8 @@ static void dwc3_get_properties(struct dwc3 *dwc) +@@ -1413,6 +1467,8 @@ static void dwc3_get_properties(struct dwc3 *dwc) dwc->tx_max_burst_prd = tx_max_burst_prd; dwc->imod_interval = 0; @@ -1616259,7 +1616244,7 @@ index 5709b959b1d9..922247b818b4 } /* check whether the core supports IMOD */ -@@ -1482,21 +1538,59 @@ static void dwc3_check_params(struct dwc3 *dwc) +@@ -1487,21 +1543,59 @@ static void dwc3_check_params(struct dwc3 *dwc) } break; } @@ -1616321,7 +1616306,7 @@ index 5709b959b1d9..922247b818b4 dwc->dev = dev; -@@ -1528,7 +1622,7 @@ static int dwc3_probe(struct platform_device *pdev) +@@ -1533,7 +1627,7 @@ static int dwc3_probe(struct platform_device *pdev) dwc3_get_properties(dwc); @@ -1616330,7 +1616315,7 @@ index 5709b959b1d9..922247b818b4 if (IS_ERR(dwc->reset)) return PTR_ERR(dwc->reset); -@@ -1592,8 +1686,7 @@ static int dwc3_probe(struct platform_device *pdev) +@@ -1597,8 +1691,7 @@ static int dwc3_probe(struct platform_device *pdev) ret = dwc3_core_init(dwc); if (ret) { @@ -1616340,7 +1616325,7 @@ index 5709b959b1d9..922247b818b4 goto err4; } -@@ -1604,7 +1697,17 @@ static int dwc3_probe(struct platform_device *pdev) +@@ -1609,7 +1702,17 @@ static int dwc3_probe(struct platform_device *pdev) if (ret) goto err5; @@ -1616357,9 +1616342,9 @@ index 5709b959b1d9..922247b818b4 + pm_runtime_put(dev); + } - return 0; + dma_set_max_seg_size(dev, UINT_MAX); -@@ -1640,6 +1743,9 @@ static int dwc3_probe(struct platform_device *pdev) +@@ -1647,6 +1750,9 @@ static int dwc3_probe(struct platform_device *pdev) assert_reset: reset_control_assert(dwc->reset); @@ -1616369,7 +1616354,7 @@ index 5709b959b1d9..922247b818b4 return ret; } -@@ -1663,6 +1769,9 @@ static int dwc3_remove(struct platform_device *pdev) +@@ -1670,6 +1776,9 @@ static int dwc3_remove(struct platform_device *pdev) dwc3_free_event_buffers(dwc); dwc3_free_scratch_buffers(dwc); @@ -1616379,7 +1616364,7 @@ index 5709b959b1d9..922247b818b4 return 0; } -@@ -1847,7 +1956,7 @@ static int dwc3_runtime_suspend(struct device *dev) +@@ -1854,7 +1963,7 @@ static int dwc3_runtime_suspend(struct device *dev) if (ret) return ret; @@ -1616388,7 +1616373,7 @@ index 5709b959b1d9..922247b818b4 return 0; } -@@ -1857,7 +1966,7 @@ static int dwc3_runtime_resume(struct device *dev) +@@ -1864,7 +1973,7 @@ static int dwc3_runtime_resume(struct device *dev) struct dwc3 *dwc = dev_get_drvdata(dev); int ret; @@ -1616397,7 +1616382,7 @@ index 5709b959b1d9..922247b818b4 ret = dwc3_resume_common(dwc, PMSG_AUTO_RESUME); if (ret) -@@ -1906,6 +2015,9 @@ static int dwc3_suspend(struct device *dev) +@@ -1913,6 +2022,9 @@ static int dwc3_suspend(struct device *dev) struct dwc3 *dwc = dev_get_drvdata(dev); int ret; @@ -1616407,7 +1616392,7 @@ index 5709b959b1d9..922247b818b4 ret = dwc3_suspend_common(dwc, PMSG_SUSPEND); if (ret) return ret; -@@ -1920,6 +2032,9 @@ static int dwc3_resume(struct device *dev) +@@ -1927,6 +2039,9 @@ static int dwc3_resume(struct device *dev) struct dwc3 *dwc = dev_get_drvdata(dev); int ret; @@ -1616418,9 +1616403,7 @@ index 5709b959b1d9..922247b818b4 ret = dwc3_resume_common(dwc, PMSG_RESUME); diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h -old mode 100644 -new mode 100755 -index cbebe541f7e8..6de6e689265c +index 291893d27..a1174bd0f 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -31,6 +31,8 @@ @@ -1616449,8 +1616432,8 @@ index cbebe541f7e8..6de6e689265c /* Device Registers */ #define DWC3_DCFG 0xc700 -@@ -253,9 +256,11 @@ - #define DWC3_GUCTL_HSTINAUTORETRY BIT(14) +@@ -250,9 +253,11 @@ + #define DWC3_GCTL_DSBLCLKGTNG BIT(0) /* Global User Control 1 Register */ -#define DWC3_GUCTL1_PARKMODE_DISABLE_SS BIT(17) @@ -1616463,7 +1616446,7 @@ index cbebe541f7e8..6de6e689265c /* Global Status Register */ #define DWC3_GSTS_OTG_IP BIT(10) -@@ -376,6 +381,9 @@ +@@ -373,6 +378,9 @@ #define DWC3_GHWPARAMS7_RAM1_DEPTH(n) ((n) & 0xffff) #define DWC3_GHWPARAMS7_RAM2_DEPTH(n) (((n) >> 16) & 0xffff) @@ -1616473,7 +1616456,7 @@ index cbebe541f7e8..6de6e689265c /* Global Frame Length Adjustment Register */ #define DWC3_GFLADJ_30MHZ_SDBND_SEL BIT(7) #define DWC3_GFLADJ_30MHZ_MASK 0x3f -@@ -387,6 +395,8 @@ +@@ -384,6 +392,8 @@ #define DWC3_GUCTL3_SPLITDISABLE BIT(14) /* Device Configuration Register */ @@ -1616482,7 +1616465,7 @@ index cbebe541f7e8..6de6e689265c #define DWC3_DCFG_DEVADDR(addr) ((addr) << 3) #define DWC3_DCFG_DEVADDR_MASK DWC3_DCFG_DEVADDR(0x7f) -@@ -401,6 +411,7 @@ +@@ -398,6 +408,7 @@ #define DWC3_DCFG_NUMP(n) (((n) >> DWC3_DCFG_NUMP_SHIFT) & 0x1f) #define DWC3_DCFG_NUMP_MASK (0x1f << DWC3_DCFG_NUMP_SHIFT) #define DWC3_DCFG_LPM_CAP BIT(22) @@ -1616490,7 +1616473,7 @@ index cbebe541f7e8..6de6e689265c /* Device Control Register */ #define DWC3_DCTL_RUN_STOP BIT(31) -@@ -452,7 +463,7 @@ +@@ -449,7 +460,7 @@ #define DWC3_DEVTEN_CMDCMPLTEN BIT(10) #define DWC3_DEVTEN_ERRTICERREN BIT(9) #define DWC3_DEVTEN_SOFEN BIT(7) @@ -1616499,7 +1616482,7 @@ index cbebe541f7e8..6de6e689265c #define DWC3_DEVTEN_HIBERNATIONREQEVTEN BIT(5) #define DWC3_DEVTEN_WKUPEVTEN BIT(4) #define DWC3_DEVTEN_ULSTCNGEN BIT(3) -@@ -460,6 +471,8 @@ +@@ -457,6 +468,8 @@ #define DWC3_DEVTEN_USBRSTEN BIT(1) #define DWC3_DEVTEN_DISCONNEVTEN BIT(0) @@ -1616508,7 +1616491,7 @@ index cbebe541f7e8..6de6e689265c /* Device Status Register */ #define DWC3_DSTS_DCNRD BIT(29) -@@ -713,6 +726,7 @@ struct dwc3_ep { +@@ -710,6 +723,7 @@ struct dwc3_ep { #define DWC3_EP_FORCE_RESTART_STREAM BIT(9) #define DWC3_EP_FIRST_STREAM_PRIMED BIT(10) #define DWC3_EP_PENDING_CLEAR_STALL BIT(11) @@ -1616516,7 +1616499,7 @@ index cbebe541f7e8..6de6e689265c /* This last one is specific to EP0 */ #define DWC3_EP0_DIR_IN BIT(31) -@@ -852,13 +866,12 @@ struct dwc3_hwparams { +@@ -849,13 +863,12 @@ struct dwc3_hwparams { u32 hwparams6; u32 hwparams7; u32 hwparams8; @@ -1616531,7 +1616514,7 @@ index cbebe541f7e8..6de6e689265c /* HWPARAMS1 */ #define DWC3_NUM_INT(n) (((n) & (0x3f << 15)) >> 15) -@@ -905,11 +918,13 @@ struct dwc3_request { +@@ -902,11 +915,13 @@ struct dwc3_request { unsigned int remaining; unsigned int status; @@ -1616550,7 +1616533,7 @@ index cbebe541f7e8..6de6e689265c u8 epnum; struct dwc3_trb *trb; -@@ -1123,6 +1138,12 @@ struct dwc3 { +@@ -1120,6 +1135,12 @@ struct dwc3 { enum usb_phy_interface hsphy_mode; struct usb_role_switch *role_sw; enum usb_dr_mode role_switch_default_mode; @@ -1616563,7 +1616546,7 @@ index cbebe541f7e8..6de6e689265c u32 fladj; u32 irq_gadget; -@@ -1133,6 +1154,9 @@ struct dwc3 { +@@ -1130,6 +1151,9 @@ struct dwc3 { u32 nr_scratch; u32 u1u2; u32 maximum_speed; @@ -1616573,7 +1616556,7 @@ index cbebe541f7e8..6de6e689265c u32 ip; -@@ -1215,6 +1239,7 @@ struct dwc3 { +@@ -1212,6 +1236,7 @@ struct dwc3 { u8 rx_max_burst_prd; u8 tx_thr_num_pkt_prd; u8 tx_max_burst_prd; @@ -1616581,7 +1616564,7 @@ index cbebe541f7e8..6de6e689265c const char *hsphy_interface; -@@ -1229,6 +1254,7 @@ struct dwc3 { +@@ -1226,6 +1251,7 @@ struct dwc3 { unsigned is_utmi_l1_suspend:1; unsigned is_fpga:1; unsigned pending_events:1; @@ -1616589,7 +1616572,7 @@ index cbebe541f7e8..6de6e689265c unsigned pullups_connected:1; unsigned setup_packet_pending:1; unsigned three_stage_setup:1; -@@ -1262,8 +1288,24 @@ struct dwc3 { +@@ -1259,8 +1285,24 @@ struct dwc3 { unsigned dis_metastability_quirk:1; unsigned dis_split_quirk:1; @@ -1616614,7 +1616597,7 @@ index cbebe541f7e8..6de6e689265c }; #define INCRX_BURST_MODE 0 -@@ -1453,6 +1495,23 @@ u32 dwc3_core_fifo_space(struct dwc3_ep *dep, u8 type); +@@ -1450,6 +1492,23 @@ u32 dwc3_core_fifo_space(struct dwc3_ep *dep, u8 type); (!(_ip##_VERSIONTYPE_##_to) || \ dwc->version_type <= _ip##_VERSIONTYPE_##_to)) @@ -1616638,7 +1616621,7 @@ index cbebe541f7e8..6de6e689265c bool dwc3_has_imod(struct dwc3 *dwc); int dwc3_event_buffers_setup(struct dwc3 *dwc); -@@ -1480,6 +1539,8 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned int cmd, +@@ -1477,6 +1536,8 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned int cmd, struct dwc3_gadget_ep_cmd_params *params); int dwc3_send_gadget_generic_command(struct dwc3 *dwc, unsigned int cmd, u32 param); @@ -1616647,7 +1616630,7 @@ index cbebe541f7e8..6de6e689265c #else static inline int dwc3_gadget_init(struct dwc3 *dwc) { return 0; } -@@ -1499,6 +1560,11 @@ static inline int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned int cmd, +@@ -1496,6 +1557,11 @@ static inline int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned int cmd, static inline int dwc3_send_gadget_generic_command(struct dwc3 *dwc, int cmd, u32 param) { return 0; } @@ -1616660,9 +1616643,7 @@ index cbebe541f7e8..6de6e689265c #if IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE) diff --git a/drivers/usb/dwc3/debug.h b/drivers/usb/dwc3/debug.h -old mode 100644 -new mode 100755 -index 74d9c2c38193..b2aa7272f5de +index 74d9c2c38..b2aa7272f 100644 --- a/drivers/usb/dwc3/debug.h +++ b/drivers/usb/dwc3/debug.h @@ -221,8 +221,8 @@ static inline const char *dwc3_gadget_event_string(char *str, size_t size, @@ -1616688,9 +1616669,7 @@ index 74d9c2c38193..b2aa7272f5de return "Start of Frame"; case DWC3_DEVICE_EVENT_ERRATIC_ERROR: diff --git a/drivers/usb/dwc3/debugfs.c b/drivers/usb/dwc3/debugfs.c -old mode 100644 -new mode 100755 -index da8b62db49fb..f0f04d7b10ea +index da8b62db4..f0f04d7b1 100644 --- a/drivers/usb/dwc3/debugfs.c +++ b/drivers/usb/dwc3/debugfs.c @@ -454,6 +454,10 @@ static ssize_t dwc3_mode_write(struct file *file, @@ -1616745,9 +1616724,7 @@ index da8b62db49fb..f0f04d7b10ea val *= mdwidth; val >>= 3; diff --git a/drivers/usb/dwc3/drd.c b/drivers/usb/dwc3/drd.c -old mode 100644 -new mode 100755 -index 0a96f44ccca7..347795a8b3c1 +index 8bcfbb29c..9d549730e 100644 --- a/drivers/usb/dwc3/drd.c +++ b/drivers/usb/dwc3/drd.c @@ -420,6 +420,12 @@ static void dwc3_drd_update(struct dwc3 *dwc) @@ -1616832,8 +1616809,8 @@ index 0a96f44ccca7..347795a8b3c1 case USB_ROLE_HOST: mode = DWC3_GCTL_PRTCAP_HOST; diff --git a/drivers/usb/dwc3/dwc3-imx8mp.c b/drivers/usb/dwc3/dwc3-imx8mp.c -new file mode 100755 -index 000000000000..84c1a4ac2444 +new file mode 100644 +index 000000000..84c1a4ac2 --- /dev/null +++ b/drivers/usb/dwc3/dwc3-imx8mp.c @@ -0,0 +1,364 @@ @@ -1617202,9 +1617179,7 @@ index 000000000000..84c1a4ac2444 +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("DesignWare USB3 imx8mp Glue Layer"); diff --git a/drivers/usb/dwc3/dwc3-keystone.c b/drivers/usb/dwc3/dwc3-keystone.c -old mode 100644 -new mode 100755 -index 9a99253d5ba3..057056c0975e +index 9a99253d5..057056c09 100644 --- a/drivers/usb/dwc3/dwc3-keystone.c +++ b/drivers/usb/dwc3/dwc3-keystone.c @@ -99,13 +99,8 @@ static int kdwc3_probe(struct platform_device *pdev) @@ -1617224,9 +1617199,7 @@ index 9a99253d5ba3..057056c0975e phy_pm_runtime_get_sync(kdwc->usb3_phy); diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c -old mode 100644 -new mode 100755 -index a5a8c5712bce..73c20a93208e +index 9f420cc8d..a431747bb 100644 --- a/drivers/usb/dwc3/dwc3-pci.c +++ b/drivers/usb/dwc3/dwc3-pci.c @@ -40,7 +40,9 @@ @@ -1617258,7 +1617231,7 @@ index a5a8c5712bce..73c20a93208e static int dwc3_pci_quirks(struct dwc3_pci *dwc) { struct pci_dev *pdev = dwc->pci; -@@ -225,7 +239,6 @@ static void dwc3_pci_resume_work(struct work_struct *work) +@@ -227,7 +241,6 @@ static void dwc3_pci_resume_work(struct work_struct *work) static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) { @@ -1617266,7 +1617239,7 @@ index a5a8c5712bce..73c20a93208e struct dwc3_pci *dwc; struct resource res[2]; int ret; -@@ -268,7 +281,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) +@@ -270,7 +283,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) dwc->dwc3->dev.parent = dev; ACPI_COMPANION_SET(&dwc->dwc3->dev, ACPI_COMPANION(dev)); @@ -1617275,7 +1617248,7 @@ index a5a8c5712bce..73c20a93208e if (ret < 0) goto err; -@@ -291,6 +304,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) +@@ -293,6 +306,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) return 0; err: @@ -1617283,7 +1617256,7 @@ index a5a8c5712bce..73c20a93208e platform_device_put(dwc->dwc3); return ret; } -@@ -307,75 +321,82 @@ static void dwc3_pci_remove(struct pci_dev *pci) +@@ -309,75 +323,82 @@ static void dwc3_pci_remove(struct pci_dev *pci) #endif device_init_wakeup(&pci->dev, false); pm_runtime_get(&pci->dev); @@ -1617389,12 +1617362,10 @@ index a5a8c5712bce..73c20a93208e }; MODULE_DEVICE_TABLE(pci, dwc3_pci_id_table); diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c -old mode 100644 -new mode 100755 -index 416c94c612f5..ec51e2859d6e +index 568973582..d93dde9b1 100644 --- a/drivers/usb/dwc3/dwc3-qcom.c +++ b/drivers/usb/dwc3/dwc3-qcom.c -@@ -678,6 +678,20 @@ static int dwc3_qcom_of_register_core(struct platform_device *pdev) +@@ -687,6 +687,20 @@ static int dwc3_qcom_of_register_core(struct platform_device *pdev) return -ENODEV; } @@ -1617416,12 +1617387,10 @@ index 416c94c612f5..ec51e2859d6e if (ret) { dev_err(dev, "failed to register dwc3 core - %d\n", ret); diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c -old mode 100644 -new mode 100755 -index 3cd294264372..658739410992 +index 14bdef970..52f2bfae4 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c -@@ -597,11 +597,13 @@ static int dwc3_ep0_set_address(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl) +@@ -600,11 +600,13 @@ static int dwc3_ep0_set_address(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl) static int dwc3_ep0_delegate_req(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl) { @@ -1617439,7 +1617408,7 @@ index 3cd294264372..658739410992 return ret; } -@@ -619,6 +621,8 @@ static int dwc3_ep0_set_config(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl) +@@ -622,6 +624,8 @@ static int dwc3_ep0_set_config(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl) return -EINVAL; case USB_STATE_ADDRESS: @@ -1617449,9 +1617418,7 @@ index 3cd294264372..658739410992 /* if the cfg matches and the cfg is non zero */ if (cfg && (!ret || (ret == USB_GADGET_DELAYED_STATUS))) { diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c -old mode 100644 -new mode 100755 -index 076032128c34..18f7712010da +index c403966f0..4aa6f9076 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -418,6 +418,7 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned int cmd, @@ -1618302,7 +1618269,7 @@ index 076032128c34..18f7712010da /* It changed to be suspend event for version 2.30a and above */ if (!DWC3_VER_IS_PRIOR(DWC3, 230A)) { /* -@@ -3980,6 +4369,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) +@@ -3986,6 +4375,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) dev->platform_data = dwc; dwc->gadget->ops = &dwc3_gadget_ops; dwc->gadget->speed = USB_SPEED_UNKNOWN; @@ -1618310,7 +1618277,7 @@ index 076032128c34..18f7712010da dwc->gadget->sg_supported = true; dwc->gadget->name = "dwc3-gadget"; dwc->gadget->lpm_capable = !dwc->usb2_gadget_lpm_disable; -@@ -4006,6 +4396,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) +@@ -4012,6 +4402,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) dwc->revision); dwc->gadget->max_speed = dwc->maximum_speed; @@ -1618318,7 +1618285,7 @@ index 076032128c34..18f7712010da /* * REVISIT: Here we should clear all pending IRQs to be -@@ -4022,7 +4413,10 @@ int dwc3_gadget_init(struct dwc3 *dwc) +@@ -4028,7 +4419,10 @@ int dwc3_gadget_init(struct dwc3 *dwc) goto err5; } @@ -1618330,7 +1618297,7 @@ index 076032128c34..18f7712010da return 0; -@@ -4077,9 +4471,10 @@ int dwc3_gadget_suspend(struct dwc3 *dwc) +@@ -4083,9 +4477,10 @@ int dwc3_gadget_suspend(struct dwc3 *dwc) int dwc3_gadget_resume(struct dwc3 *dwc) { @@ -1618343,9 +1618310,7 @@ index 076032128c34..18f7712010da ret = __dwc3_gadget_start(dwc); diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h -old mode 100644 -new mode 100755 -index 0cd281949970..77df4b6d6c13 +index 0cd281949..77df4b6d6 100644 --- a/drivers/usb/dwc3/gadget.h +++ b/drivers/usb/dwc3/gadget.h @@ -90,15 +90,17 @@ static inline void dwc3_gadget_move_started_request(struct dwc3_request *req) @@ -1618369,9 +1618334,7 @@ index 0cd281949970..77df4b6d6c13 } diff --git a/drivers/usb/dwc3/trace.c b/drivers/usb/dwc3/trace.c -old mode 100644 -new mode 100755 -index 1b45a9723eeb..8a4fe12bb2e3 +index 1b45a9723..8a4fe12bb 100644 --- a/drivers/usb/dwc3/trace.c +++ b/drivers/usb/dwc3/trace.c @@ -9,3 +9,10 @@ @@ -1618386,7 +1618349,7 @@ index 1b45a9723eeb..8a4fe12bb2e3 +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 2d152571a7de..b5deb1be21b7 100644 +index 2d152571a..b5deb1be2 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -216,6 +216,12 @@ config USB_F_PRINTER @@ -1618457,7 +1618420,7 @@ index 2d152571a7de..b5deb1be21b7 100644 endif # USB_GADGET diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c -index a980799900e7..553382ce3837 100644 +index a98079990..553382ce3 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -13,6 +13,7 @@ @@ -1618615,9 +1618578,7 @@ index a980799900e7..553382ce3837 100644 .suspend = composite_suspend, diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c -old mode 100644 -new mode 100755 -index d51ea1c052f2..f2a2f11936b3 +index 6bb69a4e6..0c572b78f 100644 --- a/drivers/usb/gadget/configfs.c +++ b/drivers/usb/gadget/configfs.c @@ -10,6 +10,32 @@ @@ -1618666,7 +1618627,7 @@ index d51ea1c052f2..f2a2f11936b3 }; static inline struct gadget_info *to_gadget_info(struct config_item *item) -@@ -272,7 +304,7 @@ static ssize_t gadget_dev_desc_UDC_store(struct config_item *item, +@@ -275,7 +307,7 @@ static ssize_t gadget_dev_desc_UDC_store(struct config_item *item, mutex_lock(&gi->lock); @@ -1618675,7 +1618636,7 @@ index d51ea1c052f2..f2a2f11936b3 ret = unregister_gadget(gi); if (ret) goto err; -@@ -1270,6 +1302,9 @@ static void purge_configs_funcs(struct gadget_info *gi) +@@ -1273,6 +1305,9 @@ static void purge_configs_funcs(struct gadget_info *gi) f->name, f); f->unbind(c, f); } @@ -1618685,7 +1618646,7 @@ index d51ea1c052f2..f2a2f11936b3 } c->next_interface_id = 0; memset(c->interface, 0, sizeof(c->interface)); -@@ -1404,6 +1439,10 @@ static int configfs_composite_bind(struct usb_gadget *gadget, +@@ -1407,6 +1442,10 @@ static int configfs_composite_bind(struct usb_gadget *gadget, goto err_purge_funcs; } } @@ -1618696,7 +1618657,7 @@ index d51ea1c052f2..f2a2f11936b3 usb_ep_autoconfig_reset(cdev->gadget); } if (cdev->use_os_string) { -@@ -1422,6 +1461,57 @@ static int configfs_composite_bind(struct usb_gadget *gadget, +@@ -1425,6 +1464,57 @@ static int configfs_composite_bind(struct usb_gadget *gadget, return ret; } @@ -1618754,7 +1618715,7 @@ index d51ea1c052f2..f2a2f11936b3 static void configfs_composite_unbind(struct usb_gadget *gadget) { struct usb_composite_dev *cdev; -@@ -1449,6 +1539,60 @@ static void configfs_composite_unbind(struct usb_gadget *gadget) +@@ -1452,6 +1542,60 @@ static void configfs_composite_unbind(struct usb_gadget *gadget) spin_unlock_irqrestore(&gi->spinlock, flags); } @@ -1618815,7 +1618776,7 @@ index d51ea1c052f2..f2a2f11936b3 static int configfs_composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) { -@@ -1474,6 +1618,8 @@ static int configfs_composite_setup(struct usb_gadget *gadget, +@@ -1477,6 +1621,8 @@ static int configfs_composite_setup(struct usb_gadget *gadget, return ret; } @@ -1618824,7 +1618785,7 @@ index d51ea1c052f2..f2a2f11936b3 static void configfs_composite_disconnect(struct usb_gadget *gadget) { struct usb_composite_dev *cdev; -@@ -1484,6 +1630,14 @@ static void configfs_composite_disconnect(struct usb_gadget *gadget) +@@ -1487,6 +1633,14 @@ static void configfs_composite_disconnect(struct usb_gadget *gadget) if (!cdev) return; @@ -1618839,7 +1618800,7 @@ index d51ea1c052f2..f2a2f11936b3 gi = container_of(cdev, struct gadget_info, cdev); spin_lock_irqsave(&gi->spinlock, flags); cdev = get_gadget_data(gadget); -@@ -1492,10 +1646,36 @@ static void configfs_composite_disconnect(struct usb_gadget *gadget) +@@ -1495,10 +1649,36 @@ static void configfs_composite_disconnect(struct usb_gadget *gadget) return; } @@ -1618876,7 +1618837,7 @@ index d51ea1c052f2..f2a2f11936b3 static void configfs_composite_suspend(struct usb_gadget *gadget) { struct usb_composite_dev *cdev; -@@ -1544,10 +1724,13 @@ static const struct usb_gadget_driver configfs_driver_template = { +@@ -1547,10 +1727,13 @@ static const struct usb_gadget_driver configfs_driver_template = { .bind = configfs_composite_bind, .unbind = configfs_composite_unbind, @@ -1618892,7 +1618853,7 @@ index d51ea1c052f2..f2a2f11936b3 .suspend = configfs_composite_suspend, .resume = configfs_composite_resume, -@@ -1559,6 +1742,91 @@ static const struct usb_gadget_driver configfs_driver_template = { +@@ -1562,6 +1745,91 @@ static const struct usb_gadget_driver configfs_driver_template = { .match_existing_only = 1, }; @@ -1618984,7 +1618945,7 @@ index d51ea1c052f2..f2a2f11936b3 static struct config_group *gadgets_make( struct config_group *group, const char *name) -@@ -1611,7 +1879,11 @@ static struct config_group *gadgets_make( +@@ -1614,7 +1882,11 @@ static struct config_group *gadgets_make( if (!gi->composite.gadget_driver.function) goto err; @@ -1618996,7 +1618957,7 @@ index d51ea1c052f2..f2a2f11936b3 err: kfree(gi); return ERR_PTR(-ENOMEM); -@@ -1619,7 +1891,11 @@ static struct config_group *gadgets_make( +@@ -1622,7 +1894,11 @@ static struct config_group *gadgets_make( static void gadgets_drop(struct config_group *group, struct config_item *item) { @@ -1619008,7 +1618969,7 @@ index d51ea1c052f2..f2a2f11936b3 } static struct configfs_group_operations gadgets_ops = { -@@ -1659,6 +1935,13 @@ static int __init gadget_cfs_init(void) +@@ -1662,6 +1938,13 @@ static int __init gadget_cfs_init(void) config_group_init(&gadget_subsys.su_group); ret = configfs_register_subsystem(&gadget_subsys); @@ -1619022,7 +1618983,7 @@ index d51ea1c052f2..f2a2f11936b3 return ret; } module_init(gadget_cfs_init); -@@ -1666,5 +1949,10 @@ module_init(gadget_cfs_init); +@@ -1669,5 +1952,10 @@ module_init(gadget_cfs_init); static void __exit gadget_cfs_exit(void) { configfs_unregister_subsystem(&gadget_subsys); @@ -1619034,7 +1618995,7 @@ index d51ea1c052f2..f2a2f11936b3 } module_exit(gadget_cfs_exit); diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c -index 1eb4fa2e623f..177645f3250a 100644 +index 1eb4fa2e6..177645f32 100644 --- a/drivers/usb/gadget/epautoconf.c +++ b/drivers/usb/gadget/epautoconf.c @@ -67,6 +67,9 @@ struct usb_ep *usb_ep_autoconfig_ss( @@ -1619076,9 +1619037,7 @@ index 1eb4fa2e623f..177645f3250a 100644 } EXPORT_SYMBOL_GPL(usb_ep_autoconfig_ss); diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile -old mode 100644 -new mode 100755 -index 5d3a6cf02218..14e5c906a6e0 +index 5d3a6cf02..14e5c906a 100644 --- a/drivers/usb/gadget/function/Makefile +++ b/drivers/usb/gadget/function/Makefile @@ -50,3 +50,9 @@ usb_f_printer-y := f_printer.o @@ -1619093,8 +1619052,8 @@ index 5d3a6cf02218..14e5c906a6e0 +obj-$(CONFIG_DRIVERS_HDF_USB_F_GENERIC) += usb_f_generic.o \ No newline at end of file diff --git a/drivers/usb/gadget/function/f_accessory.c b/drivers/usb/gadget/function/f_accessory.c -new file mode 100755 -index 000000000000..73185410d3a0 +new file mode 100644 +index 000000000..73185410d --- /dev/null +++ b/drivers/usb/gadget/function/f_accessory.c @@ -0,0 +1,1556 @@ @@ -1620655,8 +1620614,8 @@ index 000000000000..73185410d3a0 +DECLARE_USB_FUNCTION_INIT(accessory, acc_alloc_inst, acc_alloc); +MODULE_LICENSE("GPL"); diff --git a/drivers/usb/gadget/function/f_audio_source.c b/drivers/usb/gadget/function/f_audio_source.c -new file mode 100755 -index 000000000000..c768a526b315 +new file mode 100644 +index 000000000..c768a526b --- /dev/null +++ b/drivers/usb/gadget/function/f_audio_source.c @@ -0,0 +1,1071 @@ @@ -1621732,9 +1621691,7 @@ index 000000000000..c768a526b315 + audio_source_alloc); +MODULE_LICENSE("GPL"); diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c -old mode 100644 -new mode 100755 -index b17acab77fe2..7c30858fc156 +index eb9d01d42..386632eb3 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -71,7 +71,7 @@ struct ffs_function { @@ -1621755,7 +1621712,7 @@ index b17acab77fe2..7c30858fc156 } static long ffs_ep0_ioctl(struct file *file, unsigned code, unsigned long value) -@@ -1277,7 +1277,7 @@ ffs_epfile_release(struct inode *inode, struct file *file) +@@ -1281,7 +1281,7 @@ ffs_epfile_release(struct inode *inode, struct file *file) __ffs_epfile_read_buffer_free(epfile); ffs_data_closed(epfile->ffs); @@ -1621764,7 +1621721,7 @@ index b17acab77fe2..7c30858fc156 } static long ffs_epfile_ioctl(struct file *file, unsigned code, -@@ -2836,7 +2836,7 @@ static int __ffs_func_bind_do_descs(enum ffs_entity_type type, u8 *valuep, +@@ -2840,7 +2840,7 @@ static int __ffs_func_bind_do_descs(enum ffs_entity_type type, u8 *valuep, struct ffs_function *func = priv; struct ffs_ep *ffs_ep; unsigned ep_desc_id; @@ -1621773,7 +1621730,7 @@ index b17acab77fe2..7c30858fc156 static const char *speed_names[] = { "full", "high", "super" }; if (type != FFS_DESCRIPTOR) -@@ -2909,8 +2909,9 @@ static int __ffs_func_bind_do_descs(enum ffs_entity_type type, u8 *valuep, +@@ -2913,8 +2913,9 @@ static int __ffs_func_bind_do_descs(enum ffs_entity_type type, u8 *valuep, ffs_ep->ep = ep; ffs_ep->req = req; @@ -1621785,7 +1621742,7 @@ index b17acab77fe2..7c30858fc156 /* * If we use virtual address mapping, we restore * original bEndpointAddress value. -@@ -3445,7 +3446,10 @@ static void ffs_func_resume(struct usb_function *f) +@@ -3449,7 +3450,10 @@ static void ffs_func_resume(struct usb_function *f) static int ffs_func_revmap_ep(struct ffs_function *func, u8 num) { @@ -1621798,12 +1621755,10 @@ index b17acab77fe2..7c30858fc156 } diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c -old mode 100644 -new mode 100755 -index 950c9435beec..73a28f8a38a7 +index d20ca5974..a476a19cb 100644 --- a/drivers/usb/gadget/function/f_mass_storage.c +++ b/drivers/usb/gadget/function/f_mass_storage.c -@@ -2301,6 +2301,16 @@ static void fsg_disable(struct usb_function *f) +@@ -2317,6 +2317,16 @@ static void fsg_disable(struct usb_function *f) { struct fsg_dev *fsg = fsg_from_func(f); @@ -1621821,9 +1621776,7 @@ index 950c9435beec..73a28f8a38a7 } diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c -old mode 100644 -new mode 100755 -index 8fff995b8dd5..566531bf6cab +index 8fff995b8..566531bf6 100644 --- a/drivers/usb/gadget/function/f_midi.c +++ b/drivers/usb/gadget/function/f_midi.c @@ -1222,6 +1222,65 @@ static void f_midi_free_inst(struct usb_function_instance *f) @@ -1621921,9 +1621874,7 @@ index 8fff995b8dd5..566531bf6cab midi_free: diff --git a/drivers/usb/gadget/function/f_printer.c b/drivers/usb/gadget/function/f_printer.c -old mode 100644 -new mode 100755 -index c13bb29a160e..939f174a956c +index c13bb29a1..939f174a9 100644 --- a/drivers/usb/gadget/function/f_printer.c +++ b/drivers/usb/gadget/function/f_printer.c @@ -51,6 +51,8 @@ @@ -1621946,7 +1621897,7 @@ index c13bb29a160e..939f174a956c 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 ee95e8f5f9d4..b550fcb234ff 100644 +index ee95e8f5f..b550fcb23 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 = { @@ -1621996,11 +1621947,8 @@ index ee95e8f5f9d4..b550fcb234ff 100644 default: invalid: VDBG(cdev, "invalid control req%02x.%02x v%04x i%04x l%d\n", -diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c -old mode 100644 -new mode 100755 diff --git a/drivers/usb/gadget/function/f_uac1_legacy.c b/drivers/usb/gadget/function/f_uac1_legacy.c -index e2d7f69128a0..1519ac654803 100644 +index e2d7f6912..1519ac654 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) @@ -1622024,9 +1621972,7 @@ index e2d7f69128a0..1519ac654803 100644 mutex_lock(&opts->lock); --opts->refcnt; diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c -old mode 100644 -new mode 100755 -index 11cc6056b590..f1ba000ac3f7 +index 11cc6056b..f1ba000ac 100644 --- a/drivers/usb/gadget/function/f_uac2.c +++ b/drivers/usb/gadget/function/f_uac2.c @@ -44,6 +44,7 @@ @@ -1622582,7 +1622528,7 @@ index 11cc6056b590..f1ba000ac3f7 } diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c -index 5d39aff263f0..ea8e0a34a6e0 100644 +index 5d39aff26..ea8e0a34a 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 = { @@ -1623305,9 +1623251,7 @@ index 5d39aff263f0..ea8e0a34a6e0 100644 return &uvc->func; diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c -old mode 100644 -new mode 100755 -index 6c8b8f5b7e0f..3482a26a61a5 +index 6c8b8f5b7..3482a26a6 100644 --- a/drivers/usb/gadget/function/u_audio.c +++ b/drivers/usb/gadget/function/u_audio.c @@ -16,6 +16,7 @@ @@ -1623918,9 +1623862,7 @@ index 6c8b8f5b7e0f..3482a26a61a5 kfree(uac->c_prm.rbuf); kfree(uac); diff --git a/drivers/usb/gadget/function/u_audio.h b/drivers/usb/gadget/function/u_audio.h -old mode 100644 -new mode 100755 -index 5ea6b86f1fda..a218cdf771fe +index 5ea6b86f1..a218cdf77 100644 --- a/drivers/usb/gadget/function/u_audio.h +++ b/drivers/usb/gadget/function/u_audio.h @@ -11,6 +11,14 @@ @@ -1623958,9 +1623900,7 @@ index 5ea6b86f1fda..a218cdf771fe /* Max packet size for all in_ep possible speeds */ unsigned int in_ep_maxpsize; diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c -old mode 100644 -new mode 100755 -index 5e5f699a434f..b47f498a7daf +index 5e5f699a4..b47f498a7 100644 --- a/drivers/usb/gadget/function/u_ether.c +++ b/drivers/usb/gadget/function/u_ether.c @@ -81,6 +81,7 @@ struct eth_dev { @@ -1624019,9 +1623959,7 @@ index 5e5f699a434f..b47f498a7daf * gether_cleanup - remove Ethernet-over-USB device * Context: may sleep diff --git a/drivers/usb/gadget/function/u_ether.h b/drivers/usb/gadget/function/u_ether.h -old mode 100644 -new mode 100755 -index 10dd640684e2..40144546d1b0 +index 10dd64068..40144546d 100644 --- a/drivers/usb/gadget/function/u_ether.h +++ b/drivers/usb/gadget/function/u_ether.h @@ -244,6 +244,18 @@ unsigned gether_get_qmult(struct net_device *net); @@ -1624044,9 +1623982,7 @@ index 10dd640684e2..40144546d1b0 /* connect/disconnect is handled by individual functions */ diff --git a/drivers/usb/gadget/function/u_ether_configfs.h b/drivers/usb/gadget/function/u_ether_configfs.h -old mode 100644 -new mode 100755 -index f982e18a5a78..f558c3139ebe +index f982e18a5..f558c3139 100644 --- a/drivers/usb/gadget/function/u_ether_configfs.h +++ b/drivers/usb/gadget/function/u_ether_configfs.h @@ -148,7 +148,20 @@ out: \ @@ -1624072,9 +1624008,7 @@ index f982e18a5a78..f558c3139ebe #define USB_ETHER_CONFIGFS_ITEM_ATTR_U8_RW(_f_, _n_) \ static ssize_t _f_##_opts_##_n_##_show(struct config_item *item,\ diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c -old mode 100644 -new mode 100755 -index 7b54e814aefb..948eabf3cebd +index 4fd21772a..946dfa977 100644 --- a/drivers/usb/gadget/function/u_serial.c +++ b/drivers/usb/gadget/function/u_serial.c @@ -261,9 +261,7 @@ __acquires(&port->port_lock) @@ -1624097,7 +1624031,7 @@ index 7b54e814aefb..948eabf3cebd * layer until it refuses to take any more data (or is throttled back). * Then it issues reads for any further data. * -@@ -712,7 +710,7 @@ static void gs_close(struct tty_struct *tty, struct file *file) +@@ -715,7 +713,7 @@ static void gs_close(struct tty_struct *tty, struct file *file) /* Iff we're disconnected, there can be no I/O in flight so it's * ok to free the circular buffer; else just scrub it. And don't @@ -1624107,8 +1624041,8 @@ index 7b54e814aefb..948eabf3cebd if (gser == NULL) kfifo_free(&port->port_write_buf); diff --git a/drivers/usb/gadget/function/u_uac.h b/drivers/usb/gadget/function/u_uac.h -new file mode 100755 -index 000000000000..224ddc397c70 +new file mode 100644 +index 000000000..224ddc397 --- /dev/null +++ b/drivers/usb/gadget/function/u_uac.h @@ -0,0 +1,194 @@ @@ -1624306,11 +1624240,8 @@ index 000000000000..224ddc397c70 +} + +#endif /* __U_UAC_H */ -diff --git a/drivers/usb/gadget/function/u_uac1.h b/drivers/usb/gadget/function/u_uac1.h -old mode 100644 -new mode 100755 diff --git a/drivers/usb/gadget/function/u_uac1_legacy.c b/drivers/usb/gadget/function/u_uac1_legacy.c -index 60ae8b2d3f6a..2f149853a91b 100644 +index 60ae8b2d3..2f149853a 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) @@ -1624325,9 +1624256,7 @@ index 60ae8b2d3f6a..2f149853a91b 100644 snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DROP, NULL); snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_HW_PARAMS, params); diff --git a/drivers/usb/gadget/function/u_uac2.h b/drivers/usb/gadget/function/u_uac2.h -old mode 100644 -new mode 100755 -index b5035711172d..179d3ef6a195 +index b50357111..179d3ef6a 100644 --- a/drivers/usb/gadget/function/u_uac2.h +++ b/drivers/usb/gadget/function/u_uac2.h @@ -21,7 +21,9 @@ @@ -1624351,7 +1624280,7 @@ index b5035711172d..179d3ef6a195 struct mutex lock; diff --git a/drivers/usb/gadget/function/u_uvc.h b/drivers/usb/gadget/function/u_uvc.h -index 9a01a7d4f17f..3e92a28d8d78 100644 +index 9a01a7d4f..3e92a28d8 100644 --- a/drivers/usb/gadget/function/u_uvc.h +++ b/drivers/usb/gadget/function/u_uvc.h @@ -18,15 +18,18 @@ @@ -1624401,7 +1624330,7 @@ index 9a01a7d4f17f..3e92a28d8d78 100644 #endif /* U_UVC_H */ diff --git a/drivers/usb/gadget/function/uvc.h b/drivers/usb/gadget/function/uvc.h -index 6c4fc4913f4f..499a5f8de73c 100644 +index 6c4fc4913..499a5f8de 100644 --- a/drivers/usb/gadget/function/uvc.h +++ b/drivers/usb/gadget/function/uvc.h @@ -15,6 +15,7 @@ @@ -1624449,7 +1624378,7 @@ index 6c4fc4913f4f..499a5f8de73c 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 2db01170d096..8a65f590fab1 100644 +index 2db01170d..8a65f590f 100644 --- a/drivers/usb/gadget/function/uvc_configfs.c +++ b/drivers/usb/gadget/function/uvc_configfs.c @@ -12,6 +12,7 @@ @@ -1624963,7 +1624892,7 @@ index 2db01170d096..8a65f590fab1 100644 }; diff --git a/drivers/usb/gadget/function/uvc_queue.c b/drivers/usb/gadget/function/uvc_queue.c -index cab1e30462c2..0f5e6fb93d27 100644 +index cab1e3046..0f5e6fb93 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, @@ -1624982,7 +1624911,7 @@ index cab1e30462c2..0f5e6fb93d27 100644 if (ret) return ret; diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c -index 65abd55ce234..4216c9147477 100644 +index 65abd55ce..4216c9147 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) @@ -1625039,7 +1624968,7 @@ index 65abd55ce234..4216c9147477 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 5ce548c2359d..cae5c2b6283d 100644 +index 5ce548c23..cae5c2b62 100644 --- a/drivers/usb/gadget/function/uvc_video.c +++ b/drivers/usb/gadget/function/uvc_video.c @@ -12,12 +12,14 @@ @@ -1625154,11 +1625083,8 @@ index 5ce548c2359d..cae5c2b6283d 100644 if ((ret = uvcg_queue_enable(&video->queue, 1)) < 0) return ret; -diff --git a/drivers/usb/gadget/legacy/audio.c b/drivers/usb/gadget/legacy/audio.c -old mode 100644 -new mode 100755 diff --git a/drivers/usb/gadget/legacy/webcam.c b/drivers/usb/gadget/legacy/webcam.c -index ff970a943347..059deaed133b 100644 +index ff970a943..059deaed1 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) @@ -1625171,9 +1625097,7 @@ index ff970a943347..059deaed133b 100644 /* Allocate string descriptor numbers ... note that string contents * can be overridden by the composite_dev glue. diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c -old mode 100644 -new mode 100755 -index 3a3b5a03dda7..a0c281293530 +index dd2fafc5b..9e39159c7 100644 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -29,6 +29,7 @@ @@ -1625201,7 +1625125,7 @@ index 3a3b5a03dda7..a0c281293530 * * returns zero, or a negative error code. */ -@@ -132,7 +134,7 @@ EXPORT_SYMBOL_GPL(usb_ep_enable); +@@ -130,7 +132,7 @@ EXPORT_SYMBOL_GPL(usb_ep_enable); * gadget drivers must call usb_ep_enable() again before queueing * requests to the endpoint. * @@ -1625333,8 +1625257,8 @@ index 3a3b5a03dda7..a0c281293530 mutex_lock(&udc_lock); list_add_tail(&udc->list, &udc_list); -@@ -1356,6 +1430,7 @@ static void usb_gadget_remove_driver(struct usb_udc *udc) - kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE); +@@ -1354,6 +1428,7 @@ static void usb_gadget_remove_driver(struct usb_udc *udc) + udc->driver->function); usb_gadget_disconnect(udc->gadget); + usb_gadget_disable_async_callbacks(udc); @@ -1625350,9 +1625274,7 @@ index 3a3b5a03dda7..a0c281293530 kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE); diff --git a/drivers/usb/gadget/udc/snps_udc_core.c b/drivers/usb/gadget/udc/snps_udc_core.c -old mode 100644 -new mode 100755 -index 6c726d2e1788..d046c09fa566 +index 6c726d2e1..d046c09fa 100644 --- a/drivers/usb/gadget/udc/snps_udc_core.c +++ b/drivers/usb/gadget/udc/snps_udc_core.c @@ -36,7 +36,6 @@ @@ -1625431,9 +1625353,7 @@ index 6c726d2e1788..d046c09fa566 /* Reset the UDC core */ diff --git a/drivers/usb/gadget/udc/trace.c b/drivers/usb/gadget/udc/trace.c -old mode 100644 -new mode 100755 -index 7430624c0bd7..e0e617280b12 +index 7430624c0..e0e617280 100644 --- a/drivers/usb/gadget/udc/trace.c +++ b/drivers/usb/gadget/udc/trace.c @@ -8,3 +8,6 @@ @@ -1625444,12 +1625364,10 @@ index 7430624c0bd7..e0e617280b12 +EXPORT_TRACEPOINT_SYMBOL_GPL(usb_gadget_connect); +EXPORT_TRACEPOINT_SYMBOL_GPL(usb_gadget_disconnect); diff --git a/drivers/usb/gadget/udc/udc-xilinx.c b/drivers/usb/gadget/udc/udc-xilinx.c -old mode 100644 -new mode 100755 -index 096f56a09e6a..78561630a9d7 +index 47486f0f2..59cda488b 100644 --- a/drivers/usb/gadget/udc/udc-xilinx.c +++ b/drivers/usb/gadget/udc/udc-xilinx.c -@@ -1960,7 +1960,7 @@ static void xudc_nonctrl_ep_handler(struct xusb_udc *udc, u8 epnum, +@@ -1964,7 +1964,7 @@ static void xudc_nonctrl_ep_handler(struct xusb_udc *udc, u8 epnum, if (intrstatus & (XUSB_STATUS_EP0_BUFF1_COMP_MASK << epnum)) ep->buffer0ready = 0; if (intrstatus & (XUSB_STATUS_EP0_BUFF2_COMP_MASK << epnum)) @@ -1625459,9 +1625377,7 @@ index 096f56a09e6a..78561630a9d7 if (list_empty(&ep->queue)) return; diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile -old mode 100644 -new mode 100755 -index bc731332fed9..2c7155fae179 +index bc731332f..2c7155fae 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -19,9 +19,7 @@ ifneq ($(CONFIG_USB_XHCI_DBGCAP), ) @@ -1625485,9 +1625401,7 @@ index bc731332fed9..2c7155fae179 obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c -old mode 100644 -new mode 100755 -index 2dcfc67f2ba8..3e48737f893f +index 2dcfc67f2..3e48737f8 100644 --- a/drivers/usb/host/ehci-platform.c +++ b/drivers/usb/host/ehci-platform.c @@ -28,6 +28,7 @@ @@ -1625589,9 +1625503,7 @@ index 2dcfc67f2ba8..3e48737f893f dev->dev.platform_data = NULL; diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c -old mode 100644 -new mode 100755 -index 4a8456f12a73..4923536780ee +index 4a8456f12..492353678 100644 --- a/drivers/usb/host/ohci-platform.c +++ b/drivers/usb/host/ohci-platform.c @@ -32,7 +32,7 @@ @@ -1625613,9 +1625525,7 @@ index 4a8456f12a73..4923536780ee /* diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c -old mode 100644 -new mode 100755 -index 7bb306741807..ecc65c6b011e +index e92f92025..462730b48 100644 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c @@ -449,8 +449,13 @@ static int xhci_stop_device(struct xhci_hcd *xhci, int slot_id, int suspend) @@ -1625649,9 +1625559,7 @@ index 7bb306741807..ecc65c6b011e unsigned long xhci_get_resuming_ports(struct usb_hcd *hcd) { diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c -old mode 100644 -new mode 100755 -index a8a9addb4d25..10c5eae5c8f3 +index 006e1b15f..3e230d9dd 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -65,7 +65,7 @@ static struct xhci_segment *xhci_segment_alloc(struct xhci_hcd *xhci, @@ -1625986,7 +1625894,7 @@ index a8a9addb4d25..10c5eae5c8f3 static void xhci_set_hc_event_deq(struct xhci_hcd *xhci) { -@@ -2455,15 +2547,21 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) +@@ -2475,15 +2567,21 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) * xHCI section 5.4.6 - doorbell array must be * "physically contiguous and 64-byte (cache line) aligned". */ @@ -1626015,9 +1625923,7 @@ index a8a9addb4d25..10c5eae5c8f3 /* * Initialize the ring segment pool. The ring must be a contiguous diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c -old mode 100644 -new mode 100755 -index 86c4bc9df3b8..7f0461750146 +index 86c4bc9df..7f0461750 100644 --- a/drivers/usb/host/xhci-mtk-sch.c +++ b/drivers/usb/host/xhci-mtk-sch.c @@ -32,6 +32,15 @@ @@ -1626494,9 +1626400,7 @@ index 86c4bc9df3b8..7f0461750146 + return 0; +} diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c -old mode 100644 -new mode 100755 -index 1c331577fca9..09f2ddbfe8b9 +index 122777b21..d47bc552f 100644 --- a/drivers/usb/host/xhci-mtk.c +++ b/drivers/usb/host/xhci-mtk.c @@ -344,15 +344,6 @@ static void usb_wakeup_set(struct xhci_hcd_mtk *mtk, bool enable) @@ -1626533,9 +1626437,7 @@ index 1c331577fca9..09f2ddbfe8b9 { struct device *dev = &pdev->dev; diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci-mtk.h -old mode 100644 -new mode 100755 -index 3e2c607b5d64..607dbe474d91 +index 3e2c607b5..607dbe474 100644 --- a/drivers/usb/host/xhci-mtk.h +++ b/drivers/usb/host/xhci-mtk.h @@ -22,14 +22,10 @@ @@ -1626607,10 +1626509,10 @@ index 3e2c607b5d64..607dbe474d91 - #endif /* _XHCI_MTK_H_ */ diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index aff65cefead2..8b6ae499c3a5 100644 +index 311e96b05..fd46991a9 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) +@@ -290,10 +290,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) pdev->device == 0x3432) xhci->quirks |= XHCI_BROKEN_STREAMS; @@ -1626623,9 +1626525,7 @@ index aff65cefead2..8b6ae499c3a5 100644 if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) { diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c -old mode 100644 -new mode 100755 -index 972a44b2a7f1..045383d38470 +index 83c7dffa9..67795b330 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -184,6 +184,41 @@ static const struct of_device_id usb_xhci_of_match[] = { @@ -1626670,7 +1626570,7 @@ index 972a44b2a7f1..045383d38470 static int xhci_plat_probe(struct platform_device *pdev) { const struct xhci_plat_priv *priv_match; -@@ -339,6 +374,10 @@ static int xhci_plat_probe(struct platform_device *pdev) +@@ -342,6 +377,10 @@ static int xhci_plat_probe(struct platform_device *pdev) goto put_usb3_hcd; } @@ -1626681,7 +1626581,7 @@ index 972a44b2a7f1..045383d38470 hcd->tpl_support = of_usb_host_tpl_support(sysdev->of_node); xhci->shared_hcd->tpl_support = hcd->tpl_support; -@@ -418,8 +457,10 @@ static int xhci_plat_remove(struct platform_device *dev) +@@ -421,8 +460,10 @@ static int xhci_plat_remove(struct platform_device *dev) usb_phy_shutdown(hcd->usb_phy); usb_remove_hcd(hcd); @@ -1626694,9 +1626594,7 @@ index 972a44b2a7f1..045383d38470 clk_disable_unprepare(reg_clk); usb_put_hcd(hcd); diff --git a/drivers/usb/host/xhci-plat.h b/drivers/usb/host/xhci-plat.h -old mode 100644 -new mode 100755 -index 561d0b7bce09..e726a572321d +index 561d0b7bc..e726a5723 100644 --- a/drivers/usb/host/xhci-plat.h +++ b/drivers/usb/host/xhci-plat.h @@ -13,6 +13,7 @@ @@ -1626720,9 +1626618,7 @@ index 561d0b7bce09..e726a572321d + #endif /* _XHCI_PLAT_H */ diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c -old mode 100644 -new mode 100755 -index b69b8c7e7966..78345e425264 +index 4fdee53db..56a6ce16b 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -57,8 +57,10 @@ @@ -1626821,7 +1626717,7 @@ index b69b8c7e7966..78345e425264 static bool xhci_mod_cmd_timer(struct xhci_hcd *xhci, unsigned long delay) { -@@ -421,9 +447,8 @@ void xhci_ring_ep_doorbell(struct xhci_hcd *xhci, +@@ -422,9 +448,8 @@ void xhci_ring_ep_doorbell(struct xhci_hcd *xhci, trace_xhci_ring_ep_doorbell(slot_id, DB_VALUE(ep_index, stream_id)); writel(DB_VALUE(ep_index, stream_id), db_addr); @@ -1626833,7 +1626729,7 @@ index b69b8c7e7966..78345e425264 } /* Ring the doorbell for any rings with pending URBs */ -@@ -479,6 +504,26 @@ static struct xhci_virt_ep *xhci_get_virt_ep(struct xhci_hcd *xhci, +@@ -480,6 +505,26 @@ static struct xhci_virt_ep *xhci_get_virt_ep(struct xhci_hcd *xhci, return &xhci->devs[slot_id]->eps[ep_index]; } @@ -1626860,7 +1626756,7 @@ index b69b8c7e7966..78345e425264 /* Get the right ring for the given slot_id, ep_index and stream_id. * If the endpoint supports streams, boundary check the URB's stream ID. * If the endpoint doesn't support streams, return the singular endpoint ring. -@@ -493,29 +538,7 @@ struct xhci_ring *xhci_triad_to_transfer_ring(struct xhci_hcd *xhci, +@@ -494,29 +539,7 @@ struct xhci_ring *xhci_triad_to_transfer_ring(struct xhci_hcd *xhci, if (!ep) return NULL; @@ -1626891,7 +1626787,7 @@ index b69b8c7e7966..78345e425264 } -@@ -542,97 +565,55 @@ static u64 xhci_get_hw_deq(struct xhci_hcd *xhci, struct xhci_virt_device *vdev, +@@ -543,97 +566,55 @@ static u64 xhci_get_hw_deq(struct xhci_hcd *xhci, struct xhci_virt_device *vdev, return le64_to_cpu(ep_ctx->deq); } @@ -1627011,7 +1626907,7 @@ index b69b8c7e7966..78345e425264 /* * We want to find the pointer, segment and cycle state of the new trb -@@ -647,40 +628,70 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, +@@ -648,40 +629,70 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, if (td_last_trb_found) break; } @@ -1627099,7 +1626995,7 @@ index b69b8c7e7966..78345e425264 } /* flip_cycle means flip the cycle bit of all but the first and last TRB. -@@ -839,7 +850,26 @@ static int xhci_reset_halted_ep(struct xhci_hcd *xhci, unsigned int slot_id, +@@ -840,7 +851,26 @@ static int xhci_reset_halted_ep(struct xhci_hcd *xhci, unsigned int slot_id, return ret; } @@ -1627127,7 +1627023,7 @@ index b69b8c7e7966..78345e425264 struct xhci_virt_ep *ep, unsigned int stream_id, struct xhci_td *td, enum xhci_ep_reset_type reset_type) -@@ -852,20 +882,31 @@ static void xhci_handle_halted_endpoint(struct xhci_hcd *xhci, +@@ -853,20 +883,31 @@ static void xhci_handle_halted_endpoint(struct xhci_hcd *xhci, * Device will be reset soon to recover the link so don't do anything */ if (ep->vdev->flags & VDEV_PORT_ERROR) @@ -1627167,7 +1627063,7 @@ index b69b8c7e7966..78345e425264 } /* -@@ -873,16 +914,20 @@ static void xhci_handle_halted_endpoint(struct xhci_hcd *xhci, +@@ -874,16 +915,20 @@ static void xhci_handle_halted_endpoint(struct xhci_hcd *xhci, * We have the xHCI lock, so nothing can modify this list until we drop it. * We're also in the event handler, so we can't get re-interrupted if another * Stop Endpoint command completes. @@ -1627190,7 +1627086,7 @@ index b69b8c7e7966..78345e425264 xhci = ep->xhci; -@@ -899,27 +944,70 @@ static int xhci_invalidate_cancelled_tds(struct xhci_virt_ep *ep, +@@ -900,27 +945,70 @@ static int xhci_invalidate_cancelled_tds(struct xhci_virt_ep *ep, continue; } /* @@ -1627268,7 +1627164,7 @@ index b69b8c7e7966..78345e425264 /* * When we get a command completion for a Stop Endpoint Command, we need to * unlink any cancelled TDs from the ring. There are two ways to do that: -@@ -931,88 +1019,86 @@ static int xhci_invalidate_cancelled_tds(struct xhci_virt_ep *ep, +@@ -932,88 +1020,86 @@ static int xhci_invalidate_cancelled_tds(struct xhci_virt_ep *ep, * bit cleared) so that the HW will skip over them. */ static void xhci_handle_cmd_stop_ep(struct xhci_hcd *xhci, int slot_id, @@ -1627415,7 +1627311,7 @@ index b69b8c7e7966..78345e425264 } static void xhci_kill_ring_urbs(struct xhci_hcd *xhci, struct xhci_ring *ring) -@@ -1229,10 +1315,10 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, +@@ -1230,10 +1316,10 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, unsigned int ep_index; unsigned int stream_id; struct xhci_ring *ep_ring; @@ -1627427,7 +1627323,7 @@ index b69b8c7e7966..78345e425264 ep_index = TRB_TO_EP_INDEX(le32_to_cpu(trb->generic.field[3])); stream_id = TRB_TO_STREAM_ID(le32_to_cpu(trb->generic.field[2])); -@@ -1240,8 +1326,7 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, +@@ -1241,8 +1327,7 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, if (!ep) return; @@ -1627437,7 +1627333,7 @@ index b69b8c7e7966..78345e425264 if (!ep_ring) { xhci_warn(xhci, "WARN Set TR deq ptr command for freed stream ID %u\n", stream_id); -@@ -1249,8 +1334,8 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, +@@ -1250,8 +1335,8 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, goto cleanup; } @@ -1627448,7 +1627344,7 @@ index b69b8c7e7966..78345e425264 trace_xhci_handle_cmd_set_deq(slot_ctx); trace_xhci_handle_cmd_set_deq_ep(ep_ctx); -@@ -1303,7 +1388,7 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, +@@ -1304,7 +1389,7 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, /* Update the ring's dequeue segment and dequeue pointer * to reflect the new position. */ @@ -1627457,7 +1627353,7 @@ index b69b8c7e7966..78345e425264 ep_ring, ep_index); } else { xhci_warn(xhci, "Mismatch between completed Set TR Deq Ptr command & xHCI internal state.\n"); -@@ -1311,7 +1396,24 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, +@@ -1312,7 +1397,24 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, ep->queued_deq_seg, ep->queued_deq_ptr); } } @@ -1627483,7 +1627379,7 @@ index b69b8c7e7966..78345e425264 cleanup: ep->ep_state &= ~SET_DEQ_PENDING; ep->queued_deq_seg = NULL; -@@ -1323,7 +1425,6 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, +@@ -1324,7 +1426,6 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id, static void xhci_handle_cmd_reset_ep(struct xhci_hcd *xhci, int slot_id, union xhci_trb *trb, u32 cmd_comp_code) { @@ -1627491,7 +1627387,7 @@ index b69b8c7e7966..78345e425264 struct xhci_virt_ep *ep; struct xhci_ep_ctx *ep_ctx; unsigned int ep_index; -@@ -1333,8 +1434,7 @@ static void xhci_handle_cmd_reset_ep(struct xhci_hcd *xhci, int slot_id, +@@ -1334,8 +1435,7 @@ static void xhci_handle_cmd_reset_ep(struct xhci_hcd *xhci, int slot_id, if (!ep) return; @@ -1627501,7 +1627397,7 @@ index b69b8c7e7966..78345e425264 trace_xhci_handle_cmd_reset_ep(ep_ctx); /* This command will only fail if the endpoint wasn't halted, -@@ -1343,27 +1443,15 @@ static void xhci_handle_cmd_reset_ep(struct xhci_hcd *xhci, int slot_id, +@@ -1344,27 +1444,15 @@ static void xhci_handle_cmd_reset_ep(struct xhci_hcd *xhci, int slot_id, xhci_dbg_trace(xhci, trace_xhci_dbg_reset_ep, "Ignoring reset ep completion code of %u", cmd_comp_code); @@ -1627536,7 +1627432,7 @@ index b69b8c7e7966..78345e425264 /* if this was a soft reset, then restart */ if ((le32_to_cpu(trb->generic.field[3])) & TRB_TSP) -@@ -1397,7 +1485,7 @@ static void xhci_handle_cmd_disable_slot(struct xhci_hcd *xhci, int slot_id) +@@ -1398,7 +1486,7 @@ static void xhci_handle_cmd_disable_slot(struct xhci_hcd *xhci, int slot_id) } static void xhci_handle_cmd_config_ep(struct xhci_hcd *xhci, int slot_id, @@ -1627545,7 +1627441,7 @@ index b69b8c7e7966..78345e425264 { struct xhci_virt_device *virt_dev; struct xhci_input_control_ctx *ctrl_ctx; -@@ -1415,6 +1503,8 @@ static void xhci_handle_cmd_config_ep(struct xhci_hcd *xhci, int slot_id, +@@ -1416,6 +1504,8 @@ static void xhci_handle_cmd_config_ep(struct xhci_hcd *xhci, int slot_id, * is not waiting on the configure endpoint command. */ virt_dev = xhci->devs[slot_id]; @@ -1627554,7 +1627450,7 @@ index b69b8c7e7966..78345e425264 ctrl_ctx = xhci_get_input_control_ctx(virt_dev->in_ctx); if (!ctrl_ctx) { xhci_warn(xhci, "Could not get input context, bad type.\n"); -@@ -1459,24 +1549,27 @@ static void xhci_handle_cmd_addr_dev(struct xhci_hcd *xhci, int slot_id) +@@ -1460,24 +1550,27 @@ static void xhci_handle_cmd_addr_dev(struct xhci_hcd *xhci, int slot_id) struct xhci_slot_ctx *slot_ctx; vdev = xhci->devs[slot_id]; @@ -1627587,7 +1627483,7 @@ index b69b8c7e7966..78345e425264 } static void xhci_handle_cmd_nec_get_fw(struct xhci_hcd *xhci, -@@ -1569,7 +1662,7 @@ void xhci_handle_command_timeout(struct work_struct *work) +@@ -1570,7 +1663,7 @@ void xhci_handle_command_timeout(struct work_struct *work) static void handle_cmd_completion(struct xhci_hcd *xhci, struct xhci_event_cmd *event) { @@ -1627596,7 +1627492,7 @@ index b69b8c7e7966..78345e425264 u64 cmd_dma; dma_addr_t cmd_dequeue_dma; u32 cmd_comp_code; -@@ -1577,6 +1670,11 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, +@@ -1578,6 +1671,11 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, struct xhci_command *cmd; u32 cmd_type; @@ -1627608,7 +1627504,7 @@ index b69b8c7e7966..78345e425264 cmd_dma = le64_to_cpu(event->cmd_trb); cmd_trb = xhci->cmd_ring->dequeue; -@@ -1637,8 +1735,7 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, +@@ -1638,8 +1736,7 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, break; case TRB_CONFIG_EP: if (!cmd->completion) @@ -1627618,7 +1627514,7 @@ index b69b8c7e7966..78345e425264 break; case TRB_EVAL_CONTEXT: break; -@@ -1649,7 +1746,8 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, +@@ -1650,7 +1747,8 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, WARN_ON(slot_id != TRB_TO_SLOT_ID( le32_to_cpu(cmd_trb->generic.field[3]))); if (!cmd->completion) @@ -1627628,7 +1627524,7 @@ index b69b8c7e7966..78345e425264 break; case TRB_SET_DEQ: WARN_ON(slot_id != TRB_TO_SLOT_ID( -@@ -1672,7 +1770,7 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, +@@ -1673,7 +1771,7 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, */ slot_id = TRB_TO_SLOT_ID( le32_to_cpu(cmd_trb->generic.field[3])); @@ -1627637,7 +1627533,7 @@ index b69b8c7e7966..78345e425264 break; case TRB_NEC_GET_FW: xhci_handle_cmd_nec_get_fw(xhci, event); -@@ -1699,11 +1797,8 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, +@@ -1700,11 +1798,8 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, } static void handle_vendor_event(struct xhci_hcd *xhci, @@ -1627650,7 +1627546,7 @@ index b69b8c7e7966..78345e425264 xhci_dbg(xhci, "Vendor specific event TRB type = %u\n", trb_type); if (trb_type == TRB_NEC_CMD_COMP && (xhci->quirks & XHCI_NEC_HOST)) handle_cmd_completion(xhci, &event->event_cmd); -@@ -2067,18 +2162,52 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep, +@@ -2068,18 +2163,52 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep, ep_ctx = xhci_get_ep_ctx(xhci, ep->vdev->out_ctx, ep->ep_index); @@ -1627712,7 +1627608,7 @@ index b69b8c7e7966..78345e425264 /* * xhci internal endpoint state will go to a "halt" state for * any stall, including default control pipe protocol stall. -@@ -2089,19 +2218,23 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep, +@@ -2090,19 +2219,23 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep, * stall later. Hub TT buffer should only be cleared for FS/LS * devices behind HS hubs for functional stalls. */ @@ -1627744,7 +1627640,7 @@ index b69b8c7e7966..78345e425264 return xhci_td_cleanup(xhci, td, ep_ring, td->status); } -@@ -2429,7 +2562,6 @@ static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep, +@@ -2430,7 +2563,6 @@ static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep, static int handle_tx_event(struct xhci_hcd *xhci, struct xhci_transfer_event *event) { @@ -1627752,7 +1627648,7 @@ index b69b8c7e7966..78345e425264 struct xhci_virt_ep *ep; struct xhci_ring *ep_ring; unsigned int slot_id; -@@ -2456,9 +2588,8 @@ static int handle_tx_event(struct xhci_hcd *xhci, +@@ -2457,9 +2589,8 @@ static int handle_tx_event(struct xhci_hcd *xhci, goto err_out; } @@ -1627763,7 +1627659,7 @@ index b69b8c7e7966..78345e425264 if (GET_EP_CTX_STATE(ep_ctx) == EP_STATE_DISABLED) { xhci_err(xhci, -@@ -2536,7 +2667,6 @@ static int handle_tx_event(struct xhci_hcd *xhci, +@@ -2538,7 +2669,6 @@ static int handle_tx_event(struct xhci_hcd *xhci, case COMP_STALL_ERROR: xhci_dbg(xhci, "Stalled endpoint for slot %u ep %u\n", slot_id, ep_index); @@ -1627771,7 +1627667,7 @@ index b69b8c7e7966..78345e425264 status = -EPIPE; break; case COMP_SPLIT_TRANSACTION_ERROR: -@@ -2845,10 +2975,11 @@ static int handle_tx_event(struct xhci_hcd *xhci, +@@ -2847,10 +2977,11 @@ static int handle_tx_event(struct xhci_hcd *xhci, * Returns >0 for "possibly more events to process" (caller should call again), * otherwise 0 if done. In future, <0 returns should indicate error code. */ @@ -1627784,7 +1627680,7 @@ index b69b8c7e7966..78345e425264 int ret; /* Event ring hasn't been allocated yet. */ -@@ -2870,31 +3001,30 @@ static int xhci_handle_event(struct xhci_hcd *xhci) +@@ -2872,31 +3003,30 @@ static int xhci_handle_event(struct xhci_hcd *xhci) * speculative reads of the event's flags/data below. */ rmb(); @@ -1627826,7 +1627722,7 @@ index b69b8c7e7966..78345e425264 } /* Any of the above functions may drop and re-acquire the lock, so check * to make sure a watchdog timer didn't mark the host as non-responsive. -@@ -2914,13 +3044,14 @@ static int xhci_handle_event(struct xhci_hcd *xhci) +@@ -2916,13 +3046,14 @@ static int xhci_handle_event(struct xhci_hcd *xhci) */ return 1; } @@ -1627842,7 +1627738,7 @@ index b69b8c7e7966..78345e425264 union xhci_trb *event_ring_deq) { u64 temp_64; -@@ -2950,6 +3081,16 @@ static void xhci_update_erst_dequeue(struct xhci_hcd *xhci, +@@ -2952,6 +3083,16 @@ static void xhci_update_erst_dequeue(struct xhci_hcd *xhci, temp_64 |= ERST_EHB; xhci_write_64(xhci, temp_64, &xhci->ir_set->erst_dequeue); } @@ -1627859,7 +1627755,7 @@ index b69b8c7e7966..78345e425264 /* * xHCI spec says we can get an interrupt, and if the HC has an error condition, -@@ -2985,6 +3126,10 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd) +@@ -2987,6 +3128,10 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd) goto out; } @@ -1627870,7 +1627766,7 @@ index b69b8c7e7966..78345e425264 /* * Clear the op reg interrupt status first, * so we can receive interrupts from other MSI-X interrupters. -@@ -3077,6 +3222,7 @@ static int prepare_ring(struct xhci_hcd *xhci, struct xhci_ring *ep_ring, +@@ -3079,6 +3224,7 @@ static int prepare_ring(struct xhci_hcd *xhci, struct xhci_ring *ep_ring, u32 ep_state, unsigned int num_trbs, gfp_t mem_flags) { unsigned int num_trbs_needed; @@ -1627878,7 +1627774,7 @@ index b69b8c7e7966..78345e425264 /* Make sure the endpoint has been added to xHC schedule */ switch (ep_state) { -@@ -3147,7 +3293,19 @@ static int prepare_ring(struct xhci_hcd *xhci, struct xhci_ring *ep_ring, +@@ -3149,7 +3295,19 @@ static int prepare_ring(struct xhci_hcd *xhci, struct xhci_ring *ep_ring, ep_ring->enq_seg = ep_ring->enq_seg->next; ep_ring->enqueue = ep_ring->enq_seg->trbs; @@ -1627898,7 +1627794,7 @@ index b69b8c7e7966..78345e425264 return 0; } -@@ -3166,7 +3324,8 @@ static int prepare_transfer(struct xhci_hcd *xhci, +@@ -3168,7 +3326,8 @@ static int prepare_transfer(struct xhci_hcd *xhci, struct xhci_ring *ep_ring; struct xhci_ep_ctx *ep_ctx = xhci_get_ep_ctx(xhci, xdev->out_ctx, ep_index); @@ -1627908,7 +1627804,7 @@ index b69b8c7e7966..78345e425264 if (!ep_ring) { xhci_dbg(xhci, "Can't prepare ring for bad stream ID %u\n", stream_id); -@@ -3485,6 +3644,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags, +@@ -3487,6 +3646,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags, need_zero_pkt = true; td = &urb_priv->td[0]; @@ -1627916,7 +1627812,7 @@ index b69b8c7e7966..78345e425264 /* * Don't give the first TRB to the hardware (by toggling the cycle bit) -@@ -4283,71 +4443,7 @@ int xhci_queue_stop_endpoint(struct xhci_hcd *xhci, struct xhci_command *cmd, +@@ -4285,71 +4445,7 @@ int xhci_queue_stop_endpoint(struct xhci_hcd *xhci, struct xhci_command *cmd, return queue_command(xhci, cmd, 0, 0, 0, trb_slot_id | trb_ep_index | type | trb_suspend, false); } @@ -1627990,9 +1627886,7 @@ index b69b8c7e7966..78345e425264 int xhci_queue_reset_ep(struct xhci_hcd *xhci, struct xhci_command *cmd, int slot_id, unsigned int ep_index, diff --git a/drivers/usb/host/xhci-trace.c b/drivers/usb/host/xhci-trace.c -old mode 100644 -new mode 100755 -index d0070814d1ea..c4178357bd92 +index d0070814d..c4178357b 100644 --- a/drivers/usb/host/xhci-trace.c +++ b/drivers/usb/host/xhci-trace.c @@ -12,3 +12,6 @@ @@ -1628003,9 +1627897,7 @@ index d0070814d1ea..c4178357bd92 +EXPORT_TRACEPOINT_SYMBOL_GPL(xhci_handle_transfer); +EXPORT_TRACEPOINT_SYMBOL_GPL(xhci_urb_giveback); diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c -old mode 100644 -new mode 100755 -index b069fe3f8ab0..3f9596d36366 +index 19914d08f..430369ef6 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -21,7 +21,6 @@ @@ -1628334,7 +1628226,7 @@ index b069fe3f8ab0..3f9596d36366 /* FIXME: From section 4.3.4: "Software shall be responsible for timing * the SetAddress() "recovery interval" required by USB and aborting the * command on a timeout. -@@ -4304,10 +4266,11 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev, +@@ -4306,10 +4268,11 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev, return ret; } @@ -1628347,7 +1628239,7 @@ index b069fe3f8ab0..3f9596d36366 static int xhci_enable_device(struct usb_hcd *hcd, struct usb_device *udev) { -@@ -4367,6 +4330,14 @@ static int __maybe_unused xhci_change_max_exit_latency(struct xhci_hcd *xhci, +@@ -4369,6 +4332,14 @@ static int __maybe_unused xhci_change_max_exit_latency(struct xhci_hcd *xhci, return -ENOMEM; } @@ -1628362,7 +1628254,7 @@ index b069fe3f8ab0..3f9596d36366 xhci_slot_copy(xhci, command->in_ctx, virt_dev->out_ctx); spin_unlock_irqrestore(&xhci->lock, flags); -@@ -4391,6 +4362,30 @@ static int __maybe_unused xhci_change_max_exit_latency(struct xhci_hcd *xhci, +@@ -4393,6 +4364,30 @@ static int __maybe_unused xhci_change_max_exit_latency(struct xhci_hcd *xhci, return ret; } @@ -1628393,7 +1628285,7 @@ index b069fe3f8ab0..3f9596d36366 #ifdef CONFIG_PM /* BESL to HIRD Encoding array for USB2 LPM */ -@@ -5138,6 +5133,15 @@ int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev, +@@ -5140,6 +5135,15 @@ int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev, return -ENOMEM; } @@ -1628409,7 +1628301,7 @@ index b069fe3f8ab0..3f9596d36366 xhci_slot_copy(xhci, config_cmd->in_ctx, vdev->out_ctx); ctrl_ctx->add_flags |= cpu_to_le32(SLOT_FLAG); slot_ctx = xhci_get_slot_ctx(xhci, config_cmd->in_ctx); -@@ -5462,10 +5466,20 @@ void xhci_init_driver(struct hc_driver *drv, +@@ -5464,10 +5468,20 @@ void xhci_init_driver(struct hc_driver *drv, drv->reset = over->reset; if (over->start) drv->start = over->start; @@ -1628431,9 +1628323,7 @@ index b069fe3f8ab0..3f9596d36366 drv->update_hub_device = over->update_hub_device; } diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -old mode 100644 -new mode 100755 -index c7749f6e3474..06243f940bd4 +index c6e6d73fa..4c8d2adae 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1422,7 +1422,7 @@ union xhci_trb { @@ -1628596,7 +1628486,7 @@ index c7749f6e3474..06243f940bd4 * 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 b8e1109f0e0d..9cffdd43cf01 100644 +index b8e1109f0..9cffdd43c 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) @@ -1628611,7 +1628501,7 @@ index b8e1109f0e0d..9cffdd43cf01 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 20dcbccb290b..ede0d8c9b3d0 100644 +index 20dcbccb2..ede0d8c9b 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, @@ -1628628,7 +1628518,7 @@ index 20dcbccb290b..ede0d8c9b3d0 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 1f8c9b16a0fb..c22b026481f2 100644 +index 1f8c9b16a..c22b02648 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, @@ -1628671,9 +1628561,7 @@ index 1f8c9b16a0fb..c22b026481f2 100644 UNUSUAL_DEV(0x2109, 0x0711, 0x0000, 0x9999, "VIA", diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c -old mode 100644 -new mode 100755 -index 0d4b1c0eeefb..5021ea91075e +index def903e9d..3b9e34c6a 100644 --- a/drivers/usb/typec/altmodes/displayport.c +++ b/drivers/usb/typec/altmodes/displayport.c @@ -17,8 +17,8 @@ @@ -1628810,9 +1628698,7 @@ index 0d4b1c0eeefb..5021ea91075e dp->connector_fwnode = fwnode_find_reference(fwnode, "displayport", 0); if (IS_ERR(dp->connector_fwnode)) diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c -old mode 100644 -new mode 100755 -index 9d3a35b2046d..4fd17c662d15 +index dec83edb0..f72abe43c 100644 --- a/drivers/usb/typec/class.c +++ b/drivers/usb/typec/class.c @@ -11,6 +11,7 @@ @@ -1629008,7 +1628894,7 @@ index 9d3a35b2046d..4fd17c662d15 /* ------------------------------------------------------------------------- */ /* Alternate Modes */ -@@ -382,7 +508,7 @@ static umode_t typec_altmode_attr_is_visible(struct kobject *kobj, +@@ -384,7 +510,7 @@ static umode_t typec_altmode_attr_is_visible(struct kobject *kobj, return attr->mode; } @@ -1629017,7 +1628903,7 @@ index 9d3a35b2046d..4fd17c662d15 .is_visible = typec_altmode_attr_is_visible, .attrs = typec_altmode_attrs, }; -@@ -484,6 +610,10 @@ typec_register_altmode(struct device *parent, +@@ -490,6 +616,10 @@ typec_register_altmode(struct device *parent, if (is_typec_partner(parent)) alt->adev.dev.bus = &typec_bus; @@ -1629028,7 +1628914,7 @@ index 9d3a35b2046d..4fd17c662d15 ret = device_register(&alt->adev.dev); if (ret) { dev_err(parent, "failed to register alternate mode (%d)\n", -@@ -534,12 +664,61 @@ static ssize_t supports_usb_power_delivery_show(struct device *dev, +@@ -540,12 +670,61 @@ static ssize_t supports_usb_power_delivery_show(struct device *dev, } static DEVICE_ATTR_RO(supports_usb_power_delivery); @@ -1629091,7 +1628977,7 @@ index 9d3a35b2046d..4fd17c662d15 static void typec_partner_release(struct device *dev) { -@@ -572,6 +751,61 @@ int typec_partner_set_identity(struct typec_partner *partner) +@@ -578,6 +757,61 @@ int typec_partner_set_identity(struct typec_partner *partner) } EXPORT_SYMBOL_GPL(typec_partner_set_identity); @@ -1629153,7 +1629039,7 @@ index 9d3a35b2046d..4fd17c662d15 /** * typec_partner_register_altmode - Register USB Type-C Partner Alternate Mode * @partner: USB Type-C Partner that supports the alternate mode -@@ -592,6 +826,20 @@ typec_partner_register_altmode(struct typec_partner *partner, +@@ -598,6 +832,20 @@ typec_partner_register_altmode(struct typec_partner *partner, } EXPORT_SYMBOL_GPL(typec_partner_register_altmode); @@ -1629174,7 +1629060,7 @@ index 9d3a35b2046d..4fd17c662d15 /** * typec_register_partner - Register a USB Type-C Partner * @port: The USB Type-C Port the partner is connected to -@@ -614,6 +862,9 @@ struct typec_partner *typec_register_partner(struct typec_port *port, +@@ -620,6 +868,9 @@ struct typec_partner *typec_register_partner(struct typec_port *port, ida_init(&partner->mode_ids); partner->usb_pd = desc->usb_pd; partner->accessory = desc->accessory; @@ -1629184,7 +1629070,7 @@ index 9d3a35b2046d..4fd17c662d15 if (desc->identity) { /* -@@ -664,11 +915,70 @@ static void typec_plug_release(struct device *dev) +@@ -670,11 +921,70 @@ static void typec_plug_release(struct device *dev) kfree(plug); } @@ -1629255,7 +1629141,7 @@ index 9d3a35b2046d..4fd17c662d15 /** * typec_plug_register_altmode - Register USB Type-C Cable Plug Alternate Mode * @plug: USB Type-C Cable Plug that supports the alternate mode -@@ -714,6 +1024,7 @@ struct typec_plug *typec_register_plug(struct typec_cable *cable, +@@ -720,6 +1030,7 @@ struct typec_plug *typec_register_plug(struct typec_cable *cable, sprintf(name, "plug%d", desc->index); ida_init(&plug->mode_ids); @@ -1629263,7 +1629149,7 @@ index 9d3a35b2046d..4fd17c662d15 plug->index = desc->index; plug->dev.class = typec_class; plug->dev.parent = &cable->dev; -@@ -746,15 +1057,6 @@ EXPORT_SYMBOL_GPL(typec_unregister_plug); +@@ -752,15 +1063,6 @@ EXPORT_SYMBOL_GPL(typec_unregister_plug); /* Type-C Cables */ @@ -1629279,7 +1629165,7 @@ index 9d3a35b2046d..4fd17c662d15 static const char * const typec_plug_types[] = { [USB_PLUG_NONE] = "unknown", [USB_PLUG_TYPE_A] = "type-a", -@@ -775,6 +1077,7 @@ static DEVICE_ATTR_RO(plug_type); +@@ -781,6 +1083,7 @@ static DEVICE_ATTR_RO(plug_type); static struct attribute *typec_cable_attrs[] = { &dev_attr_type.attr, &dev_attr_plug_type.attr, @@ -1629287,7 +1629173,7 @@ index 9d3a35b2046d..4fd17c662d15 NULL }; ATTRIBUTE_GROUPS(typec_cable); -@@ -877,6 +1180,7 @@ struct typec_cable *typec_register_cable(struct typec_port *port, +@@ -883,6 +1186,7 @@ struct typec_cable *typec_register_cable(struct typec_port *port, cable->type = desc->type; cable->active = desc->active; @@ -1629295,7 +1629181,7 @@ index 9d3a35b2046d..4fd17c662d15 if (desc->identity) { /* -@@ -1246,11 +1550,23 @@ static ssize_t usb_power_delivery_revision_show(struct device *dev, +@@ -1252,11 +1556,23 @@ static ssize_t usb_power_delivery_revision_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -1629322,7 +1629208,7 @@ index 9d3a35b2046d..4fd17c662d15 static ssize_t orientation_show(struct device *dev, struct device_attribute *attr, -@@ -1311,7 +1627,7 @@ static umode_t typec_attr_is_visible(struct kobject *kobj, +@@ -1317,7 +1633,7 @@ static umode_t typec_attr_is_visible(struct kobject *kobj, return attr->mode; } @@ -1629331,7 +1629217,7 @@ index 9d3a35b2046d..4fd17c662d15 .is_visible = typec_attr_is_visible, .attrs = typec_attrs, }; -@@ -1354,6 +1670,11 @@ const struct device_type typec_port_dev_type = { +@@ -1360,6 +1676,11 @@ const struct device_type typec_port_dev_type = { /* --------------------------------------- */ /* Driver callbacks to report role updates */ @@ -1629343,7 +1629229,7 @@ index 9d3a35b2046d..4fd17c662d15 /** * typec_set_data_role - Report data role change * @port: The USB Type-C Port where the role was changed -@@ -1363,12 +1684,23 @@ const struct device_type typec_port_dev_type = { +@@ -1369,12 +1690,23 @@ const struct device_type typec_port_dev_type = { */ void typec_set_data_role(struct typec_port *port, enum typec_data_role role) { @@ -1629367,7 +1629253,7 @@ index 9d3a35b2046d..4fd17c662d15 } EXPORT_SYMBOL_GPL(typec_set_data_role); -@@ -1409,11 +1741,6 @@ void typec_set_vconn_role(struct typec_port *port, enum typec_role role) +@@ -1415,11 +1747,6 @@ void typec_set_vconn_role(struct typec_port *port, enum typec_role role) } EXPORT_SYMBOL_GPL(typec_set_vconn_role); @@ -1629379,7 +1629265,7 @@ index 9d3a35b2046d..4fd17c662d15 /** * typec_set_pwr_opmode - Report changed power operation mode * @port: The USB Type-C Port where the mode was changed -@@ -1584,6 +1911,33 @@ EXPORT_SYMBOL_GPL(typec_set_mode); +@@ -1590,6 +1917,33 @@ EXPORT_SYMBOL_GPL(typec_set_mode); /* --------------------------------------- */ @@ -1629413,7 +1629299,7 @@ index 9d3a35b2046d..4fd17c662d15 /** * typec_get_drvdata - Return private driver data pointer * @port: USB Type-C port -@@ -1625,6 +1979,62 @@ typec_port_register_altmode(struct typec_port *port, +@@ -1631,6 +1985,62 @@ typec_port_register_altmode(struct typec_port *port, } EXPORT_SYMBOL_GPL(typec_port_register_altmode); @@ -1629477,9 +1629363,7 @@ index 9d3a35b2046d..4fd17c662d15 * typec_register_port - Register a USB Type-C Port * @parent: Parent device diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c -old mode 100644 -new mode 100755 -index 1276112edeff..271e2740992f +index 1276112ed..271e27409 100644 --- a/drivers/usb/typec/mux/intel_pmc_mux.c +++ b/drivers/usb/typec/mux/intel_pmc_mux.c @@ -176,6 +176,7 @@ static int hsl_orientation(struct pmc_usb_port *port) @@ -1629536,9 +1629420,7 @@ index 1276112edeff..271e2740992f } diff --git a/drivers/usb/typec/tcpm/Kconfig b/drivers/usb/typec/tcpm/Kconfig -old mode 100644 -new mode 100755 -index 073fd2ea5e0b..82a6cd2b2493 +index 073fd2ea5..82a6cd2b2 100644 --- a/drivers/usb/typec/tcpm/Kconfig +++ b/drivers/usb/typec/tcpm/Kconfig @@ -20,6 +20,13 @@ config TYPEC_TCPCI @@ -1629556,9 +1629438,7 @@ index 073fd2ea5e0b..82a6cd2b2493 tristate "Richtek RT1711H Type-C chip driver" help diff --git a/drivers/usb/typec/tcpm/Makefile b/drivers/usb/typec/tcpm/Makefile -old mode 100644 -new mode 100755 -index 7d499f3569fd..d2ca41aea970 +index 7d499f356..d2ca41aea 100644 --- a/drivers/usb/typec/tcpm/Makefile +++ b/drivers/usb/typec/tcpm/Makefile @@ -4,6 +4,7 @@ obj-$(CONFIG_TYPEC_FUSB302) += fusb302.o @@ -1629570,9 +1629450,7 @@ index 7d499f3569fd..d2ca41aea970 obj-$(CONFIG_TYPEC_MT6360) += tcpci_mt6360.o obj-$(CONFIG_TYPEC_TCPCI_MAXIM) += tcpci_maxim.o diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c -old mode 100644 -new mode 100755 -index 700e38e92152..3b36e5353a94 +index 700e38e92..3b36e5353 100644 --- a/drivers/usb/typec/tcpm/fusb302.c +++ b/drivers/usb/typec/tcpm/fusb302.c @@ -343,12 +343,11 @@ static int fusb302_sw_reset(struct fusb302_chip *chip) @@ -1629650,9 +1629528,7 @@ index 700e38e92152..3b36e5353a94 spin_lock_irqsave(&chip->irq_lock, flags); if (chip->irq_while_suspended) { diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c -old mode 100644 -new mode 100755 -index 069affa5cb1e..fde55279da6d +index e34e46df8..5f1079932 100644 --- a/drivers/usb/typec/tcpm/tcpci.c +++ b/drivers/usb/typec/tcpm/tcpci.c @@ -18,7 +18,20 @@ @@ -1629867,7 +1629743,7 @@ index 069affa5cb1e..fde55279da6d ret = regmap_write(tcpci->regmap, TCPC_TRANSMIT, reg); if (ret < 0) return ret; -@@ -506,12 +631,22 @@ static int tcpci_init(struct tcpc_dev *tcpc) +@@ -510,12 +635,22 @@ static int tcpci_init(struct tcpc_dev *tcpc) TCPC_ALERT_RX_HARD_RST | TCPC_ALERT_CC_STATUS; if (tcpci->controls_vbus) reg |= TCPC_ALERT_POWER_STATUS; @@ -1629890,7 +1629766,7 @@ index 069affa5cb1e..fde55279da6d tcpci_read16(tcpci, TCPC_ALERT, &status); -@@ -527,15 +662,12 @@ irqreturn_t tcpci_irq(struct tcpci *tcpci) +@@ -531,15 +666,12 @@ irqreturn_t tcpci_irq(struct tcpci *tcpci) tcpm_cc_change(tcpci->port); if (status & TCPC_ALERT_POWER_STATUS) { @@ -1629908,7 +1629784,7 @@ index 069affa5cb1e..fde55279da6d tcpm_tcpc_reset(tcpci->port); else tcpm_vbus_change(tcpci->port); -@@ -574,6 +706,12 @@ irqreturn_t tcpci_irq(struct tcpci *tcpci) +@@ -578,6 +710,12 @@ irqreturn_t tcpci_irq(struct tcpci *tcpci) tcpm_pd_receive(tcpci->port, &msg); } @@ -1629921,7 +1629797,7 @@ index 069affa5cb1e..fde55279da6d if (status & TCPC_ALERT_RX_HARD_RST) tcpm_pd_hard_reset(tcpci->port); -@@ -633,6 +771,7 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data) +@@ -637,6 +775,7 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data) tcpci->tcpc.get_vbus = tcpci_get_vbus; tcpci->tcpc.set_vbus = tcpci_set_vbus; tcpci->tcpc.set_cc = tcpci_set_cc; @@ -1629929,7 +1629805,7 @@ index 069affa5cb1e..fde55279da6d tcpci->tcpc.get_cc = tcpci_get_cc; tcpci->tcpc.set_polarity = tcpci_set_polarity; tcpci->tcpc.set_vconn = tcpci_set_vconn; -@@ -643,6 +782,19 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data) +@@ -647,6 +786,19 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data) tcpci->tcpc.pd_transmit = tcpci_pd_transmit; tcpci->tcpc.set_bist_data = tcpci_set_bist_data; tcpci->tcpc.enable_frs = tcpci_enable_frs; @@ -1629950,9 +1629826,7 @@ index 069affa5cb1e..fde55279da6d err = tcpci_parse_config(tcpci); if (err < 0) diff --git a/drivers/usb/typec/tcpm/tcpci.h b/drivers/usb/typec/tcpm/tcpci.h -old mode 100644 -new mode 100755 -index 5ef07a56d67a..2be7a77d400e +index 95ce89139..fa9a07425 100644 --- a/drivers/usb/typec/tcpm/tcpci.h +++ b/drivers/usb/typec/tcpm/tcpci.h @@ -8,6 +8,8 @@ @@ -1630008,8 +1629882,8 @@ index 5ef07a56d67a..2be7a77d400e +#define TCPC_POWER_STATUS_SINKING_VBUS BIT(0) #define TCPC_FAULT_STATUS 0x1f - -@@ -114,6 +131,10 @@ + #define TCPC_FAULT_STATUS_ALL_REG_RST_TO_DEFAULT BIT(7) +@@ -115,6 +132,10 @@ #define TCPC_RX_DETECT 0x2f #define TCPC_RX_DETECT_HARD_RESET BIT(5) #define TCPC_RX_DETECT_SOP BIT(0) @@ -1630020,7 +1629894,7 @@ index 5ef07a56d67a..2be7a77d400e #define TCPC_RX_BYTE_CNT 0x30 #define TCPC_RX_BUF_FRAME_TYPE 0x31 -@@ -132,7 +153,11 @@ +@@ -133,7 +154,11 @@ #define TCPC_TX_DATA 0x54 /* through 0x6f */ #define TCPC_VBUS_VOLTAGE 0x70 @@ -1630032,7 +1629906,7 @@ index 5ef07a56d67a..2be7a77d400e #define TCPC_VBUS_STOP_DISCHARGE_THRESH 0x74 #define TCPC_VBUS_VOLTAGE_ALARM_HI_CFG 0x76 #define TCPC_VBUS_VOLTAGE_ALARM_LO_CFG 0x78 -@@ -140,20 +165,38 @@ +@@ -141,20 +166,38 @@ /* I2C_WRITE_BYTE_COUNT + 1 when TX_BUF_BYTE_x is only accessible I2C_WRITE_BYTE_COUNT */ #define TCPC_TRANSMIT_BUFFER_MAX_LEN 31 @@ -1630074,8 +1629948,8 @@ index 5ef07a56d67a..2be7a77d400e struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data); diff --git a/drivers/usb/typec/tcpm/tcpci_husb311.c b/drivers/usb/typec/tcpm/tcpci_husb311.c -new file mode 100755 -index 000000000000..72a524b5cc98 +new file mode 100644 +index 000000000..72a524b5c --- /dev/null +++ b/drivers/usb/typec/tcpm/tcpci_husb311.c @@ -0,0 +1,298 @@ @@ -1630378,9 +1630252,7 @@ index 000000000000..72a524b5cc98 +MODULE_DESCRIPTION("Husb311 USB Type-C Port Controller Interface Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/usb/typec/tcpm/tcpci_maxim.c b/drivers/usb/typec/tcpm/tcpci_maxim.c -old mode 100644 -new mode 100755 -index 723d7dd38f75..7b39cbd099c2 +index 723d7dd38..7b39cbd09 100644 --- a/drivers/usb/typec/tcpm/tcpci_maxim.c +++ b/drivers/usb/typec/tcpm/tcpci_maxim.c @@ -22,6 +22,9 @@ @@ -1630520,9 +1630392,7 @@ index 723d7dd38f75..7b39cbd099c2 }; MODULE_DEVICE_TABLE(of, max_tcpci_of_match); diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c -old mode 100644 -new mode 100755 -index cf0e6a80815a..e28c57d194a3 +index ac3953a0f..4eefc1e14 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -76,6 +76,8 @@ @@ -1631452,7 +1631322,7 @@ index cf0e6a80815a..e28c57d194a3 response[0] |= VDO_OPOS(adev->mode); rlen = 1; } -@@ -1411,19 +1883,26 @@ static void tcpm_handle_vdm_request(struct tcpm_port *port, +@@ -1412,19 +1884,26 @@ static void tcpm_handle_vdm_request(struct tcpm_port *port, if (rlen > 0) tcpm_queue_vdm(port, response[0], &response[1], rlen - 1); @@ -1631480,7 +1631350,7 @@ index cf0e6a80815a..e28c57d194a3 tcpm_queue_vdm(port, header, data, count); } -@@ -1456,7 +1935,8 @@ static unsigned int vdm_ready_timeout(u32 vdm_hdr) +@@ -1457,7 +1936,8 @@ static unsigned int vdm_ready_timeout(u32 vdm_hdr) static void vdm_run_state_machine(struct tcpm_port *port) { struct pd_message msg; @@ -1631490,7 +1631360,7 @@ index cf0e6a80815a..e28c57d194a3 switch (port->vdm_state) { case VDM_STATE_READY: -@@ -1470,37 +1950,68 @@ static void vdm_run_state_machine(struct tcpm_port *port) +@@ -1471,37 +1951,68 @@ static void vdm_run_state_machine(struct tcpm_port *port) * if there's traffic or we're not in PDO ready state don't send * a VDM. */ @@ -1631578,7 +1631448,7 @@ index cf0e6a80815a..e28c57d194a3 break; case VDM_STATE_ERR_SEND: /* -@@ -1513,6 +2024,32 @@ static void vdm_run_state_machine(struct tcpm_port *port) +@@ -1514,6 +2025,32 @@ static void vdm_run_state_machine(struct tcpm_port *port) tcpm_log(port, "VDM Tx error, retry"); port->vdm_retries++; port->vdm_state = VDM_STATE_READY; @@ -1631611,7 +1631481,7 @@ index cf0e6a80815a..e28c57d194a3 } break; default: -@@ -1535,7 +2072,11 @@ static void vdm_state_machine_work(struct kthread_work *work) +@@ -1536,7 +2073,11 @@ static void vdm_state_machine_work(struct kthread_work *work) prev_state = port->vdm_state; vdm_run_state_machine(port); } while (port->vdm_state != prev_state && @@ -1631624,7 +1631494,7 @@ index cf0e6a80815a..e28c57d194a3 mutex_unlock(&port->lock); } -@@ -1663,9 +2204,14 @@ static int tcpm_validate_caps(struct tcpm_port *port, const u32 *pdo, +@@ -1664,9 +2205,14 @@ static int tcpm_validate_caps(struct tcpm_port *port, const u32 *pdo, static int tcpm_altmode_enter(struct typec_altmode *altmode, u32 *vdo) { struct tcpm_port *port = typec_altmode_get_drvdata(altmode); @@ -1631640,7 +1631510,7 @@ index cf0e6a80815a..e28c57d194a3 header |= VDO_OPOS(altmode->mode); tcpm_queue_vdm_unlocked(port, header, vdo, vdo ? 1 : 0); -@@ -1675,9 +2221,14 @@ static int tcpm_altmode_enter(struct typec_altmode *altmode, u32 *vdo) +@@ -1676,9 +2222,14 @@ static int tcpm_altmode_enter(struct typec_altmode *altmode, u32 *vdo) static int tcpm_altmode_exit(struct typec_altmode *altmode) { struct tcpm_port *port = typec_altmode_get_drvdata(altmode); @@ -1631656,7 +1631526,7 @@ index cf0e6a80815a..e28c57d194a3 header |= VDO_OPOS(altmode->mode); tcpm_queue_vdm_unlocked(port, header, NULL, 0); -@@ -1722,20 +2273,108 @@ static void tcpm_handle_alert(struct tcpm_port *port, const __le32 *payload, +@@ -1723,20 +2274,108 @@ static void tcpm_handle_alert(struct tcpm_port *port, const __le32 *payload, if (!type) { tcpm_log(port, "Alert message received with no type"); @@ -1631772,7 +1631642,7 @@ index cf0e6a80815a..e28c57d194a3 } } -@@ -1746,15 +2385,18 @@ static void tcpm_pd_data_request(struct tcpm_port *port, +@@ -1747,15 +2386,18 @@ static void tcpm_pd_data_request(struct tcpm_port *port, unsigned int cnt = pd_header_cnt_le(msg->header); unsigned int rev = pd_header_rev_le(msg->header); unsigned int i; @@ -1631795,7 +1631665,7 @@ index cf0e6a80815a..e28c57d194a3 for (i = 0; i < cnt; i++) port->source_caps[i] = le32_to_cpu(msg->payload[i]); -@@ -1770,12 +2412,26 @@ static void tcpm_pd_data_request(struct tcpm_port *port, +@@ -1771,12 +2413,26 @@ static void tcpm_pd_data_request(struct tcpm_port *port, * to comply with 6.2.1.1.5 of the USB PD 3.0 spec. We don't * support Rev 1.0 so just do nothing in that scenario. */ @@ -1631823,7 +1631693,7 @@ index cf0e6a80815a..e28c57d194a3 /* * This message may be received even if VBUS is not * present. This is quite unexpected; see USB PD -@@ -1789,42 +2445,68 @@ static void tcpm_pd_data_request(struct tcpm_port *port, +@@ -1790,42 +2446,68 @@ static void tcpm_pd_data_request(struct tcpm_port *port, * but be prepared to keep waiting for VBUS after it was * handled. */ @@ -1631904,7 +1631774,7 @@ index cf0e6a80815a..e28c57d194a3 if (frs_enable) { ret = port->tcpc->enable_frs(port->tcpc, true); tcpm_log(port, "Enable FRS %s, ret:%d\n", ret ? "fail" : "success", ret); -@@ -1832,27 +2514,45 @@ static void tcpm_pd_data_request(struct tcpm_port *port, +@@ -1833,27 +2515,45 @@ static void tcpm_pd_data_request(struct tcpm_port *port, port->nr_sink_caps = cnt; port->sink_cap_done = true; @@ -1631958,7 +1631828,7 @@ index cf0e6a80815a..e28c57d194a3 break; } } -@@ -1872,31 +2572,25 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, +@@ -1873,31 +2573,25 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, enum pd_ctrl_msg_type type = pd_header_type_le(msg->header); enum tcpm_state next_state; @@ -1632002,7 +1631872,7 @@ index cf0e6a80815a..e28c57d194a3 break; case PD_CTRL_GOTO_MIN: break; -@@ -1908,6 +2602,10 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, +@@ -1909,6 +2603,10 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, port->req_current_limit, port->req_supply_voltage); port->explicit_contract = true; @@ -1632013,7 +1631883,7 @@ index cf0e6a80815a..e28c57d194a3 tcpm_set_state(port, SNK_READY, 0); } else { /* -@@ -1931,6 +2629,11 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, +@@ -1932,6 +2630,11 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, tcpm_set_state(port, FR_SWAP_SNK_SRC_NEW_SINK_READY, 0); break; default: @@ -1632025,7 +1631895,7 @@ index cf0e6a80815a..e28c57d194a3 break; } break; -@@ -1944,6 +2647,11 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, +@@ -1945,6 +2648,11 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, next_state = SNK_READY; else next_state = SNK_WAIT_CAPABILITIES; @@ -1632037,7 +1631907,7 @@ index cf0e6a80815a..e28c57d194a3 tcpm_set_state(port, next_state, 0); break; case SNK_NEGOTIATE_PPS_CAPABILITIES: -@@ -1952,6 +2660,12 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, +@@ -1953,6 +2661,12 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, port->pps_data.req_op_curr = port->current_limit; port->pps_status = (type == PD_CTRL_WAIT ? -EAGAIN : -EOPNOTSUPP); @@ -1632050,7 +1631920,7 @@ index cf0e6a80815a..e28c57d194a3 tcpm_set_state(port, SNK_READY, 0); break; case DR_SWAP_SEND: -@@ -1976,7 +2690,22 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, +@@ -1977,7 +2691,22 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, port->sink_cap_done = true; tcpm_set_state(port, ready_state(port), 0); break; @@ -1632073,7 +1631943,7 @@ index cf0e6a80815a..e28c57d194a3 break; } break; -@@ -1997,13 +2726,14 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, +@@ -1998,13 +2727,14 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, tcpm_set_state(port, SNK_TRANSITION_SINK, 0); break; case SOFT_RESET_SEND: @@ -1632095,7 +1631965,7 @@ index cf0e6a80815a..e28c57d194a3 break; case DR_SWAP_SEND: tcpm_set_state(port, DR_SWAP_CHANGE_DR, 0); -@@ -2018,57 +2748,62 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, +@@ -2019,57 +2749,62 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, tcpm_set_state(port, FR_SWAP_SNK_SRC_TRANSITION_TO_OFF, 0); break; default: @@ -1632187,7 +1632057,7 @@ index cf0e6a80815a..e28c57d194a3 break; case PD_CTRL_GET_SOURCE_CAP_EXT: case PD_CTRL_GET_STATUS: -@@ -2076,10 +2811,19 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, +@@ -2077,10 +2812,19 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, case PD_CTRL_GET_PPS_STATUS: case PD_CTRL_GET_COUNTRY_CODES: /* Currently not supported */ @@ -1632209,7 +1632079,7 @@ index cf0e6a80815a..e28c57d194a3 break; } } -@@ -2090,34 +2834,37 @@ static void tcpm_pd_ext_msg_request(struct tcpm_port *port, +@@ -2091,34 +2835,37 @@ static void tcpm_pd_ext_msg_request(struct tcpm_port *port, enum pd_ext_msg_type type = pd_header_type_le(msg->header); unsigned int data_size = pd_ext_header_data_size_le(msg->ext_msg.header); @@ -1632263,7 +1632133,7 @@ index cf0e6a80815a..e28c57d194a3 break; case PD_EXT_SOURCE_CAP_EXT: case PD_EXT_GET_BATT_CAP: -@@ -2131,10 +2878,11 @@ static void tcpm_pd_ext_msg_request(struct tcpm_port *port, +@@ -2132,10 +2879,11 @@ static void tcpm_pd_ext_msg_request(struct tcpm_port *port, case PD_EXT_FW_UPDATE_RESPONSE: case PD_EXT_COUNTRY_INFO: case PD_EXT_COUNTRY_CODES: @@ -1632277,7 +1632147,7 @@ index cf0e6a80815a..e28c57d194a3 break; } } -@@ -2179,7 +2927,7 @@ static void tcpm_pd_rx_handler(struct kthread_work *work) +@@ -2180,7 +2928,7 @@ static void tcpm_pd_rx_handler(struct kthread_work *work) "Data role mismatch, initiating error recovery"); tcpm_set_state(port, ERROR_RECOVERY, 0); } else { @@ -1632286,7 +1632156,7 @@ index cf0e6a80815a..e28c57d194a3 tcpm_pd_ext_msg_request(port, msg); else if (cnt) tcpm_pd_data_request(port, msg); -@@ -2230,6 +2978,7 @@ static int tcpm_pd_send_control(struct tcpm_port *port, +@@ -2231,6 +2979,7 @@ static int tcpm_pd_send_control(struct tcpm_port *port, static bool tcpm_send_queued_message(struct tcpm_port *port) { enum pd_msg_request queued_message; @@ -1632294,7 +1632164,7 @@ index cf0e6a80815a..e28c57d194a3 do { queued_message = port->queued_message; -@@ -2246,10 +2995,27 @@ static bool tcpm_send_queued_message(struct tcpm_port *port) +@@ -2247,10 +2996,27 @@ static bool tcpm_send_queued_message(struct tcpm_port *port) tcpm_pd_send_control(port, PD_CTRL_NOT_SUPP); break; case PD_MSG_DATA_SINK_CAP: @@ -1632324,7 +1632194,7 @@ index cf0e6a80815a..e28c57d194a3 break; default: break; -@@ -2615,6 +3381,12 @@ static int tcpm_pd_send_request(struct tcpm_port *port) +@@ -2616,6 +3382,12 @@ static int tcpm_pd_send_request(struct tcpm_port *port) if (ret < 0) return ret; @@ -1632337,7 +1632207,7 @@ index cf0e6a80815a..e28c57d194a3 memset(&msg, 0, sizeof(msg)); msg.header = PD_HEADER_LE(PD_DATA_REQUEST, port->pwr_role, -@@ -2712,6 +3484,9 @@ static int tcpm_pd_send_pps_request(struct tcpm_port *port) +@@ -2713,6 +3485,9 @@ static int tcpm_pd_send_pps_request(struct tcpm_port *port) if (ret < 0) return ret; @@ -1632347,7 +1632217,7 @@ index cf0e6a80815a..e28c57d194a3 memset(&msg, 0, sizeof(msg)); msg.header = PD_HEADER_LE(PD_DATA_REQUEST, port->pwr_role, -@@ -2771,13 +3546,6 @@ static bool tcpm_start_toggling(struct tcpm_port *port, enum typec_cc_status cc) +@@ -2772,13 +3547,6 @@ static bool tcpm_start_toggling(struct tcpm_port *port, enum typec_cc_status cc) return ret == 0; } @@ -1632361,7 +1632231,7 @@ index cf0e6a80815a..e28c57d194a3 static int tcpm_init_vbus(struct tcpm_port *port) { int ret; -@@ -2829,8 +3597,9 @@ static int tcpm_src_attach(struct tcpm_port *port) +@@ -2830,8 +3598,9 @@ static int tcpm_src_attach(struct tcpm_port *port) if (ret < 0) return ret; @@ -1632373,7 +1632243,7 @@ index cf0e6a80815a..e28c57d194a3 if (ret < 0) return ret; -@@ -2859,6 +3628,7 @@ static int tcpm_src_attach(struct tcpm_port *port) +@@ -2860,6 +3629,7 @@ static int tcpm_src_attach(struct tcpm_port *port) port->partner = NULL; port->attached = true; @@ -1632381,7 +1632251,7 @@ index cf0e6a80815a..e28c57d194a3 port->send_discover = true; return 0; -@@ -2895,13 +3665,26 @@ static void tcpm_unregister_altmodes(struct tcpm_port *port) +@@ -2896,13 +3666,26 @@ static void tcpm_unregister_altmodes(struct tcpm_port *port) memset(modep, 0, sizeof(*modep)); } @@ -1632408,7 +1632278,7 @@ index cf0e6a80815a..e28c57d194a3 /* * First Rx ID should be 0; set this to a sentinel of -1 so that -@@ -2960,8 +3743,9 @@ static int tcpm_snk_attach(struct tcpm_port *port) +@@ -2961,8 +3744,9 @@ static int tcpm_snk_attach(struct tcpm_port *port) if (ret < 0) return ret; @@ -1632420,7 +1632290,7 @@ index cf0e6a80815a..e28c57d194a3 if (ret < 0) return ret; -@@ -2970,6 +3754,7 @@ static int tcpm_snk_attach(struct tcpm_port *port) +@@ -2971,6 +3755,7 @@ static int tcpm_snk_attach(struct tcpm_port *port) port->partner = NULL; port->attached = true; @@ -1632428,7 +1632298,7 @@ index cf0e6a80815a..e28c57d194a3 port->send_discover = true; return 0; -@@ -2997,6 +3782,7 @@ static int tcpm_acc_attach(struct tcpm_port *port) +@@ -2998,6 +3783,7 @@ static int tcpm_acc_attach(struct tcpm_port *port) tcpm_typec_connect(port); port->attached = true; @@ -1632436,7 +1632306,7 @@ index cf0e6a80815a..e28c57d194a3 return 0; } -@@ -3033,14 +3819,15 @@ static inline enum tcpm_state unattached_state(struct tcpm_port *port) +@@ -3034,14 +3820,15 @@ static inline enum tcpm_state unattached_state(struct tcpm_port *port) return SNK_UNATTACHED; } @@ -1632458,7 +1632328,7 @@ index cf0e6a80815a..e28c57d194a3 static void tcpm_swap_complete(struct tcpm_port *port, int result) { -@@ -3069,7 +3856,11 @@ static void run_state_machine(struct tcpm_port *port) +@@ -3070,7 +3857,11 @@ static void run_state_machine(struct tcpm_port *port) { int ret; enum typec_pwr_opmode opmode; @@ -1632471,7 +1632341,7 @@ index cf0e6a80815a..e28c57d194a3 port->enter_state = port->state; switch (port->state) { -@@ -3080,6 +3871,15 @@ static void run_state_machine(struct tcpm_port *port) +@@ -3081,6 +3872,15 @@ static void run_state_machine(struct tcpm_port *port) if (!port->non_pd_role_swap) tcpm_swap_complete(port, -ENOTCONN); tcpm_src_detach(port); @@ -1632487,7 +1632357,7 @@ index cf0e6a80815a..e28c57d194a3 if (tcpm_start_toggling(port, tcpm_rp_cc(port))) { tcpm_set_state(port, TOGGLING, 0); break; -@@ -3103,6 +3903,7 @@ static void run_state_machine(struct tcpm_port *port) +@@ -3104,6 +3904,7 @@ static void run_state_machine(struct tcpm_port *port) break; case SNK_TRY: @@ -1632495,7 +1632365,7 @@ index cf0e6a80815a..e28c57d194a3 port->try_snk_count++; /* * Requirements: -@@ -3125,15 +3926,13 @@ static void run_state_machine(struct tcpm_port *port) +@@ -3126,15 +3927,13 @@ static void run_state_machine(struct tcpm_port *port) break; case SNK_TRY_WAIT_DEBOUNCE: tcpm_set_state(port, SNK_TRY_WAIT_DEBOUNCE_CHECK_VBUS, @@ -1632514,7 +1632384,7 @@ index cf0e6a80815a..e28c57d194a3 break; case SRC_TRYWAIT: tcpm_set_cc(port, tcpm_rp_cc(port)); -@@ -3172,7 +3971,12 @@ static void run_state_machine(struct tcpm_port *port) +@@ -3173,7 +3972,12 @@ static void run_state_machine(struct tcpm_port *port) port->message_id = 0; port->rx_msgid = -1; port->explicit_contract = false; @@ -1632528,7 +1632398,7 @@ index cf0e6a80815a..e28c57d194a3 break; case SRC_SEND_CAPABILITIES: port->caps_count++; -@@ -3233,6 +4037,8 @@ static void run_state_machine(struct tcpm_port *port) +@@ -3234,6 +4038,8 @@ static void run_state_machine(struct tcpm_port *port) } } else { tcpm_pd_send_control(port, PD_CTRL_ACCEPT); @@ -1632537,7 +1632407,7 @@ index cf0e6a80815a..e28c57d194a3 tcpm_set_state(port, SRC_TRANSITION_SUPPLY, PD_T_SRC_TRANSITION); } -@@ -3254,7 +4060,36 @@ static void run_state_machine(struct tcpm_port *port) +@@ -3255,7 +4061,36 @@ static void run_state_machine(struct tcpm_port *port) tcpm_swap_complete(port, 0); tcpm_typec_connect(port); @@ -1632575,7 +1632445,7 @@ index cf0e6a80815a..e28c57d194a3 /* * 6.3.5 * Sending ping messages is not necessary if -@@ -3279,6 +4114,15 @@ static void run_state_machine(struct tcpm_port *port) +@@ -3280,6 +4115,15 @@ static void run_state_machine(struct tcpm_port *port) tcpm_swap_complete(port, -ENOTCONN); tcpm_pps_complete(port, -ENOTCONN); tcpm_snk_detach(port); @@ -1632591,7 +1632461,7 @@ index cf0e6a80815a..e28c57d194a3 if (tcpm_start_toggling(port, TYPEC_CC_RD)) { tcpm_set_state(port, TOGGLING, 0); break; -@@ -3299,14 +4143,18 @@ static void run_state_machine(struct tcpm_port *port) +@@ -3300,14 +4144,18 @@ static void run_state_machine(struct tcpm_port *port) PD_T_PD_DEBOUNCE); break; case SNK_DEBOUNCED: @@ -1632613,9 +1632483,7 @@ index cf0e6a80815a..e28c57d194a3 case SRC_TRY: port->try_src_count++; diff --git a/drivers/usb/typec/tcpm/wcove.c b/drivers/usb/typec/tcpm/wcove.c -old mode 100644 -new mode 100755 -index 7e9c279bf49d..5d125339687a +index 7e9c279bf..5d1253396 100644 --- a/drivers/usb/typec/tcpm/wcove.c +++ b/drivers/usb/typec/tcpm/wcove.c @@ -356,7 +356,8 @@ static int wcove_set_pd_rx(struct tcpc_dev *tcpc, bool on) @@ -1632629,9 +1632497,7 @@ index 7e9c279bf49d..5d125339687a struct wcove_typec *wcove = tcpc_to_wcove(tcpc); unsigned int info = 0; diff --git a/drivers/usb/typec/ucsi/Kconfig b/drivers/usb/typec/ucsi/Kconfig -old mode 100644 -new mode 100755 -index 2192d7c4fec7..5e9b37b3f25e +index 2192d7c4f..5e9b37b3f 100644 --- a/drivers/usb/typec/ucsi/Kconfig +++ b/drivers/usb/typec/ucsi/Kconfig @@ -3,6 +3,7 @@ @@ -1632643,9 +1632509,7 @@ index 2192d7c4fec7..5e9b37b3f25e USB Type-C Connector System Software Interface (UCSI) is a specification for an interface that allows the operating system to diff --git a/drivers/usb/typec/ucsi/displayport.c b/drivers/usb/typec/ucsi/displayport.c -old mode 100644 -new mode 100755 -index 261131c9e37c..73cd5bf35047 +index 261131c9e..73cd5bf35 100644 --- a/drivers/usb/typec/ucsi/displayport.c +++ b/drivers/usb/typec/ucsi/displayport.c @@ -49,6 +49,7 @@ static int ucsi_displayport_enter(struct typec_altmode *alt, u32 *vdo) @@ -1632725,9 +1632589,7 @@ index 261131c9e37c..73cd5bf35047 switch (cmd) { diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c -old mode 100644 -new mode 100755 -index cd3689005c31..8ed0f49e6df8 +index cd3689005..8ed0f49e6 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -613,6 +613,7 @@ static void ucsi_unregister_partner(struct ucsi_connector *con) @@ -1632869,9 +1632731,7 @@ index cd3689005c31..8ed0f49e6df8 ret = ucsi_register_altmodes(con, UCSI_RECIPIENT_SOP); if (ret) { diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h -old mode 100644 -new mode 100755 -index fce23ad16c6d..b3450d87f324 +index fce23ad16..b3450d87f 100644 --- a/drivers/usb/typec/ucsi/ucsi.h +++ b/drivers/usb/typec/ucsi/ucsi.h @@ -9,6 +9,8 @@ @@ -1632893,7 +1632753,7 @@ index fce23ad16c6d..b3450d87f324 int ucsi_send_command(struct ucsi *ucsi, u64 command, diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig -index 427a993c7f57..e4c52ca82e88 100644 +index 427a993c7..e4c52ca82 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -18,6 +18,7 @@ source "drivers/gpu/host1x/Kconfig" @@ -1632916,7 +1632776,7 @@ index 427a993c7f57..e4c52ca82e88 100644 tristate default n diff --git a/drivers/video/Makefile b/drivers/video/Makefile -index df7650adede9..b355e2fcb423 100644 +index df7650ade..b355e2fcb 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -6,6 +6,7 @@ obj-$(CONFIG_VT) += console/ @@ -1632928,7 +1632788,7 @@ index df7650adede9..b355e2fcb423 100644 obj-y += fbdev/ diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c -index 1cf924f3aecc..cd3676b96fb0 100644 +index 1cf924f3a..cd3676b96 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) @@ -1632941,8 +1632801,8 @@ index 1cf924f3aecc..cd3676b96fb0 100644 pb->scale)); diff --git a/drivers/video/rockchip/Kconfig b/drivers/video/rockchip/Kconfig -new file mode 100755 -index 000000000000..6548dd38b534 +new file mode 100644 +index 000000000..6548dd38b --- /dev/null +++ b/drivers/video/rockchip/Kconfig @@ -0,0 +1,11 @@ @@ -1632958,8 +1632818,8 @@ index 000000000000..6548dd38b534 +source "drivers/video/rockchip/vehicle/Kconfig" +source "drivers/video/rockchip/vtunnel/Kconfig" diff --git a/drivers/video/rockchip/Makefile b/drivers/video/rockchip/Makefile -new file mode 100755 -index 000000000000..867ac56fe5b7 +new file mode 100644 +index 000000000..867ac56fe --- /dev/null +++ b/drivers/video/rockchip/Makefile @@ -0,0 +1,11 @@ @@ -1632976,7 +1632836,7 @@ index 000000000000..867ac56fe5b7 +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 000000000000..bfbd396b2706 +index 000000000..bfbd396b2 --- /dev/null +++ b/drivers/video/rockchip/dvbm/Kconfig @@ -0,0 +1,18 @@ @@ -1633000,7 +1632860,7 @@ index 000000000000..bfbd396b2706 +endif diff --git a/drivers/video/rockchip/dvbm/Makefile b/drivers/video/rockchip/dvbm/Makefile new file mode 100644 -index 000000000000..9096c34720ec +index 000000000..9096c3472 --- /dev/null +++ b/drivers/video/rockchip/dvbm/Makefile @@ -0,0 +1,5 @@ @@ -1633011,7 +1632871,7 @@ index 000000000000..9096c34720ec +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 000000000000..abff28da714e +index 000000000..abff28da7 --- /dev/null +++ b/drivers/video/rockchip/dvbm/rockchip_dvbm.c @@ -0,0 +1,752 @@ @@ -1633769,7 +1633629,7 @@ index 000000000000..abff28da714e +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 000000000000..9f298b7dd47d +index 000000000..9f298b7dd --- /dev/null +++ b/drivers/video/rockchip/dvbm/rockchip_dvbm.h @@ -0,0 +1,214 @@ @@ -1633988,8 +1633848,8 @@ index 000000000000..9f298b7dd47d + +#endif diff --git a/drivers/video/rockchip/iep/Kconfig b/drivers/video/rockchip/iep/Kconfig -new file mode 100755 -index 000000000000..cd8ba653f9ea +new file mode 100644 +index 000000000..cd8ba653f --- /dev/null +++ b/drivers/video/rockchip/iep/Kconfig @@ -0,0 +1,10 @@ @@ -1634004,8 +1633864,8 @@ index 000000000000..cd8ba653f9ea + +endmenu diff --git a/drivers/video/rockchip/iep/Makefile b/drivers/video/rockchip/iep/Makefile -new file mode 100755 -index 000000000000..f4dba6e9379a +new file mode 100644 +index 000000000..f4dba6e93 --- /dev/null +++ b/drivers/video/rockchip/iep/Makefile @@ -0,0 +1,4 @@ @@ -1634014,8 +1633874,8 @@ index 000000000000..f4dba6e9379a +iep-$(CONFIG_DRM) += iep_iommu_drm.o +obj-$(CONFIG_IEP) += iep.o diff --git a/drivers/video/rockchip/iep/hw_iep_config_addr.h b/drivers/video/rockchip/iep/hw_iep_config_addr.h -new file mode 100755 -index 000000000000..1f4a0706233f +new file mode 100644 +index 000000000..1f4a07062 --- /dev/null +++ b/drivers/video/rockchip/iep/hw_iep_config_addr.h @@ -0,0 +1,99 @@ @@ -1634119,8 +1633979,8 @@ index 000000000000..1f4a0706233f + +#endif diff --git a/drivers/video/rockchip/iep/hw_iep_reg.c b/drivers/video/rockchip/iep/hw_iep_reg.c -new file mode 100755 -index 000000000000..331a50865045 +new file mode 100644 +index 000000000..331a50865 --- /dev/null +++ b/drivers/video/rockchip/iep/hw_iep_reg.c @@ -0,0 +1,1530 @@ @@ -1635655,8 +1635515,8 @@ index 000000000000..331a50865045 +} + diff --git a/drivers/video/rockchip/iep/hw_iep_reg.h b/drivers/video/rockchip/iep/hw_iep_reg.h -new file mode 100755 -index 000000000000..03d9fe92ca23 +new file mode 100644 +index 000000000..03d9fe92c --- /dev/null +++ b/drivers/video/rockchip/iep/hw_iep_reg.h @@ -0,0 +1,525 @@ @@ -1636186,8 +1636046,8 @@ index 000000000000..03d9fe92ca23 +/*#define IEP_PRINT_INFO*/ +#endif diff --git a/drivers/video/rockchip/iep/iep.h b/drivers/video/rockchip/iep/iep.h -new file mode 100755 -index 000000000000..94e372e6a471 +new file mode 100644 +index 000000000..94e372e6a --- /dev/null +++ b/drivers/video/rockchip/iep/iep.h @@ -0,0 +1,276 @@ @@ -1636468,8 +1636328,8 @@ index 000000000000..94e372e6a471 + +#endif diff --git a/drivers/video/rockchip/iep/iep_drv.c b/drivers/video/rockchip/iep/iep_drv.c -new file mode 100755 -index 000000000000..f0cfc7164e39 +new file mode 100644 +index 000000000..f0cfc7164 --- /dev/null +++ b/drivers/video/rockchip/iep/iep_drv.c @@ -0,0 +1,1320 @@ @@ -1637794,8 +1637654,8 @@ index 000000000000..f0cfc7164e39 + +#endif diff --git a/drivers/video/rockchip/iep/iep_drv.h b/drivers/video/rockchip/iep/iep_drv.h -new file mode 100755 -index 000000000000..19160c6ffccd +new file mode 100644 +index 000000000..19160c6ff --- /dev/null +++ b/drivers/video/rockchip/iep/iep_drv.h @@ -0,0 +1,159 @@ @@ -1637959,8 +1637819,8 @@ index 000000000000..19160c6ffccd +#endif + diff --git a/drivers/video/rockchip/iep/iep_iommu_drm.c b/drivers/video/rockchip/iep/iep_iommu_drm.c -new file mode 100755 -index 000000000000..411f567a6e4e +new file mode 100644 +index 000000000..411f567a6 --- /dev/null +++ b/drivers/video/rockchip/iep/iep_iommu_drm.c @@ -0,0 +1,465 @@ @@ -1638430,8 +1638290,8 @@ index 000000000000..411f567a6e4e + iommu_info->ops = &drm_ops; +} diff --git a/drivers/video/rockchip/iep/iep_iommu_ops.c b/drivers/video/rockchip/iep/iep_iommu_ops.c -new file mode 100755 -index 000000000000..e84772237b89 +new file mode 100644 +index 000000000..e84772237 --- /dev/null +++ b/drivers/video/rockchip/iep/iep_iommu_ops.c @@ -0,0 +1,244 @@ @@ -1638680,8 +1638540,8 @@ index 000000000000..e84772237b89 + return 0; +} diff --git a/drivers/video/rockchip/iep/iep_iommu_ops.h b/drivers/video/rockchip/iep/iep_iommu_ops.h -new file mode 100755 -index 000000000000..9b71d53a51eb +new file mode 100644 +index 000000000..9b71d53a5 --- /dev/null +++ b/drivers/video/rockchip/iep/iep_iommu_ops.h @@ -0,0 +1,121 @@ @@ -1638807,8 +1638667,8 @@ index 000000000000..9b71d53a51eb + +#endif diff --git a/drivers/video/rockchip/mpp/Kconfig b/drivers/video/rockchip/mpp/Kconfig -new file mode 100755 -index 000000000000..53342703a6ee +new file mode 100644 +index 000000000..53342703a --- /dev/null +++ b/drivers/video/rockchip/mpp/Kconfig @@ -0,0 +1,78 @@ @@ -1638891,8 +1638751,8 @@ index 000000000000..53342703a6ee + +endif diff --git a/drivers/video/rockchip/mpp/Makefile b/drivers/video/rockchip/mpp/Makefile -new file mode 100755 -index 000000000000..42ec696bc9d7 +new file mode 100644 +index 000000000..42ec696bc --- /dev/null +++ b/drivers/video/rockchip/mpp/Makefile @@ -0,0 +1,30 @@ @@ -1638927,8 +1638787,8 @@ index 000000000000..42ec696bc9d7 + +obj-$(CONFIG_ROCKCHIP_MPP_SERVICE) += rk_vcodec.o diff --git a/drivers/video/rockchip/mpp/hack/mpp_hack_px30.c b/drivers/video/rockchip/mpp/hack/mpp_hack_px30.c -new file mode 100755 -index 000000000000..07912bcc3436 +new file mode 100644 +index 000000000..07912bcc3 --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_hack_px30.c @@ -0,0 +1,241 @@ @@ -1639174,8 +1639034,8 @@ index 000000000000..07912bcc3436 + return ret; +} diff --git a/drivers/video/rockchip/mpp/hack/mpp_hack_px30.h b/drivers/video/rockchip/mpp/hack/mpp_hack_px30.h -new file mode 100755 -index 000000000000..c8402e30d810 +new file mode 100644 +index 000000000..c8402e30d --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_hack_px30.h @@ -0,0 +1,27 @@ @@ -1639207,8 +1639067,8 @@ index 000000000000..c8402e30d810 + +#endif diff --git a/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_hack_rk3568.c b/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_hack_rk3568.c -new file mode 100755 -index 000000000000..c2bb2687fc3d +new file mode 100644 +index 000000000..c2bb2687f --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_hack_rk3568.c @@ -0,0 +1,732 @@ @@ -1639945,8 +1639805,8 @@ index 000000000000..c2bb2687fc3d + local_irq_restore(flags); +} diff --git a/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_link_hack_rk3568.c b/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_link_hack_rk3568.c -new file mode 100755 -index 000000000000..900b63a57673 +new file mode 100644 +index 000000000..900b63a57 --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_link_hack_rk3568.c @@ -0,0 +1,213 @@ @@ -1640165,7 +1640025,7 @@ index 000000000000..900b63a57673 +} diff --git a/drivers/video/rockchip/mpp/mpp_av1dec.c b/drivers/video/rockchip/mpp/mpp_av1dec.c new file mode 100644 -index 000000000000..33e118ae6450 +index 000000000..33e118ae6 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_av1dec.c @@ -0,0 +1,1343 @@ @@ -1641513,8 +1641373,8 @@ index 000000000000..33e118ae6450 + }, +}; diff --git a/drivers/video/rockchip/mpp/mpp_common.c b/drivers/video/rockchip/mpp/mpp_common.c -new file mode 100755 -index 000000000000..d43ebf450ed2 +new file mode 100644 +index 000000000..d43ebf450 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_common.c @@ -0,0 +1,2610 @@ @@ -1644129,8 +1643989,8 @@ index 000000000000..d43ebf450ed2 +} +#endif diff --git a/drivers/video/rockchip/mpp/mpp_common.h b/drivers/video/rockchip/mpp/mpp_common.h -new file mode 100755 -index 000000000000..8daeb0838170 +new file mode 100644 +index 000000000..8daeb0838 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_common.h @@ -0,0 +1,853 @@ @@ -1644988,8 +1644848,8 @@ index 000000000000..8daeb0838170 + +#endif diff --git a/drivers/video/rockchip/mpp/mpp_debug.h b/drivers/video/rockchip/mpp/mpp_debug.h -new file mode 100755 -index 000000000000..4108c69da894 +new file mode 100644 +index 000000000..4108c69da --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_debug.h @@ -0,0 +1,138 @@ @@ -1645132,8 +1644992,8 @@ index 000000000000..4108c69da894 + +#endif diff --git a/drivers/video/rockchip/mpp/mpp_iep2.c b/drivers/video/rockchip/mpp/mpp_iep2.c -new file mode 100755 -index 000000000000..8d1926957f69 +new file mode 100644 +index 000000000..8d1926957 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iep2.c @@ -0,0 +1,1038 @@ @@ -1646176,8 +1646036,8 @@ index 000000000000..8d1926957f69 +EXPORT_SYMBOL(rockchip_iep2_driver); + diff --git a/drivers/video/rockchip/mpp/mpp_iommu.c b/drivers/video/rockchip/mpp/mpp_iommu.c -new file mode 100755 -index 000000000000..1abbfb74f4e2 +new file mode 100644 +index 000000000..1abbfb74f --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iommu.c @@ -0,0 +1,645 @@ @@ -1646827,8 +1646687,8 @@ index 000000000000..1abbfb74f4e2 + return 0; +} diff --git a/drivers/video/rockchip/mpp/mpp_iommu.h b/drivers/video/rockchip/mpp/mpp_iommu.h -new file mode 100755 -index 000000000000..87d1b5c612d2 +new file mode 100644 +index 000000000..87d1b5c61 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iommu.h @@ -0,0 +1,170 @@ @@ -1647004,7 +1646864,7 @@ index 000000000000..87d1b5c612d2 +#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 000000000000..39ff16c21ee9 +index 000000000..39ff16c21 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iommu_av1d.c @@ -0,0 +1,997 @@ @@ -1648006,8 +1647866,8 @@ index 000000000000..39ff16c21ee9 + }, +}; diff --git a/drivers/video/rockchip/mpp/mpp_jpgdec.c b/drivers/video/rockchip/mpp/mpp_jpgdec.c -new file mode 100755 -index 000000000000..753b061f22ea +new file mode 100644 +index 000000000..753b061f2 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_jpgdec.c @@ -0,0 +1,643 @@ @@ -1648655,8 +1648515,8 @@ index 000000000000..753b061f22ea +}; +EXPORT_SYMBOL(rockchip_jpgdec_driver); diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec.c b/drivers/video/rockchip/mpp/mpp_rkvdec.c -new file mode 100755 -index 000000000000..4310a09a5ce0 +new file mode 100644 +index 000000000..4310a09a5 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec.c @@ -0,0 +1,2039 @@ @@ -1650700,8 +1650560,8 @@ index 000000000000..4310a09a5ce0 +}; +EXPORT_SYMBOL(rockchip_rkvdec_driver); diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2.c b/drivers/video/rockchip/mpp/mpp_rkvdec2.c -new file mode 100755 -index 000000000000..a463fc2eeccc +new file mode 100644 +index 000000000..a463fc2ee --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2.c @@ -0,0 +1,1800 @@ @@ -1652506,8 +1652366,8 @@ index 000000000000..a463fc2eeccc +}; +EXPORT_SYMBOL(rockchip_rkvdec2_driver); diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2.h b/drivers/video/rockchip/mpp/mpp_rkvdec2.h -new file mode 100755 -index 000000000000..3eabdace77f4 +new file mode 100644 +index 000000000..3eabdace7 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2.h @@ -0,0 +1,242 @@ @@ -1652754,8 +1652614,8 @@ index 000000000000..3eabdace77f4 + +#endif diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c -new file mode 100755 -index 000000000000..7c5a58df1865 +new file mode 100644 +index 000000000..7c5a58df1 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c @@ -0,0 +1,2511 @@ @@ -1655271,8 +1655131,8 @@ index 000000000000..7c5a58df1865 + mpp_debug_leave(); +} diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2_link.h b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.h -new file mode 100755 -index 000000000000..518927e9481e +new file mode 100644 +index 000000000..518927e94 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.h @@ -0,0 +1,238 @@ @@ -1655515,8 +1655375,8 @@ index 000000000000..518927e9481e + +#endif diff --git a/drivers/video/rockchip/mpp/mpp_rkvenc.c b/drivers/video/rockchip/mpp/mpp_rkvenc.c -new file mode 100755 -index 000000000000..c71c03fb91eb +new file mode 100644 +index 000000000..c71c03fb9 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvenc.c @@ -0,0 +1,1506 @@ @@ -1657027,8 +1656887,8 @@ index 000000000000..c71c03fb91eb + }, +}; diff --git a/drivers/video/rockchip/mpp/mpp_rkvenc2.c b/drivers/video/rockchip/mpp/mpp_rkvenc2.c -new file mode 100755 -index 000000000000..111c106ae65c +new file mode 100644 +index 000000000..111c106ae --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvenc2.c @@ -0,0 +1,2693 @@ @@ -1659726,8 +1659586,8 @@ index 000000000000..111c106ae65c + }, +}; diff --git a/drivers/video/rockchip/mpp/mpp_service.c b/drivers/video/rockchip/mpp/mpp_service.c -new file mode 100755 -index 000000000000..c04d6fbf553b +new file mode 100644 +index 000000000..c04d6fbf5 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_service.c @@ -0,0 +1,499 @@ @@ -1660232,7 +1660092,7 @@ index 000000000000..c04d6fbf553b +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 000000000000..c0dc382a1872 +index 000000000..c0dc382a1 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vdpp.c @@ -0,0 +1,784 @@ @@ -1661021,8 +1660881,8 @@ index 000000000000..c0dc382a1872 +}; +EXPORT_SYMBOL(rockchip_vdpp_driver); diff --git a/drivers/video/rockchip/mpp/mpp_vdpu1.c b/drivers/video/rockchip/mpp/mpp_vdpu1.c -new file mode 100755 -index 000000000000..6ddf5dae73f3 +new file mode 100644 +index 000000000..6ddf5dae7 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vdpu1.c @@ -0,0 +1,972 @@ @@ -1661999,8 +1661859,8 @@ index 000000000000..6ddf5dae73f3 +}; +EXPORT_SYMBOL(rockchip_vdpu1_driver); diff --git a/drivers/video/rockchip/mpp/mpp_vdpu2.c b/drivers/video/rockchip/mpp/mpp_vdpu2.c -new file mode 100755 -index 000000000000..d5a6a3017208 +new file mode 100644 +index 000000000..d5a6a3017 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vdpu2.c @@ -0,0 +1,808 @@ @@ -1662813,8 +1662673,8 @@ index 000000000000..d5a6a3017208 +}; +EXPORT_SYMBOL(rockchip_vdpu2_driver); diff --git a/drivers/video/rockchip/mpp/mpp_vepu1.c b/drivers/video/rockchip/mpp/mpp_vepu1.c -new file mode 100755 -index 000000000000..18f685a2e948 +new file mode 100644 +index 000000000..18f685a2e --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vepu1.c @@ -0,0 +1,795 @@ @@ -1663614,8 +1663474,8 @@ index 000000000000..18f685a2e948 +}; +EXPORT_SYMBOL(rockchip_vepu1_driver); diff --git a/drivers/video/rockchip/mpp/mpp_vepu2.c b/drivers/video/rockchip/mpp/mpp_vepu2.c -new file mode 100755 -index 000000000000..fb5f5e5c28e3 +new file mode 100644 +index 000000000..fb5f5e5c2 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vepu2.c @@ -0,0 +1,1278 @@ @@ -1664898,8 +1664758,8 @@ index 000000000000..fb5f5e5c28e3 +}; +EXPORT_SYMBOL(rockchip_vepu2_driver); diff --git a/drivers/video/rockchip/mpp/rockchip_iep2_regs.h b/drivers/video/rockchip/mpp/rockchip_iep2_regs.h -new file mode 100755 -index 000000000000..d85a30dfb84f +new file mode 100644 +index 000000000..d85a30dfb --- /dev/null +++ b/drivers/video/rockchip/mpp/rockchip_iep2_regs.h @@ -0,0 +1,183 @@ @@ -1665088,7 +1664948,7 @@ index 000000000000..d85a30dfb84f + diff --git a/drivers/video/rockchip/mpp_osal/Kconfig b/drivers/video/rockchip/mpp_osal/Kconfig new file mode 100644 -index 000000000000..75cd7028615f +index 000000000..75cd70286 --- /dev/null +++ b/drivers/video/rockchip/mpp_osal/Kconfig @@ -0,0 +1,8 @@ @@ -1665102,7 +1664962,7 @@ index 000000000000..75cd7028615f + 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 000000000000..f4ca9643fff2 +index 000000000..f4ca9643f --- /dev/null +++ b/drivers/video/rockchip/mpp_osal/Makefile @@ -0,0 +1,2 @@ @@ -1665110,7 +1664970,7 @@ index 000000000000..f4ca9643fff2 +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 000000000000..a778b1904044 +index 000000000..a778b1904 --- /dev/null +++ b/drivers/video/rockchip/mpp_osal/mpp_osal.c @@ -0,0 +1,30 @@ @@ -1665146,7 +1665006,7 @@ index 000000000000..a778b1904044 +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 000000000000..d798dfd0c293 +index 000000000..d798dfd0c --- /dev/null +++ b/drivers/video/rockchip/mpp_osal/mpp_osal.h @@ -0,0 +1,18 @@ @@ -1665169,8 +1665029,8 @@ index 000000000000..d798dfd0c293 + +#endif diff --git a/drivers/video/rockchip/rga/Kconfig b/drivers/video/rockchip/rga/Kconfig -new file mode 100755 -index 000000000000..6023b2eb23a7 +new file mode 100644 +index 000000000..6023b2eb2 --- /dev/null +++ b/drivers/video/rockchip/rga/Kconfig @@ -0,0 +1,10 @@ @@ -1665185,8 +1665045,8 @@ index 000000000000..6023b2eb23a7 + +endmenu diff --git a/drivers/video/rockchip/rga/Makefile b/drivers/video/rockchip/rga/Makefile -new file mode 100755 -index 000000000000..58dd4c6a3e42 +new file mode 100644 +index 000000000..58dd4c6a3 --- /dev/null +++ b/drivers/video/rockchip/rga/Makefile @@ -0,0 +1,4 @@ @@ -1665195,8 +1665055,8 @@ index 000000000000..58dd4c6a3e42 + +obj-$(CONFIG_ROCKCHIP_RGA) += rga.o diff --git a/drivers/video/rockchip/rga/RGA_API.c b/drivers/video/rockchip/rga/RGA_API.c -new file mode 100755 -index 000000000000..947a9b925f60 +new file mode 100644 +index 000000000..947a9b925 --- /dev/null +++ b/drivers/video/rockchip/rga/RGA_API.c @@ -0,0 +1,201 @@ @@ -1665402,8 +1665262,8 @@ index 000000000000..947a9b925f60 + + diff --git a/drivers/video/rockchip/rga/RGA_API.h b/drivers/video/rockchip/rga/RGA_API.h -new file mode 100755 -index 000000000000..ade17d03e85c +new file mode 100644 +index 000000000..ade17d03e --- /dev/null +++ b/drivers/video/rockchip/rga/RGA_API.h @@ -0,0 +1,40 @@ @@ -1665448,8 +1665308,8 @@ index 000000000000..ade17d03e85c + +#endif diff --git a/drivers/video/rockchip/rga/rga.h b/drivers/video/rockchip/rga/rga.h -new file mode 100755 -index 000000000000..e54a6efba39f +new file mode 100644 +index 000000000..e54a6efba --- /dev/null +++ b/drivers/video/rockchip/rga/rga.h @@ -0,0 +1,508 @@ @@ -1665962,8 +1665822,8 @@ index 000000000000..e54a6efba39f + +#endif /*_RK29_IPP_DRIVER_H_*/ diff --git a/drivers/video/rockchip/rga/rga_drv.c b/drivers/video/rockchip/rga/rga_drv.c -new file mode 100755 -index 000000000000..2498023d4a4a +new file mode 100644 +index 000000000..2498023d4 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_drv.c @@ -0,0 +1,2549 @@ @@ -1668517,8 +1668377,8 @@ index 000000000000..2498023d4a4a +MODULE_DESCRIPTION("Driver for rga device"); +MODULE_LICENSE("GPL"); diff --git a/drivers/video/rockchip/rga/rga_mmu_info.c b/drivers/video/rockchip/rga/rga_mmu_info.c -new file mode 100755 -index 000000000000..8825183d92fc +new file mode 100644 +index 000000000..8825183d9 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_mmu_info.c @@ -0,0 +1,1315 @@ @@ -1669838,8 +1669698,8 @@ index 000000000000..8825183d92fc +} + diff --git a/drivers/video/rockchip/rga/rga_mmu_info.h b/drivers/video/rockchip/rga/rga_mmu_info.h -new file mode 100755 -index 000000000000..3e70894c7ee7 +new file mode 100644 +index 000000000..3e70894c7 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_mmu_info.h @@ -0,0 +1,24 @@ @@ -1669868,8 +1669728,8 @@ index 000000000000..3e70894c7ee7 + + diff --git a/drivers/video/rockchip/rga/rga_reg_info.c b/drivers/video/rockchip/rga/rga_reg_info.c -new file mode 100755 -index 000000000000..94a6305b870b +new file mode 100644 +index 000000000..94a6305b8 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_reg_info.c @@ -0,0 +1,1587 @@ @@ -1671461,8 +1671321,8 @@ index 000000000000..94a6305b870b + + diff --git a/drivers/video/rockchip/rga/rga_reg_info.h b/drivers/video/rockchip/rga/rga_reg_info.h -new file mode 100755 -index 000000000000..565e8f72d7f0 +new file mode 100644 +index 000000000..565e8f72d --- /dev/null +++ b/drivers/video/rockchip/rga/rga_reg_info.h @@ -0,0 +1,467 @@ @@ -1671934,8 +1671794,8 @@ index 000000000000..565e8f72d7f0 +uint8_t RGA_pixel_width_init(uint32_t format); + diff --git a/drivers/video/rockchip/rga/rga_rop.h b/drivers/video/rockchip/rga/rga_rop.h -new file mode 100755 -index 000000000000..ed9758711022 +new file mode 100644 +index 000000000..ed9758711 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_rop.h @@ -0,0 +1,56 @@ @@ -1671996,8 +1671856,8 @@ index 000000000000..ed9758711022 + +#endif diff --git a/drivers/video/rockchip/rga/rga_type.h b/drivers/video/rockchip/rga/rga_type.h -new file mode 100755 -index 000000000000..ce3610ab9b67 +new file mode 100644 +index 000000000..ce3610ab9 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_type.h @@ -0,0 +1,49 @@ @@ -1672051,8 +1671911,8 @@ index 000000000000..ce3610ab9b67 +#endif /* __RGA_TYPR_H__ */ + diff --git a/drivers/video/rockchip/rga2/Kconfig b/drivers/video/rockchip/rga2/Kconfig -new file mode 100755 -index 000000000000..49a0f62b99a0 +new file mode 100644 +index 000000000..49a0f62b9 --- /dev/null +++ b/drivers/video/rockchip/rga2/Kconfig @@ -0,0 +1,30 @@ @@ -1672087,8 +1671947,8 @@ index 000000000000..49a0f62b99a0 + +endif diff --git a/drivers/video/rockchip/rga2/Makefile b/drivers/video/rockchip/rga2/Makefile -new file mode 100755 -index 000000000000..60181fffa4c8 +new file mode 100644 +index 000000000..60181fffa --- /dev/null +++ b/drivers/video/rockchip/rga2/Makefile @@ -0,0 +1,5 @@ @@ -1672098,8 +1671958,8 @@ index 000000000000..60181fffa4c8 + +obj-$(CONFIG_ROCKCHIP_RGA2) += rga2.o diff --git a/drivers/video/rockchip/rga2/RGA2_API.c b/drivers/video/rockchip/rga2/RGA2_API.c -new file mode 100755 -index 000000000000..0be2c1ae64b6 +new file mode 100644 +index 000000000..0be2c1ae6 --- /dev/null +++ b/drivers/video/rockchip/rga2/RGA2_API.c @@ -0,0 +1,23 @@ @@ -1672127,8 +1671987,8 @@ index 000000000000..0be2c1ae64b6 + + diff --git a/drivers/video/rockchip/rga2/RGA2_API.h b/drivers/video/rockchip/rga2/RGA2_API.h -new file mode 100755 -index 000000000000..1fa38ed6cffe +new file mode 100644 +index 000000000..1fa38ed6c --- /dev/null +++ b/drivers/video/rockchip/rga2/RGA2_API.h @@ -0,0 +1,59 @@ @@ -1672192,8 +1672052,8 @@ index 000000000000..1fa38ed6cffe + +#endif diff --git a/drivers/video/rockchip/rga2/rga2.h b/drivers/video/rockchip/rga2/rga2.h -new file mode 100755 -index 000000000000..335970c44ed6 +new file mode 100644 +index 000000000..335970c44 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2.h @@ -0,0 +1,792 @@ @@ -1672990,8 +1672850,8 @@ index 000000000000..335970c44ed6 + +#endif /*_RK29_IPP_DRIVER_H_*/ diff --git a/drivers/video/rockchip/rga2/rga2_debugger.c b/drivers/video/rockchip/rga2/rga2_debugger.c -new file mode 100755 -index 000000000000..589241322cf4 +new file mode 100644 +index 000000000..589241322 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_debugger.c @@ -0,0 +1,396 @@ @@ -1673392,8 +1673252,8 @@ index 000000000000..589241322cf4 +} +#endif /* #ifdef CONFIG_ROCKCHIP_RGA2_PROC_FS */ diff --git a/drivers/video/rockchip/rga2/rga2_debugger.h b/drivers/video/rockchip/rga2/rga2_debugger.h -new file mode 100755 -index 000000000000..33b2f43e9f8a +new file mode 100644 +index 000000000..33b2f43e9 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_debugger.h @@ -0,0 +1,120 @@ @@ -1673518,8 +1673378,8 @@ index 000000000000..33b2f43e9f8a +#endif /* #ifndef _RGA_DEBUGGER_H_ */ + diff --git a/drivers/video/rockchip/rga2/rga2_drv.c b/drivers/video/rockchip/rga2/rga2_drv.c -new file mode 100755 -index 000000000000..ca5218f3e09f +new file mode 100644 +index 000000000..ca5218f3e --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_drv.c @@ -0,0 +1,2273 @@ @@ -1675797,8 +1675657,8 @@ index 000000000000..ca5218f3e09f +MODULE_DESCRIPTION("Driver for rga device"); +MODULE_LICENSE("GPL"); diff --git a/drivers/video/rockchip/rga2/rga2_mmu_info.c b/drivers/video/rockchip/rga2/rga2_mmu_info.c -new file mode 100755 -index 000000000000..2b05c9356c3a +new file mode 100644 +index 000000000..2b05c9356 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_mmu_info.c @@ -0,0 +1,1831 @@ @@ -1677634,8 +1677494,8 @@ index 000000000000..2b05c9356c3a +} + diff --git a/drivers/video/rockchip/rga2/rga2_mmu_info.h b/drivers/video/rockchip/rga2/rga2_mmu_info.h -new file mode 100755 -index 000000000000..a823f2fe7c3a +new file mode 100644 +index 000000000..a823f2fe7 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_mmu_info.h @@ -0,0 +1,35 @@ @@ -1677675,8 +1677535,8 @@ index 000000000000..a823f2fe7c3a +#endif + diff --git a/drivers/video/rockchip/rga2/rga2_reg_info.c b/drivers/video/rockchip/rga2/rga2_reg_info.c -new file mode 100755 -index 000000000000..a6c154989dd1 +new file mode 100644 +index 000000000..a6c154989 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_reg_info.c @@ -0,0 +1,1689 @@ @@ -1679370,8 +1679230,8 @@ index 000000000000..a6c154989dd1 + } +} diff --git a/drivers/video/rockchip/rga2/rga2_reg_info.h b/drivers/video/rockchip/rga2/rga2_reg_info.h -new file mode 100755 -index 000000000000..7aaac7d3502b +new file mode 100644 +index 000000000..7aaac7d35 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_reg_info.h @@ -0,0 +1,331 @@ @@ -1679707,8 +1679567,8 @@ index 000000000000..7aaac7d3502b +#endif + diff --git a/drivers/video/rockchip/rga2/rga2_rop.h b/drivers/video/rockchip/rga2/rga2_rop.h -new file mode 100755 -index 000000000000..dc2a343f4c5c +new file mode 100644 +index 000000000..dc2a343f4 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_rop.h @@ -0,0 +1,56 @@ @@ -1679769,8 +1679629,8 @@ index 000000000000..dc2a343f4c5c + +#endif diff --git a/drivers/video/rockchip/rga2/rga2_type.h b/drivers/video/rockchip/rga2/rga2_type.h -new file mode 100755 -index 000000000000..30f5df2f38e5 +new file mode 100644 +index 000000000..30f5df2f3 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_type.h @@ -0,0 +1,49 @@ @@ -1679825,7 +1679685,7 @@ index 000000000000..30f5df2f38e5 + diff --git a/drivers/video/rockchip/rga3/Kconfig b/drivers/video/rockchip/rga3/Kconfig new file mode 100644 -index 000000000000..c8c96b2d67ff +index 000000000..c8c96b2d6 --- /dev/null +++ b/drivers/video/rockchip/rga3/Kconfig @@ -0,0 +1,37 @@ @@ -1679868,7 +1679728,7 @@ index 000000000000..c8c96b2d67ff +endif diff --git a/drivers/video/rockchip/rga3/Makefile b/drivers/video/rockchip/rga3/Makefile new file mode 100644 -index 000000000000..11f401de2ae0 +index 000000000..11f401de2 --- /dev/null +++ b/drivers/video/rockchip/rga3/Makefile @@ -0,0 +1,9 @@ @@ -1679883,7 +1679743,7 @@ index 000000000000..11f401de2ae0 +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 000000000000..2a60a1ae72db +index 000000000..2a60a1ae7 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga.h @@ -0,0 +1,944 @@ @@ -1680833,7 +1680693,7 @@ index 000000000000..2a60a1ae72db +#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 000000000000..add2f41bda78 +index 000000000..add2f41bd --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga2_reg_info.h @@ -0,0 +1,477 @@ @@ -1681316,7 +1681176,7 @@ index 000000000000..add2f41bda78 + 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 000000000000..4db80cfb09ee +index 000000000..4db80cfb0 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga3_reg_info.h @@ -0,0 +1,521 @@ @@ -1681843,7 +1681703,7 @@ index 000000000000..4db80cfb09ee + 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 000000000000..32e83cc9c9f9 +index 000000000..32e83cc9c --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_common.h @@ -0,0 +1,49 @@ @@ -1681898,7 +1681758,7 @@ index 000000000000..32e83cc9c9f9 +#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 000000000000..c274fe87f070 +index 000000000..c274fe87f --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_debugger.h @@ -0,0 +1,145 @@ @@ -1682049,7 +1681909,7 @@ index 000000000000..c274fe87f070 + 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 000000000000..2ff0857a66a9 +index 000000000..2ff0857a6 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_dma_buf.h @@ -0,0 +1,46 @@ @@ -1682101,7 +1681961,7 @@ index 000000000000..2ff0857a66a9 + 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 000000000000..e9743a40327b +index 000000000..e9743a403 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_drv.h @@ -0,0 +1,463 @@ @@ -1682570,7 +1682430,7 @@ index 000000000000..e9743a40327b +#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 000000000000..7e3bbeebbc3a +index 000000000..7e3bbeebb --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_fence.h @@ -0,0 +1,101 @@ @@ -1682677,7 +1682537,7 @@ index 000000000000..7e3bbeebbc3a +#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 000000000000..46f7531aa88f +index 000000000..46f7531aa --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_hw_config.h @@ -0,0 +1,81 @@ @@ -1682764,7 +1682624,7 @@ index 000000000000..46f7531aa88f +#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 000000000000..b80a1f48bb25 +index 000000000..b80a1f48b --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_iommu.h @@ -0,0 +1,79 @@ @@ -1682849,7 +1682709,7 @@ index 000000000000..b80a1f48bb25 + 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 000000000000..0fc776173f16 +index 000000000..0fc776173 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_job.h @@ -0,0 +1,53 @@ @@ -1682908,7 +1682768,7 @@ index 000000000000..0fc776173f16 +#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 000000000000..d68fd75dcb45 +index 000000000..d68fd75dc --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_mm.h @@ -0,0 +1,67 @@ @@ -1682981,7 +1682841,7 @@ index 000000000000..d68fd75dcb45 +#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 000000000000..8792e8d64dfc +index 000000000..8792e8d64 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga2_reg_info.c @@ -0,0 +1,2742 @@ @@ -1685729,7 +1685589,7 @@ index 000000000000..8792e8d64dfc +}; 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 000000000000..2b61833aa4a3 +index 000000000..2b61833aa --- /dev/null +++ b/drivers/video/rockchip/rga3/rga3_reg_info.c @@ -0,0 +1,2191 @@ @@ -1687926,7 +1687786,7 @@ index 000000000000..2b61833aa4a3 +}; diff --git a/drivers/video/rockchip/rga3/rga_common.c b/drivers/video/rockchip/rga3/rga_common.c new file mode 100644 -index 000000000000..80d4821fb321 +index 000000000..80d4821fb --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_common.c @@ -0,0 +1,772 @@ @@ -1688704,7 +1688564,7 @@ index 000000000000..80d4821fb321 +} diff --git a/drivers/video/rockchip/rga3/rga_debugger.c b/drivers/video/rockchip/rga3/rga_debugger.c new file mode 100644 -index 000000000000..fe2103147845 +index 000000000..fe2103147 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_debugger.c @@ -0,0 +1,970 @@ @@ -1689680,7 +1689540,7 @@ index 000000000000..fe2103147845 +#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 000000000000..db34db5af86c +index 000000000..db34db5af --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_dma_buf.c @@ -0,0 +1,546 @@ @@ -1690232,7 +1690092,7 @@ index 000000000000..db34db5af86c +} diff --git a/drivers/video/rockchip/rga3/rga_drv.c b/drivers/video/rockchip/rga3/rga_drv.c new file mode 100644 -index 000000000000..ec3c3451d76c +index 000000000..ec3c3451d --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_drv.c @@ -0,0 +1,1614 @@ @@ -1691852,7 +1691712,7 @@ index 000000000000..ec3c3451d76c +#endif diff --git a/drivers/video/rockchip/rga3/rga_fence.c b/drivers/video/rockchip/rga3/rga_fence.c new file mode 100644 -index 000000000000..7d831d55d15d +index 000000000..7d831d55d --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_fence.c @@ -0,0 +1,146 @@ @@ -1692004,7 +1691864,7 @@ index 000000000000..7d831d55d15d +} 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 000000000000..0cf2599b931e +index 000000000..0cf2599b9 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_hw_config.c @@ -0,0 +1,352 @@ @@ -1692362,7 +1692222,7 @@ index 000000000000..0cf2599b931e +}; diff --git a/drivers/video/rockchip/rga3/rga_iommu.c b/drivers/video/rockchip/rga3/rga_iommu.c new file mode 100644 -index 000000000000..6ef9cbc0d5d2 +index 000000000..6ef9cbc0d --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_iommu.c @@ -0,0 +1,425 @@ @@ -1692793,7 +1692653,7 @@ index 000000000000..6ef9cbc0d5d2 +} diff --git a/drivers/video/rockchip/rga3/rga_job.c b/drivers/video/rockchip/rga3/rga_job.c new file mode 100644 -index 000000000000..fae613bbf716 +index 000000000..fae613bbf --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_job.c @@ -0,0 +1,1423 @@ @@ -1694222,7 +1694082,7 @@ index 000000000000..fae613bbf716 +} diff --git a/drivers/video/rockchip/rga3/rga_mm.c b/drivers/video/rockchip/rga3/rga_mm.c new file mode 100644 -index 000000000000..de7e9a6fd7fa +index 000000000..de7e9a6fd --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_mm.c @@ -0,0 +1,2229 @@ @@ -1696457,7 +1696317,7 @@ index 000000000000..de7e9a6fd7fa +} diff --git a/drivers/video/rockchip/rga3/rga_policy.c b/drivers/video/rockchip/rga3/rga_policy.c new file mode 100644 -index 000000000000..c87ce1881cff +index 000000000..c87ce1881 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_policy.c @@ -0,0 +1,426 @@ @@ -1696889,7 +1696749,7 @@ index 000000000000..c87ce1881cff +} diff --git a/drivers/video/rockchip/rve/Kconfig b/drivers/video/rockchip/rve/Kconfig new file mode 100644 -index 000000000000..d28b9d0599cf +index 000000000..d28b9d059 --- /dev/null +++ b/drivers/video/rockchip/rve/Kconfig @@ -0,0 +1,29 @@ @@ -1696924,7 +1696784,7 @@ index 000000000000..d28b9d0599cf +endif diff --git a/drivers/video/rockchip/rve/Makefile b/drivers/video/rockchip/rve/Makefile new file mode 100644 -index 000000000000..e475b7717510 +index 000000000..e475b7717 --- /dev/null +++ b/drivers/video/rockchip/rve/Makefile @@ -0,0 +1,9 @@ @@ -1696939,7 +1696799,7 @@ index 000000000000..e475b7717510 +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 000000000000..922e9e3bfb47 +index 000000000..922e9e3bf --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve.h @@ -0,0 +1,72 @@ @@ -1697017,7 +1696877,7 @@ index 000000000000..922e9e3bfb47 +#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 000000000000..8dbb46850532 +index 000000000..8dbb46850 --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_debugger.h @@ -0,0 +1,132 @@ @@ -1697155,7 +1697015,7 @@ index 000000000000..8dbb46850532 + 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 000000000000..8d9f188c93e2 +index 000000000..8d9f188c9 --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_drv.h @@ -0,0 +1,332 @@ @@ -1697493,7 +1697353,7 @@ index 000000000000..8d9f188c93e2 +#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 000000000000..e70b6ac0442b +index 000000000..e70b6ac04 --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_fence.h @@ -0,0 +1,32 @@ @@ -1697531,7 +1697391,7 @@ index 000000000000..e70b6ac0442b +#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 000000000000..b2a86f317e5f +index 000000000..b2a86f317 --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_job.h @@ -0,0 +1,53 @@ @@ -1697590,7 +1697450,7 @@ index 000000000000..b2a86f317e5f +#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 000000000000..05df28037a83 +index 000000000..05df28037 --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_reg.h @@ -0,0 +1,88 @@ @@ -1697684,7 +1697544,7 @@ index 000000000000..05df28037a83 + diff --git a/drivers/video/rockchip/rve/rve_debugger.c b/drivers/video/rockchip/rve/rve_debugger.c new file mode 100644 -index 000000000000..f156435405cf +index 000000000..f15643540 --- /dev/null +++ b/drivers/video/rockchip/rve/rve_debugger.c @@ -0,0 +1,566 @@ @@ -1698256,7 +1698116,7 @@ index 000000000000..f156435405cf + diff --git a/drivers/video/rockchip/rve/rve_drv.c b/drivers/video/rockchip/rve/rve_drv.c new file mode 100644 -index 000000000000..b4b460437b65 +index 000000000..b4b460437 --- /dev/null +++ b/drivers/video/rockchip/rve/rve_drv.c @@ -0,0 +1,897 @@ @@ -1699159,7 +1699019,7 @@ index 000000000000..b4b460437b65 +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 000000000000..8d48f8033fa7 +index 000000000..8d48f8033 --- /dev/null +++ b/drivers/video/rockchip/rve/rve_fence.c @@ -0,0 +1,136 @@ @@ -1699301,7 +1699161,7 @@ index 000000000000..8d48f8033fa7 +} diff --git a/drivers/video/rockchip/rve/rve_job.c b/drivers/video/rockchip/rve/rve_job.c new file mode 100644 -index 000000000000..36b6ab63e36f +index 000000000..36b6ab63e --- /dev/null +++ b/drivers/video/rockchip/rve/rve_job.c @@ -0,0 +1,1028 @@ @@ -1700335,7 +1700195,7 @@ index 000000000000..36b6ab63e36f +} diff --git a/drivers/video/rockchip/rve/rve_reg.c b/drivers/video/rockchip/rve/rve_reg.c new file mode 100644 -index 000000000000..44b305cce0db +index 000000000..44b305cce --- /dev/null +++ b/drivers/video/rockchip/rve/rve_reg.c @@ -0,0 +1,277 @@ @@ -1700618,7 +1700478,7 @@ index 000000000000..44b305cce0db +} diff --git a/drivers/video/rockchip/vehicle/Kconfig b/drivers/video/rockchip/vehicle/Kconfig new file mode 100644 -index 000000000000..e61c864842f2 +index 000000000..e61c86484 --- /dev/null +++ b/drivers/video/rockchip/vehicle/Kconfig @@ -0,0 +1,41 @@ @@ -1700665,7 +1700525,7 @@ index 000000000000..e61c864842f2 +endif diff --git a/drivers/video/rockchip/vehicle/Makefile b/drivers/video/rockchip/vehicle/Makefile new file mode 100644 -index 000000000000..7da28b30548a +index 000000000..7da28b305 --- /dev/null +++ b/drivers/video/rockchip/vehicle/Makefile @@ -0,0 +1,26 @@ @@ -1700697,7 +1700557,7 @@ index 000000000000..7da28b30548a + 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 000000000000..8f7ac2429bef +index 000000000..8f7ac2429 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle-csi2-dphy-common.h @@ -0,0 +1,381 @@ @@ -1701084,7 +1700944,7 @@ index 000000000000..8f7ac2429bef +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_ad.h b/drivers/video/rockchip/vehicle/vehicle_ad.h new file mode 100644 -index 000000000000..a83233b791e0 +index 000000000..a83233b79 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad.h @@ -0,0 +1,83 @@ @@ -1701173,7 +1701033,7 @@ index 000000000000..a83233b791e0 +#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 000000000000..9547e887031a +index 000000000..9547e8870 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_7181.c @@ -0,0 +1,608 @@ @@ -1701787,7 +1701647,7 @@ index 000000000000..9547e887031a + 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 000000000000..b4e572ed0ef8 +index 000000000..b4e572ed0 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_7181.h @@ -0,0 +1,19 @@ @@ -1701812,7 +1701672,7 @@ index 000000000000..b4e572ed0ef8 + 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 000000000000..a015f0d7a204 +index 000000000..a015f0d7a --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_gc2145.c @@ -0,0 +1,1149 @@ @@ -1702967,7 +1702827,7 @@ index 000000000000..a015f0d7a204 + 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 000000000000..1934bc2172ad +index 000000000..1934bc217 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_gc2145.h @@ -0,0 +1,18 @@ @@ -1702991,7 +1702851,7 @@ index 000000000000..1934bc2172ad +#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 000000000000..e3926a5139ae +index 000000000..e3926a513 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_max96714.c @@ -0,0 +1,539 @@ @@ -1703536,7 +1703396,7 @@ index 000000000000..e3926a5139ae +} 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 000000000000..5f1ce6fcda6a +index 000000000..5f1ce6fcd --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_max96714.h @@ -0,0 +1,18 @@ @@ -1703560,7 +1703420,7 @@ index 000000000000..5f1ce6fcda6a +#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 000000000000..3c67848320d8 +index 000000000..3c6784832 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6188.c @@ -0,0 +1,1206 @@ @@ -1704772,7 +1704632,7 @@ index 000000000000..3c67848320d8 +} 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 000000000000..4e9c6a61ed61 +index 000000000..4e9c6a61e --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6188.h @@ -0,0 +1,18 @@ @@ -1704796,7 +1704656,7 @@ index 000000000000..4e9c6a61ed61 +#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 000000000000..af9274dd35e7 +index 000000000..af9274dd3 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6324.c @@ -0,0 +1,2238 @@ @@ -1707040,7 +1706900,7 @@ index 000000000000..af9274dd35e7 +} 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 000000000000..b28780737969 +index 000000000..b28780737 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6324.h @@ -0,0 +1,18 @@ @@ -1707064,7 +1706924,7 @@ index 000000000000..b28780737969 +#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 000000000000..08888dbe6c1b +index 000000000..08888dbe6 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_tp2825.c @@ -0,0 +1,1039 @@ @@ -1708109,7 +1707969,7 @@ index 000000000000..08888dbe6c1b + 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 000000000000..451912580de8 +index 000000000..451912580 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_tp2825.h @@ -0,0 +1,18 @@ @@ -1708133,7 +1707993,7 @@ index 000000000000..451912580de8 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_cfg.h b/drivers/video/rockchip/vehicle/vehicle_cfg.h new file mode 100644 -index 000000000000..96241b7b5128 +index 000000000..96241b7b5 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_cfg.h @@ -0,0 +1,145 @@ @@ -1708284,7 +1708144,7 @@ index 000000000000..96241b7b5128 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_cif.c b/drivers/video/rockchip/vehicle/vehicle_cif.c new file mode 100644 -index 000000000000..96c2bfb95785 +index 000000000..96c2bfb95 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_cif.c @@ -0,0 +1,5332 @@ @@ -1713622,7 +1713482,7 @@ index 000000000000..96c2bfb95785 +} diff --git a/drivers/video/rockchip/vehicle/vehicle_cif.h b/drivers/video/rockchip/vehicle/vehicle_cif.h new file mode 100644 -index 000000000000..3c75694acd89 +index 000000000..3c75694ac --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_cif.h @@ -0,0 +1,189 @@ @@ -1713817,7 +1713677,7 @@ index 000000000000..3c75694acd89 +#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 000000000000..08e1b1f892d2 +index 000000000..08e1b1f89 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_cif_regs.h @@ -0,0 +1,19 @@ @@ -1713842,7 +1713702,7 @@ index 000000000000..08e1b1f892d2 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_dev.c b/drivers/video/rockchip/vehicle/vehicle_dev.c new file mode 100644 -index 000000000000..29c0f67111ed +index 000000000..29c0f6711 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_dev.c @@ -0,0 +1,116 @@ @@ -1713964,7 +1713824,7 @@ index 000000000000..29c0f67111ed +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 000000000000..e2c0e676ba85 +index 000000000..e2c0e676b --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_flinger.c @@ -0,0 +1,1552 @@ @@ -1715522,7 +1715382,7 @@ index 000000000000..e2c0e676ba85 +} diff --git a/drivers/video/rockchip/vehicle/vehicle_flinger.h b/drivers/video/rockchip/vehicle/vehicle_flinger.h new file mode 100644 -index 000000000000..4b6cf8f3d5b2 +index 000000000..4b6cf8f3d --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_flinger.h @@ -0,0 +1,115 @@ @@ -1715643,7 +1715503,7 @@ index 000000000000..4b6cf8f3d5b2 +#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 000000000000..ccb45fd01051 +index 000000000..ccb45fd01 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_generic_sensor.c @@ -0,0 +1,441 @@ @@ -1716090,7 +1715950,7 @@ index 000000000000..ccb45fd01051 +} diff --git a/drivers/video/rockchip/vehicle/vehicle_gpio.c b/drivers/video/rockchip/vehicle/vehicle_gpio.c new file mode 100644 -index 000000000000..baab6aa28e34 +index 000000000..baab6aa28 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_gpio.c @@ -0,0 +1,178 @@ @@ -1716274,7 +1716134,7 @@ index 000000000000..baab6aa28e34 +} diff --git a/drivers/video/rockchip/vehicle/vehicle_gpio.h b/drivers/video/rockchip/vehicle/vehicle_gpio.h new file mode 100644 -index 000000000000..6c36392cd6b7 +index 000000000..6c36392cd --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_gpio.h @@ -0,0 +1,33 @@ @@ -1716313,7 +1716173,7 @@ index 000000000000..6c36392cd6b7 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_main.c b/drivers/video/rockchip/vehicle/vehicle_main.c new file mode 100644 -index 000000000000..a3ffdd1e3f8a +index 000000000..a3ffdd1e3 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_main.c @@ -0,0 +1,502 @@ @@ -1716821,7 +1716681,7 @@ index 000000000000..a3ffdd1e3f8a +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 000000000000..4d66db14a978 +index 000000000..4d66db14a --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_main.h @@ -0,0 +1,19 @@ @@ -1716846,7 +1716706,7 @@ index 000000000000..4d66db14a978 +#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 000000000000..65189b720a02 +index 000000000..65189b720 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_samsung_dcphy_common.h @@ -0,0 +1,246 @@ @@ -1717098,7 +1716958,7 @@ index 000000000000..65189b720a02 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_version.h b/drivers/video/rockchip/vehicle/vehicle_version.h new file mode 100644 -index 000000000000..9e5da4de3c75 +index 000000000..9e5da4de3 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_version.h @@ -0,0 +1,78 @@ @@ -1717182,7 +1717042,7 @@ index 000000000000..9e5da4de3c75 +#endif diff --git a/drivers/video/rockchip/vtunnel/Kconfig b/drivers/video/rockchip/vtunnel/Kconfig new file mode 100644 -index 000000000000..49ad2a592bb0 +index 000000000..49ad2a592 --- /dev/null +++ b/drivers/video/rockchip/vtunnel/Kconfig @@ -0,0 +1,12 @@ @@ -1717200,7 +1717060,7 @@ index 000000000000..49ad2a592bb0 +endmenu diff --git a/drivers/video/rockchip/vtunnel/Makefile b/drivers/video/rockchip/vtunnel/Makefile new file mode 100644 -index 000000000000..fdfd79a1c0a2 +index 000000000..fdfd79a1c --- /dev/null +++ b/drivers/video/rockchip/vtunnel/Makefile @@ -0,0 +1,3 @@ @@ -1717209,7 +1717069,7 @@ index 000000000000..fdfd79a1c0a2 +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 000000000000..2a879ab5f83d +index 000000000..2a879ab5f --- /dev/null +++ b/drivers/video/rockchip/vtunnel/rkvtunnel.c @@ -0,0 +1,1527 @@ @@ -1718742,7 +1718602,7 @@ index 000000000000..2a879ab5f83d +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 000000000000..1781aa785bc0 +index 000000000..1781aa785 --- /dev/null +++ b/drivers/video/rockchip/vtunnel/rkvtunnel.h @@ -0,0 +1,81 @@ @@ -1718828,7 +1718688,7 @@ index 000000000000..1781aa785bc0 + +#endif diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c -index f0d51dd21c9e..c81fbe355adc 100644 +index f0d51dd21..c81fbe355 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, @@ -1718880,7 +1718740,7 @@ index f0d51dd21c9e..c81fbe355adc 100644 ret, lnum, offs); break; diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c -index b3ac7c98fe8c..929ed3bc5619 100644 +index b3ac7c98f..929ed3bc5 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -802,7 +802,6 @@ xfs_ialloc( @@ -1718917,7 +1718777,7 @@ index b3ac7c98fe8c..929ed3bc5619 100644 /* diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h -index b0dcc07334a1..09f0dfeff6e8 100644 +index b0dcc0733..09f0dfeff 100644 --- a/include/drm/bridge/analogix_dp.h +++ b/include/drm/bridge/analogix_dp.h @@ -8,6 +8,7 @@ @@ -1719003,7 +1718863,7 @@ index b0dcc07334a1..09f0dfeff6e8 100644 + #endif /* _ANALOGIX_DP_H_ */ diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h -index ea34ca146b82..aca7ae836796 100644 +index ea34ca146..aca7ae836 100644 --- a/include/drm/bridge/dw_hdmi.h +++ b/include/drm/bridge/dw_hdmi.h @@ -6,12 +6,16 @@ @@ -1719239,7 +1719099,7 @@ index ea34ca146b82..aca7ae836796 100644 #endif /* __IMX_HDMI_H__ */ diff --git a/include/drm/bridge/dw_mipi_dsi.h b/include/drm/bridge/dw_mipi_dsi.h -index bda8aa7c2280..3b86b7d8b009 100644 +index bda8aa7c2..3b86b7d8b 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 { @@ -1719258,7 +1719118,7 @@ index bda8aa7c2280..3b86b7d8b009 100644 #endif /* __DW_MIPI_DSI__ */ diff --git a/include/drm/drm_auth.h b/include/drm/drm_auth.h -index f99d3417f304..6bf8b2b78991 100644 +index f99d3417f..6bf8b2b78 100644 --- a/include/drm/drm_auth.h +++ b/include/drm/drm_auth.h @@ -107,7 +107,6 @@ struct drm_master { @@ -1719270,7 +1719130,7 @@ index f99d3417f304..6bf8b2b78991 100644 bool drm_is_current_master(struct drm_file *fpriv); diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h -index 928136556174..f8cd5d8e58ee 100644 +index 03d39532c..70795101e 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -175,6 +175,48 @@ struct drm_scdc { @@ -1719341,7 +1719201,7 @@ index 928136556174..f8cd5d8e58ee 100644 /** diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h -index 59b51a09cae6..3a3d9d887cad 100644 +index 59b51a09c..3a3d9d887 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -287,7 +287,16 @@ struct drm_crtc_state { @@ -1719363,7 +1719223,7 @@ index 59b51a09cae6..3a3d9d887cad 100644 * @target_vblank: * diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h -index e57d0440f00f..e395d1fc186e 100644 +index e57d0440f..e395d1fc1 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -29,6 +29,7 @@ @@ -1719391,7 +1719251,7 @@ index e57d0440f00f..e395d1fc186e 100644 * @dumb_create: * diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h -index 4526b6a1e583..6f082761e245 100644 +index 4526b6a1e..6f082761e 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -229,6 +229,38 @@ struct detailed_timing { @@ -1719434,7 +1719294,7 @@ index 4526b6a1e583..6f082761e245 100644 #define DRM_ELD_HEADER_BLOCK_SIZE 4 diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h -index 42d04607d091..b81b3bfb08c8 100644 +index 42d04607d..b81b3bfb0 100644 --- a/include/drm/drm_file.h +++ b/include/drm/drm_file.h @@ -226,27 +226,15 @@ struct drm_file { @@ -1719479,7 +1719339,7 @@ index 42d04607d091..b81b3bfb08c8 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 31ba85a4110a..05592c17da0c 100644 +index 3c0d1495c..57abc8d5f 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; @@ -1719522,7 +1719382,7 @@ index 31ba85a4110a..05592c17da0c 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 a18f73eb3cf6..76d114569484 100644 +index a18f73eb3..76d114569 100644 --- a/include/drm/drm_mode_config.h +++ b/include/drm/drm_mode_config.h @@ -794,6 +794,19 @@ struct drm_mode_config { @@ -1719546,7 +1719406,7 @@ index a18f73eb3cf6..76d114569484 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 c34a3e8030e1..6292fa663844 100644 +index c34a3e803..6292fa663 100644 --- a/include/drm/drm_mode_object.h +++ b/include/drm/drm_mode_object.h @@ -60,7 +60,7 @@ struct drm_mode_object { @@ -1719559,7 +1719419,7 @@ index c34a3e8030e1..6292fa663844 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 0f69f9fbf12c..a9d0c6b0854e 100644 +index 0f69f9fbf..a9d0c6b08 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); @@ -1719570,8 +1719430,8 @@ index 0f69f9fbf12c..a9d0c6b0854e 100644 #endif /* __DRM_PRIME_H__ */ diff --git a/include/drm/drm_sync_helper.h b/include/drm/drm_sync_helper.h -new file mode 100755 -index 000000000000..a5586c674fec +new file mode 100644 +index 000000000..a5586c674 --- /dev/null +++ b/include/drm/drm_sync_helper.h @@ -0,0 +1,156 @@ @@ -1719732,7 +1719592,7 @@ index 000000000000..a5586c674fec + +#endif diff --git a/include/dt-bindings/clock/px30-cru.h b/include/dt-bindings/clock/px30-cru.h -index 5b1416fcde6f..33eac20e9ad4 100644 +index 5b1416fcd..33eac20e9 100644 --- a/include/dt-bindings/clock/px30-cru.h +++ b/include/dt-bindings/clock/px30-cru.h @@ -87,6 +87,8 @@ @@ -1719745,8 +1719605,8 @@ index 5b1416fcde6f..33eac20e9ad4 100644 /* dclk gates */ #define DCLK_VOPB 150 diff --git a/include/dt-bindings/clock/rk1808-cru.h b/include/dt-bindings/clock/rk1808-cru.h -new file mode 100755 -index 000000000000..994896d111f1 +new file mode 100644 +index 000000000..994896d11 --- /dev/null +++ b/include/dt-bindings/clock/rk1808-cru.h @@ -0,0 +1,473 @@ @@ -1720224,7 +1720084,7 @@ index 000000000000..994896d111f1 + +#endif diff --git a/include/dt-bindings/clock/rk3036-cru.h b/include/dt-bindings/clock/rk3036-cru.h -index 35a5a01f9697..ec8c3e748463 100644 +index 35a5a01f9..ec8c3e748 100644 --- a/include/dt-bindings/clock/rk3036-cru.h +++ b/include/dt-bindings/clock/rk3036-cru.h @@ -43,6 +43,8 @@ @@ -1720253,7 +1720113,7 @@ index 35a5a01f9697..ec8c3e748463 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 6a47825dac5d..e5269025da79 100644 +index 6a47825da..e5269025d 100644 --- a/include/dt-bindings/clock/rk3128-cru.h +++ b/include/dt-bindings/clock/rk3128-cru.h @@ -118,6 +118,7 @@ @@ -1720265,7 +1720125,7 @@ index 6a47825dac5d..e5269025da79 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 afad90680fce..a5de0f65fe06 100644 +index afad90680..a5de0f65f 100644 --- a/include/dt-bindings/clock/rk3188-cru-common.h +++ b/include/dt-bindings/clock/rk3188-cru-common.h @@ -67,6 +67,7 @@ @@ -1720290,7 +1720150,7 @@ index afad90680fce..a5de0f65fe06 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 33819acbfc56..7c94bc10baae 100644 +index 33819acbf..7c94bc10b 100644 --- a/include/dt-bindings/clock/rk3288-cru.h +++ b/include/dt-bindings/clock/rk3288-cru.h @@ -161,6 +161,10 @@ @@ -1720305,7 +1720165,7 @@ index 33819acbfc56..7c94bc10baae 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 0a06c5f514d7..7f2d1882ed31 100644 +index 0a06c5f51..7f2d1882e 100644 --- a/include/dt-bindings/clock/rk3368-cru.h +++ b/include/dt-bindings/clock/rk3368-cru.h @@ -101,6 +101,7 @@ @@ -1720317,7 +1720177,7 @@ index 0a06c5f514d7..7f2d1882ed31 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 44e0a319f077..a06e18ebc4dd 100644 +index 44e0a319f..a06e18ebc 100644 --- a/include/dt-bindings/clock/rk3399-cru.h +++ b/include/dt-bindings/clock/rk3399-cru.h @@ -7,6 +7,8 @@ @@ -1720377,8 +1720237,8 @@ index 44e0a319f077..a06e18ebc4dd 100644 #define SRST_A_RKPERF_B 46 #define SRST_PVTM_CORE_B 47 diff --git a/include/dt-bindings/clock/rk3568-cru.h b/include/dt-bindings/clock/rk3568-cru.h -new file mode 100755 -index 000000000000..aecfdd4ce084 +new file mode 100644 +index 000000000..aecfdd4ce --- /dev/null +++ b/include/dt-bindings/clock/rk3568-cru.h @@ -0,0 +1,932 @@ @@ -1721315,8 +1721175,8 @@ index 000000000000..aecfdd4ce084 + +#endif diff --git a/include/dt-bindings/clock/rk618-cru.h b/include/dt-bindings/clock/rk618-cru.h -new file mode 100755 -index 000000000000..72ae0aef1378 +new file mode 100644 +index 000000000..72ae0aef1 --- /dev/null +++ b/include/dt-bindings/clock/rk618-cru.h @@ -0,0 +1,38 @@ @@ -1721359,8 +1721219,8 @@ index 000000000000..72ae0aef1378 + +#endif diff --git a/include/dt-bindings/clock/rk628-cgu.h b/include/dt-bindings/clock/rk628-cgu.h -new file mode 100755 -index 000000000000..d1690907d208 +new file mode 100644 +index 000000000..d1690907d --- /dev/null +++ b/include/dt-bindings/clock/rk628-cgu.h @@ -0,0 +1,50 @@ @@ -1721415,8 +1721275,8 @@ index 000000000000..d1690907d208 + +#endif diff --git a/include/dt-bindings/clock/rockchip,rk3036.h b/include/dt-bindings/clock/rockchip,rk3036.h -new file mode 100755 -index 000000000000..019550c7d0c1 +new file mode 100644 +index 000000000..019550c7d --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3036.h @@ -0,0 +1,155 @@ @@ -1721576,8 +1721436,8 @@ index 000000000000..019550c7d0c1 + +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3036_H */ diff --git a/include/dt-bindings/clock/rockchip,rk312x.h b/include/dt-bindings/clock/rockchip,rk312x.h -new file mode 100755 -index 000000000000..0af5abca3470 +new file mode 100644 +index 000000000..0af5abca3 --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk312x.h @@ -0,0 +1,167 @@ @@ -1721749,8 +1721609,8 @@ index 000000000000..0af5abca3470 + +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3128_H */ diff --git a/include/dt-bindings/clock/rockchip,rk3188.h b/include/dt-bindings/clock/rockchip,rk3188.h -new file mode 100755 -index 000000000000..b8c57e1cfed8 +new file mode 100644 +index 000000000..b8c57e1cf --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3188.h @@ -0,0 +1,13 @@ @@ -1721768,8 +1721628,8 @@ index 000000000000..b8c57e1cfed8 + +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3188_H */ diff --git a/include/dt-bindings/clock/rockchip,rk3228.h b/include/dt-bindings/clock/rockchip,rk3228.h -new file mode 100755 -index 000000000000..b86e44536722 +new file mode 100644 +index 000000000..b86e44536 --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3228.h @@ -0,0 +1,167 @@ @@ -1721941,8 +1721801,8 @@ index 000000000000..b86e44536722 + +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3228_H */ diff --git a/include/dt-bindings/clock/rockchip,rk3288.h b/include/dt-bindings/clock/rockchip,rk3288.h -new file mode 100755 -index 000000000000..1a2803c4f168 +new file mode 100644 +index 000000000..1a2803c4f --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3288.h @@ -0,0 +1,220 @@ @@ -1722167,8 +1722027,8 @@ index 000000000000..1a2803c4f168 + +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3288_H */ diff --git a/include/dt-bindings/clock/rockchip,rk3368.h b/include/dt-bindings/clock/rockchip,rk3368.h -new file mode 100755 -index 000000000000..76630794b4d9 +new file mode 100644 +index 000000000..76630794b --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3368.h @@ -0,0 +1,263 @@ @@ -1722436,8 +1722296,8 @@ index 000000000000..76630794b4d9 + +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3368_H */ diff --git a/include/dt-bindings/clock/rockchip-ddr.h b/include/dt-bindings/clock/rockchip-ddr.h -new file mode 100755 -index 000000000000..b065432e7793 +new file mode 100644 +index 000000000..b065432e7 --- /dev/null +++ b/include/dt-bindings/clock/rockchip-ddr.h @@ -0,0 +1,63 @@ @@ -1722505,8 +1722365,8 @@ index 000000000000..b065432e7793 + +#endif diff --git a/include/dt-bindings/clock/rockchip.h b/include/dt-bindings/clock/rockchip.h -new file mode 100755 -index 000000000000..b438f7bd4083 +new file mode 100644 +index 000000000..b438f7bd4 --- /dev/null +++ b/include/dt-bindings/clock/rockchip.h @@ -0,0 +1,101 @@ @@ -1722612,8 +1722472,8 @@ index 000000000000..b438f7bd4083 + +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_H */ diff --git a/include/dt-bindings/clock/rv1126-cru.h b/include/dt-bindings/clock/rv1126-cru.h -new file mode 100755 -index 000000000000..474bcbc546af +new file mode 100644 +index 000000000..474bcbc54 --- /dev/null +++ b/include/dt-bindings/clock/rv1126-cru.h @@ -0,0 +1,633 @@ @@ -1723251,8 +1723111,8 @@ index 000000000000..474bcbc546af + +#endif diff --git a/include/dt-bindings/display/drm_mipi_dsi.h b/include/dt-bindings/display/drm_mipi_dsi.h -new file mode 100755 -index 000000000000..bc24ce4ddd08 +new file mode 100644 +index 000000000..bc24ce4dd --- /dev/null +++ b/include/dt-bindings/display/drm_mipi_dsi.h @@ -0,0 +1,53 @@ @@ -1723310,8 +1723170,8 @@ index 000000000000..bc24ce4ddd08 + +#endif /* __DRM_MIPI_DSI__ */ diff --git a/include/dt-bindings/display/media-bus-format.h b/include/dt-bindings/display/media-bus-format.h -new file mode 100755 -index 000000000000..b8e9a1bb3f95 +new file mode 100644 +index 000000000..b8e9a1bb3 --- /dev/null +++ b/include/dt-bindings/display/media-bus-format.h @@ -0,0 +1,152 @@ @@ -1723468,8 +1723328,8 @@ index 000000000000..b8e9a1bb3f95 + +#endif /* __LINUX_MEDIA_BUS_FORMAT_H */ diff --git a/include/dt-bindings/display/mipi_dsi.h b/include/dt-bindings/display/mipi_dsi.h -new file mode 100755 -index 000000000000..38aeee0ed51d +new file mode 100644 +index 000000000..38aeee0ed --- /dev/null +++ b/include/dt-bindings/display/mipi_dsi.h @@ -0,0 +1,106 @@ @@ -1723581,7 +1723441,7 @@ index 000000000000..38aeee0ed51d +#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 000000000000..3e14128e7ab1 +index 000000000..3e14128e7 --- /dev/null +++ b/include/dt-bindings/display/rockchip_vop.h @@ -0,0 +1,21 @@ @@ -1723607,8 +1723467,8 @@ index 000000000000..3e14128e7ab1 + +#endif diff --git a/include/dt-bindings/dram/rockchip,rk322x.h b/include/dt-bindings/dram/rockchip,rk322x.h -new file mode 100755 -index 000000000000..1ab3317d700e +new file mode 100644 +index 000000000..1ab3317d7 --- /dev/null +++ b/include/dt-bindings/dram/rockchip,rk322x.h @@ -0,0 +1,90 @@ @@ -1723703,8 +1723563,8 @@ index 000000000000..1ab3317d700e + +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK322X_H */ diff --git a/include/dt-bindings/dram/rockchip,rk3368.h b/include/dt-bindings/dram/rockchip,rk3368.h -new file mode 100755 -index 000000000000..993f1eed9816 +new file mode 100644 +index 000000000..993f1eed9 --- /dev/null +++ b/include/dt-bindings/dram/rockchip,rk3368.h @@ -0,0 +1,80 @@ @@ -1723789,8 +1723649,8 @@ index 000000000000..993f1eed9816 + +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK3368_H*/ diff --git a/include/dt-bindings/input/rk-input.h b/include/dt-bindings/input/rk-input.h -new file mode 100755 -index 000000000000..00b412927890 +new file mode 100644 +index 000000000..00b412927 --- /dev/null +++ b/include/dt-bindings/input/rk-input.h @@ -0,0 +1,814 @@ @@ -1724609,8 +1724469,8 @@ index 000000000000..00b412927890 +#define FF_STATUS_PLAYING 0x01 +#define FF_STATUS_MAX 0x01 diff --git a/include/dt-bindings/memory/px30-dram.h b/include/dt-bindings/memory/px30-dram.h -new file mode 100755 -index 000000000000..17d799d802d9 +new file mode 100644 +index 000000000..17d799d80 --- /dev/null +++ b/include/dt-bindings/memory/px30-dram.h @@ -0,0 +1,132 @@ @@ -1724747,8 +1724607,8 @@ index 000000000000..17d799d802d9 + +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_PX30_H*/ diff --git a/include/dt-bindings/memory/rk1808-dram.h b/include/dt-bindings/memory/rk1808-dram.h -new file mode 100755 -index 000000000000..522bd75a4a55 +new file mode 100644 +index 000000000..522bd75a4 --- /dev/null +++ b/include/dt-bindings/memory/rk1808-dram.h @@ -0,0 +1,180 @@ @@ -1724933,8 +1724793,8 @@ index 000000000000..522bd75a4a55 + +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK1808_H*/ diff --git a/include/dt-bindings/memory/rk3128-dram.h b/include/dt-bindings/memory/rk3128-dram.h -new file mode 100755 -index 000000000000..2598ac98e525 +new file mode 100644 +index 000000000..2598ac98e --- /dev/null +++ b/include/dt-bindings/memory/rk3128-dram.h @@ -0,0 +1,95 @@ @@ -1725034,8 +1724894,8 @@ index 000000000000..2598ac98e525 + +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK3128_H */ diff --git a/include/dt-bindings/memory/rk3288-dram.h b/include/dt-bindings/memory/rk3288-dram.h -new file mode 100755 -index 000000000000..1c531dca755c +new file mode 100644 +index 000000000..1c531dca7 --- /dev/null +++ b/include/dt-bindings/memory/rk3288-dram.h @@ -0,0 +1,127 @@ @@ -1725167,8 +1725027,8 @@ index 000000000000..1c531dca755c + +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK3288_H*/ diff --git a/include/dt-bindings/memory/rk3328-dram.h b/include/dt-bindings/memory/rk3328-dram.h -new file mode 100755 -index 000000000000..171f41c256d3 +new file mode 100644 +index 000000000..171f41c25 --- /dev/null +++ b/include/dt-bindings/memory/rk3328-dram.h @@ -0,0 +1,159 @@ @@ -1725332,8 +1725192,8 @@ index 000000000000..171f41c256d3 + +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK3328_H*/ diff --git a/include/dt-bindings/memory/rk3368-dram.h b/include/dt-bindings/memory/rk3368-dram.h -new file mode 100755 -index 000000000000..c1f23d32d987 +new file mode 100644 +index 000000000..c1f23d32d --- /dev/null +++ b/include/dt-bindings/memory/rk3368-dram.h @@ -0,0 +1,109 @@ @@ -1725447,8 +1725307,8 @@ index 000000000000..c1f23d32d987 + +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK3368_H*/ diff --git a/include/dt-bindings/memory/rk3399-dram.h b/include/dt-bindings/memory/rk3399-dram.h -new file mode 100755 -index 000000000000..44abb0aafb05 +new file mode 100644 +index 000000000..44abb0aaf --- /dev/null +++ b/include/dt-bindings/memory/rk3399-dram.h @@ -0,0 +1,107 @@ @@ -1725560,8 +1725420,8 @@ index 000000000000..44abb0aafb05 + +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK3399_H */ diff --git a/include/dt-bindings/memory/rk3568-dram.h b/include/dt-bindings/memory/rk3568-dram.h -new file mode 100755 -index 000000000000..c05eae7fe32e +new file mode 100644 +index 000000000..c05eae7fe --- /dev/null +++ b/include/dt-bindings/memory/rk3568-dram.h @@ -0,0 +1,111 @@ @@ -1725677,8 +1725537,8 @@ index 000000000000..c05eae7fe32e + +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK3568_H */ diff --git a/include/dt-bindings/memory/rockchip-dram.h b/include/dt-bindings/memory/rockchip-dram.h -new file mode 100755 -index 000000000000..17e5e34b05c5 +new file mode 100644 +index 000000000..17e5e34b0 --- /dev/null +++ b/include/dt-bindings/memory/rockchip-dram.h @@ -0,0 +1,94 @@ @@ -1725777,8 +1725637,8 @@ index 000000000000..17e5e34b05c5 + +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_H */ diff --git a/include/dt-bindings/memory/rv1126-dram.h b/include/dt-bindings/memory/rv1126-dram.h -new file mode 100755 -index 000000000000..208227825044 +new file mode 100644 +index 000000000..208227825 --- /dev/null +++ b/include/dt-bindings/memory/rv1126-dram.h @@ -0,0 +1,161 @@ @@ -1725944,8 +1725804,8 @@ index 000000000000..208227825044 + +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RV1126_H*/ diff --git a/include/dt-bindings/phy/phy-snps-pcie3.h b/include/dt-bindings/phy/phy-snps-pcie3.h -new file mode 100755 -index 000000000000..5006947f2285 +new file mode 100644 +index 000000000..5006947f2 --- /dev/null +++ b/include/dt-bindings/phy/phy-snps-pcie3.h @@ -0,0 +1,21 @@ @@ -1725971,8 +1725831,8 @@ index 000000000000..5006947f2285 + +#endif /* _DT_BINDINGS_PHY_SNPS_PCIE3 */ diff --git a/include/dt-bindings/pinctrl/rockchip-rk3036.h b/include/dt-bindings/pinctrl/rockchip-rk3036.h -new file mode 100755 -index 000000000000..553c33579065 +new file mode 100644 +index 000000000..553c33579 --- /dev/null +++ b/include/dt-bindings/pinctrl/rockchip-rk3036.h @@ -0,0 +1,267 @@ @@ -1726244,8 +1726104,8 @@ index 000000000000..553c33579065 + +#endif diff --git a/include/dt-bindings/pinctrl/rockchip-rk312x.h b/include/dt-bindings/pinctrl/rockchip-rk312x.h -new file mode 100755 -index 000000000000..e0fa5976c18f +new file mode 100644 +index 000000000..e0fa5976c --- /dev/null +++ b/include/dt-bindings/pinctrl/rockchip-rk312x.h @@ -0,0 +1,384 @@ @@ -1726634,8 +1726494,8 @@ index 000000000000..e0fa5976c18f + +#endif diff --git a/include/dt-bindings/pinctrl/rockchip-rk3188.h b/include/dt-bindings/pinctrl/rockchip-rk3188.h -new file mode 100755 -index 000000000000..58bba225d1de +new file mode 100644 +index 000000000..58bba225d --- /dev/null +++ b/include/dt-bindings/pinctrl/rockchip-rk3188.h @@ -0,0 +1,457 @@ @@ -1727097,8 +1726957,8 @@ index 000000000000..58bba225d1de + +#endif diff --git a/include/dt-bindings/pinctrl/rockchip-rk3288.h b/include/dt-bindings/pinctrl/rockchip-rk3288.h -new file mode 100755 -index 000000000000..97aa66e2b329 +new file mode 100644 +index 000000000..97aa66e2b --- /dev/null +++ b/include/dt-bindings/pinctrl/rockchip-rk3288.h @@ -0,0 +1,666 @@ @@ -1727769,8 +1727629,8 @@ index 000000000000..97aa66e2b329 + +#endif diff --git a/include/dt-bindings/power/rk1808-power.h b/include/dt-bindings/power/rk1808-power.h -new file mode 100755 -index 000000000000..32342c1e7ded +new file mode 100644 +index 000000000..32342c1e7 --- /dev/null +++ b/include/dt-bindings/power/rk1808-power.h @@ -0,0 +1,20 @@ @@ -1727796,7 +1727656,7 @@ index 000000000000..32342c1e7ded +#endif diff --git a/include/dt-bindings/power/rk3528-power.h b/include/dt-bindings/power/rk3528-power.h new file mode 100644 -index 000000000000..4f7c978651b5 +index 000000000..4f7c97865 --- /dev/null +++ b/include/dt-bindings/power/rk3528-power.h @@ -0,0 +1,18 @@ @@ -1727820,7 +1727680,7 @@ index 000000000000..4f7c978651b5 +#endif diff --git a/include/dt-bindings/power/rk3562-power.h b/include/dt-bindings/power/rk3562-power.h new file mode 100644 -index 000000000000..94b26b5bea5f +index 000000000..94b26b5be --- /dev/null +++ b/include/dt-bindings/power/rk3562-power.h @@ -0,0 +1,32 @@ @@ -1727857,8 +1727717,8 @@ index 000000000000..94b26b5bea5f + +#endif diff --git a/include/dt-bindings/power/rk3568-power.h b/include/dt-bindings/power/rk3568-power.h -new file mode 100755 -index 000000000000..6cc1af1a9d26 +new file mode 100644 +index 000000000..6cc1af1a9 --- /dev/null +++ b/include/dt-bindings/power/rk3568-power.h @@ -0,0 +1,32 @@ @@ -1727895,8 +1727755,8 @@ index 000000000000..6cc1af1a9d26 + +#endif diff --git a/include/dt-bindings/power/rk3588-power.h b/include/dt-bindings/power/rk3588-power.h -new file mode 100755 -index 000000000000..69f7e9060250 +new file mode 100644 +index 000000000..69f7e9060 --- /dev/null +++ b/include/dt-bindings/power/rk3588-power.h @@ -0,0 +1,69 @@ @@ -1727970,8 +1727830,8 @@ index 000000000000..69f7e9060250 + +#endif diff --git a/include/dt-bindings/power/rv1126-power.h b/include/dt-bindings/power/rv1126-power.h -new file mode 100755 -index 000000000000..3e210103646f +new file mode 100644 +index 000000000..3e2101036 --- /dev/null +++ b/include/dt-bindings/power/rv1126-power.h @@ -0,0 +1,34 @@ @@ -1728010,8 +1727870,8 @@ index 000000000000..3e210103646f + +#endif diff --git a/include/dt-bindings/reset/rk628-rgu.h b/include/dt-bindings/reset/rk628-rgu.h -new file mode 100755 -index 000000000000..e0c714bef00c +new file mode 100644 +index 000000000..e0c714bef --- /dev/null +++ b/include/dt-bindings/reset/rk628-rgu.h @@ -0,0 +1,43 @@ @@ -1728059,8 +1727919,8 @@ index 000000000000..e0c714bef00c + +#endif diff --git a/include/dt-bindings/sensor-dev.h b/include/dt-bindings/sensor-dev.h -new file mode 100755 -index 000000000000..e03f0027d325 +new file mode 100644 +index 000000000..e03f0027d --- /dev/null +++ b/include/dt-bindings/sensor-dev.h @@ -0,0 +1,18 @@ @@ -1728083,7 +1727943,7 @@ index 000000000000..e03f0027d325 + +#endif diff --git a/include/dt-bindings/soc/rockchip,boot-mode.h b/include/dt-bindings/soc/rockchip,boot-mode.h -index 4b0914c0989d..a0f63a040613 100644 +index 4b0914c09..a0f63a040 100644 --- a/include/dt-bindings/soc/rockchip,boot-mode.h +++ b/include/dt-bindings/soc/rockchip,boot-mode.h @@ -10,7 +10,19 @@ @@ -1728109,7 +1727969,7 @@ index 4b0914c0989d..a0f63a040613 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 000000000000..0681e92ef4da +index 000000000..0681e92ef --- /dev/null +++ b/include/dt-bindings/soc/rockchip-amp.h @@ -0,0 +1,7 @@ @@ -1728122,7 +1727982,7 @@ index 000000000000..0681e92ef4da +#endif diff --git a/include/dt-bindings/soc/rockchip-csu.h b/include/dt-bindings/soc/rockchip-csu.h new file mode 100644 -index 000000000000..8b0442533c3f +index 000000000..8b0442533 --- /dev/null +++ b/include/dt-bindings/soc/rockchip-csu.h @@ -0,0 +1,15 @@ @@ -1728142,8 +1728002,8 @@ index 000000000000..8b0442533c3f + +#endif diff --git a/include/dt-bindings/soc/rockchip-system-status.h b/include/dt-bindings/soc/rockchip-system-status.h -new file mode 100755 -index 000000000000..6a0d198a2e6e +new file mode 100644 +index 000000000..6a0d198a2 --- /dev/null +++ b/include/dt-bindings/soc/rockchip-system-status.h @@ -0,0 +1,59 @@ @@ -1728207,8 +1728067,8 @@ index 000000000000..6a0d198a2e6e + +#endif diff --git a/include/dt-bindings/suspend/rockchip-px30.h b/include/dt-bindings/suspend/rockchip-px30.h -new file mode 100755 -index 000000000000..4362028f677c +new file mode 100644 +index 000000000..4362028f6 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-px30.h @@ -0,0 +1,53 @@ @@ -1728266,8 +1728126,8 @@ index 000000000000..4362028f677c + +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk1808.h b/include/dt-bindings/suspend/rockchip-rk1808.h -new file mode 100755 -index 000000000000..3d565faabf4d +new file mode 100644 +index 000000000..3d565faab --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk1808.h @@ -0,0 +1,46 @@ @@ -1728318,8 +1728178,8 @@ index 000000000000..3d565faabf4d + +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk322x.h b/include/dt-bindings/suspend/rockchip-rk322x.h -new file mode 100755 -index 000000000000..882ae053fa22 +new file mode 100644 +index 000000000..882ae053f --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk322x.h @@ -0,0 +1,57 @@ @@ -1728381,8 +1728241,8 @@ index 000000000000..882ae053fa22 + +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3288.h b/include/dt-bindings/suspend/rockchip-rk3288.h -new file mode 100755 -index 000000000000..d07cced43877 +new file mode 100644 +index 000000000..d07cced43 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3288.h @@ -0,0 +1,59 @@ @@ -1728446,8 +1728306,8 @@ index 000000000000..d07cced43877 + +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3308.h b/include/dt-bindings/suspend/rockchip-rk3308.h -new file mode 100755 -index 000000000000..a3e015e2209a +new file mode 100644 +index 000000000..a3e015e22 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3308.h @@ -0,0 +1,104 @@ @@ -1728556,8 +1728416,8 @@ index 000000000000..a3e015e2209a + +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3328.h b/include/dt-bindings/suspend/rockchip-rk3328.h -new file mode 100755 -index 000000000000..972f8bb5e281 +new file mode 100644 +index 000000000..972f8bb5e --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3328.h @@ -0,0 +1,19 @@ @@ -1728581,8 +1728441,8 @@ index 000000000000..972f8bb5e281 + +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3368.h b/include/dt-bindings/suspend/rockchip-rk3368.h -new file mode 100755 -index 000000000000..9873f8236a8b +new file mode 100644 +index 000000000..9873f8236 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3368.h @@ -0,0 +1,56 @@ @@ -1728643,8 +1728503,8 @@ index 000000000000..9873f8236a8b + +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3399.h b/include/dt-bindings/suspend/rockchip-rk3399.h -new file mode 100755 -index 000000000000..176c7cfcd989 +new file mode 100644 +index 000000000..176c7cfcd --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3399.h @@ -0,0 +1,61 @@ @@ -1728710,8 +1728570,8 @@ index 000000000000..176c7cfcd989 + +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3568.h b/include/dt-bindings/suspend/rockchip-rk3568.h -new file mode 100755 -index 000000000000..91e89f64a067 +new file mode 100644 +index 000000000..91e89f64a --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3568.h @@ -0,0 +1,57 @@ @@ -1728773,8 +1728633,8 @@ index 000000000000..91e89f64a067 + +#endif diff --git a/include/dt-bindings/suspend/rockchip-rv1126.h b/include/dt-bindings/suspend/rockchip-rv1126.h -new file mode 100755 -index 000000000000..7c28c2bd7619 +new file mode 100644 +index 000000000..7c28c2bd7 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rv1126.h @@ -0,0 +1,46 @@ @@ -1728825,8 +1728685,8 @@ index 000000000000..7c28c2bd7619 +#define RKPM_TIME_OUT_WKUP_EN BIT(10) +#endif diff --git a/include/linux/android_kabi.h b/include/linux/android_kabi.h -new file mode 100755 -index 000000000000..efa52953fe35 +new file mode 100644 +index 000000000..efa52953f --- /dev/null +++ b/include/linux/android_kabi.h @@ -0,0 +1,113 @@ @@ -1728944,10 +1728804,10 @@ index 000000000000..efa52953fe35 + +#endif /* _ANDROID_KABI_H */ diff --git a/include/linux/bpf.h b/include/linux/bpf.h -index a75abe994918..e49f608096dd 100644 +index 112a4d2ed..df0c185c0 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h -@@ -173,7 +173,7 @@ struct bpf_map { +@@ -177,7 +177,7 @@ struct bpf_map { atomic64_t usercnt; struct work_struct work; struct mutex freeze_mutex; @@ -1728956,7 +1728816,7 @@ index a75abe994918..e49f608096dd 100644 }; static inline bool map_value_has_spin_lock(const struct bpf_map *map) -@@ -1333,7 +1333,6 @@ void bpf_map_charge_move(struct bpf_map_memory *dst, +@@ -1338,7 +1338,6 @@ void bpf_map_charge_move(struct bpf_map_memory *dst, void *bpf_map_area_alloc(u64 size, int numa_node); void *bpf_map_area_mmapable_alloc(u64 size, int numa_node); void bpf_map_area_free(void *base); @@ -1728965,10 +1728825,10 @@ index a75abe994918..e49f608096dd 100644 int generic_map_lookup_batch(struct bpf_map *map, const union bpf_attr *attr, diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h -index 03a5de5f99f4..d9897d0b10a2 100644 +index 6fa85be64..4ce08dc51 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h -@@ -599,6 +599,7 @@ struct clk_divider { +@@ -626,6 +626,7 @@ struct clk_divider { u8 shift; u8 width; u8 flags; @@ -1728976,7 +1728836,7 @@ index 03a5de5f99f4..d9897d0b10a2 100644 const struct clk_div_table *table; spinlock_t *lock; }; -@@ -936,6 +937,8 @@ void clk_hw_unregister_fixed_factor(struct clk_hw *hw); +@@ -971,6 +972,8 @@ void clk_hw_unregister_fixed_factor(struct clk_hw *hw); * CLK_FRAC_DIVIDER_BIG_ENDIAN - By default little endian register accesses are * used for the divider register. Setting this flag makes the register * accesses big endian. @@ -1728985,7 +1728845,7 @@ index 03a5de5f99f4..d9897d0b10a2 100644 */ struct clk_fractional_divider { struct clk_hw hw; -@@ -947,6 +950,7 @@ struct clk_fractional_divider { +@@ -982,6 +985,7 @@ struct clk_fractional_divider { u8 nwidth; u32 nmask; u8 flags; @@ -1728993,7 +1728853,7 @@ index 03a5de5f99f4..d9897d0b10a2 100644 void (*approximation)(struct clk_hw *hw, unsigned long rate, unsigned long *parent_rate, unsigned long *m, unsigned long *n); -@@ -957,6 +961,7 @@ struct clk_fractional_divider { +@@ -992,6 +996,7 @@ struct clk_fractional_divider { #define CLK_FRAC_DIVIDER_ZERO_BASED BIT(0) #define CLK_FRAC_DIVIDER_BIG_ENDIAN BIT(1) @@ -1729001,7 +1728861,7 @@ index 03a5de5f99f4..d9897d0b10a2 100644 extern const struct clk_ops clk_fractional_divider_ops; struct clk *clk_register_fractional_divider(struct device *dev, -@@ -1017,6 +1022,9 @@ extern const struct clk_ops clk_multiplier_ops; +@@ -1052,6 +1057,9 @@ extern const struct clk_ops clk_multiplier_ops; * @mux_hw: handle between composite and hardware-specific mux clock * @rate_hw: handle between composite and hardware-specific rate clock * @gate_hw: handle between composite and hardware-specific gate clock @@ -1729011,7 +1728871,7 @@ index 03a5de5f99f4..d9897d0b10a2 100644 * @mux_ops: clock ops for mux * @rate_ops: clock ops for rate * @gate_ops: clock ops for gate -@@ -1028,6 +1036,7 @@ struct clk_composite { +@@ -1063,6 +1071,7 @@ struct clk_composite { struct clk_hw *mux_hw; struct clk_hw *rate_hw; struct clk_hw *gate_hw; @@ -1729020,8 +1728880,8 @@ index 03a5de5f99f4..d9897d0b10a2 100644 const struct clk_ops *mux_ops; const struct clk_ops *rate_ops; diff --git a/include/linux/clk/rockchip.h b/include/linux/clk/rockchip.h -new file mode 100755 -index 000000000000..07c563a42c60 +new file mode 100644 +index 000000000..07c563a42 --- /dev/null +++ b/include/linux/clk/rockchip.h @@ -0,0 +1,18 @@ @@ -1729044,7 +1728904,7 @@ index 000000000000..07c563a42c60 + +#endif /* __LINUX_CLK_ROCKCHIP_H_ */ diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h -index 04c20de66afc..047f449d3658 100644 +index b70224370..730e69bb5 100644 --- a/include/linux/cpuset.h +++ b/include/linux/cpuset.h @@ -15,6 +15,7 @@ @@ -1729055,7 +1728915,7 @@ index 04c20de66afc..047f449d3658 100644 #include #ifdef CONFIG_CPUSETS -@@ -162,6 +163,8 @@ static inline void set_mems_allowed(nodemask_t nodemask) +@@ -164,6 +165,8 @@ static inline void set_mems_allowed(nodemask_t nodemask) task_unlock(current); } @@ -1729064,7 +1728924,7 @@ index 04c20de66afc..047f449d3658 100644 #else /* !CONFIG_CPUSETS */ static inline bool cpusets_enabled(void) { return false; } -@@ -184,7 +187,7 @@ static inline void cpuset_read_unlock(void) { } +@@ -188,7 +191,7 @@ static inline void cpuset_unlock(void) { } static inline void cpuset_cpus_allowed(struct task_struct *p, struct cpumask *mask) { @@ -1729073,7 +1728933,7 @@ index 04c20de66afc..047f449d3658 100644 } static inline void cpuset_cpus_allowed_fallback(struct task_struct *p) -@@ -280,6 +283,8 @@ static inline bool read_mems_allowed_retry(unsigned int seq) +@@ -284,6 +287,8 @@ static inline bool read_mems_allowed_retry(unsigned int seq) return false; } @@ -1729083,8 +1728943,8 @@ index 04c20de66afc..047f449d3658 100644 #endif /* _LINUX_CPUSET_H */ diff --git a/include/linux/dma-buf-cache.h b/include/linux/dma-buf-cache.h -new file mode 100755 -index 000000000000..d97545560990 +new file mode 100644 +index 000000000..d97545560 --- /dev/null +++ b/include/linux/dma-buf-cache.h @@ -0,0 +1,32 @@ @@ -1729121,7 +1728981,7 @@ index 000000000000..d97545560990 + +#endif /* _LINUX_DMA_BUF_CACHE_H */ diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h -index 0c5706abb7fe..f635c237d109 100644 +index 0c5706abb..f635c237d 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -209,6 +209,41 @@ struct dma_buf_ops { @@ -1729311,7 +1729171,7 @@ index 0c5706abb7fe..f635c237d109 100644 #ifdef CONFIG_DMABUF_PROCESS_INFO /** diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h -index 09e23adb351d..9f12efaaa93a 100644 +index 09e23adb3..9f12efaaa 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) {} @@ -1729325,7 +1729185,7 @@ index 09e23adb351d..9f12efaaa93a 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 83b8cfb2d760..e8f0e92c27dd 100644 +index 83b8cfb2d..e8f0e92c2 100644 --- a/include/linux/dma-heap.h +++ b/include/linux/dma-heap.h @@ -16,15 +16,17 @@ struct dma_heap; @@ -1729416,7 +1729276,7 @@ index 83b8cfb2d760..e8f0e92c27dd 100644 + unsigned int heap_flags); #endif /* _DMA_HEAPS_H */ diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h -index 2112f21f73d8..f51561eda33b 100644 +index 2112f21f7..f51561eda 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, @@ -1729449,7 +1729309,7 @@ index 2112f21f73d8..f51561eda33b 100644 #endif /* CONFIG_IOMMU_DMA */ #endif /* __DMA_IOMMU_H */ diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h -index a5f89fc4d6df..84c14dbcdb66 100644 +index ba1d93c66..c25005764 100644 --- a/include/linux/dma-map-ops.h +++ b/include/linux/dma-map-ops.h @@ -8,6 +8,7 @@ @@ -1729472,7 +1729332,7 @@ index a5f89fc4d6df..84c14dbcdb66 100644 }; #ifdef CONFIG_DMA_OPS -@@ -258,6 +264,14 @@ void arch_dma_free(struct device *dev, size_t size, void *cpu_addr, +@@ -261,6 +267,14 @@ void arch_dma_free(struct device *dev, size_t size, void *cpu_addr, #define pgprot_dmacoherent(prot) pgprot_noncached(prot) #endif @@ -1729488,7 +1729348,7 @@ index a5f89fc4d6df..84c14dbcdb66 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 a7d70cdee25e..7270f12e2c78 100644 +index a7d70cdee..7270f12e2 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -61,6 +61,23 @@ @@ -1729516,7 +1729376,7 @@ index a7d70cdee25e..7270f12e2c78 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 dd357a747780..493a047ed0a2 100644 +index 4e4cce0ad..1c85c1a90 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -418,6 +418,9 @@ enum dma_slave_buswidth { @@ -1729539,7 +1729399,7 @@ index dd357a747780..493a047ed0a2 100644 /** diff --git a/include/linux/energy_model.h b/include/linux/energy_model.h -index 5f04a2b35e80..9ca1ea02fa72 100644 +index 5f04a2b35..9ca1ea02f 100644 --- a/include/linux/energy_model.h +++ b/include/linux/energy_model.h @@ -29,6 +29,8 @@ struct em_perf_state { @@ -1729590,7 +1729450,7 @@ index 5f04a2b35e80..9ca1ea02fa72 100644 return -EINVAL; } diff --git a/include/linux/extcon.h b/include/linux/extcon.h -index fa1e431ee6d9..6f851be8cb25 100644 +index fa1e431ee..6f851be8c 100644 --- a/include/linux/extcon.h +++ b/include/linux/extcon.h @@ -37,6 +37,7 @@ @@ -1729602,7 +1729462,7 @@ index fa1e431ee6d9..6f851be8cb25 100644 /* * Charging external connector diff --git a/include/linux/freezer.h b/include/linux/freezer.h -index 27828145ca09..f753c307b8b3 100644 +index 27828145c..f753c307b 100644 --- a/include/linux/freezer.h +++ b/include/linux/freezer.h @@ -27,6 +27,11 @@ static inline bool frozen(struct task_struct *p) @@ -1729626,8 +1729486,8 @@ index 27828145ca09..f753c307b8b3 100644 static inline void __thaw_task(struct task_struct *t) {} diff --git a/include/linux/initramfs.h b/include/linux/initramfs.h -new file mode 100755 -index 000000000000..26953171620f +new file mode 100644 +index 000000000..269531716 --- /dev/null +++ b/include/linux/initramfs.h @@ -0,0 +1,40 @@ @@ -1729672,7 +1729532,7 @@ index 000000000000..26953171620f + +#endif /* _LINUX_INITRAMFS_H */ diff --git a/include/linux/iommu.h b/include/linux/iommu.h -index e90c267e7f3e..f94cfde78201 100644 +index e90c267e7..f94cfde78 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -31,6 +31,26 @@ @@ -1729762,7 +1729622,7 @@ index e90c267e7f3e..f94cfde78201 100644 /** diff --git a/include/linux/iova.h b/include/linux/iova.h -index 6c19b09e9663..0b6e1fb344d4 100644 +index 6c19b09e9..0b6e1fb34 100644 --- a/include/linux/iova.h +++ b/include/linux/iova.h @@ -95,6 +95,7 @@ struct iova_domain { @@ -1729774,7 +1729634,7 @@ index 6c19b09e9663..0b6e1fb344d4 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 f6d092fdb93d..ffb0a87055b1 100644 +index f6d092fdb..ffb0a8705 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) @@ -1729787,7 +1729647,7 @@ index f6d092fdb93d..ffb0a87055b1 100644 #endif diff --git a/include/linux/irqchip/arm-gic-v4.h b/include/linux/irqchip/arm-gic-v4.h -index 6976b8331b60..943c3411ca10 100644 +index 74e11617b..a767453a6 100644 --- a/include/linux/irqchip/arm-gic-v4.h +++ b/include/linux/irqchip/arm-gic-v4.h @@ -39,6 +39,8 @@ struct its_vpe { @@ -1729799,7 +1729659,7 @@ index 6976b8331b60..943c3411ca10 100644 union { /* GICv4.0 implementations */ struct { -@@ -104,6 +106,7 @@ enum its_vcpu_info_cmd_type { +@@ -106,6 +108,7 @@ enum its_vcpu_info_cmd_type { PROP_UPDATE_AND_INV_VLPI, SCHEDULE_VPE, DESCHEDULE_VPE, @@ -1729807,7 +1729667,7 @@ index 6976b8331b60..943c3411ca10 100644 INVALL_VPE, PROP_UPDATE_VSGI, }; -@@ -129,6 +132,7 @@ int its_alloc_vcpu_irqs(struct its_vm *vm); +@@ -131,6 +134,7 @@ int its_alloc_vcpu_irqs(struct its_vm *vm); void its_free_vcpu_irqs(struct its_vm *vm); int its_make_vpe_resident(struct its_vpe *vpe, bool g0en, bool g1en); int its_make_vpe_non_resident(struct its_vpe *vpe, bool db); @@ -1729816,7 +1729676,7 @@ index 6976b8331b60..943c3411ca10 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 3baea2ef33fb..2b770134cc97 100644 +index 3baea2ef3..2b770134c 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -25,6 +25,10 @@ extern unsigned long max_pfn; @@ -1729913,8 +1729773,8 @@ index 3baea2ef33fb..2b770134cc97 100644 return memblock.bottom_up; } diff --git a/include/linux/memory_group_manager.h b/include/linux/memory_group_manager.h -new file mode 100755 -index 000000000000..786e3b995f29 +new file mode 100644 +index 000000000..786e3b995 --- /dev/null +++ b/include/linux/memory_group_manager.h @@ -0,0 +1,223 @@ @@ -1730142,7 +1730002,7 @@ index 000000000000..786e3b995f29 + +#endif /* _MEMORY_GROUP_MANAGER_H_ */ diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h -index e07f6e61cd38..7cdc5dfa4fce 100644 +index e07f6e61c..7cdc5dfa4 100644 --- a/include/linux/mfd/rk808.h +++ b/include/linux/mfd/rk808.h @@ -113,6 +113,235 @@ enum rk808_reg { @@ -1730694,10 +1730554,10 @@ index e07f6e61cd38..7cdc5dfa4fce 100644 }; #endif /* __LINUX_REGULATOR_RK808_H */ diff --git a/include/linux/mm.h b/include/linux/mm.h -index 9ed1be47c8cb..9d52a0c60677 100644 +index 181830659..8cdae5baf 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -2944,6 +2944,8 @@ extern bool page_poisoning_enabled(void); +@@ -2946,6 +2946,8 @@ extern bool page_poisoning_enabled(void); extern void kernel_poison_pages(struct page *page, int numpages, int enable); #else static inline bool page_poisoning_enabled(void) { return false; } @@ -1730707,7 +1730567,7 @@ index 9ed1be47c8cb..9d52a0c60677 100644 int enable) { } #endif diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h -index 40d7e98fc990..819f6119dff3 100644 +index fb08b86ac..96ac20fb5 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -141,6 +141,7 @@ struct mmc_host_ops { @@ -1730718,7 +1730578,7 @@ index 40d7e98fc990..819f6119dff3 100644 /* The tuning command opcode value is different for SD and eMMC cards */ int (*execute_tuning)(struct mmc_host *host, u32 opcode); -@@ -483,6 +484,9 @@ void mmc_free_host(struct mmc_host *); +@@ -485,6 +486,9 @@ void mmc_free_host(struct mmc_host *); int mmc_of_parse(struct mmc_host *host); int mmc_of_parse_voltage(struct device_node *np, u32 *mask); @@ -1730729,7 +1730589,7 @@ index 40d7e98fc990..819f6119dff3 100644 { return (void *)host->private; diff --git a/include/linux/mmu_context.h b/include/linux/mmu_context.h -index 03dee12d2b61..bc4ac3c525e6 100644 +index 03dee12d2..bc4ac3c52 100644 --- a/include/linux/mmu_context.h +++ b/include/linux/mmu_context.h @@ -14,4 +14,12 @@ @@ -1730746,8 +1730606,8 @@ index 03dee12d2b61..bc4ac3c525e6 100644 + #endif diff --git a/include/linux/phy/pcie.h b/include/linux/phy/pcie.h -new file mode 100755 -index 000000000000..93c997f520fe +new file mode 100644 +index 000000000..93c997f52 --- /dev/null +++ b/include/linux/phy/pcie.h @@ -0,0 +1,12 @@ @@ -1730764,8 +1730624,8 @@ index 000000000000..93c997f520fe + +#endif diff --git a/include/linux/phy/phy-rockchip-typec.h b/include/linux/phy/phy-rockchip-typec.h -new file mode 100755 -index 000000000000..1d6af83d3b89 +new file mode 100644 +index 000000000..1d6af83d3 --- /dev/null +++ b/include/linux/phy/phy-rockchip-typec.h @@ -0,0 +1,34 @@ @@ -1730804,8 +1730664,8 @@ index 000000000000..1d6af83d3b89 + +#endif diff --git a/include/linux/power/bq25700-charge.h b/include/linux/power/bq25700-charge.h -new file mode 100755 -index 000000000000..5e7d3e40d2ea +new file mode 100644 +index 000000000..5e7d3e40d --- /dev/null +++ b/include/linux/power/bq25700-charge.h @@ -0,0 +1,20 @@ @@ -1730830,8 +1730690,8 @@ index 000000000000..5e7d3e40d2ea + +#endif /* __CHARGER_BQ25700_H_ */ diff --git a/include/linux/power/cw2015_battery.h b/include/linux/power/cw2015_battery.h -new file mode 100755 -index 000000000000..8e6b1fc7e344 +new file mode 100644 +index 000000000..8e6b1fc7e --- /dev/null +++ b/include/linux/power/cw2015_battery.h @@ -0,0 +1,119 @@ @@ -1730955,8 +1730815,8 @@ index 000000000000..8e6b1fc7e344 + +#endif diff --git a/include/linux/power/rk_usbbc.h b/include/linux/power/rk_usbbc.h -new file mode 100755 -index 000000000000..45f7128b3a69 +new file mode 100644 +index 000000000..45f7128b3 --- /dev/null +++ b/include/linux/power/rk_usbbc.h @@ -0,0 +1,44 @@ @@ -1731005,7 +1730865,7 @@ index 000000000000..45f7128b3a69 + +#endif diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h -index e6fe2f581bda..26ca45b7b9b9 100644 +index e6fe2f581..26ca45b7b 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -49,6 +49,12 @@ enum { @@ -1731063,7 +1730923,7 @@ index e6fe2f581bda..26ca45b7b9b9 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 000000000000..a6b151916b37 +index 000000000..a6b151916 --- /dev/null +++ b/include/linux/priority_control_manager.h @@ -0,0 +1,77 @@ @@ -1731145,7 +1731005,7 @@ index 000000000000..a6b151916b37 + +#endif /* _PRIORITY_CONTROL_MANAGER_H_ */ diff --git a/include/linux/pwm.h b/include/linux/pwm.h -index a13ff383fa1d..6b2a7fb80de8 100644 +index c0cf66133..296573c4a 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h @@ -59,6 +59,9 @@ struct pwm_state { @@ -1731159,7 +1731019,7 @@ index a13ff383fa1d..6b2a7fb80de8 100644 }; diff --git a/include/linux/reboot.h b/include/linux/reboot.h -index 3734cd8f38a8..1c8d7856c559 100644 +index 3734cd8f3..1c8d7856c 100644 --- a/include/linux/reboot.h +++ b/include/linux/reboot.h @@ -49,6 +49,26 @@ extern int register_restart_handler(struct notifier_block *); @@ -1731190,7 +1731050,7 @@ index 3734cd8f38a8..1c8d7856c559 100644 * Architecture-specific implementations of sys_reboot commands. */ diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h -index 633e7a2ab01d..521e48c34d07 100644 +index 633e7a2ab..521e48c34 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -223,6 +223,8 @@ enum regulator_type { @@ -1731211,7 +1731071,7 @@ index 633e7a2ab01d..521e48c34d07 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 ce8df21863f0..e8703b6fc13d 100644 +index ce8df2186..e8703b6fc 100644 --- a/include/linux/regulator/fan53555.h +++ b/include/linux/regulator/fan53555.h @@ -52,6 +52,8 @@ struct fan53555_platform_data { @@ -1731224,8 +1731084,8 @@ index ce8df21863f0..e8703b6fc13d 100644 #endif /* __FAN53555_H__ */ diff --git a/include/linux/rfkill-bt.h b/include/linux/rfkill-bt.h -new file mode 100755 -index 000000000000..c4174b156580 +new file mode 100644 +index 000000000..c4174b156 --- /dev/null +++ b/include/linux/rfkill-bt.h @@ -0,0 +1,73 @@ @@ -1731303,8 +1731163,8 @@ index 000000000000..c4174b156580 +#endif /* __RFKILL_GPIO_H */ + diff --git a/include/linux/rfkill-wlan.h b/include/linux/rfkill-wlan.h -new file mode 100755 -index 000000000000..431e71a7a844 +new file mode 100644 +index 000000000..431e71a7a --- /dev/null +++ b/include/linux/rfkill-wlan.h @@ -0,0 +1,62 @@ @@ -1731371,8 +1731231,8 @@ index 000000000000..431e71a7a844 + +#endif diff --git a/include/linux/rk_keys.h b/include/linux/rk_keys.h -new file mode 100755 -index 000000000000..aee656daf2c8 +new file mode 100644 +index 000000000..aee656daf --- /dev/null +++ b/include/linux/rk_keys.h @@ -0,0 +1,19 @@ @@ -1731396,8 +1731256,8 @@ index 000000000000..aee656daf2c8 + +#endif diff --git a/include/linux/rockchip-iovmm.h b/include/linux/rockchip-iovmm.h -new file mode 100755 -index 000000000000..3005c745e5b8 +new file mode 100644 +index 000000000..3005c745e --- /dev/null +++ b/include/linux/rockchip-iovmm.h @@ -0,0 +1,91 @@ @@ -1731493,8 +1731353,8 @@ index 000000000000..3005c745e5b8 + +#endif /*__ASM_PLAT_IOVMM_H*/ diff --git a/include/linux/rockchip/cpu.h b/include/linux/rockchip/cpu.h -new file mode 100755 -index 000000000000..beaaf923f9ec +new file mode 100644 +index 000000000..beaaf923f --- /dev/null +++ b/include/linux/rockchip/cpu.h @@ -0,0 +1,272 @@ @@ -1731771,8 +1731631,8 @@ index 000000000000..beaaf923f9ec + +#endif diff --git a/include/linux/rockchip/grf.h b/include/linux/rockchip/grf.h -new file mode 100755 -index 000000000000..fae51232297c +new file mode 100644 +index 000000000..fae512322 --- /dev/null +++ b/include/linux/rockchip/grf.h @@ -0,0 +1,700 @@ @@ -1732478,7 +1732338,7 @@ index 000000000000..fae51232297c +#endif diff --git a/include/linux/rockchip/nvmem.h b/include/linux/rockchip/nvmem.h new file mode 100644 -index 000000000000..741887856e33 +index 000000000..741887856 --- /dev/null +++ b/include/linux/rockchip/nvmem.h @@ -0,0 +1,26 @@ @@ -1732509,8 +1732369,8 @@ index 000000000000..741887856e33 +#endif +#endif diff --git a/include/linux/rockchip/psci.h b/include/linux/rockchip/psci.h -new file mode 100755 -index 000000000000..870da27edf65 +new file mode 100644 +index 000000000..870da27ed --- /dev/null +++ b/include/linux/rockchip/psci.h @@ -0,0 +1,76 @@ @@ -1732592,7 +1732452,7 @@ index 000000000000..870da27edf65 +#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 000000000000..2c95b04b092d +index 000000000..2c95b04b0 --- /dev/null +++ b/include/linux/rockchip/rockchip_pm_config.h @@ -0,0 +1,32 @@ @@ -1732629,8 +1732489,8 @@ index 000000000000..2c95b04b092d + +#endif /* __ROCKCHIP_PM_CONFIG_H */ diff --git a/include/linux/rockchip/rockchip_sip.h b/include/linux/rockchip/rockchip_sip.h -new file mode 100755 -index 000000000000..70b1493ef697 +new file mode 100644 +index 000000000..70b1493ef --- /dev/null +++ b/include/linux/rockchip/rockchip_sip.h @@ -0,0 +1,549 @@ @@ -1733184,8 +1733044,8 @@ index 000000000000..70b1493ef697 + +#endif diff --git a/include/linux/rockchip_ion.h b/include/linux/rockchip_ion.h -new file mode 100755 -index 000000000000..39c497774fb0 +new file mode 100644 +index 000000000..39c497774 --- /dev/null +++ b/include/linux/rockchip_ion.h @@ -0,0 +1,41 @@ @@ -1733231,7 +1733091,7 @@ index 000000000000..39c497774fb0 + +#endif diff --git a/include/linux/sched.h b/include/linux/sched.h -index d590141f04d1..b5d9a9ce8d86 100644 +index 05dc5bae4..4627f2e34 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1369,7 +1369,7 @@ struct task_struct { @@ -1733244,7 +1733104,7 @@ index d590141f04d1..b5d9a9ce8d86 100644 #endif diff --git a/include/linux/sched/signal.h b/include/linux/sched/signal.h -index ae60f838ebb9..9a0e2a1d626c 100644 +index 2c634010c..ce76124a2 100644 --- a/include/linux/sched/signal.h +++ b/include/linux/sched/signal.h @@ -12,6 +12,7 @@ @@ -1733256,7 +1733116,7 @@ index ae60f838ebb9..9a0e2a1d626c 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 c078f0a94cec..9544c9d9d534 100644 +index c078f0a94..9544c9d9d 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) @@ -1733283,8 +1733143,8 @@ index c078f0a94cec..9544c9d9d534 100644 #endif /* _LINUX_SCHED_XACCT_H */ diff --git a/include/linux/sensor-dev.h b/include/linux/sensor-dev.h -new file mode 100755 -index 000000000000..6ae9c16e67a3 +new file mode 100644 +index 000000000..6ae9c16e6 --- /dev/null +++ b/include/linux/sensor-dev.h @@ -0,0 +1,350 @@ @@ -1733639,8 +1733499,8 @@ index 000000000000..6ae9c16e67a3 +extern int sensor_read_reg_normal(struct i2c_client *client); + diff --git a/include/linux/soc/rockchip/pvtm.h b/include/linux/soc/rockchip/pvtm.h -new file mode 100755 -index 000000000000..3d2495cfd6e5 +new file mode 100644 +index 000000000..3d2495cfd --- /dev/null +++ b/include/linux/soc/rockchip/pvtm.h @@ -0,0 +1,17 @@ @@ -1733663,7 +1733523,7 @@ index 000000000000..3d2495cfd6e5 +#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 000000000000..14f70f72e383 +index 000000000..14f70f72e --- /dev/null +++ b/include/linux/soc/rockchip/rk_sdmmc.h @@ -0,0 +1,13 @@ @@ -1733681,8 +1733541,8 @@ index 000000000000..14f70f72e383 + +#endif diff --git a/include/linux/soc/rockchip/rk_vendor_storage.h b/include/linux/soc/rockchip/rk_vendor_storage.h -new file mode 100755 -index 000000000000..d30b775e6a5f +new file mode 100644 +index 000000000..d30b775e6 --- /dev/null +++ b/include/linux/soc/rockchip/rk_vendor_storage.h @@ -0,0 +1,96 @@ @@ -1733783,8 +1733643,8 @@ index 000000000000..d30b775e6a5f + +#endif diff --git a/include/linux/soc/rockchip/rockchip_decompress.h b/include/linux/soc/rockchip/rockchip_decompress.h -new file mode 100755 -index 000000000000..120ae907c2aa +new file mode 100644 +index 000000000..120ae907c --- /dev/null +++ b/include/linux/soc/rockchip/rockchip_decompress.h @@ -0,0 +1,42 @@ @@ -1733831,8 +1733691,8 @@ index 000000000000..120ae907c2aa + +#endif diff --git a/include/linux/soc/rockchip/rockchip_thunderboot_crypto.h b/include/linux/soc/rockchip/rockchip_thunderboot_crypto.h -new file mode 100755 -index 000000000000..2fe176649409 +new file mode 100644 +index 000000000..2fe176649 --- /dev/null +++ b/include/linux/soc/rockchip/rockchip_thunderboot_crypto.h @@ -0,0 +1,9 @@ @@ -1733847,7 +1733707,7 @@ index 000000000000..2fe176649409 +#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 000000000000..d0a08a07c21d +index 000000000..d0a08a07c --- /dev/null +++ b/include/linux/soc/rockchip/rockchip_thunderboot_service.h @@ -0,0 +1,37 @@ @@ -1733889,10 +1733749,10 @@ index 000000000000..d0a08a07c21d +#endif +#endif diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h -index abf7b8ec1fb6..bf41c178e22e 100644 +index 184d7a814..45c2cbe60 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h -@@ -183,6 +183,7 @@ struct plat_stmmacenet_data { +@@ -182,6 +182,7 @@ struct plat_stmmacenet_data { void (*serdes_powerdown)(struct net_device *ndev, void *priv); int (*init)(struct platform_device *pdev, void *priv); void (*exit)(struct platform_device *pdev, void *priv); @@ -1733901,7 +1733761,7 @@ index abf7b8ec1fb6..bf41c178e22e 100644 void *bsp_priv; struct clk *stmmac_clk; diff --git a/include/linux/thermal.h b/include/linux/thermal.h -index 7097d4dcfdd0..781e5bfbb9b4 100644 +index 7097d4dcf..781e5bfbb 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -399,6 +399,7 @@ void thermal_cdev_update(struct thermal_cooling_device *); @@ -1733923,14 +1733783,8 @@ index 7097d4dcfdd0..781e5bfbb9b4 100644 #endif /* CONFIG_THERMAL */ #endif /* __THERMAL_H__ */ -diff --git a/include/linux/usb/audio-v2.h b/include/linux/usb/audio-v2.h -old mode 100644 -new mode 100755 -diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h -old mode 100644 -new mode 100755 diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h -index a2d229ab63ba..4d352204e819 100644 +index a2d229ab6..4d352204e 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, @@ -1733951,8 +1733805,8 @@ index a2d229ab63ba..4d352204e819 100644 const char *name); void (*free_func_inst)(struct usb_function_instance *inst); diff --git a/include/linux/usb/f_accessory.h b/include/linux/usb/f_accessory.h -new file mode 100755 -index 000000000000..ebe3c4d59309 +new file mode 100644 +index 000000000..ebe3c4d59 --- /dev/null +++ b/include/linux/usb/f_accessory.h @@ -0,0 +1,23 @@ @@ -1733980,9 +1733834,7 @@ index 000000000000..ebe3c4d59309 + +#endif /* __LINUX_USB_F_ACCESSORY_H */ diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h -old mode 100644 -new mode 100755 -index e7351d64f11f..daf43d1af134 +index 11df3d5b4..daf43d1af 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -217,6 +217,7 @@ struct usb_ep_caps { @@ -1734037,7 +1733889,7 @@ index e7351d64f11f..daf43d1af134 const char *name; struct device dev; diff --git a/include/linux/usb/pd.h b/include/linux/usb/pd.h -index 433040ff840a..96b7ff66f074 100644 +index 433040ff8..96b7ff66f 100644 --- a/include/linux/usb/pd.h +++ b/include/linux/usb/pd.h @@ -225,6 +225,7 @@ enum pd_pdo_type { @@ -1734077,7 +1733929,7 @@ index 433040ff840a..96b7ff66f074 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 0eb83ce19597..b517ebc8f0ff 100644 +index 0eb83ce19..b517ebc8f 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 { @@ -1734090,7 +1733942,7 @@ index 0eb83ce19597..b517ebc8f0ff 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 68bdc4e2f5a9..7f5e330a68a6 100644 +index 68bdc4e2f..7f5e330a6 100644 --- a/include/linux/usb/pd_vdo.h +++ b/include/linux/usb/pd_vdo.h @@ -21,22 +21,24 @@ @@ -1734533,7 +1734385,7 @@ index 68bdc4e2f5a9..7f5e330a68a6 100644 * SVDM Discover SVIDs request -> response * diff --git a/include/linux/usb/quirks.h b/include/linux/usb/quirks.h -index 5e4c497f54d6..6567f7445c2d 100644 +index 5e4c497f5..6567f7445 100644 --- a/include/linux/usb/quirks.h +++ b/include/linux/usb/quirks.h @@ -72,4 +72,7 @@ @@ -1734545,7 +1734397,7 @@ index 5e4c497f54d6..6567f7445c2d 100644 + #endif /* __LINUX_USB_QUIRKS_H */ diff --git a/include/linux/usb/tcpm.h b/include/linux/usb/tcpm.h -index 09762d26fa0c..cb69546f87af 100644 +index 09762d26f..cb69546f8 100644 --- a/include/linux/usb/tcpm.h +++ b/include/linux/usb/tcpm.h @@ -19,6 +19,10 @@ enum typec_cc_status { @@ -1734655,9 +1734507,7 @@ index 09762d26fa0c..cb69546f87af 100644 #endif /* __LINUX_USB_TCPM_H */ diff --git a/include/linux/usb/typec.h b/include/linux/usb/typec.h -old mode 100644 -new mode 100755 -index 6be558045942..a5e685dd6dad +index 6be558045..a5e685dd6 100644 --- a/include/linux/usb/typec.h +++ b/include/linux/usb/typec.h @@ -17,6 +17,7 @@ struct typec_partner; @@ -1734778,7 +1734628,7 @@ index 6be558045942..a5e685dd6dad +int typec_get_negotiated_svdm_version(struct typec_port *port); #endif /* __LINUX_USB_TYPEC_H */ diff --git a/include/linux/usb/typec_altmode.h b/include/linux/usb/typec_altmode.h -index 5e0a7b7647c3..65933cbe9129 100644 +index 22b8ee8f0..c33a8bc62 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) @@ -1734799,7 +1734649,7 @@ index 5e0a7b7647c3..65933cbe9129 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 47c2d501ddce..63dd44b72e0c 100644 +index 47c2d501d..63dd44b72 100644 --- a/include/linux/usb/typec_tbt.h +++ b/include/linux/usb/typec_tbt.h @@ -39,12 +39,16 @@ struct typec_thunderbolt_data { @@ -1734821,7 +1734671,7 @@ index 47c2d501ddce..63dd44b72e0c 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 8110c29fab42..2e4f7721fc4e 100644 +index 8110c29fa..2e4f7721f 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@ -83,8 +83,6 @@ struct usbnet { @@ -1734835,7 +1734685,7 @@ index 8110c29fab42..2e4f7721fc4e 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 000000000000..c9b1f62684d1 +index 000000000..c9b1f6268 --- /dev/null +++ b/include/linux/version_compat_defs.h @@ -0,0 +1,79 @@ @@ -1734919,8 +1734769,8 @@ index 000000000000..c9b1f62684d1 + +#endif /* _VERSION_COMPAT_DEFS_H_ */ diff --git a/include/linux/wakelock.h b/include/linux/wakelock.h -new file mode 100755 -index 000000000000..7b4825ba9521 +new file mode 100644 +index 000000000..7b4825ba9 --- /dev/null +++ b/include/linux/wakelock.h @@ -0,0 +1,76 @@ @@ -1735001,8 +1734851,8 @@ index 000000000000..7b4825ba9521 + +#endif diff --git a/include/linux/wakeup_reason.h b/include/linux/wakeup_reason.h -new file mode 100755 -index 000000000000..54f5caaa5cde +new file mode 100644 +index 000000000..54f5caaa5 --- /dev/null +++ b/include/linux/wakeup_reason.h @@ -0,0 +1,37 @@ @@ -1735044,7 +1734894,7 @@ index 000000000000..54f5caaa5cde + +#endif /* _LINUX_WAKEUP_REASON_H */ diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h -index 92cd9f038fed..03b43b0f706e 100644 +index 92cd9f038..03b43b0f7 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, @@ -1735070,8 +1734920,8 @@ index 92cd9f038fed..03b43b0f706e 100644 * v4l2_async_notifier_unregister - unregisters a subdevice * asynchronous notifier diff --git a/include/soc/rockchip/android-version.h b/include/soc/rockchip/android-version.h -new file mode 100755 -index 000000000000..e0d865bab335 +new file mode 100644 +index 000000000..e0d865bab --- /dev/null +++ b/include/soc/rockchip/android-version.h @@ -0,0 +1,17 @@ @@ -1735093,8 +1734943,8 @@ index 000000000000..e0d865bab335 + (((a) << 24) + ((b) << 16) + ((c) << 8) + (r)) +#endif diff --git a/include/soc/rockchip/pm_domains.h b/include/soc/rockchip/pm_domains.h -new file mode 100755 -index 000000000000..0e1fadd3d52e +new file mode 100644 +index 000000000..0e1fadd3d --- /dev/null +++ b/include/soc/rockchip/pm_domains.h @@ -0,0 +1,61 @@ @@ -1735161,7 +1735011,7 @@ index 000000000000..0e1fadd3d52e +#endif diff --git a/include/soc/rockchip/rk_minidump.h b/include/soc/rockchip/rk_minidump.h new file mode 100644 -index 000000000000..c9e9efd2222b +index 000000000..c9e9efd22 --- /dev/null +++ b/include/soc/rockchip/rk_minidump.h @@ -0,0 +1,75 @@ @@ -1735241,8 +1735091,8 @@ index 000000000000..c9e9efd2222b +extern bool (*md_is_ddr_address)(u64 virt_addr); +#endif /* __RK_MINIDUMP_H */ diff --git a/include/soc/rockchip/rkfb_dmc.h b/include/soc/rockchip/rkfb_dmc.h -new file mode 100755 -index 000000000000..5e82b3194dd3 +new file mode 100644 +index 000000000..5e82b3194 --- /dev/null +++ b/include/soc/rockchip/rkfb_dmc.h @@ -0,0 +1,11 @@ @@ -1735259,7 +1735109,7 @@ index 000000000000..5e82b3194dd3 +#endif diff --git a/include/soc/rockchip/rockchip-mailbox.h b/include/soc/rockchip/rockchip-mailbox.h new file mode 100644 -index 000000000000..e3698b9e10fe +index 000000000..e3698b9e1 --- /dev/null +++ b/include/soc/rockchip/rockchip-mailbox.h @@ -0,0 +1,30 @@ @@ -1735294,8 +1735144,8 @@ index 000000000000..e3698b9e10fe + +#endif /* __SOC_ROCKCHIP_MAILBOX_H__ */ diff --git a/include/soc/rockchip/rockchip-system-status.h b/include/soc/rockchip/rockchip-system-status.h -new file mode 100755 -index 000000000000..5eb53ff2f3f3 +new file mode 100644 +index 000000000..5eb53ff2f --- /dev/null +++ b/include/soc/rockchip/rockchip-system-status.h @@ -0,0 +1,55 @@ @@ -1735356,7 +1735206,7 @@ index 000000000000..5eb53ff2f3f3 +#endif diff --git a/include/soc/rockchip/rockchip_amp.h b/include/soc/rockchip/rockchip_amp.h new file mode 100644 -index 000000000000..851c0f47d54a +index 000000000..851c0f47d --- /dev/null +++ b/include/soc/rockchip/rockchip_amp.h @@ -0,0 +1,48 @@ @@ -1735410,7 +1735260,7 @@ index 000000000000..851c0f47d54a +#endif /* _ROCKCHIP_AMP */ diff --git a/include/soc/rockchip/rockchip_csu.h b/include/soc/rockchip/rockchip_csu.h new file mode 100644 -index 000000000000..4338d68359f7 +index 000000000..4338d6835 --- /dev/null +++ b/include/soc/rockchip/rockchip_csu.h @@ -0,0 +1,46 @@ @@ -1735461,8 +1735311,8 @@ index 000000000000..4338d68359f7 + +#endif diff --git a/include/soc/rockchip/rockchip_dmc.h b/include/soc/rockchip/rockchip_dmc.h -new file mode 100755 -index 000000000000..f115cdcec291 +new file mode 100644 +index 000000000..f115cdcec --- /dev/null +++ b/include/soc/rockchip/rockchip_dmc.h @@ -0,0 +1,131 @@ @@ -1735599,7 +1735449,7 @@ index 000000000000..f115cdcec291 +#endif diff --git a/include/soc/rockchip/rockchip_dvbm.h b/include/soc/rockchip/rockchip_dvbm.h new file mode 100644 -index 000000000000..19596f1bd4c6 +index 000000000..19596f1bd --- /dev/null +++ b/include/soc/rockchip/rockchip_dvbm.h @@ -0,0 +1,161 @@ @@ -1735765,8 +1735615,8 @@ index 000000000000..19596f1bd4c6 + +#endif diff --git a/include/soc/rockchip/rockchip_iommu.h b/include/soc/rockchip/rockchip_iommu.h -new file mode 100755 -index 000000000000..191a2fda8f1a +new file mode 100644 +index 000000000..191a2fda8 --- /dev/null +++ b/include/soc/rockchip/rockchip_iommu.h @@ -0,0 +1,52 @@ @@ -1735823,8 +1735673,8 @@ index 000000000000..191a2fda8f1a + +#endif diff --git a/include/soc/rockchip/rockchip_ipa.h b/include/soc/rockchip/rockchip_ipa.h -new file mode 100755 -index 000000000000..cb333f463c7b +new file mode 100644 +index 000000000..cb333f463 --- /dev/null +++ b/include/soc/rockchip/rockchip_ipa.h @@ -0,0 +1,40 @@ @@ -1735869,8 +1735719,8 @@ index 000000000000..cb333f463c7b + +#endif diff --git a/include/soc/rockchip/rockchip_opp_select.h b/include/soc/rockchip/rockchip_opp_select.h -new file mode 100755 -index 000000000000..e7669f29cbd5 +new file mode 100644 +index 000000000..e7669f29c --- /dev/null +++ b/include/soc/rockchip/rockchip_opp_select.h @@ -0,0 +1,286 @@ @@ -1736162,7 +1736012,7 @@ index 000000000000..e7669f29cbd5 +#endif diff --git a/include/soc/rockchip/rockchip_performance.h b/include/soc/rockchip/rockchip_performance.h new file mode 100644 -index 000000000000..c080fb65c7a5 +index 000000000..c080fb65c --- /dev/null +++ b/include/soc/rockchip/rockchip_performance.h @@ -0,0 +1,33 @@ @@ -1736201,7 +1736051,7 @@ index 000000000000..c080fb65c7a5 +#endif diff --git a/include/soc/rockchip/rockchip_rockit.h b/include/soc/rockchip/rockchip_rockit.h new file mode 100644 -index 000000000000..760a864d24bc +index 000000000..760a864d2 --- /dev/null +++ b/include/soc/rockchip/rockchip_rockit.h @@ -0,0 +1,187 @@ @@ -1736393,7 +1736243,7 @@ index 000000000000..760a864d24bc + +#endif diff --git a/include/soc/rockchip/rockchip_sip.h b/include/soc/rockchip/rockchip_sip.h -index c46a9ae2a2ab..269cf14c38fb 100644 +index c46a9ae2a..269cf14c3 100644 --- a/include/soc/rockchip/rockchip_sip.h +++ b/include/soc/rockchip/rockchip_sip.h @@ -15,6 +15,14 @@ @@ -1736413,8 +1736263,8 @@ index c46a9ae2a2ab..269cf14c38fb 100644 #endif diff --git a/include/soc/rockchip/rockchip_system_monitor.h b/include/soc/rockchip/rockchip_system_monitor.h -new file mode 100755 -index 000000000000..0ca822d1041f +new file mode 100644 +index 000000000..0ca822d10 --- /dev/null +++ b/include/soc/rockchip/rockchip_system_monitor.h @@ -0,0 +1,237 @@ @@ -1736656,7 +1736506,7 @@ index 000000000000..0ca822d1041f + +#endif diff --git a/include/sound/hdmi-codec.h b/include/sound/hdmi-codec.h -index b55970859a13..4fc733c8c570 100644 +index b55970859..4fc733c8c 100644 --- a/include/sound/hdmi-codec.h +++ b/include/sound/hdmi-codec.h @@ -34,6 +34,11 @@ struct hdmi_codec_daifmt { @@ -1736696,7 +1736546,7 @@ index b55970859a13..4fc733c8c570 100644 * Shuts down the audio stream. * Mandatory diff --git a/include/trace/events/cpuhp.h b/include/trace/events/cpuhp.h -index ad16f77310c6..f302ab6dbfb8 100644 +index ad16f7731..f302ab6db 100644 --- a/include/trace/events/cpuhp.h +++ b/include/trace/events/cpuhp.h @@ -89,6 +89,28 @@ TRACE_EVENT(cpuhp_exit, @@ -1736729,7 +1736579,7 @@ index ad16f77310c6..f302ab6dbfb8 100644 /* This part must be outside protection */ diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h -index dd5fff2bb1b2..6c6a23b4b3c1 100644 +index dd5fff2bb..6c6a23b4b 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h @@ -203,6 +203,7 @@ TRACE_EVENT(sched_migrate_task, @@ -1736757,8 +1736607,8 @@ index dd5fff2bb1b2..6c6a23b4b3c1 100644 DECLARE_EVENT_CLASS(sched_process_template, diff --git a/include/trace/events/thermal_ipa_power.h b/include/trace/events/thermal_ipa_power.h -new file mode 100755 -index 000000000000..a3a932c75d6a +new file mode 100644 +index 000000000..a3a932c75 --- /dev/null +++ b/include/trace/events/thermal_ipa_power.h @@ -0,0 +1,47 @@ @@ -1736810,7 +1736660,7 @@ index 000000000000..a3a932c75d6a +/* This part must be outside protection */ +#include diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h -index dad9d3b4a97a..1c10ff522c6d 100644 +index dad9d3b4a..1c10ff522 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -242,6 +242,8 @@ extern "C" { @@ -1736876,8 +1736726,8 @@ index dad9d3b4a97a..1c10ff522c6d 100644 } #endif diff --git a/include/uapi/drm/rockchip_drm.h b/include/uapi/drm/rockchip_drm.h -new file mode 100755 -index 000000000000..2ac71b43dba0 +new file mode 100644 +index 000000000..2ac71b43d --- /dev/null +++ b/include/uapi/drm/rockchip_drm.h @@ -0,0 +1,139 @@ @@ -1737022,7 +1736872,7 @@ index 000000000000..2ac71b43dba0 +#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 000000000000..a44da7beb041 +index 000000000..a44da7beb --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.h @@ -0,0 +1,77 @@ @@ -1737105,7 +1736955,7 @@ index 000000000000..a44da7beb041 +#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 000000000000..c83cedd6a775 +index 000000000..c83cedd6a --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.h @@ -0,0 +1,36 @@ @@ -1737147,7 +1736997,7 @@ index 000000000000..c83cedd6a775 +#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 000000000000..c18c6fc8a7ae +index 000000000..c18c6fc8a --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/csf/mali_base_csf_kernel.h @@ -0,0 +1,613 @@ @@ -1737766,7 +1737616,7 @@ index 000000000000..c18c6fc8a7ae +#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 000000000000..f49ab0036fc3 +index 000000000..f49ab0036 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/csf/mali_kbase_csf_errors_dumpfault.h @@ -0,0 +1,81 @@ @@ -1737853,7 +1737703,7 @@ index 000000000000..f49ab0036fc3 +#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 000000000000..7c37cfc077f8 +index 000000000..7c37cfc07 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/csf/mali_kbase_csf_ioctl.h @@ -0,0 +1,614 @@ @@ -1738473,7 +1738323,7 @@ index 000000000000..7c37cfc077f8 +#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 000000000000..0ca5d902f174 +index 000000000..0ca5d902f --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h @@ -0,0 +1,41 @@ @@ -1738520,7 +1738370,7 @@ index 000000000000..0ca5d902f174 +#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 000000000000..9bfd6d2fc529 +index 000000000..9bfd6d2fc --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h @@ -0,0 +1,50 @@ @@ -1738576,7 +1738426,7 @@ index 000000000000..9bfd6d2fc529 +#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 000000000000..83d84137a034 +index 000000000..83d84137a --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_coherency.h @@ -0,0 +1,30 @@ @@ -1738612,7 +1738462,7 @@ index 000000000000..83d84137a034 +#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 000000000000..784e09a7edc2 +index 000000000..784e09a7e --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_id.h @@ -0,0 +1,145 @@ @@ -1738763,7 +1738613,7 @@ index 000000000000..784e09a7edc2 +#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 000000000000..1f331671b6b4 +index 000000000..1f331671b --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h @@ -0,0 +1,98 @@ @@ -1738867,7 +1738717,7 @@ index 000000000000..1f331671b6b4 +#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 000000000000..1a3098d6cad8 +index 000000000..1a3098d6c --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/jm/mali_base_jm_kernel.h @@ -0,0 +1,1055 @@ @@ -1739928,7 +1739778,7 @@ index 000000000000..1a3098d6cad8 +#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 000000000000..ac6affe8c76c +index 000000000..ac6affe8c --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/jm/mali_kbase_jm_ioctl.h @@ -0,0 +1,247 @@ @@ -1740181,7 +1740031,7 @@ index 000000000000..ac6affe8c76c +#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 000000000000..f8378146aceb +index 000000000..f8378146a --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_base_common_kernel.h @@ -0,0 +1,231 @@ @@ -1740418,7 +1740268,7 @@ index 000000000000..f8378146aceb +#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 000000000000..e6cac0eb2a1a +index 000000000..e6cac0eb2 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_base_kernel.h @@ -0,0 +1,643 @@ @@ -1741067,7 +1740917,7 @@ index 000000000000..e6cac0eb2a1a +#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 000000000000..70f5b0977520 +index 000000000..70f5b0977 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_base_mem_priv.h @@ -0,0 +1,57 @@ @@ -1741130,7 +1740980,7 @@ index 000000000000..70f5b0977520 +#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 000000000000..5089bf249528 +index 000000000..5089bf249 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_kbase_hwcnt_reader.h @@ -0,0 +1,503 @@ @@ -1741639,7 +1741489,7 @@ index 000000000000..5089bf249528 +#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 000000000000..c8a54f91165e +index 000000000..c8a54f911 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_kbase_ioctl.h @@ -0,0 +1,789 @@ @@ -1742434,7 +1742284,7 @@ index 000000000000..c8a54f91165e +#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 000000000000..72e1b9dbf245 +index 000000000..72e1b9dbf --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_kbase_kinstr_jm_reader.h @@ -0,0 +1,69 @@ @@ -1742509,7 +1742359,7 @@ index 000000000000..72e1b9dbf245 +#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 000000000000..329845005341 +index 000000000..329845005 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs_buf_size.h @@ -0,0 +1,35 @@ @@ -1742549,7 +1742399,7 @@ index 000000000000..329845005341 + +#endif /*_UAPI_KBASE_MEM_PROFILE_DEBUGFS_BUF_SIZE_H_*/ diff --git a/include/uapi/linux/cec.h b/include/uapi/linux/cec.h -index 7d1a06c52469..ebbcb9b0104a 100644 +index 7d1a06c52..ebbcb9b01 100644 --- a/include/uapi/linux/cec.h +++ b/include/uapi/linux/cec.h @@ -516,6 +516,12 @@ struct cec_event { @@ -1742566,8 +1742416,8 @@ index 7d1a06c52469..ebbcb9b0104a 100644 * The remainder of this header defines all CEC messages and operands. * The format matters since it the cec-ctl utility parses it to generate diff --git a/include/uapi/linux/fec-config.h b/include/uapi/linux/fec-config.h -new file mode 100755 -index 000000000000..2b3f97fb2a3e +new file mode 100644 +index 000000000..2b3f97fb2 --- /dev/null +++ b/include/uapi/linux/fec-config.h @@ -0,0 +1,33 @@ @@ -1742605,7 +1742455,7 @@ index 000000000000..2b3f97fb2a3e + +#endif diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h -index 84fa53ffb13f..f16dff5b49cc 100644 +index 84fa53ffb..f16dff5b4 100644 --- a/include/uapi/linux/media-bus-format.h +++ b/include/uapi/linux/media-bus-format.h @@ -34,7 +34,7 @@ @@ -1742630,8 +1742480,8 @@ index 84fa53ffb13f..f16dff5b49cc 100644 /* YUV (including grey) - next is 0x202e */ #define MEDIA_BUS_FMT_Y8_1X8 0x2001 diff --git a/include/uapi/linux/rk-camera-module.h b/include/uapi/linux/rk-camera-module.h -new file mode 100755 -index 000000000000..68e57c0a9e41 +new file mode 100644 +index 000000000..68e57c0a9 --- /dev/null +++ b/include/uapi/linux/rk-camera-module.h @@ -0,0 +1,813 @@ @@ -1743450,7 +1743300,7 @@ index 000000000000..68e57c0a9e41 +#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 000000000000..b7a7fd1ddb3b +index 000000000..b7a7fd1dd --- /dev/null +++ b/include/uapi/linux/rk-decom.h @@ -0,0 +1,34 @@ @@ -1743490,7 +1743340,7 @@ index 000000000000..b7a7fd1ddb3b +#endif diff --git a/include/uapi/linux/rk-dma-heap.h b/include/uapi/linux/rk-dma-heap.h new file mode 100644 -index 000000000000..4e83d71811ce +index 000000000..4e83d7181 --- /dev/null +++ b/include/uapi/linux/rk-dma-heap.h @@ -0,0 +1,55 @@ @@ -1743551,7 +1743401,7 @@ index 000000000000..4e83d71811ce +#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 000000000000..58da85c9cb2e +index 000000000..58da85c9c --- /dev/null +++ b/include/uapi/linux/rk-iomux.h @@ -0,0 +1,20 @@ @@ -1743577,7 +1743427,7 @@ index 000000000000..58da85c9cb2e +#endif diff --git a/include/uapi/linux/rk-isp1-config.h b/include/uapi/linux/rk-isp1-config.h new file mode 100644 -index 000000000000..72b8755dd707 +index 000000000..72b8755dd --- /dev/null +++ b/include/uapi/linux/rk-isp1-config.h @@ -0,0 +1,872 @@ @@ -1744455,7 +1744305,7 @@ index 000000000000..72b8755dd707 +#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 000000000000..50949e0752bc +index 000000000..50949e075 --- /dev/null +++ b/include/uapi/linux/rk-isp2-config.h @@ -0,0 +1,2018 @@ @@ -1746479,7 +1746329,7 @@ index 000000000000..50949e0752bc +#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 000000000000..aad8fbad705c +index 000000000..aad8fbad7 --- /dev/null +++ b/include/uapi/linux/rk-isp21-config.h @@ -0,0 +1,813 @@ @@ -1747298,7 +1747148,7 @@ index 000000000000..aad8fbad705c +#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 000000000000..e14492674b3e +index 000000000..e14492674 --- /dev/null +++ b/include/uapi/linux/rk-isp3-config.h @@ -0,0 +1,1077 @@ @@ -1748381,7 +1748231,7 @@ index 000000000000..e14492674b3e +#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 000000000000..ecd4eaef2cd3 +index 000000000..ecd4eaef2 --- /dev/null +++ b/include/uapi/linux/rk-isp32-config.h @@ -0,0 +1,1528 @@ @@ -1749915,7 +1749765,7 @@ index 000000000000..ecd4eaef2cd3 +#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 000000000000..616ddff9ed64 +index 000000000..616ddff9e --- /dev/null +++ b/include/uapi/linux/rk-ispp-config.h @@ -0,0 +1,422 @@ @@ -1750342,8 +1750192,8 @@ index 000000000000..616ddff9ed64 + +#endif diff --git a/include/uapi/linux/rk-led-flash.h b/include/uapi/linux/rk-led-flash.h -new file mode 100755 -index 000000000000..c679cb9eb39a +new file mode 100644 +index 000000000..c679cb9eb --- /dev/null +++ b/include/uapi/linux/rk-led-flash.h @@ -0,0 +1,9 @@ @@ -1750358,7 +1750208,7 @@ index 000000000000..c679cb9eb39a +#endif diff --git a/include/uapi/linux/rk-mpp.h b/include/uapi/linux/rk-mpp.h new file mode 100644 -index 000000000000..9a24407001ec +index 000000000..9a2440700 --- /dev/null +++ b/include/uapi/linux/rk-mpp.h @@ -0,0 +1,82 @@ @@ -1750445,8 +1750295,8 @@ index 000000000000..9a24407001ec + +#endif /* _UAPI_RK_MPP_H */ diff --git a/include/uapi/linux/rk-pcie-dma.h b/include/uapi/linux/rk-pcie-dma.h -new file mode 100755 -index 000000000000..bf4a96b5eea7 +new file mode 100644 +index 000000000..bf4a96b5e --- /dev/null +++ b/include/uapi/linux/rk-pcie-dma.h @@ -0,0 +1,57 @@ @@ -1750509,7 +1750359,7 @@ index 000000000000..bf4a96b5eea7 +#endif diff --git a/include/uapi/linux/rk-pcie-ep.h b/include/uapi/linux/rk-pcie-ep.h new file mode 100644 -index 000000000000..d89748eed925 +index 000000000..d89748eed --- /dev/null +++ b/include/uapi/linux/rk-pcie-ep.h @@ -0,0 +1,122 @@ @@ -1750636,8 +1750486,8 @@ index 000000000000..d89748eed925 + +#endif diff --git a/include/uapi/linux/rk-preisp.h b/include/uapi/linux/rk-preisp.h -new file mode 100755 -index 000000000000..4cd51a84ada8 +new file mode 100644 +index 000000000..4cd51a84a --- /dev/null +++ b/include/uapi/linux/rk-preisp.h @@ -0,0 +1,118 @@ @@ -1750760,8 +1750610,8 @@ index 000000000000..4cd51a84ada8 + +#endif /* _UAPI_RKPREISP_H */ diff --git a/include/uapi/linux/rk-video-format.h b/include/uapi/linux/rk-video-format.h -new file mode 100755 -index 000000000000..938d5adff737 +new file mode 100644 +index 000000000..938d5adff --- /dev/null +++ b/include/uapi/linux/rk-video-format.h @@ -0,0 +1,37 @@ @@ -1750803,8 +1750653,8 @@ index 000000000000..938d5adff737 + +#endif /* _UAPI_RK_VIDEO_FORMAT_H */ diff --git a/include/uapi/linux/rk803.h b/include/uapi/linux/rk803.h -new file mode 100755 -index 000000000000..448468da9e8d +new file mode 100644 +index 000000000..448468da9 --- /dev/null +++ b/include/uapi/linux/rk803.h @@ -0,0 +1,16 @@ @@ -1750826,7 +1750676,7 @@ index 000000000000..448468da9e8d +#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 000000000000..571488235471 +index 000000000..571488235 --- /dev/null +++ b/include/uapi/linux/rk_cryptodev.h @@ -0,0 +1,85 @@ @@ -1750917,7 +1750767,7 @@ index 000000000000..571488235471 +#endif diff --git a/include/uapi/linux/rk_hdmirx_config.h b/include/uapi/linux/rk_hdmirx_config.h new file mode 100644 -index 000000000000..26dcea790013 +index 000000000..26dcea790 --- /dev/null +++ b/include/uapi/linux/rk_hdmirx_config.h @@ -0,0 +1,88 @@ @@ -1751010,8 +1750860,8 @@ index 000000000000..26dcea790013 + +#endif /* _UAPI_RK_HDMIRX_CONFIG_H */ diff --git a/include/uapi/linux/rk_vcm_head.h b/include/uapi/linux/rk_vcm_head.h -new file mode 100755 -index 000000000000..4e663ae260d8 +new file mode 100644 +index 000000000..4e663ae26 --- /dev/null +++ b/include/uapi/linux/rk_vcm_head.h @@ -0,0 +1,137 @@ @@ -1751153,8 +1751003,8 @@ index 000000000000..4e663ae260d8 +#endif /* RK_VCM_HEAD_H */ + diff --git a/include/uapi/linux/rkcif-config.h b/include/uapi/linux/rkcif-config.h -new file mode 100755 -index 000000000000..c9b9bbf0d301 +new file mode 100644 +index 000000000..c9b9bbf0d --- /dev/null +++ b/include/uapi/linux/rkcif-config.h @@ -0,0 +1,91 @@ @@ -1751250,8 +1751100,8 @@ index 000000000000..c9b9bbf0d301 + +#endif diff --git a/include/uapi/linux/rkisp1-config.h b/include/uapi/linux/rkisp1-config.h -new file mode 100755 -index 000000000000..c26d4bb69261 +new file mode 100644 +index 000000000..c26d4bb69 --- /dev/null +++ b/include/uapi/linux/rkisp1-config.h @@ -0,0 +1,872 @@ @@ -1752128,8 +1751978,8 @@ index 000000000000..c26d4bb69261 + +#endif /* _UAPI_RKISP1_CONFIG_H */ diff --git a/include/uapi/linux/rkisp2-config.h b/include/uapi/linux/rkisp2-config.h -new file mode 100755 -index 000000000000..9d41f9e8a097 +new file mode 100644 +index 000000000..9d41f9e8a --- /dev/null +++ b/include/uapi/linux/rkisp2-config.h @@ -0,0 +1,1853 @@ @@ -1753987,8 +1753837,8 @@ index 000000000000..9d41f9e8a097 + +#endif /* _UAPI_RKISP2_CONFIG_H */ diff --git a/include/uapi/linux/rkisp21-config.h b/include/uapi/linux/rkisp21-config.h -new file mode 100755 -index 000000000000..203022b62361 +new file mode 100644 +index 000000000..203022b62 --- /dev/null +++ b/include/uapi/linux/rkisp21-config.h @@ -0,0 +1,804 @@ @@ -1754797,8 +1754647,8 @@ index 000000000000..203022b62361 + +#endif /* _UAPI_RKISP21_CONFIG_H */ diff --git a/include/uapi/linux/rkisp3-config.h b/include/uapi/linux/rkisp3-config.h -new file mode 100755 -index 000000000000..25bbe1a9a146 +new file mode 100644 +index 000000000..25bbe1a9a --- /dev/null +++ b/include/uapi/linux/rkisp3-config.h @@ -0,0 +1,1072 @@ @@ -1755875,8 +1755725,8 @@ index 000000000000..25bbe1a9a146 + +#endif /* _UAPI_RKISP3_CONFIG_H */ diff --git a/include/uapi/linux/rkispp-config.h b/include/uapi/linux/rkispp-config.h -new file mode 100755 -index 000000000000..b4a27f74f9c9 +new file mode 100644 +index 000000000..b4a27f74f --- /dev/null +++ b/include/uapi/linux/rkispp-config.h @@ -0,0 +1,370 @@ @@ -1756251,7 +1756101,7 @@ index 000000000000..b4a27f74f9c9 + +#endif diff --git a/include/uapi/linux/serial_reg.h b/include/uapi/linux/serial_reg.h -index f51bc8f36813..7e3fe68af328 100644 +index f51bc8f36..7e3fe68af 100644 --- a/include/uapi/linux/serial_reg.h +++ b/include/uapi/linux/serial_reg.h @@ -30,6 +30,7 @@ @@ -1756263,8 +1756113,8 @@ index f51bc8f36813..7e3fe68af328 100644 #define UART_IIR 2 /* In: Interrupt ID Register */ #define UART_IIR_NO_INT 0x01 /* No interrupts pending */ diff --git a/include/uapi/linux/usb/f_accessory.h b/include/uapi/linux/usb/f_accessory.h -new file mode 100755 -index 000000000000..0baeb7d0d74c +new file mode 100644 +index 000000000..0baeb7d0d --- /dev/null +++ b/include/uapi/linux/usb/f_accessory.h @@ -0,0 +1,146 @@ @@ -1756415,7 +1756265,7 @@ index 000000000000..0baeb7d0d74c + +#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 652f169a019e..428926e35973 100644 +index 652f169a0..428926e35 100644 --- a/include/uapi/linux/usb/g_uvc.h +++ b/include/uapi/linux/usb/g_uvc.h @@ -19,7 +19,9 @@ @@ -1756430,7 +1756280,7 @@ index 652f169a019e..428926e35973 100644 struct uvc_request_data { __s32 length; diff --git a/include/uapi/linux/usb/video.h b/include/uapi/linux/usb/video.h -index c58854fb7d94..d160d5bdd730 100644 +index c58854fb7..d160d5bdd 100644 --- a/include/uapi/linux/usb/video.h +++ b/include/uapi/linux/usb/video.h @@ -597,5 +597,63 @@ struct UVC_FRAME_MJPEG(n) { \ @@ -1756498,7 +1756348,7 @@ index c58854fb7d94..d160d5bdd730 100644 #endif /* __LINUX_USB_VIDEO_H */ diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index b28817c59fdf..622e97c1060f 100644 +index 55b8c4b82..6f937714d 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -689,6 +689,7 @@ struct v4l2_pix_format { @@ -1756511,7 +1756361,7 @@ index b28817c59fdf..622e97c1060f 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 000000000000..c217380d1713 +index 000000000..c217380d1 --- /dev/null +++ b/include/uapi/misc/rkflash_vendor_storage.h @@ -0,0 +1,22 @@ @@ -1756538,10 +1756388,10 @@ index 000000000000..c217380d1713 + +#endif diff --git a/init/Kconfig b/init/Kconfig -index 70bd7f69076a..4ce9ca666ce7 100644 +index 8cfe761ff..8ea66ec4c 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1365,6 +1365,12 @@ if BLK_DEV_INITRD +@@ -1376,6 +1376,12 @@ if BLK_DEV_INITRD source "usr/Kconfig" @@ -1756555,7 +1756405,7 @@ index 70bd7f69076a..4ce9ca666ce7 100644 config BOOT_CONFIG diff --git a/init/initramfs.c b/init/initramfs.c -index 55b74d7e5260..f4c4e2404dfd 100644 +index 65c9b45f9..ded50387c 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -12,6 +12,7 @@ @@ -1756566,7 +1756416,7 @@ index 55b74d7e5260..f4c4e2404dfd 100644 #include static ssize_t __init xwrite(struct file *file, const char *p, size_t count, -@@ -465,6 +466,9 @@ static char * __init unpack_to_rootfs(char *buf, unsigned long len) +@@ -480,6 +481,9 @@ static char * __init unpack_to_rootfs(char *buf, unsigned long len) state = Start; this_header = 0; message = NULL; @@ -1756576,7 +1756426,7 @@ index 55b74d7e5260..f4c4e2404dfd 100644 while (!message && len) { loff_t saved_offset = this_header; if (*buf == '0' && !(this_header & 3)) { -@@ -639,4 +643,23 @@ static int __init populate_rootfs(void) +@@ -699,4 +703,23 @@ static int __init populate_rootfs(void) flush_delayed_fput(); return 0; } @@ -1756601,10 +1756451,10 @@ index 55b74d7e5260..f4c4e2404dfd 100644 rootfs_initcall(populate_rootfs); +#endif diff --git a/init/main.c b/init/main.c -index 30d6afeae932..bc383f09d3c6 100644 +index 124d586f2..04d33abd9 100644 --- a/init/main.c +++ b/init/main.c -@@ -1524,6 +1524,10 @@ static noinline void __init kernel_init_freeable(void) +@@ -1515,6 +1515,10 @@ static noinline void __init kernel_init_freeable(void) smp_init(); sched_init_smp(); @@ -1756615,7 +1756465,7 @@ index 30d6afeae932..bc383f09d3c6 100644 padata_init(); page_alloc_init_late(); /* Initialize page ext after all struct pages are initialized. */ -@@ -1533,6 +1537,10 @@ static noinline void __init kernel_init_freeable(void) +@@ -1524,6 +1528,10 @@ static noinline void __init kernel_init_freeable(void) kunit_run_all_tests(); @@ -1756627,7 +1756477,7 @@ index 30d6afeae932..bc383f09d3c6 100644 /* diff --git a/ipc/msg.c b/ipc/msg.c -index 8ded6b8f10a2..6e6c8e0c9380 100644 +index 8ded6b8f1..6e6c8e0c9 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -147,7 +147,7 @@ static int newque(struct ipc_namespace *ns, struct ipc_params *params) @@ -1756640,7 +1756490,7 @@ index 8ded6b8f10a2..6e6c8e0c9380 100644 return -ENOMEM; diff --git a/ipc/sem.c b/ipc/sem.c -index 916f7a90be31..d735cecd9c1d 100644 +index 916f7a90b..d735cecd9 100644 --- a/ipc/sem.c +++ b/ipc/sem.c @@ -511,7 +511,7 @@ static struct sem_array *sem_alloc(size_t nsems) @@ -1756671,7 +1756521,7 @@ index 916f7a90be31..d735cecd9c1d 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 b418731d66e8..471ac3e7498d 100644 +index b418731d6..471ac3e74 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -711,7 +711,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params) @@ -1756684,7 +1756534,7 @@ index b418731d66e8..471ac3e7498d 100644 return -ENOMEM; diff --git a/ipc/util.c b/ipc/util.c -index 7c3601dad9bd..bbb5190af6d9 100644 +index 7c3601dad..bbb5190af 100644 --- a/ipc/util.c +++ b/ipc/util.c @@ -754,13 +754,21 @@ struct pid_namespace *ipc_seq_pid_ns(struct seq_file *s) @@ -1756714,7 +1756564,7 @@ index 7c3601dad9bd..bbb5190af6d9 100644 if (ipc != NULL) { rcu_read_lock(); diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index aaad2dce2be6..22d4909597d0 100644 +index 4b904a732..0df0c9141 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -128,21 +128,6 @@ static struct bpf_map *find_and_alloc_map(union bpf_attr *attr) @@ -1756767,16 +1756617,25 @@ index aaad2dce2be6..22d4909597d0 100644 } static const struct vm_operations_struct bpf_map_default_vmops = { -@@ -664,7 +655,7 @@ static int bpf_map_mmap(struct file *filp, struct vm_area_struct *vma) - goto out; - - if (vma->vm_flags & VM_MAYWRITE) +@@ -649,7 +640,7 @@ static int bpf_map_mmap(struct file *filp, struct vm_area_struct *vma) + err = -EACCES; + goto out; + } - bpf_map_write_active_inc(map); + map->writecnt++; + } out: mutex_unlock(&map->freeze_mutex); +@@ -667,7 +658,7 @@ static int bpf_map_mmap(struct file *filp, struct vm_area_struct *vma) + err = map->ops->map_mmap(map, vma); + if (err) { + if (vma->vm_flags & VM_WRITE) +- bpf_map_write_active_dec(map); ++ map->writecnt--; + } + return err; -@@ -1096,7 +1087,6 @@ static int map_update_elem(union bpf_attr *attr) +@@ -1099,7 +1090,6 @@ static int map_update_elem(union bpf_attr *attr) map = __bpf_map_get(f); if (IS_ERR(map)) return PTR_ERR(map); @@ -1756784,7 +1756643,7 @@ index aaad2dce2be6..22d4909597d0 100644 if (!(map_get_sys_perms(map, f) & FMODE_CAN_WRITE)) { err = -EPERM; goto err_put; -@@ -1138,7 +1128,6 @@ static int map_update_elem(union bpf_attr *attr) +@@ -1141,7 +1131,6 @@ static int map_update_elem(union bpf_attr *attr) free_key: kfree(key); err_put: @@ -1756792,7 +1756651,7 @@ index aaad2dce2be6..22d4909597d0 100644 fdput(f); return err; } -@@ -1161,7 +1150,6 @@ static int map_delete_elem(union bpf_attr *attr) +@@ -1164,7 +1153,6 @@ static int map_delete_elem(union bpf_attr *attr) map = __bpf_map_get(f); if (IS_ERR(map)) return PTR_ERR(map); @@ -1756800,7 +1756659,7 @@ index aaad2dce2be6..22d4909597d0 100644 if (!(map_get_sys_perms(map, f) & FMODE_CAN_WRITE)) { err = -EPERM; goto err_put; -@@ -1192,7 +1180,6 @@ static int map_delete_elem(union bpf_attr *attr) +@@ -1195,7 +1183,6 @@ static int map_delete_elem(union bpf_attr *attr) out: kfree(key); err_put: @@ -1756808,7 +1756667,7 @@ index aaad2dce2be6..22d4909597d0 100644 fdput(f); return err; } -@@ -1500,7 +1487,6 @@ static int map_lookup_and_delete_elem(union bpf_attr *attr) +@@ -1509,7 +1496,6 @@ static int map_lookup_and_delete_elem(union bpf_attr *attr) map = __bpf_map_get(f); if (IS_ERR(map)) return PTR_ERR(map); @@ -1756816,7 +1756675,7 @@ index aaad2dce2be6..22d4909597d0 100644 if (!(map_get_sys_perms(map, f) & FMODE_CAN_READ) || !(map_get_sys_perms(map, f) & FMODE_CAN_WRITE)) { err = -EPERM; -@@ -1542,7 +1528,6 @@ static int map_lookup_and_delete_elem(union bpf_attr *attr) +@@ -1551,7 +1537,6 @@ static int map_lookup_and_delete_elem(union bpf_attr *attr) free_key: kfree(key); err_put: @@ -1756824,7 +1756683,7 @@ index aaad2dce2be6..22d4909597d0 100644 fdput(f); return err; } -@@ -1569,7 +1554,8 @@ static int map_freeze(const union bpf_attr *attr) +@@ -1578,7 +1563,8 @@ static int map_freeze(const union bpf_attr *attr) } mutex_lock(&map->freeze_mutex); @@ -1756834,7 +1756693,7 @@ index aaad2dce2be6..22d4909597d0 100644 err = -EBUSY; goto err_put; } -@@ -3996,9 +3982,6 @@ static int bpf_map_do_batch(const union bpf_attr *attr, +@@ -4017,9 +4003,6 @@ static int bpf_map_do_batch(const union bpf_attr *attr, union bpf_attr __user *uattr, int cmd) { @@ -1756844,7 +1756703,7 @@ index aaad2dce2be6..22d4909597d0 100644 struct bpf_map *map; int err, ufd; struct fd f; -@@ -4011,13 +3994,16 @@ static int bpf_map_do_batch(const union bpf_attr *attr, +@@ -4032,13 +4015,16 @@ static int bpf_map_do_batch(const union bpf_attr *attr, map = __bpf_map_get(f); if (IS_ERR(map)) return PTR_ERR(map); @@ -1756865,7 +1756724,7 @@ index aaad2dce2be6..22d4909597d0 100644 err = -EPERM; goto err_put; } -@@ -4030,9 +4016,8 @@ static int bpf_map_do_batch(const union bpf_attr *attr, +@@ -4051,9 +4037,8 @@ static int bpf_map_do_batch(const union bpf_attr *attr, BPF_DO_BATCH(map->ops->map_update_batch); else BPF_DO_BATCH(map->ops->map_delete_batch); @@ -1756877,10 +1756736,10 @@ index aaad2dce2be6..22d4909597d0 100644 return err; } diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c -index f1deefc9bdcd..a27746e4b7c9 100644 +index c162addef..96ae200c4 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c -@@ -3577,22 +3577,7 @@ static void coerce_reg_to_size(struct bpf_reg_state *reg, int size) +@@ -3724,22 +3724,7 @@ static void coerce_reg_to_size(struct bpf_reg_state *reg, int size) static bool bpf_map_is_rdonly(const struct bpf_map *map) { @@ -1756905,10 +1756764,10 @@ index f1deefc9bdcd..a27746e4b7c9 100644 static int bpf_map_direct_read(struct bpf_map *map, int off, int size, u64 *val) diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c -index 1592411cbdd5..3090a66cc509 100644 +index 715582c18..4ba47bd3a 100644 --- a/kernel/cgroup/cgroup-v1.c +++ b/kernel/cgroup/cgroup-v1.c -@@ -520,7 +520,8 @@ static ssize_t __cgroup1_procs_write(struct kernfs_open_file *of, +@@ -519,7 +519,8 @@ static ssize_t __cgroup1_procs_write(struct kernfs_open_file *of, if (!uid_eq(cred->euid, GLOBAL_ROOT_UID) && #endif !uid_eq(cred->euid, tcred->uid) && @@ -1756919,10 +1756778,10 @@ index 1592411cbdd5..3090a66cc509 100644 put_cred(tcred); if (ret) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c -index b68de0d09632..cbab2f812db6 100644 +index 1069407bd..78c19685b 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c -@@ -374,9 +374,9 @@ static DEFINE_SPINLOCK(callback_lock); +@@ -375,9 +375,9 @@ static DEFINE_SPINLOCK(callback_lock); static struct workqueue_struct *cpuset_migrate_mm_wq; /* @@ -1756934,7 +1756793,7 @@ index b68de0d09632..cbab2f812db6 100644 static DECLARE_WORK(cpuset_hotplug_work, cpuset_hotplug_workfn); static DECLARE_WAIT_QUEUE_HEAD(cpuset_attach_wq); -@@ -396,18 +396,29 @@ static inline bool is_in_v2_mode(void) +@@ -397,18 +397,29 @@ static inline bool is_in_v2_mode(void) } /* @@ -1756970,7 +1756829,7 @@ index b68de0d09632..cbab2f812db6 100644 cs = parent_cs(cs); if (unlikely(!cs)) { /* -@@ -417,11 +428,13 @@ static void guarantee_online_cpus(struct cpuset *cs, struct cpumask *pmask) +@@ -418,11 +429,13 @@ static void guarantee_online_cpus(struct cpuset *cs, struct cpumask *pmask) * cpuset's effective_cpus is on its way to be * identical to cpu_online_mask. */ @@ -1756987,7 +1756846,7 @@ index b68de0d09632..cbab2f812db6 100644 } /* -@@ -512,6 +525,9 @@ static inline int alloc_cpumasks(struct cpuset *cs, struct tmpmasks *tmp) +@@ -513,6 +526,9 @@ static inline int alloc_cpumasks(struct cpuset *cs, struct tmpmasks *tmp) if (cs && !zalloc_cpumask_var(pmask4, GFP_KERNEL)) goto free_three; @@ -1756997,7 +1756856,7 @@ index b68de0d09632..cbab2f812db6 100644 return 0; free_three: -@@ -1025,7 +1041,6 @@ static void rebuild_sched_domains_locked(void) +@@ -1026,7 +1042,6 @@ static void rebuild_sched_domains_locked(void) struct cpuset *cs; int ndoms; @@ -1757005,7 +1756864,7 @@ index b68de0d09632..cbab2f812db6 100644 lockdep_assert_held(&cpuset_mutex); /* -@@ -1083,6 +1098,12 @@ void rebuild_sched_domains(void) +@@ -1084,6 +1099,12 @@ void rebuild_sched_domains(void) put_online_cpus(); } @@ -1757018,7 +1756877,7 @@ index b68de0d09632..cbab2f812db6 100644 /** * update_tasks_cpumask - Update the cpumasks of tasks in the cpuset. * @cs: the cpuset in which each task's cpus_allowed mask needs to be changed -@@ -1105,7 +1126,7 @@ static void update_tasks_cpumask(struct cpuset *cs) +@@ -1106,7 +1127,7 @@ static void update_tasks_cpumask(struct cpuset *cs) if (top_cs && (task->flags & PF_KTHREAD) && kthread_is_per_cpu(task)) continue; @@ -1757027,7 +1756886,7 @@ index b68de0d09632..cbab2f812db6 100644 } css_task_iter_end(&it); } -@@ -1130,8 +1151,7 @@ static void compute_effective_cpumask(struct cpumask *new_cpus, +@@ -1131,8 +1152,7 @@ static void compute_effective_cpumask(struct cpumask *new_cpus, cpumask_and(new_cpus, new_cpus, cs->cpus_requested); cpumask_and(new_cpus, new_cpus, cpu_active_mask); } else { @@ -1757037,7 +1756896,7 @@ index b68de0d09632..cbab2f812db6 100644 } } -@@ -2302,20 +2322,18 @@ static void cpuset_attach(struct cgroup_taskset *tset) +@@ -2303,20 +2323,18 @@ static void cpuset_attach(struct cgroup_taskset *tset) lockdep_assert_cpus_held(); /* see cgroup_attach_lock() */ mutex_lock(&cpuset_mutex); @@ -1757063,7 +1756922,7 @@ index b68de0d09632..cbab2f812db6 100644 cpuset_change_task_nodemask(task, &cpuset_attach_nodemask_to); cpuset_update_task_spread_flag(cs, task); -@@ -2994,10 +3012,10 @@ static void cpuset_bind(struct cgroup_subsys_state *root_css) +@@ -2995,10 +3013,10 @@ static void cpuset_bind(struct cgroup_subsys_state *root_css) */ static void cpuset_fork(struct task_struct *task) { @@ -1757075,7 +1756934,7 @@ index b68de0d09632..cbab2f812db6 100644 task->mems_allowed = current->mems_allowed; } -@@ -3257,7 +3275,7 @@ static void cpuset_hotplug_update_tasks(struct cpuset *cs, struct tmpmasks *tmp) +@@ -3258,7 +3276,7 @@ static void cpuset_hotplug_update_tasks(struct cpuset *cs, struct tmpmasks *tmp) * Note that CPU offlining during suspend is ignored. We don't modify * cpusets across suspend/resume cycles at all. */ @@ -1757084,7 +1756943,7 @@ index b68de0d09632..cbab2f812db6 100644 { static cpumask_t new_cpus; static nodemask_t new_mems; -@@ -3369,6 +3387,7 @@ void cpuset_wait_for_hotplug(void) +@@ -3370,6 +3388,7 @@ void cpuset_wait_for_hotplug(void) { flush_work(&cpuset_hotplug_work); } @@ -1757092,7 +1756951,7 @@ index b68de0d09632..cbab2f812db6 100644 /* * Keep top_cpuset.mems_allowed tracking node_states[N_MEMORY]. -@@ -3427,11 +3446,11 @@ void cpuset_cpus_allowed(struct task_struct *tsk, struct cpumask *pmask) +@@ -3428,11 +3447,11 @@ void cpuset_cpus_allowed(struct task_struct *tsk, struct cpumask *pmask) spin_lock_irqsave(&callback_lock, flags); rcu_read_lock(); @@ -1757106,7 +1756965,7 @@ index b68de0d09632..cbab2f812db6 100644 /** * cpuset_cpus_allowed_fallback - final fallback before complete catastrophe. * @tsk: pointer to task_struct with which the scheduler is struggling -@@ -3446,9 +3465,17 @@ void cpuset_cpus_allowed(struct task_struct *tsk, struct cpumask *pmask) +@@ -3447,9 +3466,17 @@ void cpuset_cpus_allowed(struct task_struct *tsk, struct cpumask *pmask) void cpuset_cpus_allowed_fallback(struct task_struct *tsk) { @@ -1757127,7 +1756986,7 @@ index b68de0d09632..cbab2f812db6 100644 /* diff --git a/kernel/cgroup/legacy_freezer.c b/kernel/cgroup/legacy_freezer.c -index 08236798d173..081d026f13db 100644 +index 08236798d..081d026f1 100644 --- a/kernel/cgroup/legacy_freezer.c +++ b/kernel/cgroup/legacy_freezer.c @@ -479,3 +479,4 @@ struct cgroup_subsys freezer_cgrp_subsys = { @@ -1757136,7 +1756995,7 @@ index 08236798d173..081d026f13db 100644 }; +EXPORT_SYMBOL_GPL(freezer_cgrp_subsys); diff --git a/kernel/cpu.c b/kernel/cpu.c -index 2cda6a3efd76..356baa1b6c9d 100644 +index 2cda6a3ef..356baa1b6 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -40,6 +40,8 @@ @@ -1757172,7 +1757031,7 @@ index 2cda6a3efd76..356baa1b6c9d 100644 if (!cpu_present(cpu)) diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c -index e2999a070a99..79cb6d063b80 100644 +index 4195e7ad1..5e7b66e32 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) @@ -1757184,7 +1757043,7 @@ index e2999a070a99..79cb6d063b80 100644 static u32 irq_readl_be(void __iomem *addr) { diff --git a/kernel/power/Makefile b/kernel/power/Makefile -index 5899260a8bef..97705757f9c6 100644 +index 5899260a8..97705757f 100644 --- a/kernel/power/Makefile +++ b/kernel/power/Makefile @@ -17,4 +17,5 @@ obj-$(CONFIG_PM_WAKELOCKS) += wakelock.o @@ -1757194,7 +1757053,7 @@ index 5899260a8bef..97705757f9c6 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 334173fe6940..c2c858c6d56d 100644 +index 334173fe6..c2c858c6d 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) @@ -1757260,7 +1757119,7 @@ index 334173fe6940..c2c858c6d56d 100644 dev_info(dev, "EM: created perf domain\n"); diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c -index 59a1b126c369..b6875ebd184d 100644 +index 59a1b126c..b6875ebd1 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -326,7 +326,7 @@ static int create_image(int platform_mode) @@ -1757273,7 +1757132,7 @@ index 59a1b126c369..b6875ebd184d 100644 platform_leave(platform_mode); diff --git a/kernel/power/power.h b/kernel/power/power.h -index 24f12d534515..778bf431ec02 100644 +index 24f12d534..778bf431e 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -106,7 +106,7 @@ extern int create_basic_memory_bitmaps(void); @@ -1757286,7 +1757145,7 @@ index 24f12d534515..778bf431ec02 100644 /** * Auxiliary structure used for reading the snapshot image data and diff --git a/kernel/power/process.c b/kernel/power/process.c -index b9faa363c46a..41053c3b4ead 100644 +index b9faa363c..41053c3b4 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c @@ -85,18 +85,21 @@ static int try_to_freeze_tasks(bool user_only) @@ -1757317,7 +1757176,7 @@ index b9faa363c46a..41053c3b4ead 100644 for_each_process_thread(g, p) { if (p != current && !freezer_should_skip(p) diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c -index f5dccd445d36..c60ed74e3cc7 100644 +index c1bdaae07..6a1d97bc5 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -1137,7 +1137,15 @@ void free_basic_memory_bitmaps(void) @@ -1757353,7 +1757212,7 @@ index f5dccd445d36..c60ed74e3cc7 100644 pfn = memory_bm_next_pfn(bm); } diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c -index 4aa4d5d3947f..b776c3db6828 100644 +index 4aa4d5d39..b776c3db6 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -30,6 +30,7 @@ @@ -1757445,8 +1757304,8 @@ index 4aa4d5d3947f..b776c3db6828 100644 if (error) { suspend_stats.fail++; diff --git a/kernel/power/wakeup_reason.c b/kernel/power/wakeup_reason.c -new file mode 100755 -index 000000000000..8fefaa3fdba2 +new file mode 100644 +index 000000000..8fefaa3fd --- /dev/null +++ b/kernel/power/wakeup_reason.c @@ -0,0 +1,438 @@ @@ -1757889,7 +1757748,7 @@ index 000000000000..8fefaa3fdba2 + +late_initcall(wakeup_reason_init); diff --git a/kernel/rcu/tree_stall.h b/kernel/rcu/tree_stall.h -index 251a9af3709a..52cf14bff824 100644 +index 251a9af37..52cf14bff 100644 --- a/kernel/rcu/tree_stall.h +++ b/kernel/rcu/tree_stall.h @@ -15,6 +15,7 @@ @@ -1757910,10 +1757769,10 @@ index 251a9af3709a..52cf14bff824 100644 rcu_force_quiescent_state(); /* Kick them all. */ diff --git a/kernel/reboot.c b/kernel/reboot.c -index af6f23d8bea1..bce629531d2a 100644 +index e297b35fc..2c4470fa9 100644 --- a/kernel/reboot.c +++ b/kernel/reboot.c -@@ -215,6 +215,27 @@ void do_kernel_restart(char *cmd) +@@ -216,6 +216,27 @@ void do_kernel_restart(char *cmd) atomic_notifier_call_chain(&restart_handler_list, reboot_mode, cmd); } @@ -1757942,7 +1757801,7 @@ index af6f23d8bea1..bce629531d2a 100644 { /* The boot cpu is always logical cpu 0 */ diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 9afa1dd0f7e2..867ee64a35a3 100644 +index 49ed67b62..4ad201bb7 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -50,6 +50,13 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(sched_overutilized_tp); @@ -1757996,7 +1757855,7 @@ index 9afa1dd0f7e2..867ee64a35a3 100644 cpu = default_cpu; unlock: rcu_read_unlock(); -@@ -1773,7 +1797,10 @@ static inline bool is_cpu_allowed(struct task_struct *p, int cpu) +@@ -1772,7 +1796,10 @@ static inline bool is_cpu_allowed(struct task_struct *p, int cpu) if (is_per_cpu_kthread(p)) return cpu_online(cpu); @@ -1758008,7 +1757867,7 @@ index 9afa1dd0f7e2..867ee64a35a3 100644 } /* -@@ -2436,10 +2463,9 @@ static int select_fallback_rq(int cpu, struct task_struct *p) +@@ -2435,10 +2462,9 @@ static int select_fallback_rq(int cpu, struct task_struct *p) } fallthrough; case possible: @@ -1758020,7 +1757879,7 @@ index 9afa1dd0f7e2..867ee64a35a3 100644 case fail: #ifdef CONFIG_CPU_ISOLATION_OPT allow_iso = true; -@@ -2630,6 +2656,9 @@ ttwu_do_activate(struct rq *rq, struct task_struct *p, int wake_flags, +@@ -2629,6 +2655,9 @@ ttwu_do_activate(struct rq *rq, struct task_struct *p, int wake_flags, { int en_flags = ENQUEUE_WAKEUP | ENQUEUE_NOCLOCK; @@ -1758030,7 +1757889,7 @@ index 9afa1dd0f7e2..867ee64a35a3 100644 lockdep_assert_held(&rq->lock); if (p->sched_contributes_to_load) -@@ -3026,6 +3055,19 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags) +@@ -3025,6 +3054,19 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags) if (!(p->state & state)) goto unlock; @@ -1758050,7 +1757909,7 @@ index 9afa1dd0f7e2..867ee64a35a3 100644 trace_sched_waking(p); /* We're going to change ->state: */ -@@ -5013,7 +5055,7 @@ asmlinkage __visible void __sched preempt_schedule_irq(void) +@@ -5021,7 +5063,7 @@ asmlinkage __visible void __sched preempt_schedule_irq(void) int default_wake_function(wait_queue_entry_t *curr, unsigned mode, int wake_flags, void *key) { @@ -1758059,7 +1757918,7 @@ index 9afa1dd0f7e2..867ee64a35a3 100644 return try_to_wake_up(curr->private, mode, wake_flags); } EXPORT_SYMBOL(default_wake_function); -@@ -5722,16 +5764,19 @@ int sched_setscheduler(struct task_struct *p, int policy, +@@ -5738,16 +5780,19 @@ int sched_setscheduler(struct task_struct *p, int policy, { return _sched_setscheduler(p, policy, param, true); } @@ -1758079,7 +1757938,7 @@ index 9afa1dd0f7e2..867ee64a35a3 100644 /** * sched_setscheduler_nocheck - change the scheduling policy and/or RT priority of a thread from kernelspace. -@@ -5751,6 +5796,7 @@ int sched_setscheduler_nocheck(struct task_struct *p, int policy, +@@ -5767,6 +5812,7 @@ int sched_setscheduler_nocheck(struct task_struct *p, int policy, { return _sched_setscheduler(p, policy, param, false); } @@ -1758087,7 +1757946,7 @@ index 9afa1dd0f7e2..867ee64a35a3 100644 /* * SCHED_FIFO is a broken scheduler model; that is, it is fundamentally -@@ -7058,6 +7104,11 @@ void migrate_tasks(struct rq *dead_rq, struct rq_flags *rf, +@@ -7061,6 +7107,11 @@ void migrate_tasks(struct rq *dead_rq, struct rq_flags *rf, */ update_rq_clock(rq); @@ -1758100,7 +1757959,7 @@ index 9afa1dd0f7e2..867ee64a35a3 100644 /* * There's this thread running, bail when that's the only diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index e5e72262e2ef..6ea17f110de9 100644 +index 9a701e968..f485a2e19 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 @@ -1758135,7 +1757994,7 @@ index e5e72262e2ef..6ea17f110de9 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 d2a655643a02..b5837e27718e 100644 +index d2a655643..b5837e277 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) @@ -1758147,7 +1758006,7 @@ index d2a655643a02..b5837e27718e 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 2c613e1cff3a..e2890b677e43 100644 +index 2c613e1cf..e2890b677 100644 --- a/kernel/sched/pelt.c +++ b/kernel/sched/pelt.c @@ -28,6 +28,42 @@ @@ -1758203,7 +1758062,7 @@ index 2c613e1cff3a..e2890b677e43 100644 } diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c -index 15b4cc7b8f7a..dce6e444ce86 100644 +index 15b4cc7b8..dce6e444c 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) @@ -1758290,7 +1758149,7 @@ index 15b4cc7b8f7a..dce6e444ce86 100644 int target = find_lowest_rq(p); diff --git a/kernel/sched/sched-pelt.h b/kernel/sched/sched-pelt.h -index c529706bed11..92a6875bc2d3 100644 +index c529706be..92a6875bc 100644 --- a/kernel/sched/sched-pelt.h +++ b/kernel/sched/sched-pelt.h @@ -1,7 +1,7 @@ @@ -1758326,7 +1758185,7 @@ index c529706bed11..92a6875bc2d3 100644 +#define LOAD_AVG_PERIOD pelt_load_avg_period +#define LOAD_AVG_MAX pelt_load_avg_max diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h -index 23cd54413f2e..9e264d895775 100644 +index 8da63d4e4..d57c4c8d5 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1915,6 +1915,8 @@ extern const int sched_latency_to_weight[40]; @@ -1758339,7 +1758198,7 @@ index 23cd54413f2e..9e264d895775 100644 struct sched_class { diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c -index 9191e5daaa3c..58d840c624d7 100644 +index 9191e5daa..58d840c62 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -5,6 +5,9 @@ @@ -1758353,7 +1758212,7 @@ index 9191e5daaa3c..58d840c624d7 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 a55642aa3f68..6911bbca018c 100644 +index a55642aa3..6911bbca0 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 @@ -1758385,9 +1758244,40 @@ index a55642aa3f68..6911bbca018c 100644 { /* Pairs with the smp_store_mb() in wait_woken(). */ smp_mb(); /* C */ +diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c +index 7d0c67c2a..311bef21c 100644 +--- a/kernel/trace/trace.c ++++ b/kernel/trace/trace.c +@@ -9389,7 +9389,7 @@ static struct notifier_block trace_module_nb = { + }; + #endif /* CONFIG_MODULES */ + +-static __init int tracer_init_tracefs(void) ++static int tracefs_init(void * data) + { + int ret; + +@@ -9439,6 +9439,17 @@ static __init int tracer_init_tracefs(void) + return 0; + } + ++static __init int tracer_init_tracefs(void) ++{ ++ struct task_struct *thread; ++ ++ thread = kthread_run(tracefs_init, NULL, "tracefs_init"); ++ if (IS_ERR(thread)) ++ return PTR_ERR(thread); ++ ++ return 0; ++} ++ + static int trace_panic_handler(struct notifier_block *this, + unsigned long event, void *unused) + { diff --git a/make-boot.sh b/make-boot.sh new file mode 100755 -index 000000000000..f4cd4c4524b5 +index 000000000..f4cd4c452 --- /dev/null +++ b/make-boot.sh @@ -0,0 +1,31 @@ @@ -1758424,7 +1758314,7 @@ index 000000000000..f4cd4c4524b5 +cp ${BOOT_LINUX}/boot_linux.img ${OUT_IMAGE} diff --git a/make-ohos.sh b/make-ohos.sh new file mode 100755 -index 000000000000..70ad2c5ccf41 +index 000000000..a9e22dc69 --- /dev/null +++ b/make-ohos.sh @@ -0,0 +1,148 @@ @@ -1758577,7 +1758467,7 @@ index 000000000000..70ad2c5ccf41 + fi +done diff --git a/mm/hugetlb.c b/mm/hugetlb.c -index feac38090a9e..2738f5741696 100644 +index feac38090..2738f5741 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, @@ -1758625,7 +1758515,7 @@ index feac38090a9e..2738f5741696 100644 void __unmap_hugepage_range_final(struct mmu_gather *tlb, diff --git a/mm/memblock.c b/mm/memblock.c -index f72d53957033..ba21b5b13f39 100644 +index f72d53957..ba21b5b13 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -97,6 +97,26 @@ struct pglist_data __refdata contig_page_data; @@ -1758701,7 +1758591,7 @@ index f72d53957033..ba21b5b13f39 100644 return end_pfn - start_pfn; diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 6993c6b27dcf..3078e59b72af 100644 +index fabeabbb1..b63375b3f 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1445,9 +1445,15 @@ static void free_one_page(struct zone *zone, @@ -1758779,10 +1758669,10 @@ index 6993c6b27dcf..3078e59b72af 100644 pgcnt++; } diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c -index 756523e5402a..f0a4377c3b7d 100644 +index 5f91fd198..90ee1ba88 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c -@@ -1539,9 +1539,6 @@ static void l2cap_sock_close_cb(struct l2cap_chan *chan) +@@ -1546,9 +1546,6 @@ static void l2cap_sock_close_cb(struct l2cap_chan *chan) { struct sock *sk = chan->data; @@ -1758792,7 +1758682,7 @@ index 756523e5402a..f0a4377c3b7d 100644 l2cap_sock_kill(sk); } -@@ -1550,9 +1547,6 @@ static void l2cap_sock_teardown_cb(struct l2cap_chan *chan, int err) +@@ -1557,9 +1554,6 @@ static void l2cap_sock_teardown_cb(struct l2cap_chan *chan, int err) struct sock *sk = chan->data; struct sock *parent; @@ -1758802,7 +1758692,7 @@ index 756523e5402a..f0a4377c3b7d 100644 BT_DBG("chan %p state %s", chan, state_to_string(chan->state)); /* This callback can be called both for server (BT_LISTEN) -@@ -1752,10 +1746,8 @@ static void l2cap_sock_destruct(struct sock *sk) +@@ -1759,10 +1753,8 @@ static void l2cap_sock_destruct(struct sock *sk) { BT_DBG("sk %p", sk); @@ -1758815,10 +1758705,10 @@ index 756523e5402a..f0a4377c3b7d 100644 if (l2cap_pi(sk)->rx_busy_skb) { kfree_skb(l2cap_pi(sk)->rx_busy_skb); diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c -index 081d1ee3ddb8..8244d3ae185b 100644 +index f9a2993fd..656601ab7 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c -@@ -93,10 +93,10 @@ static void sco_sock_timeout(struct work_struct *work) +@@ -97,10 +97,10 @@ static void sco_sock_timeout(struct work_struct *work) BT_DBG("sock %p state %d", sk, sk->sk_state); @@ -1758831,7 +1758721,7 @@ index 081d1ee3ddb8..8244d3ae185b 100644 sock_put(sk); } -@@ -193,10 +193,10 @@ static void sco_conn_del(struct hci_conn *hcon, int err) +@@ -197,10 +197,10 @@ static void sco_conn_del(struct hci_conn *hcon, int err) if (sk) { sock_hold(sk); @@ -1758844,7 +1758734,7 @@ index 081d1ee3ddb8..8244d3ae185b 100644 sock_put(sk); } -@@ -1103,10 +1103,10 @@ static void sco_conn_ready(struct sco_conn *conn) +@@ -1104,10 +1104,10 @@ static void sco_conn_ready(struct sco_conn *conn) if (sk) { sco_sock_clear_timer(sk); @@ -1758857,7 +1758747,7 @@ index 081d1ee3ddb8..8244d3ae185b 100644 } else { sco_conn_lock(conn); -@@ -1121,12 +1121,12 @@ static void sco_conn_ready(struct sco_conn *conn) +@@ -1122,12 +1122,12 @@ static void sco_conn_ready(struct sco_conn *conn) return; } @@ -1758872,7 +1758762,7 @@ index 081d1ee3ddb8..8244d3ae185b 100644 sco_conn_unlock(conn); return; } -@@ -1147,7 +1147,7 @@ static void sco_conn_ready(struct sco_conn *conn) +@@ -1148,7 +1148,7 @@ static void sco_conn_ready(struct sco_conn *conn) /* Wake up parent */ parent->sk_data_ready(parent); @@ -1758882,7 +1758772,7 @@ index 081d1ee3ddb8..8244d3ae185b 100644 sco_conn_unlock(conn); } diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig -index 83a7af8982bb..33ab1f7a3cc0 100644 +index 83a7af898..33ab1f7a3 100644 --- a/net/rfkill/Kconfig +++ b/net/rfkill/Kconfig @@ -32,3 +32,12 @@ config RFKILL_GPIO @@ -1758899,7 +1758789,7 @@ index 83a7af8982bb..33ab1f7a3cc0 100644 + help + Rockchip rfkill driver for rk29/rk3X diff --git a/net/rfkill/Makefile b/net/rfkill/Makefile -index dc47b6174ec5..beed5b506307 100644 +index dc47b6174..beed5b506 100644 --- a/net/rfkill/Makefile +++ b/net/rfkill/Makefile @@ -7,3 +7,5 @@ rfkill-y += core.o @@ -1758909,8 +1758799,8 @@ index dc47b6174ec5..beed5b506307 100644 +rfkill-rk-y += rfkill-wlan.o rfkill-bt.o +obj-$(CONFIG_RFKILL_RK) += rfkill-rk.o diff --git a/net/rfkill/rfkill-bt.c b/net/rfkill/rfkill-bt.c -new file mode 100755 -index 000000000000..7c943871a379 +new file mode 100644 +index 000000000..7c943871a --- /dev/null +++ b/net/rfkill/rfkill-bt.c @@ -0,0 +1,827 @@ @@ -1759742,8 +1759632,8 @@ index 000000000000..7c943871a379 +MODULE_AUTHOR("cmy@rock-chips.com, gwl@rock-chips.com"); +MODULE_LICENSE("GPL"); diff --git a/net/rfkill/rfkill-wlan.c b/net/rfkill/rfkill-wlan.c -new file mode 100755 -index 000000000000..6a581c847a68 +new file mode 100644 +index 000000000..6a581c847 --- /dev/null +++ b/net/rfkill/rfkill-wlan.c @@ -0,0 +1,979 @@ @@ -1760727,7 +1760617,7 @@ index 000000000000..6a581c847a68 +MODULE_AUTHOR("gwl@rock-chips.com"); +MODULE_LICENSE("GPL"); diff --git a/scripts/Makefile b/scripts/Makefile -index 9adb6d247818..b7b7ad5475e6 100644 +index 5d89c2ee2..537368c4d 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -9,6 +9,7 @@ CRYPTO_CFLAGS = $(shell pkg-config --cflags libcrypto 2> /dev/null) @@ -1760739,7 +1760629,7 @@ index 9adb6d247818..b7b7ad5475e6 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 53aa3e18ce8a..7ca0ddfa6e19 100644 +index 53aa3e18c..7ca0ddfa6 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -318,8 +318,9 @@ $(obj)/%.dtb.S: $(obj)/%.dtb FORCE @@ -1760756,7 +1760646,7 @@ index 53aa3e18ce8a..7ca0ddfa6e19 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 000000000000..5486902f1f76 +index 000000000..5486902f1 --- /dev/null +++ b/scripts/clang-wrapper.py @@ -0,0 +1,102 @@ @@ -1760863,7 +1760753,7 @@ index 000000000000..5486902f1f76 + status = run_clang() + sys.exit(status) diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c -index 17cb6890d45a..913fb08af475 100644 +index 17cb6890d..913fb08af 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, @@ -1760893,7 +1760783,7 @@ index 17cb6890d45a..913fb08af475 100644 diff --git a/scripts/mkimg b/scripts/mkimg new file mode 100755 -index 000000000000..63e3da6f402c +index 000000000..63e3da6f4 --- /dev/null +++ b/scripts/mkimg @@ -0,0 +1,235 @@ @@ -1761134,7 +1761024,7 @@ index 000000000000..63e3da6f402c +fi diff --git a/scripts/repack-bootimg b/scripts/repack-bootimg new file mode 100755 -index 000000000000..69065d28e0ea +index 000000000..69065d28e --- /dev/null +++ b/scripts/repack-bootimg @@ -0,0 +1,153 @@ @@ -1761292,8 +1761182,8 @@ index 000000000000..69065d28e0ea +--os_patch_level $os_patch_level \ +--output $output diff --git a/scripts/resource_tool.c b/scripts/resource_tool.c -new file mode 100755 -index 000000000000..8465c578b2d7 +new file mode 100644 +index 000000000..8465c578b --- /dev/null +++ b/scripts/resource_tool.c @@ -0,0 +1,1575 @@ @@ -1762873,7 +1762763,7 @@ index 000000000000..8465c578b2d7 + +/************pack code end****************/ diff --git a/security/Kconfig.hardening b/security/Kconfig.hardening -index b54eb7177a31..b02e64e8461a 100644 +index b54eb7177..b02e64e84 100644 --- a/security/Kconfig.hardening +++ b/security/Kconfig.hardening @@ -39,7 +39,7 @@ choice @@ -1762894,7 +1762784,7 @@ index b54eb7177a31..b02e64e8461a 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 fb45a32d99cd..0ec5bf47d96e 100644 +index fb45a32d9..0ec5bf47d 100644 --- a/sound/drivers/aloop.c +++ b/sound/drivers/aloop.c @@ -37,6 +37,7 @@ MODULE_SUPPORTED_DEVICE("{{ALSA,Loopback soundcard}}"); @@ -1762973,7 +1762863,7 @@ index fb45a32d99cd..0ec5bf47d96e 100644 } diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig -index f1c9e563994b..d3f815d7c867 100644 +index 04a7070c7..7ff1aa8db 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -89,11 +89,16 @@ config SND_SOC_ALL_CODECS @@ -1763113,7 +1763003,7 @@ index f1c9e563994b..d3f815d7c867 100644 config SND_SOC_RT5659 diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile -index 11ce98c25d6c..d94d074c18ad 100644 +index 11ce98c25..d94d074c1 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -84,12 +84,19 @@ snd-soc-da7219-objs := da7219.o da7219-aad.o @@ -1763185,7 +1763075,7 @@ index 11ce98c25d6c..d94d074c18ad 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 4d286844e3c8..2be7ba425ee4 100644 +index 4d286844e..2be7ba425 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[] = { @@ -1763223,8 +1763113,8 @@ index 4d286844e3c8..2be7ba425ee4 100644 .formats = SNDRV_PCM_FMTBIT_S16_LE, }, diff --git a/sound/soc/codecs/dummy-codec.c b/sound/soc/codecs/dummy-codec.c -new file mode 100755 -index 000000000000..35756c753357 +new file mode 100644 +index 000000000..35756c753 --- /dev/null +++ b/sound/soc/codecs/dummy-codec.c @@ -0,0 +1,115 @@ @@ -1763344,8 +1763234,8 @@ index 000000000000..35756c753357 +MODULE_DESCRIPTION("Rockchip Dummy Codec Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/es7202.c b/sound/soc/codecs/es7202.c -new file mode 100755 -index 000000000000..49035e8ca52d +new file mode 100644 +index 000000000..49035e8ca --- /dev/null +++ b/sound/soc/codecs/es7202.c @@ -0,0 +1,1170 @@ @@ -1764520,8 +1764410,8 @@ index 000000000000..49035e8ca52d +MODULE_AUTHOR(" David Yang, >"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/es7202.h b/sound/soc/codecs/es7202.h -new file mode 100755 -index 000000000000..fb8643c0a3b2 +new file mode 100644 +index 000000000..fb8643c0a --- /dev/null +++ b/sound/soc/codecs/es7202.h @@ -0,0 +1,95 @@ @@ -1764621,8 +1764511,8 @@ index 000000000000..fb8643c0a3b2 + +#endif diff --git a/sound/soc/codecs/es7210.c b/sound/soc/codecs/es7210.c -new file mode 100755 -index 000000000000..dfb0e24e23c7 +new file mode 100644 +index 000000000..dfb0e24e2 --- /dev/null +++ b/sound/soc/codecs/es7210.c @@ -0,0 +1,1754 @@ @@ -1766381,8 +1766271,8 @@ index 000000000000..dfb0e24e23c7 +MODULE_AUTHOR("David Yang / info@everest-semi.com"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/es7210.h b/sound/soc/codecs/es7210.h -new file mode 100755 -index 000000000000..234a365c398e +new file mode 100644 +index 000000000..234a365c3 --- /dev/null +++ b/sound/soc/codecs/es7210.h @@ -0,0 +1,76 @@ @@ -1766463,8 +1766353,8 @@ index 000000000000..234a365c398e + +#endif /* _ES7210_H_ */ diff --git a/sound/soc/codecs/es7243e.c b/sound/soc/codecs/es7243e.c -new file mode 100755 -index 000000000000..e2bf03c526d8 +new file mode 100644 +index 000000000..e2bf03c52 --- /dev/null +++ b/sound/soc/codecs/es7243e.c @@ -0,0 +1,2671 @@ @@ -1769140,8 +1769030,8 @@ index 000000000000..e2bf03c526d8 +MODULE_AUTHOR("David Yang "); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/es7243e_usr_cfg.h b/sound/soc/codecs/es7243e_usr_cfg.h -new file mode 100755 -index 000000000000..1d9760ada940 +new file mode 100644 +index 000000000..1d9760ada --- /dev/null +++ b/sound/soc/codecs/es7243e_usr_cfg.h @@ -0,0 +1,274 @@ @@ -1769420,8 +1769310,8 @@ index 000000000000..1d9760ada940 + +#define VDDA_VOLTAGE VDDA_3V3 diff --git a/sound/soc/codecs/es8311.c b/sound/soc/codecs/es8311.c -new file mode 100755 -index 000000000000..b13ece8be069 +new file mode 100644 +index 000000000..b13ece8be --- /dev/null +++ b/sound/soc/codecs/es8311.c @@ -0,0 +1,756 @@ @@ -1770182,8 +1770072,8 @@ index 000000000000..b13ece8be069 +MODULE_AUTHOR("David Yang "); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/es8311.h b/sound/soc/codecs/es8311.h -new file mode 100755 -index 000000000000..94d8472bd5de +new file mode 100644 +index 000000000..94d8472bd --- /dev/null +++ b/sound/soc/codecs/es8311.h @@ -0,0 +1,69 @@ @@ -1770257,8 +1770147,8 @@ index 000000000000..94d8472bd5de + +#endif diff --git a/sound/soc/codecs/es8323.c b/sound/soc/codecs/es8323.c -new file mode 100755 -index 000000000000..636510849a6d +new file mode 100644 +index 000000000..636510849 --- /dev/null +++ b/sound/soc/codecs/es8323.c @@ -0,0 +1,998 @@ @@ -1771261,8 +1771151,8 @@ index 000000000000..636510849a6d +MODULE_AUTHOR("Mark Brown "); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/es8323.h b/sound/soc/codecs/es8323.h -new file mode 100755 -index 000000000000..355a6a7d3149 +new file mode 100644 +index 000000000..355a6a7d3 --- /dev/null +++ b/sound/soc/codecs/es8323.h @@ -0,0 +1,151 @@ @@ -1771418,7 +1771308,7 @@ index 000000000000..355a6a7d3149 + +#endif diff --git a/sound/soc/codecs/es8328.c b/sound/soc/codecs/es8328.c -index 081b5f189632..3e2de70340cc 100644 +index 081b5f189..3e2de7034 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 = { @@ -1771454,8 +1771344,8 @@ index 081b5f189632..3e2de70340cc 100644 return -EINVAL; } diff --git a/sound/soc/codecs/es8396.c b/sound/soc/codecs/es8396.c -new file mode 100755 -index 000000000000..4cd7916b026f +new file mode 100644 +index 000000000..4cd7916b0 --- /dev/null +++ b/sound/soc/codecs/es8396.c @@ -0,0 +1,3207 @@ @@ -1774667,8 +1774557,8 @@ index 000000000000..4cd7916b026f +MODULE_AUTHOR("DavidYang, Everest Semiconductor Co., Ltd, "); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/es8396.h b/sound/soc/codecs/es8396.h -new file mode 100755 -index 000000000000..e6f2f390707d +new file mode 100644 +index 000000000..e6f2f3907 --- /dev/null +++ b/sound/soc/codecs/es8396.h @@ -0,0 +1,354 @@ @@ -1775027,8 +1774917,8 @@ index 000000000000..e6f2f390707d + +#endif diff --git a/sound/soc/codecs/rk1000_codec.c b/sound/soc/codecs/rk1000_codec.c -new file mode 100755 -index 000000000000..9cabd0977813 +new file mode 100644 +index 000000000..9cabd0977 --- /dev/null +++ b/sound/soc/codecs/rk1000_codec.c @@ -0,0 +1,580 @@ @@ -1775613,8 +1775503,8 @@ index 000000000000..9cabd0977813 +MODULE_AUTHOR("Sugar Zhang "); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/rk1000_codec.h b/sound/soc/codecs/rk1000_codec.h -new file mode 100755 -index 000000000000..0c9169cd6fb7 +new file mode 100644 +index 000000000..0c9169cd6 --- /dev/null +++ b/sound/soc/codecs/rk1000_codec.h @@ -0,0 +1,320 @@ @@ -1775939,8 +1775829,8 @@ index 000000000000..0c9169cd6fb7 + +#endif diff --git a/sound/soc/codecs/rk312x_codec.c b/sound/soc/codecs/rk312x_codec.c -new file mode 100755 -index 000000000000..0e3ac4008962 +new file mode 100644 +index 000000000..0e3ac4008 --- /dev/null +++ b/sound/soc/codecs/rk312x_codec.c @@ -0,0 +1,2526 @@ @@ -1778471,8 +1778361,8 @@ index 000000000000..0e3ac4008962 +MODULE_DESCRIPTION("ROCKCHIP i2s ASoC Interface"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/rk312x_codec.h b/sound/soc/codecs/rk312x_codec.h -new file mode 100755 -index 000000000000..0924088681ba +new file mode 100644 +index 000000000..092408868 --- /dev/null +++ b/sound/soc/codecs/rk312x_codec.h @@ -0,0 +1,566 @@ @@ -1779043,8 +1778933,8 @@ index 000000000000..0924088681ba + +#endif /* __RK312x_CODEC_H__ */ diff --git a/sound/soc/codecs/rk3228_codec.c b/sound/soc/codecs/rk3228_codec.c -new file mode 100755 -index 000000000000..d82eec871ac8 +new file mode 100644 +index 000000000..d82eec871 --- /dev/null +++ b/sound/soc/codecs/rk3228_codec.c @@ -0,0 +1,543 @@ @@ -1779592,8 +1779482,8 @@ index 000000000000..d82eec871ac8 +MODULE_DESCRIPTION("ASoC rk3228 codec driver"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/rk3228_codec.h b/sound/soc/codecs/rk3228_codec.h -new file mode 100755 -index 000000000000..7283d0ba86e8 +new file mode 100644 +index 000000000..7283d0ba8 --- /dev/null +++ b/sound/soc/codecs/rk3228_codec.h @@ -0,0 +1,218 @@ @@ -1779816,8 +1779706,8 @@ index 000000000000..7283d0ba86e8 + +#endif diff --git a/sound/soc/codecs/rk3308_codec.c b/sound/soc/codecs/rk3308_codec.c -new file mode 100755 -index 000000000000..a6ce7f061d73 +new file mode 100644 +index 000000000..a6ce7f061 --- /dev/null +++ b/sound/soc/codecs/rk3308_codec.c @@ -0,0 +1,5128 @@ @@ -1784950,8 +1784840,8 @@ index 000000000000..a6ce7f061d73 +MODULE_DESCRIPTION("ASoC RK3308 Codec Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/rk3308_codec.h b/sound/soc/codecs/rk3308_codec.h -new file mode 100755 -index 000000000000..93e089dae081 +new file mode 100644 +index 000000000..93e089dae --- /dev/null +++ b/sound/soc/codecs/rk3308_codec.h @@ -0,0 +1,1069 @@ @@ -1786025,8 +1785915,8 @@ index 000000000000..93e089dae081 + +#endif /* __RK3308_CODEC_H__ */ diff --git a/sound/soc/codecs/rk3308_codec_provider.h b/sound/soc/codecs/rk3308_codec_provider.h -new file mode 100755 -index 000000000000..34c1ef86a507 +new file mode 100644 +index 000000000..34c1ef86a --- /dev/null +++ b/sound/soc/codecs/rk3308_codec_provider.h @@ -0,0 +1,28 @@ @@ -1786059,8 +1785949,8 @@ index 000000000000..34c1ef86a507 + +#endif /* __RK3308_CODEC_PROVIDER_H__ */ diff --git a/sound/soc/codecs/rk817_codec.c b/sound/soc/codecs/rk817_codec.c -new file mode 100755 -index 000000000000..453ea4bf5b7f +new file mode 100644 +index 000000000..453ea4bf5 --- /dev/null +++ b/sound/soc/codecs/rk817_codec.c @@ -0,0 +1,1364 @@ @@ -1787429,8 +1787319,8 @@ index 000000000000..453ea4bf5b7f +MODULE_AUTHOR("binyuan "); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/rk817_codec.h b/sound/soc/codecs/rk817_codec.h -new file mode 100755 -index 000000000000..a928c323928b +new file mode 100644 +index 000000000..a928c3239 --- /dev/null +++ b/sound/soc/codecs/rk817_codec.h @@ -0,0 +1,215 @@ @@ -1787650,8 +1787540,8 @@ index 000000000000..a928c323928b + +#endif /* __RK817_CODEC_H__ */ diff --git a/sound/soc/codecs/rk_codec_digital.c b/sound/soc/codecs/rk_codec_digital.c -new file mode 100755 -index 000000000000..ec91b72fa6de +new file mode 100644 +index 000000000..ec91b72fa --- /dev/null +++ b/sound/soc/codecs/rk_codec_digital.c @@ -0,0 +1,1109 @@ @@ -1788765,8 +1788655,8 @@ index 000000000000..ec91b72fa6de +MODULE_DESCRIPTION("ASoC Rockchip codec digital driver"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/rk_codec_digital.h b/sound/soc/codecs/rk_codec_digital.h -new file mode 100755 -index 000000000000..4bb409b8d8bc +new file mode 100644 +index 000000000..4bb409b8d --- /dev/null +++ b/sound/soc/codecs/rk_codec_digital.h @@ -0,0 +1,319 @@ @@ -1789090,7 +1788980,7 @@ index 000000000000..4bb409b8d8bc + +#endif diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c -index a5674c227b3a..0db73e7a0511 100644 +index a5674c227..0db73e7a0 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[] = { @@ -1789105,7 +1788995,7 @@ index a5674c227b3a..0db73e7a0511 100644 {"IN2P", NULL, "LDO2"}, {"IN3P", NULL, "LDO2"}, diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c -index e59fdc81dbd4..2dd8d6d4f87d 100644 +index e59fdc81d..2dd8d6d4f 100644 --- a/sound/soc/codecs/rt5651.c +++ b/sound/soc/codecs/rt5651.c @@ -24,6 +24,9 @@ @@ -1789267,7 +1789157,7 @@ index e59fdc81dbd4..2dd8d6d4f87d 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 20c33a3ece37..05739b17813c 100644 +index 20c33a3ec..05739b178 100644 --- a/sound/soc/codecs/rt5651.h +++ b/sound/soc/codecs/rt5651.h @@ -2096,7 +2096,10 @@ struct rt5651_priv { @@ -1789282,7 +1789172,7 @@ index 20c33a3ece37..05739b17813c 100644 #endif /* __RT5651_H__ */ diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c -index c86231dfcf4f..0827b7e65ac1 100644 +index 600e93d61..49a165515 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c @@ -7,6 +7,7 @@ @@ -1789359,7 +1789249,7 @@ index c86231dfcf4f..0827b7e65ac1 100644 &soc_component_dev_wm8974, &wm8974_dai, 1); diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig -index d610b553ea3b..2925971bcd55 100644 +index d610b553e..2925971bc 100644 --- a/sound/soc/rockchip/Kconfig +++ b/sound/soc/rockchip/Kconfig @@ -16,6 +16,15 @@ config SND_SOC_ROCKCHIP_I2S @@ -1789430,7 +1789320,7 @@ index d610b553ea3b..2925971bcd55 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 65e814d46006..ec17d97d0f27 100644 +index 65e814d46..ec17d97d0 100644 --- a/sound/soc/rockchip/Makefile +++ b/sound/soc/rockchip/Makefile @@ -1,20 +1,35 @@ @@ -1789473,7 +1789363,7 @@ index 65e814d46006..ec17d97d0f27 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 000000000000..44ca66f1ed95 +index 000000000..44ca66f1e --- /dev/null +++ b/sound/soc/rockchip/rockchip_audio_pwm.c @@ -0,0 +1,372 @@ @@ -1789851,7 +1789741,7 @@ index 000000000000..44ca66f1ed95 +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 000000000000..ad68660437c2 +index 000000000..ad6866043 --- /dev/null +++ b/sound/soc/rockchip/rockchip_audio_pwm.h @@ -0,0 +1,48 @@ @@ -1789905,7 +1789795,7 @@ index 000000000000..ad68660437c2 +#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 000000000000..aafeab5b41c7 +index 000000000..aafeab5b4 --- /dev/null +++ b/sound/soc/rockchip/rockchip_cdndp.c @@ -0,0 +1,166 @@ @@ -1790077,7 +1789967,7 @@ index 000000000000..aafeab5b41c7 +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 000000000000..bf675defb884 +index 000000000..bf675defb --- /dev/null +++ b/sound/soc/rockchip/rockchip_da7219.c @@ -0,0 +1,235 @@ @@ -1790318,7 +1790208,7 @@ index 000000000000..bf675defb884 +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 000000000000..ed107d4d2399 +index 000000000..ed107d4d2 --- /dev/null +++ b/sound/soc/rockchip/rockchip_hdmi.c @@ -0,0 +1,279 @@ @@ -1790603,7 +1790493,7 @@ index 000000000000..ed107d4d2399 +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 000000000000..02a282e8f60a +index 000000000..02a282e8f --- /dev/null +++ b/sound/soc/rockchip/rockchip_hdmi_analog.c @@ -0,0 +1,222 @@ @@ -1790831,7 +1790721,7 @@ index 000000000000..02a282e8f60a +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 000000000000..4db9fb7b7dae +index 000000000..4db9fb7b7 --- /dev/null +++ b/sound/soc/rockchip/rockchip_hdmi_dp.c @@ -0,0 +1,193 @@ @@ -1791029,7 +1790919,7 @@ index 000000000000..4db9fb7b7dae +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 785baf98f9da..69336b77df70 100644 +index 785baf98f..69336b77d 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -15,11 +15,11 @@ @@ -1791420,7 +1791310,7 @@ index 785baf98f9da..69336b77df70 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 fcaae24e40af..251851bf4f2c 100644 +index fcaae24e4..251851bf4 100644 --- a/sound/soc/rockchip/rockchip_i2s.h +++ b/sound/soc/rockchip/rockchip_i2s.h @@ -88,15 +88,17 @@ @@ -1791447,7 +1791337,7 @@ index fcaae24e40af..251851bf4f2c 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 000000000000..81865dcdb3a4 +index 000000000..81865dcdb --- /dev/null +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c @@ -0,0 +1,1952 @@ @@ -1793405,7 +1793295,7 @@ index 000000000000..81865dcdb3a4 +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 000000000000..fa41f81429f5 +index 000000000..fa41f8142 --- /dev/null +++ b/sound/soc/rockchip/rockchip_i2s_tdm.h @@ -0,0 +1,393 @@ @@ -1793804,7 +1793694,7 @@ index 000000000000..fa41f81429f5 +#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 000000000000..7a789c8c7e3a +index 000000000..7a789c8c7 --- /dev/null +++ b/sound/soc/rockchip/rockchip_multi_dais.c @@ -0,0 +1,541 @@ @@ -1794351,7 +1794241,7 @@ index 000000000000..7a789c8c7e3a +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 000000000000..5d9a076afb78 +index 000000000..5d9a076af --- /dev/null +++ b/sound/soc/rockchip/rockchip_multi_dais.h @@ -0,0 +1,33 @@ @@ -1794390,7 +1794280,7 @@ index 000000000000..5d9a076afb78 +#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 000000000000..38f2220eeec1 +index 000000000..38f2220ee --- /dev/null +++ b/sound/soc/rockchip/rockchip_multi_dais_pcm.c @@ -0,0 +1,704 @@ @@ -1795100,7 +1794990,7 @@ index 000000000000..38f2220eeec1 +MODULE_LICENSE("GPL"); diff --git a/sound/soc/rockchip/rockchip_multicodecs.c b/sound/soc/rockchip/rockchip_multicodecs.c new file mode 100644 -index 000000000000..9486a2e5db2d +index 000000000..9486a2e5d --- /dev/null +++ b/sound/soc/rockchip/rockchip_multicodecs.c @@ -0,0 +1,809 @@ @@ -1795914,7 +1795804,7 @@ index 000000000000..9486a2e5db2d +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 94cfbc90390b..d2e69dd7651b 100644 +index 94cfbc903..d2e69dd76 100644 --- a/sound/soc/rockchip/rockchip_pdm.c +++ b/sound/soc/rockchip/rockchip_pdm.c @@ -19,11 +19,15 @@ @@ -1796155,7 +1796045,7 @@ index 94cfbc90390b..d2e69dd7651b 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 8e5bbafef7bb..cab977272ee6 100644 +index 8e5bbafef..cab977272 100644 --- a/sound/soc/rockchip/rockchip_pdm.h +++ b/sound/soc/rockchip/rockchip_pdm.h @@ -41,6 +41,8 @@ @@ -1796187,7 +1796077,7 @@ index 8e5bbafef7bb..cab977272ee6 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 000000000000..4dc91c2a1e75 +index 000000000..4dc91c2a1 --- /dev/null +++ b/sound/soc/rockchip/rockchip_rt5651.c @@ -0,0 +1,245 @@ @@ -1796437,7 +1796327,7 @@ index 000000000000..4dc91c2a1e75 +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 ccddcd9926af..39d8d8a4a0a0 100644 +index ccddcd992..39d8d8a4a 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -41,7 +41,7 @@ struct rk_spdif_dev { @@ -1796570,7 +1796460,7 @@ index ccddcd9926af..39d8d8a4a0a0 100644 diff --git a/sound/soc/rockchip/rockchip_spdifrx.c b/sound/soc/rockchip/rockchip_spdifrx.c new file mode 100644 -index 000000000000..0e457232116d +index 000000000..0e4572321 --- /dev/null +++ b/sound/soc/rockchip/rockchip_spdifrx.c @@ -0,0 +1,415 @@ @@ -1796991,7 +1796881,7 @@ index 000000000000..0e457232116d +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 000000000000..e75b2d5afd04 +index 000000000..e75b2d5af --- /dev/null +++ b/sound/soc/rockchip/rockchip_spdifrx.h @@ -0,0 +1,113 @@ @@ -1797110,7 +1797000,7 @@ index 000000000000..e75b2d5afd04 +#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 000000000000..d69278aa5317 +index 000000000..d69278aa5 --- /dev/null +++ b/sound/soc/rockchip/rockchip_vad.c @@ -0,0 +1,1316 @@ @@ -1798432,7 +1798322,7 @@ index 000000000000..d69278aa5317 +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 000000000000..1121e71490e0 +index 000000000..1121e7149 --- /dev/null +++ b/sound/soc/rockchip/rockchip_vad.h @@ -0,0 +1,231 @@ @@ -1798669,7 +1798559,7 @@ index 000000000000..1121e71490e0 +#endif diff --git a/sound/soc/rockchip/vad_preprocess.h b/sound/soc/rockchip/vad_preprocess.h new file mode 100644 -index 000000000000..85e4d1022984 +index 000000000..85e4d1022 --- /dev/null +++ b/sound/soc/rockchip/vad_preprocess.h @@ -0,0 +1,29 @@ @@ -1798704,7 +1798594,7 @@ index 000000000000..85e4d1022984 +#endif diff --git a/sound/soc/rockchip/vad_preprocess_arm.S b/sound/soc/rockchip/vad_preprocess_arm.S new file mode 100644 -index 000000000000..a0d3eabf2ba0 +index 000000000..a0d3eabf2 --- /dev/null +++ b/sound/soc/rockchip/vad_preprocess_arm.S @@ -0,0 +1,348 @@ @@ -1799058,7 +1798948,7 @@ index 000000000000..a0d3eabf2ba0 + .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 000000000000..823757c1718f +index 000000000..823757c17 --- /dev/null +++ b/sound/soc/rockchip/vad_preprocess_arm64.S @@ -0,0 +1,273 @@ @@ -1799337,7 +1799227,7 @@ index 000000000000..823757c1718f + .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 000000000000..a105634e60d0 +index 000000000..a105634e6 --- /dev/null +++ b/sound/soc/rockchip/vad_preprocess_thumb.S @@ -0,0 +1,360 @@ @@ -1799702,7 +1799592,7 @@ index 000000000000..a105634e60d0 + .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 752422147fb3..2db51d89fafd 100644 +index 752422147..2db51d89f 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) @@ -1799726,7 +1799616,7 @@ index 752422147fb3..2db51d89fafd 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 aaca1f44e788..8643beaf25a1 100644 +index aaca1f44e..8643beaf2 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 { @@ -1799821,7 +1799711,7 @@ index aaca1f44e788..8643beaf25a1 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 1f44a29818bf..51574379ff91 100644 +index 1f44a2981..51574379f 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 { @@ -1799915,62 +1799805,3 @@ index 1f44a29818bf..51574379ff91 100644 }; #define STR_INTERFACE "AIO Test" -diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c -index 89a8bb8e2..70cd26e8b 100644 ---- a/kernel/trace/trace.c -+++ b/kernel/trace/trace.c -@@ -9401,7 +9401,7 @@ static struct notifier_block trace_module_nb = { - }; - #endif /* CONFIG_MODULES */ - --static __init int tracer_init_tracefs(void) -+static int tracefs_init(void * data) - { - int ret; - -@@ -9451,6 +9451,17 @@ static __init int tracer_init_tracefs(void) - return 0; - } - -+static __init int tracer_init_tracefs(void) -+{ -+ struct task_struct *thread; -+ -+ thread = kthread_run(tracefs_init, NULL, "tracefs_init"); -+ if (IS_ERR(thread)) -+ return PTR_ERR(thread); -+ -+ return 0; -+} -+ - static int trace_panic_handler(struct notifier_block *this, - unsigned long event, void *unused) - { -diff --git a/drivers/char/mem.c b/drivers/char/mem.c -index 7d483c332..9b839d619 100644 ---- a/drivers/char/mem.c -+++ b/drivers/char/mem.c -@@ -1066,6 +1066,12 @@ static int devmem_init_inode(void) - return 0; - } - -+static int do_wait_for_random_bytes(void * data) -+{ -+ wait_for_random_bytes(); -+ return 0; -+} -+ - static int __init chr_dev_init(void) - { - int minor; -@@ -1094,6 +1100,11 @@ static int __init chr_dev_init(void) - NULL, devlist[minor].name); - } - -+ struct task_struct *thread; -+ thread = kthread_run(do_wait_for_random_bytes,NULL,"wait_for_random_bytes_thread"); -+ if (IS_ERR(thread)){ -+ printk("wait_for_random_bytes_thread thread create fail"); -+ } - return tty_init(); - }