diff --git a/linux-5.10/rk3568_patch/kernel.patch b/linux-5.10/rk3568_patch/kernel.patch index f3d217317437e4afea968895cb8999d9780218bd..172d2bc2c8d828174c2f5072a4b10ce9401c6dd0 100644 --- 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/Makefile b/Makefile -index 756479b101f8..7be6e2e07b0e 100644 +index 756479b10..7be6e2e07 100644 --- a/Makefile +++ b/Makefile @@ -493,7 +493,7 @@ LINUXINCLUDE := \ @@ -487,7 +487,7 @@ index 756479b101f8..7be6e2e07b0e 100644 # Require designated initializers for all marked structures KBUILD_CFLAGS += $(call cc-option,-Werror=designated-init) diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi -index 093567022386..dc4c26a8a196 100644 +index 093567022..dc4c26a8a 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -85,6 +85,11 @@ display-subsystem { @@ -539,7 +539,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 { @@ -564,7 +564,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 { @@ -595,7 +595,7 @@ index bbc3bff50856..49b8652da097 100644 }; diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi -index b6bde9d12c2b..c1a87fbe1c92 100644 +index b6bde9d12..c1a87fbe1 100644 --- a/arch/arm/boot/dts/rk3188.dtsi +++ b/arch/arm/boot/dts/rk3188.dtsi @@ -739,22 +739,22 @@ power-domain@RK3188_PD_GPU { @@ -626,7 +626,7 @@ index b6bde9d12c2b..c1a87fbe1c92 100644 }; diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi -index 7de8b006ca13..4b2b7f027c23 100644 +index 7de8b006c..4b2b7f027 100644 --- a/arch/arm/boot/dts/rk322x.dtsi +++ b/arch/arm/boot/dts/rk322x.dtsi @@ -398,7 +398,7 @@ pwm0: pwm@110b0000 { @@ -666,7 +666,7 @@ index 7de8b006ca13..4b2b7f027c23 100644 status = "disabled"; }; diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi -index 0d89ad274268..8683c9c13a6a 100644 +index 0d89ad274..8683c9c13 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -695,7 +695,7 @@ pwm0: pwm@ff680000 { @@ -706,7 +706,7 @@ index 0d89ad274268..8683c9c13a6a 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 { @@ -782,7 +782,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) @@ -800,7 +800,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); @@ -825,7 +825,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 5c4ac1c9f4e0..8c0cda1d28d2 100644 +index 5c4ac1c9f..8c0cda1d2 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -224,11 +224,8 @@ config ARCH_RENESAS @@ -841,7 +841,7 @@ index 5c4ac1c9f4e0..8c0cda1d28d2 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..06633207b0cf 100644 +index 485b7dbd4..06633207b 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -44,7 +44,7 @@ ifeq ($(CONFIG_BROKEN_GAS_INST),y) @@ -871,7 +871,7 @@ index 485b7dbd4f9e..06633207b0cf 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 @@ -920,7 +920,7 @@ index 26661c7b736b..a2386c005926 100644 +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nvr-demo-v12-linux-spi-nand.dtb diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts b/arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts new file mode 100755 -index 000000000000..2f258286286a +index 000000000..2f2582862 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts @@ -0,0 +1,759 @@ @@ -1685,7 +1685,7 @@ index 000000000000..2f258286286a +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-dual-lvds.dts b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-dual-lvds.dts new file mode 100755 -index 000000000000..09fc265a8d7a +index 000000000..09fc265a8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-dual-lvds.dts @@ -0,0 +1,147 @@ @@ -1838,7 +1838,7 @@ index 000000000000..09fc265a8d7a +}; 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 +index 000000000..d4f202189 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi-lvds.dts @@ -0,0 +1,241 @@ @@ -2085,7 +2085,7 @@ index 000000000000..d4f202189250 +}; 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 +index 000000000..0ea056682 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-hdmi.dts @@ -0,0 +1,105 @@ @@ -2196,7 +2196,7 @@ index 000000000000..0ea056682e57 +}; 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 +index 000000000..8b54a9a18 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb-rk618-lvds.dts @@ -0,0 +1,146 @@ @@ -2348,7 +2348,7 @@ index 000000000000..8b54a9a18fcc +}; 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 +index 000000000..bbcd18959 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb.dtsi @@ -0,0 +1,823 @@ @@ -3177,7 +3177,7 @@ index 000000000000..bbcd18959dc4 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-android.dtsi b/arch/arm64/boot/dts/rockchip/px30-android.dtsi new file mode 100755 -index 000000000000..aecb6344f01f +index 000000000..aecb6344f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-android.dtsi @@ -0,0 +1,131 @@ @@ -3314,7 +3314,7 @@ index 000000000000..aecb6344f01f +}; 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 +index 000000000..fde5895db --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-ddr4p416dd6-timing.dtsi @@ -0,0 +1,216 @@ @@ -3536,7 +3536,7 @@ index 000000000000..fde5895db94a +}; 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 +index 000000000..c75c5ef4e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-dram-default-timing.dtsi @@ -0,0 +1,294 @@ @@ -3836,7 +3836,7 @@ index 000000000000..c75c5ef4ef2a +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts new file mode 100755 -index 000000000000..eb60e71b77f3 +index 000000000..eb60e71b7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts @@ -0,0 +1,689 @@ @@ -4531,7 +4531,7 @@ index 000000000000..eb60e71b77f3 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts new file mode 100755 -index 000000000000..fca982485b16 +index 000000000..fca982485 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-avb.dts @@ -0,0 +1,109 @@ @@ -4646,7 +4646,7 @@ index 000000000000..fca982485b16 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts new file mode 100755 -index 000000000000..ff24bdd46aea +index 000000000..ff24bdd46 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts @@ -0,0 +1,939 @@ @@ -5591,7 +5591,7 @@ index 000000000000..ff24bdd46aea + 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 +index 000000000..317b53b2a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts @@ -0,0 +1,627 @@ @@ -6224,7 +6224,7 @@ index 000000000000..317b53b2a1eb +/* 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 +index 000000000..81f44c366 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts @@ -0,0 +1,627 @@ @@ -6857,7 +6857,7 @@ index 000000000000..81f44c36686c +/* 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 +index 000000000..b814812ed --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts @@ -0,0 +1,127 @@ @@ -6990,7 +6990,7 @@ index 000000000000..b814812edbe9 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi new file mode 100755 -index 000000000000..3d8e81009bef +index 000000000..3d8e81009 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi @@ -0,0 +1,815 @@ @@ -7811,7 +7811,7 @@ index 000000000000..3d8e81009bef +}; 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 +index 000000000..f2659a7f5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-avb.dts @@ -0,0 +1,276 @@ @@ -8093,7 +8093,7 @@ index 000000000000..f2659a7f524e +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-linux.dts new file mode 100755 -index 000000000000..54a4c19d11b3 +index 000000000..54a4c19d1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11-linux.dts @@ -0,0 +1,296 @@ @@ -8395,7 +8395,7 @@ index 000000000000..54a4c19d11b3 +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts new file mode 100755 -index 000000000000..2e59a09d3c5c +index 000000000..2e59a09d3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v11.dts @@ -0,0 +1,293 @@ @@ -8694,7 +8694,7 @@ index 000000000000..2e59a09d3c5c +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts new file mode 100755 -index 000000000000..7bfe640d32de +index 000000000..7bfe640d3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts @@ -0,0 +1,853 @@ @@ -9553,7 +9553,7 @@ index 000000000000..7bfe640d32de + diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618-avb.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618-avb.dts new file mode 100755 -index 000000000000..ea44da5066af +index 000000000..ea44da506 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618-avb.dts @@ -0,0 +1,11 @@ @@ -9570,7 +9570,7 @@ index 000000000000..ea44da5066af +}; 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 +index 000000000..69f44b4d1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dts @@ -0,0 +1,33 @@ @@ -9609,7 +9609,7 @@ index 000000000000..69f44b4d115c +}; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi new file mode 100755 -index 000000000000..0eac63181407 +index 000000000..0eac63181 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ext-rk618.dtsi @@ -0,0 +1,202 @@ @@ -9817,7 +9817,7 @@ index 000000000000..0eac63181407 +}; 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 +index 000000000..e3f4274b2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-robot-no-gpu.dtsi @@ -0,0 +1,57 @@ @@ -9880,7 +9880,7 @@ index 000000000000..e3f4274b2309 +}; 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 +index 000000000..f48a753e6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-robot.dtsi @@ -0,0 +1,93 @@ @@ -9979,7 +9979,7 @@ index 000000000000..f48a753e6453 +}; 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 +index 000000000..1657151c9 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/px30-z7-a0-rk618-dsi.dts @@ -0,0 +1,875 @@ @@ -10859,7 +10859,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 { @@ -11014,7 +11014,7 @@ index 0d6761074b11..237c0d9af325 100644 status = "disabled"; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk1808-dram-default-timing.dtsi new file mode 100755 -index 000000000000..0fa79e2f05c0 +index 000000000..0fa79e2f0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-dram-default-timing.dtsi @@ -0,0 +1,302 @@ @@ -11322,7 +11322,7 @@ index 000000000000..0fa79e2f05c0 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts new file mode 100755 -index 000000000000..a09824816188 +index 000000000..a09824816 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts @@ -0,0 +1,305 @@ @@ -11633,7 +11633,7 @@ index 000000000000..a09824816188 +}; 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 +index 000000000..413d4f6fa --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4-second.dts @@ -0,0 +1,272 @@ @@ -11911,7 +11911,7 @@ index 000000000000..413d4f6fa29d +}; 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 +index 000000000..17993d1ff --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts @@ -0,0 +1,271 @@ @@ -12188,7 +12188,7 @@ index 000000000000..17993d1ff44a +}; 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 +index 000000000..3b9c88660 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi @@ -0,0 +1,717 @@ @@ -12911,7 +12911,7 @@ index 000000000000..3b9c88660701 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-fpga.dts b/arch/arm64/boot/dts/rockchip/rk1808-fpga.dts new file mode 100755 -index 000000000000..d021918cacd1 +index 000000000..d021918ca --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808-fpga.dts @@ -0,0 +1,58 @@ @@ -12975,7 +12975,7 @@ index 000000000000..d021918cacd1 +}; 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 +index 000000000..3469abac4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808.dtsi @@ -0,0 +1,3040 @@ @@ -16021,7 +16021,7 @@ index 000000000000..3469abac4f34 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808k.dtsi b/arch/arm64/boot/dts/rockchip/rk1808k.dtsi new file mode 100755 -index 000000000000..78bd92e4c2c6 +index 000000000..78bd92e4c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk1808k.dtsi @@ -0,0 +1,51 @@ @@ -16078,7 +16078,7 @@ index 000000000000..78bd92e4c2c6 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts new file mode 100755 -index 000000000000..c77d2e963266 +index 000000000..c77d2e963 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts @@ -0,0 +1,681 @@ @@ -16765,7 +16765,7 @@ index 000000000000..c77d2e963266 +}; 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 +index 000000000..557daa856 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts @@ -0,0 +1,55 @@ @@ -16826,7 +16826,7 @@ index 000000000000..557daa856132 +}; 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 +index 000000000..90a29a903 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts @@ -0,0 +1,56 @@ @@ -16888,7 +16888,7 @@ index 000000000000..90a29a903545 +}; 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 +index 000000000..88c1e9c6c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v10.dts @@ -0,0 +1,101 @@ @@ -16995,7 +16995,7 @@ index 000000000000..88c1e9c6c8ac +}; 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 +index 000000000..364f74a40 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v11.dts @@ -0,0 +1,77 @@ @@ -17078,7 +17078,7 @@ index 000000000000..364f74a40d9d +}; 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 +index 000000000..e2891ce10 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts @@ -0,0 +1,88 @@ @@ -17172,7 +17172,7 @@ index 000000000000..e2891ce1092c +}; 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 +index 000000000..c4a7178f1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v11.dts @@ -0,0 +1,92 @@ @@ -17270,7 +17270,7 @@ index 000000000000..c4a7178f1dc8 +}; 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 +index 000000000..1c0e66384 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-ext-v10.dtsi @@ -0,0 +1,235 @@ @@ -17511,7 +17511,7 @@ index 000000000000..1c0e66384c16 +}; 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 +index 000000000..3d052d0da --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi @@ -0,0 +1,780 @@ @@ -18297,7 +18297,7 @@ index 000000000000..3d052d0da477 +}; 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 +index 000000000..7b692a810 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi @@ -0,0 +1,835 @@ @@ -19138,7 +19138,7 @@ index 000000000000..7b692a810333 +}; 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 +index 000000000..225aca323 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-fpga.dts @@ -0,0 +1,51 @@ @@ -19194,7 +19194,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 bce6f8b7db43..7a96be10eaf0 100644 +index bce6f8b7d..7a96be10e 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 { @@ -19210,7 +19210,7 @@ index bce6f8b7db43..7a96be10eaf0 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 +index 000000000..2586d9905 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-voice-module-board-v10.dts @@ -0,0 +1,19 @@ @@ -19234,7 +19234,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 @@ @@ -19377,7 +19377,7 @@ index 2560b98771ca..cc86c0880cec 100644 status = "disabled"; diff --git a/arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts new file mode 100755 -index 000000000000..d5e2d9ebd4aa +index 000000000..d5e2d9ebd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts @@ -0,0 +1,62 @@ @@ -19445,7 +19445,7 @@ index 000000000000..d5e2d9ebd4aa +}; 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 +index 000000000..e2414b67f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-ext-v10.dtsi @@ -0,0 +1,124 @@ @@ -19575,7 +19575,7 @@ index 000000000000..e2414b67f0d1 +}; 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 +index 000000000..902ae3544 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi @@ -0,0 +1,784 @@ @@ -20365,7 +20365,7 @@ index 000000000000..902ae3544235 +}; 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 +index 000000000..ffd53fd15 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308k.dtsi @@ -0,0 +1,46 @@ @@ -20417,7 +20417,7 @@ index 000000000000..ffd53fd158c5 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-cif-sensor.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-863-cif-sensor.dtsi new file mode 100755 -index 000000000000..c01f4d014a1b +index 000000000..c01f4d014 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-cif-sensor.dtsi @@ -0,0 +1,54 @@ @@ -20477,7 +20477,7 @@ index 000000000000..c01f4d014a1b + diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts new file mode 100755 -index 000000000000..174d05e37ccb +index 000000000..174d05e37 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-avb.dts @@ -0,0 +1,112 @@ @@ -20595,7 +20595,7 @@ index 000000000000..174d05e37ccb +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-rkisp1.dts b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-rkisp1.dts new file mode 100755 -index 000000000000..d80dad694c1d +index 000000000..d80dad694 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10-rkisp1.dts @@ -0,0 +1,103 @@ @@ -20704,7 +20704,7 @@ index 000000000000..d80dad694c1d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts new file mode 100755 -index 000000000000..7a399b3356ac +index 000000000..7a399b335 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts @@ -0,0 +1,42 @@ @@ -20752,7 +20752,7 @@ index 000000000000..7a399b3356ac +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi new file mode 100755 -index 000000000000..6e6e3be2f104 +index 000000000..6e6e3be2f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi @@ -0,0 +1,833 @@ @@ -21591,7 +21591,7 @@ index 000000000000..6e6e3be2f104 +}; 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 +index 000000000..86d048c0d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-86v-v10.dts @@ -0,0 +1,840 @@ @@ -22437,7 +22437,7 @@ index 000000000000..86d048c0d731 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts new file mode 100755 -index 000000000000..02308ebae99e +index 000000000..02308ebae --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts @@ -0,0 +1,1308 @@ @@ -23751,7 +23751,7 @@ index 000000000000..02308ebae99e +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts new file mode 100755 -index 000000000000..0af03d1ec2a8 +index 000000000..0af03d1ec --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts @@ -0,0 +1,1330 @@ @@ -25087,7 +25087,7 @@ index 000000000000..0af03d1ec2a8 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts new file mode 100755 -index 000000000000..fa8b7cff619f +index 000000000..fa8b7cff6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts @@ -0,0 +1,1317 @@ @@ -26410,7 +26410,7 @@ index 000000000000..fa8b7cff619f +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts new file mode 100755 -index 000000000000..9669993499e0 +index 000000000..966999349 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts @@ -0,0 +1,1317 @@ @@ -27733,7 +27733,7 @@ index 000000000000..9669993499e0 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts new file mode 100755 -index 000000000000..4c12a79f814b +index 000000000..4c12a79f8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-avb.dts @@ -0,0 +1,91 @@ @@ -27830,7 +27830,7 @@ index 000000000000..4c12a79f814b +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts new file mode 100755 -index 000000000000..67c131c9618a +index 000000000..67c131c96 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts @@ -0,0 +1,1024 @@ @@ -28860,7 +28860,7 @@ index 000000000000..67c131c9618a +/* 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 +index 000000000..696680615 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts @@ -0,0 +1,748 @@ @@ -29614,7 +29614,7 @@ index 000000000000..6966806150f5 +/* 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 +index 000000000..b3b9efec9 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts @@ -0,0 +1,728 @@ @@ -30348,7 +30348,7 @@ index 000000000000..b3b9efec92e4 +/* 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 +index 000000000..58bbfdafb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts @@ -0,0 +1,37 @@ @@ -30391,7 +30391,7 @@ index 000000000000..58bbfdafb489 +}; 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 +index 000000000..940c05df8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi @@ -0,0 +1,887 @@ @@ -31284,7 +31284,7 @@ index 000000000000..940c05df8304 +}; 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 +index 000000000..2f0c3fc3a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11-avb.dts @@ -0,0 +1,351 @@ @@ -31641,7 +31641,7 @@ index 000000000000..2f0c3fc3a38d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts new file mode 100755 -index 000000000000..139efd9d1332 +index 000000000..139efd9d1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v11.dts @@ -0,0 +1,297 @@ @@ -31944,7 +31944,7 @@ index 000000000000..139efd9d1332 +}; 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 +index 000000000..a386cd291 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi @@ -0,0 +1,120 @@ @@ -32070,7 +32070,7 @@ index 000000000000..a386cd291cf3 +}; 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 +index 000000000..809b6501b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-android.dtsi @@ -0,0 +1,88 @@ @@ -32164,7 +32164,7 @@ index 000000000000..809b6501b78f +}; 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 +index 000000000..ee04d8988 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong-avb.dts @@ -0,0 +1,13 @@ @@ -32183,7 +32183,7 @@ index 000000000000..ee04d8988fbb +}; 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 +index 000000000..dcff87208 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dts @@ -0,0 +1,34 @@ @@ -32223,7 +32223,7 @@ index 000000000000..dcff87208d39 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi new file mode 100755 -index 000000000000..ad7ef6be49fa +index 000000000..ad7ef6be4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi @@ -0,0 +1,673 @@ @@ -32902,7 +32902,7 @@ index 000000000000..ad7ef6be49fa +}; 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 +index 000000000..0ea270539 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-box-plus-dram-timing.dtsi @@ -0,0 +1,221 @@ @@ -33129,7 +33129,7 @@ index 000000000000..0ea270539a23 +}; 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 +index 000000000..940024920 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-dram-2layer-timing.dtsi @@ -0,0 +1,257 @@ @@ -33392,7 +33392,7 @@ index 000000000000..940024920b5d +}; 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 +index 000000000..a3f5ff4bd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi @@ -0,0 +1,311 @@ @@ -33709,7 +33709,7 @@ index 000000000000..a3f5ff4bdc47 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts new file mode 100755 -index 000000000000..0d72e05e2d59 +index 000000000..0d72e05e2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb-android-avb.dts @@ -0,0 +1,13 @@ @@ -33728,7 +33728,7 @@ index 000000000000..0d72e05e2d59 +}; 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 +index 000000000..6d50444a5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dts @@ -0,0 +1,34 @@ @@ -33768,7 +33768,7 @@ index 000000000000..6d50444a5a1d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi new file mode 100755 -index 000000000000..e050047420a6 +index 000000000..e05004742 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi @@ -0,0 +1,715 @@ @@ -34488,7 +34488,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 { @@ -34535,7 +34535,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 { @@ -34550,7 +34550,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 daa9a0c601a9..b76282e704de 100644 +index daa9a0c60..b76282e70 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 { @@ -34566,7 +34566,7 @@ index daa9a0c601a9..b76282e704de 100644 regulator-min-microvolt = <1800000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android-avb.dts new file mode 100755 -index 000000000000..adc1dd7cd4da +index 000000000..adc1dd7cd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android-avb.dts @@ -0,0 +1,32 @@ @@ -34604,7 +34604,7 @@ index 000000000000..adc1dd7cd4da +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dts new file mode 100755 -index 000000000000..66e83916c728 +index 000000000..66e83916c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dts @@ -0,0 +1,34 @@ @@ -34644,7 +34644,7 @@ index 000000000000..66e83916c728 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi new file mode 100755 -index 000000000000..3dad4f4fafcb +index 000000000..3dad4f4fa --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi @@ -0,0 +1,612 @@ @@ -35261,7 +35261,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 { @@ -35300,7 +35300,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 e546c9d1d646..03f8b2fe42c3 100644 +index e546c9d1d..03f8b2fe4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -318,13 +318,13 @@ power: power-controller { @@ -35405,7 +35405,7 @@ index e546c9d1d646..03f8b2fe42c3 100644 #interrupt-cells = <3>; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts b/arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts new file mode 100755 -index 000000000000..7e803a8ed30c +index 000000000..7e803a8ed --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts @@ -0,0 +1,189 @@ @@ -35600,7 +35600,7 @@ index 000000000000..7e803a8ed30c +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi new file mode 100755 -index 000000000000..fdea0c73932e +index 000000000..fdea0c739 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi @@ -0,0 +1,982 @@ @@ -36588,7 +36588,7 @@ index 000000000000..fdea0c73932e + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi new file mode 100755 -index 000000000000..a3e0bbaaf7c5 +index 000000000..a3e0bbaaf --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi @@ -0,0 +1,357 @@ @@ -36951,7 +36951,7 @@ index 000000000000..a3e0bbaaf7c5 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-cif-sensor.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-cif-sensor.dtsi new file mode 100755 -index 000000000000..7d2aac22c020 +index 000000000..7d2aac22c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-cif-sensor.dtsi @@ -0,0 +1,35 @@ @@ -36992,7 +36992,7 @@ index 000000000000..7d2aac22c020 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-dram-default-timing.dtsi new file mode 100755 -index 000000000000..10bfbebda989 +index 000000000..10bfbebda --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-dram-default-timing.dtsi @@ -0,0 +1,66 @@ @@ -37064,7 +37064,7 @@ index 000000000000..10bfbebda989 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9-avb.dts b/arch/arm64/boot/dts/rockchip/rk3368-p9-avb.dts new file mode 100755 -index 000000000000..6a971781032a +index 000000000..6a9717810 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-p9-avb.dts @@ -0,0 +1,35 @@ @@ -37105,7 +37105,7 @@ index 000000000000..6a971781032a +}; 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 +index 000000000..29658be08 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-p9.dts @@ -0,0 +1,34 @@ @@ -37145,7 +37145,7 @@ index 000000000000..29658be08696 + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi new file mode 100755 -index 000000000000..7eeb9db4f13b +index 000000000..7eeb9db4f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi @@ -0,0 +1,841 @@ @@ -37992,7 +37992,7 @@ index 000000000000..7eeb9db4f13b + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts new file mode 100755 -index 000000000000..1d50d3fa549f +index 000000000..1d50d3fa5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts @@ -0,0 +1,993 @@ @@ -38991,7 +38991,7 @@ index 000000000000..1d50d3fa549f +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts new file mode 100755 -index 000000000000..4a755f1207c1 +index 000000000..4a755f120 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts @@ -0,0 +1,676 @@ @@ -39673,7 +39673,7 @@ index 000000000000..4a755f1207c1 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts b/arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts new file mode 100755 -index 000000000000..b7b11f895cab +index 000000000..b7b11f895 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts @@ -0,0 +1,662 @@ @@ -40341,7 +40341,7 @@ index 000000000000..b7b11f895cab +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts b/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts new file mode 100755 -index 000000000000..b9b6b24ff37b +index 000000000..b9b6b24ff --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts @@ -0,0 +1,746 @@ @@ -41093,7 +41093,7 @@ index 000000000000..b9b6b24ff37b +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts b/arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts new file mode 100755 -index 000000000000..eff7c2fed990 +index 000000000..eff7c2fed --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts @@ -0,0 +1,808 @@ @@ -41907,7 +41907,7 @@ index 000000000000..eff7c2fed990 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts new file mode 100755 -index 000000000000..d7dc6d67e242 +index 000000000..d7dc6d67e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts @@ -0,0 +1,1070 @@ @@ -42983,7 +42983,7 @@ index 000000000000..d7dc6d67e242 + diff --git a/arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts b/arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts new file mode 100755 -index 000000000000..b455e32c3e29 +index 000000000..b455e32c3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts @@ -0,0 +1,139 @@ @@ -43128,7 +43128,7 @@ index 000000000000..b455e32c3e29 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-xikp.dts b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dts new file mode 100755 -index 000000000000..bc320ffdc3b7 +index 000000000..bc320ffdc --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dts @@ -0,0 +1,33 @@ @@ -43168,7 +43168,7 @@ index 000000000000..bc320ffdc3b7 \ No newline at end of file diff --git a/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi new file mode 100755 -index 000000000000..aa73096aff9d +index 000000000..aa73096af --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi @@ -0,0 +1,893 @@ @@ -44066,7 +44066,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 { @@ -44133,7 +44133,7 @@ index 3746f23dc3df..e962c7962789 100644 diff --git a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts new file mode 100755 -index 000000000000..0a489bf8fc84 +index 000000000..0a489bf8f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts @@ -0,0 +1,1074 @@ @@ -45213,7 +45213,7 @@ index 000000000000..0a489bf8fc84 + diff --git a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts new file mode 100755 -index 000000000000..31f25e44504d +index 000000000..31f25e445 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts @@ -0,0 +1,1333 @@ @@ -46552,7 +46552,7 @@ index 000000000000..31f25e44504d + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi new file mode 100755 -index 000000000000..ffaa92b7a89e +index 000000000..ffaa92b7a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi @@ -0,0 +1,339 @@ @@ -46897,7 +46897,7 @@ index 000000000000..ffaa92b7a89e + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts new file mode 100755 -index 000000000000..c4572da2ec87 +index 000000000..c4572da2e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts @@ -0,0 +1,134 @@ @@ -47037,7 +47037,7 @@ index 000000000000..c4572da2ec87 +}; 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 +index 000000000..1c9b88473 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts @@ -0,0 +1,158 @@ @@ -47201,7 +47201,7 @@ index 000000000000..1c9b884736b1 +}; 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 +index 000000000..704e0df4e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi @@ -0,0 +1,891 @@ @@ -48098,7 +48098,7 @@ index 000000000000..704e0df4e122 +}; 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 +index 000000000..981777b82 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-dram-default-timing.dtsi @@ -0,0 +1,80 @@ @@ -48184,7 +48184,7 @@ index 000000000000..981777b82329 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi new file mode 100755 -index 000000000000..2a675ec7c342 +index 000000000..2a675ec7c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi @@ -0,0 +1,127 @@ @@ -48317,7 +48317,7 @@ index 000000000000..2a675ec7c342 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi new file mode 100755 -index 000000000000..4cac4981b267 +index 000000000..4cac4981b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi @@ -0,0 +1,181 @@ @@ -48504,7 +48504,7 @@ index 000000000000..4cac4981b267 +}; 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 +index 000000000..343a9fc38 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts @@ -0,0 +1,389 @@ @@ -48899,7 +48899,7 @@ index 000000000000..343a9fc389e1 + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts new file mode 100755 -index 000000000000..72aa97affa99 +index 000000000..72aa97aff --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts @@ -0,0 +1,157 @@ @@ -49062,7 +49062,7 @@ index 000000000000..72aa97affa99 + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts new file mode 100755 -index 000000000000..5b6b7131fdd1 +index 000000000..5b6b7131f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts @@ -0,0 +1,321 @@ @@ -49389,7 +49389,7 @@ index 000000000000..5b6b7131fdd1 + 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 +index 000000000..8439d91dd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts @@ -0,0 +1,425 @@ @@ -49820,7 +49820,7 @@ index 000000000000..8439d91dd125 + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi new file mode 100755 -index 000000000000..dc821a2d45c4 +index 000000000..dc821a2d4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi @@ -0,0 +1,1430 @@ @@ -51256,7 +51256,7 @@ index 000000000000..dc821a2d45c4 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts new file mode 100755 -index 000000000000..bb7ddac77f23 +index 000000000..bb7ddac77 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts @@ -0,0 +1,145 @@ @@ -51407,7 +51407,7 @@ index 000000000000..bb7ddac77f23 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts new file mode 100755 -index 000000000000..bf27556295ec +index 000000000..bf2755629 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts @@ -0,0 +1,51 @@ @@ -51464,7 +51464,7 @@ index 000000000000..bf27556295ec +}; 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 +index 000000000..f35d6ee56 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi @@ -0,0 +1,352 @@ @@ -51822,7 +51822,7 @@ index 000000000000..f35d6ee56072 +}; 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 +index 000000000..b15fb8a9d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts @@ -0,0 +1,156 @@ @@ -51984,7 +51984,7 @@ index 000000000000..b15fb8a9d088 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts new file mode 100755 -index 000000000000..2daf9f1235f3 +index 000000000..2daf9f123 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts @@ -0,0 +1,51 @@ @@ -52041,7 +52041,7 @@ index 000000000000..2daf9f1235f3 +}; 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 +index 000000000..4b23c1fca --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi @@ -0,0 +1,366 @@ @@ -52413,7 +52413,7 @@ index 000000000000..4b23c1fcadd8 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts new file mode 100755 -index 000000000000..7f730f5633dd +index 000000000..7f730f563 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts @@ -0,0 +1,126 @@ @@ -52545,7 +52545,7 @@ index 000000000000..7f730f5633dd +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-lp4.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-lp4.dts new file mode 100755 -index 000000000000..85f4356a0030 +index 000000000..85f4356a0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-lp4.dts @@ -0,0 +1,233 @@ @@ -52784,7 +52784,7 @@ index 000000000000..85f4356a0030 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-mipi-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-mipi-edp.dts new file mode 100755 -index 000000000000..fffd92f00ff4 +index 000000000..fffd92f00 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-mipi-edp.dts @@ -0,0 +1,300 @@ @@ -53090,7 +53090,7 @@ index 000000000000..fffd92f00ff4 +}; 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 +index 000000000..9ba1b0381 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts @@ -0,0 +1,176 @@ @@ -53272,7 +53272,7 @@ index 000000000000..9ba1b0381fed +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts new file mode 100755 -index 000000000000..e1bb5f129680 +index 000000000..e1bb5f129 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-cros.dts @@ -0,0 +1,51 @@ @@ -53329,7 +53329,7 @@ index 000000000000..e1bb5f129680 +}; 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 +index 000000000..e34379ded --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3.dtsi @@ -0,0 +1,353 @@ @@ -53688,7 +53688,7 @@ index 000000000000..e34379ded3a5 +}; 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 +index 000000000..aa8ea436a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi @@ -0,0 +1,646 @@ @@ -54340,7 +54340,7 @@ index 000000000000..aa8ea436ae9b + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi new file mode 100755 -index 000000000000..adbda6ba4e0d +index 000000000..adbda6ba4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi @@ -0,0 +1,324 @@ @@ -54670,7 +54670,7 @@ index 000000000000..adbda6ba4e0d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts new file mode 100755 -index 000000000000..c372ade536f2 +index 000000000..c372ade53 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts @@ -0,0 +1,1102 @@ @@ -55778,7 +55778,7 @@ index 000000000000..c372ade536f2 +}; 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 +index 000000000..5a023389a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts @@ -0,0 +1,1074 @@ @@ -56858,7 +56858,7 @@ index 000000000000..5a023389a033 +}; 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 +index 000000000..1192dfa42 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-fpga.dts @@ -0,0 +1,64 @@ @@ -56928,7 +56928,7 @@ index 000000000000..1192dfa42940 + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts new file mode 100755 -index 000000000000..e8d771e2b90e +index 000000000..e8d771e2b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts @@ -0,0 +1,165 @@ @@ -57099,7 +57099,7 @@ index 000000000000..e8d771e2b90e +/* 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 +index 000000000..7a1c36e98 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts @@ -0,0 +1,118 @@ @@ -57223,7 +57223,7 @@ index 000000000000..7a1c36e981d5 +}; 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 +index 000000000..44b04e160 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts @@ -0,0 +1,85 @@ @@ -57313,7 +57313,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 { @@ -57326,7 +57326,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 765b24a2bcbf..32dcaf210085 100644 +index 765b24a2b..32dcaf210 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 { @@ -57342,7 +57342,7 @@ index 765b24a2bcbf..32dcaf210085 100644 regulator-max-microvolt = <3000000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi new file mode 100755 -index 000000000000..0549701d615e +index 000000000..0549701d6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi @@ -0,0 +1,306 @@ @@ -57654,7 +57654,7 @@ index 000000000000..0549701d615e +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts new file mode 100755 -index 000000000000..8610539ef284 +index 000000000..8610539ef --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts @@ -0,0 +1,1121 @@ @@ -58780,7 +58780,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 @@ @@ -59178,7 +59178,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 { @@ -59200,7 +59200,7 @@ index 35b7ab3bf10c..20309076dbac 100644 regulator-state-mem { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts new file mode 100755 -index 000000000000..86e45dc0074d +index 000000000..86e45dc00 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts @@ -0,0 +1,1088 @@ @@ -60293,7 +60293,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 { @@ -60365,7 +60365,7 @@ index c88295782e7b..1a23e8f3cdf6 100644 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts new file mode 100755 -index 000000000000..3106512b87cd +index 000000000..3106512b8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts @@ -0,0 +1,181 @@ @@ -60552,7 +60552,7 @@ index 000000000000..3106512b87cd +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts new file mode 100755 -index 000000000000..3e9ef7b0773b +index 000000000..3e9ef7b07 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts @@ -0,0 +1,128 @@ @@ -60686,7 +60686,7 @@ index 000000000000..3e9ef7b0773b + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts new file mode 100755 -index 000000000000..c2f8673198d5 +index 000000000..c2f867319 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts @@ -0,0 +1,82 @@ @@ -60774,7 +60774,7 @@ index 000000000000..c2f8673198d5 +}; 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 +index 000000000..8156e5f7c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi @@ -0,0 +1,488 @@ @@ -61268,7 +61268,7 @@ index 000000000000..8156e5f7c795 + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts new file mode 100755 -index 000000000000..e1e482938481 +index 000000000..e1e482938 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts @@ -0,0 +1,487 @@ @@ -61761,7 +61761,7 @@ index 000000000000..e1e482938481 +}; 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 +index 000000000..9f370a7bf --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts @@ -0,0 +1,452 @@ @@ -62219,7 +62219,7 @@ index 000000000000..9f370a7bff1c +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts new file mode 100755 -index 000000000000..da471a636103 +index 000000000..da471a636 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts @@ -0,0 +1,497 @@ @@ -62721,7 +62721,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 { @@ -62735,7 +62735,7 @@ index 701a567d7638..3d9e27750139 100644 &saradc { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi new file mode 100755 -index 000000000000..373a776b9207 +index 000000000..373a776b9 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi @@ -0,0 +1,121 @@ @@ -62862,7 +62862,7 @@ index 000000000000..373a776b9207 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts new file mode 100755 -index 000000000000..eeca9cf54373 +index 000000000..eeca9cf54 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts @@ -0,0 +1,170 @@ @@ -63038,7 +63038,7 @@ index 000000000000..eeca9cf54373 + diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dts new file mode 100755 -index 000000000000..28f81ee8f7f5 +index 000000000..28f81ee8f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dts @@ -0,0 +1,42 @@ @@ -63086,7 +63086,7 @@ index 000000000000..28f81ee8f7f5 +}; 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 +index 000000000..fb700431e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi @@ -0,0 +1,1039 @@ @@ -64131,7 +64131,7 @@ index 000000000000..fb700431e356 +}; 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 +index 000000000..ac9d28db5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts @@ -0,0 +1,1179 @@ @@ -65316,7 +65316,7 @@ index 000000000000..ac9d28db5b76 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts new file mode 100755 -index 000000000000..10ba2048483d +index 000000000..10ba20484 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts @@ -0,0 +1,293 @@ @@ -65615,7 +65615,7 @@ index 000000000000..10ba2048483d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-vop-clk-set.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-vop-clk-set.dtsi new file mode 100755 -index 000000000000..5ed8dac6cf7d +index 000000000..5ed8dac6c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-vop-clk-set.dtsi @@ -0,0 +1,181 @@ @@ -65801,7 +65801,7 @@ index 000000000000..5ed8dac6cf7d +#endif + diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -index 4b6065dbba55..d1bf1b6a0d10 100644 +index 4b6065dbb..d1bf1b6a0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -9,8 +9,13 @@ @@ -66516,7 +66516,7 @@ index 4b6065dbba55..d1bf1b6a0d10 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 +index 000000000..59f200e0b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399k-opp.dtsi @@ -0,0 +1,24 @@ @@ -66546,7 +66546,7 @@ index 000000000000..59f200e0b9cb +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts new file mode 100755 -index 000000000000..f975f47b76d6 +index 000000000..f975f47b7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts @@ -0,0 +1,1293 @@ @@ -67845,7 +67845,7 @@ index 000000000000..f975f47b76d6 +/* 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 +index 000000000..08ac2a477 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts @@ -0,0 +1,1203 @@ @@ -69054,7 +69054,7 @@ index 000000000000..08ac2a477852 +/* 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 +index 000000000..398f96211 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts @@ -0,0 +1,1061 @@ @@ -70121,7 +70121,7 @@ index 000000000000..398f962114cf +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts new file mode 100755 -index 000000000000..c3faaa1ba4d3 +index 000000000..c3faaa1ba --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts @@ -0,0 +1,1223 @@ @@ -71350,7 +71350,7 @@ index 000000000000..c3faaa1ba4d3 +/* 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 +index 000000000..7d118a783 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts @@ -0,0 +1,1045 @@ @@ -72401,7 +72401,7 @@ index 000000000000..7d118a783353 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v14-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v14-linux.dts new file mode 100755 -index 000000000000..4f8546eb80bf +index 000000000..4f8546eb8 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v14-linux.dts @@ -0,0 +1,247 @@ @@ -72654,7 +72654,7 @@ index 000000000000..4f8546eb80bf +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts new file mode 100755 -index 000000000000..96a3fb56cfe5 +index 000000000..96a3fb56c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts @@ -0,0 +1,140 @@ @@ -72800,7 +72800,7 @@ index 000000000000..96a3fb56cfe5 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi new file mode 100755 -index 000000000000..3f176b3bc94f +index 000000000..3f176b3bc --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi @@ -0,0 +1,826 @@ @@ -73632,7 +73632,7 @@ index 000000000000..3f176b3bc94f +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dts new file mode 100755 -index 000000000000..1bd285bfc695 +index 000000000..1bd285bfc --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dts @@ -0,0 +1,15 @@ @@ -73653,7 +73653,7 @@ index 000000000000..1bd285bfc695 +}; 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 +index 000000000..41ac0af11 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi @@ -0,0 +1,528 @@ @@ -74187,7 +74187,7 @@ index 000000000000..41ac0af11188 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi new file mode 100755 -index 000000000000..f0feae6730e3 +index 000000000..f0feae673 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi @@ -0,0 +1,436 @@ @@ -74629,7 +74629,7 @@ index 000000000000..f0feae6730e3 + diff --git a/arch/arm64/boot/dts/rockchip/rk3566-eink.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-eink.dtsi new file mode 100755 -index 000000000000..09791eb16abf +index 000000000..09791eb16 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-eink.dtsi @@ -0,0 +1,100 @@ @@ -74735,7 +74735,7 @@ index 000000000000..09791eb16abf + diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dts new file mode 100755 -index 000000000000..3f215884a070 +index 000000000..3f215884a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dts @@ -0,0 +1,7 @@ @@ -74748,7 +74748,7 @@ index 000000000000..3f215884a070 +#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 +index 000000000..227bc4e39 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi @@ -0,0 +1,507 @@ @@ -75261,7 +75261,7 @@ index 000000000000..227bc4e39d99 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb.dtsi new file mode 100755 -index 000000000000..d1aa123cd347 +index 000000000..d1aa123cd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb.dtsi @@ -0,0 +1,7 @@ @@ -75274,7 +75274,7 @@ index 000000000000..d1aa123cd347 +#include "rk3568-evb.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-linux.dts new file mode 100755 -index 000000000000..a22cc8cec6af +index 000000000..a22cc8cec --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-linux.dts @@ -0,0 +1,13 @@ @@ -75293,7 +75293,7 @@ index 000000000000..a22cc8cec6af +}; 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 +index 000000000..98a384041 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-lvds.dts @@ -0,0 +1,99 @@ @@ -75398,7 +75398,7 @@ index 000000000000..98a384041b8b +}; 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 +index 000000000..f602ed98d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dts @@ -0,0 +1,7 @@ @@ -75411,7 +75411,7 @@ index 000000000000..f602ed98d7ce +#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 +index 000000000..385933be9 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi @@ -0,0 +1,489 @@ @@ -75906,7 +75906,7 @@ index 000000000000..385933be9f45 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts new file mode 100755 -index 000000000000..83546eef6529 +index 000000000..83546eef6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts @@ -0,0 +1,345 @@ @@ -76257,7 +76257,7 @@ index 000000000000..83546eef6529 +}; 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 +index 000000000..5ba1318bc --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-i2s-mic-array.dts @@ -0,0 +1,102 @@ @@ -76365,7 +76365,7 @@ index 000000000000..5ba1318bcee1 +}; 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 +index 000000000..957a99b16 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-linux.dts @@ -0,0 +1,8 @@ @@ -76379,7 +76379,7 @@ index 000000000000..957a99b168bb +#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 +index 000000000..55e967919 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-pdm-mic-array.dts @@ -0,0 +1,111 @@ @@ -76496,7 +76496,7 @@ index 000000000000..55e9679194cb + diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts new file mode 100755 -index 000000000000..3b36bdba12b6 +index 000000000..3b36bdba1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts @@ -0,0 +1,8 @@ @@ -76510,7 +76510,7 @@ index 000000000000..3b36bdba12b6 +#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 +index 000000000..4a6bec70f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi @@ -0,0 +1,599 @@ @@ -77115,7 +77115,7 @@ index 000000000000..4a6bec70f33e +}; 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 +index 000000000..e292b0dd1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10-linux.dts @@ -0,0 +1,8 @@ @@ -77129,7 +77129,7 @@ index 000000000000..e292b0dd1846 +#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 +index 000000000..09f5260fb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dts @@ -0,0 +1,8 @@ @@ -77143,7 +77143,7 @@ index 000000000000..09f5260fb375 +#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 +index 000000000..f936cc186 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi @@ -0,0 +1,499 @@ @@ -77648,7 +77648,7 @@ index 000000000000..f936cc186cfb +}; 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 +index 000000000..600fc3c39 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dts @@ -0,0 +1,7 @@ @@ -77661,7 +77661,7 @@ index 000000000000..600fc3c39586 +#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 +index 000000000..835866595 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi @@ -0,0 +1,317 @@ @@ -77984,7 +77984,7 @@ index 000000000000..83586659530d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts new file mode 100755 -index 000000000000..3f559fca27f8 +index 000000000..3f559fca2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts @@ -0,0 +1,1115 @@ @@ -79105,7 +79105,7 @@ index 000000000000..3f559fca27f8 +}; 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 +index 000000000..2e6d3160a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts @@ -0,0 +1,968 @@ @@ -80079,7 +80079,7 @@ index 000000000000..2e6d3160aa16 +}; 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 +index 000000000..50412b44b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts @@ -0,0 +1,957 @@ @@ -81042,7 +81042,7 @@ index 000000000000..50412b44bb71 +}; 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 +index 000000000..f6f4534aa --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts @@ -0,0 +1,1307 @@ @@ -82355,7 +82355,7 @@ index 000000000000..f6f4534aad50 +}; 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 +index 000000000..8102da027 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts @@ -0,0 +1,1180 @@ @@ -83541,7 +83541,7 @@ index 000000000000..8102da0270fa +}; 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 +index 000000000..1d4a04844 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts @@ -0,0 +1,1208 @@ @@ -84755,7 +84755,7 @@ index 000000000000..1d4a0484473a +}; 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 +index 000000000..40022eb6c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts @@ -0,0 +1,1213 @@ @@ -85974,7 +85974,7 @@ index 000000000000..40022eb6c646 +}; 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 +index 000000000..01b6499b6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566.dtsi @@ -0,0 +1,53 @@ @@ -86033,7 +86033,7 @@ index 000000000000..01b6499b678d +/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 +index 000000000..01cd37c04 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-android.dtsi @@ -0,0 +1,74 @@ @@ -86113,7 +86113,7 @@ index 000000000000..01cd37c04e1a +}; 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 +index 000000000..43f978809 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-dram-default-timing.dtsi @@ -0,0 +1,81 @@ @@ -86200,7 +86200,7 @@ index 000000000000..43f978809c02 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi new file mode 100755 -index 000000000000..2ca4a18314d2 +index 000000000..2ca4a1831 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi @@ -0,0 +1,1807 @@ @@ -88013,7 +88013,7 @@ index 000000000000..2ca4a18314d2 +}; 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 +index 000000000..259b483af --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-spi-nor.dts @@ -0,0 +1,18 @@ @@ -88037,7 +88037,7 @@ index 000000000000..259b483af0f4 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts new file mode 100755 -index 000000000000..55c255998473 +index 000000000..55c255998 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts @@ -0,0 +1,8 @@ @@ -88051,7 +88051,7 @@ index 000000000000..55c255998473 +#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 +index 000000000..00c28f392 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts @@ -0,0 +1,8 @@ @@ -88065,7 +88065,7 @@ index 000000000000..00c28f39269b +#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 +index 000000000..64881d201 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi @@ -0,0 +1,490 @@ @@ -88561,7 +88561,7 @@ index 000000000000..64881d20183f +}; 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 +index 000000000..7a5a7feb5 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts @@ -0,0 +1,79 @@ @@ -88646,7 +88646,7 @@ index 000000000000..7a5a7feb52a7 +}; 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 +index 000000000..23f5f036c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dts @@ -0,0 +1,8 @@ @@ -88660,7 +88660,7 @@ index 000000000000..23f5f036c4b2 +#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 +index 000000000..c2d0b697a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi @@ -0,0 +1,493 @@ @@ -89159,7 +89159,7 @@ index 000000000000..c2d0b697a9bd +}; 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 +index 000000000..5884da41f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb4-lp3-v10.dts @@ -0,0 +1,12 @@ @@ -89177,7 +89177,7 @@ index 000000000000..5884da41f121 +}; 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 +index 000000000..e9eb33307 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dts @@ -0,0 +1,8 @@ @@ -89191,7 +89191,7 @@ index 000000000000..e9eb333079a2 +#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 +index 000000000..e8a00fc85 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi @@ -0,0 +1,539 @@ @@ -89736,7 +89736,7 @@ index 000000000000..e8a00fc85483 +}; 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 +index 000000000..a11975fc7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-linux.dts @@ -0,0 +1,8 @@ @@ -89750,7 +89750,7 @@ index 000000000000..a11975fc7d53 +#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 +index 000000000..0c5ea5eb3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts @@ -0,0 +1,127 @@ @@ -89883,7 +89883,7 @@ index 000000000000..0c5ea5eb32ba +}; 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 +index 000000000..597fa0b0b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts @@ -0,0 +1,96 @@ @@ -89985,7 +89985,7 @@ index 000000000000..597fa0b0b089 +}; 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 +index 000000000..24c4debec --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk630-bt656-to-cvbs.dts @@ -0,0 +1,70 @@ @@ -90061,7 +90061,7 @@ index 000000000000..24c4debec4f3 +}; 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 +index 000000000..6e34fa48a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dts @@ -0,0 +1,8 @@ @@ -90075,7 +90075,7 @@ index 000000000000..6e34fa48abc4 +#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 +index 000000000..2f3b5d74e --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi @@ -0,0 +1,490 @@ @@ -90571,7 +90571,7 @@ index 000000000000..2f3b5d74e1cf +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb7-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb7-ddr4-v10.dts new file mode 100755 -index 000000000000..ecb96832c292 +index 000000000..ecb96832c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb7-ddr4-v10.dts @@ -0,0 +1,12 @@ @@ -90589,7 +90589,7 @@ index 000000000000..ecb96832c292 +}; 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 +index 000000000..d832a40d3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10-linux.dts @@ -0,0 +1,69 @@ @@ -90664,7 +90664,7 @@ index 000000000000..d832a40d37e9 +/delete-node/ &display_subsystem; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10.dts new file mode 100755 -index 000000000000..489967f1318f +index 000000000..489967f13 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-iotest-ddr3-v10.dts @@ -0,0 +1,47 @@ @@ -90717,7 +90717,7 @@ index 000000000000..489967f1318f +}; 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..d869144aa806 +index 000000000..d869144aa --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi @@ -0,0 +1,59 @@ @@ -90782,7 +90782,7 @@ index 000000000000..d869144aa806 +}; 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 +index 000000000..50bd02452 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux-spi-nand.dts @@ -0,0 +1,31 @@ @@ -90819,7 +90819,7 @@ index 000000000000..50bd024528df +}; 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 +index 000000000..3317db6ee --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux.dts @@ -0,0 +1,27 @@ @@ -90852,7 +90852,7 @@ index 000000000000..3317db6ee671 +}; 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 +index 000000000..053d20259 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dts @@ -0,0 +1,27 @@ @@ -90885,7 +90885,7 @@ index 000000000000..053d20259e93 +}; 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 +index 000000000..40a2096bc --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi @@ -0,0 +1,442 @@ @@ -91333,7 +91333,7 @@ index 000000000000..40a2096bc58b +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts new file mode 100755 -index 000000000000..de8c1a1e734f +index 000000000..de8c1a1e7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts @@ -0,0 +1,20 @@ @@ -91359,7 +91359,7 @@ index 000000000000..de8c1a1e734f + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts new file mode 100755 -index 000000000000..b605c3d57d26 +index 000000000..b605c3d57 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux.dts @@ -0,0 +1,16 @@ @@ -91381,7 +91381,7 @@ index 000000000000..b605c3d57d26 + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12.dtsi new file mode 100755 -index 000000000000..6bb50368a73b +index 000000000..6bb50368a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12.dtsi @@ -0,0 +1,39 @@ @@ -91426,7 +91426,7 @@ index 000000000000..6bb50368a73b +}; 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 +index 000000000..f9908b61c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-linux.dtsi @@ -0,0 +1,55 @@ @@ -91487,7 +91487,7 @@ index 000000000000..f9908b61cb41 +}; 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 +index 000000000..e1ec294b2 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi @@ -0,0 +1,510 @@ @@ -92003,7 +92003,7 @@ index 000000000000..e1ec294b2c82 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi new file mode 100755 -index 000000000000..30d8cedfbdc7 +index 000000000..30d8cedfb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi @@ -0,0 +1,3119 @@ @@ -95128,7 +95128,7 @@ index 000000000000..30d8cedfbdc7 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts new file mode 100755 -index 000000000000..0ef442123d05 +index 000000000..0ef442123 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts @@ -0,0 +1,14 @@ @@ -95148,7 +95148,7 @@ index 000000000000..0ef442123d05 + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-edp.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-edp.dtsi new file mode 100755 -index 000000000000..459fc3b6d6a0 +index 000000000..459fc3b6d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-edp.dtsi @@ -0,0 +1,141 @@ @@ -95295,7 +95295,7 @@ index 000000000000..459fc3b6d6a0 +}; 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 +index 000000000..25889a206 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0-beiqicloud.dtsi @@ -0,0 +1,395 @@ @@ -95696,7 +95696,7 @@ index 000000000000..25889a206778 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi new file mode 100755 -index 000000000000..bd32a4246df3 +index 000000000..bd32a4246 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi @@ -0,0 +1,91 @@ @@ -95793,7 +95793,7 @@ index 000000000000..bd32a4246df3 +}; 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 +index 000000000..70fc8ffc3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx1.dtsi @@ -0,0 +1,97 @@ @@ -95896,7 +95896,7 @@ index 000000000000..70fc8ffc3e41 +}; 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 +index 000000000..ccfd369d0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-android.dts @@ -0,0 +1,13 @@ @@ -95915,7 +95915,7 @@ index 000000000000..ccfd369d0cd3 + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts new file mode 100755 -index 000000000000..3107e3a9937a +index 000000000..3107e3a99 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts @@ -0,0 +1,155 @@ @@ -96076,7 +96076,7 @@ index 000000000000..3107e3a9937a + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts new file mode 100755 -index 000000000000..0fb7b0a65fe5 +index 000000000..0fb7b0a65 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts @@ -0,0 +1,14 @@ @@ -96096,7 +96096,7 @@ index 000000000000..0fb7b0a65fe5 +}; 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..e34a074e7888 +index 000000000..14d80d46b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi @@ -0,0 +1,856 @@ @@ -96259,7 +96259,7 @@ index 000000000000..e34a074e7888 + }; + + rk809_sound_micarray: rk809-sound-micarray { -+ status = "okay"; ++ status = "disabled"; + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,name = "rockchip,rk809-codec"; @@ -96338,7 +96338,7 @@ index 000000000000..e34a074e7888 +}; +#endif +&rk809_sound { -+ status = "disabled"; ++ status = "okay"; +}; + +&combphy0_us { @@ -96958,7 +96958,7 @@ index 000000000000..e34a074e7888 +}; 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 +index 000000000..8dd494ce3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10-linux.dts @@ -0,0 +1,13 @@ @@ -96977,7 +96977,7 @@ index 000000000000..8dd494ce3a1f +}; 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 +index 000000000..7c1919d7d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10.dtsi @@ -0,0 +1,816 @@ @@ -97799,7 +97799,7 @@ index 000000000000..7c1919d7d258 +}; 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 +index 000000000..8be2d36f3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi @@ -0,0 +1,1891 @@ @@ -99696,7 +99696,7 @@ index 000000000000..8be2d36f38c0 +}; 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 +index 000000000..372617fee --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi @@ -0,0 +1,3449 @@ @@ -103151,7 +103151,7 @@ index 000000000000..372617fee467 +#include "rk3568-pinctrl.dtsi" diff --git a/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi b/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi new file mode 100755 -index 000000000000..fc0145333257 +index 000000000..fc0145333 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi @@ -0,0 +1,382 @@ @@ -103539,7 +103539,7 @@ index 000000000000..fc0145333257 + diff --git a/arch/arm64/configs/rockchip_linux_defconfig b/arch/arm64/configs/rockchip_linux_defconfig new file mode 100755 -index 000000000000..2690331abd8d +index 000000000..2690331ab --- /dev/null +++ b/arch/arm64/configs/rockchip_linux_defconfig @@ -0,0 +1,557 @@ @@ -104102,7 +104102,7 @@ index 000000000000..2690331abd8d +# CONFIG_USB_NET_CDC_NCM is not set 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 +index 000000000..a82fe791b --- /dev/null +++ b/arch/arm64/include/asm/system_info.h @@ -0,0 +1,14 @@ @@ -104121,7 +104121,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 77605aec25fe..32be174c84d7 100644 +index 77605aec2..32be174c8 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -25,6 +25,12 @@ @@ -104138,7 +104138,7 @@ index 77605aec25fe..32be174c84d7 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 4999caff3281..b47d477f4ce7 100644 +index 4999caff3..b47d477f4 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -191,6 +191,8 @@ void machine_restart(char *cmd) @@ -104151,7 +104151,7 @@ index 4999caff3281..b47d477f4ce7 100644 * UpdateCapsule() depends on the system being reset via * ResetSystem(). diff --git a/drivers/Kconfig b/drivers/Kconfig -index dcecc9f6e33f..8c97ea01aabd 100644 +index dcecc9f6e..8c97ea01a 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -235,4 +235,8 @@ source "drivers/interconnect/Kconfig" @@ -104164,7 +104164,7 @@ index dcecc9f6e33f..8c97ea01aabd 100644 +source "drivers/rk_nand/Kconfig" endmenu diff --git a/drivers/Makefile b/drivers/Makefile -index 576228037718..18cc78f5385c 100644 +index 576228037..18cc78f53 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -189,3 +189,5 @@ obj-$(CONFIG_GNSS) += gnss/ @@ -104174,10 +104174,10 @@ index 576228037718..18cc78f5385c 100644 +obj-$(CONFIG_RK_FLASH) += rkflash/ +obj-$(CONFIG_RK_NAND) += rk_nand/ diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c -index f7f1d9dbdc80..59c452fff835 100644 +index 07b06fc6f..cc9770936 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c -@@ -2313,12 +2313,6 @@ static int nbd_genl_status(struct sk_buff *skb, struct genl_info *info) +@@ -2386,12 +2386,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); @@ -104191,7 +104191,7 @@ index f7f1d9dbdc80..59c452fff835 100644 ret = idr_for_each(&nbd_index_idr, &status_cb, reply); if (ret) { diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig -index c715d4681a0b..42bb63d80971 100644 +index c715d4681..42bb63d80 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -38,6 +38,13 @@ menuconfig COMMON_CLK @@ -104209,7 +104209,7 @@ index c715d4681a0b..42bb63d80971 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 61c78714c095..5c825b523c6b 100644 +index 61c78714c..5c825b523 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1296,7 +1296,7 @@ static int __init clk_disable_unused(void) @@ -104222,7 +104222,7 @@ index 61c78714c095..5c825b523c6b 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..02c5df791017 100644 +index 47cd6c5de..02c5df791 100644 --- a/drivers/clk/rockchip/Kconfig +++ b/drivers/clk/rockchip/Kconfig @@ -2,7 +2,7 @@ @@ -104352,7 +104352,7 @@ index 47cd6c5de837..02c5df791017 100644 + Say y here to enable clk compensation(+/- 1000 ppm). endif diff --git a/drivers/clk/rockchip/Makefile b/drivers/clk/rockchip/Makefile -index a99e4d9bbae1..a4c718bf1126 100644 +index a99e4d9bb..a4c718bf1 100644 --- a/drivers/clk/rockchip/Makefile +++ b/drivers/clk/rockchip/Makefile @@ -13,10 +13,14 @@ clk-rockchip-y += clk-inverter.o @@ -104376,7 +104376,7 @@ index a99e4d9bbae1..a4c718bf1126 100644 obj-$(CONFIG_CLK_RK3399) += clk-rk3399.o +obj-$(CONFIG_CLK_RK3568) += clk-rk3568.o diff --git a/drivers/clk/rockchip/clk-cpu.c b/drivers/clk/rockchip/clk-cpu.c -index 0dc478a19451..55416812bed2 100644 +index 0dc478a19..55416812b 100644 --- a/drivers/clk/rockchip/clk-cpu.c +++ b/drivers/clk/rockchip/clk-cpu.c @@ -51,6 +51,7 @@ @@ -104580,7 +104580,7 @@ index 0dc478a19451..55416812bed2 100644 } diff --git a/drivers/clk/rockchip/clk-dclk-divider.c b/drivers/clk/rockchip/clk-dclk-divider.c new file mode 100755 -index 000000000000..77c35b42207e +index 000000000..77c35b422 --- /dev/null +++ b/drivers/clk/rockchip/clk-dclk-divider.c @@ -0,0 +1,168 @@ @@ -104753,7 +104753,7 @@ index 000000000000..77c35b42207e + return ERR_PTR(-ENOMEM); +} diff --git a/drivers/clk/rockchip/clk-ddr.c b/drivers/clk/rockchip/clk-ddr.c -index 86718c54e56b..3c8bcbee2048 100644 +index 86718c54e..3c8bcbee2 100644 --- a/drivers/clk/rockchip/clk-ddr.c +++ b/drivers/clk/rockchip/clk-ddr.c @@ -8,10 +8,20 @@ @@ -104990,7 +104990,7 @@ index 86718c54e56b..3c8bcbee2048 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, @@ -105091,7 +105091,7 @@ index ccd5c270c213..b978af08d84f 100644 div->width = div_width; div->lock = lock; diff --git a/drivers/clk/rockchip/clk-pll.c b/drivers/clk/rockchip/clk-pll.c -index bbbf9ce42867..f4946461609d 100644 +index bbbf9ce42..f49464616 100644 --- a/drivers/clk/rockchip/clk-pll.c +++ b/drivers/clk/rockchip/clk-pll.c @@ -15,6 +15,9 @@ @@ -106026,7 +106026,7 @@ index bbbf9ce42867..f4946461609d 100644 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/clk/rockchip/clk-pvtm.c b/drivers/clk/rockchip/clk-pvtm.c new file mode 100755 -index 000000000000..ad02b6a571d8 +index 000000000..ad02b6a57 --- /dev/null +++ b/drivers/clk/rockchip/clk-pvtm.c @@ -0,0 +1,310 @@ @@ -106341,7 +106341,7 @@ index 000000000000..ad02b6a571d8 +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..89ecbd4ed0c9 100644 +index 6fb9c98b7..89ecbd4ed 100644 --- a/drivers/clk/rockchip/clk-px30.c +++ b/drivers/clk/rockchip/clk-px30.c @@ -6,13 +6,16 @@ @@ -106889,7 +106889,7 @@ index 6fb9c98b7d24..89ecbd4ed0c9 100644 +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk1808.c b/drivers/clk/rockchip/clk-rk1808.c new file mode 100755 -index 000000000000..cb9483623f13 +index 000000000..cb9483623 --- /dev/null +++ b/drivers/clk/rockchip/clk-rk1808.c @@ -0,0 +1,1249 @@ @@ -108143,7 +108143,7 @@ index 000000000000..cb9483623f13 +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..02770ff67e14 100644 +index 6a46f85ad..02770ff67 100644 --- a/drivers/clk/rockchip/clk-rk3036.c +++ b/drivers/clk/rockchip/clk-rk3036.c @@ -9,13 +9,18 @@ @@ -108427,7 +108427,7 @@ index 6a46f85ad837..02770ff67e14 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..6f6f44ac7257 100644 +index 4b1122e98..6f6f44ac7 100644 --- a/drivers/clk/rockchip/clk-rk3128.c +++ b/drivers/clk/rockchip/clk-rk3128.c @@ -6,13 +6,19 @@ @@ -108786,7 +108786,7 @@ index 4b1122e98e16..6f6f44ac7257 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..052669bf8978 100644 +index 730020fcc..052669bf8 100644 --- a/drivers/clk/rockchip/clk-rk3188.c +++ b/drivers/clk/rockchip/clk-rk3188.c @@ -5,15 +5,21 @@ @@ -109181,7 +109181,7 @@ index 730020fcc7fe..052669bf8978 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..01ff90c8a59f 100644 +index 47d6482dd..01ff90c8a 100644 --- a/drivers/clk/rockchip/clk-rk3228.c +++ b/drivers/clk/rockchip/clk-rk3228.c @@ -7,14 +7,20 @@ @@ -109662,7 +109662,7 @@ index 47d6482dda9d..01ff90c8a59f 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..3e054ddf1931 100644 +index 93c794695..3e054ddf1 100644 --- a/drivers/clk/rockchip/clk-rk3288.c +++ b/drivers/clk/rockchip/clk-rk3288.c @@ -6,14 +6,20 @@ @@ -110109,7 +110109,7 @@ index 93c794695c46..3e054ddf1931 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..539d37ae89c9 100644 +index 5bf15f2a4..539d37ae8 100644 --- a/drivers/clk/rockchip/clk-rk3308.c +++ b/drivers/clk/rockchip/clk-rk3308.c @@ -8,11 +8,20 @@ @@ -110555,7 +110555,7 @@ index 5bf15f2a44b7..539d37ae89c9 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..b8064dd74bd6 100644 +index 2429b7c2a..b8064dd74 100644 --- a/drivers/clk/rockchip/clk-rk3328.c +++ b/drivers/clk/rockchip/clk-rk3328.c @@ -6,8 +6,10 @@ @@ -111075,7 +111075,7 @@ index 2429b7c2a8b3..b8064dd74bd6 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..4b4513a26740 100644 +index 554433494..4b4513a26 100644 --- a/drivers/clk/rockchip/clk-rk3368.c +++ b/drivers/clk/rockchip/clk-rk3368.c @@ -5,13 +5,19 @@ @@ -111508,7 +111508,7 @@ index 55443349439b..4b4513a26740 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 7df2f1e00347..d5071884b3d5 100644 +index 7df2f1e00..d5071884b 100644 --- a/drivers/clk/rockchip/clk-rk3399.c +++ b/drivers/clk/rockchip/clk-rk3399.c @@ -15,6 +15,12 @@ @@ -112754,7 +112754,7 @@ index 7df2f1e00347..d5071884b3d5 100644 diff --git a/drivers/clk/rockchip/clk-rk3568.c b/drivers/clk/rockchip/clk-rk3568.c new file mode 100755 -index 000000000000..44ce9cc542ce +index 000000000..44ce9cc54 --- /dev/null +++ b/drivers/clk/rockchip/clk-rk3568.c @@ -0,0 +1,1757 @@ @@ -114516,7 +114516,7 @@ index 000000000000..44ce9cc542ce +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:clk-rk3568"); diff --git a/drivers/clk/rockchip/clk-rv1108.c b/drivers/clk/rockchip/clk-rv1108.c -index 5947d3192866..53eaabb193a4 100644 +index 5947d3192..53eaabb19 100644 --- a/drivers/clk/rockchip/clk-rv1108.c +++ b/drivers/clk/rockchip/clk-rv1108.c @@ -7,13 +7,17 @@ @@ -114814,7 +114814,7 @@ index 5947d3192866..53eaabb193a4 100644 +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rv1126.c b/drivers/clk/rockchip/clk-rv1126.c new file mode 100755 -index 000000000000..09a376c51c0b +index 000000000..09a376c51 --- /dev/null +++ b/drivers/clk/rockchip/clk-rv1126.c @@ -0,0 +1,1586 @@ @@ -116405,7 +116405,7 @@ index 000000000000..09a376c51c0b +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..6c8e47067032 100644 +index b443169dd..6c8e47067 100644 --- a/drivers/clk/rockchip/clk.c +++ b/drivers/clk/rockchip/clk.c @@ -38,6 +38,7 @@ static struct clk *rockchip_clk_register_branch(const char *name, @@ -116742,7 +116742,7 @@ index b443169dd408..6c8e47067032 100644 } EXPORT_SYMBOL_GPL(rockchip_register_restart_notifier); diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h -index 2271a84124b0..509087750eeb 100644 +index 2271a8412..509087750 100644 --- a/drivers/clk/rockchip/clk.h +++ b/drivers/clk/rockchip/clk.h @@ -37,12 +37,25 @@ struct clk; @@ -117312,7 +117312,7 @@ index 2271a84124b0..509087750eeb 100644 #endif diff --git a/drivers/clk/rockchip/regmap/Kconfig b/drivers/clk/rockchip/regmap/Kconfig new file mode 100755 -index 000000000000..65f691bc4141 +index 000000000..65f691bc4 --- /dev/null +++ b/drivers/clk/rockchip/regmap/Kconfig @@ -0,0 +1,16 @@ @@ -117334,7 +117334,7 @@ index 000000000000..65f691bc4141 + 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 +index 000000000..18d075d09 --- /dev/null +++ b/drivers/clk/rockchip/regmap/Makefile @@ -0,0 +1,13 @@ @@ -117353,7 +117353,7 @@ index 000000000000..18d075d093d9 +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 +index 000000000..43d2b9a45 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-composite.c @@ -0,0 +1,400 @@ @@ -117759,7 +117759,7 @@ index 000000000000..43d2b9a45aca +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_composite); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-divider.c b/drivers/clk/rockchip/regmap/clk-regmap-divider.c new file mode 100755 -index 000000000000..cb59a3d9acd2 +index 000000000..cb59a3d9a --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-divider.c @@ -0,0 +1,104 @@ @@ -117869,7 +117869,7 @@ index 000000000000..cb59a3d9acd2 +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..3d5f1d2691e3 +index 000000000..3d5f1d269 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c @@ -0,0 +1,157 @@ @@ -118032,7 +118032,7 @@ index 000000000000..3d5f1d2691e3 +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 +index 000000000..36549b912 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-gate.c @@ -0,0 +1,82 @@ @@ -118120,7 +118120,7 @@ index 000000000000..36549b912fa2 +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_gate); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-mux.c b/drivers/clk/rockchip/regmap/clk-regmap-mux.c new file mode 100755 -index 000000000000..49d58b9c53ab +index 000000000..49d58b9c5 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-mux.c @@ -0,0 +1,79 @@ @@ -118205,7 +118205,7 @@ index 000000000000..49d58b9c53ab +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_mux); 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 +index 000000000..24ad7eda9 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-pll.c @@ -0,0 +1,363 @@ @@ -118574,7 +118574,7 @@ index 000000000000..24ad7eda9d94 +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_pll); diff --git a/drivers/clk/rockchip/regmap/clk-regmap.h b/drivers/clk/rockchip/regmap/clk-regmap.h new file mode 100755 -index 000000000000..255c0201a590 +index 000000000..255c0201a --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap.h @@ -0,0 +1,311 @@ @@ -118891,7 +118891,7 @@ index 000000000000..255c0201a590 +#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 +index 000000000..c780f502b --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-rk618.c @@ -0,0 +1,408 @@ @@ -119305,7 +119305,7 @@ index 000000000000..c780f502b354 +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..4c3a9eac0e0c +index 000000000..4c3a9eac0 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-rk628.c @@ -0,0 +1,569 @@ @@ -119879,7 +119879,7 @@ index 000000000000..4c3a9eac0e0c +MODULE_DESCRIPTION("Rockchip RK628 CRU driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig -index 39f4d8866200..668711048df8 100644 +index 39f4d8866..668711048 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -84,7 +84,9 @@ config IXP4XX_TIMER @@ -119894,7 +119894,7 @@ index 39f4d8866200..668711048df8 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 @@ @@ -119988,7 +119988,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 @@ -120009,7 +120009,7 @@ index 1f73fa75b1a0..0faef5fc6df3 100644 bool help diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile -index f1b7e3dd6e5d..2e0e827afd21 100644 +index f1b7e3dd6..2e0e827af 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -64,6 +64,7 @@ obj-$(CONFIG_PXA3xx) += pxa3xx-cpufreq.o @@ -120021,7 +120021,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 a3734014db47..0b91e3616a11 100644 +index a3734014d..0b91e3616 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 = { @@ -120076,7 +120076,7 @@ index a3734014db47..0b91e3616a11 100644 { .compatible = "st,stih407", }, { .compatible = "st,stih410", }, diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c -index e363ae04aac6..5c8463fa079f 100644 +index e363ae04a..5c8463fa0 100644 --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c @@ -23,6 +23,9 @@ @@ -120354,7 +120354,7 @@ index e363ae04aac6..5c8463fa079f 100644 list_del(&priv->node); } diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c -index ebee0ad559fa..9a7538886556 100644 +index ebee0ad55..9a7538886 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -16,6 +16,7 @@ @@ -120412,7 +120412,7 @@ index ebee0ad559fa..9a7538886556 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) @@ -120440,7 +120440,7 @@ index 50a4d7846580..1f001d281718 100644 diff --git a/drivers/cpufreq/rockchip-cpufreq.c b/drivers/cpufreq/rockchip-cpufreq.c new file mode 100755 -index 000000000000..d370fb4384dc +index 000000000..d370fb438 --- /dev/null +++ b/drivers/cpufreq/rockchip-cpufreq.c @@ -0,0 +1,509 @@ @@ -120955,7 +120955,7 @@ index 000000000000..d370fb4384dc +MODULE_LICENSE("GPL v2"); diff --git a/drivers/cpufreq/rockchip-cpufreq.h b/drivers/cpufreq/rockchip-cpufreq.h new file mode 100755 -index 000000000000..43015c079a1f +index 000000000..43015c079 --- /dev/null +++ b/drivers/cpufreq/rockchip-cpufreq.h @@ -0,0 +1,17 @@ @@ -120977,7 +120977,7 @@ index 000000000000..43015c079a1f + +#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, @@ -120986,7 +120986,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) @@ -121003,7 +121003,7 @@ index 29acaf48e575..0e51ed25665e 100644 } +EXPORT_SYMBOL_GPL(cpuidle_governor_latency_req); diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig -index 37dc40d1fcfb..79217edf629a 100644 +index 37dc40d1f..79217edf6 100644 --- a/drivers/devfreq/Kconfig +++ b/drivers/devfreq/Kconfig @@ -131,15 +131,21 @@ config ARM_TEGRA20_DEVFREQ @@ -121032,7 +121032,7 @@ index 37dc40d1fcfb..79217edf629a 100644 from hardware. diff --git a/drivers/devfreq/Makefile b/drivers/devfreq/Makefile -index 3ca1ad0ecb97..1061fb5923f8 100644 +index 3ca1ad0ec..1061fb592 100644 --- a/drivers/devfreq/Makefile +++ b/drivers/devfreq/Makefile @@ -11,7 +11,8 @@ obj-$(CONFIG_DEVFREQ_GOV_PASSIVE) += governor_passive.o @@ -121046,7 +121046,7 @@ index 3ca1ad0ecb97..1061fb5923f8 100644 obj-$(CONFIG_ARM_TEGRA20_DEVFREQ) += tegra20-devfreq.o diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c -index 829128c0cc68..16b6d8f8767d 100644 +index 829128c0c..16b6d8f87 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -1763,6 +1763,40 @@ static ssize_t timer_store(struct device *dev, struct device_attribute *attr, @@ -121099,7 +121099,7 @@ index 829128c0cc68..16b6d8f8767d 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 @@ -121115,7 +121115,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 @@ @@ -121124,7 +121124,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 9a88faaf8..9fd6a82f7 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -20,23 +20,70 @@ @@ -121790,7 +121790,7 @@ index 9a88faaf8b27..9fd6a82f79d6 100644 diff --git a/drivers/devfreq/event/rockchip-nocp.c b/drivers/devfreq/event/rockchip-nocp.c new file mode 100755 -index 000000000000..957b84ee3290 +index 000000000..957b84ee3 --- /dev/null +++ b/drivers/devfreq/event/rockchip-nocp.c @@ -0,0 +1,166 @@ @@ -121962,7 +121962,7 @@ index 000000000000..957b84ee3290 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c deleted file mode 100644 -index 2e912166a993..000000000000 +index 2e912166a..000000000 --- a/drivers/devfreq/rk3399_dmc.c +++ /dev/null @@ -1,516 +0,0 @@ @@ -122484,7 +122484,7 @@ index 2e912166a993..000000000000 -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 +index 000000000..7032b4815 --- /dev/null +++ b/drivers/devfreq/rockchip_bus.c @@ -0,0 +1,500 @@ @@ -122990,7 +122990,7 @@ index 000000000000..7032b4815c5a +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..4cb817617498 +index 000000000..4cb817617 --- /dev/null +++ b/drivers/devfreq/rockchip_dmc.c @@ -0,0 +1,3320 @@ @@ -126316,7 +126316,7 @@ index 000000000000..4cb817617498 +MODULE_DESCRIPTION("rockchip dmcfreq driver with devfreq framework"); diff --git a/drivers/devfreq/rockchip_dmc_dbg.c b/drivers/devfreq/rockchip_dmc_dbg.c new file mode 100755 -index 000000000000..80b25e9046d1 +index 000000000..80b25e904 --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_dbg.c @@ -0,0 +1,1061 @@ @@ -127383,7 +127383,7 @@ index 000000000000..80b25e9046d1 +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 +index 000000000..8f2e2c02b --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_timing.h @@ -0,0 +1,1307 @@ @@ -128695,7 +128695,7 @@ index 000000000000..8f2e2c02bb90 +#endif /* __ROCKCHIP_DMC_TIMING_H__ */ + diff --git a/drivers/dma-buf/Kconfig b/drivers/dma-buf/Kconfig -index 3ca7de37dd8f..dec5d6851ac5 100644 +index 3ca7de37d..dec5d6851 100644 --- a/drivers/dma-buf/Kconfig +++ b/drivers/dma-buf/Kconfig @@ -21,7 +21,6 @@ config SW_SYNC @@ -128725,7 +128725,7 @@ index 3ca7de37dd8f..dec5d6851ac5 100644 endmenu diff --git a/drivers/dma-buf/Makefile b/drivers/dma-buf/Makefile -index 995e05f609ff..40d81f23cacf 100644 +index 995e05f60..40d81f23c 100644 --- a/drivers/dma-buf/Makefile +++ b/drivers/dma-buf/Makefile @@ -6,6 +6,7 @@ obj-$(CONFIG_DMABUF_HEAPS) += heaps/ @@ -128738,7 +128738,7 @@ index 995e05f609ff..40d81f23cacf 100644 selftest.o \ diff --git a/drivers/dma-buf/dma-buf-sysfs-stats.c b/drivers/dma-buf/dma-buf-sysfs-stats.c new file mode 100755 -index 000000000000..943e395d1807 +index 000000000..943e395d1 --- /dev/null +++ b/drivers/dma-buf/dma-buf-sysfs-stats.c @@ -0,0 +1,311 @@ @@ -129055,7 +129055,7 @@ index 000000000000..943e395d1807 +} diff --git a/drivers/dma-buf/dma-buf-sysfs-stats.h b/drivers/dma-buf/dma-buf-sysfs-stats.h new file mode 100755 -index 000000000000..5f4703249117 +index 000000000..5f4703249 --- /dev/null +++ b/drivers/dma-buf/dma-buf-sysfs-stats.h @@ -0,0 +1,62 @@ @@ -129122,7 +129122,7 @@ index 000000000000..5f4703249117 +#endif +#endif // _DMA_BUF_SYSFS_STATS_H diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c -index 922416b3aace..0ab865543d1f 100644 +index 922416b3a..0ab865543 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -29,7 +29,7 @@ @@ -129456,7 +129456,7 @@ index 922416b3aace..0ab865543d1f 100644 } __exitcall(dma_buf_deinit); 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) @@ -129569,7 +129569,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 afd22c9dbdcf..4fb22001b2ca 100644 +index afd22c9db..4fb22001b 100644 --- a/drivers/dma-buf/dma-heap.c +++ b/drivers/dma-buf/dma-heap.c @@ -30,6 +30,7 @@ @@ -129902,7 +129902,7 @@ index afd22c9dbdcf..4fb22001b2ca 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 @@ @@ -129932,7 +129932,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 @@ @@ -129943,7 +129943,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 @@ @@ -130358,7 +130358,7 @@ index e55384dc115b..4931578df815 100644 static const struct dma_heap_ops cma_heap_ops = { diff --git a/drivers/dma-buf/heaps/deferred-free-helper.c b/drivers/dma-buf/heaps/deferred-free-helper.c new file mode 100755 -index 000000000000..e19c8b68dfeb +index 000000000..e19c8b68d --- /dev/null +++ b/drivers/dma-buf/heaps/deferred-free-helper.c @@ -0,0 +1,138 @@ @@ -130502,7 +130502,7 @@ index 000000000000..e19c8b68dfeb + 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 +index 000000000..11940328c --- /dev/null +++ b/drivers/dma-buf/heaps/deferred-free-helper.h @@ -0,0 +1,55 @@ @@ -130563,7 +130563,7 @@ index 000000000000..11940328ce3f +#endif diff --git a/drivers/dma-buf/heaps/heap-helpers.c b/drivers/dma-buf/heaps/heap-helpers.c deleted file mode 100644 -index d0696cf937af..000000000000 +index d0696cf93..000000000 --- a/drivers/dma-buf/heaps/heap-helpers.c +++ /dev/null @@ -1,270 +0,0 @@ @@ -130839,7 +130839,7 @@ index d0696cf937af..000000000000 -}; 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..000000000 --- a/drivers/dma-buf/heaps/heap-helpers.h +++ /dev/null @@ -1,53 +0,0 @@ @@ -130898,7 +130898,7 @@ index 805d2df88024..000000000000 -#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 +index 000000000..7c34a1ba4 --- /dev/null +++ b/drivers/dma-buf/heaps/page_pool.c @@ -0,0 +1,247 @@ @@ -131151,7 +131151,7 @@ index 000000000000..7c34a1ba48bb +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 +index 000000000..6b083b04f --- /dev/null +++ b/drivers/dma-buf/heaps/page_pool.h @@ -0,0 +1,55 @@ @@ -131211,7 +131211,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 @@ @@ -131852,7 +131852,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 348b3a917..3daa6c76b 100644 --- a/drivers/dma-buf/sw_sync.c +++ b/drivers/dma-buf/sw_sync.c @@ -7,6 +7,8 @@ @@ -131879,7 +131879,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 101394f16..a2f906741 100644 --- a/drivers/dma-buf/sync_debug.c +++ b/drivers/dma-buf/sync_debug.c @@ -8,6 +8,7 @@ @@ -131896,7 +131896,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 { @@ -131919,7 +131919,7 @@ index 6176e52ba2d7..ee84997da6b4 100644 #endif /* _LINUX_SYNC_H */ diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig -index c08968c5ddf8..d9dbfda3c5f2 100644 +index c08968c5d..d9dbfda3c 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -9,7 +9,7 @@ menu "Firmware Drivers" @@ -131946,7 +131946,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 @@ -131959,7 +131959,7 @@ index 5e013b6a3692..850970fbacbc 100644 obj-$(CONFIG_TI_SCI_PROTOCOL) += ti_sci.o diff --git a/drivers/firmware/rockchip_sip.c b/drivers/firmware/rockchip_sip.c new file mode 100755 -index 000000000000..4b00f33f3a05 +index 000000000..4b00f33f3 --- /dev/null +++ b/drivers/firmware/rockchip_sip.c @@ -0,0 +1,548 @@ @@ -132512,7 +132512,7 @@ index 000000000000..4b00f33f3a05 +MODULE_DESCRIPTION("Rockchip SIP Call"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig -index d1300fc003ed..9a4110ad1c20 100644 +index d1300fc00..9a4110ad1 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -495,6 +495,14 @@ config GPIO_REG @@ -132531,7 +132531,7 @@ index d1300fc003ed..9a4110ad1c20 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 @@ -132544,7 +132544,7 @@ index 09dada80ac34..ce6cafb6d3de 100644 obj-$(CONFIG_GPIO_SCH311X) += gpio-sch311x.o diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c new file mode 100755 -index 000000000000..1d1e9a64cceb +index 000000000..1d1e9a64c --- /dev/null +++ b/drivers/gpio/gpio-rockchip.c @@ -0,0 +1,746 @@ @@ -133295,7 +133295,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 2f895a2b8411..be9002d622d5 100644 +index 2f895a2b8..be9002d62 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -1039,3 +1039,14 @@ void of_gpiochip_remove(struct gpio_chip *chip) @@ -133314,7 +133314,7 @@ index 2f895a2b8411..be9002d622d5 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); @@ -133337,7 +133337,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 @@ @@ -133350,7 +133350,7 @@ index 835c88318cec..b66e520ebbdd 100644 obj-$(CONFIG_TRACE_GPU_MEM) += trace/ diff --git a/drivers/gpu/arm/Kbuild b/drivers/gpu/arm/Kbuild new file mode 100755 -index 000000000000..b3466f167d8e +index 000000000..b3466f167 --- /dev/null +++ b/drivers/gpu/arm/Kbuild @@ -0,0 +1,31 @@ @@ -133387,7 +133387,7 @@ index 000000000000..b3466f167d8e +obj-$(CONFIG_MALI_BIFROST_FOR_LINUX) += bifrost_for_linux/ diff --git a/drivers/gpu/arm/Kconfig b/drivers/gpu/arm/Kconfig new file mode 100755 -index 000000000000..599711c18af9 +index 000000000..599711c18 --- /dev/null +++ b/drivers/gpu/arm/Kconfig @@ -0,0 +1,48 @@ @@ -133441,7 +133441,7 @@ index 000000000000..599711c18af9 +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..c05dc8399027 +index 000000000..c05dc8399 --- /dev/null +++ b/drivers/gpu/arm/bifrost/Kbuild @@ -0,0 +1,229 @@ @@ -133676,7 +133676,7 @@ index 000000000000..c05dc8399027 +obj-$(CONFIG_MALI_KUTF) += tests/ diff --git a/drivers/gpu/arm/bifrost/Kconfig b/drivers/gpu/arm/bifrost/Kconfig new file mode 100755 -index 000000000000..ccb16671047a +index 000000000..ccb166710 --- /dev/null +++ b/drivers/gpu/arm/bifrost/Kconfig @@ -0,0 +1,308 @@ @@ -133990,7 +133990,7 @@ index 000000000000..ccb16671047a +# source "drivers/gpu/arm/midgard/tests/Kconfig" diff --git a/drivers/gpu/arm/bifrost/Makefile b/drivers/gpu/arm/bifrost/Makefile new file mode 100755 -index 000000000000..53a12094ec14 +index 000000000..53a12094e --- /dev/null +++ b/drivers/gpu/arm/bifrost/Makefile @@ -0,0 +1,38 @@ @@ -134034,7 +134034,7 @@ index 000000000000..53a12094ec14 + $(MAKE) -C $(KDIR) M=$(CURDIR) clean diff --git a/drivers/gpu/arm/bifrost/Makefile.kbase b/drivers/gpu/arm/bifrost/Makefile.kbase new file mode 100755 -index 000000000000..6b0f81ee76e8 +index 000000000..6b0f81ee7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/Makefile.kbase @@ -0,0 +1,23 @@ @@ -134063,7 +134063,7 @@ index 000000000000..6b0f81ee76e8 + diff --git a/drivers/gpu/arm/bifrost/Mconfig b/drivers/gpu/arm/bifrost/Mconfig new file mode 100755 -index 000000000000..99ababfc2d16 +index 000000000..99ababfc2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/Mconfig @@ -0,0 +1,277 @@ @@ -134346,7 +134346,7 @@ index 000000000000..99ababfc2d16 +source "kernel/drivers/gpu/arm/midgard/tests/Mconfig" diff --git a/drivers/gpu/arm/bifrost/arbiter/Kbuild b/drivers/gpu/arm/bifrost/arbiter/Kbuild new file mode 100755 -index 000000000000..98e47bed223a +index 000000000..98e47bed2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/Kbuild @@ -0,0 +1,24 @@ @@ -134376,7 +134376,7 @@ index 000000000000..98e47bed223a + 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..ddf1a0ce0b05 +index 000000000..ddf1a0ce0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.c @@ -0,0 +1,175 @@ @@ -134557,7 +134557,7 @@ index 000000000000..ddf1a0ce0b05 +} 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..e7e9de76c94c +index 000000000..e7e9de76c --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.h @@ -0,0 +1,133 @@ @@ -134696,7 +134696,7 @@ index 000000000000..e7e9de76c94c +#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..1f53cbf1a286 +index 000000000..1f53cbf1a --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_defs.h @@ -0,0 +1,95 @@ @@ -134797,7 +134797,7 @@ index 000000000000..1f53cbf1a286 +#endif /* _MALI_KBASE_ARBITER_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_interface.h b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_interface.h new file mode 100755 -index 000000000000..5d5d8a7d2cff +index 000000000..5d5d8a7d2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_interface.h @@ -0,0 +1,181 @@ @@ -134984,7 +134984,7 @@ index 000000000000..5d5d8a7d2cff +#endif /* _MALI_KBASE_ARBITER_INTERFACE_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..02b5de2436ea +index 000000000..02b5de243 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c @@ -0,0 +1,676 @@ @@ -135666,7 +135666,7 @@ index 000000000000..02b5de2436ea +} 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..3c49eb1948c5 +index 000000000..3c49eb194 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h @@ -0,0 +1,159 @@ @@ -135831,7 +135831,7 @@ index 000000000000..3c49eb1948c5 +#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..b48ab4c51875 +index 000000000..b48ab4c51 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/Kbuild @@ -0,0 +1,65 @@ @@ -135902,7 +135902,7 @@ index 000000000000..b48ab4c51875 +endif 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..4a61f96c8c7d +index 000000000..4a61f96c8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_backend_config.h @@ -0,0 +1,31 @@ @@ -135939,7 +135939,7 @@ index 000000000000..4a61f96c8c7d + 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..4e07a3f9d83f +index 000000000..4e07a3f9d --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.c @@ -0,0 +1,34 @@ @@ -135979,7 +135979,7 @@ index 000000000000..4e07a3f9d83f + 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..f78ada74f605 +index 000000000..f78ada74f --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.h @@ -0,0 +1,39 @@ @@ -136024,7 +136024,7 @@ index 000000000000..f78ada74f605 +#endif /* _KBASE_CACHE_POLICY_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..187d7d6f6926 +index 000000000..187d7d6f6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.c @@ -0,0 +1,287 @@ @@ -136317,7 +136317,7 @@ index 000000000000..187d7d6f6926 + 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..dcafb26ea4c0 +index 000000000..dcafb26ea --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.h @@ -0,0 +1,155 @@ @@ -136478,7 +136478,7 @@ index 000000000000..dcafb26ea4c0 + 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..3aadcb04160c +index 000000000..3aadcb041 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_debug_job_fault_backend.c @@ -0,0 +1,164 @@ @@ -136648,7 +136648,7 @@ index 000000000000..3aadcb04160c +#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..ff561d180247 +index 000000000..ff561d180 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c @@ -0,0 +1,847 @@ @@ -137501,7 +137501,7 @@ index 000000000000..ff561d180247 +} 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..7bcd47c70ef0 +index 000000000..7bcd47c70 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.h @@ -0,0 +1,47 @@ @@ -137554,7 +137554,7 @@ index 000000000000..7bcd47c70ef0 +#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..60ae0206d6a8 +index 000000000..60ae0206d --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_gpuprops_backend.c @@ -0,0 +1,158 @@ @@ -137718,7 +137718,7 @@ index 000000000000..60ae0206d6a8 +} 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..54b07483dee6 +index 000000000..54b07483d --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_backend.c @@ -0,0 +1,520 @@ @@ -138244,7 +138244,7 @@ index 000000000000..54b07483dee6 +#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..9f785ce16e17 +index 000000000..9f785ce16 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_defs.h @@ -0,0 +1,63 @@ @@ -138313,7 +138313,7 @@ index 000000000000..9f785ce16e17 + 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..2254b9f30d02 +index 000000000..2254b9f30 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_internal.h @@ -0,0 +1,44 @@ @@ -138363,7 +138363,7 @@ index 000000000000..2254b9f30d02 +#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..ca3c048b637a +index 000000000..ca3c048b6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_internal.h @@ -0,0 +1,44 @@ @@ -138413,7 +138413,7 @@ index 000000000000..ca3c048b637a +#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..b09db552e639 +index 000000000..b09db552e --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_linux.c @@ -0,0 +1,504 @@ @@ -138923,7 +138923,7 @@ index 000000000000..b09db552e639 +#endif /* !defined(CONFIG_MALI_BIFROST_NO_MALI) */ 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..9b775898dac2 +index 000000000..9b775898d --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_as.c @@ -0,0 +1,245 @@ @@ -139174,7 +139174,7 @@ index 000000000000..9b775898dac2 + 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..9cccf224999e +index 000000000..9cccf2249 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_defs.h @@ -0,0 +1,113 @@ @@ -139293,7 +139293,7 @@ index 000000000000..9cccf224999e +#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..19661c9766c6 +index 000000000..19661c976 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_hw.c @@ -0,0 +1,1462 @@ @@ -140761,7 +140761,7 @@ index 000000000000..19661c9766c6 +} 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..cd1f9794fdc4 +index 000000000..cd1f9794f --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_internal.h @@ -0,0 +1,181 @@ @@ -140948,7 +140948,7 @@ index 000000000000..cd1f9794fdc4 +#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..afaaef27883d +index 000000000..afaaef278 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.c @@ -0,0 +1,1659 @@ @@ -142613,7 +142613,7 @@ index 000000000000..afaaef27883d +} 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..c3b9f2d85536 +index 000000000..c3b9f2d85 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.h @@ -0,0 +1,83 @@ @@ -142702,7 +142702,7 @@ index 000000000000..c3b9f2d85536 +#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..8187e73767be +index 000000000..8187e7376 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_backend.c @@ -0,0 +1,365 @@ @@ -143073,7 +143073,7 @@ index 000000000000..8187e73767be + 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..6576e55d2e39 +index 000000000..6576e55d2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_internal.h @@ -0,0 +1,74 @@ @@ -143153,7 +143153,7 @@ index 000000000000..6576e55d2e39 +#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..d5526caa5899 +index 000000000..d5526caa5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.c @@ -0,0 +1,133 @@ @@ -143292,7 +143292,7 @@ index 000000000000..d5526caa5899 +} 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..0c779ac80d27 +index 000000000..0c779ac80 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.h @@ -0,0 +1,55 @@ @@ -143353,7 +143353,7 @@ index 000000000000..0c779ac80d27 +#endif /* _KBASE_L2_MMU_CONFIG_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..e33fe0b8e415 +index 000000000..e33fe0b8e --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c @@ -0,0 +1,67 @@ @@ -143426,7 +143426,7 @@ index 000000000000..e33fe0b8e415 +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..e7927cf82e5a +index 000000000..e7927cf82 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.h @@ -0,0 +1,81 @@ @@ -143513,7 +143513,7 @@ index 000000000000..e7927cf82e5a + 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..7b10d06c5fdb +index 000000000..7b10d06c5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_backend.c @@ -0,0 +1,788 @@ @@ -144307,7 +144307,7 @@ index 000000000000..7b10d06c5fdb +#endif /* CONFIG_MALI_ARBITER_SUPPORT */ 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..984e12503009 +index 000000000..984e12503 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.c @@ -0,0 +1,114 @@ @@ -144427,7 +144427,7 @@ index 000000000000..984e12503009 +} 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..5423e96725b9 +index 000000000..5423e9672 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.h @@ -0,0 +1,89 @@ @@ -144522,7 +144522,7 @@ index 000000000000..5423e96725b9 +#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..f67ec650c981 +index 000000000..f67ec650c --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca_devfreq.h @@ -0,0 +1,60 @@ @@ -144588,7 +144588,7 @@ index 000000000000..f67ec650c981 + 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..9eef44ad877f +index 000000000..9eef44ad8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.c @@ -0,0 +1,66 @@ @@ -144660,7 +144660,7 @@ index 000000000000..9eef44ad877f +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..304e5d7fa32d +index 000000000..304e5d7fa --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.h @@ -0,0 +1,69 @@ @@ -144735,7 +144735,7 @@ index 000000000000..304e5d7fa32d +#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..7322c093c7b6 +index 000000000..7322c093c --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_defs.h @@ -0,0 +1,560 @@ @@ -145301,7 +145301,7 @@ index 000000000000..7322c093c7b6 +#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..e9e30ebadc2d +index 000000000..e9e30ebad --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_driver.c @@ -0,0 +1,2545 @@ @@ -147852,7 +147852,7 @@ index 000000000000..e9e30ebadc2d +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..50ca016bbd6d +index 000000000..50ca016bb --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_internal.h @@ -0,0 +1,739 @@ @@ -148597,7 +148597,7 @@ index 000000000000..50ca016bbd6d +#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..12cb051db42a +index 000000000..12cb051db --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_l2_states.h @@ -0,0 +1,38 @@ @@ -148641,7 +148641,7 @@ index 000000000000..12cb051db42a +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..e163bd4f4094 +index 000000000..e163bd4f4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_mcu_states.h @@ -0,0 +1,39 @@ @@ -148686,7 +148686,7 @@ index 000000000000..e163bd4f4094 +KBASEP_MCU_STATE(RESET_WAIT) 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..b714971ba17c +index 000000000..b714971ba --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_metrics.c @@ -0,0 +1,324 @@ @@ -149016,7 +149016,7 @@ index 000000000000..b714971ba17c +} 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..48b24b1c866e +index 000000000..48b24b1c8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.c @@ -0,0 +1,268 @@ @@ -149290,7 +149290,7 @@ index 000000000000..48b24b1c866e +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..f103ef0c01e4 +index 000000000..f103ef0c0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.h @@ -0,0 +1,106 @@ @@ -149402,7 +149402,7 @@ index 000000000000..f103ef0c01e4 +#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..6cafaa171962 +index 000000000..6cafaa171 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_shader_states.h @@ -0,0 +1,45 @@ @@ -149453,7 +149453,7 @@ index 000000000000..6cafaa171962 +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..e19f53b2cbe8 +index 000000000..e19f53b2c --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_time.c @@ -0,0 +1,81 @@ @@ -149540,7 +149540,7 @@ index 000000000000..e19f53b2cbe8 +} diff --git a/drivers/gpu/arm/bifrost/build.bp b/drivers/gpu/arm/bifrost/build.bp new file mode 100755 -index 000000000000..b9b86184f3be +index 000000000..b9b86184f --- /dev/null +++ b/drivers/gpu/arm/bifrost/build.bp @@ -0,0 +1,186 @@ @@ -149732,7 +149732,7 @@ index 000000000000..b9b86184f3be +} 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..7c68eb2f860a +index 000000000..7c68eb2f8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_csf.c @@ -0,0 +1,177 @@ @@ -149915,7 +149915,7 @@ index 000000000000..7c68eb2f860a +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..0eb42589fe46 +index 000000000..0eb42589f --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_jm.c @@ -0,0 +1,230 @@ @@ -150151,7 +150151,7 @@ index 000000000000..0eb42589fe46 +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..83182f983467 +index 000000000..83182f983 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context.c @@ -0,0 +1,339 @@ @@ -150496,7 +150496,7 @@ index 000000000000..83182f983467 +} 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..e4ed8944bdd2 +index 000000000..e4ed8944b --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context.h @@ -0,0 +1,157 @@ @@ -150659,7 +150659,7 @@ index 000000000000..e4ed8944bdd2 +#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..818cdbea960d +index 000000000..818cdbea9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context_internal.h @@ -0,0 +1,60 @@ @@ -150725,7 +150725,7 @@ index 000000000000..818cdbea960d +void kbase_context_sticky_resource_term(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..bb61811e6c85 +index 000000000..bb61811e6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/Kbuild @@ -0,0 +1,40 @@ @@ -150771,7 +150771,7 @@ index 000000000000..bb61811e6c85 +mali_kbase-$(CONFIG_MALI_BIFROST_NO_MALI) += csf/mali_kbase_csf_firmware_no_mali.o diff --git a/drivers/gpu/arm/bifrost/csf/mali_base_csf_kernel.h b/drivers/gpu/arm/bifrost/csf/mali_base_csf_kernel.h new file mode 100755 -index 000000000000..301146cbedd3 +index 000000000..301146cbe --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_base_csf_kernel.h @@ -0,0 +1,598 @@ @@ -151375,7 +151375,7 @@ index 000000000000..301146cbedd3 +#endif /* _BASE_CSF_KERNEL_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_gpu_csf_control_registers.h b/drivers/gpu/arm/bifrost/csf/mali_gpu_csf_control_registers.h new file mode 100755 -index 000000000000..4fff80ca4023 +index 000000000..4fff80ca4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_gpu_csf_control_registers.h @@ -0,0 +1,33 @@ @@ -151414,7 +151414,7 @@ index 000000000000..4fff80ca4023 +#endif /* _GPU_CSF_CONTROL_REGISTERS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_gpu_csf_registers.h b/drivers/gpu/arm/bifrost/csf/mali_gpu_csf_registers.h new file mode 100755 -index 000000000000..5c03445f3c79 +index 000000000..5c03445f3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_gpu_csf_registers.h @@ -0,0 +1,1252 @@ @@ -152672,7 +152672,7 @@ index 000000000000..5c03445f3c79 +#endif /* _GPU_CSF_REGISTERS_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..83d7513e78d9 +index 000000000..83d7513e7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c @@ -0,0 +1,2547 @@ @@ -155225,7 +155225,7 @@ index 000000000000..83d7513e78d9 +} 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..c183d0a32302 +index 000000000..c183d0a32 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.h @@ -0,0 +1,444 @@ @@ -155675,7 +155675,7 @@ index 000000000000..c183d0a32302 +#endif /* _KBASE_CSF_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..fd8329ba9422 +index 000000000..fd8329ba9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c @@ -0,0 +1,460 @@ @@ -156141,7 +156141,7 @@ index 000000000000..fd8329ba9422 +#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..c2e99d386f8c +index 000000000..c2e99d386 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.h @@ -0,0 +1,48 @@ @@ -156195,7 +156195,7 @@ index 000000000000..c2e99d386f8c +#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..3829572a1aeb +index 000000000..3829572a1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_defs.h @@ -0,0 +1,883 @@ @@ -157084,7 +157084,7 @@ index 000000000000..3829572a1aeb +#endif /* _KBASE_CSF_DEFS_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..4a924f346685 +index 000000000..4a924f346 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.c @@ -0,0 +1,1993 @@ @@ -159083,7 +159083,7 @@ index 000000000000..4a924f346685 +} 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..03a5217cffb0 +index 000000000..03a5217cf --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.h @@ -0,0 +1,663 @@ @@ -159752,7 +159752,7 @@ index 000000000000..03a5217cffb0 +#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..d282d5ca7fc2 +index 000000000..d282d5ca7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.c @@ -0,0 +1,306 @@ @@ -160064,7 +160064,7 @@ index 000000000000..d282d5ca7fc2 +#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..ab4b6ebc5296 +index 000000000..ab4b6ebc5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.h @@ -0,0 +1,72 @@ @@ -160142,7 +160142,7 @@ index 000000000000..ab4b6ebc5296 +#endif /* _KBASE_CSF_FIRMWARE_CFG_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..7401113c5d6a +index 000000000..7401113c5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c @@ -0,0 +1,1012 @@ @@ -161160,7 +161160,7 @@ index 000000000000..7401113c5d6a +} 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..087cc858c2b8 +index 000000000..087cc858c --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.c @@ -0,0 +1,196 @@ @@ -161362,7 +161362,7 @@ index 000000000000..087cc858c2b8 +} 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..f71ea01ed8c0 +index 000000000..f71ea01ed --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.h @@ -0,0 +1,76 @@ @@ -161444,7 +161444,7 @@ index 000000000000..f71ea01ed8c0 +#endif /* _KBASE_CSF_HEAP_CONTEXT_ALLOC_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_ioctl.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_ioctl.h new file mode 100755 -index 000000000000..e9bb8d299754 +index 000000000..e9bb8d299 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_ioctl.h @@ -0,0 +1,379 @@ @@ -161829,7 +161829,7 @@ index 000000000000..e9bb8d299754 +#endif /* _KBASE_CSF_IOCTL_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..e1263d535918 +index 000000000..e1263d535 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.c @@ -0,0 +1,1737 @@ @@ -163572,7 +163572,7 @@ index 000000000000..e1263d535918 +} 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..45c76af04c0f +index 000000000..45c76af04 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.h @@ -0,0 +1,305 @@ @@ -163883,7 +163883,7 @@ index 000000000000..45c76af04c0f +#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..55e3b64cbe71 +index 000000000..55e3b64cb --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.c @@ -0,0 +1,199 @@ @@ -164088,7 +164088,7 @@ index 000000000000..55e3b64cbe71 + 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..359fe2cb0168 +index 000000000..359fe2cb0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.h @@ -0,0 +1,38 @@ @@ -164132,7 +164132,7 @@ index 000000000000..359fe2cb0168 +#endif /* _KBASE_CSF_KCPU_DEBUGFS_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..987cbc2fc201 +index 000000000..987cbc2fc --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.c @@ -0,0 +1,120 @@ @@ -164258,7 +164258,7 @@ index 000000000000..987cbc2fc201 +} 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..2b459911d834 +index 000000000..2b459911d --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.h @@ -0,0 +1,72 @@ @@ -164336,7 +164336,7 @@ index 000000000000..2b459911d834 +#endif 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..f1a318d26f43 +index 000000000..f1a318d26 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_reset_gpu.c @@ -0,0 +1,355 @@ @@ -164697,7 +164697,7 @@ index 000000000000..f1a318d26f43 +} 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..a3017a7f25ba +index 000000000..a3017a7f2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.c @@ -0,0 +1,4135 @@ @@ -168838,7 +168838,7 @@ index 000000000000..a3017a7f25ba +} 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..1b1c0681f64d +index 000000000..1b1c0681f --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.h @@ -0,0 +1,408 @@ @@ -169252,7 +169252,7 @@ index 000000000000..1b1c0681f64d +#endif /* _KBASE_CSF_SCHEDULER_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..60cae15bc8ef +index 000000000..60cae15bc --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.c @@ -0,0 +1,584 @@ @@ -169842,7 +169842,7 @@ index 000000000000..60cae15bc8ef +} 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..1a4729df6ca3 +index 000000000..1a4729df6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.h @@ -0,0 +1,113 @@ @@ -169961,7 +169961,7 @@ index 000000000000..1a4729df6ca3 +#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..5d744b81fe4a +index 000000000..5d744b81f --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.c @@ -0,0 +1,107 @@ @@ -170074,7 +170074,7 @@ index 000000000000..5d744b81fe4a + 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..44c580d82068 +index 000000000..44c580d82 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.h @@ -0,0 +1,38 @@ @@ -170118,7 +170118,7 @@ index 000000000000..44c580d82068 +#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..1f9e208904a9 +index 000000000..1f9e20890 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_def.h @@ -0,0 +1,112 @@ @@ -170236,7 +170236,7 @@ index 000000000000..1f9e208904a9 +#endif /* !_KBASE_CSF_TILER_HEAP_DEF_H_ */ 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..495ff2850500 +index 000000000..495ff2850 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c @@ -0,0 +1,169 @@ @@ -170411,7 +170411,7 @@ index 000000000000..495ff2850500 +} 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..d0156c09a60f +index 000000000..d0156c09a --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.h @@ -0,0 +1,69 @@ @@ -170486,7 +170486,7 @@ index 000000000000..d0156c09a60f +#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..5079a8e5af8c +index 000000000..5079a8e5a --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.c @@ -0,0 +1,555 @@ @@ -171047,7 +171047,7 @@ index 000000000000..5079a8e5af8c +} 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..f5ce9d629f55 +index 000000000..f5ce9d629 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.h @@ -0,0 +1,181 @@ @@ -171234,7 +171234,7 @@ index 000000000000..f5ce9d629f55 +#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..4d68766b8b9a +index 000000000..4d68766b8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c @@ -0,0 +1,623 @@ @@ -171863,7 +171863,7 @@ index 000000000000..4d68766b8b9a +#endif /* CONFIG_DEBUG_FS */ 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..2cac55e0664d +index 000000000..2cac55e06 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.h @@ -0,0 +1,177 @@ @@ -172046,7 +172046,7 @@ index 000000000000..2cac55e0664d +#endif /* _KBASE_CSF_TRACE_BUFFER_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..32181d711193 +index 000000000..32181d711 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_csf.h @@ -0,0 +1,116 @@ @@ -172168,7 +172168,7 @@ index 000000000000..32181d711193 +/* ***** 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..b201e49bd0f2 +index 000000000..b201e49bd --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_jm.h @@ -0,0 +1,173 @@ @@ -172347,7 +172347,7 @@ index 000000000000..b201e49bd0f2 +/* ***** 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..2ea901b666c2 +index 000000000..2ea901b66 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.c @@ -0,0 +1,143 @@ @@ -172496,7 +172496,7 @@ index 000000000000..2ea901b666c2 +#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..b055ff82a116 +index 000000000..b055ff82a --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.h @@ -0,0 +1,148 @@ @@ -172650,7 +172650,7 @@ index 000000000000..b055ff82a116 +#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..f265fe9a9753 +index 000000000..f265fe9a9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_csf.h @@ -0,0 +1,85 @@ @@ -172741,7 +172741,7 @@ index 000000000000..f265fe9a9753 +#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..ea8e01a87f3f +index 000000000..ea8e01a87 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_jm.h @@ -0,0 +1,102 @@ @@ -172849,7 +172849,7 @@ index 000000000000..ea8e01a87f3f +#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..1b821281f09f +index 000000000..1b821281f --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.c @@ -0,0 +1,115 @@ @@ -172970,7 +172970,7 @@ index 000000000000..1b821281f09f +#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..adfcb1aa556e +index 000000000..adfcb1aa5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.h @@ -0,0 +1,309 @@ @@ -173285,7 +173285,7 @@ index 000000000000..adfcb1aa556e +#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..d103e5766456 +index 000000000..d103e5766 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_csf.h @@ -0,0 +1,147 @@ @@ -173438,7 +173438,7 @@ index 000000000000..d103e5766456 +#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..037b1edecd8e +index 000000000..037b1edec --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_jm.h @@ -0,0 +1,165 @@ @@ -173609,7 +173609,7 @@ index 000000000000..037b1edecd8e +#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..a13c0ba20c94 +index 000000000..a13c0ba20 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.c @@ -0,0 +1,356 @@ @@ -173971,7 +173971,7 @@ index 000000000000..a13c0ba20c94 +#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..e4e2e8c35001 +index 000000000..e4e2e8c35 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.h @@ -0,0 +1,226 @@ @@ -174203,7 +174203,7 @@ index 000000000000..e4e2e8c35001 +#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..b50bceee4244 +index 000000000..b50bceee4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_codes.h @@ -0,0 +1,165 @@ @@ -174374,7 +174374,7 @@ index 000000000000..b50bceee4244 +/* ***** 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..c680feb86387 +index 000000000..c680feb86 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_defs.h @@ -0,0 +1,183 @@ @@ -174563,7 +174563,7 @@ index 000000000000..c680feb86387 +#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..e450760e3426 +index 000000000..e450760e3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_internal.h @@ -0,0 +1,89 @@ @@ -174658,7 +174658,7 @@ index 000000000000..e450760e3426 +#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..27f687faf072 +index 000000000..27f687faf --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_linux_ktrace.h @@ -0,0 +1,111 @@ @@ -174775,7 +174775,7 @@ index 000000000000..27f687faf072 +#endif /* !defined(_KBASE_DEBUG_LINUX_KTRACE_H_) || defined(TRACE_HEADER_MULTI_READ) */ 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..d8b3fff6a214 +index 000000000..d8b3fff6a --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_csf.c @@ -0,0 +1,274 @@ @@ -175055,7 +175055,7 @@ index 000000000000..d8b3fff6a214 +} 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..97bcc1d23aa3 +index 000000000..97bcc1d23 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_csf.c @@ -0,0 +1,161 @@ @@ -175222,7 +175222,7 @@ index 000000000000..97bcc1d23aa3 +} 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..a11d778071b5 +index 000000000..a11d77807 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_jm.c @@ -0,0 +1,100 @@ @@ -175328,7 +175328,7 @@ index 000000000000..a11d778071b5 +} 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..8e853eb82fa1 +index 000000000..8e853eb82 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_jm.c @@ -0,0 +1,264 @@ @@ -175598,7 +175598,7 @@ index 000000000000..8e853eb82fa1 +} 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..76fb33a5e881 +index 000000000..76fb33a5e --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device.c @@ -0,0 +1,411 @@ @@ -176015,7 +176015,7 @@ index 000000000000..76fb33a5e881 +} 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..33264bcc0464 +index 000000000..33264bcc0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device.h @@ -0,0 +1,177 @@ @@ -176198,7 +176198,7 @@ index 000000000000..33264bcc0464 +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..3a75c6c05cfa +index 000000000..3a75c6c05 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device_hw.c @@ -0,0 +1,184 @@ @@ -176388,7 +176388,7 @@ index 000000000000..3a75c6c05cfa +} 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..54644582eac5 +index 000000000..54644582e --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device_internal.h @@ -0,0 +1,78 @@ @@ -176472,7 +176472,7 @@ index 000000000000..54644582eac5 +void kbase_device_early_term(struct kbase_device *kbdev); 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..f7e9b125ba8b +index 000000000..f7e9b125b --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_csf.c @@ -0,0 +1,105 @@ @@ -176583,7 +176583,7 @@ index 000000000000..f7e9b125ba8b +} 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..56f541516489 +index 000000000..56f541516 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_jm.c @@ -0,0 +1,177 @@ @@ -176766,7 +176766,7 @@ index 000000000000..56f541516489 +} 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..ff6e4ae47184 +index 000000000..ff6e4ae47 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h @@ -0,0 +1,297 @@ @@ -177069,7 +177069,7 @@ index 000000000000..ff6e4ae47184 +#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..c9c2fbd49058 +index 000000000..c9c2fbd49 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h @@ -0,0 +1,288 @@ @@ -177363,7 +177363,7 @@ index 000000000000..c9c2fbd49058 +#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..3128db4cabfc +index 000000000..3128db4ca --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.c @@ -0,0 +1,41 @@ @@ -177410,7 +177410,7 @@ index 000000000000..3128db4cabfc +} diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.h b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.h new file mode 100755 -index 000000000000..9516e56eda01 +index 000000000..9516e56ed --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.h @@ -0,0 +1,31 @@ @@ -177447,7 +177447,7 @@ index 000000000000..9516e56eda01 +#endif /* _KBASE_GPU_H_ */ diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_coherency.h b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_coherency.h new file mode 100755 -index 000000000000..bb2b1613aa47 +index 000000000..bb2b1613a --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_coherency.h @@ -0,0 +1,31 @@ @@ -177484,7 +177484,7 @@ index 000000000000..bb2b1613aa47 +#endif /* _KBASE_GPU_COHERENCY_H_ */ 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..e63c3881a3ca +index 000000000..e63c3881a --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_fault.h @@ -0,0 +1,48 @@ @@ -177538,7 +177538,7 @@ index 000000000000..e63c3881a3ca +#endif /* _KBASE_GPU_FAULT_H_ */ diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_id.h b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_id.h new file mode 100755 -index 000000000000..31d55264c67f +index 000000000..31d55264c --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_id.h @@ -0,0 +1,119 @@ @@ -177663,7 +177663,7 @@ index 000000000000..31d55264c67f +#endif /* _KBASE_GPU_ID_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..d8066f43768b +index 000000000..d8066f437 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h @@ -0,0 +1,428 @@ @@ -178097,7 +178097,7 @@ index 000000000000..d8066f43768b +#endif /* _KBASE_GPU_REGMAP_H_ */ diff --git a/drivers/gpu/arm/bifrost/ipa/Kbuild b/drivers/gpu/arm/bifrost/ipa/Kbuild new file mode 100755 -index 000000000000..04aa9d82d7c5 +index 000000000..04aa9d82d --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/Kbuild @@ -0,0 +1,28 @@ @@ -178131,7 +178131,7 @@ index 000000000000..04aa9d82d7c5 +bifrost_kbase-$(CONFIG_DEBUG_FS) += ipa/mali_kbase_ipa_debugfs.o 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..67adb65306dd +index 000000000..67adb6530 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c @@ -0,0 +1,672 @@ @@ -178809,7 +178809,7 @@ index 000000000000..67adb65306dd +KBASE_EXPORT_TEST_API(kbase_ipa_power_model_ops); 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..f43f3d9416b4 +index 000000000..f43f3d941 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h @@ -0,0 +1,254 @@ @@ -179069,7 +179069,7 @@ index 000000000000..f43f3d9416b4 +#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..30a3b7d1b3be +index 000000000..30a3b7d1b --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c @@ -0,0 +1,322 @@ @@ -179397,7 +179397,7 @@ index 000000000000..30a3b7d1b3be +} 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..a983d9c14216 +index 000000000..a983d9c14 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h @@ -0,0 +1,68 @@ @@ -179471,7 +179471,7 @@ index 000000000000..a983d9c14216 +#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..9a11ee5b1e74 +index 000000000..9a11ee5b1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c @@ -0,0 +1,356 @@ @@ -179833,7 +179833,7 @@ index 000000000000..9a11ee5b1e74 +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..84534e07ec55 +index 000000000..84534e07e --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h @@ -0,0 +1,45 @@ @@ -179884,7 +179884,7 @@ index 000000000000..84534e07ec55 +#endif /* _KBASE_IPA_SIMPLE_H_ */ diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_common.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_common.c new file mode 100755 -index 000000000000..702db1623101 +index 000000000..702db1623 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_common.c @@ -0,0 +1,349 @@ @@ -180239,7 +180239,7 @@ index 000000000000..702db1623101 +} diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_common.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_common.h new file mode 100755 -index 000000000000..46e3cd4bc6e1 +index 000000000..46e3cd4bc --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_common.h @@ -0,0 +1,217 @@ @@ -180462,7 +180462,7 @@ index 000000000000..46e3cd4bc6e1 +#endif /* _KBASE_IPA_VINSTR_COMMON_H_ */ diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_g7x.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_g7x.c new file mode 100755 -index 000000000000..83174eb66ded +index 000000000..83174eb66 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_vinstr_g7x.c @@ -0,0 +1,490 @@ @@ -180958,7 +180958,7 @@ index 000000000000..83174eb66ded +ALIAS_POWER_MODEL(tnax, g77); diff --git a/drivers/gpu/arm/bifrost/jm/mali_base_jm_kernel.h b/drivers/gpu/arm/bifrost/jm/mali_base_jm_kernel.h new file mode 100755 -index 000000000000..9367cc5431cf +index 000000000..9367cc543 --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_base_jm_kernel.h @@ -0,0 +1,1079 @@ @@ -182043,7 +182043,7 @@ index 000000000000..9367cc5431cf +#endif /* _BASE_JM_KERNEL_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..4fb5d1d9c410 +index 000000000..4fb5d1d9c --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h @@ -0,0 +1,844 @@ @@ -182893,7 +182893,7 @@ index 000000000000..4fb5d1d9c410 +#endif /* _KBASE_JM_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_ioctl.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_ioctl.h new file mode 100755 -index 000000000000..305a9eb221ae +index 000000000..305a9eb22 --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_ioctl.h @@ -0,0 +1,216 @@ @@ -183115,7 +183115,7 @@ index 000000000000..305a9eb221ae +#endif /* _KBASE_JM_IOCTL_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..6c222ceae8ee +index 000000000..6c222ceae --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h @@ -0,0 +1,892 @@ @@ -184013,7 +184013,7 @@ index 000000000000..6c222ceae8ee +#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..900ecd2c1b8d +index 000000000..900ecd2c1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h @@ -0,0 +1,409 @@ @@ -184428,7 +184428,7 @@ index 000000000000..900ecd2c1b8d +#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..0dc08381bee6 +index 000000000..0dc08381b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h @@ -0,0 +1,515 @@ @@ -184949,7 +184949,7 @@ index 000000000000..0dc08381bee6 +#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..c1ad3ac40705 +index 000000000..c1ad3ac40 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h @@ -0,0 +1,684 @@ @@ -185639,7 +185639,7 @@ index 000000000000..c1ad3ac40705 +#endif /* _BASE_HWCONFIG_ISSUES_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_base_kernel.h b/drivers/gpu/arm/bifrost/mali_base_kernel.h new file mode 100755 -index 000000000000..086171adb6e5 +index 000000000..086171adb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_base_kernel.h @@ -0,0 +1,807 @@ @@ -186452,7 +186452,7 @@ index 000000000000..086171adb6e5 +#endif /* _BASE_KERNEL_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_base_mem_priv.h b/drivers/gpu/arm/bifrost/mali_base_mem_priv.h new file mode 100755 -index 000000000000..844a025b715d +index 000000000..844a025b7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_base_mem_priv.h @@ -0,0 +1,57 @@ @@ -186515,7 +186515,7 @@ index 000000000000..844a025b715d +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase.h b/drivers/gpu/arm/bifrost/mali_kbase.h new file mode 100755 -index 000000000000..8189d02ab910 +index 000000000..8189d02ab --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase.h @@ -0,0 +1,614 @@ @@ -187135,7 +187135,7 @@ index 000000000000..8189d02ab910 +#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..76bbfffe03a0 +index 000000000..76bbfffe0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c @@ -0,0 +1,113 @@ @@ -187254,7 +187254,7 @@ index 000000000000..76bbfffe03a0 +} 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..58d7fcf030a4 +index 000000000..58d7fcf03 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h @@ -0,0 +1,50 @@ @@ -187310,7 +187310,7 @@ index 000000000000..58d7fcf030a4 +#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..2c110937a792 +index 000000000..2c110937a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_bits.h @@ -0,0 +1,41 @@ @@ -187357,7 +187357,7 @@ index 000000000000..2c110937a792 +#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..27a03cf02138 +index 000000000..27a03cf02 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c @@ -0,0 +1,67 @@ @@ -187430,7 +187430,7 @@ index 000000000000..27a03cf02138 +} 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..8a1e5291bf5f +index 000000000..8a1e5291b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h @@ -0,0 +1,50 @@ @@ -187486,7 +187486,7 @@ index 000000000000..8a1e5291bf5f +#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..b201a60fa6e3 +index 000000000..b201a60fa --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_caps.h @@ -0,0 +1,65 @@ @@ -187557,7 +187557,7 @@ index 000000000000..b201a60fa6e3 +#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..87d5aaa6bb5d +index 000000000..87d5aaa6b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c @@ -0,0 +1,105 @@ @@ -187668,7 +187668,7 @@ index 000000000000..87d5aaa6bb5d + 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..3a7cf73d9eac +index 000000000..3a7cf73d9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h @@ -0,0 +1,97 @@ @@ -187771,7 +187771,7 @@ index 000000000000..3a7cf73d9eac +#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..ce7070d1d634 +index 000000000..ce7070d1d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_config.c @@ -0,0 +1,48 @@ @@ -187825,7 +187825,7 @@ index 000000000000..ce7070d1d634 + 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..57456e2b90db +index 000000000..57456e2b9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_config.h @@ -0,0 +1,393 @@ @@ -188224,7 +188224,7 @@ index 000000000000..57456e2b90db +#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..e079281127ab +index 000000000..e07928112 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h @@ -0,0 +1,213 @@ @@ -188443,7 +188443,7 @@ index 000000000000..e079281127ab + 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..071b9236dee0 +index 000000000..071b9236d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c @@ -0,0 +1,5001 @@ @@ -193450,7 +193450,7 @@ index 000000000000..071b9236dee0 +#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..caba2cd7a0e3 +index 000000000..caba2cd7a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h @@ -0,0 +1,51 @@ @@ -193507,7 +193507,7 @@ index 000000000000..caba2cd7a0e3 + 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..750dbd8c3924 +index 000000000..750dbd8c3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c @@ -0,0 +1,355 @@ @@ -193868,7 +193868,7 @@ index 000000000000..750dbd8c3924 +} 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..1affa719e6dc +index 000000000..1affa719e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h @@ -0,0 +1,209 @@ @@ -194083,7 +194083,7 @@ index 000000000000..1affa719e6dc +#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..118f787fb74c +index 000000000..118f787fb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug.c @@ -0,0 +1,44 @@ @@ -194133,7 +194133,7 @@ index 000000000000..118f787fb74c + 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..f33413908405 +index 000000000..f33413908 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug.h @@ -0,0 +1,169 @@ @@ -194308,7 +194308,7 @@ index 000000000000..f33413908405 +#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..dbc774d56ab4 +index 000000000..dbc774d56 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c @@ -0,0 +1,566 @@ @@ -194880,7 +194880,7 @@ index 000000000000..dbc774d56ab4 +#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..ef69627cdce8 +index 000000000..ef69627cd --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h @@ -0,0 +1,116 @@ @@ -195002,7 +195002,7 @@ index 000000000000..ef69627cdce8 +#endif /*_KBASE_DEBUG_JOB_FAULT_H*/ 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..478813705a41 +index 000000000..478813705 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c @@ -0,0 +1,313 @@ @@ -195321,7 +195321,7 @@ index 000000000000..478813705a41 +#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..b948b7cd9dd4 +index 000000000..b948b7cd9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h @@ -0,0 +1,40 @@ @@ -195367,7 +195367,7 @@ index 000000000000..b948b7cd9dd4 +#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..37e507b164c5 +index 000000000..37e507b16 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c @@ -0,0 +1,183 @@ @@ -195556,7 +195556,7 @@ index 000000000000..37e507b164c5 +} 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..c3c9efa14e65 +index 000000000..c3c9efa14 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h @@ -0,0 +1,141 @@ @@ -195703,7 +195703,7 @@ index 000000000000..c3c9efa14e65 + 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..980cf09500ef +index 000000000..980cf0950 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_defs.h @@ -0,0 +1,1807 @@ @@ -197516,7 +197516,7 @@ index 000000000000..980cf09500ef +#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..b5ac414b1223 +index 000000000..b5ac414b1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c @@ -0,0 +1,81 @@ @@ -197603,7 +197603,7 @@ index 000000000000..b5ac414b1223 +KBASE_EXPORT_TEST_API(kbase_disjoint_event_get); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dma_fence.c b/drivers/gpu/arm/bifrost/mali_kbase_dma_fence.c new file mode 100755 -index 000000000000..1fac5e3e68f1 +index 000000000..1fac5e3e6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dma_fence.c @@ -0,0 +1,473 @@ @@ -198082,7 +198082,7 @@ index 000000000000..1fac5e3e68f1 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dma_fence.h b/drivers/gpu/arm/bifrost/mali_kbase_dma_fence.h new file mode 100755 -index 000000000000..3ac8186328a1 +index 000000000..3ac818632 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dma_fence.h @@ -0,0 +1,144 @@ @@ -198232,7 +198232,7 @@ index 000000000000..3ac8186328a1 +#endif 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..a5a7ad744a8e +index 000000000..a5a7ad744 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c @@ -0,0 +1,442 @@ @@ -198680,7 +198680,7 @@ index 000000000000..a5a7ad744a8e +} 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..e19495055b48 +index 000000000..e19495055 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h @@ -0,0 +1,74 @@ @@ -198760,7 +198760,7 @@ index 000000000000..e19495055b48 +#endif /* _KBASE_DUMMY_JOB_WORKAROUND_ */ 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..5adb80f9bbd2 +index 000000000..5adb80f9b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_event.c @@ -0,0 +1,274 @@ @@ -199040,7 +199040,7 @@ index 000000000000..5adb80f9bbd2 +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..5e04acf87892 +index 000000000..5e04acf87 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence.c @@ -0,0 +1,154 @@ @@ -199200,7 +199200,7 @@ index 000000000000..5e04acf87892 +} 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..f319d9e1dce6 +index 000000000..f319d9e1d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence.h @@ -0,0 +1,284 @@ @@ -199490,7 +199490,7 @@ index 000000000000..f319d9e1dce6 +#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..303029639d38 +index 000000000..303029639 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h @@ -0,0 +1,64 @@ @@ -199560,7 +199560,7 @@ index 000000000000..303029639d38 +#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..c4703748bec6 +index 000000000..c4703748b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c @@ -0,0 +1,84 @@ @@ -199650,7 +199650,7 @@ index 000000000000..c4703748bec6 + 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..579c7b6ff3aa +index 000000000..579c7b6ff --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gator.h @@ -0,0 +1,53 @@ @@ -199709,7 +199709,7 @@ index 000000000000..579c7b6ff3aa +#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..569abd920fde +index 000000000..569abd920 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c @@ -0,0 +1,104 @@ @@ -199819,7 +199819,7 @@ index 000000000000..569abd920fde +#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..a45dabbb680f +index 000000000..a45dabbb6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h @@ -0,0 +1,54 @@ @@ -199879,7 +199879,7 @@ index 000000000000..a45dabbb680f +#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..020b5d853608 +index 000000000..020b5d853 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c @@ -0,0 +1,649 @@ @@ -200534,7 +200534,7 @@ index 000000000000..020b5d853608 +} 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..5eee7948381a +index 000000000..5eee79483 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h @@ -0,0 +1,135 @@ @@ -200675,7 +200675,7 @@ index 000000000000..5eee7948381a +#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..ec6f1c39ccb0 +index 000000000..ec6f1c39c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h @@ -0,0 +1,98 @@ @@ -200779,7 +200779,7 @@ index 000000000000..ec6f1c39ccb0 +#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..91dc4dbc0800 +index 000000000..91dc4dbc0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gwt.c @@ -0,0 +1,273 @@ @@ -201058,7 +201058,7 @@ index 000000000000..91dc4dbc0800 +} 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..7e7746e64915 +index 000000000..7e7746e64 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gwt.h @@ -0,0 +1,55 @@ @@ -201119,7 +201119,7 @@ index 000000000000..7e7746e64915 +#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..dc58ffb931be +index 000000000..dc58ffb93 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hw.c @@ -0,0 +1,437 @@ @@ -201562,7 +201562,7 @@ index 000000000000..dc58ffb931be +} 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..f386b1624317 +index 000000000..f386b1624 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hw.h @@ -0,0 +1,70 @@ @@ -201638,7 +201638,7 @@ index 000000000000..f386b1624317 +#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..89df2519ab97 +index 000000000..89df2519a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h @@ -0,0 +1,45 @@ @@ -201689,7 +201689,7 @@ index 000000000000..89df2519ab97 +#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..124a2d9cf0c3 +index 000000000..124a2d9cf --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h @@ -0,0 +1,51 @@ @@ -201746,7 +201746,7 @@ index 000000000000..124a2d9cf0c3 +#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..3ae0dbe6886d +index 000000000..3ae0dbe68 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h @@ -0,0 +1,87 @@ @@ -201839,7 +201839,7 @@ index 000000000000..3ae0dbe6886d +#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..4fd2e3549268 +index 000000000..4fd2e3549 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h @@ -0,0 +1,151 @@ @@ -201996,7 +201996,7 @@ index 000000000000..4fd2e3549268 +#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..f6ce17e4180f +index 000000000..f6ce17e41 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h @@ -0,0 +1,304 @@ @@ -202306,7 +202306,7 @@ index 000000000000..f6ce17e4180f +#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..bbaf6eaf8d88 +index 000000000..bbaf6eaf8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h @@ -0,0 +1,229 @@ @@ -202541,7 +202541,7 @@ index 000000000000..bbaf6eaf8d88 +#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..94b7551b865e +index 000000000..94b7551b8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h @@ -0,0 +1,56 @@ @@ -202603,7 +202603,7 @@ index 000000000000..94b7551b865e +#endif /* _KBASE_BACKEND_TIME_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt.c b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt.c new file mode 100755 -index 000000000000..2708af78b292 +index 000000000..2708af78b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt.c @@ -0,0 +1,794 @@ @@ -203403,7 +203403,7 @@ index 000000000000..2708af78b292 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_accumulator.h b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_accumulator.h new file mode 100755 -index 000000000000..eb82ea4bfd14 +index 000000000..eb82ea4bf --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_accumulator.h @@ -0,0 +1,146 @@ @@ -203555,7 +203555,7 @@ index 000000000000..eb82ea4bfd14 +#endif /* _KBASE_HWCNT_ACCUMULATOR_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend.h b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend.h new file mode 100755 -index 000000000000..3a921b754b55 +index 000000000..3a921b754 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend.h @@ -0,0 +1,220 @@ @@ -203781,7 +203781,7 @@ index 000000000000..3a921b754b55 +#endif /* _KBASE_HWCNT_BACKEND_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend_jm.c b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend_jm.c new file mode 100755 -index 000000000000..9f65de41694f +index 000000000..9f65de416 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend_jm.c @@ -0,0 +1,736 @@ @@ -204523,7 +204523,7 @@ index 000000000000..9f65de41694f +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend_jm.h b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend_jm.h new file mode 100755 -index 000000000000..f15faeba704a +index 000000000..f15faeba7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_backend_jm.h @@ -0,0 +1,61 @@ @@ -204590,7 +204590,7 @@ index 000000000000..f15faeba704a +#endif /* _KBASE_HWCNT_BACKEND_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_context.h b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_context.h new file mode 100755 -index 000000000000..bc50ad12c2f4 +index 000000000..bc50ad12c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_context.h @@ -0,0 +1,119 @@ @@ -204715,7 +204715,7 @@ index 000000000000..bc50ad12c2f4 +#endif /* _KBASE_HWCNT_CONTEXT_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_gpu.c b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_gpu.c new file mode 100755 -index 000000000000..499f3bc23bec +index 000000000..499f3bc23 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_gpu.c @@ -0,0 +1,571 @@ @@ -205292,7 +205292,7 @@ index 000000000000..499f3bc23bec +KBASE_EXPORT_TEST_API(kbase_hwcnt_gpu_patch_dump_headers); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_gpu.h b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_gpu.h new file mode 100755 -index 000000000000..f0d51763f7f7 +index 000000000..f0d51763f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_gpu.h @@ -0,0 +1,217 @@ @@ -205515,7 +205515,7 @@ index 000000000000..f0d51763f7f7 +#endif /* _KBASE_HWCNT_GPU_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_legacy.c b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_legacy.c new file mode 100755 -index 000000000000..794ef39e365c +index 000000000..794ef39e3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_legacy.c @@ -0,0 +1,152 @@ @@ -205673,7 +205673,7 @@ index 000000000000..794ef39e365c +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_legacy.h b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_legacy.h new file mode 100755 -index 000000000000..7a610ae378a2 +index 000000000..7a610ae37 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_legacy.h @@ -0,0 +1,94 @@ @@ -205773,7 +205773,7 @@ index 000000000000..7a610ae378a2 +#endif /* _KBASE_HWCNT_LEGACY_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_reader.h b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_reader.h new file mode 100755 -index 000000000000..8cd3835595f7 +index 000000000..8cd383559 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_reader.h @@ -0,0 +1,106 @@ @@ -205885,7 +205885,7 @@ index 000000000000..8cd3835595f7 + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_types.c b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_types.c new file mode 100755 -index 000000000000..2b9fe02acd75 +index 000000000..2b9fe02ac --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_types.c @@ -0,0 +1,604 @@ @@ -206495,7 +206495,7 @@ index 000000000000..2b9fe02acd75 +KBASE_EXPORT_TEST_API(kbase_hwcnt_dump_buffer_accumulate_strict); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_types.h b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_types.h new file mode 100755 -index 000000000000..3394b1271cc8 +index 000000000..3394b1271 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_types.h @@ -0,0 +1,1142 @@ @@ -207643,7 +207643,7 @@ index 000000000000..3394b1271cc8 +#endif /* _KBASE_HWCNT_TYPES_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_virtualizer.c b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_virtualizer.c new file mode 100755 -index 000000000000..917e47cda0f9 +index 000000000..917e47cda --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_virtualizer.c @@ -0,0 +1,790 @@ @@ -208439,7 +208439,7 @@ index 000000000000..917e47cda0f9 +KBASE_EXPORT_TEST_API(kbase_hwcnt_virtualizer_term); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_virtualizer.h b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_virtualizer.h new file mode 100755 -index 000000000000..8f628c3306fc +index 000000000..8f628c330 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwcnt_virtualizer.h @@ -0,0 +1,145 @@ @@ -208590,7 +208590,7 @@ index 000000000000..8f628c3306fc +#endif /* _KBASE_HWCNT_VIRTUALIZER_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ioctl.h b/drivers/gpu/arm/bifrost/mali_kbase_ioctl.h new file mode 100755 -index 000000000000..fed45100b4be +index 000000000..fed45100b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ioctl.h @@ -0,0 +1,838 @@ @@ -209434,7 +209434,7 @@ index 000000000000..fed45100b4be +#endif 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..d0674d1bd8f4 +index 000000000..d0674d1bd --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd.c @@ -0,0 +1,1819 @@ @@ -211259,7 +211259,7 @@ index 000000000000..d0674d1bd8f4 +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..6b0c36d6b93f +index 000000000..6b0c36d6b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.c @@ -0,0 +1,250 @@ @@ -211515,7 +211515,7 @@ index 000000000000..6b0c36d6b93f +#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..697bdef4d434 +index 000000000..697bdef4d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.h @@ -0,0 +1,45 @@ @@ -211566,7 +211566,7 @@ index 000000000000..697bdef4d434 +#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..fb15a8c1727a +index 000000000..fb15a8c17 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jm.c @@ -0,0 +1,155 @@ @@ -211727,7 +211727,7 @@ index 000000000000..fb15a8c1727a +#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..b3fd421a1ff3 +index 000000000..b3fd421a1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jm.h @@ -0,0 +1,119 @@ @@ -211852,7 +211852,7 @@ index 000000000000..b3fd421a1ff3 +#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..9b338eb66531 +index 000000000..9b338eb66 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js.c @@ -0,0 +1,3760 @@ @@ -215618,7 +215618,7 @@ index 000000000000..9b338eb66531 +} 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..541acd4afed7 +index 000000000..541acd4af --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js.h @@ -0,0 +1,40 @@ @@ -215664,7 +215664,7 @@ index 000000000000..541acd4afed7 +#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..141d04a385cb +index 000000000..141d04a38 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.c @@ -0,0 +1,283 @@ @@ -215953,7 +215953,7 @@ index 000000000000..141d04a385cb +} 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..25fd39787c71 +index 000000000..25fd39787 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.h @@ -0,0 +1,155 @@ @@ -216114,7 +216114,7 @@ index 000000000000..25fd39787c71 +#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..fd1ea8815b16 +index 000000000..fd1ea8815 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.c @@ -0,0 +1,895 @@ @@ -217015,7 +217015,7 @@ index 000000000000..fd1ea8815b16 +} 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..555edfeef77c +index 000000000..555edfeef --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.h @@ -0,0 +1,283 @@ @@ -217304,7 +217304,7 @@ index 000000000000..555edfeef77c +#endif /* _KBASE_KINSTR_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm_reader.h b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm_reader.h new file mode 100755 -index 000000000000..e267e6bc44de +index 000000000..e267e6bc4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm_reader.h @@ -0,0 +1,70 @@ @@ -217380,7 +217380,7 @@ index 000000000000..e267e6bc44de +#endif /* _KBASE_KINSTR_JM_READER_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..003ac9e68a76 +index 000000000..003ac9e68 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_linux.h @@ -0,0 +1,48 @@ @@ -217434,7 +217434,7 @@ index 000000000000..003ac9e68a76 +#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..82a799c2d673 +index 000000000..82a799c2d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem.c @@ -0,0 +1,4734 @@ @@ -222174,7 +222174,7 @@ index 000000000000..82a799c2d673 +} 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..2238fbfe9e99 +index 000000000..2238fbfe9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem.h @@ -0,0 +1,1962 @@ @@ -224142,7 +224142,7 @@ index 000000000000..2238fbfe9e99 +#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..99b5b852667e +index 000000000..99b5b8526 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.c @@ -0,0 +1,3425 @@ @@ -227573,7 +227573,7 @@ index 000000000000..99b5b852667e +#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..85e030ab751a +index 000000000..85e030ab7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.h @@ -0,0 +1,478 @@ @@ -228057,7 +228057,7 @@ index 000000000000..85e030ab751a +#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..70116030f233 +index 000000000..70116030f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_lowlevel.h @@ -0,0 +1,166 @@ @@ -228229,7 +228229,7 @@ index 000000000000..70116030f233 +#endif /* _KBASE_LOWLEVEL_H */ 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..0723e32e2003 +index 000000000..0723e32e2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool.c @@ -0,0 +1,856 @@ @@ -229091,7 +229091,7 @@ index 000000000000..0723e32e2003 +} 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..5879fdf85b1d +index 000000000..5879fdf85 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.c @@ -0,0 +1,191 @@ @@ -229288,7 +229288,7 @@ index 000000000000..5879fdf85b1d +} 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..2932945b3185 +index 000000000..2932945b3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.h @@ -0,0 +1,123 @@ @@ -229417,7 +229417,7 @@ index 000000000000..2932945b3185 + 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..aa2554805b5b +index 000000000..aa2554805 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.c @@ -0,0 +1,115 @@ @@ -229538,7 +229538,7 @@ index 000000000000..aa2554805b5b +} 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..0484f5940ad1 +index 000000000..0484f5940 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.h @@ -0,0 +1,92 @@ @@ -229636,7 +229636,7 @@ index 000000000000..0484f5940ad1 +#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..85723f825054 +index 000000000..85723f825 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.c @@ -0,0 +1,134 @@ @@ -229776,7 +229776,7 @@ index 000000000000..85723f825054 +#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..1462247c3bca +index 000000000..1462247c3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.h @@ -0,0 +1,64 @@ @@ -229846,7 +229846,7 @@ index 000000000000..1462247c3bca + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs_buf_size.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs_buf_size.h new file mode 100755 -index 000000000000..d55cc854c415 +index 000000000..d55cc854c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs_buf_size.h @@ -0,0 +1,39 @@ @@ -229891,7 +229891,7 @@ index 000000000000..d55cc854c415 + 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..72acadfae993 +index 000000000..72acadfae --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mipe_gen_header.h @@ -0,0 +1,219 @@ @@ -230116,7 +230116,7 @@ index 000000000000..72acadfae993 +/* 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..54667cfc6304 +index 000000000..54667cfc6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mipe_proto.h @@ -0,0 +1,127 @@ @@ -230249,7 +230249,7 @@ index 000000000000..54667cfc6304 +/* 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..38ae46e0ddf1 +index 000000000..38ae46e0d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.c @@ -0,0 +1,153 @@ @@ -230408,7 +230408,7 @@ index 000000000000..38ae46e0ddf1 +}; 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..431b1f4cb5db +index 000000000..431b1f4cb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.h @@ -0,0 +1,39 @@ @@ -230453,7 +230453,7 @@ index 000000000000..431b1f4cb5db +#endif /* _KBASE_NATIVE_MGM_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..fbb090e6c21f +index 000000000..fbb090e6c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_platform_fake.c @@ -0,0 +1,124 @@ @@ -230583,7 +230583,7 @@ index 000000000000..fbb090e6c21f +EXPORT_SYMBOL(kbase_platform_unregister); 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..630ab1550045 +index 000000000..630ab1550 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pm.c @@ -0,0 +1,292 @@ @@ -230881,7 +230881,7 @@ index 000000000000..630ab1550045 +} 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..13565186c11f +index 000000000..13565186c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pm.h @@ -0,0 +1,251 @@ @@ -231138,7 +231138,7 @@ index 000000000000..13565186c11f +#endif /* _KBASE_PM_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..7b86c58440db +index 000000000..7b86c5844 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.c @@ -0,0 +1,245 @@ @@ -231389,7 +231389,7 @@ index 000000000000..7b86c58440db +#endif /* defined(CONFIG_DEBUG_FS) && !defined(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..200c0c2d8de8 +index 000000000..200c0c2d8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.h @@ -0,0 +1,85 @@ @@ -231480,7 +231480,7 @@ index 000000000000..200c0c2d8de8 +#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..61bbb0b48490 +index 000000000..61bbb0b48 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_reset_gpu.h @@ -0,0 +1,129 @@ @@ -231615,7 +231615,7 @@ index 000000000000..61bbb0b48490 +#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..b5c7b1289846 +index 000000000..b5c7b1289 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_smc.c @@ -0,0 +1,91 @@ @@ -231712,7 +231712,7 @@ index 000000000000..b5c7b1289846 + 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..221eb21a8c7f +index 000000000..221eb21a8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_smc.h @@ -0,0 +1,72 @@ @@ -231790,7 +231790,7 @@ index 000000000000..221eb21a8c7f +#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..c164719b3d7b +index 000000000..c164719b3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_softjobs.c @@ -0,0 +1,1805 @@ @@ -233601,7 +233601,7 @@ index 000000000000..c164719b3d7b +#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..22caa4a6d814 +index 000000000..22caa4a6d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_strings.c @@ -0,0 +1,28 @@ @@ -233635,7 +233635,7 @@ index 000000000000..22caa4a6d814 +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..d2f1825314fe +index 000000000..d2f182531 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_strings.h @@ -0,0 +1,24 @@ @@ -233665,7 +233665,7 @@ index 000000000000..d2f1825314fe +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..4e5ab3ca557a +index 000000000..4e5ab3ca5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync.h @@ -0,0 +1,231 @@ @@ -233902,7 +233902,7 @@ index 000000000000..4e5ab3ca557a +#endif /* MALI_KBASE_SYNC_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_sync_android.c b/drivers/gpu/arm/bifrost/mali_kbase_sync_android.c new file mode 100755 -index 000000000000..41f740a7bc8c +index 000000000..41f740a7b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync_android.c @@ -0,0 +1,542 @@ @@ -234450,7 +234450,7 @@ index 000000000000..41f740a7bc8c +#endif 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..866894bd0f94 +index 000000000..866894bd0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync_common.c @@ -0,0 +1,51 @@ @@ -234507,7 +234507,7 @@ index 000000000000..866894bd0f94 +} 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..271873b9fe29 +index 000000000..271873b9f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync_file.c @@ -0,0 +1,372 @@ @@ -234885,7 +234885,7 @@ index 000000000000..271873b9fe29 +#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..7669895b3c5d +index 000000000..7669895b3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.c @@ -0,0 +1,227 @@ @@ -235118,7 +235118,7 @@ index 000000000000..7669895b3c5d +#endif 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..7e95956f3132 +index 000000000..7e95956f3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.h @@ -0,0 +1,103 @@ @@ -235227,7 +235227,7 @@ index 000000000000..7e95956f3132 +#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..8d4f044376a9 +index 000000000..8d4f04437 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_utility.h @@ -0,0 +1,55 @@ @@ -235288,7 +235288,7 @@ index 000000000000..8d4f044376a9 +#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..3b0e2d6855ce +index 000000000..3b0e2d685 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.c @@ -0,0 +1,1083 @@ @@ -236377,7 +236377,7 @@ index 000000000000..3b0e2d6855ce +} 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..81d315f95567 +index 000000000..81d315f95 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.h @@ -0,0 +1,91 @@ @@ -236474,7 +236474,7 @@ index 000000000000..81d315f95567 +#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..be812f62c862 +index 000000000..be812f62c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_linux_trace.h @@ -0,0 +1,552 @@ @@ -237032,7 +237032,7 @@ index 000000000000..be812f62c862 +#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..3a4db10bdb3d +index 000000000..3a4db10bd --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_malisw.h @@ -0,0 +1,109 @@ @@ -237147,7 +237147,7 @@ index 000000000000..3a4db10bdb3d +#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..b6fb5a094fab +index 000000000..b6fb5a094 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.c @@ -0,0 +1,27 @@ @@ -237180,7 +237180,7 @@ index 000000000000..b6fb5a094fab +#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..3b90ae437db9 +index 000000000..3b90ae437 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.h @@ -0,0 +1,69 @@ @@ -237255,7 +237255,7 @@ index 000000000000..3b90ae437db9 +#include diff --git a/drivers/gpu/arm/bifrost/mali_uk.h b/drivers/gpu/arm/bifrost/mali_uk.h new file mode 100755 -index 000000000000..701f3909042f +index 000000000..701f39090 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_uk.h @@ -0,0 +1,84 @@ @@ -237345,7 +237345,7 @@ index 000000000000..701f3909042f +#endif /* _UK_H_ */ 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..1d106999228a +index 000000000..1d1069992 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_csf.c @@ -0,0 +1,532 @@ @@ -237883,7 +237883,7 @@ index 000000000000..1d106999228a +} 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..b0187a46b733 +index 000000000..b0187a46b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_jm.c @@ -0,0 +1,440 @@ @@ -238329,7 +238329,7 @@ index 000000000000..b0187a46b733 +} 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..a5cda009426d +index 000000000..a5cda0094 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.c @@ -0,0 +1,2275 @@ @@ -240610,7 +240610,7 @@ index 000000000000..a5cda009426d +} 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..f2613e881dac +index 000000000..f2613e881 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.h @@ -0,0 +1,156 @@ @@ -240772,7 +240772,7 @@ index 000000000000..f2613e881dac +#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..e6eef86d7ac0 +index 000000000..e6eef86d7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw.h @@ -0,0 +1,107 @@ @@ -240885,7 +240885,7 @@ index 000000000000..e6eef86d7ac0 +#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..a820ab24ac05 +index 000000000..a820ab24a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw_direct.c @@ -0,0 +1,274 @@ @@ -241165,7 +241165,7 @@ index 000000000000..a820ab24ac05 +} 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..8ecb14d72327 +index 000000000..8ecb14d72 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_internal.h @@ -0,0 +1,73 @@ @@ -241244,7 +241244,7 @@ index 000000000000..8ecb14d72327 +#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..02493e9b2621 +index 000000000..02493e9b2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_aarch64.c @@ -0,0 +1,200 @@ @@ -241450,7 +241450,7 @@ index 000000000000..02493e9b2621 +} diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_lpae.c b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_lpae.c new file mode 100755 -index 000000000000..91a2d7ac4dcb +index 000000000..91a2d7ac4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_lpae.c @@ -0,0 +1,215 @@ @@ -241671,7 +241671,7 @@ index 000000000000..91a2d7ac4dcb +} diff --git a/drivers/gpu/arm/bifrost/platform/Kconfig b/drivers/gpu/arm/bifrost/platform/Kconfig new file mode 100755 -index 000000000000..ef9fb963ecf5 +index 000000000..ef9fb963e --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/Kconfig @@ -0,0 +1,30 @@ @@ -241707,7 +241707,7 @@ index 000000000000..ef9fb963ecf5 + diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild b/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild new file mode 100755 -index 000000000000..78343c0570d1 +index 000000000..78343c057 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild @@ -0,0 +1,25 @@ @@ -241738,7 +241738,7 @@ index 000000000000..78343c0570d1 + $(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..11a8b77dca06 +index 000000000..11a8b77dc --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_clk_rate_trace.c @@ -0,0 +1,68 @@ @@ -241812,7 +241812,7 @@ index 000000000000..11a8b77dca06 +}; 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..ccefddf882fd +index 000000000..ccefddf88 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_devicetree.c @@ -0,0 +1,41 @@ @@ -241859,7 +241859,7 @@ index 000000000000..ccefddf882fd +#endif 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..2137b425c1ab +index 000000000..2137b425c --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_platform.h @@ -0,0 +1,49 @@ @@ -241914,7 +241914,7 @@ index 000000000000..2137b425c1ab +#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..8772edb56f73 +index 000000000..8772edb56 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_runtime_pm.c @@ -0,0 +1,185 @@ @@ -242105,7 +242105,7 @@ index 000000000000..8772edb56f73 + diff --git a/drivers/gpu/arm/bifrost/platform/rk/Kbuild b/drivers/gpu/arm/bifrost/platform/rk/Kbuild new file mode 100755 -index 000000000000..7cc6c59d969f +index 000000000..7cc6c59d9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/Kbuild @@ -0,0 +1,17 @@ @@ -242128,7 +242128,7 @@ index 000000000000..7cc6c59d969f + 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 +index 000000000..5de70ee13 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/custom_log.h @@ -0,0 +1,192 @@ @@ -242326,7 +242326,7 @@ index 000000000000..5de70ee13d25 +#endif /* __CUSTOM_LOG_H__ */ diff --git a/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_platform.h new file mode 100755 -index 000000000000..07c5b6f8a760 +index 000000000..07c5b6f8a --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_platform.h @@ -0,0 +1,88 @@ @@ -242420,7 +242420,7 @@ index 000000000000..07c5b6f8a760 + 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..e73ef450d135 +index 000000000..e73ef450d --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c @@ -0,0 +1,459 @@ @@ -242885,7 +242885,7 @@ index 000000000000..e73ef450d135 +} 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..6eab25014d21 +index 000000000..6eab25014 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_rk.h @@ -0,0 +1,62 @@ @@ -242953,7 +242953,7 @@ index 000000000000..6eab25014d21 + diff --git a/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild b/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild new file mode 100755 -index 000000000000..6780e4c9433b +index 000000000..6780e4c94 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild @@ -0,0 +1,24 @@ @@ -242983,7 +242983,7 @@ index 000000000000..6780e4c9433b + 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..fac3cd52182f +index 000000000..fac3cd521 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_platform.h @@ -0,0 +1,39 @@ @@ -243028,7 +243028,7 @@ index 000000000000..fac3cd52182f +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..d165ce262814 +index 000000000..d165ce262 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_vexpress.c @@ -0,0 +1,69 @@ @@ -243103,7 +243103,7 @@ index 000000000000..d165ce262814 +} 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..51b408efd48a +index 000000000..51b408efd --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/Kbuild @@ -0,0 +1,24 @@ @@ -243133,7 +243133,7 @@ index 000000000000..51b408efd48a + 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..fac3cd52182f +index 000000000..fac3cd521 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h @@ -0,0 +1,39 @@ @@ -243178,7 +243178,7 @@ index 000000000000..fac3cd52182f +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..efca0a5b3493 +index 000000000..efca0a5b3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c @@ -0,0 +1,65 @@ @@ -243249,7 +243249,7 @@ index 000000000000..efca0a5b3493 +} 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..e07709c9b1a5 +index 000000000..e07709c9b --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/Kbuild @@ -0,0 +1,25 @@ @@ -243280,7 +243280,7 @@ index 000000000000..e07709c9b1a5 + 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..fac3cd52182f +index 000000000..fac3cd521 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h @@ -0,0 +1,39 @@ @@ -243325,7 +243325,7 @@ index 000000000000..fac3cd52182f +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..b6714b95b776 +index 000000000..b6714b95b --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c @@ -0,0 +1,67 @@ @@ -243398,7 +243398,7 @@ index 000000000000..b6714b95b776 +} 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..8778d812aea0 +index 000000000..8778d812a --- /dev/null +++ b/drivers/gpu/arm/bifrost/protected_mode_switcher.h @@ -0,0 +1,69 @@ @@ -243473,7 +243473,7 @@ index 000000000000..8778d812aea0 +#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..c26bef780781 +index 000000000..c26bef780 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/Kbuild @@ -0,0 +1,24 @@ @@ -243503,7 +243503,7 @@ index 000000000000..c26bef780781 +obj-$(CONFIG_MALI_CLK_RATE_TRACE_PORTAL) += mali_kutf_clk_rate_trace/kernel/ diff --git a/drivers/gpu/arm/bifrost/tests/Kconfig b/drivers/gpu/arm/bifrost/tests/Kconfig new file mode 100755 -index 000000000000..83a4d7764a50 +index 000000000..83a4d7764 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/Kconfig @@ -0,0 +1,24 @@ @@ -243533,7 +243533,7 @@ index 000000000000..83a4d7764a50 +source "drivers/gpu/arm/midgard/tests/mali_kutf_clk_rate_trace/kernel/Kconfig" diff --git a/drivers/gpu/arm/bifrost/tests/Mconfig b/drivers/gpu/arm/bifrost/tests/Mconfig new file mode 100755 -index 000000000000..bba96b3d9e48 +index 000000000..bba96b3d9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/Mconfig @@ -0,0 +1,38 @@ @@ -243577,7 +243577,7 @@ index 000000000000..bba96b3d9e48 + 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..858b9c38b49a +index 000000000..858b9c38b --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers.h @@ -0,0 +1,85 @@ @@ -243668,7 +243668,7 @@ index 000000000000..858b9c38b49a +#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..3b1300e1ce6f +index 000000000..3b1300e1c --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers_user.h @@ -0,0 +1,179 @@ @@ -243853,7 +243853,7 @@ index 000000000000..3b1300e1ce6f +#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..988559de1edf +index 000000000..988559de1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_mem.h @@ -0,0 +1,73 @@ @@ -243932,7 +243932,7 @@ index 000000000000..988559de1edf +#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..49ebeb4ec546 +index 000000000..49ebeb4ec --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_resultset.h @@ -0,0 +1,181 @@ @@ -244119,7 +244119,7 @@ index 000000000000..49ebeb4ec546 +#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..8d75f506f9eb +index 000000000..8d75f506f --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_suite.h @@ -0,0 +1,569 @@ @@ -244694,7 +244694,7 @@ index 000000000000..8d75f506f9eb +#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..25b8285500d7 +index 000000000..25b828550 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_utils.h @@ -0,0 +1,60 @@ @@ -244760,7 +244760,7 @@ index 000000000000..25b8285500d7 +#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..2531d41ca28d +index 000000000..2531d41ca --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/Kbuild @@ -0,0 +1,26 @@ @@ -244792,7 +244792,7 @@ index 000000000000..2531d41ca28d +kutf-y := kutf_mem.o kutf_resultset.o kutf_suite.o kutf_utils.o kutf_helpers.o kutf_helpers_user.o diff --git a/drivers/gpu/arm/bifrost/tests/kutf/Kconfig b/drivers/gpu/arm/bifrost/tests/kutf/Kconfig new file mode 100755 -index 000000000000..0cdb474c06a3 +index 000000000..0cdb474c0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/Kconfig @@ -0,0 +1,28 @@ @@ -244826,7 +244826,7 @@ index 000000000000..0cdb474c06a3 + choose M here - this will generate a single module called kutf. diff --git a/drivers/gpu/arm/bifrost/tests/kutf/Makefile b/drivers/gpu/arm/bifrost/tests/kutf/Makefile new file mode 100755 -index 000000000000..d848e8774bd0 +index 000000000..d848e8774 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/Makefile @@ -0,0 +1,35 @@ @@ -244867,7 +244867,7 @@ index 000000000000..d848e8774bd0 + $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean 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..32eab143e669 +index 000000000..32eab143e --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/build.bp @@ -0,0 +1,36 @@ @@ -244909,7 +244909,7 @@ index 000000000000..32eab143e669 +} 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..4463b04792f5 +index 000000000..4463b0479 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers.c @@ -0,0 +1,131 @@ @@ -245046,7 +245046,7 @@ index 000000000000..4463b04792f5 +} 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..108fa82d9b21 +index 000000000..108fa82d9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers_user.c @@ -0,0 +1,468 @@ @@ -245520,7 +245520,7 @@ index 000000000000..108fa82d9b21 +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..fd98beaeb84a +index 000000000..fd98beaeb --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_mem.c @@ -0,0 +1,108 @@ @@ -245634,7 +245634,7 @@ index 000000000000..fd98beaeb84a +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..94ecfa4421e1 +index 000000000..94ecfa442 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_resultset.c @@ -0,0 +1,164 @@ @@ -245804,7 +245804,7 @@ index 000000000000..94ecfa4421e1 +} 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..9dc6e2b4bad4 +index 000000000..9dc6e2b4b --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_suite.c @@ -0,0 +1,1224 @@ @@ -247034,7 +247034,7 @@ index 000000000000..9dc6e2b4bad4 +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..7f5ac517fdb4 +index 000000000..7f5ac517f --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_utils.c @@ -0,0 +1,76 @@ @@ -247116,7 +247116,7 @@ index 000000000000..7f5ac517fdb4 +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..f5565d30f9cf +index 000000000..f5565d30f --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kbuild @@ -0,0 +1,26 @@ @@ -247148,7 +247148,7 @@ index 000000000000..f5565d30f9cf +mali_kutf_clk_rate_trace_test_portal-y := mali_kutf_clk_rate_trace_test.o diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kconfig b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kconfig new file mode 100755 -index 000000000000..8196e4cc6b37 +index 000000000..8196e4cc6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kconfig @@ -0,0 +1,30 @@ @@ -247184,7 +247184,7 @@ index 000000000000..8196e4cc6b37 + module called mali_kutf_clk_rate_trace_test_portal. diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Makefile b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Makefile new file mode 100755 -index 000000000000..71c78b84830c +index 000000000..71c78b848 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Makefile @@ -0,0 +1,57 @@ @@ -247247,7 +247247,7 @@ index 000000000000..71c78b84830c +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..0cc2904db542 +index 000000000..0cc2904db --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/build.bp @@ -0,0 +1,34 @@ @@ -247287,7 +247287,7 @@ index 000000000000..0cc2904db542 +} 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..d74a278bffa7 +index 000000000..d74a278bf --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c @@ -0,0 +1,890 @@ @@ -248183,7 +248183,7 @@ index 000000000000..d74a278bffa7 +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..f46afd5086bd +index 000000000..f46afd508 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h @@ -0,0 +1,148 @@ @@ -248337,7 +248337,7 @@ index 000000000000..f46afd5086bd +#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..ca8c51273b4c +index 000000000..ca8c51273 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kbuild @@ -0,0 +1,26 @@ @@ -248369,7 +248369,7 @@ index 000000000000..ca8c51273b4c +mali_kutf_irq_test-y := mali_kutf_irq_test_main.o diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kconfig b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kconfig new file mode 100755 -index 000000000000..78283307713d +index 000000000..782833077 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kconfig @@ -0,0 +1,29 @@ @@ -248404,7 +248404,7 @@ index 000000000000..78283307713d + Choosing M here will generate a single module called mali_kutf_irq_test. diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Makefile b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Makefile new file mode 100755 -index 000000000000..bc4d654a90ca +index 000000000..bc4d654a9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Makefile @@ -0,0 +1,51 @@ @@ -248461,7 +248461,7 @@ index 000000000000..bc4d654a90ca + $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean 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..90efdcf9ad9c +index 000000000..90efdcf9a --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/build.bp @@ -0,0 +1,35 @@ @@ -248502,7 +248502,7 @@ index 000000000000..90efdcf9ad9c +} 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..5f27c3a7e9b2 +index 000000000..5f27c3a7e --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c @@ -0,0 +1,278 @@ @@ -248786,7 +248786,7 @@ index 000000000000..5f27c3a7e9b2 +MODULE_VERSION("1.0"); 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..cd90ea0ec285 +index 000000000..cd90ea0ec --- /dev/null +++ b/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c @@ -0,0 +1,368 @@ @@ -249160,7 +249160,7 @@ index 000000000000..cd90ea0ec285 +} 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..abaa6bb12b9d +index 000000000..abaa6bb12 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_csf.c @@ -0,0 +1,172 @@ @@ -249338,7 +249338,7 @@ index 000000000000..abaa6bb12b9d +} 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..c368ac7288da +index 000000000..c368ac728 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_jm.c @@ -0,0 +1,97 @@ @@ -249442,7 +249442,7 @@ index 000000000000..c368ac7288da \ No newline at end of file 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..8d8834fdcda6 +index 000000000..8d8834fdc --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.c @@ -0,0 +1,308 @@ @@ -249756,7 +249756,7 @@ index 000000000000..8d8834fdcda6 +#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..cd48411b45cf +index 000000000..cd48411b4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.h @@ -0,0 +1,121 @@ @@ -249883,7 +249883,7 @@ index 000000000000..cd48411b45cf +#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..724f5fa23725 +index 000000000..724f5fa23 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_io.c @@ -0,0 +1,362 @@ @@ -250251,7 +250251,7 @@ index 000000000000..724f5fa23725 +} 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..35eec467af90 +index 000000000..35eec467a --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_priv.h @@ -0,0 +1,73 @@ @@ -250330,7 +250330,7 @@ index 000000000000..35eec467af90 +#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..3e378279cf2c +index 000000000..3e378279c --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tl_serialize.h @@ -0,0 +1,125 @@ @@ -250461,7 +250461,7 @@ index 000000000000..3e378279cf2c + 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..f4239cfafb9d +index 000000000..f4239cfaf --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.c @@ -0,0 +1,306 @@ @@ -250773,7 +250773,7 @@ index 000000000000..f4239cfafb9d + 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..faf88d676b5d +index 000000000..faf88d676 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.h @@ -0,0 +1,169 @@ @@ -250948,7 +250948,7 @@ index 000000000000..faf88d676b5d + 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..de76fa57051e +index 000000000..de76fa570 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.c @@ -0,0 +1,2974 @@ @@ -253928,7 +253928,7 @@ index 000000000000..de76fa57051e +/* 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..5651f0a0fc57 +index 000000000..5651f0a0f --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.h @@ -0,0 +1,2926 @@ @@ -256860,7 +256860,7 @@ index 000000000000..5651f0a0fc57 +#endif diff --git a/drivers/gpu/arm/bifrost_for_linux/Kbuild b/drivers/gpu/arm/bifrost_for_linux/Kbuild new file mode 100755 -index 000000000000..531b92126b98 +index 000000000..531b92126 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/Kbuild @@ -0,0 +1,172 @@ @@ -257038,7 +257038,7 @@ index 000000000000..531b92126b98 +obj-$(CONFIG_MALI_KUTF) += tests/ diff --git a/drivers/gpu/arm/bifrost_for_linux/Kconfig b/drivers/gpu/arm/bifrost_for_linux/Kconfig new file mode 100755 -index 000000000000..e78b634031ee +index 000000000..e78b63403 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/Kconfig @@ -0,0 +1,196 @@ @@ -257240,7 +257240,7 @@ index 000000000000..e78b634031ee +# source "drivers/gpu/arm/bifrost/tests/Kconfig" diff --git a/drivers/gpu/arm/bifrost_for_linux/Makefile b/drivers/gpu/arm/bifrost_for_linux/Makefile new file mode 100755 -index 000000000000..26522d566dd0 +index 000000000..26522d566 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/Makefile @@ -0,0 +1,42 @@ @@ -257288,7 +257288,7 @@ index 000000000000..26522d566dd0 + $(MAKE) -C $(KDIR) M=$(CURDIR) clean diff --git a/drivers/gpu/arm/bifrost_for_linux/Makefile.kbase b/drivers/gpu/arm/bifrost_for_linux/Makefile.kbase new file mode 100755 -index 000000000000..2bef9c25eaeb +index 000000000..2bef9c25e --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/Makefile.kbase @@ -0,0 +1,17 @@ @@ -257311,7 +257311,7 @@ index 000000000000..2bef9c25eaeb + diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/Kbuild b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/Kbuild new file mode 100755 -index 000000000000..5eeba1b14710 +index 000000000..5eeba1b14 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/Kbuild @@ -0,0 +1,60 @@ @@ -257377,7 +257377,7 @@ index 000000000000..5eeba1b14710 +endif diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_backend_config.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_backend_config.h new file mode 100755 -index 000000000000..c8ae87eb84a2 +index 000000000..c8ae87eb8 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_backend_config.h @@ -0,0 +1,29 @@ @@ -257412,7 +257412,7 @@ index 000000000000..c8ae87eb84a2 + diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_cache_policy_backend.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_cache_policy_backend.c new file mode 100755 -index 000000000000..fef9a2cb743e +index 000000000..fef9a2cb7 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_cache_policy_backend.c @@ -0,0 +1,29 @@ @@ -257447,7 +257447,7 @@ index 000000000000..fef9a2cb743e + diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_cache_policy_backend.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_cache_policy_backend.h new file mode 100755 -index 000000000000..fe9869109a82 +index 000000000..fe9869109 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_cache_policy_backend.h @@ -0,0 +1,34 @@ @@ -257487,7 +257487,7 @@ index 000000000000..fe9869109a82 +#endif /* _KBASE_CACHE_POLICY_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_debug_job_fault_backend.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_debug_job_fault_backend.c new file mode 100755 -index 000000000000..7851ea6466c7 +index 000000000..7851ea646 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_debug_job_fault_backend.c @@ -0,0 +1,157 @@ @@ -257650,7 +257650,7 @@ index 000000000000..7851ea6466c7 +#endif diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_devfreq.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_devfreq.c new file mode 100755 -index 000000000000..003af36d8fe2 +index 000000000..003af36d8 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_devfreq.c @@ -0,0 +1,495 @@ @@ -258151,7 +258151,7 @@ index 000000000000..003af36d8fe2 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_devfreq.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_devfreq.h new file mode 100755 -index 000000000000..7bcc350f3006 +index 000000000..7bcc350f3 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_devfreq.h @@ -0,0 +1,25 @@ @@ -258182,7 +258182,7 @@ index 000000000000..7bcc350f3006 +#endif /* _BASE_DEVFREQ_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_device_hw.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_device_hw.c new file mode 100755 -index 000000000000..17f253308ffc +index 000000000..17f253308 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_device_hw.c @@ -0,0 +1,255 @@ @@ -258443,7 +258443,7 @@ index 000000000000..17f253308ffc +} diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_device_internal.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_device_internal.h new file mode 100755 -index 000000000000..5b20445932fb +index 000000000..5b2044593 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_device_internal.h @@ -0,0 +1,67 @@ @@ -258516,7 +258516,7 @@ index 000000000000..5b20445932fb +#endif /* _KBASE_DEVICE_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_gpu.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_gpu.c new file mode 100755 -index 000000000000..a7c3a77d8ac8 +index 000000000..a7c3a77d8 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_gpu.c @@ -0,0 +1,123 @@ @@ -258645,7 +258645,7 @@ index 000000000000..a7c3a77d8ac8 + diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_gpuprops_backend.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_gpuprops_backend.c new file mode 100755 -index 000000000000..b395325b556b +index 000000000..b395325b5 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_gpuprops_backend.c @@ -0,0 +1,110 @@ @@ -258761,7 +258761,7 @@ index 000000000000..b395325b556b + diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_backend.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_backend.c new file mode 100755 -index 000000000000..8084d054cc5b +index 000000000..8084d054c --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_backend.c @@ -0,0 +1,492 @@ @@ -259259,7 +259259,7 @@ index 000000000000..8084d054cc5b + diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_defs.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_defs.h new file mode 100755 -index 000000000000..4794672da8f0 +index 000000000..4794672da --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_defs.h @@ -0,0 +1,58 @@ @@ -259323,7 +259323,7 @@ index 000000000000..4794672da8f0 + diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_internal.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_internal.h new file mode 100755 -index 000000000000..e96aeae786e1 +index 000000000..e96aeae78 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_instr_internal.h @@ -0,0 +1,45 @@ @@ -259374,7 +259374,7 @@ index 000000000000..e96aeae786e1 +#endif /* _KBASE_INSTR_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_irq_internal.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_irq_internal.h new file mode 100755 -index 000000000000..8781561e73d0 +index 000000000..8781561e7 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_irq_internal.h @@ -0,0 +1,39 @@ @@ -259419,7 +259419,7 @@ index 000000000000..8781561e73d0 +#endif /* _KBASE_IRQ_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_irq_linux.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_irq_linux.c new file mode 100755 -index 000000000000..d0666c86cf59 +index 000000000..d0666c86c --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_irq_linux.c @@ -0,0 +1,469 @@ @@ -259894,7 +259894,7 @@ index 000000000000..d0666c86cf59 +#endif /* !defined(CONFIG_MALI_BIFROST_NO_MALI) */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_as.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_as.c new file mode 100755 -index 000000000000..c660c80341f4 +index 000000000..c660c8034 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_as.c @@ -0,0 +1,235 @@ @@ -260135,7 +260135,7 @@ index 000000000000..c660c80341f4 + diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_defs.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_defs.h new file mode 100755 -index 000000000000..08a7400e66d5 +index 000000000..08a7400e6 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_defs.h @@ -0,0 +1,123 @@ @@ -260264,7 +260264,7 @@ index 000000000000..08a7400e66d5 +#endif /* _KBASE_HWACCESS_GPU_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_hw.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_hw.c new file mode 100755 -index 000000000000..cbca5eac82f1 +index 000000000..cbca5eac8 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_hw.c @@ -0,0 +1,1512 @@ @@ -261782,7 +261782,7 @@ index 000000000000..cbca5eac82f1 +#endif /* KBASE_GPU_RESET_EN */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_internal.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_internal.h new file mode 100755 -index 000000000000..1f382b3c1af4 +index 000000000..1f382b3c1 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_internal.h @@ -0,0 +1,164 @@ @@ -261952,7 +261952,7 @@ index 000000000000..1f382b3c1af4 +#endif /* _KBASE_JM_HWACCESS_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_rb.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_rb.c new file mode 100755 -index 000000000000..a41e7b5b7afb +index 000000000..a41e7b5b7 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_rb.c @@ -0,0 +1,1947 @@ @@ -263905,7 +263905,7 @@ index 000000000000..a41e7b5b7afb + diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_rb.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_rb.h new file mode 100755 -index 000000000000..1e0e05ad3ea4 +index 000000000..1e0e05ad3 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_jm_rb.h @@ -0,0 +1,76 @@ @@ -263987,7 +263987,7 @@ index 000000000000..1e0e05ad3ea4 +#endif /* _KBASE_HWACCESS_GPU_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_affinity.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_affinity.c new file mode 100755 -index 000000000000..54d8ddd80097 +index 000000000..54d8ddd80 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_affinity.c @@ -0,0 +1,303 @@ @@ -264296,7 +264296,7 @@ index 000000000000..54d8ddd80097 +#endif /* KBASE_TRACE_ENABLE */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_affinity.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_affinity.h new file mode 100755 -index 000000000000..35d9781ae092 +index 000000000..35d9781ae --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_affinity.h @@ -0,0 +1,129 @@ @@ -264431,7 +264431,7 @@ index 000000000000..35d9781ae092 +#endif /* _KBASE_JS_AFFINITY_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_backend.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_backend.c new file mode 100755 -index 000000000000..d392fa2a85d9 +index 000000000..d392fa2a8 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_backend.c @@ -0,0 +1,356 @@ @@ -264793,7 +264793,7 @@ index 000000000000..d392fa2a85d9 + diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_internal.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_internal.h new file mode 100755 -index 000000000000..3f53779c6747 +index 000000000..3f53779c6 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_js_internal.h @@ -0,0 +1,69 @@ @@ -264868,7 +264868,7 @@ index 000000000000..3f53779c6747 +#endif /* _KBASE_JS_BACKEND_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_mmu_hw_direct.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_mmu_hw_direct.c new file mode 100755 -index 000000000000..aa1817c8bca9 +index 000000000..aa1817c8b --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_mmu_hw_direct.c @@ -0,0 +1,401 @@ @@ -265275,7 +265275,7 @@ index 000000000000..aa1817c8bca9 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_mmu_hw_direct.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_mmu_hw_direct.h new file mode 100755 -index 000000000000..c02253c6acc3 +index 000000000..c02253c6a --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_mmu_hw_direct.h @@ -0,0 +1,42 @@ @@ -265323,7 +265323,7 @@ index 000000000000..c02253c6acc3 +#endif /* _MALI_KBASE_MMU_HW_DIRECT_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_always_on.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_always_on.c new file mode 100755 -index 000000000000..0614348e935a +index 000000000..0614348e9 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_always_on.c @@ -0,0 +1,63 @@ @@ -265392,7 +265392,7 @@ index 000000000000..0614348e935a +KBASE_EXPORT_TEST_API(kbase_pm_always_on_policy_ops); diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_always_on.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_always_on.h new file mode 100755 -index 000000000000..f9d244b01bc2 +index 000000000..f9d244b01 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_always_on.h @@ -0,0 +1,77 @@ @@ -265475,7 +265475,7 @@ index 000000000000..f9d244b01bc2 + diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_backend.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_backend.c new file mode 100755 -index 000000000000..cd8932650ed5 +index 000000000..cd8932650 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_backend.c @@ -0,0 +1,478 @@ @@ -265959,7 +265959,7 @@ index 000000000000..cd8932650ed5 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca.c new file mode 100755 -index 000000000000..c17db8be8877 +index 000000000..c17db8be8 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca.c @@ -0,0 +1,182 @@ @@ -266147,7 +266147,7 @@ index 000000000000..c17db8be8877 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca.h new file mode 100755 -index 000000000000..ee9e751f2d79 +index 000000000..ee9e751f2 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca.h @@ -0,0 +1,92 @@ @@ -266245,7 +266245,7 @@ index 000000000000..ee9e751f2d79 +#endif /* _KBASE_PM_CA_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_devfreq.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_devfreq.c new file mode 100755 -index 000000000000..66bf660cffb6 +index 000000000..66bf660cf --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_devfreq.c @@ -0,0 +1,129 @@ @@ -266380,7 +266380,7 @@ index 000000000000..66bf660cffb6 + diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_devfreq.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_devfreq.h new file mode 100755 -index 000000000000..7ab3cd4d8460 +index 000000000..7ab3cd4d8 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_devfreq.h @@ -0,0 +1,55 @@ @@ -266441,7 +266441,7 @@ index 000000000000..7ab3cd4d8460 + diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_fixed.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_fixed.c new file mode 100755 -index 000000000000..864612d31f9b +index 000000000..864612d31 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_fixed.c @@ -0,0 +1,65 @@ @@ -266512,7 +266512,7 @@ index 000000000000..864612d31f9b +KBASE_EXPORT_TEST_API(kbase_pm_ca_fixed_policy_ops); diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_fixed.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_fixed.h new file mode 100755 -index 000000000000..a763155cb703 +index 000000000..a763155cb --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_ca_fixed.h @@ -0,0 +1,40 @@ @@ -266558,7 +266558,7 @@ index 000000000000..a763155cb703 + diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_coarse_demand.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_coarse_demand.c new file mode 100755 -index 000000000000..f891fa225a89 +index 000000000..f891fa225 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_coarse_demand.c @@ -0,0 +1,70 @@ @@ -266634,7 +266634,7 @@ index 000000000000..f891fa225a89 +KBASE_EXPORT_TEST_API(kbase_pm_coarse_demand_policy_ops); diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_coarse_demand.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_coarse_demand.h new file mode 100755 -index 000000000000..749d305eee9a +index 000000000..749d305ee --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_coarse_demand.h @@ -0,0 +1,64 @@ @@ -266704,7 +266704,7 @@ index 000000000000..749d305eee9a +#endif /* MALI_KBASE_PM_COARSE_DEMAND_H */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_defs.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_defs.h new file mode 100755 -index 000000000000..564fbda1116a +index 000000000..564fbda11 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_defs.h @@ -0,0 +1,519 @@ @@ -267229,7 +267229,7 @@ index 000000000000..564fbda1116a +#endif /* _KBASE_PM_HWACCESS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_demand.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_demand.c new file mode 100755 -index 000000000000..81322fd0dd17 +index 000000000..81322fd0d --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_demand.c @@ -0,0 +1,73 @@ @@ -267308,7 +267308,7 @@ index 000000000000..81322fd0dd17 +KBASE_EXPORT_TEST_API(kbase_pm_demand_policy_ops); diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_demand.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_demand.h new file mode 100755 -index 000000000000..c0c84b6e9189 +index 000000000..c0c84b6e9 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_demand.h @@ -0,0 +1,64 @@ @@ -267378,7 +267378,7 @@ index 000000000000..c0c84b6e9189 +#endif /* MALI_KBASE_PM_DEMAND_H */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_driver.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_driver.c new file mode 100755 -index 000000000000..707f71a79a77 +index 000000000..707f71a79 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_driver.c @@ -0,0 +1,1672 @@ @@ -269056,7 +269056,7 @@ index 000000000000..707f71a79a77 +KBASE_EXPORT_TEST_API(kbase_pm_release_gpu_cycle_counter); diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_internal.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_internal.h new file mode 100755 -index 000000000000..9fbe094541c5 +index 000000000..9fbe09454 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_internal.h @@ -0,0 +1,548 @@ @@ -269610,7 +269610,7 @@ index 000000000000..9fbe094541c5 +#endif /* _KBASE_BACKEND_PM_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_metrics.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_metrics.c new file mode 100755 -index 000000000000..ba13bcd8b291 +index 000000000..ba13bcd8b --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_metrics.c @@ -0,0 +1,401 @@ @@ -270017,7 +270017,7 @@ index 000000000000..ba13bcd8b291 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_policy.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_policy.c new file mode 100755 -index 000000000000..b98c68d9a42a +index 000000000..b98c68d9a --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_policy.c @@ -0,0 +1,973 @@ @@ -270996,7 +270996,7 @@ index 000000000000..b98c68d9a42a +KBASE_EXPORT_TEST_API(kbase_pm_release_l2_caches); diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_policy.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_policy.h new file mode 100755 -index 000000000000..611a90e66e65 +index 000000000..611a90e66 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_pm_policy.h @@ -0,0 +1,227 @@ @@ -271229,7 +271229,7 @@ index 000000000000..611a90e66e65 +#endif /* _KBASE_PM_POLICY_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_time.c b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_time.c new file mode 100755 -index 000000000000..0068e1091f4c +index 000000000..0068e1091 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_time.c @@ -0,0 +1,103 @@ @@ -271338,7 +271338,7 @@ index 000000000000..0068e1091f4c +#endif /* CONFIG_MALI_BIFROST_NO_MALI */ diff --git a/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_time.h b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_time.h new file mode 100755 -index 000000000000..0559b2f7097d +index 000000000..0559b2f70 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/backend/gpu/mali_kbase_time.h @@ -0,0 +1,52 @@ @@ -271396,7 +271396,7 @@ index 000000000000..0559b2f7097d +#endif /* _KBASE_BACKEND_TIME_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/docs/Doxyfile b/drivers/gpu/arm/bifrost_for_linux/docs/Doxyfile new file mode 100755 -index 000000000000..35ff2f1ce4a0 +index 000000000..35ff2f1ce --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/docs/Doxyfile @@ -0,0 +1,126 @@ @@ -271528,7 +271528,7 @@ index 000000000000..35ff2f1ce4a0 + diff --git a/drivers/gpu/arm/bifrost_for_linux/docs/policy_operation_diagram.dot b/drivers/gpu/arm/bifrost_for_linux/docs/policy_operation_diagram.dot new file mode 100755 -index 000000000000..7ae05c2f8ded +index 000000000..7ae05c2f8 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/docs/policy_operation_diagram.dot @@ -0,0 +1,112 @@ @@ -271646,7 +271646,7 @@ index 000000000000..7ae05c2f8ded +} diff --git a/drivers/gpu/arm/bifrost_for_linux/docs/policy_overview.dot b/drivers/gpu/arm/bifrost_for_linux/docs/policy_overview.dot new file mode 100755 -index 000000000000..159b993b7d61 +index 000000000..159b993b7 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/docs/policy_overview.dot @@ -0,0 +1,63 @@ @@ -271715,7 +271715,7 @@ index 000000000000..159b993b7d61 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/Kbuild b/drivers/gpu/arm/bifrost_for_linux/ipa/Kbuild new file mode 100755 -index 000000000000..0776428fce4f +index 000000000..0776428fc --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/ipa/Kbuild @@ -0,0 +1,27 @@ @@ -271748,7 +271748,7 @@ index 000000000000..0776428fce4f +endif diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa.c b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa.c new file mode 100755 -index 000000000000..d6332b55e970 +index 000000000..d6332b55e --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa.c @@ -0,0 +1,580 @@ @@ -272334,7 +272334,7 @@ index 000000000000..d6332b55e970 +KBASE_EXPORT_TEST_API(kbase_ipa_power_model_ops); diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa.h b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa.h new file mode 100755 -index 000000000000..67478fe911ea +index 000000000..67478fe91 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa.h @@ -0,0 +1,165 @@ @@ -272505,7 +272505,7 @@ index 000000000000..67478fe911ea +#endif diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_debugfs.c b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_debugfs.c new file mode 100755 -index 000000000000..eafc14009ddc +index 000000000..eafc14009 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_debugfs.c @@ -0,0 +1,219 @@ @@ -272730,7 +272730,7 @@ index 000000000000..eafc14009ddc +} diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_debugfs.h b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_debugfs.h new file mode 100755 -index 000000000000..ec06e2096f94 +index 000000000..ec06e2096 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_debugfs.h @@ -0,0 +1,49 @@ @@ -272785,7 +272785,7 @@ index 000000000000..ec06e2096f94 +#endif /* _KBASE_IPA_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_simple.c b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_simple.c new file mode 100755 -index 000000000000..b35cea451765 +index 000000000..b35cea451 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_simple.c @@ -0,0 +1,327 @@ @@ -273118,7 +273118,7 @@ index 000000000000..b35cea451765 +}; diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_simple.h b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_simple.h new file mode 100755 -index 000000000000..23cd55f5867d +index 000000000..23cd55f58 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_simple.h @@ -0,0 +1,40 @@ @@ -273164,7 +273164,7 @@ index 000000000000..23cd55f5867d +#endif /* _KBASE_IPA_SIMPLE_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_common.c b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_common.c new file mode 100755 -index 000000000000..b3d480030c2b +index 000000000..b3d480030 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_common.c @@ -0,0 +1,217 @@ @@ -273387,7 +273387,7 @@ index 000000000000..b3d480030c2b +} diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_common.h b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_common.h new file mode 100755 -index 000000000000..25b36c8e3089 +index 000000000..25b36c8e3 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_common.h @@ -0,0 +1,161 @@ @@ -273554,7 +273554,7 @@ index 000000000000..25b36c8e3089 +#endif /* _KBASE_IPA_VINSTR_COMMON_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_g71.c b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_g71.c new file mode 100755 -index 000000000000..81f6fddbd79b +index 000000000..81f6fddbd --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/ipa/mali_kbase_ipa_vinstr_g71.c @@ -0,0 +1,136 @@ @@ -273696,7 +273696,7 @@ index 000000000000..81f6fddbd79b +KBASE_EXPORT_TEST_API(kbase_g71_ipa_model_ops); diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_base_hwconfig_features.h b/drivers/gpu/arm/bifrost_for_linux/mali_base_hwconfig_features.h new file mode 100755 -index 000000000000..219586d4d2da +index 000000000..219586d4d --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_base_hwconfig_features.h @@ -0,0 +1,282 @@ @@ -273984,7 +273984,7 @@ index 000000000000..219586d4d2da +#endif /* _BASE_HWCONFIG_FEATURES_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_base_hwconfig_issues.h b/drivers/gpu/arm/bifrost_for_linux/mali_base_hwconfig_issues.h new file mode 100755 -index 000000000000..1c5ee496ac85 +index 000000000..1c5ee496a --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_base_hwconfig_issues.h @@ -0,0 +1,1126 @@ @@ -275116,7 +275116,7 @@ index 000000000000..1c5ee496ac85 +#endif /* _BASE_HWCONFIG_ISSUES_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_base_kernel.h b/drivers/gpu/arm/bifrost_for_linux/mali_base_kernel.h new file mode 100755 -index 000000000000..6f5c68e288cd +index 000000000..6f5c68e28 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_base_kernel.h @@ -0,0 +1,1822 @@ @@ -276944,7 +276944,7 @@ index 000000000000..6f5c68e288cd +#endif /* _BASE_KERNEL_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_base_mem_priv.h b/drivers/gpu/arm/bifrost_for_linux/mali_base_mem_priv.h new file mode 100755 -index 000000000000..4a98a72cc37a +index 000000000..4a98a72cc --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_base_mem_priv.h @@ -0,0 +1,52 @@ @@ -277002,7 +277002,7 @@ index 000000000000..4a98a72cc37a +#endif diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_base_vendor_specific_func.h b/drivers/gpu/arm/bifrost_for_linux/mali_base_vendor_specific_func.h new file mode 100755 -index 000000000000..be454a216a39 +index 000000000..be454a216 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_base_vendor_specific_func.h @@ -0,0 +1,24 @@ @@ -277032,7 +277032,7 @@ index 000000000000..be454a216a39 +#endif /*_BASE_VENDOR_SPEC_FUNC_H_*/ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase.h new file mode 100755 -index 000000000000..1fe936ea6012 +index 000000000..1fe936ea6 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase.h @@ -0,0 +1,616 @@ @@ -277654,7 +277654,7 @@ index 000000000000..1fe936ea6012 + diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_10969_workaround.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_10969_workaround.c new file mode 100755 -index 000000000000..6b3559d93351 +index 000000000..6b3559d93 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_10969_workaround.c @@ -0,0 +1,210 @@ @@ -277870,7 +277870,7 @@ index 000000000000..6b3559d93351 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_10969_workaround.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_10969_workaround.h new file mode 100755 -index 000000000000..099a29861672 +index 000000000..099a29861 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_10969_workaround.h @@ -0,0 +1,23 @@ @@ -277899,7 +277899,7 @@ index 000000000000..099a29861672 +#endif /* _KBASE_10969_WORKAROUND_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_as_fault_debugfs.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_as_fault_debugfs.c new file mode 100755 -index 000000000000..cc729d416858 +index 000000000..cc729d416 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_as_fault_debugfs.c @@ -0,0 +1,102 @@ @@ -278007,7 +278007,7 @@ index 000000000000..cc729d416858 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_as_fault_debugfs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_as_fault_debugfs.h new file mode 100755 -index 000000000000..66387e1c3f6a +index 000000000..66387e1c3 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_as_fault_debugfs.h @@ -0,0 +1,45 @@ @@ -278058,7 +278058,7 @@ index 000000000000..66387e1c3f6a +#endif /*_KBASE_AS_FAULT_DEBUG_FS_H*/ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_cache_policy.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_cache_policy.c new file mode 100755 -index 000000000000..1d11de67aa80 +index 000000000..1d11de67a --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_cache_policy.c @@ -0,0 +1,54 @@ @@ -278118,7 +278118,7 @@ index 000000000000..1d11de67aa80 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_cache_policy.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_cache_policy.h new file mode 100755 -index 000000000000..0c18bdb357b0 +index 000000000..0c18bdb35 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_cache_policy.h @@ -0,0 +1,45 @@ @@ -278169,7 +278169,7 @@ index 000000000000..0c18bdb357b0 +#endif /* _KBASE_CACHE_POLICY_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_config.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_config.c new file mode 100755 -index 000000000000..fb615ae02ead +index 000000000..fb615ae02 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_config.c @@ -0,0 +1,51 @@ @@ -278226,7 +278226,7 @@ index 000000000000..fb615ae02ead + diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_config.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_config.h new file mode 100755 -index 000000000000..212e3b14d96c +index 000000000..212e3b14d --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_config.h @@ -0,0 +1,343 @@ @@ -278575,7 +278575,7 @@ index 000000000000..212e3b14d96c +#endif /* _KBASE_CONFIG_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_config_defaults.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_config_defaults.h new file mode 100755 -index 000000000000..69079e7d9680 +index 000000000..69079e7d9 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_config_defaults.h @@ -0,0 +1,226 @@ @@ -278807,7 +278807,7 @@ index 000000000000..69079e7d9680 + diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_context.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_context.c new file mode 100755 -index 000000000000..7a09aa26128e +index 000000000..7a09aa261 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_context.c @@ -0,0 +1,362 @@ @@ -279175,7 +279175,7 @@ index 000000000000..7a09aa26128e +KBASE_EXPORT_SYMBOL(kbase_context_set_create_flags); diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_context.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_context.h new file mode 100755 -index 000000000000..a3f5bb0ce0da +index 000000000..a3f5bb0ce --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_context.h @@ -0,0 +1,90 @@ @@ -279271,7 +279271,7 @@ index 000000000000..a3f5bb0ce0da +#endif /* _KBASE_CONTEXT_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_core_linux.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_core_linux.c new file mode 100755 -index 000000000000..347fee2643bb +index 000000000..347fee264 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_core_linux.c @@ -0,0 +1,4971 @@ @@ -284248,7 +284248,7 @@ index 000000000000..347fee2643bb +#endif diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_ctx_sched.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_ctx_sched.c new file mode 100755 -index 000000000000..e2f7baabad43 +index 000000000..e2f7baaba --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_ctx_sched.c @@ -0,0 +1,203 @@ @@ -284457,7 +284457,7 @@ index 000000000000..e2f7baabad43 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_ctx_sched.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_ctx_sched.h new file mode 100755 -index 000000000000..2330d48c8e51 +index 000000000..2330d48c8 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_ctx_sched.h @@ -0,0 +1,131 @@ @@ -284594,7 +284594,7 @@ index 000000000000..2330d48c8e51 +#endif /* _KBASE_CTX_SCHED_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug.c new file mode 100755 -index 000000000000..fb57ac2e31ad +index 000000000..fb57ac2e3 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug.c @@ -0,0 +1,39 @@ @@ -284639,7 +284639,7 @@ index 000000000000..fb57ac2e31ad + diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug.h new file mode 100755 -index 000000000000..31b754c5507b +index 000000000..31b754c55 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug.h @@ -0,0 +1,164 @@ @@ -284809,7 +284809,7 @@ index 000000000000..31b754c5507b +#endif /* _KBASE_DEBUG_H */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_job_fault.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_job_fault.c new file mode 100755 -index 000000000000..f29430ddf8f9 +index 000000000..f29430ddf --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_job_fault.c @@ -0,0 +1,499 @@ @@ -285314,7 +285314,7 @@ index 000000000000..f29430ddf8f9 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_job_fault.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_job_fault.h new file mode 100755 -index 000000000000..a2bf8983c37c +index 000000000..a2bf8983c --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_job_fault.h @@ -0,0 +1,96 @@ @@ -285416,7 +285416,7 @@ index 000000000000..a2bf8983c37c +#endif /*_KBASE_DEBUG_JOB_FAULT_H*/ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_mem_view.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_mem_view.c new file mode 100755 -index 000000000000..aa271566e917 +index 000000000..aa271566e --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_mem_view.c @@ -0,0 +1,306 @@ @@ -285728,7 +285728,7 @@ index 000000000000..aa271566e917 +#endif diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_mem_view.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_mem_view.h new file mode 100755 -index 000000000000..20ab51a776c6 +index 000000000..20ab51a77 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_debug_mem_view.h @@ -0,0 +1,25 @@ @@ -285759,7 +285759,7 @@ index 000000000000..20ab51a776c6 +#endif diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_defs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_defs.h new file mode 100755 -index 000000000000..73721f5da139 +index 000000000..73721f5da --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_defs.h @@ -0,0 +1,1641 @@ @@ -287406,7 +287406,7 @@ index 000000000000..73721f5da139 +#endif /* _KBASE_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_device.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_device.c new file mode 100755 -index 000000000000..2d11f11f3be0 +index 000000000..2d11f11f3 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_device.c @@ -0,0 +1,674 @@ @@ -288086,7 +288086,7 @@ index 000000000000..2d11f11f3be0 + diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_disjoint_events.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_disjoint_events.c new file mode 100755 -index 000000000000..f70bcccf4050 +index 000000000..f70bcccf4 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_disjoint_events.c @@ -0,0 +1,76 @@ @@ -288168,7 +288168,7 @@ index 000000000000..f70bcccf4050 +KBASE_EXPORT_TEST_API(kbase_disjoint_event_get); diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_dma_fence.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_dma_fence.c new file mode 100755 -index 000000000000..8a571266534b +index 000000000..8a5712665 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_dma_fence.c @@ -0,0 +1,449 @@ @@ -288623,7 +288623,7 @@ index 000000000000..8a571266534b +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_dma_fence.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_dma_fence.h new file mode 100755 -index 000000000000..b02ea9774c4f +index 000000000..b02ea9774 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_dma_fence.h @@ -0,0 +1,131 @@ @@ -288760,7 +288760,7 @@ index 000000000000..b02ea9774c4f +#endif diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_event.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_event.c new file mode 100755 -index 000000000000..188148645f37 +index 000000000..188148645 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_event.c @@ -0,0 +1,259 @@ @@ -289025,7 +289025,7 @@ index 000000000000..188148645f37 +KBASE_EXPORT_TEST_API(kbase_event_cleanup); diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence.c new file mode 100755 -index 000000000000..fcb373372596 +index 000000000..fcb373372 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence.c @@ -0,0 +1,196 @@ @@ -289227,7 +289227,7 @@ index 000000000000..fcb373372596 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence.h new file mode 100755 -index 000000000000..9f59d30a1e2e +index 000000000..9f59d30a1 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence.h @@ -0,0 +1,270 @@ @@ -289503,7 +289503,7 @@ index 000000000000..9f59d30a1e2e +#endif /* _KBASE_FENCE_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence_defs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence_defs.h new file mode 100755 -index 000000000000..d2d7c436918c +index 000000000..d2d7c4369 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_fence_defs.h @@ -0,0 +1,51 @@ @@ -289560,7 +289560,7 @@ index 000000000000..d2d7c436918c +#endif /* _KBASE_FENCE_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator.h new file mode 100755 -index 000000000000..87697b15d986 +index 000000000..87697b15d --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator.h @@ -0,0 +1,45 @@ @@ -289611,7 +289611,7 @@ index 000000000000..87697b15d986 +#endif /* _KBASE_GATOR_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_api.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_api.c new file mode 100755 -index 000000000000..860e10159fb3 +index 000000000..860e10159 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_api.c @@ -0,0 +1,334 @@ @@ -289951,7 +289951,7 @@ index 000000000000..860e10159fb3 +KBASE_EXPORT_SYMBOL(kbase_gator_instr_hwcnt_dump_irq); diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_api.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_api.h new file mode 100755 -index 000000000000..ef9ac0f7b633 +index 000000000..ef9ac0f7b --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_api.h @@ -0,0 +1,219 @@ @@ -290176,7 +290176,7 @@ index 000000000000..ef9ac0f7b633 +#endif diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names.h new file mode 100755 -index 000000000000..24103e292453 +index 000000000..24103e292 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names.h @@ -0,0 +1,2167 @@ @@ -292349,7 +292349,7 @@ index 000000000000..24103e292453 +#endif diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_thex.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_thex.h new file mode 100755 -index 000000000000..15fd4efdc6ca +index 000000000..15fd4efdc --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_thex.h @@ -0,0 +1,291 @@ @@ -292646,7 +292646,7 @@ index 000000000000..15fd4efdc6ca +#endif /* _KBASE_GATOR_HWCNT_NAMES_THEX_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_tmix.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_tmix.h new file mode 100755 -index 000000000000..8a215f723570 +index 000000000..8a215f723 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_tmix.h @@ -0,0 +1,291 @@ @@ -292943,7 +292943,7 @@ index 000000000000..8a215f723570 +#endif /* _KBASE_GATOR_HWCNT_NAMES_TMIX_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_tsix.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_tsix.h new file mode 100755 -index 000000000000..fb6a1437a1f6 +index 000000000..fb6a1437a --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gator_hwcnt_names_tsix.h @@ -0,0 +1,291 @@ @@ -293240,7 +293240,7 @@ index 000000000000..fb6a1437a1f6 +#endif /* _KBASE_GATOR_HWCNT_NAMES_TSIX_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_id.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_id.h new file mode 100755 -index 000000000000..2d368dfaf644 +index 000000000..2d368dfaf --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_id.h @@ -0,0 +1,118 @@ @@ -293364,7 +293364,7 @@ index 000000000000..2d368dfaf644 +#endif /* _KBASE_GPU_ID_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_memory_debugfs.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_memory_debugfs.c new file mode 100755 -index 000000000000..6df0a1cb1264 +index 000000000..6df0a1cb1 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_memory_debugfs.c @@ -0,0 +1,97 @@ @@ -293467,7 +293467,7 @@ index 000000000000..6df0a1cb1264 +#endif diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_memory_debugfs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_memory_debugfs.h new file mode 100755 -index 000000000000..7045693eb910 +index 000000000..7045693eb --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpu_memory_debugfs.h @@ -0,0 +1,37 @@ @@ -293510,7 +293510,7 @@ index 000000000000..7045693eb910 +#endif /*_KBASE_GPU_MEMORY_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops.c new file mode 100755 -index 000000000000..4130810f1038 +index 000000000..4130810f1 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops.c @@ -0,0 +1,514 @@ @@ -294030,7 +294030,7 @@ index 000000000000..4130810f1038 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops.h new file mode 100755 -index 000000000000..57b3eaf9cd53 +index 000000000..57b3eaf9c --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops.h @@ -0,0 +1,84 @@ @@ -294120,7 +294120,7 @@ index 000000000000..57b3eaf9cd53 +#endif /* _KBASE_GPUPROPS_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops_types.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops_types.h new file mode 100755 -index 000000000000..10794fc27318 +index 000000000..10794fc27 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_gpuprops_types.h @@ -0,0 +1,92 @@ @@ -294218,7 +294218,7 @@ index 000000000000..10794fc27318 +#endif /* _KBASE_GPUPROPS_TYPES_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hw.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hw.c new file mode 100755 -index 000000000000..eb8368ccee5e +index 000000000..eb8368cce --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hw.c @@ -0,0 +1,446 @@ @@ -294670,7 +294670,7 @@ index 000000000000..eb8368ccee5e +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hw.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hw.h new file mode 100755 -index 000000000000..754250ce968d +index 000000000..754250ce9 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hw.h @@ -0,0 +1,65 @@ @@ -294741,7 +294741,7 @@ index 000000000000..754250ce968d +#endif /* _KBASE_HW_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_backend.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_backend.h new file mode 100755 -index 000000000000..b09be99e6b4e +index 000000000..b09be99e6 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_backend.h @@ -0,0 +1,54 @@ @@ -294801,7 +294801,7 @@ index 000000000000..b09be99e6b4e +#endif /* _KBASE_HWACCESS_BACKEND_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_defs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_defs.h new file mode 100755 -index 000000000000..0acf297192fd +index 000000000..0acf29719 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_defs.h @@ -0,0 +1,36 @@ @@ -294843,7 +294843,7 @@ index 000000000000..0acf297192fd +#endif /* _KBASE_HWACCESS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_gpuprops.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_gpuprops.h new file mode 100755 -index 000000000000..cf8a8131c22e +index 000000000..cf8a8131c --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_gpuprops.h @@ -0,0 +1,47 @@ @@ -294896,7 +294896,7 @@ index 000000000000..cf8a8131c22e +#endif /* _KBASE_HWACCESS_GPUPROPS_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_instr.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_instr.h new file mode 100755 -index 000000000000..5de2b7535bb4 +index 000000000..5de2b7535 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_instr.h @@ -0,0 +1,116 @@ @@ -295018,7 +295018,7 @@ index 000000000000..5de2b7535bb4 +#endif /* _KBASE_HWACCESS_INSTR_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_jm.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_jm.h new file mode 100755 -index 000000000000..750fda2cd81d +index 000000000..750fda2cd --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_jm.h @@ -0,0 +1,381 @@ @@ -295405,7 +295405,7 @@ index 000000000000..750fda2cd81d +#endif /* _KBASE_HWACCESS_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_pm.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_pm.h new file mode 100755 -index 000000000000..71c7d495c40a +index 000000000..71c7d495c --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_pm.h @@ -0,0 +1,209 @@ @@ -295620,7 +295620,7 @@ index 000000000000..71c7d495c40a +#endif /* _KBASE_HWACCESS_PM_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_time.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_time.h new file mode 100755 -index 000000000000..b9fe8e669c63 +index 000000000..b9fe8e669 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwaccess_time.h @@ -0,0 +1,53 @@ @@ -295679,7 +295679,7 @@ index 000000000000..b9fe8e669c63 +#endif /* _KBASE_BACKEND_TIME_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwcnt_reader.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwcnt_reader.h new file mode 100755 -index 000000000000..cf7bf1b35dc5 +index 000000000..cf7bf1b35 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_hwcnt_reader.h @@ -0,0 +1,66 @@ @@ -295751,7 +295751,7 @@ index 000000000000..cf7bf1b35dc5 + diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_ioctl.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_ioctl.h new file mode 100755 -index 000000000000..e7c1daee470b +index 000000000..e7c1daee4 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_ioctl.h @@ -0,0 +1,658 @@ @@ -296415,7 +296415,7 @@ index 000000000000..e7c1daee470b +#endif diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd.c new file mode 100755 -index 000000000000..144ebfcdfc59 +index 000000000..144ebfcdf --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd.c @@ -0,0 +1,1847 @@ @@ -298268,7 +298268,7 @@ index 000000000000..144ebfcdfc59 +KBASE_EXPORT_TEST_API(kbase_jd_exit); diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd_debugfs.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd_debugfs.c new file mode 100755 -index 000000000000..fed4ad5816ab +index 000000000..fed4ad581 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd_debugfs.c @@ -0,0 +1,235 @@ @@ -298509,7 +298509,7 @@ index 000000000000..fed4ad5816ab +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd_debugfs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd_debugfs.h new file mode 100755 -index 000000000000..fae32919b22f +index 000000000..fae32919b --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jd_debugfs.h @@ -0,0 +1,40 @@ @@ -298555,7 +298555,7 @@ index 000000000000..fae32919b22f +#endif /*_KBASE_JD_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jm.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jm.c new file mode 100755 -index 000000000000..0c5c6a6f78cb +index 000000000..0c5c6a6f7 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jm.c @@ -0,0 +1,131 @@ @@ -298692,7 +298692,7 @@ index 000000000000..0c5c6a6f78cb + diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jm.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jm.h new file mode 100755 -index 000000000000..a74ee24c8058 +index 000000000..a74ee24c8 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_jm.h @@ -0,0 +1,110 @@ @@ -298808,7 +298808,7 @@ index 000000000000..a74ee24c8058 +#endif /* _KBASE_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js.c new file mode 100755 -index 000000000000..677e438aedfa +index 000000000..677e438ae --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js.c @@ -0,0 +1,2798 @@ @@ -301612,7 +301612,7 @@ index 000000000000..677e438aedfa +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js.h new file mode 100755 -index 000000000000..ddada8e468a1 +index 000000000..ddada8e46 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js.h @@ -0,0 +1,925 @@ @@ -302543,7 +302543,7 @@ index 000000000000..ddada8e468a1 +#endif /* _KBASE_JS_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_ctx_attr.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_ctx_attr.c new file mode 100755 -index 000000000000..321506ada835 +index 000000000..321506ada --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_ctx_attr.c @@ -0,0 +1,301 @@ @@ -302850,7 +302850,7 @@ index 000000000000..321506ada835 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_ctx_attr.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_ctx_attr.h new file mode 100755 -index 000000000000..ce9183326a57 +index 000000000..ce9183326 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_ctx_attr.h @@ -0,0 +1,158 @@ @@ -303014,7 +303014,7 @@ index 000000000000..ce9183326a57 +#endif /* _KBASE_JS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_defs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_defs.h new file mode 100755 -index 000000000000..0b4890d6b50e +index 000000000..0b4890d6b --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_js_defs.h @@ -0,0 +1,386 @@ @@ -303406,7 +303406,7 @@ index 000000000000..0b4890d6b50e +#endif /* _KBASE_JS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_linux.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_linux.h new file mode 100755 -index 000000000000..6d1e61fd41e0 +index 000000000..6d1e61fd4 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_linux.h @@ -0,0 +1,43 @@ @@ -303455,7 +303455,7 @@ index 000000000000..6d1e61fd41e0 +#endif /* _KBASE_LINUX_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem.c new file mode 100755 -index 000000000000..a105b15d641c +index 000000000..a105b15d6 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem.c @@ -0,0 +1,2875 @@ @@ -306336,7 +306336,7 @@ index 000000000000..a105b15d641c +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem.h new file mode 100755 -index 000000000000..f2fd75e2018b +index 000000000..f2fd75e20 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem.h @@ -0,0 +1,1142 @@ @@ -307484,7 +307484,7 @@ index 000000000000..f2fd75e2018b +#endif /* _KBASE_MEM_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_linux.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_linux.c new file mode 100755 -index 000000000000..842444c9b0bd +index 000000000..842444c9b --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_linux.c @@ -0,0 +1,2678 @@ @@ -310168,7 +310168,7 @@ index 000000000000..842444c9b0bd + diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_linux.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_linux.h new file mode 100755 -index 000000000000..db35f62a7431 +index 000000000..db35f62a7 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_linux.h @@ -0,0 +1,240 @@ @@ -310414,7 +310414,7 @@ index 000000000000..db35f62a7431 +#endif /* _KBASE_MEM_LINUX_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_lowlevel.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_lowlevel.h new file mode 100755 -index 000000000000..f4e88491327e +index 000000000..f4e884913 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_lowlevel.h @@ -0,0 +1,89 @@ @@ -310509,7 +310509,7 @@ index 000000000000..f4e88491327e +#endif /* _KBASE_LOWLEVEL_H */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool.c new file mode 100755 -index 000000000000..696730ac5b2b +index 000000000..696730ac5 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool.c @@ -0,0 +1,651 @@ @@ -311166,7 +311166,7 @@ index 000000000000..696730ac5b2b +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool_debugfs.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool_debugfs.c new file mode 100755 -index 000000000000..319cf2568aba +index 000000000..319cf2568 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool_debugfs.c @@ -0,0 +1,88 @@ @@ -311260,7 +311260,7 @@ index 000000000000..319cf2568aba +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool_debugfs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool_debugfs.h new file mode 100755 -index 000000000000..496eaf3f1e1a +index 000000000..496eaf3f1 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_pool_debugfs.h @@ -0,0 +1,40 @@ @@ -311306,7 +311306,7 @@ index 000000000000..496eaf3f1e1a + diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs.c new file mode 100755 -index 000000000000..d58fd8d62fde +index 000000000..d58fd8d62 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs.c @@ -0,0 +1,121 @@ @@ -311433,7 +311433,7 @@ index 000000000000..d58fd8d62fde +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs.h new file mode 100755 -index 000000000000..a1dc2e0b165b +index 000000000..a1dc2e0b1 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs.h @@ -0,0 +1,59 @@ @@ -311498,7 +311498,7 @@ index 000000000000..a1dc2e0b165b + diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs_buf_size.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs_buf_size.h new file mode 100755 -index 000000000000..82f0702974c2 +index 000000000..82f070297 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mem_profile_debugfs_buf_size.h @@ -0,0 +1,33 @@ @@ -311537,7 +311537,7 @@ index 000000000000..82f0702974c2 + diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu.c new file mode 100755 -index 000000000000..c63269aed53c +index 000000000..c63269aed --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu.c @@ -0,0 +1,2138 @@ @@ -313681,7 +313681,7 @@ index 000000000000..c63269aed53c +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_hw.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_hw.h new file mode 100755 -index 000000000000..986e959e9a0c +index 000000000..986e959e9 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_hw.h @@ -0,0 +1,123 @@ @@ -313810,7 +313810,7 @@ index 000000000000..986e959e9a0c +#endif /* _MALI_KBASE_MMU_HW_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_mode_aarch64.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_mode_aarch64.c new file mode 100755 -index 000000000000..0fb717b67af9 +index 000000000..0fb717b67 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_mode_aarch64.c @@ -0,0 +1,214 @@ @@ -314030,7 +314030,7 @@ index 000000000000..0fb717b67af9 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_mode_lpae.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_mode_lpae.c new file mode 100755 -index 000000000000..f080fdc0be88 +index 000000000..f080fdc0b --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_mmu_mode_lpae.c @@ -0,0 +1,199 @@ @@ -314235,7 +314235,7 @@ index 000000000000..f080fdc0be88 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_platform_fake.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_platform_fake.c new file mode 100755 -index 000000000000..0152b35f711b +index 000000000..0152b35f7 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_platform_fake.c @@ -0,0 +1,119 @@ @@ -314360,7 +314360,7 @@ index 000000000000..0152b35f711b +EXPORT_SYMBOL(kbase_platform_unregister); diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_pm.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_pm.c new file mode 100755 -index 000000000000..97d543464c28 +index 000000000..97d543464 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_pm.c @@ -0,0 +1,205 @@ @@ -314571,7 +314571,7 @@ index 000000000000..97d543464c28 + diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_pm.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_pm.h new file mode 100755 -index 000000000000..37fa2479df74 +index 000000000..37fa2479d --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_pm.h @@ -0,0 +1,171 @@ @@ -314748,7 +314748,7 @@ index 000000000000..37fa2479df74 +#endif /* _KBASE_PM_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_profiling_gator_api.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_profiling_gator_api.h new file mode 100755 -index 000000000000..7fb674eded37 +index 000000000..7fb674ede --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_profiling_gator_api.h @@ -0,0 +1,40 @@ @@ -314794,7 +314794,7 @@ index 000000000000..7fb674eded37 +#endif /* _KBASE_PROFILING_GATOR_API */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_regs_history_debugfs.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_regs_history_debugfs.c new file mode 100755 -index 000000000000..9e73f9f4999e +index 000000000..9e73f9f49 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_regs_history_debugfs.c @@ -0,0 +1,130 @@ @@ -314930,7 +314930,7 @@ index 000000000000..9e73f9f4999e +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_regs_history_debugfs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_regs_history_debugfs.h new file mode 100755 -index 000000000000..fbb36b3f22e4 +index 000000000..fbb36b3f2 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_regs_history_debugfs.h @@ -0,0 +1,50 @@ @@ -314986,7 +314986,7 @@ index 000000000000..fbb36b3f22e4 +#endif /*_KBASE_REGS_HISTORY_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_replay.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_replay.c new file mode 100755 -index 000000000000..9f4dc372770d +index 000000000..9f4dc3727 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_replay.c @@ -0,0 +1,1166 @@ @@ -316158,7 +316158,7 @@ index 000000000000..9f4dc372770d +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_smc.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_smc.c new file mode 100755 -index 000000000000..43175c85988f +index 000000000..43175c859 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_smc.c @@ -0,0 +1,74 @@ @@ -316238,7 +316238,7 @@ index 000000000000..43175c85988f + diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_smc.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_smc.h new file mode 100755 -index 000000000000..9bff3d2e8b4d +index 000000000..9bff3d2e8 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_smc.h @@ -0,0 +1,67 @@ @@ -316311,7 +316311,7 @@ index 000000000000..9bff3d2e8b4d +#endif /* _KBASE_SMC_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_softjobs.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_softjobs.c new file mode 100755 -index 000000000000..c24b94e0d6eb +index 000000000..c24b94e0d --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_softjobs.c @@ -0,0 +1,1513 @@ @@ -317830,7 +317830,7 @@ index 000000000000..c24b94e0d6eb +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_strings.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_strings.c new file mode 100755 -index 000000000000..c98762cec244 +index 000000000..c98762cec --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_strings.c @@ -0,0 +1,23 @@ @@ -317859,7 +317859,7 @@ index 000000000000..c98762cec244 +const char kbase_timeline_name[] = KBASE_TIMELINE_NAME; diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_strings.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_strings.h new file mode 100755 -index 000000000000..41b8fdbec6a4 +index 000000000..41b8fdbec --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_strings.h @@ -0,0 +1,19 @@ @@ -317884,7 +317884,7 @@ index 000000000000..41b8fdbec6a4 +extern const char kbase_timeline_name[]; diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync.h new file mode 100755 -index 000000000000..54159262314a +index 000000000..541592623 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync.h @@ -0,0 +1,203 @@ @@ -318093,7 +318093,7 @@ index 000000000000..54159262314a +#endif /* MALI_KBASE_SYNC_H */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_android.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_android.c new file mode 100755 -index 000000000000..e4528e2b9f25 +index 000000000..e4528e2b9 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_android.c @@ -0,0 +1,537 @@ @@ -318636,7 +318636,7 @@ index 000000000000..e4528e2b9f25 +#endif diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_common.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_common.c new file mode 100755 -index 000000000000..457def296684 +index 000000000..457def296 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_common.c @@ -0,0 +1,43 @@ @@ -318685,7 +318685,7 @@ index 000000000000..457def296684 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_file.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_file.c new file mode 100755 -index 000000000000..509c0666f10f +index 000000000..509c0666f --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_sync_file.c @@ -0,0 +1,348 @@ @@ -319039,7 +319039,7 @@ index 000000000000..509c0666f10f +#endif diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_tlstream.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_tlstream.c new file mode 100755 -index 000000000000..485565ebfe80 +index 000000000..485565ebf --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_tlstream.c @@ -0,0 +1,2569 @@ @@ -321614,7 +321614,7 @@ index 000000000000..485565ebfe80 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_tlstream.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_tlstream.h new file mode 100755 -index 000000000000..c0a1117d5f25 +index 000000000..c0a1117d5 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_tlstream.h @@ -0,0 +1,623 @@ @@ -322243,7 +322243,7 @@ index 000000000000..c0a1117d5f25 + diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_defs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_defs.h new file mode 100755 -index 000000000000..e2e0544208ce +index 000000000..e2e054420 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_defs.h @@ -0,0 +1,264 @@ @@ -322513,7 +322513,7 @@ index 000000000000..e2e0544208ce +/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline.c new file mode 100755 -index 000000000000..d9854749f45b +index 000000000..d9854749f --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline.c @@ -0,0 +1,236 @@ @@ -322755,7 +322755,7 @@ index 000000000000..d9854749f45b +#endif /* CONFIG_MALI_BIFROST_TRACE_TIMELINE */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline.h new file mode 100755 -index 000000000000..4b517f396f8c +index 000000000..4b517f396 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline.h @@ -0,0 +1,363 @@ @@ -323124,7 +323124,7 @@ index 000000000000..4b517f396f8c + diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline_defs.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline_defs.h new file mode 100755 -index 000000000000..156a95a67f4a +index 000000000..156a95a67 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_trace_timeline_defs.h @@ -0,0 +1,140 @@ @@ -323270,7 +323270,7 @@ index 000000000000..156a95a67f4a +"_tgid,job_slot,_producerof_atom_number_completed") diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_uku.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_uku.h new file mode 100755 -index 000000000000..cf8ee0572dc5 +index 000000000..cf8ee0572 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_uku.h @@ -0,0 +1,532 @@ @@ -323808,7 +323808,7 @@ index 000000000000..cf8ee0572dc5 + diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_utility.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_utility.c new file mode 100755 -index 000000000000..be474ff87401 +index 000000000..be474ff87 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_utility.c @@ -0,0 +1,33 @@ @@ -323847,7 +323847,7 @@ index 000000000000..be474ff87401 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_utility.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_utility.h new file mode 100755 -index 000000000000..fd7252dab0de +index 000000000..fd7252dab --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_utility.h @@ -0,0 +1,37 @@ @@ -323890,7 +323890,7 @@ index 000000000000..fd7252dab0de +#endif /* _KBASE_UTILITY_H */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_vinstr.c b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_vinstr.c new file mode 100755 -index 000000000000..9c5b2e46c0e5 +index 000000000..9c5b2e46c --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_vinstr.c @@ -0,0 +1,2072 @@ @@ -325968,7 +325968,7 @@ index 000000000000..9c5b2e46c0e5 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_kbase_vinstr.h b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_vinstr.h new file mode 100755 -index 000000000000..6207d25aef06 +index 000000000..6207d25ae --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_kbase_vinstr.h @@ -0,0 +1,155 @@ @@ -326129,7 +326129,7 @@ index 000000000000..6207d25aef06 + diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_linux_kbase_trace.h b/drivers/gpu/arm/bifrost_for_linux/mali_linux_kbase_trace.h new file mode 100755 -index 000000000000..5d6b4021d626 +index 000000000..5d6b4021d --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_linux_kbase_trace.h @@ -0,0 +1,201 @@ @@ -326336,7 +326336,7 @@ index 000000000000..5d6b4021d626 +#include diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_linux_trace.h b/drivers/gpu/arm/bifrost_for_linux/mali_linux_trace.h new file mode 100755 -index 000000000000..2be06a552768 +index 000000000..2be06a552 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_linux_trace.h @@ -0,0 +1,189 @@ @@ -326531,7 +326531,7 @@ index 000000000000..2be06a552768 +#include diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_malisw.h b/drivers/gpu/arm/bifrost_for_linux/mali_malisw.h new file mode 100755 -index 000000000000..99452933eab4 +index 000000000..99452933e --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_malisw.h @@ -0,0 +1,131 @@ @@ -326668,7 +326668,7 @@ index 000000000000..99452933eab4 +#endif /* _MALISW_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_midg_coherency.h b/drivers/gpu/arm/bifrost_for_linux/mali_midg_coherency.h new file mode 100755 -index 000000000000..a509cbd5f175 +index 000000000..a509cbd5f --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_midg_coherency.h @@ -0,0 +1,26 @@ @@ -326700,7 +326700,7 @@ index 000000000000..a509cbd5f175 +#endif /* _MIDG_COHERENCY_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_midg_regmap.h b/drivers/gpu/arm/bifrost_for_linux/mali_midg_regmap.h new file mode 100755 -index 000000000000..554ed8dcb3eb +index 000000000..554ed8dcb --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_midg_regmap.h @@ -0,0 +1,611 @@ @@ -327317,7 +327317,7 @@ index 000000000000..554ed8dcb3eb +#endif /* _MIDGARD_REGMAP_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_timeline.h b/drivers/gpu/arm/bifrost_for_linux/mali_timeline.h new file mode 100755 -index 000000000000..bd5f6614b6bb +index 000000000..bd5f6614b --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_timeline.h @@ -0,0 +1,396 @@ @@ -327719,7 +327719,7 @@ index 000000000000..bd5f6614b6bb + diff --git a/drivers/gpu/arm/bifrost_for_linux/mali_uk.h b/drivers/gpu/arm/bifrost_for_linux/mali_uk.h new file mode 100755 -index 000000000000..841d03fb5873 +index 000000000..841d03fb5 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/mali_uk.h @@ -0,0 +1,141 @@ @@ -327866,7 +327866,7 @@ index 000000000000..841d03fb5873 +#endif /* _UK_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/Kconfig b/drivers/gpu/arm/bifrost_for_linux/platform/Kconfig new file mode 100755 -index 000000000000..38835d3d1531 +index 000000000..38835d3d1 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/Kconfig @@ -0,0 +1,24 @@ @@ -327896,7 +327896,7 @@ index 000000000000..38835d3d1531 + diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/Kbuild b/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/Kbuild new file mode 100755 -index 000000000000..d40d7982ff04 +index 000000000..d40d7982f --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/Kbuild @@ -0,0 +1,18 @@ @@ -327920,7 +327920,7 @@ index 000000000000..d40d7982ff04 + $(MALI_PLATFORM_DIR)/mali_kbase_runtime_pm.o diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_config_devicetree.c b/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_config_devicetree.c new file mode 100755 -index 000000000000..29ccc29e4125 +index 000000000..29ccc29e4 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_config_devicetree.c @@ -0,0 +1,40 @@ @@ -327966,7 +327966,7 @@ index 000000000000..29ccc29e4125 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_config_platform.h new file mode 100755 -index 000000000000..2ceca34945b9 +index 000000000..2ceca3494 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_config_platform.h @@ -0,0 +1,80 @@ @@ -328052,7 +328052,7 @@ index 000000000000..2ceca34945b9 +#define AUTO_SUSPEND_DELAY (100) diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_runtime_pm.c b/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_runtime_pm.c new file mode 100755 -index 000000000000..9fe37c8d835e +index 000000000..9fe37c8d8 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/devicetree/mali_kbase_runtime_pm.c @@ -0,0 +1,121 @@ @@ -328179,7 +328179,7 @@ index 000000000000..9fe37c8d835e + diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/mali_kbase_platform_common.h b/drivers/gpu/arm/bifrost_for_linux/platform/mali_kbase_platform_common.h new file mode 100755 -index 000000000000..7cb3be7f78ce +index 000000000..7cb3be7f7 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/mali_kbase_platform_common.h @@ -0,0 +1,26 @@ @@ -328211,7 +328211,7 @@ index 000000000000..7cb3be7f78ce +int kbase_platform_early_init(void); diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/rk/Kbuild b/drivers/gpu/arm/bifrost_for_linux/platform/rk/Kbuild new file mode 100755 -index 000000000000..7cc6c59d969f +index 000000000..7cc6c59d9 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/rk/Kbuild @@ -0,0 +1,17 @@ @@ -328234,7 +328234,7 @@ index 000000000000..7cc6c59d969f + diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/rk/custom_log.h b/drivers/gpu/arm/bifrost_for_linux/platform/rk/custom_log.h new file mode 100755 -index 000000000000..5de70ee13d25 +index 000000000..5de70ee13 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/rk/custom_log.h @@ -0,0 +1,192 @@ @@ -328432,7 +328432,7 @@ index 000000000000..5de70ee13d25 +#endif /* __CUSTOM_LOG_H__ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_config_platform.h new file mode 100755 -index 000000000000..07c5b6f8a760 +index 000000000..07c5b6f8a --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_config_platform.h @@ -0,0 +1,88 @@ @@ -328526,7 +328526,7 @@ index 000000000000..07c5b6f8a760 + diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_config_rk.c b/drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_config_rk.c new file mode 100755 -index 000000000000..926c2dd3f8c9 +index 000000000..926c2dd3f --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_config_rk.c @@ -0,0 +1,459 @@ @@ -328991,7 +328991,7 @@ index 000000000000..926c2dd3f8c9 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_rk.h b/drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_rk.h new file mode 100755 -index 000000000000..6eab25014d21 +index 000000000..6eab25014 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/rk/mali_kbase_rk.h @@ -0,0 +1,62 @@ @@ -329059,7 +329059,7 @@ index 000000000000..6eab25014d21 + diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/Kbuild b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/Kbuild new file mode 100755 -index 000000000000..d9d5e9085231 +index 000000000..d9d5e9085 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/Kbuild @@ -0,0 +1,19 @@ @@ -329084,7 +329084,7 @@ index 000000000000..d9d5e9085231 + mali_kbase_platform_fake.o diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_config_platform.h new file mode 100755 -index 000000000000..02835f129aa3 +index 000000000..02835f129 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_config_platform.h @@ -0,0 +1,75 @@ @@ -329165,7 +329165,7 @@ index 000000000000..02835f129aa3 +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_config_vexpress.c new file mode 100755 -index 000000000000..15ce2bc5eea5 +index 000000000..15ce2bc5e --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_config_vexpress.c @@ -0,0 +1,85 @@ @@ -329256,7 +329256,7 @@ index 000000000000..15ce2bc5eea5 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_cpu_vexpress.c b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_cpu_vexpress.c new file mode 100755 -index 000000000000..4665f98cbbe4 +index 000000000..4665f98cb --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_cpu_vexpress.c @@ -0,0 +1,279 @@ @@ -329541,7 +329541,7 @@ index 000000000000..4665f98cbbe4 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_cpu_vexpress.h b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_cpu_vexpress.h new file mode 100755 -index 000000000000..da865698133a +index 000000000..da8656981 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress/mali_kbase_cpu_vexpress.h @@ -0,0 +1,38 @@ @@ -329585,7 +329585,7 @@ index 000000000000..da865698133a +#endif /* _KBASE_CPU_VEXPRESS_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/Kbuild b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/Kbuild new file mode 100755 -index 000000000000..df87c74f43ba +index 000000000..df87c74f4 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/Kbuild @@ -0,0 +1,18 @@ @@ -329609,7 +329609,7 @@ index 000000000000..df87c74f43ba + mali_kbase_platform_fake.o diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h new file mode 100755 -index 000000000000..0efbf3962f98 +index 000000000..0efbf3962 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h @@ -0,0 +1,73 @@ @@ -329688,7 +329688,7 @@ index 000000000000..0efbf3962f98 +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c new file mode 100755 -index 000000000000..3ff0930fb4a3 +index 000000000..3ff0930fb --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c @@ -0,0 +1,79 @@ @@ -329773,7 +329773,7 @@ index 000000000000..3ff0930fb4a3 +} diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/Kbuild b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/Kbuild new file mode 100755 -index 000000000000..d9d5e9085231 +index 000000000..d9d5e9085 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/Kbuild @@ -0,0 +1,19 @@ @@ -329798,7 +329798,7 @@ index 000000000000..d9d5e9085231 + mali_kbase_platform_fake.o diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h new file mode 100755 -index 000000000000..dbdf21e009f9 +index 000000000..dbdf21e00 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h @@ -0,0 +1,75 @@ @@ -329879,7 +329879,7 @@ index 000000000000..dbdf21e009f9 +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c new file mode 100755 -index 000000000000..76ffe4a1e59e +index 000000000..76ffe4a1e --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c @@ -0,0 +1,83 @@ @@ -329968,7 +329968,7 @@ index 000000000000..76ffe4a1e59e + diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c new file mode 100755 -index 000000000000..816dff49835f +index 000000000..816dff498 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c @@ -0,0 +1,71 @@ @@ -330045,7 +330045,7 @@ index 000000000000..816dff49835f +} diff --git a/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h new file mode 100755 -index 000000000000..23647ccb0871 +index 000000000..23647ccb0 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h @@ -0,0 +1,28 @@ @@ -330079,7 +330079,7 @@ index 000000000000..23647ccb0871 +#endif /* _KBASE_CPU_VEXPRESS_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/platform_dummy/mali_ukk_os.h b/drivers/gpu/arm/bifrost_for_linux/platform_dummy/mali_ukk_os.h new file mode 100755 -index 000000000000..5fa9b39c4bc0 +index 000000000..5fa9b39c4 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/platform_dummy/mali_ukk_os.h @@ -0,0 +1,53 @@ @@ -330138,7 +330138,7 @@ index 000000000000..5fa9b39c4bc0 +#endif /* _UKK_OS_H__ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/protected_mode_switcher.h b/drivers/gpu/arm/bifrost_for_linux/protected_mode_switcher.h new file mode 100755 -index 000000000000..5dc2f3ba8cf6 +index 000000000..5dc2f3ba8 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/protected_mode_switcher.h @@ -0,0 +1,64 @@ @@ -330208,7 +330208,7 @@ index 000000000000..5dc2f3ba8cf6 +#endif /* _PROTECTED_MODE_SWITCH_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/sconscript b/drivers/gpu/arm/bifrost_for_linux/sconscript new file mode 100755 -index 000000000000..e738dd7a3869 +index 000000000..e738dd7a3 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/sconscript @@ -0,0 +1,72 @@ @@ -330286,7 +330286,7 @@ index 000000000000..e738dd7a3869 +env.AppendUnique(BASE=['cutils_linked_list']) diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/Kbuild b/drivers/gpu/arm/bifrost_for_linux/tests/Kbuild new file mode 100755 -index 000000000000..b4bed0473439 +index 000000000..b4bed0473 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/Kbuild @@ -0,0 +1,17 @@ @@ -330309,7 +330309,7 @@ index 000000000000..b4bed0473439 +obj-$(CONFIG_MALI_IRQ_LATENCY) += mali_kutf_irq_test/ diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/Kconfig b/drivers/gpu/arm/bifrost_for_linux/tests/Kconfig new file mode 100755 -index 000000000000..da0515c065de +index 000000000..da0515c06 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/Kconfig @@ -0,0 +1,17 @@ @@ -330332,7 +330332,7 @@ index 000000000000..da0515c065de +source "drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig" diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_helpers.h b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_helpers.h new file mode 100755 -index 000000000000..3f1dfc244d30 +index 000000000..3f1dfc244 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_helpers.h @@ -0,0 +1,216 @@ @@ -330554,7 +330554,7 @@ index 000000000000..3f1dfc244d30 +#endif /* _KERNEL_UTF_HELPERS_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_helpers_user.h b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_helpers_user.h new file mode 100755 -index 000000000000..759bf717c7cd +index 000000000..759bf717c --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_helpers_user.h @@ -0,0 +1,179 @@ @@ -330739,7 +330739,7 @@ index 000000000000..759bf717c7cd +#endif /* _KERNEL_UTF_HELPERS_USER_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_mem.h b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_mem.h new file mode 100755 -index 000000000000..584c9dd4bc13 +index 000000000..584c9dd4b --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_mem.h @@ -0,0 +1,68 @@ @@ -330813,7 +330813,7 @@ index 000000000000..584c9dd4bc13 +#endif /* _KERNEL_UTF_MEM_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_resultset.h b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_resultset.h new file mode 100755 -index 000000000000..1cc85f1b7a46 +index 000000000..1cc85f1b7 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_resultset.h @@ -0,0 +1,121 @@ @@ -330940,7 +330940,7 @@ index 000000000000..1cc85f1b7a46 +#endif /* _KERNEL_UTF_RESULTSET_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_suite.h b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_suite.h new file mode 100755 -index 000000000000..cba2b2d84d62 +index 000000000..cba2b2d84 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_suite.h @@ -0,0 +1,568 @@ @@ -331514,7 +331514,7 @@ index 000000000000..cba2b2d84d62 +#endif /* _KERNEL_UTF_SUITE_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_utils.h b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_utils.h new file mode 100755 -index 000000000000..c458c1f73802 +index 000000000..c458c1f73 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/include/kutf/kutf_utils.h @@ -0,0 +1,55 @@ @@ -331575,7 +331575,7 @@ index 000000000000..c458c1f73802 +#endif /* _KERNEL_UTF_UTILS_H_ */ diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/Kbuild b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/Kbuild new file mode 100755 -index 000000000000..97f80057224f +index 000000000..97f800572 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/Kbuild @@ -0,0 +1,20 @@ @@ -331601,7 +331601,7 @@ index 000000000000..97f80057224f +kutf-y := kutf_mem.o kutf_resultset.o kutf_suite.o kutf_utils.o kutf_helpers.o kutf_helpers_user.o diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/Kconfig b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/Kconfig new file mode 100755 -index 000000000000..6a87bdbf746e +index 000000000..6a87bdbf7 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/Kconfig @@ -0,0 +1,22 @@ @@ -331629,7 +331629,7 @@ index 000000000000..6a87bdbf746e + choose M here - this will generate a single module called kutf. diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/Makefile b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/Makefile new file mode 100755 -index 000000000000..010c92ca39b9 +index 000000000..010c92ca3 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/Makefile @@ -0,0 +1,29 @@ @@ -331664,7 +331664,7 @@ index 000000000000..010c92ca39b9 + $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_helpers.c b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_helpers.c new file mode 100755 -index 000000000000..793d58c789ff +index 000000000..793d58c78 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_helpers.c @@ -0,0 +1,768 @@ @@ -332438,7 +332438,7 @@ index 000000000000..793d58c789ff +EXPORT_SYMBOL(kutf_helper_textbuf_userdata_ops); diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_helpers_user.c b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_helpers_user.c new file mode 100755 -index 000000000000..cf3b00563c5f +index 000000000..cf3b00563 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_helpers_user.c @@ -0,0 +1,460 @@ @@ -332904,7 +332904,7 @@ index 000000000000..cf3b00563c5f +EXPORT_SYMBOL(kutf_helper_output_named_val); diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_mem.c b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_mem.c new file mode 100755 -index 000000000000..a75e15fde05f +index 000000000..a75e15fde --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_mem.c @@ -0,0 +1,102 @@ @@ -333012,7 +333012,7 @@ index 000000000000..a75e15fde05f +EXPORT_SYMBOL(kutf_mempool_alloc); diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_resultset.c b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_resultset.c new file mode 100755 -index 000000000000..5bd04969fd55 +index 000000000..5bd04969f --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_resultset.c @@ -0,0 +1,95 @@ @@ -333113,7 +333113,7 @@ index 000000000000..5bd04969fd55 + diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_suite.c b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_suite.c new file mode 100755 -index 000000000000..ad30cc86a3b0 +index 000000000..ad30cc86a --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_suite.c @@ -0,0 +1,1398 @@ @@ -334517,7 +334517,7 @@ index 000000000000..ad30cc86a3b0 +module_exit(exit_kutf_core); diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_utils.c b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_utils.c new file mode 100755 -index 000000000000..a429a2dbf788 +index 000000000..a429a2dbf --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/kutf_utils.c @@ -0,0 +1,71 @@ @@ -334594,7 +334594,7 @@ index 000000000000..a429a2dbf788 +EXPORT_SYMBOL(kutf_dsprintf); diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/kutf/sconscript b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/sconscript new file mode 100755 -index 000000000000..d7f112448e42 +index 000000000..d7f112448 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/kutf/sconscript @@ -0,0 +1,21 @@ @@ -334621,7 +334621,7 @@ index 000000000000..d7f112448e42 +kutf_env.KernelObjTarget('kutf', mod) diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Kbuild b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Kbuild new file mode 100755 -index 000000000000..0cd9cebe9d8b +index 000000000..0cd9cebe9 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Kbuild @@ -0,0 +1,20 @@ @@ -334647,7 +334647,7 @@ index 000000000000..0cd9cebe9d8b +mali_kutf_irq_test-y := mali_kutf_irq_test_main.o diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Kconfig b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Kconfig new file mode 100755 -index 000000000000..4caa8ec8a0e2 +index 000000000..4caa8ec8a --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Kconfig @@ -0,0 +1,23 @@ @@ -334676,7 +334676,7 @@ index 000000000000..4caa8ec8a0e2 + Choosing M here will generate a single module called mali_kutf_irq_test. diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Makefile b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Makefile new file mode 100755 -index 000000000000..ced37b08e532 +index 000000000..ced37b08e --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/Makefile @@ -0,0 +1,47 @@ @@ -334729,7 +334729,7 @@ index 000000000000..ced37b08e532 + $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c new file mode 100755 -index 000000000000..c9cc4447cf37 +index 000000000..c9cc4447c --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c @@ -0,0 +1,269 @@ @@ -335004,7 +335004,7 @@ index 000000000000..c9cc4447cf37 +MODULE_VERSION("1.0"); diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/sconscript b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/sconscript new file mode 100755 -index 000000000000..b06d9ea32924 +index 000000000..b06d9ea32 --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/mali_kutf_irq_test/sconscript @@ -0,0 +1,30 @@ @@ -335040,7 +335040,7 @@ index 000000000000..b06d9ea32924 + env.KernelObjTarget('mali_kutf_irq_test', cmd) diff --git a/drivers/gpu/arm/bifrost_for_linux/tests/sconscript b/drivers/gpu/arm/bifrost_for_linux/tests/sconscript new file mode 100755 -index 000000000000..04584117ccef +index 000000000..04584117c --- /dev/null +++ b/drivers/gpu/arm/bifrost_for_linux/tests/sconscript @@ -0,0 +1,38 @@ @@ -335084,14 +335084,14 @@ index 000000000000..04584117ccef + SConscript('mali_kutf_vinstr_test/sconscript') diff --git a/drivers/gpu/arm/mali400/.gitignore b/drivers/gpu/arm/mali400/.gitignore new file mode 100755 -index 000000000000..d91c8078a009 +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 +index 000000000..dbb7ad3e5 --- /dev/null +++ b/drivers/gpu/arm/mali400/Kbuild @@ -0,0 +1,2 @@ @@ -335099,14 +335099,14 @@ index 000000000000..dbb7ad3e5d85 +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 +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 +index 000000000..7390ab758 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/Kbuild @@ -0,0 +1,254 @@ @@ -335366,7 +335366,7 @@ index 000000000000..7390ab758f22 + @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..34c5f72edcda +index 000000000..34c5f72ed --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/Kconfig @@ -0,0 +1,118 @@ @@ -335490,7 +335490,7 @@ index 000000000000..34c5f72edcda + 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 +index 000000000..0b91321a5 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/Makefile @@ -0,0 +1,206 @@ @@ -335702,7 +335702,7 @@ index 000000000000..0b91321a5af1 +export CONFIG KBUILD_EXTRA_SYMBOLS diff --git a/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c new file mode 100755 -index 000000000000..79a418c36ccb +index 000000000..79a418c36 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c @@ -0,0 +1,142 @@ @@ -335850,7 +335850,7 @@ index 000000000000..79a418c36ccb +} 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 +index 000000000..0475b7171 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.h @@ -0,0 +1,57 @@ @@ -335913,7 +335913,7 @@ index 000000000000..0475b7171d8d +#endif /* __MALI_BROADCAST_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c new file mode 100755 -index 000000000000..5bed27a8c5c9 +index 000000000..5bed27a8c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c @@ -0,0 +1,139 @@ @@ -336058,7 +336058,7 @@ index 000000000000..5bed27a8c5c9 +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h new file mode 100755 -index 000000000000..c9e6e058ea8e +index 000000000..c9e6e058e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h @@ -0,0 +1,30 @@ @@ -336094,7 +336094,7 @@ index 000000000000..c9e6e058ea8e + 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 +index 000000000..99b7f3607 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.c @@ -0,0 +1,213 @@ @@ -336313,7 +336313,7 @@ index 000000000000..99b7f360768b +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h new file mode 100755 -index 000000000000..a7ecf41471d8 +index 000000000..a7ecf4147 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h @@ -0,0 +1,45 @@ @@ -336364,7 +336364,7 @@ index 000000000000..a7ecf41471d8 +#endif /* __MALI_DLBU_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c new file mode 100755 -index 000000000000..55b21a410754 +index 000000000..55b21a410 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c @@ -0,0 +1,308 @@ @@ -336678,7 +336678,7 @@ index 000000000000..55b21a410754 + 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 +index 000000000..662348c4e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.h @@ -0,0 +1,34 @@ @@ -336718,7 +336718,7 @@ index 000000000000..662348c4e6ac +#endif/* __MALI_DVFS_POLICY_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_executor.c b/drivers/gpu/arm/mali400/mali/common/mali_executor.c new file mode 100755 -index 000000000000..ee40520ed0ce +index 000000000..ee40520ed --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_executor.c @@ -0,0 +1,2707 @@ @@ -339431,7 +339431,7 @@ index 000000000000..ee40520ed0ce +} 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 +index 000000000..4224d6a6c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_executor.h @@ -0,0 +1,102 @@ @@ -339539,7 +339539,7 @@ index 000000000000..4224d6a6cdc4 +#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 +index 000000000..7d3d4aff7 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp.c @@ -0,0 +1,357 @@ @@ -339902,7 +339902,7 @@ index 000000000000..7d3d4aff7c3f +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp.h b/drivers/gpu/arm/mali400/mali/common/mali_gp.h new file mode 100755 -index 000000000000..3156310f21c7 +index 000000000..3156310f2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp.h @@ -0,0 +1,127 @@ @@ -340035,7 +340035,7 @@ index 000000000000..3156310f21c7 +#endif /* __MALI_GP_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c new file mode 100755 -index 000000000000..5d4d9f2530d3 +index 000000000..5d4d9f253 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c @@ -0,0 +1,306 @@ @@ -340347,7 +340347,7 @@ index 000000000000..5d4d9f2530d3 +} 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 +index 000000000..b84333f9f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.h @@ -0,0 +1,324 @@ @@ -340677,7 +340677,7 @@ index 000000000000..b84333f9f810 +#endif /* __MALI_GP_JOB_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_group.c b/drivers/gpu/arm/mali400/mali/common/mali_group.c new file mode 100755 -index 000000000000..47979a2f1a35 +index 000000000..47979a2f1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_group.c @@ -0,0 +1,1875 @@ @@ -342558,7 +342558,7 @@ index 000000000000..47979a2f1a35 +#endif /* #if defined(CONFIG_MALI400_PROFILING) */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_group.h b/drivers/gpu/arm/mali400/mali/common/mali_group.h new file mode 100755 -index 000000000000..32481e4a6748 +index 000000000..32481e4a6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_group.h @@ -0,0 +1,460 @@ @@ -343024,7 +343024,7 @@ index 000000000000..32481e4a6748 +#endif /* __MALI_GROUP_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c new file mode 100755 -index 000000000000..a813816e998d +index 000000000..a813816e9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c @@ -0,0 +1,47 @@ @@ -343077,7 +343077,7 @@ index 000000000000..a813816e998d +} 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 +index 000000000..38d96e240 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.h @@ -0,0 +1,111 @@ @@ -343194,7 +343194,7 @@ index 000000000000..38d96e240a20 +#endif /* __MALI_HW_CORE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h b/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h new file mode 100755 -index 000000000000..6a8f0f0116a4 +index 000000000..6a8f0f011 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h @@ -0,0 +1,181 @@ @@ -343381,7 +343381,7 @@ index 000000000000..6a8f0f0116a4 +#endif /* __MALI_KERNEL_COMMON_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c new file mode 100755 -index 000000000000..87f97b710257 +index 000000000..87f97b710 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c @@ -0,0 +1,1349 @@ @@ -344736,7 +344736,7 @@ index 000000000000..87f97b710257 +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h new file mode 100755 -index 000000000000..c471fc955107 +index 000000000..c471fc955 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h @@ -0,0 +1,57 @@ @@ -344799,7 +344799,7 @@ index 000000000000..c471fc955107 +#endif /* __MALI_KERNEL_CORE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c new file mode 100755 -index 000000000000..d1b8dc3b0b0e +index 000000000..d1b8dc3b0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c @@ -0,0 +1,440 @@ @@ -345245,7 +345245,7 @@ index 000000000000..d1b8dc3b0b0e +} 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 +index 000000000..06f585dcb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.h @@ -0,0 +1,72 @@ @@ -345323,7 +345323,7 @@ index 000000000000..06f585dcb238 +#endif /* __MALI_KERNEL_UTILIZATION_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c b/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c new file mode 100755 -index 000000000000..dd44e5e7fa03 +index 000000000..dd44e5e7f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c @@ -0,0 +1,45 @@ @@ -345374,7 +345374,7 @@ index 000000000000..dd44e5e7fa03 + diff --git a/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c new file mode 100755 -index 000000000000..fe33f561b2aa +index 000000000..fe33f561b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c @@ -0,0 +1,534 @@ @@ -345914,7 +345914,7 @@ index 000000000000..fe33f561b2aa +} 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 +index 000000000..c48a88440 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.h @@ -0,0 +1,124 @@ @@ -346044,7 +346044,7 @@ index 000000000000..c48a8844075f +#endif /* __MALI_KERNEL_L2_CACHE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c new file mode 100755 -index 000000000000..eb95998f1469 +index 000000000..eb95998f1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c @@ -0,0 +1,68 @@ @@ -346118,7 +346118,7 @@ index 000000000000..eb95998f1469 +} 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 +index 000000000..05013f46f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.h @@ -0,0 +1,19 @@ @@ -346143,7 +346143,7 @@ index 000000000000..05013f46f901 +#endif /* __MALI_MEM_VALIDATION_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu.c b/drivers/gpu/arm/mali400/mali/common/mali_mmu.c new file mode 100755 -index 000000000000..b82486fa66c0 +index 000000000..b82486fa6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu.c @@ -0,0 +1,433 @@ @@ -346582,7 +346582,7 @@ index 000000000000..b82486fa66c0 +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu.h b/drivers/gpu/arm/mali400/mali/common/mali_mmu.h new file mode 100755 -index 000000000000..6ed48585f3d2 +index 000000000..6ed48585f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu.h @@ -0,0 +1,124 @@ @@ -346712,7 +346712,7 @@ index 000000000000..6ed48585f3d2 +#endif /* __MALI_MMU_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c new file mode 100755 -index 000000000000..9ad3e8970b7d +index 000000000..9ad3e8970 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c @@ -0,0 +1,495 @@ @@ -347213,7 +347213,7 @@ index 000000000000..9ad3e8970b7d +} 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 +index 000000000..3fdf07210 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.h @@ -0,0 +1,110 @@ @@ -347329,7 +347329,7 @@ index 000000000000..3fdf07210259 +#endif /* __MALI_MMU_PAGE_DIRECTORY_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk.h b/drivers/gpu/arm/mali400/mali/common/mali_osk.h new file mode 100755 -index 000000000000..9ade362d6b28 +index 000000000..9ade362d6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk.h @@ -0,0 +1,1389 @@ @@ -348724,7 +348724,7 @@ index 000000000000..9ade362d6b28 +#endif /* __MALI_OSK_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h new file mode 100755 -index 000000000000..bb1831753a40 +index 000000000..bb1831753 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h @@ -0,0 +1,162 @@ @@ -348892,7 +348892,7 @@ index 000000000000..bb1831753a40 +#endif /* __MALI_OSK_BITOPS_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h new file mode 100755 -index 000000000000..9af2d7d4d621 +index 000000000..9af2d7d4d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h @@ -0,0 +1,273 @@ @@ -349171,7 +349171,7 @@ index 000000000000..9af2d7d4d621 +#endif /* __MALI_OSK_LIST_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h new file mode 100755 -index 000000000000..bf69925a43a7 +index 000000000..bf69925a4 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h @@ -0,0 +1,152 @@ @@ -349329,7 +349329,7 @@ index 000000000000..bf69925a43a7 +#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 +index 000000000..6e4583db1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h @@ -0,0 +1,146 @@ @@ -349481,7 +349481,7 @@ index 000000000000..6e4583db1c80 + diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h new file mode 100755 -index 000000000000..b6fa94ce16b3 +index 000000000..b6fa94ce1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h @@ -0,0 +1,471 @@ @@ -349958,7 +349958,7 @@ index 000000000000..b6fa94ce16b3 +#endif /* __MALI_OSK_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm.c b/drivers/gpu/arm/mali400/mali/common/mali_pm.c new file mode 100755 -index 000000000000..3989a33aeaef +index 000000000..3989a33ae --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm.c @@ -0,0 +1,1362 @@ @@ -351326,7 +351326,7 @@ index 000000000000..3989a33aeaef +} 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 +index 000000000..dac69958e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm.h @@ -0,0 +1,91 @@ @@ -351423,7 +351423,7 @@ index 000000000000..dac69958e034 +#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 +index 000000000..8290f7d88 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.c @@ -0,0 +1,209 @@ @@ -351638,7 +351638,7 @@ index 000000000000..8290f7d88f6a +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h new file mode 100755 -index 000000000000..5776abe39f3d +index 000000000..5776abe39 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h @@ -0,0 +1,104 @@ @@ -351748,7 +351748,7 @@ index 000000000000..5776abe39f3d +#endif /* __MALI_PM_DOMAIN_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c new file mode 100755 -index 000000000000..cf74823230f7 +index 000000000..cf7482323 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c @@ -0,0 +1,255 @@ @@ -352009,7 +352009,7 @@ index 000000000000..cf74823230f7 +} 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 +index 000000000..2b136b0de --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.h @@ -0,0 +1,74 @@ @@ -352089,7 +352089,7 @@ index 000000000000..2b136b0de4e3 +#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 +index 000000000..6f0af59f6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pmu.c @@ -0,0 +1,270 @@ @@ -352365,7 +352365,7 @@ index 000000000000..6f0af59f6fd4 +} 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 +index 000000000..5b856240f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pmu.h @@ -0,0 +1,123 @@ @@ -352494,7 +352494,7 @@ index 000000000000..5b856240fdac +#endif /* __MALI_PMU_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp.c b/drivers/gpu/arm/mali400/mali/common/mali_pp.c new file mode 100755 -index 000000000000..2dd8b8766f8e +index 000000000..2dd8b8766 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp.c @@ -0,0 +1,502 @@ @@ -353002,7 +353002,7 @@ index 000000000000..2dd8b8766f8e +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp.h b/drivers/gpu/arm/mali400/mali/common/mali_pp.h new file mode 100755 -index 000000000000..f98b29866ffa +index 000000000..f98b29866 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp.h @@ -0,0 +1,138 @@ @@ -353146,7 +353146,7 @@ index 000000000000..f98b29866ffa +#endif /* __MALI_PP_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c new file mode 100755 -index 000000000000..b0216d4c1ac8 +index 000000000..b0216d4c1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c @@ -0,0 +1,316 @@ @@ -353468,7 +353468,7 @@ index 000000000000..b0216d4c1ac8 +} 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 +index 000000000..d0331f398 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.h @@ -0,0 +1,594 @@ @@ -354068,7 +354068,7 @@ index 000000000000..d0331f398ff9 +#endif /* __MALI_PP_JOB_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c new file mode 100755 -index 000000000000..b5e6cfddbb0e +index 000000000..b5e6cfddb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c @@ -0,0 +1,1548 @@ @@ -355622,7 +355622,7 @@ index 000000000000..b5e6cfddbb0e +} 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 +index 000000000..de81a421e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.h @@ -0,0 +1,131 @@ @@ -355759,7 +355759,7 @@ index 000000000000..de81a421ea9a +#endif /* __MALI_SCHEDULER_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h b/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h new file mode 100755 -index 000000000000..ba1d71d01d46 +index 000000000..ba1d71d01 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h @@ -0,0 +1,29 @@ @@ -355794,7 +355794,7 @@ index 000000000000..ba1d71d01d46 +#endif /* __MALI_SCHEDULER_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_session.c b/drivers/gpu/arm/mali400/mali/common/mali_session.c new file mode 100755 -index 000000000000..7504fb108779 +index 000000000..7504fb108 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_session.c @@ -0,0 +1,155 @@ @@ -355955,7 +355955,7 @@ index 000000000000..7504fb108779 +} 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 +index 000000000..da8b9927e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_session.h @@ -0,0 +1,136 @@ @@ -356097,7 +356097,7 @@ index 000000000000..da8b9927ee60 +#endif /* __MALI_SESSION_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c new file mode 100755 -index 000000000000..35cd830bc83a +index 000000000..35cd830bc --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c @@ -0,0 +1,438 @@ @@ -356541,7 +356541,7 @@ index 000000000000..35cd830bc83a +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h new file mode 100755 -index 000000000000..018ef4c527d9 +index 000000000..018ef4c52 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h @@ -0,0 +1,190 @@ @@ -356737,7 +356737,7 @@ index 000000000000..018ef4c527d9 +#endif /* __MALI_SOFT_JOB_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c new file mode 100755 -index 000000000000..f829e99f02ab +index 000000000..f829e99f0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c @@ -0,0 +1,77 @@ @@ -356820,7 +356820,7 @@ index 000000000000..f829e99f02ab +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h new file mode 100755 -index 000000000000..4d788ec1bbe4 +index 000000000..4d788ec1b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h @@ -0,0 +1,70 @@ @@ -356896,7 +356896,7 @@ index 000000000000..4d788ec1bbe4 +#endif /* __MALI_SPINLOCK_REENTRANT_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline.c b/drivers/gpu/arm/mali400/mali/common/mali_timeline.c new file mode 100755 -index 000000000000..ffffee9306ce +index 000000000..ffffee930 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline.c @@ -0,0 +1,1964 @@ @@ -358866,7 +358866,7 @@ index 000000000000..ffffee9306ce +#endif diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline.h b/drivers/gpu/arm/mali400/mali/common/mali_timeline.h new file mode 100755 -index 000000000000..3e8bfc8fb733 +index 000000000..3e8bfc8fb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline.h @@ -0,0 +1,587 @@ @@ -359459,7 +359459,7 @@ index 000000000000..3e8bfc8fb733 +#endif /* __MALI_TIMELINE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c new file mode 100755 -index 000000000000..1ab13f50997f +index 000000000..1ab13f509 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c @@ -0,0 +1,218 @@ @@ -359683,7 +359683,7 @@ index 000000000000..1ab13f50997f +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h new file mode 100755 -index 000000000000..9da12baeef1a +index 000000000..9da12baee --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h @@ -0,0 +1,67 @@ @@ -359756,7 +359756,7 @@ index 000000000000..9da12baeef1a +#endif /* __MALI_TIMELINE_FENCE_WAIT_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c new file mode 100755 -index 000000000000..bb7f6a04e8bd +index 000000000..bb7f6a04e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c @@ -0,0 +1,179 @@ @@ -359941,7 +359941,7 @@ index 000000000000..bb7f6a04e8bd +#endif /* defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h new file mode 100755 -index 000000000000..65e368ae7c9e +index 000000000..65e368ae7 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h @@ -0,0 +1,51 @@ @@ -359998,7 +359998,7 @@ index 000000000000..65e368ae7c9e +#endif /* __MALI_TIMELINE_SYNC_FENCE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_ukk.h b/drivers/gpu/arm/mali400/mali/common/mali_ukk.h new file mode 100755 -index 000000000000..55a05c50436a +index 000000000..55a05c504 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_ukk.h @@ -0,0 +1,551 @@ @@ -360555,7 +360555,7 @@ index 000000000000..55a05c50436a +#endif /* __MALI_UKK_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c new file mode 100755 -index 000000000000..1911eff87a72 +index 000000000..1911eff87 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c @@ -0,0 +1,147 @@ @@ -360708,7 +360708,7 @@ index 000000000000..1911eff87a72 +} 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 +index 000000000..da9c0630e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.h @@ -0,0 +1,39 @@ @@ -360753,7 +360753,7 @@ index 000000000000..da9c0630e371 +#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 +index 000000000..7df55c951 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard.h @@ -0,0 +1,526 @@ @@ -361285,7 +361285,7 @@ index 000000000000..7df55c951d6f +#endif diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h new file mode 100755 -index 000000000000..686708eaef75 +index 000000000..686708eae --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_ioctl.h @@ -0,0 +1,97 @@ @@ -361388,7 +361388,7 @@ index 000000000000..686708eaef75 +#endif /* __MALI_UTGARD_IOCTL_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h new file mode 100755 -index 000000000000..17d31de931d0 +index 000000000..17d31de93 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_events.h @@ -0,0 +1,190 @@ @@ -361584,7 +361584,7 @@ index 000000000000..17d31de931d0 +#endif /*_MALI_UTGARD_PROFILING_EVENTS_H_*/ diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h new file mode 100755 -index 000000000000..c1927d1450dc +index 000000000..c1927d145 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_profiling_gator_api.h @@ -0,0 +1,305 @@ @@ -361895,7 +361895,7 @@ index 000000000000..c1927d1450dc +#endif /* __MALI_UTGARD_PROFILING_GATOR_API_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h new file mode 100755 -index 000000000000..34656f09b2ab +index 000000000..34656f09b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard_uk_types.h @@ -0,0 +1,1108 @@ @@ -363009,7 +363009,7 @@ index 000000000000..34656f09b2ab +#endif /* __MALI_UTGARD_UK_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h b/drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h new file mode 100755 -index 000000000000..6fafc6777e48 +index 000000000..6fafc6777 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/license/gpl/mali_kernel_license.h @@ -0,0 +1,30 @@ @@ -363045,7 +363045,7 @@ index 000000000000..6fafc6777e48 +#endif /* __MALI_KERNEL_LICENSE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c new file mode 100755 -index 000000000000..260c2a8227a9 +index 000000000..260c2a822 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c @@ -0,0 +1,354 @@ @@ -363405,7 +363405,7 @@ index 000000000000..260c2a8227a9 +} 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 +index 000000000..ba7c017d8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h @@ -0,0 +1,17 @@ @@ -363428,7 +363428,7 @@ index 000000000000..ba7c017d88dc +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c b/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c new file mode 100755 -index 000000000000..95c3ea12d645 +index 000000000..95c3ea12d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c @@ -0,0 +1,36 @@ @@ -363470,7 +363470,7 @@ index 000000000000..95c3ea12d645 +EXPORT_SYMBOL(mali_dev_resume); diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c new file mode 100755 -index 000000000000..e026e11e4bc5 +index 000000000..e026e11e4 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c @@ -0,0 +1,439 @@ @@ -363915,7 +363915,7 @@ index 000000000000..e026e11e4bc5 +} 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 +index 000000000..d44f6d1a8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.h @@ -0,0 +1,124 @@ @@ -364045,7 +364045,7 @@ index 000000000000..d44f6d1a8926 +#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 +index 000000000..e13cbad3e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.c @@ -0,0 +1,783 @@ @@ -364834,7 +364834,7 @@ index 000000000000..e13cbad3e513 +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h new file mode 100755 -index 000000000000..dbb29222ba98 +index 000000000..dbb29222b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h @@ -0,0 +1,191 @@ @@ -365031,7 +365031,7 @@ index 000000000000..dbb29222ba98 +#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..e45c7d2f2b1e +index 000000000..e45c7d2f2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c @@ -0,0 +1,1154 @@ @@ -366191,7 +366191,7 @@ index 000000000000..e45c7d2f2b1e +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 +index 000000000..be754cb15 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h @@ -0,0 +1,36 @@ @@ -366233,7 +366233,7 @@ index 000000000000..be754cb15646 +#endif /* __MALI_KERNEL_LINUX_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c new file mode 100755 -index 000000000000..7bda438fef50 +index 000000000..7bda438fe --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c @@ -0,0 +1,1410 @@ @@ -367649,7 +367649,7 @@ index 000000000000..7bda438fef50 +#endif /* MALI_LICENSE_IS_GPL */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h new file mode 100755 -index 000000000000..91580a87c1e1 +index 000000000..91580a87c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h @@ -0,0 +1,29 @@ @@ -367684,7 +367684,7 @@ index 000000000000..91580a87c1e1 +#endif /* __MALI_KERNEL_LINUX_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h b/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h new file mode 100755 -index 000000000000..222260823c81 +index 000000000..222260823 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h @@ -0,0 +1,161 @@ @@ -367851,7 +367851,7 @@ index 000000000000..222260823c81 + 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 +index 000000000..dfc769e6c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory.c @@ -0,0 +1,531 @@ @@ -368388,7 +368388,7 @@ index 000000000000..dfc769e6cc40 + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory.h new file mode 100755 -index 000000000000..efebbef235d8 +index 000000000..efebbef23 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory.h @@ -0,0 +1,143 @@ @@ -368537,7 +368537,7 @@ index 000000000000..efebbef235d8 +#endif /* __MALI_MEMORY_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c new file mode 100755 -index 000000000000..bccef3576914 +index 000000000..bccef3576 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c @@ -0,0 +1,362 @@ @@ -368905,7 +368905,7 @@ index 000000000000..bccef3576914 +} 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 +index 000000000..70fd9ec25 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.h @@ -0,0 +1,58 @@ @@ -368969,7 +368969,7 @@ index 000000000000..70fd9ec25f50 +#endif /* __MALI_BLOCK_ALLOCATOR_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c new file mode 100755 -index 000000000000..0bdf90b167d6 +index 000000000..0bdf90b16 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c @@ -0,0 +1,776 @@ @@ -369751,7 +369751,7 @@ index 000000000000..0bdf90b167d6 +} 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 +index 000000000..5f83a37fc --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h @@ -0,0 +1,48 @@ @@ -369805,7 +369805,7 @@ index 000000000000..5f83a37fc8f8 + 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 +index 000000000..a9db577cb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.c @@ -0,0 +1,262 @@ @@ -370073,7 +370073,7 @@ index 000000000000..a9db577cb851 + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h new file mode 100755 -index 000000000000..defa08d52a46 +index 000000000..defa08d52 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h @@ -0,0 +1,64 @@ @@ -370143,7 +370143,7 @@ index 000000000000..defa08d52a46 +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c new file mode 100755 -index 000000000000..1f4565127a6b +index 000000000..1f4565127 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c @@ -0,0 +1,369 @@ @@ -370518,7 +370518,7 @@ index 000000000000..1f4565127a6b +} 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 +index 000000000..a9b287038 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.h @@ -0,0 +1,53 @@ @@ -370577,7 +370577,7 @@ index 000000000000..a9b2870389ff +#endif /* __MALI_MEMORY_DMA_BUF_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c new file mode 100755 -index 000000000000..76018b7ab90b +index 000000000..76018b7ab --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c @@ -0,0 +1,89 @@ @@ -370672,7 +370672,7 @@ index 000000000000..76018b7ab90b + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h new file mode 100755 -index 000000000000..2db178d96233 +index 000000000..2db178d96 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h @@ -0,0 +1,29 @@ @@ -370707,7 +370707,7 @@ index 000000000000..2db178d96233 +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c new file mode 100755 -index 000000000000..27dee0f19c81 +index 000000000..27dee0f19 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c @@ -0,0 +1,993 @@ @@ -371706,7 +371706,7 @@ index 000000000000..27dee0f19c81 +} 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 +index 000000000..23d8cde75 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h @@ -0,0 +1,51 @@ @@ -371763,7 +371763,7 @@ index 000000000000..23d8cde753a1 + 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..1e1f5eb4a0f7 +index 000000000..1e1f5eb4a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c @@ -0,0 +1,810 @@ @@ -372579,7 +372579,7 @@ index 000000000000..1e1f5eb4a0f7 +} 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 +index 000000000..8c9b35d0b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h @@ -0,0 +1,54 @@ @@ -372639,7 +372639,7 @@ index 000000000000..8c9b35d0b230 +#endif /* __MALI_MEMORY_OS_ALLOC_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c new file mode 100755 -index 000000000000..0b4f828680d0 +index 000000000..0b4f82868 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c @@ -0,0 +1,170 @@ @@ -372815,7 +372815,7 @@ index 000000000000..0b4f828680d0 + 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 +index 000000000..48691d479 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h @@ -0,0 +1,30 @@ @@ -372851,7 +372851,7 @@ index 000000000000..48691d4790fe +#endif /* __MALI_MEMORY_SECURE_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c new file mode 100755 -index 000000000000..d682785b9673 +index 000000000..d682785b9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c @@ -0,0 +1,943 @@ @@ -373800,7 +373800,7 @@ index 000000000000..d682785b9673 +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h new file mode 100755 -index 000000000000..5810960e204a +index 000000000..5810960e2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h @@ -0,0 +1,121 @@ @@ -373927,7 +373927,7 @@ index 000000000000..5810960e204a + 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 +index 000000000..33db40929 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_types.h @@ -0,0 +1,219 @@ @@ -374152,7 +374152,7 @@ index 000000000000..33db40929642 +#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 +index 000000000..666d4b0fb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.c @@ -0,0 +1,154 @@ @@ -374312,7 +374312,7 @@ index 000000000000..666d4b0fb1cd + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h new file mode 100755 -index 000000000000..c314c8dcbf1c +index 000000000..c314c8dcb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h @@ -0,0 +1,29 @@ @@ -374347,7 +374347,7 @@ index 000000000000..c314c8dcbf1c +#endif /* __MALI_MEMORY_DMA_BUF_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c new file mode 100755 -index 000000000000..8e13e923c3fb +index 000000000..8e13e923c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c @@ -0,0 +1,158 @@ @@ -374511,7 +374511,7 @@ index 000000000000..8e13e923c3fb +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h new file mode 100755 -index 000000000000..33ac99509740 +index 000000000..33ac99509 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h @@ -0,0 +1,20 @@ @@ -374537,7 +374537,7 @@ index 000000000000..33ac99509740 +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c new file mode 100755 -index 000000000000..0b31e3a23432 +index 000000000..0b31e3a23 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c @@ -0,0 +1,127 @@ @@ -374670,7 +374670,7 @@ index 000000000000..0b31e3a23432 + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h new file mode 100755 -index 000000000000..fd03ed9f2bbb +index 000000000..fd03ed9f2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h @@ -0,0 +1,35 @@ @@ -374711,7 +374711,7 @@ index 000000000000..fd03ed9f2bbb +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c new file mode 100755 -index 000000000000..5bc0e52ebe23 +index 000000000..5bc0e52eb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c @@ -0,0 +1,59 @@ @@ -374776,7 +374776,7 @@ index 000000000000..5bc0e52ebe23 +} 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 +index 000000000..fb9ccd2ad --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_bitmap.c @@ -0,0 +1,152 @@ @@ -374934,7 +374934,7 @@ index 000000000000..fb9ccd2ad1e2 + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c new file mode 100755 -index 000000000000..5c8b9ceab9ab +index 000000000..5c8b9ceab --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c @@ -0,0 +1,200 @@ @@ -375140,7 +375140,7 @@ index 000000000000..5c8b9ceab9ab +} 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 +index 000000000..ed5f0b0da --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.c @@ -0,0 +1,287 @@ @@ -375433,7 +375433,7 @@ index 000000000000..ed5f0b0da7cb +#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 +index 000000000..6fd5af952 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.h @@ -0,0 +1,326 @@ @@ -375765,7 +375765,7 @@ index 000000000000..6fd5af95285b +#endif diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c new file mode 100755 -index 000000000000..994b04dad745 +index 000000000..994b04dad --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_low_level_mem.c @@ -0,0 +1,146 @@ @@ -375917,7 +375917,7 @@ index 000000000000..994b04dad745 +} 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 +index 000000000..a729d0499 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_mali.c @@ -0,0 +1,505 @@ @@ -376428,7 +376428,7 @@ index 000000000000..a729d0499869 + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c new file mode 100755 -index 000000000000..0b2d00762771 +index 000000000..0b2d00762 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c @@ -0,0 +1,27 @@ @@ -376461,7 +376461,7 @@ index 000000000000..0b2d00762771 +} 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 +index 000000000..174616b56 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_memory.c @@ -0,0 +1,61 @@ @@ -376528,7 +376528,7 @@ index 000000000000..174616b566c4 +} 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 +index 000000000..9845187f8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_misc.c @@ -0,0 +1,81 @@ @@ -376615,7 +376615,7 @@ index 000000000000..9845187f8122 +} 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 +index 000000000..a05f8f066 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_notification.c @@ -0,0 +1,182 @@ @@ -376803,7 +376803,7 @@ index 000000000000..a05f8f066964 +} 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 +index 000000000..e28e2eb21 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_pm.c @@ -0,0 +1,83 @@ @@ -376892,7 +376892,7 @@ index 000000000000..e28e2eb21fe2 +} 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 +index 000000000..9e977ea4d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_profiling.c @@ -0,0 +1,1282 @@ @@ -378180,7 +378180,7 @@ index 000000000000..9e977ea4d0ff +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 +index 000000000..af51161f9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_specific.h @@ -0,0 +1,74 @@ @@ -378260,7 +378260,7 @@ index 000000000000..af51161f9da1 +#endif /* __MALI_OSK_SPECIFIC_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c b/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c new file mode 100755 -index 000000000000..d295e712ac7a +index 000000000..d295e712a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c @@ -0,0 +1,59 @@ @@ -378325,7 +378325,7 @@ index 000000000000..d295e712ac7a +} 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 +index 000000000..d01c11482 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_timers.c @@ -0,0 +1,76 @@ @@ -378407,7 +378407,7 @@ index 000000000000..d01c1148272a +} 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 +index 000000000..fa12abd3f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wait_queue.c @@ -0,0 +1,78 @@ @@ -378491,7 +378491,7 @@ index 000000000000..fa12abd3f5dc +} 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 +index 000000000..d5e258a83 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wq.c @@ -0,0 +1,240 @@ @@ -378737,7 +378737,7 @@ index 000000000000..d5e258a83a29 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c b/drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c new file mode 100755 -index 000000000000..931d7f07a1d2 +index 000000000..931d7f07a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_pmu_power_up_down.c @@ -0,0 +1,23 @@ @@ -378766,7 +378766,7 @@ index 000000000000..931d7f07a1d2 +EXPORT_SYMBOL(mali_perf_set_num_pp_cores); diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h new file mode 100755 -index 000000000000..4661cac42b3f +index 000000000..4661cac42 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h @@ -0,0 +1,17 @@ @@ -378789,7 +378789,7 @@ index 000000000000..4661cac42b3f +#endif /* __MALI_PROFILING_EVENTS_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h new file mode 100755 -index 000000000000..6fdaa427c4cf +index 000000000..6fdaa427c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h @@ -0,0 +1,17 @@ @@ -378812,7 +378812,7 @@ index 000000000000..6fdaa427c4cf +#endif /* __MALI_PROFILING_GATOR_API_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c new file mode 100755 -index 000000000000..c3a526f0ad90 +index 000000000..c3a526f0a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c @@ -0,0 +1,275 @@ @@ -379093,7 +379093,7 @@ index 000000000000..c3a526f0ad90 +} 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 +index 000000000..f17b45833 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.h @@ -0,0 +1,35 @@ @@ -379134,7 +379134,7 @@ index 000000000000..f17b4583307a +#endif /* __MALI_PROFILING_INTERNAL_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_sync.c b/drivers/gpu/arm/mali400/mali/linux/mali_sync.c new file mode 100755 -index 000000000000..0d98b518f1ac +index 000000000..0d98b518f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_sync.c @@ -0,0 +1,665 @@ @@ -379805,7 +379805,7 @@ index 000000000000..0d98b518f1ac + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_sync.h b/drivers/gpu/arm/mali400/mali/linux/mali_sync.h new file mode 100755 -index 000000000000..91be8b9cf314 +index 000000000..91be8b9cf --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_sync.h @@ -0,0 +1,169 @@ @@ -379980,7 +379980,7 @@ index 000000000000..91be8b9cf314 +#endif /* _MALI_SYNC_H_ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h b/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h new file mode 100755 -index 000000000000..68b27b8be067 +index 000000000..68b27b8be --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h @@ -0,0 +1,17 @@ @@ -380003,7 +380003,7 @@ index 000000000000..68b27b8be067 +#endif /* __MALI_UK_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c new file mode 100755 -index 000000000000..0bd1cddb10c6 +index 000000000..0bd1cddb1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c @@ -0,0 +1,171 @@ @@ -380180,7 +380180,7 @@ index 000000000000..0bd1cddb10c6 +} 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 +index 000000000..68fcd9719 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_gp.c @@ -0,0 +1,91 @@ @@ -380277,7 +380277,7 @@ index 000000000000..68fcd971938a +} 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 +index 000000000..baea4c688 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_mem.c @@ -0,0 +1,333 @@ @@ -380616,7 +380616,7 @@ index 000000000000..baea4c688db9 + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c new file mode 100755 -index 000000000000..a9b0958c06aa +index 000000000..a9b0958c0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c @@ -0,0 +1,105 @@ @@ -380727,7 +380727,7 @@ index 000000000000..a9b0958c06aa +} 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 +index 000000000..8b49ebc50 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_profiling.c @@ -0,0 +1,183 @@ @@ -380916,7 +380916,7 @@ index 000000000000..8b49ebc50b95 +} 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 +index 000000000..1dd4a7c6f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_soft_job.c @@ -0,0 +1,90 @@ @@ -381012,7 +381012,7 @@ index 000000000000..1dd4a7c6fb1e +} 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 +index 000000000..ff0c90939 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_timeline.c @@ -0,0 +1,88 @@ @@ -381106,7 +381106,7 @@ index 000000000000..ff0c909393a4 +} 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 +index 000000000..52519d1f9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_vsync.c @@ -0,0 +1,39 @@ @@ -381151,7 +381151,7 @@ index 000000000000..52519d1f96e0 + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h new file mode 100755 -index 000000000000..1add628fe323 +index 000000000..1add628fe --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h @@ -0,0 +1,82 @@ @@ -381239,7 +381239,7 @@ index 000000000000..1add628fe323 +#endif /* __MALI_UKK_WRAPPERS_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/arm.c b/drivers/gpu/arm/mali400/mali/platform/arm/arm.c new file mode 100755 -index 000000000000..fc7017bbfe08 +index 000000000..fc7017bbf --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm.c @@ -0,0 +1,629 @@ @@ -381874,7 +381874,7 @@ index 000000000000..fc7017bbfe08 +} diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c new file mode 100755 -index 000000000000..7a2fc8107b4f +index 000000000..7a2fc8107 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c @@ -0,0 +1,122 @@ @@ -382002,7 +382002,7 @@ index 000000000000..7a2fc8107b4f +} diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h new file mode 100755 -index 000000000000..8e0101830749 +index 000000000..8e0101830 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h @@ -0,0 +1,44 @@ @@ -382052,7 +382052,7 @@ index 000000000000..8e0101830749 +#endif /* __ARM_CORE_SCALING_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c b/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c new file mode 100755 -index 000000000000..e4e7ab8b2c2e +index 000000000..e4e7ab8b2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c @@ -0,0 +1,127 @@ @@ -382185,7 +382185,7 @@ index 000000000000..e4e7ab8b2c2e +#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 +index 000000000..fe5e12241 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/rk/custom_log.h @@ -0,0 +1,209 @@ @@ -382400,7 +382400,7 @@ index 000000000000..fe5e1224149e +#endif /* __CUSTOM_LOG_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/platform/rk/rk.c b/drivers/gpu/arm/mali400/mali/platform/rk/rk.c new file mode 100755 -index 000000000000..9a012fdf8d35 +index 000000000..9a012fdf8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/rk/rk.c @@ -0,0 +1,676 @@ @@ -383082,7 +383082,7 @@ index 000000000000..9a012fdf8d35 +} 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 +index 000000000..bd939350c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h @@ -0,0 +1,37 @@ @@ -383125,7 +383125,7 @@ index 000000000000..bd939350c425 + 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 +index 000000000..6785ac933 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/readme.txt @@ -0,0 +1,28 @@ @@ -383159,7 +383159,7 @@ index 000000000000..6785ac933b38 +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 +index 000000000..0345fb169 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/regs/mali_200_regs.h @@ -0,0 +1,131 @@ @@ -383296,7 +383296,7 @@ index 000000000000..0345fb169a95 +#endif /* _MALI200_REGS_H_ */ diff --git a/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h b/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h new file mode 100755 -index 000000000000..7f8b58fd6c49 +index 000000000..7f8b58fd6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h @@ -0,0 +1,172 @@ @@ -383474,7 +383474,7 @@ index 000000000000..7f8b58fd6c49 +#endif diff --git a/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c new file mode 100755 -index 000000000000..7df934c12122 +index 000000000..7df934c12 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c @@ -0,0 +1,13 @@ @@ -383493,7 +383493,7 @@ index 000000000000..7df934c12122 +/* This file is intentionally left empty, as all functions are inlined in mali_profiling_sampler.h */ diff --git a/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h new file mode 100755 -index 000000000000..f52097c1901b +index 000000000..f52097c19 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h @@ -0,0 +1,48 @@ @@ -383547,7 +383547,7 @@ index 000000000000..f52097c1901b +#endif /* __MALI_TIMESTAMP_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c new file mode 100755 -index 000000000000..7df934c12122 +index 000000000..7df934c12 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c @@ -0,0 +1,13 @@ @@ -383566,7 +383566,7 @@ index 000000000000..7df934c12122 +/* This file is intentionally left empty, as all functions are inlined in mali_profiling_sampler.h */ diff --git a/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h new file mode 100755 -index 000000000000..709a16a82f31 +index 000000000..709a16a82 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h @@ -0,0 +1,26 @@ @@ -383598,7 +383598,7 @@ index 000000000000..709a16a82f31 +#endif /* __MALI_TIMESTAMP_H__ */ diff --git a/drivers/gpu/arm/mali400/rk_ver_info.txt b/drivers/gpu/arm/mali400/rk_ver_info.txt new file mode 100755 -index 000000000000..2a6cbbbb5a97 +index 000000000..2a6cbbbb5 --- /dev/null +++ b/drivers/gpu/arm/mali400/rk_ver_info.txt @@ -0,0 +1,11 @@ @@ -383615,7 +383615,7 @@ index 000000000000..2a6cbbbb5a97 + diff --git a/drivers/gpu/arm/mali400/ump/Kbuild b/drivers/gpu/arm/mali400/ump/Kbuild new file mode 100755 -index 000000000000..a3067ba72459 +index 000000000..a3067ba72 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Kbuild @@ -0,0 +1,92 @@ @@ -383713,7 +383713,7 @@ index 000000000000..a3067ba72459 + diff --git a/drivers/gpu/arm/mali400/ump/Kconfig b/drivers/gpu/arm/mali400/ump/Kconfig new file mode 100755 -index 000000000000..ec3509057732 +index 000000000..ec3509057 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Kconfig @@ -0,0 +1,17 @@ @@ -383736,7 +383736,7 @@ index 000000000000..ec3509057732 + diff --git a/drivers/gpu/arm/mali400/ump/Makefile b/drivers/gpu/arm/mali400/ump/Makefile new file mode 100755 -index 000000000000..88b02a22fce5 +index 000000000..88b02a22f --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Makefile @@ -0,0 +1,67 @@ @@ -383809,7 +383809,7 @@ index 000000000000..88b02a22fce5 + $(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 +index 000000000..ad2c18da9 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Makefile.common @@ -0,0 +1,20 @@ @@ -383835,7 +383835,7 @@ index 000000000000..ad2c18da98a0 +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 +index 000000000..d4aef9dd0 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/arch-default/config.h @@ -0,0 +1,24 @@ @@ -383865,7 +383865,7 @@ index 000000000000..d4aef9dd09c7 +#endif /* __ARCH_CONFIG_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h b/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h new file mode 100755 -index 000000000000..182e90c1d64f +index 000000000..182e90c1d --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h @@ -0,0 +1,18 @@ @@ -383889,7 +383889,7 @@ index 000000000000..182e90c1d64f +#endif /* __ARCH_CONFIG_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/arch/config.h b/drivers/gpu/arm/mali400/ump/arch/config.h new file mode 100755 -index 000000000000..d4aef9dd09c7 +index 000000000..d4aef9dd0 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/arch/config.h @@ -0,0 +1,24 @@ @@ -383919,7 +383919,7 @@ index 000000000000..d4aef9dd09c7 +#endif /* __ARCH_CONFIG_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c new file mode 100755 -index 000000000000..36adb2f5383e +index 000000000..36adb2f53 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c @@ -0,0 +1,455 @@ @@ -384380,7 +384380,7 @@ index 000000000000..36adb2f5383e +} 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 +index 000000000..73aa9e4c4 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.c @@ -0,0 +1,358 @@ @@ -384744,7 +384744,7 @@ index 000000000000..73aa9e4c49f9 +} 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 +index 000000000..aa65f1cb6 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.h @@ -0,0 +1,125 @@ @@ -384875,7 +384875,7 @@ index 000000000000..aa65f1cb6c88 +#endif /* __UMP_KERNEL_COMMON_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c new file mode 100755 -index 000000000000..e4642f0394c2 +index 000000000..e4642f039 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c @@ -0,0 +1,155 @@ @@ -385036,7 +385036,7 @@ index 000000000000..e4642f0394c2 + diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h new file mode 100755 -index 000000000000..a888ba833fbb +index 000000000..a888ba833 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h @@ -0,0 +1,89 @@ @@ -385131,7 +385131,7 @@ index 000000000000..a888ba833fbb +#endif /* __UMP_KERNEL_DESCRIPTOR_MAPPING_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h b/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h new file mode 100755 -index 000000000000..2b69f68e87ac +index 000000000..2b69f68e8 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h @@ -0,0 +1,48 @@ @@ -385185,7 +385185,7 @@ index 000000000000..2b69f68e87ac + 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 +index 000000000..0b6434bee --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_ref_drv.c @@ -0,0 +1,181 @@ @@ -385372,7 +385372,7 @@ index 000000000000..0b6434bee00f +} 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 +index 000000000..32f32ccbe --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_types.h @@ -0,0 +1,58 @@ @@ -385436,7 +385436,7 @@ index 000000000000..32f32ccbe9fc +#endif /* __UMP_KERNEL_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_osk.h b/drivers/gpu/arm/mali400/ump/common/ump_osk.h new file mode 100755 -index 000000000000..9adc4d3df3f5 +index 000000000..9adc4d3df --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_osk.h @@ -0,0 +1,48 @@ @@ -385490,7 +385490,7 @@ index 000000000000..9adc4d3df3f5 +#endif diff --git a/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h b/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h new file mode 100755 -index 000000000000..db842cdcbeff +index 000000000..db842cdcb --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h @@ -0,0 +1,202 @@ @@ -385698,7 +385698,7 @@ index 000000000000..db842cdcbeff +#endif /* __UMP_UK_TYPES_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/common/ump_ukk.h b/drivers/gpu/arm/mali400/ump/common/ump_ukk.h new file mode 100755 -index 000000000000..f2906768c37f +index 000000000..f2906768c --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_ukk.h @@ -0,0 +1,60 @@ @@ -385764,7 +385764,7 @@ index 000000000000..f2906768c37f +#endif /* __UMP_UKK_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h b/drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h new file mode 100755 -index 000000000000..d0174055aa28 +index 000000000..d0174055a --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/license/gpl/ump_kernel_license.h @@ -0,0 +1,30 @@ @@ -385800,7 +385800,7 @@ index 000000000000..d0174055aa28 +#endif /* __UMP_KERNEL_LICENSE_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h b/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h new file mode 100755 -index 000000000000..bfb4e8d64885 +index 000000000..bfb4e8d64 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h @@ -0,0 +1,54 @@ @@ -385860,7 +385860,7 @@ index 000000000000..bfb4e8d64885 +#endif /* __UMP_IOCTL_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c new file mode 100755 -index 000000000000..71b30830c308 +index 000000000..71b30830c --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c @@ -0,0 +1,449 @@ @@ -386315,7 +386315,7 @@ index 000000000000..71b30830c308 +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 +index 000000000..8d32ddbb5 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.h @@ -0,0 +1,18 @@ @@ -386339,7 +386339,7 @@ index 000000000000..8d32ddbb5449 +#endif /* __UMP_KERNEL_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c new file mode 100755 -index 000000000000..5a1257a25b82 +index 000000000..5a1257a25 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.c @@ -0,0 +1,271 @@ @@ -386616,7 +386616,7 @@ index 000000000000..5a1257a25b82 +} 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 +index 000000000..949fd245c --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_dedicated.h @@ -0,0 +1,23 @@ @@ -386645,7 +386645,7 @@ index 000000000000..949fd245c6af + 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 +index 000000000..7cd8d5d38 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.c @@ -0,0 +1,235 @@ @@ -386886,7 +386886,7 @@ index 000000000000..7cd8d5d381cf +} 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 +index 000000000..d21d50351 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_memory_backend_os.h @@ -0,0 +1,23 @@ @@ -386915,7 +386915,7 @@ index 000000000000..d21d503512ec + 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 +index 000000000..6be0f8644 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.c @@ -0,0 +1,222 @@ @@ -387143,7 +387143,7 @@ index 000000000000..6be0f86440de +} 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 +index 000000000..2cea6cedc --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.h @@ -0,0 +1,84 @@ @@ -387233,7 +387233,7 @@ index 000000000000..2cea6cedc380 +#endif /* __UMP_KERNEL_RANDOM_MAPPING_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c b/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c new file mode 100755 -index 000000000000..e41931e1ea75 +index 000000000..e41931e1e --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c @@ -0,0 +1,65 @@ @@ -387304,7 +387304,7 @@ index 000000000000..e41931e1ea75 +} diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c b/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c new file mode 100755 -index 000000000000..2b634ba79c6e +index 000000000..2b634ba79 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c @@ -0,0 +1,27 @@ @@ -387337,7 +387337,7 @@ index 000000000000..2b634ba79c6e +} 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 +index 000000000..e08bf2525 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_low_level_mem.c @@ -0,0 +1,314 @@ @@ -387657,7 +387657,7 @@ index 000000000000..e08bf25257b0 +} 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 +index 000000000..58c9f1bf2 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_misc.c @@ -0,0 +1,36 @@ @@ -387699,7 +387699,7 @@ index 000000000000..58c9f1bf27b8 +} 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 +index 000000000..56a787ff6 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.c @@ -0,0 +1,230 @@ @@ -387935,7 +387935,7 @@ index 000000000000..56a787ff64dc +#endif diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h new file mode 100755 -index 000000000000..61a7095a6920 +index 000000000..61a7095a6 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h @@ -0,0 +1,36 @@ @@ -387977,7 +387977,7 @@ index 000000000000..61a7095a6920 +#endif /* __UMP_UKK_REF_WRAPPERS_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c new file mode 100755 -index 000000000000..4d6b69608fd4 +index 000000000..4d6b69608 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c @@ -0,0 +1,280 @@ @@ -388263,7 +388263,7 @@ index 000000000000..4d6b69608fd4 +} 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 +index 000000000..5f8fc683c --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.h @@ -0,0 +1,46 @@ @@ -388315,7 +388315,7 @@ index 000000000000..5f8fc683c8f5 +#endif /* __UMP_UKK_WRAPPERS_H__ */ diff --git a/drivers/gpu/arm/mali400/ump/readme.txt b/drivers/gpu/arm/mali400/ump/readme.txt new file mode 100755 -index 000000000000..c238cf0f2b1f +index 000000000..c238cf0f2 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/readme.txt @@ -0,0 +1,28 @@ @@ -388349,7 +388349,7 @@ index 000000000000..c238cf0f2b1f +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 +index 000000000..e5549a33f --- /dev/null +++ b/drivers/gpu/arm/mali400/umplock/Makefile @@ -0,0 +1,69 @@ @@ -388424,7 +388424,7 @@ index 000000000000..e5549a33f91d +endif diff --git a/drivers/gpu/arm/mali400/umplock/umplock_driver.c b/drivers/gpu/arm/mali400/umplock/umplock_driver.c new file mode 100755 -index 000000000000..173f4d9bb5c7 +index 000000000..173f4d9bb --- /dev/null +++ b/drivers/gpu/arm/mali400/umplock/umplock_driver.c @@ -0,0 +1,618 @@ @@ -389048,7 +389048,7 @@ index 000000000000..173f4d9bb5c7 +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 +index 000000000..8afdaad70 --- /dev/null +++ b/drivers/gpu/arm/mali400/umplock/umplock_ioctl.h @@ -0,0 +1,66 @@ @@ -389120,7 +389120,7 @@ index 000000000000..8afdaad7000f + diff --git a/drivers/gpu/arm/midgard/Kbuild b/drivers/gpu/arm/midgard/Kbuild new file mode 100755 -index 000000000000..b2c2bbcda668 +index 000000000..b2c2bbcda --- /dev/null +++ b/drivers/gpu/arm/midgard/Kbuild @@ -0,0 +1,221 @@ @@ -389347,7 +389347,7 @@ index 000000000000..b2c2bbcda668 +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..1b28bb73ad59 +index 000000000..1b28bb73a --- /dev/null +++ b/drivers/gpu/arm/midgard/Kconfig @@ -0,0 +1,248 @@ @@ -389601,7 +389601,7 @@ index 000000000000..1b28bb73ad59 +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 +index 000000000..9aa242c4f --- /dev/null +++ b/drivers/gpu/arm/midgard/Makefile @@ -0,0 +1,42 @@ @@ -389649,7 +389649,7 @@ index 000000000000..9aa242c4f8c4 + $(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 +index 000000000..2bef9c25e --- /dev/null +++ b/drivers/gpu/arm/midgard/Makefile.kbase @@ -0,0 +1,17 @@ @@ -389672,7 +389672,7 @@ index 000000000000..2bef9c25eaeb + 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 +index 000000000..5f700e9b6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/Kbuild @@ -0,0 +1,60 @@ @@ -389738,7 +389738,7 @@ index 000000000000..5f700e9b6b44 +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 +index 000000000..c8ae87eb8 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_backend_config.h @@ -0,0 +1,29 @@ @@ -389773,7 +389773,7 @@ index 000000000000..c8ae87eb84a2 + 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 +index 000000000..fef9a2cb7 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.c @@ -0,0 +1,29 @@ @@ -389808,7 +389808,7 @@ index 000000000000..fef9a2cb743e + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h new file mode 100755 -index 000000000000..fe9869109a82 +index 000000000..fe9869109 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_cache_policy_backend.h @@ -0,0 +1,34 @@ @@ -389848,7 +389848,7 @@ index 000000000000..fe9869109a82 +#endif /* _KBASE_CACHE_POLICY_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c new file mode 100755 -index 000000000000..7851ea6466c7 +index 000000000..7851ea646 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_debug_job_fault_backend.c @@ -0,0 +1,157 @@ @@ -390011,7 +390011,7 @@ index 000000000000..7851ea6466c7 +#endif diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c new file mode 100755 -index 000000000000..ab14bc2e2ae4 +index 000000000..ab14bc2e2 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c @@ -0,0 +1,458 @@ @@ -390475,7 +390475,7 @@ index 000000000000..ab14bc2e2ae4 +} 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 +index 000000000..c0bf8b15b --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h @@ -0,0 +1,24 @@ @@ -390505,7 +390505,7 @@ index 000000000000..c0bf8b15b3bc +#endif /* _BASE_DEVFREQ_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c new file mode 100755 -index 000000000000..dcdf15cdc3e8 +index 000000000..dcdf15cdc --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c @@ -0,0 +1,255 @@ @@ -390766,7 +390766,7 @@ index 000000000000..dcdf15cdc3e8 +} 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 +index 000000000..5b2044593 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_internal.h @@ -0,0 +1,67 @@ @@ -390839,7 +390839,7 @@ index 000000000000..5b20445932fb +#endif /* _KBASE_DEVICE_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c new file mode 100755 -index 000000000000..d578fd78e825 +index 000000000..d578fd78e --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c @@ -0,0 +1,123 @@ @@ -390968,7 +390968,7 @@ index 000000000000..d578fd78e825 + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c new file mode 100755 -index 000000000000..b395325b556b +index 000000000..b395325b5 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c @@ -0,0 +1,110 @@ @@ -391084,7 +391084,7 @@ index 000000000000..b395325b556b + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c new file mode 100755 -index 000000000000..7ad309e8d7f4 +index 000000000..7ad309e8d --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c @@ -0,0 +1,492 @@ @@ -391582,7 +391582,7 @@ index 000000000000..7ad309e8d7f4 + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h new file mode 100755 -index 000000000000..4794672da8f0 +index 000000000..4794672da --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h @@ -0,0 +1,58 @@ @@ -391646,7 +391646,7 @@ index 000000000000..4794672da8f0 + 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 +index 000000000..e96aeae78 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_internal.h @@ -0,0 +1,45 @@ @@ -391697,7 +391697,7 @@ index 000000000000..e96aeae786e1 +#endif /* _KBASE_INSTR_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h new file mode 100755 -index 000000000000..8781561e73d0 +index 000000000..8781561e7 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h @@ -0,0 +1,39 @@ @@ -391742,7 +391742,7 @@ index 000000000000..8781561e73d0 +#endif /* _KBASE_IRQ_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c new file mode 100755 -index 000000000000..8416b80e8b77 +index 000000000..8416b80e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c @@ -0,0 +1,469 @@ @@ -392217,7 +392217,7 @@ index 000000000000..8416b80e8b77 +#endif /* !defined(CONFIG_MALI_NO_MALI) */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c new file mode 100755 -index 000000000000..92358f2bf298 +index 000000000..92358f2bf --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c @@ -0,0 +1,237 @@ @@ -392460,7 +392460,7 @@ index 000000000000..92358f2bf298 + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h new file mode 100755 -index 000000000000..08a7400e66d5 +index 000000000..08a7400e6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h @@ -0,0 +1,123 @@ @@ -392589,7 +392589,7 @@ index 000000000000..08a7400e66d5 +#endif /* _KBASE_HWACCESS_GPU_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c new file mode 100755 -index 000000000000..a6fb097b94f9 +index 000000000..a6fb097b9 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c @@ -0,0 +1,1518 @@ @@ -394113,7 +394113,7 @@ index 000000000000..a6fb097b94f9 +#endif /* KBASE_GPU_RESET_EN */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h new file mode 100755 -index 000000000000..1f382b3c1af4 +index 000000000..1f382b3c1 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h @@ -0,0 +1,164 @@ @@ -394283,7 +394283,7 @@ index 000000000000..1f382b3c1af4 +#endif /* _KBASE_JM_HWACCESS_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c new file mode 100755 -index 000000000000..4b4541660ec4 +index 000000000..4b4541660 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c @@ -0,0 +1,1952 @@ @@ -396241,7 +396241,7 @@ index 000000000000..4b4541660ec4 + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h new file mode 100755 -index 000000000000..1e0e05ad3ea4 +index 000000000..1e0e05ad3 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h @@ -0,0 +1,76 @@ @@ -396323,7 +396323,7 @@ index 000000000000..1e0e05ad3ea4 +#endif /* _KBASE_HWACCESS_GPU_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c new file mode 100755 -index 000000000000..54d8ddd80097 +index 000000000..54d8ddd80 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c @@ -0,0 +1,303 @@ @@ -396632,7 +396632,7 @@ index 000000000000..54d8ddd80097 +#endif /* KBASE_TRACE_ENABLE */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h new file mode 100755 -index 000000000000..35d9781ae092 +index 000000000..35d9781ae --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h @@ -0,0 +1,129 @@ @@ -396767,7 +396767,7 @@ index 000000000000..35d9781ae092 +#endif /* _KBASE_JS_AFFINITY_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c new file mode 100755 -index 000000000000..a8c1af23a369 +index 000000000..a8c1af23a --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c @@ -0,0 +1,356 @@ @@ -397129,7 +397129,7 @@ index 000000000000..a8c1af23a369 + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h new file mode 100755 -index 000000000000..3f53779c6747 +index 000000000..3f53779c6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h @@ -0,0 +1,69 @@ @@ -397204,7 +397204,7 @@ index 000000000000..3f53779c6747 +#endif /* _KBASE_JS_BACKEND_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c new file mode 100755 -index 000000000000..ba826184dd3f +index 000000000..ba826184d --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c @@ -0,0 +1,407 @@ @@ -397617,7 +397617,7 @@ index 000000000000..ba826184dd3f +} 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 +index 000000000..c02253c6a --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.h @@ -0,0 +1,42 @@ @@ -397665,7 +397665,7 @@ index 000000000000..c02253c6acc3 +#endif /* _MALI_KBASE_MMU_HW_DIRECT_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c new file mode 100755 -index 000000000000..0614348e935a +index 000000000..0614348e9 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.c @@ -0,0 +1,63 @@ @@ -397734,7 +397734,7 @@ index 000000000000..0614348e935a +KBASE_EXPORT_TEST_API(kbase_pm_always_on_policy_ops); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h new file mode 100755 -index 000000000000..f9d244b01bc2 +index 000000000..f9d244b01 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_always_on.h @@ -0,0 +1,77 @@ @@ -397817,7 +397817,7 @@ index 000000000000..f9d244b01bc2 + 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 +index 000000000..146fd48ba --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_backend.c @@ -0,0 +1,482 @@ @@ -398305,7 +398305,7 @@ index 000000000000..146fd48bab92 +} 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 +index 000000000..85890f1e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.c @@ -0,0 +1,182 @@ @@ -398493,7 +398493,7 @@ index 000000000000..85890f1e85f5 +} 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 +index 000000000..ee9e751f2 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.h @@ -0,0 +1,92 @@ @@ -398591,7 +398591,7 @@ index 000000000000..ee9e751f2d79 +#endif /* _KBASE_PM_CA_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c new file mode 100755 -index 000000000000..66bf660cffb6 +index 000000000..66bf660cf --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.c @@ -0,0 +1,129 @@ @@ -398726,7 +398726,7 @@ index 000000000000..66bf660cffb6 + diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h new file mode 100755 -index 000000000000..7ab3cd4d8460 +index 000000000..7ab3cd4d8 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_devfreq.h @@ -0,0 +1,55 @@ @@ -398787,7 +398787,7 @@ index 000000000000..7ab3cd4d8460 + 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 +index 000000000..864612d31 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.c @@ -0,0 +1,65 @@ @@ -398858,7 +398858,7 @@ index 000000000000..864612d31f9b +KBASE_EXPORT_TEST_API(kbase_pm_ca_fixed_policy_ops); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h new file mode 100755 -index 000000000000..a763155cb703 +index 000000000..a763155cb --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca_fixed.h @@ -0,0 +1,40 @@ @@ -398904,7 +398904,7 @@ index 000000000000..a763155cb703 + 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 +index 000000000..f891fa225 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.c @@ -0,0 +1,70 @@ @@ -398980,7 +398980,7 @@ index 000000000000..f891fa225a89 +KBASE_EXPORT_TEST_API(kbase_pm_coarse_demand_policy_ops); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h new file mode 100755 -index 000000000000..749d305eee9a +index 000000000..749d305ee --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_coarse_demand.h @@ -0,0 +1,64 @@ @@ -399050,7 +399050,7 @@ index 000000000000..749d305eee9a +#endif /* MALI_KBASE_PM_COARSE_DEMAND_H */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h new file mode 100755 -index 000000000000..352744ee6d73 +index 000000000..352744ee6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h @@ -0,0 +1,519 @@ @@ -399575,7 +399575,7 @@ index 000000000000..352744ee6d73 +#endif /* _KBASE_PM_HWACCESS_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c new file mode 100755 -index 000000000000..81322fd0dd17 +index 000000000..81322fd0d --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c @@ -0,0 +1,73 @@ @@ -399654,7 +399654,7 @@ index 000000000000..81322fd0dd17 +KBASE_EXPORT_TEST_API(kbase_pm_demand_policy_ops); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h new file mode 100755 -index 000000000000..c0c84b6e9189 +index 000000000..c0c84b6e9 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h @@ -0,0 +1,64 @@ @@ -399724,7 +399724,7 @@ index 000000000000..c0c84b6e9189 +#endif /* MALI_KBASE_PM_DEMAND_H */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_driver.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_driver.c new file mode 100755 -index 000000000000..82727937c545 +index 000000000..82727937c --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_driver.c @@ -0,0 +1,1713 @@ @@ -401443,7 +401443,7 @@ index 000000000000..82727937c545 +KBASE_EXPORT_TEST_API(kbase_pm_release_gpu_cycle_counter); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_internal.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_internal.h new file mode 100755 -index 000000000000..6804f45ac27b +index 000000000..6804f45ac --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_internal.h @@ -0,0 +1,548 @@ @@ -401997,7 +401997,7 @@ index 000000000000..6804f45ac27b +#endif /* _KBASE_BACKEND_PM_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_metrics.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_metrics.c new file mode 100755 -index 000000000000..024248ca7123 +index 000000000..024248ca7 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_metrics.c @@ -0,0 +1,401 @@ @@ -402404,7 +402404,7 @@ index 000000000000..024248ca7123 +} 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 +index 000000000..075f020c6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.c @@ -0,0 +1,973 @@ @@ -403383,7 +403383,7 @@ index 000000000000..075f020c66e6 +KBASE_EXPORT_TEST_API(kbase_pm_release_l2_caches); diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.h new file mode 100755 -index 000000000000..611a90e66e65 +index 000000000..611a90e66 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.h @@ -0,0 +1,227 @@ @@ -403616,7 +403616,7 @@ index 000000000000..611a90e66e65 +#endif /* _KBASE_PM_POLICY_H_ */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c new file mode 100755 -index 000000000000..d08c628dd433 +index 000000000..d08c628dd --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c @@ -0,0 +1,103 @@ @@ -403725,7 +403725,7 @@ index 000000000000..d08c628dd433 +#endif /* CONFIG_MALI_NO_MALI */ diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.h new file mode 100755 -index 000000000000..433aa4b9cb5e +index 000000000..433aa4b9c --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.h @@ -0,0 +1,52 @@ @@ -403783,7 +403783,7 @@ index 000000000000..433aa4b9cb5e +#endif /* _KBASE_BACKEND_TIME_H_ */ diff --git a/drivers/gpu/arm/midgard/docs/Doxyfile b/drivers/gpu/arm/midgard/docs/Doxyfile new file mode 100755 -index 000000000000..35ff2f1ce4a0 +index 000000000..35ff2f1ce --- /dev/null +++ b/drivers/gpu/arm/midgard/docs/Doxyfile @@ -0,0 +1,126 @@ @@ -403915,7 +403915,7 @@ index 000000000000..35ff2f1ce4a0 + 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 +index 000000000..7ae05c2f8 --- /dev/null +++ b/drivers/gpu/arm/midgard/docs/policy_operation_diagram.dot @@ -0,0 +1,112 @@ @@ -404033,7 +404033,7 @@ index 000000000000..7ae05c2f8ded +} diff --git a/drivers/gpu/arm/midgard/docs/policy_overview.dot b/drivers/gpu/arm/midgard/docs/policy_overview.dot new file mode 100755 -index 000000000000..159b993b7d61 +index 000000000..159b993b7 --- /dev/null +++ b/drivers/gpu/arm/midgard/docs/policy_overview.dot @@ -0,0 +1,63 @@ @@ -404102,7 +404102,7 @@ index 000000000000..159b993b7d61 +} diff --git a/drivers/gpu/arm/midgard/ipa/Kbuild b/drivers/gpu/arm/midgard/ipa/Kbuild new file mode 100755 -index 000000000000..602b15f5225c +index 000000000..602b15f52 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/Kbuild @@ -0,0 +1,24 @@ @@ -404132,7 +404132,7 @@ index 000000000000..602b15f5225c +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 +index 000000000..01bdbb4e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c @@ -0,0 +1,585 @@ @@ -404723,7 +404723,7 @@ index 000000000000..01bdbb4e8eb1 +KBASE_EXPORT_TEST_API(kbase_ipa_power_model_ops); diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h new file mode 100755 -index 000000000000..b2d3db149579 +index 000000000..b2d3db149 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h @@ -0,0 +1,148 @@ @@ -404877,7 +404877,7 @@ index 000000000000..b2d3db149579 +#endif diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.c b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.c new file mode 100755 -index 000000000000..eafc14009ddc +index 000000000..eafc14009 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.c @@ -0,0 +1,219 @@ @@ -405102,7 +405102,7 @@ index 000000000000..eafc14009ddc +} 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 +index 000000000..ec06e2096 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.h @@ -0,0 +1,49 @@ @@ -405157,7 +405157,7 @@ index 000000000000..ec06e2096f94 +#endif /* _KBASE_IPA_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_simple.c b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_simple.c new file mode 100755 -index 000000000000..da0a4d4a0e7e +index 000000000..da0a4d4a0 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_simple.c @@ -0,0 +1,222 @@ @@ -405385,7 +405385,7 @@ index 000000000000..da0a4d4a0e7e +}; 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 +index 000000000..6be0a334f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_hwconfig_features.h @@ -0,0 +1,311 @@ @@ -405702,7 +405702,7 @@ index 000000000000..6be0a334f99f +#endif /* _BASE_HWCONFIG_FEATURES_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_base_hwconfig_issues.h b/drivers/gpu/arm/midgard/mali_base_hwconfig_issues.h new file mode 100755 -index 000000000000..6d7e5c57e6a4 +index 000000000..6d7e5c57e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_hwconfig_issues.h @@ -0,0 +1,1098 @@ @@ -406806,7 +406806,7 @@ index 000000000000..6d7e5c57e6a4 +#endif /* _BASE_HWCONFIG_ISSUES_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_base_kernel.h b/drivers/gpu/arm/midgard/mali_base_kernel.h new file mode 100755 -index 000000000000..ea5e473caef6 +index 000000000..ea5e473ca --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_kernel.h @@ -0,0 +1,1858 @@ @@ -408670,7 +408670,7 @@ index 000000000000..ea5e473caef6 +#endif /* _BASE_KERNEL_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_base_mem_priv.h b/drivers/gpu/arm/midgard/mali_base_mem_priv.h new file mode 100755 -index 000000000000..4a98a72cc37a +index 000000000..4a98a72cc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_mem_priv.h @@ -0,0 +1,52 @@ @@ -408728,7 +408728,7 @@ index 000000000000..4a98a72cc37a +#endif diff --git a/drivers/gpu/arm/midgard/mali_base_vendor_specific_func.h b/drivers/gpu/arm/midgard/mali_base_vendor_specific_func.h new file mode 100755 -index 000000000000..be454a216a39 +index 000000000..be454a216 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_vendor_specific_func.h @@ -0,0 +1,24 @@ @@ -408758,7 +408758,7 @@ index 000000000000..be454a216a39 +#endif /*_BASE_VENDOR_SPEC_FUNC_H_*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase.h b/drivers/gpu/arm/midgard/mali_kbase.h new file mode 100755 -index 000000000000..0d9bf23dc685 +index 000000000..0d9bf23dc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase.h @@ -0,0 +1,612 @@ @@ -409376,7 +409376,7 @@ index 000000000000..0d9bf23dc685 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.c b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.c new file mode 100755 -index 000000000000..fde0f8ff8582 +index 000000000..fde0f8ff8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.c @@ -0,0 +1,209 @@ @@ -409591,7 +409591,7 @@ index 000000000000..fde0f8ff8582 +} 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 +index 000000000..099a29861 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.h @@ -0,0 +1,23 @@ @@ -409620,7 +409620,7 @@ index 000000000000..099a29861672 +#endif /* _KBASE_10969_WORKAROUND_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.c new file mode 100755 -index 000000000000..f910fe970feb +index 000000000..f910fe970 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.c @@ -0,0 +1,102 @@ @@ -409728,7 +409728,7 @@ index 000000000000..f910fe970feb +} 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 +index 000000000..3ed224889 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.h @@ -0,0 +1,45 @@ @@ -409779,7 +409779,7 @@ index 000000000000..3ed2248897fc +#endif /*_KBASE_AS_FAULT_DEBUG_FS_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_cache_policy.c b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.c new file mode 100755 -index 000000000000..c67b3e97f1af +index 000000000..c67b3e97f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.c @@ -0,0 +1,64 @@ @@ -409849,7 +409849,7 @@ index 000000000000..c67b3e97f1af +} 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 +index 000000000..0c18bdb35 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.h @@ -0,0 +1,45 @@ @@ -409900,7 +409900,7 @@ index 000000000000..0c18bdb357b0 +#endif /* _KBASE_CACHE_POLICY_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_config.c b/drivers/gpu/arm/midgard/mali_kbase_config.c new file mode 100755 -index 000000000000..fb615ae02ead +index 000000000..fb615ae02 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_config.c @@ -0,0 +1,51 @@ @@ -409957,7 +409957,7 @@ index 000000000000..fb615ae02ead + diff --git a/drivers/gpu/arm/midgard/mali_kbase_config.h b/drivers/gpu/arm/midgard/mali_kbase_config.h new file mode 100755 -index 000000000000..356d52bcd774 +index 000000000..356d52bcd --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_config.h @@ -0,0 +1,345 @@ @@ -410308,7 +410308,7 @@ index 000000000000..356d52bcd774 +#endif /* _KBASE_CONFIG_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h b/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h new file mode 100755 -index 000000000000..1cf44b3500cf +index 000000000..1cf44b350 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h @@ -0,0 +1,227 @@ @@ -410541,7 +410541,7 @@ index 000000000000..1cf44b3500cf + 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 +index 000000000..6338a7e22 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_context.c @@ -0,0 +1,342 @@ @@ -410889,7 +410889,7 @@ index 000000000000..6338a7e221ed +KBASE_EXPORT_SYMBOL(kbase_context_set_create_flags); diff --git a/drivers/gpu/arm/midgard/mali_kbase_context.h b/drivers/gpu/arm/midgard/mali_kbase_context.h new file mode 100755 -index 000000000000..a3f5bb0ce0da +index 000000000..a3f5bb0ce --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_context.h @@ -0,0 +1,90 @@ @@ -410985,7 +410985,7 @@ index 000000000000..a3f5bb0ce0da +#endif /* _KBASE_CONTEXT_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c new file mode 100755 -index 000000000000..1425dcc0718f +index 000000000..1425dcc07 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c @@ -0,0 +1,4990 @@ @@ -415981,7 +415981,7 @@ index 000000000000..1425dcc0718f +#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 +index 000000000..ce0048414 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.c @@ -0,0 +1,208 @@ @@ -416195,7 +416195,7 @@ index 000000000000..ce004841403f +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.h b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.h new file mode 100755 -index 000000000000..47474fecc2a9 +index 000000000..47474fecc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.h @@ -0,0 +1,134 @@ @@ -416335,7 +416335,7 @@ index 000000000000..47474fecc2a9 +#endif /* _KBASE_CTX_SCHED_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug.c b/drivers/gpu/arm/midgard/mali_kbase_debug.c new file mode 100755 -index 000000000000..fb57ac2e31ad +index 000000000..fb57ac2e3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug.c @@ -0,0 +1,39 @@ @@ -416380,7 +416380,7 @@ index 000000000000..fb57ac2e31ad + 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 +index 000000000..5fff2892b --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug.h @@ -0,0 +1,164 @@ @@ -416550,7 +416550,7 @@ index 000000000000..5fff2892bb55 +#endif /* _KBASE_DEBUG_H */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.c b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.c new file mode 100755 -index 000000000000..f29430ddf8f9 +index 000000000..f29430ddf --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.c @@ -0,0 +1,499 @@ @@ -417055,7 +417055,7 @@ index 000000000000..f29430ddf8f9 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.h b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.h new file mode 100755 -index 000000000000..a2bf8983c37c +index 000000000..a2bf8983c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.h @@ -0,0 +1,96 @@ @@ -417157,7 +417157,7 @@ index 000000000000..a2bf8983c37c +#endif /*_KBASE_DEBUG_JOB_FAULT_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c new file mode 100755 -index 000000000000..6f2cbdf571cb +index 000000000..6f2cbdf57 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c @@ -0,0 +1,306 @@ @@ -417469,7 +417469,7 @@ index 000000000000..6f2cbdf571cb +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.h b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.h new file mode 100755 -index 000000000000..20ab51a776c6 +index 000000000..20ab51a77 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.h @@ -0,0 +1,25 @@ @@ -417500,7 +417500,7 @@ index 000000000000..20ab51a776c6 +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_defs.h b/drivers/gpu/arm/midgard/mali_kbase_defs.h new file mode 100755 -index 000000000000..b35cade71391 +index 000000000..b35cade71 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_defs.h @@ -0,0 +1,1600 @@ @@ -419106,7 +419106,7 @@ index 000000000000..b35cade71391 +#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 +index 000000000..b0eb67da8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_device.c @@ -0,0 +1,674 @@ @@ -419786,7 +419786,7 @@ index 000000000000..b0eb67da8644 + 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 +index 000000000..f70bcccf4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_disjoint_events.c @@ -0,0 +1,76 @@ @@ -419868,7 +419868,7 @@ index 000000000000..f70bcccf4050 +KBASE_EXPORT_TEST_API(kbase_disjoint_event_get); diff --git a/drivers/gpu/arm/midgard/mali_kbase_dma_fence.c b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.c new file mode 100755 -index 000000000000..9197743c81d4 +index 000000000..9197743c8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.c @@ -0,0 +1,449 @@ @@ -420323,7 +420323,7 @@ index 000000000000..9197743c81d4 +} 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 +index 000000000..c9ab40350 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.h @@ -0,0 +1,131 @@ @@ -420460,7 +420460,7 @@ index 000000000000..c9ab40350422 +#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 +index 000000000..188148645 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_event.c @@ -0,0 +1,259 @@ @@ -420725,7 +420725,7 @@ index 000000000000..188148645f37 +KBASE_EXPORT_TEST_API(kbase_event_cleanup); diff --git a/drivers/gpu/arm/midgard/mali_kbase_fence.c b/drivers/gpu/arm/midgard/mali_kbase_fence.c new file mode 100755 -index 000000000000..3bcfb38c31c2 +index 000000000..3bcfb38c3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_fence.c @@ -0,0 +1,200 @@ @@ -420931,7 +420931,7 @@ index 000000000000..3bcfb38c31c2 +} 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 +index 000000000..639cc2ef4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_fence.h @@ -0,0 +1,275 @@ @@ -421212,7 +421212,7 @@ index 000000000000..639cc2ef4348 +#endif /* _KBASE_FENCE_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h b/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h new file mode 100755 -index 000000000000..fa2c6dfe999e +index 000000000..fa2c6dfe9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h @@ -0,0 +1,51 @@ @@ -421269,7 +421269,7 @@ index 000000000000..fa2c6dfe999e +#endif /* _KBASE_FENCE_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator.h b/drivers/gpu/arm/midgard/mali_kbase_gator.h new file mode 100755 -index 000000000000..ce65b5562a2b +index 000000000..ce65b5562 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator.h @@ -0,0 +1,45 @@ @@ -421320,7 +421320,7 @@ index 000000000000..ce65b5562a2b +#endif /* _KBASE_GATOR_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_api.c b/drivers/gpu/arm/midgard/mali_kbase_gator_api.c new file mode 100755 -index 000000000000..860e10159fb3 +index 000000000..860e10159 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_api.c @@ -0,0 +1,334 @@ @@ -421660,7 +421660,7 @@ index 000000000000..860e10159fb3 +KBASE_EXPORT_SYMBOL(kbase_gator_instr_hwcnt_dump_irq); diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_api.h b/drivers/gpu/arm/midgard/mali_kbase_gator_api.h new file mode 100755 -index 000000000000..ef9ac0f7b633 +index 000000000..ef9ac0f7b --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_api.h @@ -0,0 +1,219 @@ @@ -421885,7 +421885,7 @@ index 000000000000..ef9ac0f7b633 +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names.h new file mode 100755 -index 000000000000..cad19b66200d +index 000000000..cad19b662 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names.h @@ -0,0 +1,2170 @@ @@ -424061,7 +424061,7 @@ index 000000000000..cad19b66200d +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_thex.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_thex.h new file mode 100755 -index 000000000000..bcceef4fc9bc +index 000000000..bcceef4fc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_thex.h @@ -0,0 +1,291 @@ @@ -424358,7 +424358,7 @@ index 000000000000..bcceef4fc9bc +#endif /* _KBASE_GATOR_HWCNT_NAMES_THEX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tmix.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tmix.h new file mode 100755 -index 000000000000..5ea06770fdb2 +index 000000000..5ea06770f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tmix.h @@ -0,0 +1,291 @@ @@ -424655,7 +424655,7 @@ index 000000000000..5ea06770fdb2 +#endif /* _KBASE_GATOR_HWCNT_NAMES_TMIX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tsix.h b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tsix.h new file mode 100755 -index 000000000000..be09c4556735 +index 000000000..be09c4556 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tsix.h @@ -0,0 +1,291 @@ @@ -424952,7 +424952,7 @@ index 000000000000..be09c4556735 +#endif /* _KBASE_GATOR_HWCNT_NAMES_TSIX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h b/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h new file mode 100755 -index 000000000000..42f0111c474f +index 000000000..42f0111c4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h @@ -0,0 +1,123 @@ @@ -425081,7 +425081,7 @@ index 000000000000..42f0111c474f +#endif /* _KBASE_GPU_ID_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.c new file mode 100755 -index 000000000000..6df0a1cb1264 +index 000000000..6df0a1cb1 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.c @@ -0,0 +1,97 @@ @@ -425184,7 +425184,7 @@ index 000000000000..6df0a1cb1264 +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.h new file mode 100755 -index 000000000000..7045693eb910 +index 000000000..7045693eb --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.h @@ -0,0 +1,37 @@ @@ -425227,7 +425227,7 @@ index 000000000000..7045693eb910 +#endif /*_KBASE_GPU_MEMORY_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpuprops.c b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.c new file mode 100755 -index 000000000000..a947a2e03a2f +index 000000000..a947a2e03 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.c @@ -0,0 +1,510 @@ @@ -425743,7 +425743,7 @@ index 000000000000..a947a2e03a2f +} 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 +index 000000000..57b3eaf9c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.h @@ -0,0 +1,84 @@ @@ -425833,7 +425833,7 @@ index 000000000000..57b3eaf9cd53 +#endif /* _KBASE_GPUPROPS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_gpuprops_types.h b/drivers/gpu/arm/midgard/mali_kbase_gpuprops_types.h new file mode 100755 -index 000000000000..10794fc27318 +index 000000000..10794fc27 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops_types.h @@ -0,0 +1,92 @@ @@ -425931,7 +425931,7 @@ index 000000000000..10794fc27318 +#endif /* _KBASE_GPUPROPS_TYPES_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hw.c b/drivers/gpu/arm/midgard/mali_kbase_hw.c new file mode 100755 -index 000000000000..9a390d233939 +index 000000000..9a390d233 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hw.c @@ -0,0 +1,453 @@ @@ -426390,7 +426390,7 @@ index 000000000000..9a390d233939 +} 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 +index 000000000..754250ce9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hw.h @@ -0,0 +1,65 @@ @@ -426461,7 +426461,7 @@ index 000000000000..754250ce968d +#endif /* _KBASE_HW_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_backend.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_backend.h new file mode 100755 -index 000000000000..b09be99e6b4e +index 000000000..b09be99e6 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_backend.h @@ -0,0 +1,54 @@ @@ -426521,7 +426521,7 @@ index 000000000000..b09be99e6b4e +#endif /* _KBASE_HWACCESS_BACKEND_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_defs.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_defs.h new file mode 100755 -index 000000000000..0acf297192fd +index 000000000..0acf29719 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_defs.h @@ -0,0 +1,36 @@ @@ -426563,7 +426563,7 @@ index 000000000000..0acf297192fd +#endif /* _KBASE_HWACCESS_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_gpuprops.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_gpuprops.h new file mode 100755 -index 000000000000..cf8a8131c22e +index 000000000..cf8a8131c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_gpuprops.h @@ -0,0 +1,47 @@ @@ -426616,7 +426616,7 @@ index 000000000000..cf8a8131c22e +#endif /* _KBASE_HWACCESS_GPUPROPS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_instr.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_instr.h new file mode 100755 -index 000000000000..5de2b7535bb4 +index 000000000..5de2b7535 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_instr.h @@ -0,0 +1,116 @@ @@ -426738,7 +426738,7 @@ index 000000000000..5de2b7535bb4 +#endif /* _KBASE_HWACCESS_INSTR_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_jm.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_jm.h new file mode 100755 -index 000000000000..750fda2cd81d +index 000000000..750fda2cd --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_jm.h @@ -0,0 +1,381 @@ @@ -427125,7 +427125,7 @@ index 000000000000..750fda2cd81d +#endif /* _KBASE_HWACCESS_JM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_pm.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_pm.h new file mode 100755 -index 000000000000..71c7d495c40a +index 000000000..71c7d495c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_pm.h @@ -0,0 +1,209 @@ @@ -427340,7 +427340,7 @@ index 000000000000..71c7d495c40a +#endif /* _KBASE_HWACCESS_PM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwaccess_time.h b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_time.h new file mode 100755 -index 000000000000..10b65798e6cf +index 000000000..10b65798e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_time.h @@ -0,0 +1,53 @@ @@ -427399,7 +427399,7 @@ index 000000000000..10b65798e6cf +#endif /* _KBASE_BACKEND_TIME_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_hwcnt_reader.h b/drivers/gpu/arm/midgard/mali_kbase_hwcnt_reader.h new file mode 100755 -index 000000000000..cf7bf1b35dc5 +index 000000000..cf7bf1b35 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwcnt_reader.h @@ -0,0 +1,66 @@ @@ -427471,7 +427471,7 @@ index 000000000000..cf7bf1b35dc5 + 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 +index 000000000..dcbed9c77 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_ioctl.h @@ -0,0 +1,656 @@ @@ -428133,7 +428133,7 @@ index 000000000000..dcbed9c774d6 +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_jd.c b/drivers/gpu/arm/midgard/mali_kbase_jd.c new file mode 100755 -index 000000000000..d9d8658d31dc +index 000000000..d9d8658d3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jd.c @@ -0,0 +1,1903 @@ @@ -430042,7 +430042,7 @@ index 000000000000..d9d8658d31dc +KBASE_EXPORT_TEST_API(kbase_jd_exit); diff --git a/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c new file mode 100755 -index 000000000000..44643abf85aa +index 000000000..44643abf8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c @@ -0,0 +1,233 @@ @@ -430281,7 +430281,7 @@ index 000000000000..44643abf85aa +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.h new file mode 100755 -index 000000000000..0935f1db7296 +index 000000000..0935f1db7 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.h @@ -0,0 +1,39 @@ @@ -430326,7 +430326,7 @@ index 000000000000..0935f1db7296 +#endif /*_KBASE_JD_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_jm.c b/drivers/gpu/arm/midgard/mali_kbase_jm.c new file mode 100755 -index 000000000000..0c5c6a6f78cb +index 000000000..0c5c6a6f7 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jm.c @@ -0,0 +1,131 @@ @@ -430463,7 +430463,7 @@ index 000000000000..0c5c6a6f78cb + diff --git a/drivers/gpu/arm/midgard/mali_kbase_jm.h b/drivers/gpu/arm/midgard/mali_kbase_jm.h new file mode 100755 -index 000000000000..a74ee24c8058 +index 000000000..a74ee24c8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jm.h @@ -0,0 +1,110 @@ @@ -430579,7 +430579,7 @@ index 000000000000..a74ee24c8058 +#endif /* _KBASE_JM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_js.c b/drivers/gpu/arm/midgard/mali_kbase_js.c new file mode 100755 -index 000000000000..10a1d5909bbe +index 000000000..10a1d5909 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js.c @@ -0,0 +1,2834 @@ @@ -433419,7 +433419,7 @@ index 000000000000..10a1d5909bbe +} 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 +index 000000000..ddada8e46 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js.h @@ -0,0 +1,925 @@ @@ -434350,7 +434350,7 @@ index 000000000000..ddada8e468a1 +#endif /* _KBASE_JS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.c b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.c new file mode 100755 -index 000000000000..321506ada835 +index 000000000..321506ada --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.c @@ -0,0 +1,301 @@ @@ -434657,7 +434657,7 @@ index 000000000000..321506ada835 +} 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 +index 000000000..ce9183326 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.h @@ -0,0 +1,158 @@ @@ -434821,7 +434821,7 @@ index 000000000000..ce9183326a57 +#endif /* _KBASE_JS_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_js_defs.h b/drivers/gpu/arm/midgard/mali_kbase_js_defs.h new file mode 100755 -index 000000000000..ba8b6441549b +index 000000000..ba8b64415 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js_defs.h @@ -0,0 +1,386 @@ @@ -435213,7 +435213,7 @@ index 000000000000..ba8b6441549b +#endif /* _KBASE_JS_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_linux.h b/drivers/gpu/arm/midgard/mali_kbase_linux.h new file mode 100755 -index 000000000000..6d1e61fd41e0 +index 000000000..6d1e61fd4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_linux.h @@ -0,0 +1,43 @@ @@ -435262,7 +435262,7 @@ index 000000000000..6d1e61fd41e0 +#endif /* _KBASE_LINUX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem.c b/drivers/gpu/arm/midgard/mali_kbase_mem.c new file mode 100755 -index 000000000000..8cbb5f6765b8 +index 000000000..8cbb5f676 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem.c @@ -0,0 +1,2657 @@ @@ -437925,7 +437925,7 @@ index 000000000000..8cbb5f6765b8 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem.h b/drivers/gpu/arm/midgard/mali_kbase_mem.h new file mode 100755 -index 000000000000..3f3eaa3fda98 +index 000000000..3f3eaa3fd --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem.h @@ -0,0 +1,1068 @@ @@ -438999,7 +438999,7 @@ index 000000000000..3f3eaa3fda98 +#endif /* _KBASE_MEM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c new file mode 100755 -index 000000000000..e20315e67242 +index 000000000..e20315e67 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c @@ -0,0 +1,2578 @@ @@ -441583,7 +441583,7 @@ index 000000000000..e20315e67242 + 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 +index 000000000..33b3554f9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.h @@ -0,0 +1,231 @@ @@ -441820,7 +441820,7 @@ index 000000000000..33b3554f9d82 +#endif /* _KBASE_MEM_LINUX_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_lowlevel.h b/drivers/gpu/arm/midgard/mali_kbase_mem_lowlevel.h new file mode 100755 -index 000000000000..9725fd3f05df +index 000000000..9725fd3f0 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_lowlevel.h @@ -0,0 +1,45 @@ @@ -441871,7 +441871,7 @@ index 000000000000..9725fd3f05df +#endif /* _KBASE_LOWLEVEL_H */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_pool.c b/drivers/gpu/arm/midgard/mali_kbase_mem_pool.c new file mode 100755 -index 000000000000..a8269940a037 +index 000000000..a8269940a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool.c @@ -0,0 +1,569 @@ @@ -442446,7 +442446,7 @@ index 000000000000..a8269940a037 +} 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 +index 000000000..585fba036 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.c @@ -0,0 +1,81 @@ @@ -442533,7 +442533,7 @@ index 000000000000..585fba036c9e +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.h new file mode 100755 -index 000000000000..1442854e8956 +index 000000000..1442854e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.h @@ -0,0 +1,36 @@ @@ -442575,7 +442575,7 @@ index 000000000000..1442854e8956 + 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 +index 000000000..d58fd8d62 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c @@ -0,0 +1,121 @@ @@ -442702,7 +442702,7 @@ index 000000000000..d58fd8d62fde +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.h new file mode 100755 -index 000000000000..a1dc2e0b165b +index 000000000..a1dc2e0b1 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.h @@ -0,0 +1,59 @@ @@ -442767,7 +442767,7 @@ index 000000000000..a1dc2e0b165b + 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 +index 000000000..82f070297 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs_buf_size.h @@ -0,0 +1,33 @@ @@ -442806,7 +442806,7 @@ index 000000000000..82f0702974c2 + 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 +index 000000000..26144850a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu.c @@ -0,0 +1,2088 @@ @@ -444900,7 +444900,7 @@ index 000000000000..26144850a588 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu_hw.h b/drivers/gpu/arm/midgard/mali_kbase_mmu_hw.h new file mode 100755 -index 000000000000..986e959e9a0c +index 000000000..986e959e9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_hw.h @@ -0,0 +1,123 @@ @@ -445029,7 +445029,7 @@ index 000000000000..986e959e9a0c +#endif /* _MALI_KBASE_MMU_HW_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu_mode.h b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode.h new file mode 100755 -index 000000000000..b487c00426ae +index 000000000..b487c0042 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode.h @@ -0,0 +1,47 @@ @@ -445082,7 +445082,7 @@ index 000000000000..b487c00426ae +#endif /* _MALI_KBASE_MMU_MODE_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_aarch64.c b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_aarch64.c new file mode 100755 -index 000000000000..60df171164ff +index 000000000..60df17116 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_aarch64.c @@ -0,0 +1,200 @@ @@ -445288,7 +445288,7 @@ index 000000000000..60df171164ff +} 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 +index 000000000..53fbbc73a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_lpae.c @@ -0,0 +1,198 @@ @@ -445492,7 +445492,7 @@ index 000000000000..53fbbc73af91 +} 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 +index 000000000..1a44957fe --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_platform_fake.c @@ -0,0 +1,124 @@ @@ -445622,7 +445622,7 @@ index 000000000000..1a44957fe44a + 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 +index 000000000..97d543464 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_pm.c @@ -0,0 +1,205 @@ @@ -445833,7 +445833,7 @@ index 000000000000..97d543464c28 + diff --git a/drivers/gpu/arm/midgard/mali_kbase_pm.h b/drivers/gpu/arm/midgard/mali_kbase_pm.h new file mode 100755 -index 000000000000..37fa2479df74 +index 000000000..37fa2479d --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_pm.h @@ -0,0 +1,171 @@ @@ -446010,7 +446010,7 @@ index 000000000000..37fa2479df74 +#endif /* _KBASE_PM_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_profiling_gator_api.h b/drivers/gpu/arm/midgard/mali_kbase_profiling_gator_api.h new file mode 100755 -index 000000000000..7fb674eded37 +index 000000000..7fb674ede --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_profiling_gator_api.h @@ -0,0 +1,40 @@ @@ -446056,7 +446056,7 @@ index 000000000000..7fb674eded37 +#endif /* _KBASE_PROFILING_GATOR_API */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.c new file mode 100755 -index 000000000000..c970650069cd +index 000000000..c97065006 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.c @@ -0,0 +1,130 @@ @@ -446192,7 +446192,7 @@ index 000000000000..c970650069cd +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.h b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.h new file mode 100755 -index 000000000000..f10837002330 +index 000000000..f10837002 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.h @@ -0,0 +1,50 @@ @@ -446248,7 +446248,7 @@ index 000000000000..f10837002330 +#endif /*_KBASE_REGS_HISTORY_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/midgard/mali_kbase_replay.c b/drivers/gpu/arm/midgard/mali_kbase_replay.c new file mode 100755 -index 000000000000..84aa3316e435 +index 000000000..84aa3316e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_replay.c @@ -0,0 +1,1166 @@ @@ -447420,7 +447420,7 @@ index 000000000000..84aa3316e435 +} 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 +index 000000000..6c8cf73ae --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_smc.c @@ -0,0 +1,86 @@ @@ -447512,7 +447512,7 @@ index 000000000000..6c8cf73ae58c + 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 +index 000000000..9bff3d2e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_smc.h @@ -0,0 +1,67 @@ @@ -447585,7 +447585,7 @@ index 000000000000..9bff3d2e8b4d +#endif /* _KBASE_SMC_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_softjobs.c b/drivers/gpu/arm/midgard/mali_kbase_softjobs.c new file mode 100755 -index 000000000000..396953e780a8 +index 000000000..396953e78 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_softjobs.c @@ -0,0 +1,1549 @@ @@ -449140,7 +449140,7 @@ index 000000000000..396953e780a8 +} 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 +index 000000000..c98762cec --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_strings.c @@ -0,0 +1,23 @@ @@ -449169,7 +449169,7 @@ index 000000000000..c98762cec244 +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 +index 000000000..41b8fdbec --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_strings.h @@ -0,0 +1,19 @@ @@ -449194,7 +449194,7 @@ index 000000000000..41b8fdbec6a4 +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 +index 000000000..33b580595 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync.h @@ -0,0 +1,203 @@ @@ -449403,7 +449403,7 @@ index 000000000000..33b580595563 +#endif /* MALI_KBASE_SYNC_H */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync_android.c b/drivers/gpu/arm/midgard/mali_kbase_sync_android.c new file mode 100755 -index 000000000000..d7349dcae69a +index 000000000..d7349dcae --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync_android.c @@ -0,0 +1,537 @@ @@ -449946,7 +449946,7 @@ index 000000000000..d7349dcae69a +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync_common.c b/drivers/gpu/arm/midgard/mali_kbase_sync_common.c new file mode 100755 -index 000000000000..457def296684 +index 000000000..457def296 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync_common.c @@ -0,0 +1,43 @@ @@ -449995,7 +449995,7 @@ index 000000000000..457def296684 +} 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 +index 000000000..60b5d74db --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync_file.c @@ -0,0 +1,359 @@ @@ -450360,7 +450360,7 @@ index 000000000000..60b5d74db33e +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_tlstream.c b/drivers/gpu/arm/midgard/mali_kbase_tlstream.c new file mode 100755 -index 000000000000..c8310c45f143 +index 000000000..c8310c45f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_tlstream.c @@ -0,0 +1,2572 @@ @@ -452938,7 +452938,7 @@ index 000000000000..c8310c45f143 +} 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 +index 000000000..c0a1117d5 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_tlstream.h @@ -0,0 +1,623 @@ @@ -453567,7 +453567,7 @@ index 000000000000..c0a1117d5f25 + 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 +index 000000000..e2e054420 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_defs.h @@ -0,0 +1,264 @@ @@ -453837,7 +453837,7 @@ index 000000000000..e2e0544208ce +/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c new file mode 100755 -index 000000000000..5830e87f0818 +index 000000000..5830e87f0 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c @@ -0,0 +1,236 @@ @@ -454079,7 +454079,7 @@ index 000000000000..5830e87f0818 +#endif /* CONFIG_MALI_TRACE_TIMELINE */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.h b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.h new file mode 100755 -index 000000000000..a04f7c1420e0 +index 000000000..a04f7c142 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.h @@ -0,0 +1,363 @@ @@ -454448,7 +454448,7 @@ index 000000000000..a04f7c1420e0 + 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 +index 000000000..156a95a67 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline_defs.h @@ -0,0 +1,140 @@ @@ -454594,7 +454594,7 @@ index 000000000000..156a95a67f4a +"_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 +index 000000000..c22a59324 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_uku.h @@ -0,0 +1,545 @@ @@ -455145,7 +455145,7 @@ index 000000000000..c22a59324248 + 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 +index 000000000..be474ff87 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_utility.c @@ -0,0 +1,33 @@ @@ -455184,7 +455184,7 @@ index 000000000000..be474ff87401 +} 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 +index 000000000..fd7252dab --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_utility.h @@ -0,0 +1,37 @@ @@ -455227,7 +455227,7 @@ index 000000000000..fd7252dab0de +#endif /* _KBASE_UTILITY_H */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_vinstr.c b/drivers/gpu/arm/midgard/mali_kbase_vinstr.c new file mode 100755 -index 000000000000..8395568d0efa +index 000000000..8395568d0 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_vinstr.c @@ -0,0 +1,2070 @@ @@ -457303,7 +457303,7 @@ index 000000000000..8395568d0efa +} 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 +index 000000000..6207d25ae --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_vinstr.h @@ -0,0 +1,155 @@ @@ -457464,7 +457464,7 @@ index 000000000000..6207d25aef06 + 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 +index 000000000..5d6b4021d --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_linux_kbase_trace.h @@ -0,0 +1,201 @@ @@ -457671,7 +457671,7 @@ index 000000000000..5d6b4021d626 +#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 +index 000000000..2be06a552 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_linux_trace.h @@ -0,0 +1,189 @@ @@ -457866,7 +457866,7 @@ index 000000000000..2be06a552768 +#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 +index 000000000..99452933e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_malisw.h @@ -0,0 +1,131 @@ @@ -458003,7 +458003,7 @@ index 000000000000..99452933eab4 +#endif /* _MALISW_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_midg_coherency.h b/drivers/gpu/arm/midgard/mali_midg_coherency.h new file mode 100755 -index 000000000000..a509cbd5f175 +index 000000000..a509cbd5f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_midg_coherency.h @@ -0,0 +1,26 @@ @@ -458035,7 +458035,7 @@ index 000000000000..a509cbd5f175 +#endif /* _MIDG_COHERENCY_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_midg_regmap.h b/drivers/gpu/arm/midgard/mali_midg_regmap.h new file mode 100755 -index 000000000000..7d7b7bcd3cc3 +index 000000000..7d7b7bcd3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_midg_regmap.h @@ -0,0 +1,611 @@ @@ -458652,7 +458652,7 @@ index 000000000000..7d7b7bcd3cc3 +#endif /* _MIDGARD_REGMAP_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_timeline.h b/drivers/gpu/arm/midgard/mali_timeline.h new file mode 100755 -index 000000000000..bd5f6614b6bb +index 000000000..bd5f6614b --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_timeline.h @@ -0,0 +1,396 @@ @@ -459054,7 +459054,7 @@ index 000000000000..bd5f6614b6bb + 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 +index 000000000..841d03fb5 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_uk.h @@ -0,0 +1,141 @@ @@ -459201,7 +459201,7 @@ index 000000000000..841d03fb5873 +#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 +index 000000000..8fb4e917c --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/Kconfig @@ -0,0 +1,24 @@ @@ -459231,7 +459231,7 @@ index 000000000000..8fb4e917c4fa + diff --git a/drivers/gpu/arm/midgard/platform/devicetree/Kbuild b/drivers/gpu/arm/midgard/platform/devicetree/Kbuild new file mode 100755 -index 000000000000..e888a42fc69a +index 000000000..e888a42fc --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/Kbuild @@ -0,0 +1,18 @@ @@ -459255,7 +459255,7 @@ index 000000000000..e888a42fc69a + $(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 +index 000000000..b2a7c93f1 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_devicetree.c @@ -0,0 +1,31 @@ @@ -459292,7 +459292,7 @@ index 000000000000..b2a7c93f12a9 +} 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 +index 000000000..49e107f98 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_platform.h @@ -0,0 +1,73 @@ @@ -459371,7 +459371,7 @@ index 000000000000..49e107f98000 +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c new file mode 100755 -index 000000000000..aa4376afd3ba +index 000000000..aa4376afd --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c @@ -0,0 +1,100 @@ @@ -459477,7 +459477,7 @@ index 000000000000..aa4376afd3ba + diff --git a/drivers/gpu/arm/midgard/platform/mali_kbase_platform_common.h b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_common.h new file mode 100755 -index 000000000000..c11085af5f24 +index 000000000..c11085af5 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_common.h @@ -0,0 +1,28 @@ @@ -459511,7 +459511,7 @@ index 000000000000..c11085af5f24 +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 +index 000000000..01f9dfce9 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_fake.h @@ -0,0 +1,38 @@ @@ -459555,7 +459555,7 @@ index 000000000000..01f9dfce93cc +#endif /* CONFIG_MALI_PLATFORM_FAKE */ diff --git a/drivers/gpu/arm/midgard/platform/rk/Kbuild b/drivers/gpu/arm/midgard/platform/rk/Kbuild new file mode 100755 -index 000000000000..db993487e3be +index 000000000..db993487e --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/Kbuild @@ -0,0 +1,17 @@ @@ -459578,7 +459578,7 @@ index 000000000000..db993487e3be + 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 +index 000000000..fe5e12241 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/custom_log.h @@ -0,0 +1,209 @@ @@ -459793,7 +459793,7 @@ index 000000000000..fe5e1224149e +#endif /* __CUSTOM_LOG_H__ */ diff --git a/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_platform.h new file mode 100755 -index 000000000000..07c5b6f8a760 +index 000000000..07c5b6f8a --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_platform.h @@ -0,0 +1,88 @@ @@ -459887,7 +459887,7 @@ index 000000000000..07c5b6f8a760 + 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..9c71a78f95d7 +index 000000000..9c71a78f9 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c @@ -0,0 +1,486 @@ @@ -460379,7 +460379,7 @@ index 000000000000..9c71a78f95d7 +} diff --git a/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c.rej b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c.rej new file mode 100644 -index 000000000000..a68ec9e6f4d6 +index 000000000..a68ec9e6f --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c.rej @@ -0,0 +1,20 @@ @@ -460405,7 +460405,7 @@ index 000000000000..a68ec9e6f4d6 + goto out; 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 +index 000000000..6eab25014 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_rk.h @@ -0,0 +1,62 @@ @@ -460473,7 +460473,7 @@ index 000000000000..6eab25014d21 + 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 +index 000000000..1caa29366 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/Kbuild @@ -0,0 +1,18 @@ @@ -460497,7 +460497,7 @@ index 000000000000..1caa293666d3 + $(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 +index 000000000..02835f129 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_platform.h @@ -0,0 +1,75 @@ @@ -460578,7 +460578,7 @@ index 000000000000..02835f129aa3 +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_vexpress.c new file mode 100755 -index 000000000000..15ce2bc5eea5 +index 000000000..15ce2bc5e --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_vexpress.c @@ -0,0 +1,85 @@ @@ -460669,7 +460669,7 @@ index 000000000000..15ce2bc5eea5 +} 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 +index 000000000..4665f98cb --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.c @@ -0,0 +1,279 @@ @@ -460954,7 +460954,7 @@ index 000000000000..4665f98cbbe4 +} diff --git a/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.h b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.h new file mode 100755 -index 000000000000..da865698133a +index 000000000..da8656981 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.h @@ -0,0 +1,38 @@ @@ -460998,7 +460998,7 @@ index 000000000000..da865698133a +#endif /* _KBASE_CPU_VEXPRESS_H_ */ diff --git a/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/Kbuild b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/Kbuild new file mode 100755 -index 000000000000..7efe8fa4263b +index 000000000..7efe8fa42 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/Kbuild @@ -0,0 +1,16 @@ @@ -461020,7 +461020,7 @@ index 000000000000..7efe8fa4263b +mali_kbase-y += $(MALI_PLATFORM_THIRDPARTY_DIR)/mali_kbase_config_vexpress.o diff --git a/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h new file mode 100755 -index 000000000000..0efbf3962f98 +index 000000000..0efbf3962 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h @@ -0,0 +1,73 @@ @@ -461099,7 +461099,7 @@ index 000000000000..0efbf3962f98 +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c new file mode 100755 -index 000000000000..3ff0930fb4a3 +index 000000000..3ff0930fb --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c @@ -0,0 +1,79 @@ @@ -461184,7 +461184,7 @@ index 000000000000..3ff0930fb4a3 +} 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 +index 000000000..1caa29366 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/Kbuild @@ -0,0 +1,18 @@ @@ -461208,7 +461208,7 @@ index 000000000000..1caa293666d3 + $(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 +index 000000000..dbdf21e00 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h @@ -0,0 +1,75 @@ @@ -461289,7 +461289,7 @@ index 000000000000..dbdf21e009f9 +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c new file mode 100755 -index 000000000000..76ffe4a1e59e +index 000000000..76ffe4a1e --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c @@ -0,0 +1,83 @@ @@ -461378,7 +461378,7 @@ index 000000000000..76ffe4a1e59e + diff --git a/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c new file mode 100755 -index 000000000000..816dff49835f +index 000000000..816dff498 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.c @@ -0,0 +1,71 @@ @@ -461455,7 +461455,7 @@ index 000000000000..816dff49835f +} 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 +index 000000000..23647ccb0 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress_6xvirtex7_10mhz/mali_kbase_cpu_vexpress.h @@ -0,0 +1,28 @@ @@ -461489,7 +461489,7 @@ index 000000000000..23647ccb0871 +#endif /* _KBASE_CPU_VEXPRESS_H_ */ diff --git a/drivers/gpu/arm/midgard/platform_dummy/mali_ukk_os.h b/drivers/gpu/arm/midgard/platform_dummy/mali_ukk_os.h new file mode 100755 -index 000000000000..5fa9b39c4bc0 +index 000000000..5fa9b39c4 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform_dummy/mali_ukk_os.h @@ -0,0 +1,53 @@ @@ -461548,7 +461548,7 @@ index 000000000000..5fa9b39c4bc0 +#endif /* _UKK_OS_H__ */ diff --git a/drivers/gpu/arm/midgard/protected_mode_switcher.h b/drivers/gpu/arm/midgard/protected_mode_switcher.h new file mode 100755 -index 000000000000..5dc2f3ba8cf6 +index 000000000..5dc2f3ba8 --- /dev/null +++ b/drivers/gpu/arm/midgard/protected_mode_switcher.h @@ -0,0 +1,64 @@ @@ -461618,7 +461618,7 @@ index 000000000000..5dc2f3ba8cf6 +#endif /* _PROTECTED_MODE_SWITCH_H_ */ diff --git a/drivers/gpu/arm/midgard/rename.h b/drivers/gpu/arm/midgard/rename.h new file mode 100755 -index 000000000000..c94b67ff2c27 +index 000000000..c94b67ff2 --- /dev/null +++ b/drivers/gpu/arm/midgard/rename.h @@ -0,0 +1,422 @@ @@ -462046,7 +462046,7 @@ index 000000000000..c94b67ff2c27 +#endif diff --git a/drivers/gpu/arm/midgard/sconscript b/drivers/gpu/arm/midgard/sconscript new file mode 100755 -index 000000000000..ff23d7aebe6e +index 000000000..ff23d7aeb --- /dev/null +++ b/drivers/gpu/arm/midgard/sconscript @@ -0,0 +1,92 @@ @@ -462144,7 +462144,7 @@ index 000000000000..ff23d7aebe6e +env.AppendUnique(BASE=['cutils_linked_list']) diff --git a/drivers/gpu/arm/midgard/tests/Kbuild b/drivers/gpu/arm/midgard/tests/Kbuild new file mode 100755 -index 000000000000..b4bed0473439 +index 000000000..b4bed0473 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/Kbuild @@ -0,0 +1,17 @@ @@ -462167,7 +462167,7 @@ index 000000000000..b4bed0473439 +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 +index 000000000..da0515c06 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/Kconfig @@ -0,0 +1,17 @@ @@ -462190,7 +462190,7 @@ index 000000000000..da0515c065de +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 +index 000000000..0d145e42a --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_mem.h @@ -0,0 +1,65 @@ @@ -462261,7 +462261,7 @@ index 000000000000..0d145e42a0ca +#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 +index 000000000..1cc85f1b7 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_resultset.h @@ -0,0 +1,121 @@ @@ -462388,7 +462388,7 @@ index 000000000000..1cc85f1b7a46 +#endif /* _KERNEL_UTF_RESULTSET_H_ */ diff --git a/drivers/gpu/arm/midgard/tests/include/kutf/kutf_suite.h b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_suite.h new file mode 100755 -index 000000000000..754c3adb1cca +index 000000000..754c3adb1 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_suite.h @@ -0,0 +1,508 @@ @@ -462902,7 +462902,7 @@ index 000000000000..754c3adb1cca +#endif /* _KERNEL_UTF_SUITE_H_ */ diff --git a/drivers/gpu/arm/midgard/tests/include/kutf/kutf_utils.h b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_utils.h new file mode 100755 -index 000000000000..c458c1f73802 +index 000000000..c458c1f73 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_utils.h @@ -0,0 +1,55 @@ @@ -462963,7 +462963,7 @@ index 000000000000..c458c1f73802 +#endif /* _KERNEL_UTF_UTILS_H_ */ diff --git a/drivers/gpu/arm/midgard/tests/kutf/Kbuild b/drivers/gpu/arm/midgard/tests/kutf/Kbuild new file mode 100755 -index 000000000000..6b840c2ef7b7 +index 000000000..6b840c2ef --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/Kbuild @@ -0,0 +1,20 @@ @@ -462989,7 +462989,7 @@ index 000000000000..6b840c2ef7b7 +kutf-y := kutf_mem.o kutf_resultset.o kutf_suite.o kutf_utils.o diff --git a/drivers/gpu/arm/midgard/tests/kutf/Kconfig b/drivers/gpu/arm/midgard/tests/kutf/Kconfig new file mode 100755 -index 000000000000..84364716afe3 +index 000000000..84364716a --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/Kconfig @@ -0,0 +1,22 @@ @@ -463017,7 +463017,7 @@ index 000000000000..84364716afe3 + 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 +index 000000000..010c92ca3 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/Makefile @@ -0,0 +1,29 @@ @@ -463052,7 +463052,7 @@ index 000000000000..010c92ca39b9 + $(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 +index 000000000..5408e57d4 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_mem.c @@ -0,0 +1,94 @@ @@ -463152,7 +463152,7 @@ index 000000000000..5408e57d469a +EXPORT_SYMBOL(kutf_mempool_alloc); diff --git a/drivers/gpu/arm/midgard/tests/kutf/kutf_resultset.c b/drivers/gpu/arm/midgard/tests/kutf/kutf_resultset.c new file mode 100755 -index 000000000000..5bd04969fd55 +index 000000000..5bd04969f --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_resultset.c @@ -0,0 +1,95 @@ @@ -463253,7 +463253,7 @@ index 000000000000..5bd04969fd55 + diff --git a/drivers/gpu/arm/midgard/tests/kutf/kutf_suite.c b/drivers/gpu/arm/midgard/tests/kutf/kutf_suite.c new file mode 100755 -index 000000000000..a7cfd3be9c46 +index 000000000..a7cfd3be9 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_suite.c @@ -0,0 +1,1041 @@ @@ -464300,7 +464300,7 @@ index 000000000000..a7cfd3be9c46 +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 +index 000000000..a429a2dbf --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_utils.c @@ -0,0 +1,71 @@ @@ -464377,7 +464377,7 @@ index 000000000000..a429a2dbf788 +EXPORT_SYMBOL(kutf_dsprintf); diff --git a/drivers/gpu/arm/midgard/tests/kutf/sconscript b/drivers/gpu/arm/midgard/tests/kutf/sconscript new file mode 100755 -index 000000000000..d7f112448e42 +index 000000000..d7f112448 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/sconscript @@ -0,0 +1,21 @@ @@ -464404,7 +464404,7 @@ index 000000000000..d7f112448e42 +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 +index 000000000..0cd9cebe9 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kbuild @@ -0,0 +1,20 @@ @@ -464430,7 +464430,7 @@ index 000000000000..0cd9cebe9d8b +mali_kutf_irq_test-y := mali_kutf_irq_test_main.o diff --git a/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig new file mode 100755 -index 000000000000..16f68d15c46e +index 000000000..16f68d15c --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig @@ -0,0 +1,23 @@ @@ -464459,7 +464459,7 @@ index 000000000000..16f68d15c46e + 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 +index 000000000..4e948767a --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Makefile @@ -0,0 +1,51 @@ @@ -464516,7 +464516,7 @@ index 000000000000..4e948767a4ac + $(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 +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 @@ @@ -464779,7 +464779,7 @@ index 000000000000..e2ff4432bf80 +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 +index 000000000..ec837f164 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/sconscript @@ -0,0 +1,30 @@ @@ -464815,7 +464815,7 @@ index 000000000000..ec837f16448d + 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 +index 000000000..5337e1078 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/sconscript @@ -0,0 +1,37 @@ @@ -464858,7 +464858,7 @@ index 000000000000..5337e1078e20 + 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 +index 000000000..a06092bd5 --- /dev/null +++ b/drivers/gpu/arm/sconscript @@ -0,0 +1,25 @@ @@ -464888,7 +464888,7 @@ index 000000000000..a06092bd5bf0 + +SConscript('midgard/sconscript') diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig -index ca868271f4c4..2a9184156172 100644 +index ca868271f..2a9184156 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -31,6 +31,10 @@ config DRM_MIPI_DBI @@ -464903,7 +464903,7 @@ index ca868271f4c4..2a9184156172 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 aa1bb86293fd..b8d4a5f49924 100644 +index aa1bb8629..b8d4a5f49 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -13,6 +13,7 @@ @@ -465817,7 +465817,7 @@ index aa1bb86293fd..b8d4a5f49924 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..de32a352383d 100644 +index c051502d7..de32a3523 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h @@ -129,6 +129,7 @@ enum dp_irq_type { @@ -465917,7 +465917,7 @@ index c051502d7fbf..de32a352383d 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 914c569ab8c1..ca91db220580 100644 +index 914c569ab..ca91db220 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c @@ -11,6 +11,7 @@ @@ -467446,7 +467446,7 @@ index 914c569ab8c1..ca91db220580 100644 + analogix_dp_write(dp, ANALOGIX_DP_FUNC_EN_1, reg); +} diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h -index e284ee8da58b..346024aedc8b 100644 +index e284ee8da..346024aed 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 @@ @@ -467602,7 +467602,7 @@ index e284ee8da58b..346024aedc8b 100644 + #endif /* _ANALOGIX_DP_REG_H */ diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c -index 0c79a9ba48bb..fc39edc48877 100644 +index 0c79a9ba4..fc39edc48 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -9,6 +9,8 @@ @@ -468721,7 +468721,7 @@ index 0c79a9ba48bb..fc39edc48877 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..7ca4bd5041ed 100644 +index 1999db05b..7ca4bd504 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h @@ -509,6 +509,51 @@ @@ -468785,7 +468785,7 @@ index 1999db05bc3b..7ca4bd5041ed 100644 enum { /* PRODUCT_ID0 field values */ diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c -index 6b268f9445b3..d1fe9347244a 100644 +index 6b268f944..d1fe93472 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c @@ -1246,6 +1246,12 @@ void dw_mipi_dsi_unbind(struct dw_mipi_dsi *dsi) @@ -468802,7 +468802,7 @@ index 6b268f9445b3..d1fe9347244a 100644 MODULE_AUTHOR("Philippe Cornu "); MODULE_DESCRIPTION("DW MIPI DSI host controller driver"); diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c -index 4606cc938b36..385d3ac4151a 100644 +index 4606cc938..385d3ac41 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -537,6 +537,7 @@ int drm_version(struct drm_device *dev, void *data, @@ -468822,7 +468822,7 @@ index 4606cc938b36..385d3ac4151a 100644 return 0; } diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c -index 9f955f2010c2..ca6d13eb3190 100644 +index 9f955f201..ca6d13eb3 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -780,6 +780,28 @@ int drm_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct *vma) @@ -468863,7 +468863,7 @@ index 9f955f2010c2..ca6d13eb3190 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) @@ -468878,7 +468878,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) @@ -468914,7 +468914,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 @@ @@ -469117,7 +469117,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 @@ @@ -469268,7 +469268,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 { @@ -469284,7 +469284,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, @@ -469332,7 +469332,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 { @@ -469345,7 +469345,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 { @@ -469362,7 +469362,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 ac96b6ab44c0..42fc5c813a9b 100644 +index ac96b6ab4..42fc5c813 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -557,7 +557,6 @@ nouveau_drm_device_init(struct drm_device *dev) @@ -469467,7 +469467,7 @@ index ac96b6ab44c0..42fc5c813a9b 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 { @@ -469483,7 +469483,7 @@ index 8b252dca0fc3..b8025507a9e4 100644 struct { diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c -index 204674fccd64..b1af4a039fb4 100644 +index 204674fcc..b1af4a039 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -30,6 +30,7 @@ @@ -469935,7 +469935,7 @@ index 204674fccd64..b1af4a039fb4 100644 dsi->format = desc->format; dsi->lanes = desc->lanes; diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig -index 310aa1546893..9fff103a4557 100644 +index 310aa1546..9fff103a4 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -20,6 +20,13 @@ config DRM_ROCKCHIP @@ -469953,7 +469953,7 @@ index 310aa1546893..9fff103a4557 100644 bool "Rockchip specific extensions for Analogix DP driver" help diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile -index 17a9e7eb2130..603d143c1401 100644 +index 17a9e7eb2..603d143c1 100644 --- a/drivers/gpu/drm/rockchip/Makefile +++ b/drivers/gpu/drm/rockchip/Makefile @@ -4,7 +4,8 @@ @@ -469967,7 +469967,7 @@ index 17a9e7eb2130..603d143c1401 100644 rockchipdrm-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c -index ade2327a10e2..463e3eb4e475 100644 +index ade2327a1..463e3eb4e 100644 --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c @@ -16,6 +16,7 @@ @@ -470373,7 +470373,7 @@ index ade2327a10e2..463e3eb4e475 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 dec54c70e008..06d1b0ff3263 100644 +index dec54c70e..06d1b0ff3 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c @@ -73,7 +73,6 @@ static int cdn_dp_grf_write(struct cdn_dp_device *dp, @@ -470406,7 +470406,7 @@ index dec54c70e008..06d1b0ff3263 100644 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..08962e96b17c +index 000000000..08962e96b --- /dev/null +++ b/drivers/gpu/drm/rockchip/cdn-dp-link-training.c @@ -0,0 +1,439 @@ @@ -470850,7 +470850,7 @@ index 000000000000..08962e96b17c + return ret; +} diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/rockchip/cdn-dp-reg.c -index 33fb4d05c506..9d2163ef4d6e 100644 +index 33fb4d05c..9d2163ef4 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-reg.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.c @@ -658,7 +658,7 @@ int cdn_dp_config_video(struct cdn_dp_device *dp) @@ -470863,7 +470863,7 @@ index 33fb4d05c506..9d2163ef4d6e 100644 rem = do_div(symbol, 1000); if (tu_size_reg > 64) { diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c -index d0c9610ad220..1c70c19eb3d3 100644 +index d0c9610ad..1c70c19eb 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c @@ -17,7 +17,7 @@ @@ -471476,7 +471476,7 @@ index d0c9610ad220..1c70c19eb3d3 100644 }, }; diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c -index 23de359a1dec..360cd6833b40 100644 +index 23de359a1..360cd6833 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -9,6 +9,7 @@ @@ -472744,7 +472744,7 @@ index 23de359a1dec..360cd6833b40 100644 .pm = &dw_hdmi_rockchip_pm, diff --git a/drivers/gpu/drm/rockchip/ebc-dev/Kconfig b/drivers/gpu/drm/rockchip/ebc-dev/Kconfig new file mode 100755 -index 000000000000..949c8e4b7b57 +index 000000000..949c8e4b7 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/Kconfig @@ -0,0 +1,14 @@ @@ -472764,7 +472764,7 @@ index 000000000000..949c8e4b7b57 +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 +index 000000000..848ac22fd --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/Makefile @@ -0,0 +1,9 @@ @@ -472779,7 +472779,7 @@ index 000000000000..848ac22fd0b2 +rkebc-$(CONFIG_ARM64) += ebc_dev_v8.o diff --git a/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/Makefile b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/Makefile new file mode 100755 -index 000000000000..a63ef49dea04 +index 000000000..a63ef49de --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/Makefile @@ -0,0 +1,3 @@ @@ -472788,7 +472788,7 @@ index 000000000000..a63ef49dea04 +obj-$(CONFIG_ROCKCHIP_EBC_DEV) += buf_manage.o buf_list.o diff --git a/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.c b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.c new file mode 100755 -index 000000000000..90f350110b70 +index 000000000..90f350110 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.c @@ -0,0 +1,171 @@ @@ -472965,7 +472965,7 @@ index 000000000000..90f350110b70 +} 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 +index 000000000..eaf504560 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.h @@ -0,0 +1,95 @@ @@ -473066,7 +473066,7 @@ index 000000000000..eaf504560fb8 +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.c b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.c new file mode 100755 -index 000000000000..a2e47b45c148 +index 000000000..a2e47b45c --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.c @@ -0,0 +1,327 @@ @@ -473399,7 +473399,7 @@ index 000000000000..a2e47b45c148 +} 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 +index 000000000..745cdbf9c --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.h @@ -0,0 +1,49 @@ @@ -473454,7 +473454,7 @@ index 000000000000..745cdbf9cfde + 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 +index 000000000..5fc2fecd2 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev.h @@ -0,0 +1,114 @@ @@ -473574,7 +473574,7 @@ index 000000000000..5fc2fecd22cb +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev_v8.S b/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev_v8.S new file mode 100755 -index 000000000000..65be1fdee09f +index 000000000..65be1fdee --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev_v8.S @@ -0,0 +1,55302 @@ @@ -528882,7 +528882,7 @@ index 000000000000..65be1fdee09f + .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 +index 000000000..dc0a72b11 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_panel.h @@ -0,0 +1,50 @@ @@ -528938,7 +528938,7 @@ index 000000000000..dc0a72b11b21 +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/ebc_public.c b/drivers/gpu/drm/rockchip/ebc-dev/ebc_public.c new file mode 100755 -index 000000000000..8ecccb7f6403 +index 000000000..8ecccb7f6 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_public.c @@ -0,0 +1,36 @@ @@ -528980,7 +528980,7 @@ index 000000000000..8ecccb7f6403 +} 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 +index 000000000..6b99702b7 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/Makefile @@ -0,0 +1,5 @@ @@ -528991,7 +528991,7 @@ index 000000000000..6b99702b7a6f +waveform-$(CONFIG_ARM64) += pvi_waveform_v8.o rkf_waveform_v8.o diff --git a/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.c b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.c new file mode 100755 -index 000000000000..8871b37d52cc +index 000000000..8871b37d5 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.c @@ -0,0 +1,72 @@ @@ -529069,7 +529069,7 @@ index 000000000000..8871b37d52cc +} 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 +index 000000000..8d2210603 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.h @@ -0,0 +1,66 @@ @@ -529141,7 +529141,7 @@ index 000000000000..8d2210603a29 +#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 +index 000000000..849c81dcf --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/pvi_waveform_v8.S @@ -0,0 +1,18656 @@ @@ -547803,7 +547803,7 @@ index 000000000000..849c81dcfc71 + .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 +index 000000000..8a1782224 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/rkf_waveform_v8.S @@ -0,0 +1,19357 @@ @@ -567166,7 +567166,7 @@ index 000000000000..8a17822240c5 + .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 +index 000000000..a05717f1c --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/Makefile @@ -0,0 +1,4 @@ @@ -567176,7 +567176,7 @@ index 000000000000..a05717f1ce98 +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 +index 000000000..c24db23dc --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.c @@ -0,0 +1,70 @@ @@ -567252,7 +567252,7 @@ index 000000000000..c24db23dc47d +module_param(vcom, int, 0644); diff --git a/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.h b/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.h new file mode 100755 -index 000000000000..f95192094ba7 +index 000000000..f95192094 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.h @@ -0,0 +1,60 @@ @@ -567318,7 +567318,7 @@ index 000000000000..f95192094ba7 +#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 +index 000000000..f007dd0ad --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/tps65185.c @@ -0,0 +1,672 @@ @@ -567996,7 +567996,7 @@ index 000000000000..f007dd0adb65 +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 +index 000000000..913d48137 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/Makefile @@ -0,0 +1,3 @@ @@ -568005,7 +568005,7 @@ index 000000000000..913d4813773b +obj-$(CONFIG_ROCKCHIP_EBC_DEV) += ebc_tcon.o eink_tcon.o diff --git a/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.c b/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.c new file mode 100755 -index 000000000000..23c82751bb1b +index 000000000..23c82751b --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.c @@ -0,0 +1,416 @@ @@ -568427,7 +568427,7 @@ index 000000000000..23c82751bb1b +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 +index 000000000..9a9ea56f3 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.h @@ -0,0 +1,119 @@ @@ -568552,7 +568552,7 @@ index 000000000000..9a9ea56f3cdb +#endif diff --git a/drivers/gpu/drm/rockchip/ebc-dev/tcon/eink_tcon.c b/drivers/gpu/drm/rockchip/ebc-dev/tcon/eink_tcon.c new file mode 100755 -index 000000000000..01b2b9629c35 +index 000000000..01b2b9629 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/eink_tcon.c @@ -0,0 +1,301 @@ @@ -568858,7 +568858,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 7afdc54eb3ec..67ffb23faecb 100644 +index 7afdc54eb..67ffb23fa 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -602,7 +602,7 @@ static int inno_hdmi_register(struct drm_device *drm, struct inno_hdmi *hdmi) @@ -568871,7 +568871,7 @@ index 7afdc54eb3ec..67ffb23faecb 100644 /* * If we failed to find the CRTC(s) which this encoder is diff --git a/drivers/gpu/drm/rockchip/rk3066_hdmi.c b/drivers/gpu/drm/rockchip/rk3066_hdmi.c -index 1c546c3a8998..58b366f4f3a9 100644 +index 1c546c3a8..58b366f4f 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) @@ -568885,7 +568885,7 @@ index 1c546c3a8998..58b366f4f3a9 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..f81940b5b055 +index 000000000..f81940b5b --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/Kconfig @@ -0,0 +1,9 @@ @@ -568900,7 +568900,7 @@ index 000000000000..f81940b5b055 + 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 +index 000000000..ad3ac27b3 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/Makefile @@ -0,0 +1,12 @@ @@ -568918,7 +568918,7 @@ index 000000000000..ad3ac27b36ad + 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..ab1bbe9cee4e +index 000000000..ab1bbe9ce --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dither.c @@ -0,0 +1,50 @@ @@ -568974,7 +568974,7 @@ index 000000000000..ab1bbe9cee4e +EXPORT_SYMBOL_GPL(rk618_frc_dclk_invert); 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 +index 000000000..c74bb95f0 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dither.h @@ -0,0 +1,17 @@ @@ -568997,7 +568997,7 @@ index 000000000000..c74bb95f0ce4 +#endif diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c b/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c new file mode 100755 -index 000000000000..69db2cd25bd3 +index 000000000..69db2cd25 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c @@ -0,0 +1,1201 @@ @@ -570204,7 +570204,7 @@ index 000000000000..69db2cd25bd3 +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..12c9475e9d80 +index 000000000..12c9475e9 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c @@ -0,0 +1,1605 @@ @@ -571815,7 +571815,7 @@ index 000000000000..12c9475e9d80 +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..46ad676879f9 +index 000000000..46ad67687 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c @@ -0,0 +1,310 @@ @@ -572131,7 +572131,7 @@ index 000000000000..46ad676879f9 +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..2f72c52342a9 +index 000000000..2f72c5234 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c @@ -0,0 +1,303 @@ @@ -572440,7 +572440,7 @@ index 000000000000..2f72c52342a9 +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..d2c9c1cb2fb8 +index 000000000..d2c9c1cb2 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_scaler.c @@ -0,0 +1,424 @@ @@ -572870,7 +572870,7 @@ index 000000000000..d2c9c1cb2fb8 +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..ca13750536fc +index 000000000..ca1375053 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_vif.c @@ -0,0 +1,260 @@ @@ -573136,7 +573136,7 @@ index 000000000000..ca13750536fc +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 +index 000000000..41e1fbbe1 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/Kconfig @@ -0,0 +1,8 @@ @@ -573150,7 +573150,7 @@ index 000000000000..41e1fbbe1e61 + 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 +index 000000000..76d768d29 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/Makefile @@ -0,0 +1,14 @@ @@ -573170,7 +573170,7 @@ index 000000000000..76d768d29776 + 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..bf3a901a65b3 +index 000000000..bf3a901a6 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_combrxphy.c @@ -0,0 +1,995 @@ @@ -574171,7 +574171,7 @@ index 000000000000..bf3a901a65b3 +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..1b29b24fd0f6 +index 000000000..1b29b24fd --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c @@ -0,0 +1,515 @@ @@ -574692,7 +574692,7 @@ index 000000000000..1b29b24fd0f6 +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 +index 000000000..40d785eec --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.h @@ -0,0 +1,13 @@ @@ -574711,7 +574711,7 @@ index 000000000000..40d785eecd67 +#endif diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c b/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c new file mode 100755 -index 000000000000..37d4df171426 +index 000000000..37d4df171 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c @@ -0,0 +1,1395 @@ @@ -576112,7 +576112,7 @@ index 000000000000..37d4df171426 +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..a5fc042dcaee +index 000000000..a5fc042dc --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_gvi.c @@ -0,0 +1,668 @@ @@ -576786,7 +576786,7 @@ index 000000000000..a5fc042dcaee +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..329508681ec8 +index 000000000..329508681 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_hdmi.c @@ -0,0 +1,1615 @@ @@ -578407,7 +578407,7 @@ index 000000000000..329508681ec8 +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..87467ed8a3c9 +index 000000000..87467ed8a --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c @@ -0,0 +1,982 @@ @@ -579395,7 +579395,7 @@ index 000000000000..87467ed8a3c9 +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..848b6ed8e0f1 +index 000000000..848b6ed8e --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c @@ -0,0 +1,325 @@ @@ -579726,7 +579726,7 @@ index 000000000000..848b6ed8e0f1 +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..4e2a5d56333d +index 000000000..4e2a5d563 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_post_process.c @@ -0,0 +1,488 @@ @@ -580220,7 +580220,7 @@ index 000000000000..4e2a5d56333d +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..a7983f8ab6f9 +index 000000000..a7983f8ab --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_rgb.c @@ -0,0 +1,387 @@ @@ -580613,7 +580613,7 @@ index 000000000000..a7983f8ab6f9 +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 +index 000000000..adbc11679 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.c @@ -0,0 +1,1403 @@ @@ -582022,7 +582022,7 @@ index 000000000000..adbc11679f53 +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 +index 000000000..a4330df85 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.h @@ -0,0 +1,289 @@ @@ -582317,7 +582317,7 @@ index 000000000000..a4330df85b33 +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_backlight.c b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.c new file mode 100755 -index 000000000000..2f0a98749683 +index 000000000..2f0a98749 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.c @@ -0,0 +1,514 @@ @@ -582837,7 +582837,7 @@ index 000000000000..2f0a98749683 +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 +index 000000000..4c8dc6348 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.h @@ -0,0 +1,64 @@ @@ -582906,7 +582906,7 @@ index 000000000000..4c8dc6348354 +#endif +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c -index 0f3eb392fe39..e3ab9efdd0ad 100644 +index 0f3eb392f..e3ab9efdd 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -6,16 +6,21 @@ @@ -583785,7 +583785,7 @@ index 0f3eb392fe39..e3ab9efdd0ad 100644 CONFIG_ROCKCHIP_LVDS); ADD_ROCKCHIP_SUB_DRIVER(rockchip_dp_driver, diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h -index e33c2dcd0d4b..f79368fc8f8c 100644 +index e33c2dcd0..f79368fc8 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h @@ -12,18 +12,60 @@ @@ -584008,7 +584008,7 @@ index e33c2dcd0d4b..f79368fc8f8c 100644 extern struct platform_driver rk3066_hdmi_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..ce697e4ac157 100644 +index 3aa37e177..ce697e4ac 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -5,6 +5,7 @@ @@ -584176,7 +584176,7 @@ index 3aa37e177667..ce697e4ac157 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..94c04ce80683 100644 +index 1a6965210..94c04ce80 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.h @@ -7,6 +7,8 @@ @@ -584205,7 +584205,7 @@ index 1a696521096d..94c04ce80683 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..065fa7fde336 100644 +index 2fdc455c4..065fa7fde 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c @@ -15,14 +15,12 @@ @@ -584268,7 +584268,7 @@ index 2fdc455c4ad7..065fa7fde336 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 62e5d0970525..c945597253cc 100644 +index 62e5d0970..c94559725 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c @@ -13,9 +13,22 @@ @@ -585043,7 +585043,7 @@ index 62e5d0970525..c945597253cc 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..e288890d609d 100644 +index 7ffc541be..e288890d6 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.h @@ -7,14 +7,24 @@ @@ -585120,7 +585120,7 @@ index 7ffc541bea07..e288890d609d 100644 #endif /* _ROCKCHIP_DRM_GEM_H */ 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..0acf55916056 +index 000000000..0acf55916 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_tve.c @@ -0,0 +1,615 @@ @@ -585741,7 +585741,7 @@ index 000000000000..0acf55916056 +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..cd0bcb1a32fc +index 000000000..cd0bcb1a3 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_tve.h @@ -0,0 +1,165 @@ @@ -585911,7 +585911,7 @@ index 000000000000..cd0bcb1a32fc + +#endif /* _ROCKCHIP_DRM_TVE_ */ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c -index 0f23144491e4..c80f7d9fd13f 100644 +index 0f2314449..c80f7d9fd 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1013,7 +1013,6 @@ static void vop_plane_atomic_update(struct drm_plane *plane, @@ -585923,7 +585923,7 @@ index 0f23144491e4..c80f7d9fd13f 100644 VOP_WIN_SET(vop, win, enable, 1); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h -index 857d97cdc67c..94eff1b2b9f8 100644 +index 857d97cdc..94eff1b2b 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -7,6 +7,9 @@ @@ -586586,7 +586586,7 @@ index 857d97cdc67c..94eff1b2b9f8 100644 #endif /* _ROCKCHIP_DRM_VOP_H */ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c new file mode 100755 -index 000000000000..868a7057a9b0 +index 000000000..868a7057a --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -0,0 +1,6550 @@ @@ -593142,7 +593142,7 @@ index 000000000000..868a7057a9b0 +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..9c74221d7a05 +index 000000000..9c74221d7 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c @@ -0,0 +1,371 @@ @@ -593518,7 +593518,7 @@ index 000000000000..9c74221d7a05 +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 7c20b4a24a7e..c9bef95264a4 100644 +index 7c20b4a24..c9bef9526 100644 --- a/drivers/gpu/drm/rockchip/rockchip_lvds.c +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c @@ -6,98 +6,141 @@ @@ -594695,7 +594695,7 @@ index 7c20b4a24a7e..c9bef95264a4 100644 .remove = rockchip_lvds_remove, 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..79c756d3c72b +index 000000000..79c756d3c --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c @@ -0,0 +1,1307 @@ @@ -596007,7 +596007,7 @@ index 000000000000..79c756d3c72b + }, +}; diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c -index a6fe03c3748a..80053d91a301 100644 +index a6fe03c37..80053d91a 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -349,8 +349,8 @@ static const struct vop_win_phy rk3066_win0_data = { @@ -596071,7 +596071,7 @@ index a6fe03c3748a..80053d91a301 100644 static const struct vop_win_data rk3188_vop_win_data[] = { diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h -index 6e9fa5815d4d..8923c8b1577e 100644 +index 6e9fa5815..8923c8b15 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h @@ -1028,4 +1028,420 @@ @@ -596496,7 +596496,7 @@ index 6e9fa5815d4d..8923c8b1577e 100644 + #endif /* _ROCKCHIP_VOP_REG_H */ diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c -index 819ab4ee517e..c7c8d2f0abe7 100644 +index 819ab4ee5..c7c8d2f0a 100644 --- a/drivers/i2c/busses/i2c-rk3x.c +++ b/drivers/i2c/busses/i2c-rk3x.c @@ -23,6 +23,8 @@ @@ -597012,7 +597012,7 @@ index 819ab4ee517e..c7c8d2f0abe7 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 bdce6d3e5327..c0315596d5cd 100644 +index bdce6d3e5..c0315596d 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -61,6 +61,7 @@ @@ -597117,7 +597117,7 @@ index bdce6d3e5327..c0315596d5cd 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 @@ -597135,7 +597135,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 12584f163..c266169df 100644 --- a/drivers/iio/adc/rockchip_saradc.c +++ b/drivers/iio/adc/rockchip_saradc.c @@ -35,7 +35,7 @@ @@ -597364,7 +597364,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" @@ -597379,7 +597379,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/ @@ -597392,7 +597392,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 9f60f1559e49..793ecbbda32c 100644 +index 9f60f1559..793ecbbda 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -67,6 +67,9 @@ config KEYBOARD_AMIGA @@ -597406,7 +597406,7 @@ index 9f60f1559e49..793ecbbda32c 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) @@ -597419,7 +597419,7 @@ index 54afb38601b9..bb29a7c9a1c0 100644 diff --git a/drivers/input/keyboard/rk_keys.c b/drivers/input/keyboard/rk_keys.c new file mode 100755 -index 000000000000..375cfbd600ea +index 000000000..375cfbd60 --- /dev/null +++ b/drivers/input/keyboard/rk_keys.c @@ -0,0 +1,555 @@ @@ -597980,7 +597980,7 @@ index 000000000000..375cfbd600ea +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 +index 000000000..67558b488 --- /dev/null +++ b/drivers/input/remotectl/Kconfig @@ -0,0 +1,19 @@ @@ -598005,7 +598005,7 @@ index 000000000000..67558b48869e +endif diff --git a/drivers/input/remotectl/Makefile b/drivers/input/remotectl/Makefile new file mode 100755 -index 000000000000..209472b4a356 +index 000000000..209472b4a --- /dev/null +++ b/drivers/input/remotectl/Makefile @@ -0,0 +1,8 @@ @@ -598019,7 +598019,7 @@ index 000000000000..209472b4a356 +obj-$(CONFIG_ROCKCHIP_REMOTECTL_PWM) += rockchip_pwm_remotectl.o diff --git a/drivers/input/remotectl/rockchip_pwm_remotectl.c b/drivers/input/remotectl/rockchip_pwm_remotectl.c new file mode 100755 -index 000000000000..f24ba9edf08b +index 000000000..f24ba9edf --- /dev/null +++ b/drivers/input/remotectl/rockchip_pwm_remotectl.c @@ -0,0 +1,828 @@ @@ -598853,7 +598853,7 @@ index 000000000000..f24ba9edf08b +MODULE_LICENSE("GPL"); diff --git a/drivers/input/remotectl/rockchip_pwm_remotectl.h b/drivers/input/remotectl/rockchip_pwm_remotectl.h new file mode 100755 -index 000000000000..5126a3edb5d5 +index 000000000..5126a3edb --- /dev/null +++ b/drivers/input/remotectl/rockchip_pwm_remotectl.h @@ -0,0 +1,160 @@ @@ -599019,7 +599019,7 @@ index 000000000000..5126a3edb5d5 +#endif diff --git a/drivers/input/sensors/Kconfig b/drivers/input/sensors/Kconfig new file mode 100755 -index 000000000000..ebff9437aa66 +index 000000000..ebff9437a --- /dev/null +++ b/drivers/input/sensors/Kconfig @@ -0,0 +1,23 @@ @@ -599048,7 +599048,7 @@ index 000000000000..ebff9437aa66 +endif diff --git a/drivers/input/sensors/Makefile b/drivers/input/sensors/Makefile new file mode 100755 -index 000000000000..df8d372dafe1 +index 000000000..df8d372da --- /dev/null +++ b/drivers/input/sensors/Makefile @@ -0,0 +1,15 @@ @@ -599069,7 +599069,7 @@ index 000000000000..df8d372dafe1 +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 +index 000000000..724cb2ca1 --- /dev/null +++ b/drivers/input/sensors/accel/Kconfig @@ -0,0 +1,149 @@ @@ -599224,7 +599224,7 @@ 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 +index 000000000..de250ef4a --- /dev/null +++ b/drivers/input/sensors/accel/Makefile @@ -0,0 +1,22 @@ @@ -599252,7 +599252,7 @@ index 000000000000..de250ef4a282 +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 +index 000000000..19f578a77 --- /dev/null +++ b/drivers/input/sensors/accel/bma2xx.c @@ -0,0 +1,2268 @@ @@ -601526,7 +601526,7 @@ index 000000000000..19f578a77295 +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 +index 000000000..b0e25eac9 --- /dev/null +++ b/drivers/input/sensors/accel/da223_core.c @@ -0,0 +1,1907 @@ @@ -603439,7 +603439,7 @@ index 000000000000..b0e25eac9b5f +} 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 +index 000000000..de67d711b --- /dev/null +++ b/drivers/input/sensors/accel/da223_core.h @@ -0,0 +1,303 @@ @@ -603748,7 +603748,7 @@ index 000000000000..de67d711b486 + diff --git a/drivers/input/sensors/accel/da223_cust.c b/drivers/input/sensors/accel/da223_cust.c new file mode 100755 -index 000000000000..c00836d5b78d +index 000000000..c00836d5b --- /dev/null +++ b/drivers/input/sensors/accel/da223_cust.c @@ -0,0 +1,898 @@ @@ -604652,7 +604652,7 @@ index 000000000000..c00836d5b78d +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 +index 000000000..e6bf15a02 --- /dev/null +++ b/drivers/input/sensors/accel/da223_cust.h @@ -0,0 +1,44 @@ @@ -604702,7 +604702,7 @@ 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 +index 000000000..8be258c31 --- /dev/null +++ b/drivers/input/sensors/accel/dmard10.c @@ -0,0 +1,454 @@ @@ -605162,7 +605162,7 @@ index 000000000000..8be258c316a2 + 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 +index 000000000..80a5c96e6 --- /dev/null +++ b/drivers/input/sensors/accel/icm2060x_acc.c @@ -0,0 +1,260 @@ @@ -605428,7 +605428,7 @@ index 000000000000..80a5c96e6207 +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 +index 000000000..734b471f5 --- /dev/null +++ b/drivers/input/sensors/accel/kxtik.c @@ -0,0 +1,359 @@ @@ -605793,7 +605793,7 @@ index 000000000000..734b471f5d3a +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 +index 000000000..6fc6a8c5f --- /dev/null +++ b/drivers/input/sensors/accel/kxtj9.c @@ -0,0 +1,332 @@ @@ -606131,7 +606131,7 @@ index 000000000000..6fc6a8c5f119 +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 +index 000000000..55f0fe526 --- /dev/null +++ b/drivers/input/sensors/accel/lis3dh.c @@ -0,0 +1,303 @@ @@ -606440,7 +606440,7 @@ index 000000000000..55f0fe526899 +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 +index 000000000..ff238278f --- /dev/null +++ b/drivers/input/sensors/accel/lsm303d.c @@ -0,0 +1,362 @@ @@ -606808,7 +606808,7 @@ index 000000000000..ff238278f10c +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 +index 000000000..ed93bb014 --- /dev/null +++ b/drivers/input/sensors/accel/lsm330_acc.c @@ -0,0 +1,278 @@ @@ -607092,7 +607092,7 @@ index 000000000000..ed93bb0147ff +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 +index 000000000..d5827f2f2 --- /dev/null +++ b/drivers/input/sensors/accel/mc3230.c @@ -0,0 +1,1353 @@ @@ -608451,7 +608451,7 @@ index 000000000000..d5827f2f2bee +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 +index 000000000..33e2dec7b --- /dev/null +++ b/drivers/input/sensors/accel/mma7660.c @@ -0,0 +1,258 @@ @@ -608715,7 +608715,7 @@ index 000000000000..33e2dec7bb22 +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 +index 000000000..9c8bb48f0 --- /dev/null +++ b/drivers/input/sensors/accel/mma8452.c @@ -0,0 +1,424 @@ @@ -609145,7 +609145,7 @@ index 000000000000..9c8bb48f0848 +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 +index 000000000..6fc2058e0 --- /dev/null +++ b/drivers/input/sensors/accel/mpu6500_acc.c @@ -0,0 +1,300 @@ @@ -609451,7 +609451,7 @@ index 000000000000..6fc2058e0f9f +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 +index 000000000..4cf8c8950 --- /dev/null +++ b/drivers/input/sensors/accel/mpu6880_acc.c @@ -0,0 +1,296 @@ @@ -609753,7 +609753,7 @@ index 000000000000..4cf8c89506a5 +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 +index 000000000..614242584 --- /dev/null +++ b/drivers/input/sensors/accel/mxc622x.c @@ -0,0 +1,284 @@ @@ -610043,7 +610043,7 @@ index 000000000000..614242584e0a +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 +index 000000000..535a83a26 --- /dev/null +++ b/drivers/input/sensors/accel/mxc6655xa.c @@ -0,0 +1,262 @@ @@ -610311,7 +610311,7 @@ index 000000000000..535a83a262f5 +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 +index 000000000..39106b111 --- /dev/null +++ b/drivers/input/sensors/accel/sc7660.c @@ -0,0 +1,1655 @@ @@ -611972,7 +611972,7 @@ index 000000000000..39106b111000 +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 +index 000000000..f7443f922 --- /dev/null +++ b/drivers/input/sensors/accel/sc7a20.c @@ -0,0 +1,1768 @@ @@ -613746,7 +613746,7 @@ index 000000000000..f7443f922e7e +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 +index 000000000..576c91880 --- /dev/null +++ b/drivers/input/sensors/accel/sc7a30.c @@ -0,0 +1,1215 @@ @@ -614967,7 +614967,7 @@ index 000000000000..576c9188029b +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 +index 000000000..9ca93971d --- /dev/null +++ b/drivers/input/sensors/accel/stk8baxx.c @@ -0,0 +1,957 @@ @@ -615930,7 +615930,7 @@ index 000000000000..9ca93971d914 +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 +index 000000000..088837f92 --- /dev/null +++ b/drivers/input/sensors/angle/Kconfig @@ -0,0 +1,27 @@ @@ -615963,7 +615963,7 @@ index 000000000000..088837f92ed8 + diff --git a/drivers/input/sensors/angle/Makefile b/drivers/input/sensors/angle/Makefile new file mode 100755 -index 000000000000..0696550b53f8 +index 000000000..0696550b5 --- /dev/null +++ b/drivers/input/sensors/angle/Makefile @@ -0,0 +1,3 @@ @@ -615972,7 +615972,7 @@ index 000000000000..0696550b53f8 +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 +index 000000000..7373c6bd4 --- /dev/null +++ b/drivers/input/sensors/angle/angle_kxtik.c @@ -0,0 +1,398 @@ @@ -616376,7 +616376,7 @@ index 000000000000..7373c6bd4068 +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 +index 000000000..ae247ffa2 --- /dev/null +++ b/drivers/input/sensors/angle/angle_lis3dh.c @@ -0,0 +1,342 @@ @@ -616724,7 +616724,7 @@ index 000000000000..ae247ffa2312 + diff --git a/drivers/input/sensors/compass/Kconfig b/drivers/input/sensors/compass/Kconfig new file mode 100755 -index 000000000000..91a19ffe23ea +index 000000000..91a19ffe2 --- /dev/null +++ b/drivers/input/sensors/compass/Kconfig @@ -0,0 +1,58 @@ @@ -616788,7 +616788,7 @@ index 000000000000..91a19ffe23ea + diff --git a/drivers/input/sensors/compass/Makefile b/drivers/input/sensors/compass/Makefile new file mode 100755 -index 000000000000..f42c2aa2dd17 +index 000000000..f42c2aa2d --- /dev/null +++ b/drivers/input/sensors/compass/Makefile @@ -0,0 +1,8 @@ @@ -616802,7 +616802,7 @@ index 000000000000..f42c2aa2dd17 +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 +index 000000000..b1e334d0b --- /dev/null +++ b/drivers/input/sensors/compass/ak09911.c @@ -0,0 +1,667 @@ @@ -617475,7 +617475,7 @@ index 000000000000..b1e334d0b5a8 +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 +index 000000000..1c3056a82 --- /dev/null +++ b/drivers/input/sensors/compass/ak09918.c @@ -0,0 +1,692 @@ @@ -618173,7 +618173,7 @@ index 000000000000..1c3056a824e5 +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 +index 000000000..10e91eb2d --- /dev/null +++ b/drivers/input/sensors/compass/ak8963.c @@ -0,0 +1,714 @@ @@ -618893,7 +618893,7 @@ index 000000000000..10e91eb2d0be +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 +index 000000000..c48a808ed --- /dev/null +++ b/drivers/input/sensors/compass/ak8975.c @@ -0,0 +1,650 @@ @@ -619549,7 +619549,7 @@ index 000000000000..c48a808ed18d + diff --git a/drivers/input/sensors/gyro/Kconfig b/drivers/input/sensors/gyro/Kconfig new file mode 100755 -index 000000000000..fb721d4cb30d +index 000000000..fb721d4cb --- /dev/null +++ b/drivers/input/sensors/gyro/Kconfig @@ -0,0 +1,42 @@ @@ -619597,7 +619597,7 @@ index 000000000000..fb721d4cb30d +endif diff --git a/drivers/input/sensors/gyro/Makefile b/drivers/input/sensors/gyro/Makefile new file mode 100755 -index 000000000000..0943257a11de +index 000000000..0943257a1 --- /dev/null +++ b/drivers/input/sensors/gyro/Makefile @@ -0,0 +1,11 @@ @@ -619614,7 +619614,7 @@ index 000000000000..0943257a11de +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 +index 000000000..acbc0ac4b --- /dev/null +++ b/drivers/input/sensors/gyro/ewtsa.c @@ -0,0 +1,461 @@ @@ -620081,7 +620081,7 @@ index 000000000000..acbc0ac4b143 +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 +index 000000000..3d4624b5d --- /dev/null +++ b/drivers/input/sensors/gyro/icm2060x_gyro.c @@ -0,0 +1,216 @@ @@ -620303,7 +620303,7 @@ index 000000000000..3d4624b5dbd6 +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 +index 000000000..8822a0e3b --- /dev/null +++ b/drivers/input/sensors/gyro/l3g20d.c @@ -0,0 +1,257 @@ @@ -620566,7 +620566,7 @@ index 000000000000..8822a0e3bfe0 +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 +index 000000000..b1e3af658 --- /dev/null +++ b/drivers/input/sensors/gyro/l3g4200d.c @@ -0,0 +1,257 @@ @@ -620829,7 +620829,7 @@ index 000000000000..b1e3af6589cb +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 +index 000000000..a488d4826 --- /dev/null +++ b/drivers/input/sensors/gyro/lsm330_gyro.c @@ -0,0 +1,262 @@ @@ -621097,7 +621097,7 @@ index 000000000000..a488d4826acf +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 +index 000000000..6b4f81154 --- /dev/null +++ b/drivers/input/sensors/gyro/mpu6500_gyro.c @@ -0,0 +1,216 @@ @@ -621319,7 +621319,7 @@ index 000000000000..6b4f81154b7f +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 +index 000000000..324e66ecf --- /dev/null +++ b/drivers/input/sensors/gyro/mpu6880_gyro.c @@ -0,0 +1,216 @@ @@ -621541,7 +621541,7 @@ index 000000000000..324e66ecfab6 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/hall/Kconfig b/drivers/input/sensors/hall/Kconfig new file mode 100755 -index 000000000000..33ca28c87cda +index 000000000..33ca28c87 --- /dev/null +++ b/drivers/input/sensors/hall/Kconfig @@ -0,0 +1,16 @@ @@ -621563,7 +621563,7 @@ 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 +index 000000000..f78ba4ffb --- /dev/null +++ b/drivers/input/sensors/hall/Makefile @@ -0,0 +1,3 @@ @@ -621572,7 +621572,7 @@ index 000000000000..f78ba4ffb850 +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 +index 000000000..88ee00980 --- /dev/null +++ b/drivers/input/sensors/hall/mh248.c @@ -0,0 +1,165 @@ @@ -621743,7 +621743,7 @@ index 000000000000..88ee00980514 +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 +index 000000000..71711a950 --- /dev/null +++ b/drivers/input/sensors/hall/och165t_hall.c @@ -0,0 +1,159 @@ @@ -621908,7 +621908,7 @@ index 000000000000..71711a95028d +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/lsensor/Kconfig b/drivers/input/sensors/lsensor/Kconfig new file mode 100755 -index 000000000000..8ea493862dd3 +index 000000000..8ea493862 --- /dev/null +++ b/drivers/input/sensors/lsensor/Kconfig @@ -0,0 +1,50 @@ @@ -621964,7 +621964,7 @@ index 000000000000..8ea493862dd3 + diff --git a/drivers/input/sensors/lsensor/Makefile b/drivers/input/sensors/lsensor/Makefile new file mode 100755 -index 000000000000..aa8bf78f440c +index 000000000..aa8bf78f4 --- /dev/null +++ b/drivers/input/sensors/lsensor/Makefile @@ -0,0 +1,13 @@ @@ -621983,7 +621983,7 @@ index 000000000000..aa8bf78f440c +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 +index 000000000..182fee423 --- /dev/null +++ b/drivers/input/sensors/lsensor/cm3217.c @@ -0,0 +1,237 @@ @@ -622226,7 +622226,7 @@ index 000000000000..182fee423993 +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 +index 000000000..eed39578b --- /dev/null +++ b/drivers/input/sensors/lsensor/cm3218.c @@ -0,0 +1,415 @@ @@ -622647,7 +622647,7 @@ index 000000000000..eed39578b005 +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 +index 000000000..6322e57bb --- /dev/null +++ b/drivers/input/sensors/lsensor/cm3232.c @@ -0,0 +1,245 @@ @@ -622898,7 +622898,7 @@ index 000000000000..6322e57bb1a9 +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 +index 000000000..200c4b295 --- /dev/null +++ b/drivers/input/sensors/lsensor/isl29023.c @@ -0,0 +1,273 @@ @@ -623177,7 +623177,7 @@ index 000000000000..200c4b2959c7 +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 +index 000000000..8334d0fac --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_al3006.c @@ -0,0 +1,301 @@ @@ -623484,7 +623484,7 @@ index 000000000000..8334d0faceaf + 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 +index 000000000..8181cec58 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_ap321xx.c @@ -0,0 +1,415 @@ @@ -623905,7 +623905,7 @@ index 000000000000..8181cec587a0 + diff --git a/drivers/input/sensors/lsensor/ls_em3071x.c b/drivers/input/sensors/lsensor/ls_em3071x.c new file mode 100755 -index 000000000000..fc7500963ab5 +index 000000000..fc7500963 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_em3071x.c @@ -0,0 +1,283 @@ @@ -624194,7 +624194,7 @@ index 000000000000..fc7500963ab5 +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 +index 000000000..a8bc7d0e9 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_stk3171.c @@ -0,0 +1,321 @@ @@ -624521,7 +624521,7 @@ index 000000000000..a8bc7d0e9af3 + diff --git a/drivers/input/sensors/lsensor/ls_stk3410.c b/drivers/input/sensors/lsensor/ls_stk3410.c new file mode 100755 -index 000000000000..25722040fc31 +index 000000000..25722040f --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_stk3410.c @@ -0,0 +1,374 @@ @@ -624901,7 +624901,7 @@ index 000000000000..25722040fc31 +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 +index 000000000..4f5b470bc --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_us5152.c @@ -0,0 +1,440 @@ @@ -625347,7 +625347,7 @@ index 000000000000..4f5b470bc735 +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 +index 000000000..71f108572 --- /dev/null +++ b/drivers/input/sensors/lsensor/ls_us5152.h @@ -0,0 +1,235 @@ @@ -625588,7 +625588,7 @@ index 000000000000..71f108572639 +#endif diff --git a/drivers/input/sensors/pressure/Kconfig b/drivers/input/sensors/pressure/Kconfig new file mode 100755 -index 000000000000..8bbaaa148690 +index 000000000..8bbaaa148 --- /dev/null +++ b/drivers/input/sensors/pressure/Kconfig @@ -0,0 +1,15 @@ @@ -625609,7 +625609,7 @@ 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 +index 000000000..18872b53b --- /dev/null +++ b/drivers/input/sensors/pressure/Makefile @@ -0,0 +1,7 @@ @@ -625622,7 +625622,7 @@ index 000000000000..18872b53bb4b + 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 +index 000000000..9833ad5d9 --- /dev/null +++ b/drivers/input/sensors/pressure/pr_ms5607.c @@ -0,0 +1,297 @@ @@ -625925,7 +625925,7 @@ index 000000000000..9833ad5d9a9e +MODULE_LICENSE("GPL"); diff --git a/drivers/input/sensors/psensor/Kconfig b/drivers/input/sensors/psensor/Kconfig new file mode 100755 -index 000000000000..c7d32f51e7d0 +index 000000000..c7d32f51e --- /dev/null +++ b/drivers/input/sensors/psensor/Kconfig @@ -0,0 +1,32 @@ @@ -625963,7 +625963,7 @@ index 000000000000..c7d32f51e7d0 + diff --git a/drivers/input/sensors/psensor/Makefile b/drivers/input/sensors/psensor/Makefile new file mode 100755 -index 000000000000..49210d0e71cc +index 000000000..49210d0e7 --- /dev/null +++ b/drivers/input/sensors/psensor/Makefile @@ -0,0 +1,8 @@ @@ -625977,7 +625977,7 @@ index 000000000000..49210d0e71cc +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 +index 000000000..3242af2be --- /dev/null +++ b/drivers/input/sensors/psensor/ps_al3006.c @@ -0,0 +1,261 @@ @@ -626244,7 +626244,7 @@ index 000000000000..3242af2be23f +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 +index 000000000..d3711461a --- /dev/null +++ b/drivers/input/sensors/psensor/ps_ap321xx.c @@ -0,0 +1,325 @@ @@ -626575,7 +626575,7 @@ index 000000000000..d3711461af20 +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 +index 000000000..5f3873488 --- /dev/null +++ b/drivers/input/sensors/psensor/ps_em3071x.c @@ -0,0 +1,280 @@ @@ -626861,7 +626861,7 @@ index 000000000000..5f387348881b +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 +index 000000000..1753bbe65 --- /dev/null +++ b/drivers/input/sensors/psensor/ps_stk3171.c @@ -0,0 +1,268 @@ @@ -627135,7 +627135,7 @@ index 000000000000..1753bbe65c19 +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 +index 000000000..90f9a2313 --- /dev/null +++ b/drivers/input/sensors/psensor/ps_stk3410.c @@ -0,0 +1,377 @@ @@ -627518,7 +627518,7 @@ index 000000000000..90f9a2313d1f +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 +index 000000000..5aeeba175 --- /dev/null +++ b/drivers/input/sensors/sensor-dev.c @@ -0,0 +1,2042 @@ @@ -629566,7 +629566,7 @@ index 000000000000..5aeeba175edd +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 +index 000000000..35c3feec8 --- /dev/null +++ b/drivers/input/sensors/sensor-i2c.c @@ -0,0 +1,245 @@ @@ -629817,7 +629817,7 @@ index 000000000000..35c3feec8b32 + diff --git a/drivers/input/sensors/temperature/Kconfig b/drivers/input/sensors/temperature/Kconfig new file mode 100755 -index 000000000000..34edaa7838ac +index 000000000..34edaa783 --- /dev/null +++ b/drivers/input/sensors/temperature/Kconfig @@ -0,0 +1,15 @@ @@ -629838,7 +629838,7 @@ 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 +index 000000000..6045760d7 --- /dev/null +++ b/drivers/input/sensors/temperature/Makefile @@ -0,0 +1,7 @@ @@ -629851,7 +629851,7 @@ index 000000000000..6045760d7e93 + 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 +index 000000000..1e5183ccc --- /dev/null +++ b/drivers/input/sensors/temperature/tmp_ms5607.c @@ -0,0 +1,314 @@ @@ -630170,7 +630170,7 @@ index 000000000000..1e5183ccc11d +MODULE_DESCRIPTION("ms5607 temperature driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c -index ecdeca147ed7..4408245b61d2 100644 +index ecdeca147..4408245b6 100644 --- a/drivers/input/serio/ambakmi.c +++ b/drivers/input/serio/ambakmi.c @@ -159,7 +159,7 @@ static int amba_kmi_probe(struct amba_device *dev, @@ -630191,7 +630191,7 @@ index ecdeca147ed7..4408245b61d2 100644 static int __maybe_unused amba_kmi_resume(struct device *dev) 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 @@ -630220,7 +630220,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 @@ -630236,7 +630236,7 @@ index 6233541e9173..4a3cd29bd96d 100644 obj-$(CONFIG_TOUCHSCREEN_IMX6UL_TSC) += imx6ul_tsc.o diff --git a/drivers/input/touchscreen/cy8c_touchpad.c b/drivers/input/touchscreen/cy8c_touchpad.c new file mode 100755 -index 000000000000..8088cb918c79 +index 000000000..8088cb918 --- /dev/null +++ b/drivers/input/touchscreen/cy8c_touchpad.c @@ -0,0 +1,296 @@ @@ -630538,7 +630538,7 @@ index 000000000000..8088cb918c79 +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 +index 000000000..4bdeb1b83 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/Kconfig @@ -0,0 +1,205 @@ @@ -630749,7 +630749,7 @@ index 000000000000..4bdeb1b8365d + diff --git a/drivers/input/touchscreen/cyttsp5/Makefile b/drivers/input/touchscreen/cyttsp5/Makefile new file mode 100755 -index 000000000000..ff1fe526035d +index 000000000..ff1fe5260 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/Makefile @@ -0,0 +1,23 @@ @@ -630778,7 +630778,7 @@ index 000000000000..ff1fe526035d +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 +index 000000000..52c0eb85d --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_btn.c @@ -0,0 +1,369 @@ @@ -631153,7 +631153,7 @@ index 000000000000..52c0eb85d29e +} 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 +index 000000000..7fac39a1b --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_core.c @@ -0,0 +1,6292 @@ @@ -637451,7 +637451,7 @@ index 000000000000..7fac39a1bbaf +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 +index 000000000..598961386 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_core.h @@ -0,0 +1,182 @@ @@ -637639,7 +637639,7 @@ index 000000000000..5989613865c1 +#endif /* _LINUX_CYTTSP5_CORE_H */ diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_debug.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_debug.c new file mode 100755 -index 000000000000..f4ebba784936 +index 000000000..f4ebba784 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_debug.c @@ -0,0 +1,393 @@ @@ -638038,7 +638038,7 @@ index 000000000000..f4ebba784936 +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 +index 000000000..51cd63dc6 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_device_access.c @@ -0,0 +1,5219 @@ @@ -643263,7 +643263,7 @@ index 000000000000..51cd63dc6ac0 + 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 +index 000000000..9cb905096 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_devtree.c @@ -0,0 +1,785 @@ @@ -644054,7 +644054,7 @@ index 000000000000..9cb9050960b6 +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 +index 000000000..976db422b --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_i2c.c @@ -0,0 +1,248 @@ @@ -644308,7 +644308,7 @@ index 000000000000..976db422b907 +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 +index 000000000..c900eb206 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_loader.c @@ -0,0 +1,1586 @@ @@ -645900,7 +645900,7 @@ index 000000000000..c900eb206881 +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 +index 000000000..25e5fa765 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_mt_common.c @@ -0,0 +1,793 @@ @@ -646699,7 +646699,7 @@ index 000000000000..25e5fa7654d4 +} 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 +index 000000000..d457bb66d --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_mta.c @@ -0,0 +1,85 @@ @@ -646790,7 +646790,7 @@ index 000000000000..d457bb66d360 +} 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 +index 000000000..d5f51e9c8 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_mtb.c @@ -0,0 +1,93 @@ @@ -646889,7 +646889,7 @@ index 000000000000..d5f51e9c836f + diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_params.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_params.h new file mode 100755 -index 000000000000..7a92d109fa73 +index 000000000..7a92d109f --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_params.h @@ -0,0 +1,1548 @@ @@ -648443,7 +648443,7 @@ index 000000000000..7a92d109fa73 + diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid00.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid00.h new file mode 100755 -index 000000000000..939ff2a288ae +index 000000000..939ff2a28 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid00.h @@ -0,0 +1,1548 @@ @@ -649997,7 +649997,7 @@ index 000000000000..939ff2a288ae + diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid01.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid01.h new file mode 100755 -index 000000000000..3dcb64dd3ba7 +index 000000000..3dcb64dd3 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_params_pid01.h @@ -0,0 +1,1548 @@ @@ -651551,7 +651551,7 @@ index 000000000000..3dcb64dd3ba7 + diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.c new file mode 100755 -index 000000000000..cc6feaef1031 +index 000000000..cc6feaef1 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.c @@ -0,0 +1,289 @@ @@ -651846,7 +651846,7 @@ index 000000000000..cc6feaef1031 +#endif diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.h new file mode 100755 -index 000000000000..289b014775c0 +index 000000000..289b01477 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.h @@ -0,0 +1,60 @@ @@ -651912,7 +651912,7 @@ index 000000000000..289b014775c0 +#endif /* _LINUX_CYTTSP5_PLATFORM_H */ diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_proximity.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_proximity.c new file mode 100755 -index 000000000000..0dba2c817387 +index 000000000..0dba2c817 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_proximity.c @@ -0,0 +1,555 @@ @@ -652473,7 +652473,7 @@ index 000000000000..0dba2c817387 +} 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 +index 000000000..ded98eff2 --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_regs.h @@ -0,0 +1,1202 @@ @@ -653681,7 +653681,7 @@ index 000000000000..ded98eff2deb +#endif /* _CYTTSP5_REGS_H */ diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_spi.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_spi.c new file mode 100755 -index 000000000000..a01b88b0c8a9 +index 000000000..a01b88b0c --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_spi.c @@ -0,0 +1,255 @@ @@ -653942,7 +653942,7 @@ index 000000000000..a01b88b0c8a9 +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 +index 000000000..b9517d52d --- /dev/null +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_test_device_access_api.c @@ -0,0 +1,442 @@ @@ -654390,7 +654390,7 @@ index 000000000000..b9517d52d5d4 +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 +index 000000000..bf7df1543 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/Makefile @@ -0,0 +1,18 @@ @@ -654414,7 +654414,7 @@ index 000000000000..bf7df1543b01 + 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 +index 000000000..7e911d1ac --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_common.h @@ -0,0 +1,159 @@ @@ -654579,7 +654579,7 @@ index 000000000000..7e911d1ac36f +#endif /* __LINUX_FOCALTECH_COMMON_H__ */ diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_config.h b/drivers/input/touchscreen/focaltech_touch/focaltech_config.h new file mode 100755 -index 000000000000..18cf1eafaa9a +index 000000000..18cf1eafa --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_config.h @@ -0,0 +1,244 @@ @@ -654829,7 +654829,7 @@ index 000000000000..18cf1eafaa9a +#endif /* _LINUX_FOCLATECH_CONFIG_H_ */ diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_core.c b/drivers/input/touchscreen/focaltech_touch/focaltech_core.c new file mode 100755 -index 000000000000..c8318c0ce8c0 +index 000000000..c8318c0ce --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_core.c @@ -0,0 +1,1783 @@ @@ -656618,7 +656618,7 @@ index 000000000000..c8318c0ce8c0 +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 +index 000000000..6547719b9 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_core.h @@ -0,0 +1,254 @@ @@ -656878,7 +656878,7 @@ index 000000000000..6547719b94a9 +#endif /* __LINUX_FOCALTECH_CORE_H__ */ diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_esdcheck.c b/drivers/input/touchscreen/focaltech_touch/focaltech_esdcheck.c new file mode 100755 -index 000000000000..cb8e6ec18bcf +index 000000000..cb8e6ec18 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_esdcheck.c @@ -0,0 +1,552 @@ @@ -657436,7 +657436,7 @@ index 000000000000..cb8e6ec18bcf + 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 +index 000000000..06511c515 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_ex_fun.c @@ -0,0 +1,1130 @@ @@ -658572,7 +658572,7 @@ index 000000000000..06511c515869 +#endif diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_ex_mode.c b/drivers/input/touchscreen/focaltech_touch/focaltech_ex_mode.c new file mode 100755 -index 000000000000..bca972ebb040 +index 000000000..bca972ebb --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_ex_mode.c @@ -0,0 +1,382 @@ @@ -658960,7 +658960,7 @@ index 000000000000..bca972ebb040 + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_flash.c b/drivers/input/touchscreen/focaltech_touch/focaltech_flash.c new file mode 100755 -index 000000000000..43672a78ddac +index 000000000..43672a78d --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_flash.c @@ -0,0 +1,1971 @@ @@ -660937,7 +660937,7 @@ index 000000000000..43672a78ddac +#endif /* #if FTS_AUTO_UPGRADE_EN */ diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_flash.h b/drivers/input/touchscreen/focaltech_touch/focaltech_flash.h new file mode 100755 -index 000000000000..d11f42ca8e1e +index 000000000..d11f42ca8 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_flash.h @@ -0,0 +1,182 @@ @@ -661125,7 +661125,7 @@ index 000000000000..d11f42ca8e1e +#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 +index 000000000..133dbcf8d --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_flash/Makefile @@ -0,0 +1,8 @@ @@ -661140,7 +661140,7 @@ index 000000000000..133dbcf8d701 \ 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 +index 000000000..e32de88b2 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_flash/focaltech_upgrade_ft8201.c @@ -0,0 +1,1033 @@ @@ -662179,7 +662179,7 @@ index 000000000000..e32de88b2435 +}; 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 +index 000000000..0874729e5 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_gesture.c @@ -0,0 +1,597 @@ @@ -662782,7 +662782,7 @@ index 000000000000..0874729e5d59 +#endif diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_i2c.c b/drivers/input/touchscreen/focaltech_touch/focaltech_i2c.c new file mode 100755 -index 000000000000..5e8294145b28 +index 000000000..5e8294145 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_i2c.c @@ -0,0 +1,240 @@ @@ -663028,7 +663028,7 @@ index 000000000000..5e8294145b28 + diff --git a/drivers/input/touchscreen/focaltech_touch/focaltech_point_report_check.c b/drivers/input/touchscreen/focaltech_touch/focaltech_point_report_check.c new file mode 100755 -index 000000000000..7157f444080d +index 000000000..7157f4440 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_point_report_check.c @@ -0,0 +1,135 @@ @@ -663169,7 +663169,7 @@ index 000000000000..7157f444080d + 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 +index 000000000..2a2945ec0 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/Makefile @@ -0,0 +1,11 @@ @@ -663186,7 +663186,7 @@ index 000000000000..2a2945ec021a + 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 +index 000000000..991bbba87 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.c @@ -0,0 +1,1948 @@ @@ -665140,7 +665140,7 @@ index 000000000000..991bbba87c70 +} 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 +index 000000000..bf3623336 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test.h @@ -0,0 +1,589 @@ @@ -665735,7 +665735,7 @@ index 000000000000..bf36233363a1 +#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 +index 000000000..a6ea11fd6 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.c @@ -0,0 +1,1220 @@ @@ -666961,7 +666961,7 @@ index 000000000000..a6ea11fd6025 +} 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 +index 000000000..a6c8d50c1 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/focaltech_test_ini.h @@ -0,0 +1,144 @@ @@ -667111,7 +667111,7 @@ index 000000000000..a6c8d50c11d2 +#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 +index 000000000..2e3a5e524 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/Makefile @@ -0,0 +1,6 @@ @@ -667123,7 +667123,7 @@ index 000000000000..2e3a5e524418 +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 +index 000000000..a5d666724 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/focaltech_test/supported_ic/focaltech_test_ft8201.c @@ -0,0 +1,1034 @@ @@ -668163,10 +668163,10 @@ index 000000000000..a5d666724e55 + 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 +index 000000000..e69de29bb 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 +index 000000000..0db3f0511 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch/include/pramboot/FT8006M_Pramboot_V1.6_20180426_le.h @@ -0,0 +1,299 @@ @@ -668472,7 +668472,7 @@ index 000000000000..0db3f051175a \ 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 +index 000000000..df8d3e5ef --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/Makefile @@ -0,0 +1,16 @@ @@ -668494,7 +668494,7 @@ index 000000000000..df8d3e5ef10a +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 +index 000000000..1d7ac5557 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_common.h @@ -0,0 +1,166 @@ @@ -668666,7 +668666,7 @@ index 000000000000..1d7ac55572fe +#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 +index 000000000..d30ca81df --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_config.h @@ -0,0 +1,241 @@ @@ -668913,7 +668913,7 @@ index 000000000000..d30ca81df9a9 +#endif /* _LINUX_FOCLATECH_CONFIG_H_ */ diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.c new file mode 100755 -index 000000000000..932b2f866274 +index 000000000..932b2f866 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.c @@ -0,0 +1,1747 @@ @@ -670666,7 +670666,7 @@ index 000000000000..932b2f866274 +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 +index 000000000..66e98371b --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_core.h @@ -0,0 +1,263 @@ @@ -670935,7 +670935,7 @@ index 000000000000..66e98371bf1c +#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 +index 000000000..b34bb26e8 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_esdcheck.c @@ -0,0 +1,464 @@ @@ -671405,7 +671405,7 @@ index 000000000000..b34bb26e8529 + 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 +index 000000000..b012c093b --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_fun.c @@ -0,0 +1,1181 @@ @@ -672592,7 +672592,7 @@ index 000000000000..b012c093b4d5 +} 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 +index 000000000..c0c970b12 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_ex_mode.c @@ -0,0 +1,307 @@ @@ -672905,7 +672905,7 @@ index 000000000000..c0c970b12e48 +} 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 +index 000000000..83bf8f4a6 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.c @@ -0,0 +1,2011 @@ @@ -674922,7 +674922,7 @@ index 000000000000..83bf8f4a6039 +} 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 +index 000000000..cfebe2d12 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash.h @@ -0,0 +1,205 @@ @@ -675133,7 +675133,7 @@ index 000000000000..cfebe2d12489 +#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 +index 000000000..17c9595ca --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/Makefile @@ -0,0 +1,7 @@ @@ -675146,7 +675146,7 @@ index 000000000000..17c9595ca5c9 + 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 +index 000000000..7ed7315f0 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_flash/focaltech_upgrade_ft5436.c @@ -0,0 +1,154 @@ @@ -675306,7 +675306,7 @@ index 000000000000..7ed7315f0d93 +}; 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 +index 000000000..b65cf3945 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_gesture.c @@ -0,0 +1,460 @@ @@ -675772,7 +675772,7 @@ index 000000000000..b65cf39451d2 +} 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 +index 000000000..f2e335c3d --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_i2c.c @@ -0,0 +1,193 @@ @@ -675972,7 +675972,7 @@ index 000000000000..f2e335c3db4f \ No newline at end of file diff --git a/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_point_report_check.c b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_point_report_check.c new file mode 100755 -index 000000000000..1296af1551db +index 000000000..1296af155 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/focaltech_point_report_check.c @@ -0,0 +1,135 @@ @@ -676113,7 +676113,7 @@ index 000000000000..1296af1551db + 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 +index 000000000..60120df32 --- /dev/null +++ b/drivers/input/touchscreen/focaltech_touch_ft5436/include/firmware/fw_sample.h @@ -0,0 +1,3223 @@ @@ -679343,7 +679343,7 @@ index 000000000000..60120df3213d \ 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 +index 000000000..2191bb6af --- /dev/null +++ b/drivers/input/touchscreen/gsl3673.c @@ -0,0 +1,1302 @@ @@ -680651,7 +680651,7 @@ index 000000000000..2191bb6af26b +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 +index 000000000..5d8d8ef02 --- /dev/null +++ b/drivers/input/touchscreen/gsl3673.h @@ -0,0 +1,5091 @@ @@ -685748,7 +685748,7 @@ index 000000000000..5d8d8ef02bec +#endif diff --git a/drivers/input/touchscreen/gsl3673_800x1280.c b/drivers/input/touchscreen/gsl3673_800x1280.c new file mode 100755 -index 000000000000..191029084c22 +index 000000000..191029084 --- /dev/null +++ b/drivers/input/touchscreen/gsl3673_800x1280.c @@ -0,0 +1,1247 @@ @@ -687001,7 +687001,7 @@ index 000000000000..191029084c22 +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 +index 000000000..38fa03963 --- /dev/null +++ b/drivers/input/touchscreen/gsl3673_800x1280.h @@ -0,0 +1,5187 @@ @@ -692194,7 +692194,7 @@ 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 +index 000000000..27c326481 --- /dev/null +++ b/drivers/input/touchscreen/gsl3676/Makefile @@ -0,0 +1,3 @@ @@ -692203,7 +692203,7 @@ index 000000000000..27c3264812e1 + diff --git a/drivers/input/touchscreen/gsl3676/gsl3676.c b/drivers/input/touchscreen/gsl3676/gsl3676.c new file mode 100755 -index 000000000000..4b1baca365fd +index 000000000..4b1baca36 --- /dev/null +++ b/drivers/input/touchscreen/gsl3676/gsl3676.c @@ -0,0 +1,1261 @@ @@ -693470,7 +693470,7 @@ index 000000000000..4b1baca365fd +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 +index 000000000..617860f76 --- /dev/null +++ b/drivers/input/touchscreen/gsl3676/rk3368_th863c_10.h @@ -0,0 +1,5331 @@ @@ -698807,7 +698807,7 @@ index 000000000000..617860f76401 +#endif diff --git a/drivers/input/touchscreen/gsl_point_id.c b/drivers/input/touchscreen/gsl_point_id.c new file mode 100755 -index 000000000000..624502b6bacc +index 000000000..624502b6b --- /dev/null +++ b/drivers/input/touchscreen/gsl_point_id.c @@ -0,0 +1,3100 @@ @@ -701913,7 +701913,7 @@ index 000000000000..624502b6bacc +}*/ diff --git a/drivers/input/touchscreen/gslx680.c b/drivers/input/touchscreen/gslx680.c new file mode 100755 -index 000000000000..ab970845c64f +index 000000000..ab970845c --- /dev/null +++ b/drivers/input/touchscreen/gslx680.c @@ -0,0 +1,1905 @@ @@ -703824,7 +703824,7 @@ index 000000000000..ab970845c64f +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 +index 000000000..2a76ec410 --- /dev/null +++ b/drivers/input/touchscreen/gslx680.h @@ -0,0 +1,10368 @@ @@ -714198,7 +714198,7 @@ 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 +index 000000000..3c1e1655c --- /dev/null +++ b/drivers/input/touchscreen/gslx6801.c @@ -0,0 +1,1680 @@ @@ -715884,7 +715884,7 @@ index 000000000000..3c1e1655c0a8 +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 +index 000000000..45bb3469d --- /dev/null +++ b/drivers/input/touchscreen/gslx6801.h @@ -0,0 +1,4955 @@ @@ -720845,7 +720845,7 @@ index 000000000000..45bb3469d2ea +#endif diff --git a/drivers/input/touchscreen/gslx680_d708/Makefile b/drivers/input/touchscreen/gslx680_d708/Makefile new file mode 100755 -index 000000000000..86d995c5e6c5 +index 000000000..86d995c5e --- /dev/null +++ b/drivers/input/touchscreen/gslx680_d708/Makefile @@ -0,0 +1,9 @@ @@ -720860,7 +720860,7 @@ index 000000000000..86d995c5e6c5 + 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 +index 000000000..89b74fe3e --- /dev/null +++ b/drivers/input/touchscreen/gslx680_d708/rockchip_gsl3670.h @@ -0,0 +1,5047 @@ @@ -725913,7 +725913,7 @@ index 000000000000..89b74fe3e23c +#endif diff --git a/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680.c b/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680.c new file mode 100755 -index 000000000000..f75586e2d37a +index 000000000..f75586e2d --- /dev/null +++ b/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680.c @@ -0,0 +1,1393 @@ @@ -727312,7 +727312,7 @@ index 000000000000..f75586e2d37a +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 +index 000000000..f58ba4a8a --- /dev/null +++ b/drivers/input/touchscreen/gslx680_d708/rockchip_gslX680_88v.h @@ -0,0 +1,5248 @@ @@ -732566,7 +732566,7 @@ 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 +index 000000000..0786b5ecb --- /dev/null +++ b/drivers/input/touchscreen/gslx680_firefly.c @@ -0,0 +1,1130 @@ @@ -733702,7 +733702,7 @@ index 000000000000..0786b5ecb311 +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 +index 000000000..8f40c59d7 --- /dev/null +++ b/drivers/input/touchscreen/gslx680_firefly.h @@ -0,0 +1,5120 @@ @@ -738828,7 +738828,7 @@ index 000000000000..8f40c59d7d2d +#endif diff --git a/drivers/input/touchscreen/gslx680_pad.c b/drivers/input/touchscreen/gslx680_pad.c new file mode 100755 -index 000000000000..d61a5ec76e94 +index 000000000..d61a5ec76 --- /dev/null +++ b/drivers/input/touchscreen/gslx680_pad.c @@ -0,0 +1,1198 @@ @@ -740032,7 +740032,7 @@ index 000000000000..d61a5ec76e94 +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 +index 000000000..aab1786f2 --- /dev/null +++ b/drivers/input/touchscreen/gslx680_pad.h @@ -0,0 +1,10232 @@ @@ -750270,7 +750270,7 @@ 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 +index 000000000..380a0fd93 --- /dev/null +++ b/drivers/input/touchscreen/gslx680a.c @@ -0,0 +1,1320 @@ @@ -751596,14 +751596,14 @@ index 000000000000..380a0fd93fa0 +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 +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 +index 000000000..2b3fa3680 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/Makefile @@ -0,0 +1,8 @@ @@ -751617,7 +751617,7 @@ index 000000000000..2b3fa3680e98 + diff --git a/drivers/input/touchscreen/gt1x/gt1x.c b/drivers/input/touchscreen/gt1x/gt1x.c new file mode 100755 -index 000000000000..f65ca3b916e4 +index 000000000..f65ca3b91 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x.c @@ -0,0 +1,809 @@ @@ -752432,7 +752432,7 @@ index 000000000000..f65ca3b916e4 +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 +index 000000000..b9339f10b --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x.h @@ -0,0 +1,64 @@ @@ -752502,7 +752502,7 @@ index 000000000000..b9339f10b0ad +#endif /* _GOODIX_GT1X_H_ */ diff --git a/drivers/input/touchscreen/gt1x/gt1x_cfg.h b/drivers/input/touchscreen/gt1x/gt1x_cfg.h new file mode 100755 -index 000000000000..6581aebfeda7 +index 000000000..6581aebfe --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_cfg.h @@ -0,0 +1,27 @@ @@ -752535,7 +752535,7 @@ index 000000000000..6581aebfeda7 +#endif /* _GOODIX_GT1X_CFG_H_ */ diff --git a/drivers/input/touchscreen/gt1x/gt1x_extents.c b/drivers/input/touchscreen/gt1x/gt1x_extents.c new file mode 100755 -index 000000000000..ed087d8f0031 +index 000000000..ed087d8f0 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_extents.c @@ -0,0 +1,928 @@ @@ -753469,7 +753469,7 @@ index 000000000000..ed087d8f0031 +} 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 +index 000000000..758863339 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_firmware.h @@ -0,0 +1,548 @@ @@ -754023,7 +754023,7 @@ index 000000000000..7588633397f5 +#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 +index 000000000..48b29ab50 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_generic.c @@ -0,0 +1,2445 @@ @@ -756474,7 +756474,7 @@ index 000000000000..48b29ab50bcd + diff --git a/drivers/input/touchscreen/gt1x/gt1x_generic.h b/drivers/input/touchscreen/gt1x/gt1x_generic.h new file mode 100755 -index 000000000000..7acc390d47ef +index 000000000..7acc390d4 --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_generic.h @@ -0,0 +1,595 @@ @@ -757075,7 +757075,7 @@ index 000000000000..7acc390d47ef + 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 +index 000000000..1d824bdaf --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_tools.c @@ -0,0 +1,433 @@ @@ -757514,7 +757514,7 @@ index 000000000000..1d824bdafd8a +} 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 +index 000000000..0979bb32d --- /dev/null +++ b/drivers/input/touchscreen/gt1x/gt1x_update.c @@ -0,0 +1,1456 @@ @@ -758976,7 +758976,7 @@ index 000000000000..0979bb32d52f +} 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 +index 000000000..62a3d0e49 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/GT9110P(2020)V71_Config_20201028_170326.cfg @@ -0,0 +1,19 @@ @@ -759002,7 +759002,7 @@ index 000000000000..62a3d0e496c6 \ 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 +index 000000000..952ea8453 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/GT9110P_Config_20160217_1526_2048_97.cfg @@ -0,0 +1 @@ @@ -759010,7 +759010,7 @@ index 000000000000..952ea845390e \ 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 +index 000000000..a7ac38fe3 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/GT9271_Config_20170526.cfg @@ -0,0 +1 @@ @@ -759018,7 +759018,7 @@ index 000000000000..a7ac38fe331e \ 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 +index 000000000..77b72c416 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/HLS-0102-1398V1-1060-GT911_Config_20201204_V66.cfg @@ -0,0 +1 @@ @@ -759026,7 +759026,7 @@ index 000000000000..77b72c416bea \ 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 +index 000000000..f63b5f278 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/Makefile @@ -0,0 +1,6 @@ @@ -759038,7 +759038,7 @@ index 000000000000..f63b5f2783a5 +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 +index 000000000..db5ed0f34 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ10162B_GT9271_1060_Config_20140821_1341110X42.cfg @@ -0,0 +1 @@ @@ -759046,7 +759046,7 @@ index 000000000000..db5ed0f34b82 \ 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 +index 000000000..96bf8cb79 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ10162_GT9271_Config_20140820_182456.cfg @@ -0,0 +1 @@ @@ -759054,7 +759054,7 @@ index 000000000000..96bf8cb7961c \ 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 +index 000000000..ffc4679bf --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ10187_GT910_Config_20140623_104014_0X41.cfg @@ -0,0 +1 @@ @@ -759062,7 +759062,7 @@ index 000000000000..ffc4679bf2d9 \ 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 +index 000000000..ffbfe3d54 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ10187_GT9271_Config_20140623_104014_0X41.cfg @@ -0,0 +1 @@ @@ -759070,7 +759070,7 @@ index 000000000000..ffbfe3d547da \ 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 +index 000000000..1c42d9ef7 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ89006B_GT911_Config_20140625_085816_0X43.cfg @@ -0,0 +1 @@ @@ -759078,7 +759078,7 @@ index 000000000000..1c42d9ef7ce1 \ 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 +index 000000000..7ed0266ac --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/WGJ89006B_GT9271_Config_20140625_085816_0X41.cfg @@ -0,0 +1 @@ @@ -759086,7 +759086,7 @@ index 000000000000..7ed0266acfaa \ 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 +index 000000000..b2dffcb5e --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/goodix_tool.c @@ -0,0 +1,627 @@ @@ -759719,7 +759719,7 @@ index 000000000000..b2dffcb5e105 +} diff --git a/drivers/input/touchscreen/gt9xx/gt9xx.c b/drivers/input/touchscreen/gt9xx/gt9xx.c new file mode 100755 -index 000000000000..cdc421cfd093 +index 000000000..cdc421cfd --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx.c @@ -0,0 +1,3236 @@ @@ -762961,7 +762961,7 @@ index 000000000000..cdc421cfd093 +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 +index 000000000..acc288575 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx.h @@ -0,0 +1,397 @@ @@ -763364,7 +763364,7 @@ index 000000000000..acc288575691 +#endif /* _GOODIX_GT9XX_H_ */ diff --git a/drivers/input/touchscreen/gt9xx/gt9xx_cfg.h b/drivers/input/touchscreen/gt9xx/gt9xx_cfg.h new file mode 100755 -index 000000000000..2b083c5655f8 +index 000000000..2b083c565 --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx_cfg.h @@ -0,0 +1,65 @@ @@ -763435,7 +763435,7 @@ index 000000000000..2b083c5655f8 +#endif /* _GOODIX_GT9XX_CFG_H_ */ diff --git a/drivers/input/touchscreen/gt9xx/gt9xx_firmware.h b/drivers/input/touchscreen/gt9xx/gt9xx_firmware.h new file mode 100755 -index 000000000000..7dce6045b736 +index 000000000..7dce6045b --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx_firmware.h @@ -0,0 +1,2338 @@ @@ -765779,7 +765779,7 @@ index 000000000000..7dce6045b736 +#endif diff --git a/drivers/input/touchscreen/gt9xx/gt9xx_update.c b/drivers/input/touchscreen/gt9xx/gt9xx_update.c new file mode 100755 -index 000000000000..312b1f93be60 +index 000000000..312b1f93b --- /dev/null +++ b/drivers/input/touchscreen/gt9xx/gt9xx_update.c @@ -0,0 +1,3637 @@ @@ -769422,7 +769422,7 @@ index 000000000000..312b1f93be60 +//**************** For GT9XXF End ********************// diff --git a/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D863_7.h b/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D863_7.h new file mode 100755 -index 000000000000..af607b6f7c6a +index 000000000..af607b6f7 --- /dev/null +++ b/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D863_7.h @@ -0,0 +1,514 @@ @@ -769942,7 +769942,7 @@ index 000000000000..af607b6f7c6a + 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 +index 000000000..2a2045660 --- /dev/null +++ b/drivers/input/touchscreen/hyn_cst2xx/CST21680SE_S126_D89.h @@ -0,0 +1,514 @@ @@ -770462,7 +770462,7 @@ index 000000000000..2a2045660c0a + diff --git a/drivers/input/touchscreen/hyn_cst2xx/Makefile b/drivers/input/touchscreen/hyn_cst2xx/Makefile new file mode 100755 -index 000000000000..247b6045dd13 +index 000000000..247b6045d --- /dev/null +++ b/drivers/input/touchscreen/hyn_cst2xx/Makefile @@ -0,0 +1,2 @@ @@ -770470,7 +770470,7 @@ index 000000000000..247b6045dd13 + 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 +index 000000000..689e0a8a7 --- /dev/null +++ b/drivers/input/touchscreen/hyn_cst2xx/hyn_cst2xx.c @@ -0,0 +1,1970 @@ @@ -772446,7 +772446,7 @@ index 000000000000..689e0a8a7e26 + 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 +index 000000000..bc90005e2 --- /dev/null +++ b/drivers/input/touchscreen/tp_gslx680_board.h @@ -0,0 +1,4908 @@ @@ -777360,7 +777360,7 @@ index 000000000000..bc90005e215d +#endif diff --git a/drivers/input/touchscreen/tp_suspend.h b/drivers/input/touchscreen/tp_suspend.h new file mode 100755 -index 000000000000..e4248663febc +index 000000000..e4248663f --- /dev/null +++ b/drivers/input/touchscreen/tp_suspend.h @@ -0,0 +1,109 @@ @@ -777475,7 +777475,7 @@ index 000000000000..e4248663febc +#endif diff --git a/drivers/input/touchscreen/vtl_ts/LX20JS06_A1_CT363_V03_5198_121015.dat b/drivers/input/touchscreen/vtl_ts/LX20JS06_A1_CT363_V03_5198_121015.dat new file mode 100755 -index 000000000000..dd2c3d8b25b4 +index 000000000..dd2c3d8b2 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/LX20JS06_A1_CT363_V03_5198_121015.dat @@ -0,0 +1,4096 @@ @@ -781578,7 +781578,7 @@ index 000000000000..dd2c3d8b25b4 \ 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 +index 000000000..0d15d7471 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/Makefile @@ -0,0 +1,9 @@ @@ -781593,7 +781593,7 @@ index 000000000000..0d15d7471f7f + 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 +index 000000000..44db1086d --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/apk.c @@ -0,0 +1,232 @@ @@ -781831,7 +781831,7 @@ index 000000000000..44db1086d264 + diff --git a/drivers/input/touchscreen/vtl_ts/apk.h b/drivers/input/touchscreen/vtl_ts/apk.h new file mode 100755 -index 000000000000..a0a14b6b3cc8 +index 000000000..a0a14b6b3 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/apk.h @@ -0,0 +1,7 @@ @@ -781844,7 +781844,7 @@ index 000000000000..a0a14b6b3cc8 +#endif diff --git a/drivers/input/touchscreen/vtl_ts/chip.c b/drivers/input/touchscreen/vtl_ts/chip.c new file mode 100755 -index 000000000000..50004cef1f0c +index 000000000..50004cef1 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/chip.c @@ -0,0 +1,860 @@ @@ -782710,7 +782710,7 @@ index 000000000000..50004cef1f0c + diff --git a/drivers/input/touchscreen/vtl_ts/chip.h b/drivers/input/touchscreen/vtl_ts/chip.h new file mode 100755 -index 000000000000..5ebb121276ed +index 000000000..5ebb12127 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/chip.h @@ -0,0 +1,13 @@ @@ -782729,7 +782729,7 @@ index 000000000000..5ebb121276ed +#endif diff --git a/drivers/input/touchscreen/vtl_ts/f307&f317&f316_CT363S_01_V10_F7E9_140212.dat b/drivers/input/touchscreen/vtl_ts/f307&f317&f316_CT363S_01_V10_F7E9_140212.dat new file mode 100755 -index 000000000000..8d43138759b3 +index 000000000..8d4313875 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/f307&f317&f316_CT363S_01_V10_F7E9_140212.dat @@ -0,0 +1,2048 @@ @@ -784784,7 +784784,7 @@ index 000000000000..8d43138759b3 \ 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 +index 000000000..d3fc42f43 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/lx--js77_97_CT365_V01_E7DA_130419.dat @@ -0,0 +1,2048 @@ @@ -786839,7 +786839,7 @@ index 000000000000..d3fc42f43e6b \ 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 +index 000000000..df431fcab --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/tp_fw.h @@ -0,0 +1,2051 @@ @@ -788896,7 +788896,7 @@ index 000000000000..df431fcabca8 +}; 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 +index 000000000..8c8e374ab --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/vtl_ts.c @@ -0,0 +1,728 @@ @@ -789630,7 +789630,7 @@ index 000000000000..8c8e374ab9d2 + diff --git a/drivers/input/touchscreen/vtl_ts/vtl_ts.h b/drivers/input/touchscreen/vtl_ts/vtl_ts.h new file mode 100755 -index 000000000000..95e280688d74 +index 000000000..95e280688 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/vtl_ts.h @@ -0,0 +1,193 @@ @@ -789829,7 +789829,7 @@ index 000000000000..95e280688d74 + 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 +index 000000000..a488e9812 --- /dev/null +++ b/drivers/input/touchscreen/vtl_ts/wgj36js07_A1_CT363_V01_0187_140306.dat @@ -0,0 +1,2048 @@ @@ -791884,7 +791884,7 @@ index 000000000000..a488e98122a6 \ 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 +index 000000000..6bbdb01e4 --- /dev/null +++ b/drivers/input/touchscreen/wacom_w9013.c @@ -0,0 +1,510 @@ @@ -792399,7 +792399,7 @@ 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 04878caf6..fe1256b01 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -160,7 +160,8 @@ config OMAP_IOMMU_DEBUG @@ -792414,7 +792414,7 @@ index 04878caf6da4..fe1256b01f7e 100644 select ARM_DMA_USE_IOMMU diff --git a/drivers/iommu/dma-iommu-ops.c b/drivers/iommu/dma-iommu-ops.c new file mode 100755 -index 000000000000..862d7823985e +index 000000000..862d78239 --- /dev/null +++ b/drivers/iommu/dma-iommu-ops.c @@ -0,0 +1,473 @@ @@ -792892,7 +792892,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, @@ -792960,7 +792960,7 @@ index d1539b7399a9..d5020a7299a3 100644 switch (dir) { case DMA_BIDIRECTIONAL: diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index bcf060b5cf85..c8605ebc039c 100644 +index bcf060b5c..c8605ebc0 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -793212,7 +793212,7 @@ index bcf060b5cf85..c8605ebc039c 100644 out_err: diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c -index e5d86b7177de..2671e3ddf3ae 100644 +index e5d86b717..2671e3ddf 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -19,6 +19,7 @@ @@ -794308,7 +794308,7 @@ index e5d86b7177de..2671e3ddf3ae 100644 +MODULE_ALIAS("platform:rockchip-iommu"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig -index dc062e8c2caf..122f81a0912b 100644 +index dc062e8c2..122f81a09 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -416,8 +416,9 @@ config IRQ_UNIPHIER_AIDET @@ -794324,7 +794324,7 @@ index dc062e8c2caf..122f81a0912b 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 95e0b82b6c66..effd2bbb9e9e 100644 +index 95e0b82b6..effd2bbb9 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) @@ -794507,7 +794507,7 @@ index 95e0b82b6c66..effd2bbb9e9e 100644 if (!(tmp & GITS_CBASER_SHAREABILITY_MASK)) { /* diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c -index 1bdb7acf445f..0145d142b322 100644 +index 1bdb7acf4..0145d142b 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -18,6 +18,9 @@ @@ -794565,7 +794565,7 @@ index 1bdb7acf445f..0145d142b322 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) @@ -794602,7 +794602,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 bc7aebcc96e9..e3b462bd3981 100644 +index bc7aebcc9..e3b462bd3 100644 --- a/drivers/irqchip/irq-meson-gpio.c +++ b/drivers/irqchip/irq-meson-gpio.c @@ -15,6 +15,7 @@ @@ -794749,7 +794749,7 @@ index bc7aebcc96e9..e3b462bd3981 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 @@ @@ -794983,7 +794983,7 @@ index 979acc810f30..99b9421b8494 100644 ret = devm_mbox_controller_register(&pdev->dev, &mb->mbox); diff --git a/drivers/media/i2c/rk628_csi.c b/drivers/media/i2c/rk628_csi.c new file mode 100755 -index 000000000000..3fe765c148c7 +index 000000000..3fe765c14 --- /dev/null +++ b/drivers/media/i2c/rk628_csi.c @@ -0,0 +1,2696 @@ @@ -797685,7 +797685,7 @@ index 000000000000..3fe765c148c7 +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 +index 000000000..e4aa25866 --- /dev/null +++ b/drivers/media/i2c/rk628_csi.h @@ -0,0 +1,344 @@ @@ -798034,7 +798034,7 @@ index 000000000000..e4aa258663b8 + +#endif diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c -index 282f3d2388cc..5f3f90123123 100644 +index 282f3d238..5f3f90123 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -12,6 +12,7 @@ @@ -798059,10 +798059,169 @@ index 282f3d2388cc..5f3f90123123 100644 error: diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c -index d109b9f14407..d9530b6a54f6 100644 +index d109b9f14..fd755d98a 100644 --- a/drivers/mfd/rk808.c +++ b/drivers/mfd/rk808.c -@@ -153,6 +153,8 @@ static const struct mfd_cell rk808s[] = { +@@ -2,7 +2,7 @@ + /* + * MFD core driver for Rockchip RK808/RK818 + * +- * Copyright (c) 2014, Fuzhou Rockchip Electronics Co., Ltd ++ * Copyright (c) 2014-2018, Fuzhou Rockchip Electronics Co., Ltd + * + * Author: Chris Zhong + * Author: Zhang Qing +@@ -18,7 +18,11 @@ + #include + #include + #include ++#include + #include ++#include ++#include ++#include + + struct rk808_reg_data { + int addr; +@@ -65,22 +69,61 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg) + switch (reg) { + case RK817_SECONDS_REG ... RK817_WEEKS_REG: + case RK817_RTC_STATUS_REG: ++ case RK817_ADC_CONFIG0 ... RK817_CURE_ADC_K0: ++ case RK817_CHRG_STS: ++ case RK817_CHRG_OUT: ++ case RK817_CHRG_IN: ++ case RK817_SYS_STS: + case RK817_INT_STS_REG0: + case RK817_INT_STS_REG1: + case RK817_INT_STS_REG2: +- case RK817_SYS_STS: + return true; + } + +- return true; ++ return false; ++} ++ ++static bool rk818_is_volatile_reg(struct device *dev, unsigned int reg) ++{ ++ /* ++ * Notes: ++ * - Technically the ROUND_30s bit makes RTC_CTRL_REG volatile, but ++ * we don't use that feature. It's better to cache. ++ * - It's unlikely we care that RK808_DEVCTRL_REG is volatile since ++ * bits are cleared in case when we shutoff anyway, but better safe. ++ */ ++ ++ switch (reg) { ++ case RK808_SECONDS_REG ... RK808_WEEKS_REG: ++ case RK808_RTC_STATUS_REG: ++ case RK808_VB_MON_REG: ++ case RK808_THERMAL_REG: ++ case RK808_DCDC_EN_REG: ++ case RK808_LDO_EN_REG: ++ case RK808_DCDC_UV_STS_REG: ++ case RK808_LDO_UV_STS_REG: ++ case RK808_DCDC_PG_REG: ++ case RK808_LDO_PG_REG: ++ case RK808_DEVCTRL_REG: ++ case RK808_INT_STS_REG1: ++ case RK808_INT_STS_REG2: ++ case RK808_INT_STS_MSK_REG1: ++ case RK808_INT_STS_MSK_REG2: ++ case RK816_INT_STS_REG1: ++ case RK816_INT_STS_MSK_REG1: ++ case RK818_SUP_STS_REG ... RK818_SAVE_DATA19: ++ return true; ++ } ++ ++ return false; + } + + static const struct regmap_config rk818_regmap_config = { + .reg_bits = 8, + .val_bits = 8, +- .max_register = RK818_USB_CTRL_REG, ++ .max_register = RK818_SAVE_DATA19, + .cache_type = REGCACHE_RBTREE, +- .volatile_reg = rk808_is_volatile_reg, ++ .volatile_reg = rk818_is_volatile_reg, + }; + + static const struct regmap_config rk805_regmap_config = { +@@ -99,11 +142,20 @@ static const struct regmap_config rk808_regmap_config = { + .volatile_reg = rk808_is_volatile_reg, + }; + ++static const struct regmap_config rk816_regmap_config = { ++ .reg_bits = 8, ++ .val_bits = 8, ++ .max_register = RK816_DATA18_REG, ++ .cache_type = REGCACHE_RBTREE, ++ .volatile_reg = rk818_is_volatile_reg, ++}; ++ + static const struct regmap_config rk817_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + .max_register = RK817_GPIO_INT_CFG, +- .cache_type = REGCACHE_NONE, ++ .num_reg_defaults_raw = RK817_GPIO_INT_CFG + 1, ++ .cache_type = REGCACHE_RBTREE, + .volatile_reg = rk817_is_volatile_reg, + }; + +@@ -111,18 +163,27 @@ static struct resource rtc_resources[] = { + DEFINE_RES_IRQ(RK808_IRQ_RTC_ALARM), + }; + ++static struct resource rk816_rtc_resources[] = { ++ DEFINE_RES_IRQ(RK816_IRQ_RTC_ALARM), ++}; ++ + static struct resource rk817_rtc_resources[] = { + DEFINE_RES_IRQ(RK817_IRQ_RTC_ALARM), + }; + + static struct resource rk805_key_resources[] = { +- DEFINE_RES_IRQ(RK805_IRQ_PWRON_RISE), + DEFINE_RES_IRQ(RK805_IRQ_PWRON_FALL), ++ DEFINE_RES_IRQ(RK805_IRQ_PWRON_RISE), ++}; ++ ++static struct resource rk816_pwrkey_resources[] = { ++ DEFINE_RES_IRQ(RK816_IRQ_PWRON_FALL), ++ DEFINE_RES_IRQ(RK816_IRQ_PWRON_RISE), + }; + + static struct resource rk817_pwrkey_resources[] = { +- DEFINE_RES_IRQ(RK817_IRQ_PWRON_RISE), + DEFINE_RES_IRQ(RK817_IRQ_PWRON_FALL), ++ DEFINE_RES_IRQ(RK817_IRQ_PWRON_RISE), + }; + + static const struct mfd_cell rk805s[] = { +@@ -150,9 +211,28 @@ static const struct mfd_cell rk808s[] = { + }, + }; + ++static const struct mfd_cell rk816s[] = { ++ { .name = "rk808-clkout", }, ++ { .name = "rk808-regulator", }, ++ { .name = "rk805-pinctrl", }, ++ { .name = "rk816-battery", .of_compatible = "rk816-battery", }, ++ { ++ .name = "rk805-pwrkey", ++ .num_resources = ARRAY_SIZE(rk816_pwrkey_resources), ++ .resources = &rk816_pwrkey_resources[0], ++ }, ++ { ++ .name = "rk808-rtc", ++ .num_resources = ARRAY_SIZE(rk816_rtc_resources), ++ .resources = &rk816_rtc_resources[0], ++ }, ++}; ++ static const struct mfd_cell rk817s[] = { { .name = "rk808-clkout",}, { .name = "rk808-regulator",}, @@ -798071,7 +798230,16 @@ index d109b9f14407..d9530b6a54f6 100644 { .name = "rk805-pwrkey", .num_resources = ARRAY_SIZE(rk817_pwrkey_resources), -@@ -168,6 +170,8 @@ static const struct mfd_cell rk817s[] = { +@@ -163,11 +243,17 @@ static const struct mfd_cell rk817s[] = { + .num_resources = ARRAY_SIZE(rk817_rtc_resources), + .resources = &rk817_rtc_resources[0], + }, ++ { ++ .name = "rk817-codec", ++ .of_compatible = "rockchip,rk817-codec", ++ }, + }; + static const struct mfd_cell rk818s[] = { { .name = "rk808-clkout", }, { .name = "rk808-regulator", }, @@ -798080,8 +798248,1054 @@ index d109b9f14407..d9530b6a54f6 100644 { .name = "rk808-rtc", .num_resources = ARRAY_SIZE(rtc_resources), +@@ -176,16 +262,18 @@ static const struct mfd_cell rk818s[] = { + }; + + static const struct rk808_reg_data rk805_pre_init_reg[] = { +- {RK805_BUCK1_CONFIG_REG, RK805_BUCK1_2_ILMAX_MASK, +- RK805_BUCK1_2_ILMAX_4000MA}, +- {RK805_BUCK2_CONFIG_REG, RK805_BUCK1_2_ILMAX_MASK, +- RK805_BUCK1_2_ILMAX_4000MA}, +- {RK805_BUCK3_CONFIG_REG, RK805_BUCK3_4_ILMAX_MASK, +- RK805_BUCK3_ILMAX_3000MA}, +- {RK805_BUCK4_CONFIG_REG, RK805_BUCK3_4_ILMAX_MASK, +- RK805_BUCK4_ILMAX_3500MA}, + {RK805_BUCK4_CONFIG_REG, BUCK_ILMIN_MASK, BUCK_ILMIN_400MA}, ++ {RK805_GPIO_IO_POL_REG, SLP_SD_MSK, SLEEP_FUN}, + {RK805_THERMAL_REG, TEMP_HOTDIE_MSK, TEMP115C}, ++ {RK808_RTC_CTRL_REG, RTC_STOP, RTC_STOP}, ++}; ++ ++static struct rk808_reg_data rk805_suspend_reg[] = { ++ {RK805_BUCK3_CONFIG_REG, PWM_MODE_MSK, AUTO_PWM_MODE}, ++}; ++ ++static struct rk808_reg_data rk805_resume_reg[] = { ++ {RK805_BUCK3_CONFIG_REG, PWM_MODE_MSK, FPWM_MODE}, + }; + + static const struct rk808_reg_data rk808_pre_init_reg[] = { +@@ -195,11 +283,40 @@ static const struct rk808_reg_data rk808_pre_init_reg[] = { + { RK808_BUCK1_CONFIG_REG, BUCK1_RATE_MASK, BUCK_ILMIN_200MA }, + { RK808_BUCK2_CONFIG_REG, BUCK2_RATE_MASK, BUCK_ILMIN_200MA }, + { RK808_DCDC_UV_ACT_REG, BUCK_UV_ACT_MASK, BUCK_UV_ACT_DISABLE}, ++ { RK808_RTC_CTRL_REG, RTC_STOP, RTC_STOP}, + { RK808_VB_MON_REG, MASK_ALL, VB_LO_ACT | + VB_LO_SEL_3500MV }, + }; + ++static const struct rk808_reg_data rk816_pre_init_reg[] = { ++ /* buck4 Max ILMIT*/ ++ { RK816_BUCK4_CONFIG_REG, REG_WRITE_MSK, BUCK4_MAX_ILIMIT }, ++ /* hotdie temperature: 105c*/ ++ { RK816_THERMAL_REG, REG_WRITE_MSK, TEMP105C }, ++ /* set buck 12.5mv/us */ ++ { RK816_BUCK1_CONFIG_REG, BUCK_RATE_MSK, BUCK_RATE_12_5MV_US }, ++ { RK816_BUCK2_CONFIG_REG, BUCK_RATE_MSK, BUCK_RATE_12_5MV_US }, ++ /* enable RTC_PERIOD & RTC_ALARM int */ ++ { RK816_INT_STS_MSK_REG2, REG_WRITE_MSK, RTC_PERIOD_ALARM_INT_EN }, ++ /* set bat 3.0 low and act shutdown */ ++ { RK816_VB_MON_REG, VBAT_LOW_VOL_MASK | VBAT_LOW_ACT_MASK, ++ RK816_VBAT_LOW_3V0 | EN_VABT_LOW_SHUT_DOWN }, ++ /* enable PWRON rising/faling int */ ++ { RK816_INT_STS_MSK_REG1, REG_WRITE_MSK, RK816_PWRON_FALL_RISE_INT_EN }, ++ /* enable PLUG IN/OUT int */ ++ { RK816_INT_STS_MSK_REG3, REG_WRITE_MSK, PLUGIN_OUT_INT_EN }, ++ /* clear int flags */ ++ { RK816_INT_STS_REG1, REG_WRITE_MSK, ALL_INT_FLAGS_ST }, ++ { RK816_INT_STS_REG2, REG_WRITE_MSK, ALL_INT_FLAGS_ST }, ++ { RK816_INT_STS_REG3, REG_WRITE_MSK, ALL_INT_FLAGS_ST }, ++ { RK816_DCDC_EN_REG2, BOOST_EN_MASK, BOOST_DISABLE }, ++ /* set write mask bit 1, otherwise 'is_enabled()' get wrong status */ ++ { RK816_LDO_EN_REG1, REGS_WMSK, REGS_WMSK }, ++ { RK816_LDO_EN_REG2, REGS_WMSK, REGS_WMSK }, ++}; ++ + static const struct rk808_reg_data rk817_pre_init_reg[] = { ++ {RK817_SYS_CFG(3), RK817_SLPPOL_MSK, RK817_SLPPOL_L}, + {RK817_RTC_CTRL_REG, RTC_STOP, RTC_STOP}, + {RK817_GPIO_INT_CFG, RK817_INT_POL_MSK, RK817_INT_POL_L}, + {RK817_SYS_CFG(1), RK817_HOTDIE_TEMP_MSK | RK817_TSD_TEMP_MSK, +@@ -220,8 +337,10 @@ static const struct rk808_reg_data rk818_pre_init_reg[] = { + { RK818_H5V_EN_REG, BIT(1), RK818_REF_RDY_CTRL }, + /* enable HDMI 5V */ + { RK818_H5V_EN_REG, BIT(0), RK818_H5V_EN }, ++ { RK808_RTC_CTRL_REG, RTC_STOP, RTC_STOP}, + { RK808_VB_MON_REG, MASK_ALL, VB_LO_ACT | + VB_LO_SEL_3500MV }, ++ {RK808_CLK32OUT_REG, CLK32KOUT2_FUNC_MASK, CLK32KOUT2_FUNC}, + }; + + static const struct regmap_irq rk805_irqs[] = { +@@ -301,6 +420,70 @@ static const struct regmap_irq rk808_irqs[] = { + }, + }; + ++static struct rk808_reg_data rk816_suspend_reg[] = { ++ /* set bat 3.4v low and act irq */ ++ { RK816_VB_MON_REG, VBAT_LOW_VOL_MASK | VBAT_LOW_ACT_MASK, ++ RK816_VBAT_LOW_3V4 | EN_VBAT_LOW_IRQ }, ++}; ++ ++static struct rk808_reg_data rk816_resume_reg[] = { ++ /* set bat 3.0v low and act shutdown */ ++ { RK816_VB_MON_REG, VBAT_LOW_VOL_MASK | VBAT_LOW_ACT_MASK, ++ RK816_VBAT_LOW_3V0 | EN_VABT_LOW_SHUT_DOWN }, ++}; ++ ++static const struct regmap_irq rk816_irqs[] = { ++ /* INT_STS */ ++ [RK816_IRQ_PWRON_FALL] = { ++ .mask = RK816_IRQ_PWRON_FALL_MSK, ++ .reg_offset = 0, ++ }, ++ [RK816_IRQ_PWRON_RISE] = { ++ .mask = RK816_IRQ_PWRON_RISE_MSK, ++ .reg_offset = 0, ++ }, ++ [RK816_IRQ_VB_LOW] = { ++ .mask = RK816_IRQ_VB_LOW_MSK, ++ .reg_offset = 1, ++ }, ++ [RK816_IRQ_PWRON] = { ++ .mask = RK816_IRQ_PWRON_MSK, ++ .reg_offset = 1, ++ }, ++ [RK816_IRQ_PWRON_LP] = { ++ .mask = RK816_IRQ_PWRON_LP_MSK, ++ .reg_offset = 1, ++ }, ++ [RK816_IRQ_HOTDIE] = { ++ .mask = RK816_IRQ_HOTDIE_MSK, ++ .reg_offset = 1, ++ }, ++ [RK816_IRQ_RTC_ALARM] = { ++ .mask = RK816_IRQ_RTC_ALARM_MSK, ++ .reg_offset = 1, ++ }, ++ [RK816_IRQ_RTC_PERIOD] = { ++ .mask = RK816_IRQ_RTC_PERIOD_MSK, ++ .reg_offset = 1, ++ }, ++ [RK816_IRQ_USB_OV] = { ++ .mask = RK816_IRQ_USB_OV_MSK, ++ .reg_offset = 1, ++ }, ++}; ++ ++static struct rk808_reg_data rk818_suspend_reg[] = { ++ /* set bat 3.4v low and act irq */ ++ { RK808_VB_MON_REG, VBAT_LOW_VOL_MASK | VBAT_LOW_ACT_MASK, ++ RK808_VBAT_LOW_3V4 | EN_VBAT_LOW_IRQ }, ++}; ++ ++static struct rk808_reg_data rk818_resume_reg[] = { ++ /* set bat 3.0v low and act shutdown */ ++ { RK808_VB_MON_REG, VBAT_LOW_VOL_MASK | VBAT_LOW_ACT_MASK, ++ RK808_VBAT_LOW_3V0 | EN_VABT_LOW_SHUT_DOWN }, ++}; ++ + static const struct regmap_irq rk818_irqs[] = { + /* INT_STS */ + [RK818_IRQ_VOUT_LO] = { +@@ -421,6 +604,61 @@ static const struct regmap_irq_chip rk808_irq_chip = { + .init_ack_masked = true, + }; + ++static const struct regmap_irq rk816_battery_irqs[] = { ++ /* INT_STS */ ++ [RK816_IRQ_PLUG_IN] = { ++ .mask = RK816_IRQ_PLUG_IN_MSK, ++ .reg_offset = 0, ++ }, ++ [RK816_IRQ_PLUG_OUT] = { ++ .mask = RK816_IRQ_PLUG_OUT_MSK, ++ .reg_offset = 0, ++ }, ++ [RK816_IRQ_CHG_OK] = { ++ .mask = RK816_IRQ_CHG_OK_MSK, ++ .reg_offset = 0, ++ }, ++ [RK816_IRQ_CHG_TE] = { ++ .mask = RK816_IRQ_CHG_TE_MSK, ++ .reg_offset = 0, ++ }, ++ [RK816_IRQ_CHG_TS] = { ++ .mask = RK816_IRQ_CHG_TS_MSK, ++ .reg_offset = 0, ++ }, ++ [RK816_IRQ_CHG_CVTLIM] = { ++ .mask = RK816_IRQ_CHG_CVTLIM_MSK, ++ .reg_offset = 0, ++ }, ++ [RK816_IRQ_DISCHG_ILIM] = { ++ .mask = RK816_IRQ_DISCHG_ILIM_MSK, ++ .reg_offset = 0, ++ }, ++}; ++ ++static struct regmap_irq_chip rk816_irq_chip = { ++ .name = "rk816", ++ .irqs = rk816_irqs, ++ .num_irqs = ARRAY_SIZE(rk816_irqs), ++ .num_regs = 2, ++ .irq_reg_stride = 3, ++ .status_base = RK816_INT_STS_REG1, ++ .mask_base = RK816_INT_STS_MSK_REG1, ++ .ack_base = RK816_INT_STS_REG1, ++ .init_ack_masked = true, ++}; ++ ++static struct regmap_irq_chip rk816_battery_irq_chip = { ++ .name = "rk816_battery", ++ .irqs = rk816_battery_irqs, ++ .num_irqs = ARRAY_SIZE(rk816_battery_irqs), ++ .num_regs = 1, ++ .status_base = RK816_INT_STS_REG3, ++ .mask_base = RK816_INT_STS_MSK_REG3, ++ .ack_base = RK816_INT_STS_REG3, ++ .init_ack_masked = true, ++}; ++ + static struct regmap_irq_chip rk817_irq_chip = { + .name = "rk817", + .irqs = rk817_irqs, +@@ -446,8 +684,70 @@ static const struct regmap_irq_chip rk818_irq_chip = { + }; + + static struct i2c_client *rk808_i2c_client; ++static struct rk808_reg_data *suspend_reg, *resume_reg; ++static int suspend_reg_num, resume_reg_num; ++ ++static void rk805_device_shutdown_prepare(void) ++{ ++ int ret; ++ struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client); ++ ++ if (!rk808) ++ return; ++ ++ ret = regmap_update_bits(rk808->regmap, ++ RK805_GPIO_IO_POL_REG, ++ SLP_SD_MSK, SHUTDOWN_FUN); ++ if (ret) ++ dev_err(&rk808_i2c_client->dev, "Failed to shutdown device!\n"); ++} ++ ++static void rk817_shutdown_prepare(void) ++{ ++ int ret; ++ struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client); ++ ++ /* close rtc int when power off */ ++ regmap_update_bits(rk808->regmap, ++ RK817_INT_STS_MSK_REG0, ++ (0x3 << 5), (0x3 << 5)); ++ regmap_update_bits(rk808->regmap, ++ RK817_RTC_INT_REG, ++ (0x3 << 2), (0x0 << 2)); ++ ++ if (rk808->pins && rk808->pins->p && rk808->pins->power_off) { ++ ret = regmap_update_bits(rk808->regmap, ++ RK817_SYS_CFG(3), ++ RK817_SLPPIN_FUNC_MSK, ++ SLPPIN_NULL_FUN); ++ if (ret) ++ pr_err("shutdown: config SLPPIN_NULL_FUN error!\n"); ++ ++ ret = regmap_update_bits(rk808->regmap, ++ RK817_SYS_CFG(3), ++ RK817_SLPPOL_MSK, ++ RK817_SLPPOL_H); ++ if (ret) ++ pr_err("shutdown: config RK817_SLPPOL_H error!\n"); ++ ++ ret = pinctrl_select_state(rk808->pins->p, ++ rk808->pins->power_off); ++ if (ret) ++ pr_info("%s:failed to activate pwroff state\n", ++ __func__); ++ } ++ ++ /* pmic sleep shutdown function */ ++ ret = regmap_update_bits(rk808->regmap, ++ RK817_SYS_CFG(3), ++ RK817_SLPPIN_FUNC_MSK, SLPPIN_DN_FUN); ++ if (ret) ++ dev_err(&rk808_i2c_client->dev, "Failed to shutdown device!\n"); ++ /* pmic need the SCL clock to synchronize register */ ++ mdelay(2); ++} + +-static void rk808_pm_power_off(void) ++static void rk8xx_device_shutdown(void) + { + int ret; + unsigned int reg, bit; +@@ -462,6 +762,10 @@ static void rk808_pm_power_off(void) + reg = RK808_DEVCTRL_REG, + bit = DEV_OFF_RST; + break; ++ case RK816_ID: ++ reg = RK816_DEV_CTRL_REG; ++ bit = DEV_OFF; ++ break; + case RK818_ID: + reg = RK818_DEVCTRL_REG; + bit = DEV_OFF; +@@ -469,42 +773,345 @@ static void rk808_pm_power_off(void) + default: + return; + } ++ + ret = regmap_update_bits(rk808->regmap, reg, bit, bit); + if (ret) + dev_err(&rk808_i2c_client->dev, "Failed to shutdown device!\n"); + } + +-static void rk8xx_shutdown(struct i2c_client *client) ++/* Called in syscore shutdown */ ++static void (*pm_shutdown)(void); ++ ++static void rk8xx_syscore_shutdown(void) + { +- struct rk808 *rk808 = i2c_get_clientdata(client); + int ret; ++ struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client); + +- switch (rk808->variant) { +- case RK805_ID: +- ret = regmap_update_bits(rk808->regmap, +- RK805_GPIO_IO_POL_REG, +- SLP_SD_MSK, +- SHUTDOWN_FUN); ++ if (!rk808) { ++ dev_warn(&rk808_i2c_client->dev, ++ "have no rk808, so do nothing here\n"); ++ return; ++ } ++ ++ /* close rtc int when power off */ ++ regmap_update_bits(rk808->regmap, ++ RK808_INT_STS_MSK_REG1, ++ (0x3 << 5), (0x3 << 5)); ++ regmap_update_bits(rk808->regmap, ++ RK808_RTC_INT_REG, ++ (0x3 << 2), (0x0 << 2)); ++ /* ++ * For PMIC that power off supplies by write register via i2c bus, ++ * it's better to do power off at syscore shutdown here. ++ * ++ * Because when run to kernel's "pm_power_off" call, i2c may has ++ * been stopped or PMIC may not be able to get i2c transfer while ++ * there are too many devices are competiting. ++ */ ++ if (system_state == SYSTEM_POWER_OFF) { ++ if (rk808->variant == RK809_ID || rk808->variant == RK817_ID) { ++ ret = regmap_update_bits(rk808->regmap, ++ RK817_SYS_CFG(3), ++ RK817_SLPPIN_FUNC_MSK, ++ SLPPIN_DN_FUN); ++ if (ret) { ++ dev_warn(&rk808_i2c_client->dev, ++ "Cannot switch to power down function\n"); ++ } ++ } ++ ++ if (pm_shutdown) { ++ dev_info(&rk808_i2c_client->dev, "System power off\n"); ++ pm_shutdown(); ++ mdelay(10); ++ dev_info(&rk808_i2c_client->dev, ++ "Power off failed !\n"); ++ while (1) ++ ; ++ } ++ } ++} ++ ++static struct syscore_ops rk808_syscore_ops = { ++ .shutdown = rk8xx_syscore_shutdown, ++}; ++ ++/* ++ * RK8xx PMICs would do real power off in syscore shutdown, if "pm_power_off" ++ * is not assigned(e.g. PSCI is not enabled), we have to provide a dummy ++ * callback for it, otherwise there comes a halt in Reboot system call: ++ * ++ * if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off) ++ * cmd = LINUX_REBOOT_CMD_HALT; ++ */ ++static void rk808_pm_power_off_dummy(void) ++{ ++ pr_info("Dummy power off for RK8xx PMICs, should never reach here!\n"); ++ ++ while (1) ++ ; ++} ++ ++static ssize_t rk8xx_dbg_store(struct device *dev, ++ struct device_attribute *attr, ++ const char *buf, size_t count) ++{ ++ int ret; ++ char cmd; ++ u32 input[2], addr, data; ++ struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client); ++ ++ ret = sscanf(buf, "%c ", &cmd); ++ if (ret != 1) { ++ pr_err("Unknown command\n"); ++ goto out; ++ } ++ switch (cmd) { ++ case 'w': ++ ret = sscanf(buf, "%c %x %x ", &cmd, &input[0], &input[1]); ++ if (ret != 3) { ++ pr_err("error! cmd format: echo w [addr] [value]\n"); ++ goto out; ++ }; ++ addr = input[0] & 0xff; ++ data = input[1] & 0xff; ++ pr_info("cmd : %c %x %x\n\n", cmd, input[0], input[1]); ++ regmap_write(rk808->regmap, addr, data); ++ regmap_read(rk808->regmap, addr, &data); ++ pr_info("new: %x %x\n", addr, data); + break; +- case RK809_ID: +- case RK817_ID: +- ret = regmap_update_bits(rk808->regmap, +- RK817_SYS_CFG(3), +- RK817_SLPPIN_FUNC_MSK, +- SLPPIN_DN_FUN); ++ case 'r': ++ ret = sscanf(buf, "%c %x ", &cmd, &input[0]); ++ if (ret != 2) { ++ pr_err("error! cmd format: echo r [addr]\n"); ++ goto out; ++ }; ++ pr_info("cmd : %c %x\n\n", cmd, input[0]); ++ addr = input[0] & 0xff; ++ regmap_read(rk808->regmap, addr, &data); ++ pr_info("%x %x\n", input[0], data); + break; + default: +- return; ++ pr_err("Unknown command\n"); ++ break; ++ } ++ ++out: ++ return count; ++} ++ ++static int rk817_pinctrl_init(struct device *dev, struct rk808 *rk808) ++{ ++ int ret; ++ struct platform_device *pinctrl_dev; ++ struct pinctrl_state *default_st; ++ ++ pinctrl_dev = platform_device_alloc("rk805-pinctrl", -1); ++ if (!pinctrl_dev) { ++ dev_err(dev, "Alloc pinctrl dev failed!\n"); ++ return -ENOMEM; + } ++ ++ pinctrl_dev->dev.parent = dev; ++ ++ ret = platform_device_add(pinctrl_dev); ++ ++ if (ret) { ++ platform_device_put(pinctrl_dev); ++ dev_err(dev, "Add rk805-pinctrl dev failed!\n"); ++ return ret; ++ } ++ if (dev->pins && !IS_ERR(dev->pins->p)) { ++ dev_info(dev, "had get a pinctrl!\n"); ++ return 0; ++ } ++ ++ rk808->pins = devm_kzalloc(dev, sizeof(struct rk808_pin_info), ++ GFP_KERNEL); ++ if (!rk808->pins) ++ return -ENOMEM; ++ ++ rk808->pins->p = devm_pinctrl_get(dev); ++ if (IS_ERR(rk808->pins->p)) { ++ rk808->pins->p = NULL; ++ dev_err(dev, "no pinctrl handle\n"); ++ return 0; ++ } ++ ++ default_st = pinctrl_lookup_state(rk808->pins->p, ++ PINCTRL_STATE_DEFAULT); ++ ++ if (IS_ERR(default_st)) { ++ dev_dbg(dev, "no default pinctrl state\n"); ++ return -EINVAL; ++ } ++ ++ ret = pinctrl_select_state(rk808->pins->p, default_st); ++ if (ret) { ++ dev_dbg(dev, "failed to activate default pinctrl state\n"); ++ return -EINVAL; ++ } ++ ++ rk808->pins->power_off = pinctrl_lookup_state(rk808->pins->p, ++ "pmic-power-off"); ++ if (IS_ERR(rk808->pins->power_off)) { ++ rk808->pins->power_off = NULL; ++ dev_dbg(dev, "no power-off pinctrl state\n"); ++ } ++ ++ rk808->pins->sleep = pinctrl_lookup_state(rk808->pins->p, ++ "pmic-sleep"); ++ if (IS_ERR(rk808->pins->sleep)) { ++ rk808->pins->sleep = NULL; ++ dev_dbg(dev, "no sleep-setting state\n"); ++ } ++ ++ rk808->pins->reset = pinctrl_lookup_state(rk808->pins->p, ++ "pmic-reset"); ++ if (IS_ERR(rk808->pins->reset)) { ++ rk808->pins->reset = NULL; ++ dev_dbg(dev, "no reset-setting pinctrl state\n"); ++ return 0; ++ } ++ ++ ret = pinctrl_select_state(rk808->pins->p, rk808->pins->reset); ++ + if (ret) +- dev_warn(&client->dev, +- "Cannot switch to power down function\n"); ++ dev_dbg(dev, "failed to activate reset-setting pinctrl state\n"); ++ ++ return 0; ++} ++ ++struct rk817_reboot_data_t { ++ struct rk808 *rk808; ++ struct notifier_block reboot_notifier; ++}; ++ ++static struct rk817_reboot_data_t rk817_reboot_data; ++ ++static int rk817_reboot_notifier_handler(struct notifier_block *nb, ++ unsigned long action, void *cmd) ++{ ++ struct rk817_reboot_data_t *data; ++ struct device *dev; ++ int value, power_en_active0, power_en_active1; ++ int ret, i; ++ static const char * const pmic_rst_reg_only_cmd[] = { ++ "loader", "bootloader", "fastboot", "recovery", ++ "ums", "panic", "watchdog", "charge", ++ }; ++ ++ data = container_of(nb, struct rk817_reboot_data_t, reboot_notifier); ++ dev = &data->rk808->i2c->dev; ++ ++ regmap_read(data->rk808->regmap, RK817_POWER_EN_SAVE0, ++ &power_en_active0); ++ if (power_en_active0 != 0) { ++ regmap_read(data->rk808->regmap, RK817_POWER_EN_SAVE1, ++ &power_en_active1); ++ value = power_en_active0 & 0x0f; ++ regmap_write(data->rk808->regmap, ++ RK817_POWER_EN_REG(0), ++ value | 0xf0); ++ value = (power_en_active0 & 0xf0) >> 4; ++ regmap_write(data->rk808->regmap, ++ RK817_POWER_EN_REG(1), ++ value | 0xf0); ++ value = power_en_active1 & 0x0f; ++ regmap_write(data->rk808->regmap, ++ RK817_POWER_EN_REG(2), ++ value | 0xf0); ++ value = (power_en_active1 & 0xf0) >> 4; ++ regmap_write(data->rk808->regmap, ++ RK817_POWER_EN_REG(3), ++ value | 0xf0); ++ } else { ++ dev_info(dev, "reboot: not restore POWER_EN\n"); ++ } ++ ++ if (action != SYS_RESTART || !cmd) ++ return NOTIFY_OK; ++ ++ /* ++ * When system restart, there are two rst actions of PMIC sleep if ++ * board hardware support: ++ * ++ * 0b'00: reset the PMIC itself completely. ++ * 0b'01: reset the 'RST' related register only. ++ * ++ * In the case of 0b'00, PMIC reset itself which triggers SoC NPOR-reset ++ * at the same time, so the command: reboot load/bootload/recovery, etc ++ * is not effect any more. ++ * ++ * Here we check if this reboot cmd is what we expect for 0b'01. ++ */ ++ for (i = 0; i < ARRAY_SIZE(pmic_rst_reg_only_cmd); i++) { ++ if (!strcmp(cmd, pmic_rst_reg_only_cmd[i])) { ++ ret = regmap_update_bits(data->rk808->regmap, ++ RK817_SYS_CFG(3), ++ RK817_RST_FUNC_MSK, ++ RK817_RST_FUNC_REG); ++ if (ret) ++ dev_err(dev, "reboot: force RK817_RST_FUNC_REG error!\n"); ++ else ++ dev_info(dev, "reboot: force RK817_RST_FUNC_REG ok!\n"); ++ break; ++ } ++ } ++ ++ return NOTIFY_OK; + } + ++static void rk817_of_property_prepare(struct rk808 *rk808, struct device *dev) ++{ ++ u32 inner; ++ int ret, func, msk, val; ++ struct device_node *np = dev->of_node; ++ ++ ret = of_property_read_u32_index(np, "fb-inner-reg-idxs", 0, &inner); ++ if (!ret && inner == RK817_ID_DCDC3) ++ regmap_update_bits(rk808->regmap, RK817_POWER_CONFIG, ++ RK817_BUCK3_FB_RES_MSK, ++ RK817_BUCK3_FB_RES_INTER); ++ else ++ regmap_update_bits(rk808->regmap, RK817_POWER_CONFIG, ++ RK817_BUCK3_FB_RES_MSK, ++ RK817_BUCK3_FB_RES_EXT); ++ dev_info(dev, "support dcdc3 fb mode:%d, %d\n", ret, inner); ++ ++ ret = of_property_read_u32(np, "pmic-reset-func", &func); ++ ++ msk = RK817_SLPPIN_FUNC_MSK | RK817_RST_FUNC_MSK; ++ val = SLPPIN_NULL_FUN; ++ ++ if (!ret && func < RK817_RST_FUNC_CNT) { ++ val |= RK817_RST_FUNC_MSK & ++ (func << RK817_RST_FUNC_SFT); ++ } else { ++ val |= RK817_RST_FUNC_REG; ++ } ++ ++ regmap_update_bits(rk808->regmap, RK817_SYS_CFG(3), msk, val); ++ ++ dev_info(dev, "support pmic reset mode:%d,%d\n", ret, func); ++ ++ rk817_reboot_data.rk808 = rk808; ++ rk817_reboot_data.reboot_notifier.notifier_call = ++ rk817_reboot_notifier_handler; ++ ret = register_reboot_notifier(&rk817_reboot_data.reboot_notifier); ++ if (ret) ++ dev_err(dev, "failed to register reboot nb\n"); ++} ++ ++static struct kobject *rk8xx_kobj; ++static struct device_attribute rk8xx_attrs = ++ __ATTR(rk8xx_dbg, 0200, NULL, rk8xx_dbg_store); ++ + static const struct of_device_id rk808_of_match[] = { + { .compatible = "rockchip,rk805" }, + { .compatible = "rockchip,rk808" }, + { .compatible = "rockchip,rk809" }, ++ { .compatible = "rockchip,rk816" }, + { .compatible = "rockchip,rk817" }, + { .compatible = "rockchip,rk818" }, + { }, +@@ -517,13 +1124,20 @@ static int rk808_probe(struct i2c_client *client, + struct device_node *np = client->dev.of_node; + struct rk808 *rk808; + const struct rk808_reg_data *pre_init_reg; ++ const struct regmap_irq_chip *battery_irq_chip = NULL; + const struct mfd_cell *cells; ++ unsigned char pmic_id_msb, pmic_id_lsb; ++ u8 on_source = 0, off_source = 0; ++ unsigned int on, off; ++ int pm_off = 0, msb, lsb; + int nr_pre_init_regs; + int nr_cells; +- int msb, lsb; +- unsigned char pmic_id_msb, pmic_id_lsb; + int ret; + int i; ++ void (*of_property_prepare_fn)(struct rk808 *rk808, ++ struct device *dev) = NULL; ++ int (*pinctrl_init)(struct device *dev, struct rk808 *rk808) = NULL; ++ void (*device_shutdown_fn)(void) = NULL; + + rk808 = devm_kzalloc(&client->dev, sizeof(*rk808), GFP_KERNEL); + if (!rk808) +@@ -564,6 +1178,14 @@ static int rk808_probe(struct i2c_client *client, + nr_pre_init_regs = ARRAY_SIZE(rk805_pre_init_reg); + cells = rk805s; + nr_cells = ARRAY_SIZE(rk805s); ++ on_source = RK805_ON_SOURCE_REG; ++ off_source = RK805_OFF_SOURCE_REG; ++ suspend_reg = rk805_suspend_reg; ++ suspend_reg_num = ARRAY_SIZE(rk805_suspend_reg); ++ resume_reg = rk805_resume_reg; ++ resume_reg_num = ARRAY_SIZE(rk805_resume_reg); ++ device_shutdown_fn = rk8xx_device_shutdown; ++ rk808->pm_pwroff_prep_fn = rk805_device_shutdown_prepare; + break; + case RK808_ID: + rk808->regmap_cfg = &rk808_regmap_config; +@@ -572,6 +1194,23 @@ static int rk808_probe(struct i2c_client *client, + nr_pre_init_regs = ARRAY_SIZE(rk808_pre_init_reg); + cells = rk808s; + nr_cells = ARRAY_SIZE(rk808s); ++ device_shutdown_fn = rk8xx_device_shutdown; ++ break; ++ case RK816_ID: ++ rk808->regmap_cfg = &rk816_regmap_config; ++ rk808->regmap_irq_chip = &rk816_irq_chip; ++ battery_irq_chip = &rk816_battery_irq_chip; ++ pre_init_reg = rk816_pre_init_reg; ++ nr_pre_init_regs = ARRAY_SIZE(rk816_pre_init_reg); ++ cells = rk816s; ++ nr_cells = ARRAY_SIZE(rk816s); ++ on_source = RK816_ON_SOURCE_REG; ++ off_source = RK816_OFF_SOURCE_REG; ++ suspend_reg = rk816_suspend_reg; ++ suspend_reg_num = ARRAY_SIZE(rk816_suspend_reg); ++ resume_reg = rk816_resume_reg; ++ resume_reg_num = ARRAY_SIZE(rk816_resume_reg); ++ device_shutdown_fn = rk8xx_device_shutdown; + break; + case RK818_ID: + rk808->regmap_cfg = &rk818_regmap_config; +@@ -580,6 +1219,13 @@ static int rk808_probe(struct i2c_client *client, + nr_pre_init_regs = ARRAY_SIZE(rk818_pre_init_reg); + cells = rk818s; + nr_cells = ARRAY_SIZE(rk818s); ++ on_source = RK818_ON_SOURCE_REG; ++ off_source = RK818_OFF_SOURCE_REG; ++ suspend_reg = rk818_suspend_reg; ++ suspend_reg_num = ARRAY_SIZE(rk818_suspend_reg); ++ resume_reg = rk818_resume_reg; ++ resume_reg_num = ARRAY_SIZE(rk818_resume_reg); ++ device_shutdown_fn = rk8xx_device_shutdown; + break; + case RK809_ID: + case RK817_ID: +@@ -589,6 +1235,11 @@ static int rk808_probe(struct i2c_client *client, + nr_pre_init_regs = ARRAY_SIZE(rk817_pre_init_reg); + cells = rk817s; + nr_cells = ARRAY_SIZE(rk817s); ++ on_source = RK817_ON_SOURCE_REG; ++ off_source = RK817_OFF_SOURCE_REG; ++ rk808->pm_pwroff_prep_fn = rk817_shutdown_prepare; ++ of_property_prepare_fn = rk817_of_property_prepare; ++ pinctrl_init = rk817_pinctrl_init; + break; + default: + dev_err(&client->dev, "Unsupported RK8XX ID %lu\n", +@@ -597,6 +1248,7 @@ static int rk808_probe(struct i2c_client *client, + } + + rk808->i2c = client; ++ rk808_i2c_client = client; + i2c_set_clientdata(client, rk808); + + rk808->regmap = devm_regmap_init_i2c(client, rk808->regmap_cfg); +@@ -605,11 +1257,50 @@ static int rk808_probe(struct i2c_client *client, + return PTR_ERR(rk808->regmap); + } + ++ if (on_source && off_source) { ++ ret = regmap_read(rk808->regmap, on_source, &on); ++ if (ret) { ++ dev_err(&client->dev, "read 0x%x failed\n", on_source); ++ return ret; ++ } ++ ++ ret = regmap_read(rk808->regmap, off_source, &off); ++ if (ret) { ++ dev_err(&client->dev, "read 0x%x failed\n", off_source); ++ return ret; ++ } ++ ++ dev_info(&client->dev, "source: on=0x%02x, off=0x%02x\n", ++ on, off); ++ } ++ + if (!client->irq) { + dev_err(&client->dev, "No interrupt support, no core IRQ\n"); + return -EINVAL; + } + ++ if (of_property_prepare_fn) ++ of_property_prepare_fn(rk808, &client->dev); ++ ++ for (i = 0; i < nr_pre_init_regs; i++) { ++ ret = regmap_update_bits(rk808->regmap, ++ pre_init_reg[i].addr, ++ pre_init_reg[i].mask, ++ pre_init_reg[i].value); ++ if (ret) { ++ dev_err(&client->dev, ++ "0x%x write err\n", ++ pre_init_reg[i].addr); ++ return ret; ++ } ++ } ++ ++ if (pinctrl_init) { ++ ret = pinctrl_init(&client->dev, rk808); ++ if (ret) ++ return ret; ++ } ++ + ret = regmap_add_irq_chip(rk808->regmap, client->irq, + IRQF_ONESHOT, -1, + rk808->regmap_irq_chip, &rk808->irq_data); +@@ -618,15 +1309,15 @@ static int rk808_probe(struct i2c_client *client, + return ret; + } + +- for (i = 0; i < nr_pre_init_regs; i++) { +- ret = regmap_update_bits(rk808->regmap, +- pre_init_reg[i].addr, +- pre_init_reg[i].mask, +- pre_init_reg[i].value); ++ if (battery_irq_chip) { ++ ret = regmap_add_irq_chip(rk808->regmap, client->irq, ++ IRQF_ONESHOT | IRQF_SHARED, -1, ++ battery_irq_chip, ++ &rk808->battery_irq_data); + if (ret) { + dev_err(&client->dev, +- "0x%x write err\n", +- pre_init_reg[i].addr); ++ "Failed to add batterry irq_chip %d\n", ret); ++ regmap_del_irq_chip(client->irq, rk808->irq_data); + return ret; + } + } +@@ -639,15 +1330,34 @@ static int rk808_probe(struct i2c_client *client, + goto err_irq; + } + +- if (of_property_read_bool(np, "rockchip,system-power-controller")) { +- rk808_i2c_client = client; +- pm_power_off = rk808_pm_power_off; ++ pm_off = of_property_read_bool(np, "rockchip,system-power-controller"); ++ if (pm_off) { ++ if (!pm_power_off_prepare) ++ pm_power_off_prepare = rk808->pm_pwroff_prep_fn; ++ ++ if (device_shutdown_fn) { ++ register_syscore_ops(&rk808_syscore_ops); ++ /* power off system in the syscore shutdown ! */ ++ pm_shutdown = device_shutdown_fn; ++ } ++ } ++ ++ rk8xx_kobj = kobject_create_and_add("rk8xx", NULL); ++ if (rk8xx_kobj) { ++ ret = sysfs_create_file(rk8xx_kobj, &rk8xx_attrs.attr); ++ if (ret) ++ dev_err(&client->dev, "create rk8xx sysfs error\n"); + } + ++ if (!pm_power_off) ++ pm_power_off = rk808_pm_power_off_dummy; ++ + return 0; + + err_irq: + regmap_del_irq_chip(client->irq, rk808->irq_data); ++ if (battery_irq_chip) ++ regmap_del_irq_chip(client->irq, rk808->battery_irq_data); + return ret; + } + +@@ -656,21 +1366,45 @@ static int rk808_remove(struct i2c_client *client) + struct rk808 *rk808 = i2c_get_clientdata(client); + + regmap_del_irq_chip(client->irq, rk808->irq_data); ++ mfd_remove_devices(&client->dev); + + /** + * pm_power_off may points to a function from another module. + * Check if the pointer is set by us and only then overwrite it. + */ +- if (pm_power_off == rk808_pm_power_off) ++ if (pm_power_off == rk808_pm_power_off_dummy) + pm_power_off = NULL; + ++ /** ++ * As above, check if the pointer is set by us before overwrite. ++ */ ++ if (rk808->pm_pwroff_prep_fn && ++ pm_power_off_prepare == rk808->pm_pwroff_prep_fn) ++ pm_power_off_prepare = NULL; ++ ++ if (pm_shutdown) ++ unregister_syscore_ops(&rk808_syscore_ops); ++ + return 0; + } + + static int __maybe_unused rk8xx_suspend(struct device *dev) + { +- struct rk808 *rk808 = i2c_get_clientdata(to_i2c_client(dev)); +- int ret = 0; ++ struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client); ++ int i, ret = 0; ++ int value; ++ ++ for (i = 0; i < suspend_reg_num; i++) { ++ ret = regmap_update_bits(rk808->regmap, ++ suspend_reg[i].addr, ++ suspend_reg[i].mask, ++ suspend_reg[i].value); ++ if (ret) { ++ dev_err(dev, "0x%x write err\n", ++ suspend_reg[i].addr); ++ return ret; ++ } ++ } + + switch (rk808->variant) { + case RK805_ID: +@@ -681,10 +1415,34 @@ static int __maybe_unused rk8xx_suspend(struct device *dev) + break; + case RK809_ID: + case RK817_ID: +- ret = regmap_update_bits(rk808->regmap, +- RK817_SYS_CFG(3), +- RK817_SLPPIN_FUNC_MSK, +- SLPPIN_SLP_FUN); ++ if (rk808->pins && rk808->pins->p && rk808->pins->sleep) { ++ ret = regmap_update_bits(rk808->regmap, ++ RK817_SYS_CFG(3), ++ RK817_SLPPIN_FUNC_MSK, ++ SLPPIN_NULL_FUN); ++ if (ret) { ++ dev_err(dev, "suspend: config SLPPIN_NULL_FUN error!\n"); ++ return ret; ++ } ++ ++ ret = regmap_update_bits(rk808->regmap, ++ RK817_SYS_CFG(3), ++ RK817_SLPPOL_MSK, ++ RK817_SLPPOL_H); ++ if (ret) { ++ dev_err(dev, "suspend: config RK817_SLPPOL_H error!\n"); ++ return ret; ++ } ++ ++ /* pmic need the SCL clock to synchronize register */ ++ regmap_read(rk808->regmap, RK817_SYS_STS, &value); ++ mdelay(2); ++ ret = pinctrl_select_state(rk808->pins->p, rk808->pins->sleep); ++ if (ret) { ++ dev_err(dev, "failed to act slp pinctrl state\n"); ++ return ret; ++ } ++ } + break; + default: + break; +@@ -695,16 +1453,51 @@ static int __maybe_unused rk8xx_suspend(struct device *dev) + + static int __maybe_unused rk8xx_resume(struct device *dev) + { +- struct rk808 *rk808 = i2c_get_clientdata(to_i2c_client(dev)); +- int ret = 0; ++ struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client); ++ int i, ret = 0; ++ int value; ++ ++ for (i = 0; i < resume_reg_num; i++) { ++ ret = regmap_update_bits(rk808->regmap, ++ resume_reg[i].addr, ++ resume_reg[i].mask, ++ resume_reg[i].value); ++ if (ret) { ++ dev_err(dev, "0x%x write err\n", ++ resume_reg[i].addr); ++ return ret; ++ } ++ } + + switch (rk808->variant) { + case RK809_ID: + case RK817_ID: +- ret = regmap_update_bits(rk808->regmap, +- RK817_SYS_CFG(3), +- RK817_SLPPIN_FUNC_MSK, +- SLPPIN_NULL_FUN); ++ if (rk808->pins && rk808->pins->p && rk808->pins->reset) { ++ ret = regmap_update_bits(rk808->regmap, ++ RK817_SYS_CFG(3), ++ RK817_SLPPIN_FUNC_MSK, ++ SLPPIN_NULL_FUN); ++ if (ret) { ++ dev_err(dev, "resume: config SLPPIN_NULL_FUN error!\n"); ++ return ret; ++ } ++ ++ ret = regmap_update_bits(rk808->regmap, ++ RK817_SYS_CFG(3), ++ RK817_SLPPOL_MSK, ++ RK817_SLPPOL_L); ++ if (ret) { ++ dev_err(dev, "resume: config RK817_SLPPOL_L error!\n"); ++ return ret; ++ } ++ ++ /* pmic need the SCL clock to synchronize register */ ++ regmap_read(rk808->regmap, RK817_SYS_STS, &value); ++ mdelay(2); ++ ret = pinctrl_select_state(rk808->pins->p, rk808->pins->reset); ++ if (ret) ++ dev_dbg(dev, "failed to act reset pinctrl state\n"); ++ } + break; + default: + break; +@@ -712,7 +1505,7 @@ static int __maybe_unused rk8xx_resume(struct device *dev) + + return ret; + } +-static SIMPLE_DEV_PM_OPS(rk8xx_pm_ops, rk8xx_suspend, rk8xx_resume); ++SIMPLE_DEV_PM_OPS(rk8xx_pm_ops, rk8xx_suspend, rk8xx_resume); + + static struct i2c_driver rk808_i2c_driver = { + .driver = { +@@ -722,10 +1515,23 @@ static struct i2c_driver rk808_i2c_driver = { + }, + .probe = rk808_probe, + .remove = rk808_remove, +- .shutdown = rk8xx_shutdown, + }; + ++#ifdef CONFIG_ROCKCHIP_THUNDER_BOOT ++static int __init rk808_i2c_driver_init(void) ++{ ++ return i2c_add_driver(&rk808_i2c_driver); ++} ++subsys_initcall(rk808_i2c_driver_init); ++ ++static void __exit rk808_i2c_driver_exit(void) ++{ ++ i2c_del_driver(&rk808_i2c_driver); ++} ++module_exit(rk808_i2c_driver_exit); ++#else + module_i2c_driver(rk808_i2c_driver); ++#endif + + MODULE_LICENSE("GPL"); + MODULE_AUTHOR("Chris Zhong "); diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c -index 94caee49da99..3ade0e0f323f 100644 +index 94caee49d..3ade0e0f3 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -2893,6 +2893,9 @@ static void mmc_blk_remove_debugfs(struct mmc_card *card, @@ -798095,7 +799309,7 @@ index 94caee49da99..3ade0e0f323f 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; @@ -798105,7 +799319,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 db3c9c68875d..842b679251f8 100644 +index db3c9c688..842b67925 100644 --- a/drivers/mmc/core/core.h +++ b/drivers/mmc/core/core.h @@ -80,6 +80,8 @@ int mmc_attach_mmc(struct mmc_host *host); @@ -798118,7 +799332,7 @@ index db3c9c68875d..842b679251f8 100644 extern bool use_spi_crc; diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c -index 58112999a69a..f4d000a16637 100644 +index 58112999a..f4d000a16 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -504,6 +504,9 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) @@ -798178,7 +799392,7 @@ index 58112999a69a..f4d000a16637 100644 +} +EXPORT_SYMBOL(mmc_host_rescan); diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c -index 1b0853a82189..0482a37a0d2f 100644 +index 1b0853a82..0482a37a0 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -3,9 +3,15 @@ @@ -798889,7 +800103,7 @@ index 1b0853a82189..0482a37a0d2f 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 @@ -798901,7 +800115,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 { @@ -799078,7 +800292,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 { @@ -799092,7 +800306,7 @@ index da5923a92e60..0b53484e9306 100644 /* DMA ops for Internal/External DMAC interface */ diff --git a/drivers/mmc/host/rk_sdmmc.h b/drivers/mmc/host/rk_sdmmc.h new file mode 100755 -index 000000000000..cad989246002 +index 000000000..cad989246 --- /dev/null +++ b/drivers/mmc/host/rk_sdmmc.h @@ -0,0 +1,387 @@ @@ -799485,7 +800699,7 @@ index 000000000000..cad989246002 +#endif /* _DW_MMC_H_ */ diff --git a/drivers/mmc/host/rk_sdmmc_ops.c b/drivers/mmc/host/rk_sdmmc_ops.c new file mode 100755 -index 000000000000..96f20d2dcfc7 +index 000000000..96f20d2dc --- /dev/null +++ b/drivers/mmc/host/rk_sdmmc_ops.c @@ -0,0 +1,194 @@ @@ -799685,7 +800899,7 @@ index 000000000000..96f20d2dcfc7 +MODULE_LICENSE("GPL"); diff --git a/drivers/mmc/host/rk_sdmmc_ops.h b/drivers/mmc/host/rk_sdmmc_ops.h new file mode 100755 -index 000000000000..8261d69f561d +index 000000000..8261d69f5 --- /dev/null +++ b/drivers/mmc/host/rk_sdmmc_ops.h @@ -0,0 +1,11 @@ @@ -799701,7 +800915,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 @@ @@ -800057,7 +801271,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 @@ -800080,7 +801294,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 @@ -800093,7 +801307,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 @@ @@ -801593,7 +802807,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 da1d185f6d22..404cbf60d3f2 100644 +index da1d185f6..404cbf60d 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, @@ -801621,7 +802835,7 @@ index da1d185f6d22..404cbf60d3f2 100644 hw_atl_utils_fw_downld_dwords(self, self->rpc_addr, 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" @@ -801633,7 +802847,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 @@ -801642,7 +802856,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 6d81e87861ca..426e39d4ccf0 100644 +index 6d81e8786..426e39d4c 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, @@ -801657,7 +802871,7 @@ index 6d81e87861ca..426e39d4ccf0 100644 case MWIFIEX_USB_EP_DATA: diff --git a/drivers/net/wireless/rockchip_wlan/Kconfig b/drivers/net/wireless/rockchip_wlan/Kconfig new file mode 100755 -index 000000000000..d77741df5cc0 +index 000000000..d77741df5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/Kconfig @@ -0,0 +1,39 @@ @@ -801702,7 +802916,7 @@ index 000000000000..d77741df5cc0 +endif # WL_ROCKCHIP diff --git a/drivers/net/wireless/rockchip_wlan/Makefile b/drivers/net/wireless/rockchip_wlan/Makefile new file mode 100755 -index 000000000000..8279a393719f +index 000000000..8279a3937 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/Makefile @@ -0,0 +1,3 @@ @@ -801711,7 +802925,7 @@ index 000000000000..8279a393719f +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 +index 000000000..2ec5138b7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/Kconfig @@ -0,0 +1,33 @@ @@ -801750,7 +802964,7 @@ index 000000000000..2ec5138b79a7 + 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 +index 000000000..e4e2c6964 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/Makefile @@ -0,0 +1,10 @@ @@ -801766,7 +802980,7 @@ index 000000000000..e4e2c6964a6b + 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 +index 000000000..3e6e78888 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Kconfig @@ -0,0 +1,59 @@ @@ -801831,7 +803045,7 @@ index 000000000000..3e6e78888be2 +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..1d9f6d0c09ae +index 000000000..1d9f6d0c0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Makefile @@ -0,0 +1,258 @@ @@ -802095,7 +803309,7 @@ index 000000000000..1d9f6d0c09ae +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 +index 000000000..cc0b854d3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/aiutils.c @@ -0,0 +1,2099 @@ @@ -804200,7 +805414,7 @@ index 000000000000..cc0b854d34d5 +} 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 +index 000000000..76490b575 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcm_app_utils.c @@ -0,0 +1,1033 @@ @@ -805239,7 +806453,7 @@ index 000000000000..76490b575fae +} 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 +index 000000000..80eb786f0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmbloom.c @@ -0,0 +1,243 @@ @@ -805488,7 +806702,7 @@ index 000000000000..80eb786f035a +} 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 +index 000000000..40bdb4bfd --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmevent.c @@ -0,0 +1,396 @@ @@ -805890,7 +807104,7 @@ index 000000000000..40bdb4bfda4f +} 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 +index 000000000..b59edd754 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh.c @@ -0,0 +1,893 @@ @@ -806789,7 +808003,7 @@ index 000000000000..b59edd7540ca +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_linux.c new file mode 100755 -index 000000000000..84cc71992635 +index 000000000..84cc71992 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_linux.c @@ -0,0 +1,524 @@ @@ -807319,7 +808533,7 @@ index 000000000000..84cc71992635 +#endif /* BCMSDH_MODULE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc.c new file mode 100755 -index 000000000000..01f7fa23b2b3 +index 000000000..01f7fa23b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc.c @@ -0,0 +1,1801 @@ @@ -809126,7 +810340,7 @@ index 000000000000..01f7fa23b2b3 +} 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 +index 000000000..a2d34724f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc_linux.c @@ -0,0 +1,381 @@ @@ -809513,7 +810727,7 @@ index 000000000000..a2d34724f6c4 +} 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 +index 000000000..86d4cb9e3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdspi_linux.c @@ -0,0 +1,438 @@ @@ -809957,7 +811171,7 @@ index 000000000000..86d4cb9e3575 +#endif /* !BCMSPI_ANDROID */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmspibrcm.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmspibrcm.c new file mode 100755 -index 000000000000..c0431638b995 +index 000000000..c0431638b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmspibrcm.c @@ -0,0 +1,1800 @@ @@ -811763,7 +812977,7 @@ index 000000000000..c0431638b995 +} 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..bc27ba560e1d +index 000000000..bc27ba560 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmstdlib_s.c @@ -0,0 +1,307 @@ @@ -812076,7 +813290,7 @@ index 000000000000..bc27ba560e1d +} 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 +index 000000000..c9b01bd66 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmutils.c @@ -0,0 +1,4379 @@ @@ -816461,7 +817675,7 @@ index 000000000000..c9b01bd66820 +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.c new file mode 100755 -index 000000000000..fc916db9cb61 +index 000000000..fc916db9c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.c @@ -0,0 +1,1494 @@ @@ -817961,7 +819175,7 @@ index 000000000000..fc916db9cb61 +} 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 +index 000000000..ad3a6a4ae --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.h @@ -0,0 +1,816 @@ @@ -818783,7 +819997,7 @@ index 000000000000..ad3a6a4ae693 +#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 +index 000000000..196ff0fe0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rates.h @@ -0,0 +1,832 @@ @@ -819621,7 +820835,7 @@ index 000000000000..196ff0fe0eff +#endif /* _bcmwifi_rates_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rspec.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rspec.h new file mode 100755 -index 000000000000..5c3d4a674814 +index 000000000..5c3d4a674 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_rspec.h @@ -0,0 +1,213 @@ @@ -819840,7 +821054,7 @@ index 000000000000..5c3d4a674814 +#endif /* _bcmwifi_rspec_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmxtlv.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmxtlv.c new file mode 100755 -index 000000000000..51d0f5aaf623 +index 000000000..51d0f5aaf --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmxtlv.c @@ -0,0 +1,623 @@ @@ -820469,7 +821683,7 @@ index 000000000000..51d0f5aaf623 +} 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..d8d151631705 +index 000000000..d8d151631 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus.c @@ -0,0 +1,2903 @@ @@ -823378,7 +824592,7 @@ index 000000000000..d8d151631705 +#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 +index 000000000..3be28b2da --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb.c @@ -0,0 +1,1173 @@ @@ -824557,7 +825771,7 @@ index 000000000000..3be28b2da9d4 +} /* dbus_bus_fw_get */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb_linux.c new file mode 100755 -index 000000000000..2d999b12bc94 +index 000000000..2d999b12b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb_linux.c @@ -0,0 +1,3404 @@ @@ -827967,7 +829181,7 @@ index 000000000000..2d999b12bc94 +#endif /* BCMUSBDEV_COMPOSITE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd.h new file mode 100755 -index 000000000000..427e96ea33bb +index 000000000..427e96ea3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd.h @@ -0,0 +1,3433 @@ @@ -831406,7 +832620,7 @@ index 000000000000..427e96ea33bb +#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 +index 000000000..c5b07cf49 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bus.h @@ -0,0 +1,357 @@ @@ -831769,7 +832983,7 @@ index 000000000000..c5b07cf493d9 +#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 +index 000000000..342cc004d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_buzzz.h @@ -0,0 +1,38 @@ @@ -831813,7 +833027,7 @@ index 000000000000..342cc004d25a +#endif /* _DHD_BUZZZ_H_INCLUDED_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ccode.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ccode.c new file mode 100755 -index 000000000000..fe9a826325e6 +index 000000000..fe9a82632 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ccode.c @@ -0,0 +1,274 @@ @@ -832093,7 +833307,7 @@ index 000000000000..fe9a826325e6 +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cdc.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cdc.c new file mode 100755 -index 000000000000..44cd1cbf24e6 +index 000000000..44cd1cbf2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cdc.c @@ -0,0 +1,981 @@ @@ -833080,7 +834294,7 @@ index 000000000000..44cd1cbf24e6 +} 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..cc35d086068a +index 000000000..cc35d0860 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.c @@ -0,0 +1,305 @@ @@ -833391,7 +834605,7 @@ index 000000000000..cc35d086068a +} 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 +index 000000000..88c2e0a16 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.h @@ -0,0 +1,55 @@ @@ -833452,7 +834666,7 @@ index 000000000000..88c2e0a16bcc +#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 +index 000000000..df11fa183 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_common.c @@ -0,0 +1,7496 @@ @@ -840954,7 +842168,7 @@ index 000000000000..df11fa183e60 +#endif /* DISABLE_HE_ENAB || CUSTOM_CONTROL_HE_ENAB */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.c new file mode 100755 -index 000000000000..c4713ded8a23 +index 000000000..c4713ded8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.c @@ -0,0 +1,4730 @@ @@ -845690,7 +846904,7 @@ index 000000000000..c4713ded8a23 +} 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 +index 000000000..6af9c7b18 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.h @@ -0,0 +1,384 @@ @@ -846080,7 +847294,7 @@ index 000000000000..6af9c7b18013 +#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 +index 000000000..dd1a0681b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.c @@ -0,0 +1,220 @@ @@ -846306,7 +847520,7 @@ index 000000000000..dd1a0681bf4f + diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.h new file mode 100755 -index 000000000000..bcc712c2999b +index 000000000..bcc712c29 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.h @@ -0,0 +1,77 @@ @@ -846389,7 +847603,7 @@ index 000000000000..bcc712c2999b + 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 +index 000000000..8553e7456 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_gpio.c @@ -0,0 +1,279 @@ @@ -846674,7 +847888,7 @@ index 000000000000..8553e74562dc +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_hikey.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_hikey.c new file mode 100755 -index 000000000000..8acb153a45e3 +index 000000000..8acb153a4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_hikey.c @@ -0,0 +1,294 @@ @@ -846974,7 +848188,7 @@ index 000000000000..8acb153a45e3 +#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 +index 000000000..1c0f3ca65 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_memprealloc.c @@ -0,0 +1,562 @@ @@ -847542,7 +848756,7 @@ index 000000000000..1c0f3ca65e7a +#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 +index 000000000..4bc2511c6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg.h @@ -0,0 +1,367 @@ @@ -847915,7 +849129,7 @@ index 000000000000..4bc2511c6da2 +#endif /* _dhd_dbg_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.c new file mode 100755 -index 000000000000..c909431c0b46 +index 000000000..c909431c0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.c @@ -0,0 +1,426 @@ @@ -848347,7 +849561,7 @@ index 000000000000..c909431c0b46 +} 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 +index 000000000..c6deb98f2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.h @@ -0,0 +1,141 @@ @@ -848494,7 +849708,7 @@ index 000000000000..c6deb98f2ace +#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 +index 000000000..a6066289c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.c @@ -0,0 +1,2411 @@ @@ -850911,7 +852125,7 @@ index 000000000000..a6066289c543 +} 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 +index 000000000..008c45316 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.h @@ -0,0 +1,853 @@ @@ -851770,7 +852984,7 @@ index 000000000000..008c45316f1c +#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 +index 000000000..2f33db421 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug_linux.c @@ -0,0 +1,516 @@ @@ -852292,7 +853506,7 @@ index 000000000000..2f33db421877 +} 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 +index 000000000..d457437d3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.c @@ -0,0 +1,1238 @@ @@ -853536,7 +854750,7 @@ index 000000000000..d457437d39ed +} 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 +index 000000000..ac2639d19 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.h @@ -0,0 +1,289 @@ @@ -853831,7 +855045,7 @@ index 000000000000..ac2639d19396 +#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 +index 000000000..cdb70099f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_gpio.c @@ -0,0 +1,350 @@ @@ -854187,7 +855401,7 @@ index 000000000000..cdb70099fb19 + diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.c new file mode 100755 -index 000000000000..3772fdfca4e5 +index 000000000..3772fdfca --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.c @@ -0,0 +1,1429 @@ @@ -855622,7 +856836,7 @@ index 000000000000..3772fdfca4e5 +#endif /* DHDTCPSYNC_FLOOD_BLK */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.h new file mode 100755 -index 000000000000..45be081e3473 +index 000000000..45be081e3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.h @@ -0,0 +1,97 @@ @@ -855725,7 +856939,7 @@ 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..37a12817a999 +index 000000000..37a12817a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.c @@ -0,0 +1,22324 @@ @@ -878055,7 +879269,7 @@ index 000000000000..37a12817a999 +#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 +index 000000000..f2b295f54 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.h @@ -0,0 +1,448 @@ @@ -878509,7 +879723,7 @@ index 000000000000..f2b295f54f5b +#endif /* __DHD_LINUX_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_exportfs.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_exportfs.c new file mode 100755 -index 000000000000..6518b357aa30 +index 000000000..6518b357a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_exportfs.c @@ -0,0 +1,1420 @@ @@ -879935,7 +881149,7 @@ index 000000000000..6518b357aa30 +} 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 +index 000000000..30dfaa2b7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_lb.c @@ -0,0 +1,1324 @@ @@ -881265,7 +882479,7 @@ index 000000000000..30dfaa2b7e41 +#endif /* DHD_LB_TXP */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.c new file mode 100755 -index 000000000000..3efe02c9ed49 +index 000000000..3efe02c9e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.c @@ -0,0 +1,1472 @@ @@ -882743,7 +883957,7 @@ index 000000000000..3efe02c9ed49 +#endif /* DHD_RX_DUMP */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.h new file mode 100755 -index 000000000000..12bb32fd5dae +index 000000000..12bb32fd5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.h @@ -0,0 +1,125 @@ @@ -882874,7 +884088,7 @@ index 000000000000..12bb32fd5dae +#endif /* __DHD_LINUX_PKTDUMP_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_platdev.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_platdev.c new file mode 100755 -index 000000000000..93961824abae +index 000000000..93961824a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_platdev.c @@ -0,0 +1,1041 @@ @@ -883921,7 +885135,7 @@ index 000000000000..93961824abae +} 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 +index 000000000..9959c2c50 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_priv.h @@ -0,0 +1,432 @@ @@ -884359,7 +885573,7 @@ index 000000000000..9959c2c50141 +#endif /* __DHD_LINUX_PRIV_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sched.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sched.c new file mode 100755 -index 000000000000..7980b02c65ab +index 000000000..7980b02c6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sched.c @@ -0,0 +1,52 @@ @@ -884417,7 +885631,7 @@ index 000000000000..7980b02c65ab +} 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 +index 000000000..26c66add8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.c @@ -0,0 +1,397 @@ @@ -884820,7 +886034,7 @@ index 000000000000..26c66add8aa3 +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.h new file mode 100755 -index 000000000000..f6c77c4b30b0 +index 000000000..f6c77c4b3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.h @@ -0,0 +1,93 @@ @@ -884919,7 +886133,7 @@ index 000000000000..f6c77c4b30b0 +#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 +index 000000000..713422a71 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.c @@ -0,0 +1,789 @@ @@ -885714,7 +886928,7 @@ index 000000000000..713422a713cc +#endif /* SHOW_LOGTRACE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.h new file mode 100755 -index 000000000000..4645ccb890ab +index 000000000..4645ccb89 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.h @@ -0,0 +1,40 @@ @@ -885760,7 +886974,7 @@ index 000000000000..4645ccb890ab +#endif /* _dhd_mschdbg_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_msgbuf.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_msgbuf.c new file mode 100755 -index 000000000000..ab8c9b399308 +index 000000000..ab8c9b399 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_msgbuf.c @@ -0,0 +1,11162 @@ @@ -896928,7 +898142,7 @@ index 000000000000..ab8c9b399308 +#endif /* DHD_MAP_LOGGING */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.c new file mode 100755 -index 000000000000..45dd0e66ea04 +index 000000000..45dd0e66e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.c @@ -0,0 +1,11618 @@ @@ -908552,7 +909766,7 @@ index 000000000000..45dd0e66ea04 +} 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..028b7082c897 +index 000000000..028b7082c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.h @@ -0,0 +1,605 @@ @@ -909163,7 +910377,7 @@ index 000000000000..028b7082c897 +#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 +index 000000000..3fb799247 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie_linux.c @@ -0,0 +1,2738 @@ @@ -911907,7 +913121,7 @@ index 000000000000..3fb799247421 +EXPORT_SYMBOL(dhd_bus_check_driver_up); diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.c new file mode 100755 -index 000000000000..005c03e3d181 +index 000000000..005c03e3d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.c @@ -0,0 +1,4458 @@ @@ -916371,7 +917585,7 @@ index 000000000000..005c03e3d181 +#endif /* PNO_SUPPORT */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.h new file mode 100755 -index 000000000000..903a732554c0 +index 000000000..903a73255 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.h @@ -0,0 +1,590 @@ @@ -916967,7 +918181,7 @@ index 000000000000..903a732554c0 +#endif /* __DHD_PNO_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_proto.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_proto.h new file mode 100755 -index 000000000000..b83c1bdc0b83 +index 000000000..b83c1bdc0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_proto.h @@ -0,0 +1,243 @@ @@ -917216,7 +918430,7 @@ index 000000000000..b83c1bdc0b83 +#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 +index 000000000..49e367890 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.c @@ -0,0 +1,4103 @@ @@ -921325,7 +922539,7 @@ index 000000000000..49e367890f47 +} 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 +index 000000000..d0c6af209 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.h @@ -0,0 +1,537 @@ @@ -921868,7 +923082,7 @@ index 000000000000..d0c6af209db6 +#endif /* __DHD_RTT_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_sdio.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_sdio.c new file mode 100755 -index 000000000000..6bc9b0ea60ab +index 000000000..6bc9b0ea6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_sdio.c @@ -0,0 +1,10712 @@ @@ -932587,7 +933801,7 @@ index 000000000000..6bc9b0ea60ab \ 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 +index 000000000..2df6b62cd --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_static_buf.c @@ -0,0 +1,586 @@ @@ -933179,7 +934393,7 @@ index 000000000000..2df6b62cd6b2 +module_exit(dhd_static_buf_exit); diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.c new file mode 100755 -index 000000000000..bafcb0b5c7e4 +index 000000000..bafcb0b5c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.c @@ -0,0 +1,4616 @@ @@ -937801,7 +939015,7 @@ index 000000000000..bafcb0b5c7e4 +#endif /* PROP_TXSTATUS */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.h new file mode 100755 -index 000000000000..a2aa2bca76f7 +index 000000000..a2aa2bca7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.h @@ -0,0 +1,570 @@ @@ -938377,7 +939591,7 @@ index 000000000000..a2aa2bca76f7 +#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 +index 000000000..5bd8e4613 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_stats.h @@ -0,0 +1,387 @@ @@ -938770,7 +939984,7 @@ index 000000000000..5bd8e4613da0 +#endif /* _dngl_stats_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_wlhdr.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_wlhdr.h new file mode 100755 -index 000000000000..d71ebb65d63d +index 000000000..d71ebb65d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dngl_wlhdr.h @@ -0,0 +1,44 @@ @@ -938820,7 +940034,7 @@ index 000000000000..d71ebb65d63d +#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 +index 000000000..fa9ff43e5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.c @@ -0,0 +1,113 @@ @@ -938939,7 +940153,7 @@ index 000000000000..fa9ff43e5c2c +} 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 +index 000000000..57c149dfd --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.h @@ -0,0 +1,39 @@ @@ -938984,7 +940198,7 @@ index 000000000000..57c149dfdff3 +#endif /* __FRAG_H__ */ 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 +index 000000000..09c2520b8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktpool.c @@ -0,0 +1,1428 @@ @@ -940418,7 +941632,7 @@ index 000000000000..09c2520b8fec +#endif /* BCMPKTPOOL */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktq.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktq.c new file mode 100755 -index 000000000000..f4768ff69096 +index 000000000..f4768ff69 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktq.c @@ -0,0 +1,1429 @@ @@ -941853,7 +943067,7 @@ index 000000000000..f4768ff69096 +#endif /* HND_PKTQ_THREAD_SAFE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndlhl.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndlhl.c new file mode 100755 -index 000000000000..fd229c2f585b +index 000000000..fd229c2f5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndlhl.c @@ -0,0 +1,538 @@ @@ -942397,7 +943611,7 @@ index 000000000000..fd229c2f585b +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndmem.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndmem.c new file mode 100755 -index 000000000000..fde6108c50e2 +index 000000000..fde6108c5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndmem.c @@ -0,0 +1,430 @@ @@ -942833,7 +944047,7 @@ index 000000000000..fde6108c50e2 +} 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 +index 000000000..cb8294f25 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndpmu.c @@ -0,0 +1,789 @@ @@ -943628,7 +944842,7 @@ index 000000000000..cb8294f25274 +#endif /* BCMPMU_STATS */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11.h new file mode 100755 -index 000000000000..cd46e747cc8b +index 000000000..cd46e747c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11.h @@ -0,0 +1,5364 @@ @@ -948998,7 +950212,7 @@ index 000000000000..cd46e747cc8b +#endif /* _802_11_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11e.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11e.h new file mode 100755 -index 000000000000..7b1414961ee1 +index 000000000..7b1414961 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11e.h @@ -0,0 +1,140 @@ @@ -949144,7 +950358,7 @@ index 000000000000..7b1414961ee1 +#endif /* _802_11e_CAC_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11s.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11s.h new file mode 100755 -index 000000000000..91ca2f3b1ce4 +index 000000000..91ca2f3b1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11s.h @@ -0,0 +1,335 @@ @@ -949485,7 +950699,7 @@ index 000000000000..91ca2f3b1ce4 +#endif /* #ifndef _802_11s_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.1d.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.1d.h new file mode 100755 -index 000000000000..06364be73fa8 +index 000000000..06364be73 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.1d.h @@ -0,0 +1,54 @@ @@ -949545,7 +950759,7 @@ index 000000000000..06364be73fa8 +#endif /* _802_1_D__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.3.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.3.h new file mode 100755 -index 000000000000..496ca3a3795e +index 000000000..496ca3a37 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.3.h @@ -0,0 +1,56 @@ @@ -949607,7 +950821,7 @@ index 000000000000..496ca3a3795e +#endif /* #ifndef _802_3_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/aidmp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/aidmp.h new file mode 100755 -index 000000000000..8c826062d436 +index 000000000..8c826062d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/aidmp.h @@ -0,0 +1,430 @@ @@ -950043,7 +951257,7 @@ index 000000000000..8c826062d436 +#endif /* _AIDMP_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_cfg.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_cfg.h new file mode 100755 -index 000000000000..63c72e481fe8 +index 000000000..63c72e481 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_cfg.h @@ -0,0 +1,33 @@ @@ -950082,7 +951296,7 @@ index 000000000000..63c72e481fe8 +#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 +index 000000000..347d53a86 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_mpool_pub.h @@ -0,0 +1,351 @@ @@ -950439,7 +951653,7 @@ index 000000000000..347d53a862d2 +#endif /* _BCM_MPOOL_PUB_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_ring.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_ring.h new file mode 100755 -index 000000000000..978e5dd2f554 +index 000000000..978e5dd2f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_ring.h @@ -0,0 +1,614 @@ @@ -951059,7 +952273,7 @@ index 000000000000..978e5dd2f554 +#endif /* ! __bcm_ring_h_included__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmarp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmarp.h new file mode 100755 -index 000000000000..f0fc3e32fda9 +index 000000000..f0fc3e32f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmarp.h @@ -0,0 +1,91 @@ @@ -951156,7 +952370,7 @@ index 000000000000..f0fc3e32fda9 +#endif /* !defined(_bcmarp_h_) */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmbloom.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmbloom.h new file mode 100755 -index 000000000000..cb572307e126 +index 000000000..cb572307e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmbloom.h @@ -0,0 +1,80 @@ @@ -951242,7 +952456,7 @@ index 000000000000..cb572307e126 +#endif /* _bcmbloom_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmcdc.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmcdc.h new file mode 100755 -index 000000000000..e88366426909 +index 000000000..e88366426 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmcdc.h @@ -0,0 +1,122 @@ @@ -951370,7 +952584,7 @@ index 000000000000..e88366426909 +#endif /* _bcmcdc_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdefs.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdefs.h new file mode 100755 -index 000000000000..393ec7d10e12 +index 000000000..393ec7d10 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdefs.h @@ -0,0 +1,616 @@ @@ -951992,7 +953206,7 @@ index 000000000000..393ec7d10e12 +#endif /* _bcmdefs_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdevs.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdevs.h new file mode 100755 -index 000000000000..afc6b54d9e0b +index 000000000..afc6b54d9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdevs.h @@ -0,0 +1,945 @@ @@ -952943,7 +954157,7 @@ index 000000000000..afc6b54d9e0b +#endif /* _BCMDEVS_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdhcp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdhcp.h new file mode 100755 -index 000000000000..da46d1a717b5 +index 000000000..da46d1a71 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdhcp.h @@ -0,0 +1,93 @@ @@ -953042,7 +954256,7 @@ index 000000000000..da46d1a717b5 +#endif /* #ifndef _bcmdhcp_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmendian.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmendian.h new file mode 100755 -index 000000000000..7eecf9f16115 +index 000000000..7eecf9f16 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmendian.h @@ -0,0 +1,417 @@ @@ -953465,7 +954679,7 @@ index 000000000000..7eecf9f16115 +#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 +index 000000000..4ac3c376c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmeth.h @@ -0,0 +1,116 @@ @@ -953587,7 +954801,7 @@ index 000000000000..4ac3c376ca98 +#endif /* _BCMETH_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmevent.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmevent.h new file mode 100755 -index 000000000000..fc47263e81e2 +index 000000000..fc47263e8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmevent.h @@ -0,0 +1,1297 @@ @@ -954890,7 +956104,7 @@ index 000000000000..fc47263e81e2 +#endif /* _BCMEVENT_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmicmp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmicmp.h new file mode 100755 -index 000000000000..472ec722339b +index 000000000..472ec7223 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmicmp.h @@ -0,0 +1,90 @@ @@ -954986,7 +956200,7 @@ index 000000000000..472ec722339b +#endif /* #ifndef _bcmicmp_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmiov.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmiov.h new file mode 100755 -index 000000000000..42633f8c7d32 +index 000000000..42633f8c7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmiov.h @@ -0,0 +1,357 @@ @@ -955349,7 +956563,7 @@ index 000000000000..42633f8c7d32 +#endif /* _bcmiov_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmip.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmip.h new file mode 100755 -index 000000000000..cec5b903c6f4 +index 000000000..cec5b903c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmip.h @@ -0,0 +1,251 @@ @@ -955606,7 +956820,7 @@ index 000000000000..cec5b903c6f4 +#endif /* _bcmip_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmipv6.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmipv6.h new file mode 100755 -index 000000000000..88cac9009183 +index 000000000..88cac9009 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmipv6.h @@ -0,0 +1,162 @@ @@ -955774,7 +956988,7 @@ index 000000000000..88cac9009183 +#endif /* !defined(_bcmipv6_h_) */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmmsgbuf.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmmsgbuf.h new file mode 100755 -index 000000000000..4215d3298c21 +index 000000000..4215d3298 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmmsgbuf.h @@ -0,0 +1,1395 @@ @@ -957175,7 +958389,7 @@ index 000000000000..4215d3298c21 +#endif /* _bcmmsgbuf_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmnvram.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmnvram.h new file mode 100755 -index 000000000000..988ac4813a5f +index 000000000..988ac4813 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmnvram.h @@ -0,0 +1,329 @@ @@ -957510,7 +958724,7 @@ index 000000000000..988ac4813a5f +#endif /* _bcmnvram_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcie.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcie.h new file mode 100755 -index 000000000000..8f80018ac9dd +index 000000000..8f80018ac --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcie.h @@ -0,0 +1,537 @@ @@ -958053,7 +959267,7 @@ index 000000000000..8f80018ac9dd +#endif /* _bcmpcie_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcispi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcispi.h new file mode 100755 -index 000000000000..6308a3aaf7f5 +index 000000000..6308a3aaf --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcispi.h @@ -0,0 +1,182 @@ @@ -958241,7 +959455,7 @@ index 000000000000..6308a3aaf7f5 +#endif /* _BCM_PCI_SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmperf.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmperf.h new file mode 100755 -index 000000000000..8ac9001f55eb +index 000000000..8ac9001f5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmperf.h @@ -0,0 +1,40 @@ @@ -958287,7 +959501,7 @@ index 000000000000..8ac9001f55eb +#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 +index 000000000..b9759b9b1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdbus.h @@ -0,0 +1,184 @@ @@ -958477,7 +959691,7 @@ index 000000000000..b9759b9b186e +#endif /* _sdio_api_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh.h new file mode 100755 -index 000000000000..b2300ec635c6 +index 000000000..b2300ec63 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh.h @@ -0,0 +1,279 @@ @@ -958762,7 +959976,7 @@ index 000000000000..b2300ec635c6 +#endif /* _bcmsdh_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh_sdmmc.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh_sdmmc.h new file mode 100755 -index 000000000000..4e3c72d194ce +index 000000000..4e3c72d19 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh_sdmmc.h @@ -0,0 +1,130 @@ @@ -958898,7 +960112,7 @@ index 000000000000..4e3c72d194ce +#endif /* __BCMSDH_SDMMC_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdpcm.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdpcm.h new file mode 100755 -index 000000000000..09a81c24398f +index 000000000..09a81c243 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdpcm.h @@ -0,0 +1,310 @@ @@ -959214,7 +960428,7 @@ index 000000000000..09a81c24398f +#endif /* _bcmsdpcm_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdspi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdspi.h new file mode 100755 -index 000000000000..2d299a140cb3 +index 000000000..2d299a140 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdspi.h @@ -0,0 +1,139 @@ @@ -959359,7 +960573,7 @@ index 000000000000..2d299a140cb3 +#endif /* _BCM_SD_SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdstd.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdstd.h new file mode 100755 -index 000000000000..5132d4340ecd +index 000000000..5132d4340 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdstd.h @@ -0,0 +1,282 @@ @@ -959647,7 +960861,7 @@ index 000000000000..5132d4340ecd +#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 +index 000000000..6f71ddc95 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspi.h @@ -0,0 +1,44 @@ @@ -959697,7 +960911,7 @@ index 000000000000..6f71ddc9519e +#endif /* _BCM_SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspibrcm.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspibrcm.h new file mode 100755 -index 000000000000..2d9f972496c3 +index 000000000..2d9f97249 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmspibrcm.h @@ -0,0 +1,168 @@ @@ -959871,7 +961085,7 @@ index 000000000000..2d9f972496c3 +#endif /* _BCM_SPI_BRCM_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_fmt.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_fmt.h new file mode 100755 -index 000000000000..e1bd05548c1f +index 000000000..e1bd05548 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_fmt.h @@ -0,0 +1,1014 @@ @@ -960891,7 +962105,7 @@ index 000000000000..e1bd05548c1f +#endif /* _bcmsrom_fmt_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_tbl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_tbl.h new file mode 100755 -index 000000000000..aa72338de34f +index 000000000..aa72338de --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_tbl.h @@ -0,0 +1,1459 @@ @@ -962356,7 +963570,7 @@ index 000000000000..aa72338de34f +#endif /* _bcmsrom_tbl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmstdlib_s.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmstdlib_s.h new file mode 100755 -index 000000000000..6c79800c8cda +index 000000000..6c79800c8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmstdlib_s.h @@ -0,0 +1,46 @@ @@ -962408,7 +963622,7 @@ index 000000000000..6c79800c8cda +#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 +index 000000000..6803cad80 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtcp.h @@ -0,0 +1,93 @@ @@ -962507,7 +963721,7 @@ index 000000000000..6803cad809c3 +#endif /* #ifndef _bcmtcp_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtlv.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtlv.h new file mode 100755 -index 000000000000..279840e41a35 +index 000000000..279840e41 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtlv.h @@ -0,0 +1,343 @@ @@ -962856,7 +964070,7 @@ index 000000000000..279840e41a35 +#endif /* _bcmtlv_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmudp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmudp.h new file mode 100755 -index 000000000000..397bc5985e25 +index 000000000..397bc5985 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmudp.h @@ -0,0 +1,61 @@ @@ -962923,7 +964137,7 @@ index 000000000000..397bc5985e25 +#endif /* #ifndef _bcmudp_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmutils.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmutils.h new file mode 100755 -index 000000000000..c779ea07ea2d +index 000000000..c779ea07e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmutils.h @@ -0,0 +1,1342 @@ @@ -964271,7 +965485,7 @@ index 000000000000..c779ea07ea2d +#endif /* _bcmutils_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/brcm_nl80211.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/brcm_nl80211.h new file mode 100755 -index 000000000000..0e0aa766a678 +index 000000000..0e0aa766a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/brcm_nl80211.h @@ -0,0 +1,73 @@ @@ -964350,7 +965564,7 @@ index 000000000000..0e0aa766a678 +#endif /* _brcm_nl80211_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dbus.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dbus.h new file mode 100755 -index 000000000000..e4b87288b3d6 +index 000000000..e4b87288b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dbus.h @@ -0,0 +1,599 @@ @@ -964955,7 +966169,7 @@ index 000000000000..e4b87288b3d6 +#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 +index 000000000..785b44011 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhd_daemon.h @@ -0,0 +1,67 @@ @@ -965028,7 +966242,7 @@ index 000000000000..785b440116cc +#endif /* __BCM_DHDD_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhdioctl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhdioctl.h new file mode 100755 -index 000000000000..f7012a0f5115 +index 000000000..f7012a0f5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhdioctl.h @@ -0,0 +1,278 @@ @@ -965312,7 +966526,7 @@ index 000000000000..f7012a0f5115 +#endif /* _dhdioctl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglevent.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglevent.h new file mode 100755 -index 000000000000..ec2cbbaf0b1f +index 000000000..ec2cbbaf0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglevent.h @@ -0,0 +1,142 @@ @@ -965460,7 +966674,7 @@ index 000000000000..ec2cbbaf0b1f +#endif /* _DNGLEVENT_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/eapol.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/eapol.h new file mode 100755 -index 000000000000..08a296828189 +index 000000000..08a296828 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/eapol.h @@ -0,0 +1,283 @@ @@ -965749,7 +966963,7 @@ index 000000000000..08a296828189 +#endif /* _eapol_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/epivers.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/epivers.h new file mode 100755 -index 000000000000..23f8d324361b +index 000000000..23f8d3243 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/epivers.h @@ -0,0 +1,52 @@ @@ -965807,7 +967021,7 @@ index 000000000000..23f8d324361b +#endif /* _epivers_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/etd.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/etd.h new file mode 100755 -index 000000000000..a2181daf525e +index 000000000..a2181daf5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/etd.h @@ -0,0 +1,626 @@ @@ -966439,7 +967653,7 @@ index 000000000000..a2181daf525e +#endif /* _ETD_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/ethernet.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/ethernet.h new file mode 100755 -index 000000000000..41c9b62b0d5c +index 000000000..41c9b62b0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/ethernet.h @@ -0,0 +1,225 @@ @@ -966670,7 +967884,7 @@ index 000000000000..41c9b62b0d5c +#endif /* _NET_ETHERNET_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log.h new file mode 100755 -index 000000000000..e43715d72646 +index 000000000..e43715d72 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log.h @@ -0,0 +1,423 @@ @@ -967099,7 +968313,7 @@ index 000000000000..e43715d72646 +#endif /* _EVENT_LOG_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_payload.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_payload.h new file mode 100755 -index 000000000000..fc110219ec75 +index 000000000..fc110219e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_payload.h @@ -0,0 +1,1017 @@ @@ -968122,7 +969336,7 @@ index 000000000000..fc110219ec75 +#endif /* _EVENT_LOG_PAYLOAD_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_set.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_set.h new file mode 100755 -index 000000000000..47c991c20019 +index 000000000..47c991c20 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_set.h @@ -0,0 +1,124 @@ @@ -968252,7 +969466,7 @@ index 000000000000..47c991c20019 +#endif /* _EVENT_LOG_SET_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_tag.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_tag.h new file mode 100755 -index 000000000000..144ed7275932 +index 000000000..144ed7275 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_tag.h @@ -0,0 +1,479 @@ @@ -968737,7 +969951,7 @@ index 000000000000..144ed7275932 +#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 +index 000000000..0c6fc6b26 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_trace.h @@ -0,0 +1,124 @@ @@ -968867,7 +970081,7 @@ index 000000000000..0c6fc6b262a0 +#endif /* _WL_DIAG_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/fils.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/fils.h new file mode 100755 -index 000000000000..1d3c8e0b52a8 +index 000000000..1d3c8e0b5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/fils.h @@ -0,0 +1,295 @@ @@ -969168,7 +970382,7 @@ index 000000000000..1d3c8e0b52a8 +#endif /* __FILSAUTH_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_armtrap.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_armtrap.h new file mode 100755 -index 000000000000..177ef53141fe +index 000000000..177ef5314 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_armtrap.h @@ -0,0 +1,90 @@ @@ -969264,7 +970478,7 @@ index 000000000000..177ef53141fe +#endif /* _hnd_armtrap_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_cons.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_cons.h new file mode 100755 -index 000000000000..81a699d8b5de +index 000000000..81a699d8b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_cons.h @@ -0,0 +1,87 @@ @@ -969357,7 +970571,7 @@ index 000000000000..81a699d8b5de +#endif /* _hnd_cons_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_debug.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_debug.h new file mode 100755 -index 000000000000..b8dca36b84c6 +index 000000000..b8dca36b8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_debug.h @@ -0,0 +1,169 @@ @@ -969532,7 +970746,7 @@ index 000000000000..b8dca36b84c6 +#endif /* _HND_DEBUG_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktpool.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktpool.h new file mode 100755 -index 000000000000..57f222967488 +index 000000000..57f222967 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktpool.h @@ -0,0 +1,244 @@ @@ -969782,7 +970996,7 @@ index 000000000000..57f222967488 +#endif /* _hnd_pktpool_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktq.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktq.h new file mode 100755 -index 000000000000..824bbc1420d9 +index 000000000..824bbc142 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktq.h @@ -0,0 +1,326 @@ @@ -970114,7 +971328,7 @@ index 000000000000..824bbc1420d9 +#endif /* _hnd_pktq_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_trap.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_trap.h new file mode 100755 -index 000000000000..caf006ee26d9 +index 000000000..caf006ee2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_trap.h @@ -0,0 +1,40 @@ @@ -970160,7 +971374,7 @@ index 000000000000..caf006ee26d9 +#endif /* _hnd_trap_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndchipc.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndchipc.h new file mode 100755 -index 000000000000..be9a2e65cb55 +index 000000000..be9a2e65c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndchipc.h @@ -0,0 +1,54 @@ @@ -970220,7 +971434,7 @@ index 000000000000..be9a2e65cb55 +#endif /* _hndchipc_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndlhl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndlhl.h new file mode 100755 -index 000000000000..c6794464ebe7 +index 000000000..c6794464e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndlhl.h @@ -0,0 +1,62 @@ @@ -970288,7 +971502,7 @@ index 000000000000..c6794464ebe7 +#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 +index 000000000..de348e7d3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndmem.h @@ -0,0 +1,81 @@ @@ -970375,7 +971589,7 @@ index 000000000000..de348e7d3c45 +#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 +index 000000000..88e2952cf --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndoobr.h @@ -0,0 +1,76 @@ @@ -970457,7 +971671,7 @@ index 000000000000..88e2952cf7c5 +#endif /* _hndoobr_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndpmu.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndpmu.h new file mode 100755 -index 000000000000..df3b31bf46ee +index 000000000..df3b31bf4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndpmu.h @@ -0,0 +1,80 @@ @@ -970543,7 +971757,7 @@ index 000000000000..df3b31bf46ee +#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 +index 000000000..b4cb16001 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndsoc.h @@ -0,0 +1,351 @@ @@ -970900,7 +972114,7 @@ index 000000000000..b4cb16001b97 +#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 +index 000000000..bb9167067 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_osl.h @@ -0,0 +1,636 @@ @@ -971542,7 +972756,7 @@ index 000000000000..bb916706702d +#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 +index 000000000..30fff1847 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_pkt.h @@ -0,0 +1,236 @@ @@ -971784,7 +972998,7 @@ index 000000000000..30fff18479f3 +#endif /* _linux_pkt_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxver.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxver.h new file mode 100755 -index 000000000000..32ad78f6c932 +index 000000000..32ad78f6c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxver.h @@ -0,0 +1,900 @@ @@ -972690,7 +973904,7 @@ index 000000000000..32ad78f6c932 +#endif /* _linuxver_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/lpflags.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/lpflags.h new file mode 100755 -index 000000000000..ed0ff7825b08 +index 000000000..ed0ff7825 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/lpflags.h @@ -0,0 +1,46 @@ @@ -972742,7 +973956,7 @@ index 000000000000..ed0ff7825b08 +#endif /* _lpflags_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/mbo.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/mbo.h new file mode 100755 -index 000000000000..eef005063065 +index 000000000..eef005063 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/mbo.h @@ -0,0 +1,286 @@ @@ -973034,7 +974248,7 @@ index 000000000000..eef005063065 +#endif /* __MBO_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/miniopt.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/miniopt.h new file mode 100755 -index 000000000000..1c1d8e9e2004 +index 000000000..1c1d8e9e2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/miniopt.h @@ -0,0 +1,80 @@ @@ -973120,7 +974334,7 @@ index 000000000000..1c1d8e9e2004 +#endif /* MINI_OPT_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msf.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msf.h new file mode 100755 -index 000000000000..5f0022e53250 +index 000000000..5f0022e53 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msf.h @@ -0,0 +1,67 @@ @@ -973193,7 +974407,7 @@ index 000000000000..5f0022e53250 +#endif /* _WLC_MSF_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msgtrace.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msgtrace.h new file mode 100755 -index 000000000000..c871c7ce620d +index 000000000..c871c7ce6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msgtrace.h @@ -0,0 +1,63 @@ @@ -973262,7 +974476,7 @@ index 000000000000..c871c7ce620d +#endif /* _MSGTRACE_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/nan.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/nan.h new file mode 100755 -index 000000000000..bdb07f8460da +index 000000000..bdb07f846 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/nan.h @@ -0,0 +1,1559 @@ @@ -974827,7 +976041,7 @@ index 000000000000..bdb07f8460da +#endif /* _NAN_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl.h new file mode 100755 -index 000000000000..2a7aec17d1db +index 000000000..2a7aec17d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl.h @@ -0,0 +1,378 @@ @@ -975211,7 +976425,7 @@ index 000000000000..2a7aec17d1db +#endif /* _osl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_decl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_decl.h new file mode 100755 -index 000000000000..a5643079c831 +index 000000000..a5643079c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_decl.h @@ -0,0 +1,38 @@ @@ -975255,7 +976469,7 @@ index 000000000000..a5643079c831 +#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 +index 000000000..2c182ca29 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_ext.h @@ -0,0 +1,766 @@ @@ -976027,7 +977241,7 @@ index 000000000000..2c182ca29bd1 +#endif /* _osl_ext_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/p2p.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/p2p.h new file mode 100755 -index 000000000000..b68d5c32e466 +index 000000000..b68d5c32e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/p2p.h @@ -0,0 +1,702 @@ @@ -976735,7 +977949,7 @@ index 000000000000..b68d5c32e466 +#endif /* _P2P_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_end.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_end.h new file mode 100755 -index 000000000000..64c7579ae26c +index 000000000..64c7579ae --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_end.h @@ -0,0 +1,60 @@ @@ -976801,7 +978015,7 @@ index 000000000000..64c7579ae26c +#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 +index 000000000..097611ed4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_start.h @@ -0,0 +1,105 @@ @@ -976912,7 +978126,7 @@ index 000000000000..097611ed404a +#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 +index 000000000..c8ec32a62 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcicfg.h @@ -0,0 +1,402 @@ @@ -977320,7 +978534,7 @@ index 000000000000..c8ec32a62406 +#endif /* _h_pcicfg_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcie_core.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcie_core.h new file mode 100755 -index 000000000000..592ad25e4832 +index 000000000..592ad25e4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcie_core.h @@ -0,0 +1,1193 @@ @@ -978519,7 +979733,7 @@ index 000000000000..592ad25e4832 +#endif /* _PCIE_CORE_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/rte_ioctl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/rte_ioctl.h new file mode 100755 -index 000000000000..90669be876b4 +index 000000000..90669be87 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/rte_ioctl.h @@ -0,0 +1,104 @@ @@ -978629,7 +979843,7 @@ index 000000000000..90669be876b4 +#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 +index 000000000..f7eb1cfde --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbchipc.h @@ -0,0 +1,4619 @@ @@ -983254,7 +984468,7 @@ index 000000000000..f7eb1cfde400 +#endif /* _SBCHIPC_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbconfig.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbconfig.h new file mode 100755 -index 000000000000..b05cd510aa0b +index 000000000..b05cd510a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbconfig.h @@ -0,0 +1,286 @@ @@ -983546,7 +984760,7 @@ index 000000000000..b05cd510aa0b +#endif /* _SBCONFIG_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbgci.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbgci.h new file mode 100755 -index 000000000000..bbf0e4337124 +index 000000000..bbf0e4337 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbgci.h @@ -0,0 +1,274 @@ @@ -983826,7 +985040,7 @@ index 000000000000..bbf0e4337124 +#endif /* _SBGCI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhndarm.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhndarm.h new file mode 100755 -index 000000000000..ee1279a4a807 +index 000000000..ee1279a4a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhndarm.h @@ -0,0 +1,142 @@ @@ -983974,7 +985188,7 @@ index 000000000000..ee1279a4a807 +#endif /* _sbhndarm_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhnddma.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhnddma.h new file mode 100755 -index 000000000000..52a39dc6d415 +index 000000000..52a39dc6d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhnddma.h @@ -0,0 +1,450 @@ @@ -984430,7 +985644,7 @@ index 000000000000..52a39dc6d415 +#endif /* _sbhnddma_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbpcmcia.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbpcmcia.h new file mode 100755 -index 000000000000..8b6c6cf45556 +index 000000000..8b6c6cf45 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbpcmcia.h @@ -0,0 +1,138 @@ @@ -984574,7 +985788,7 @@ index 000000000000..8b6c6cf45556 +#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 +index 000000000..ba7d66266 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdio.h @@ -0,0 +1,189 @@ @@ -984769,7 +985983,7 @@ index 000000000000..ba7d66266afb +#endif /* _SBSDIO_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdpcmdev.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdpcmdev.h new file mode 100755 -index 000000000000..c60600d81f33 +index 000000000..c60600d81 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdpcmdev.h @@ -0,0 +1,310 @@ @@ -985085,7 +986299,7 @@ index 000000000000..c60600d81f33 +#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 +index 000000000..5e709aa52 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsocram.h @@ -0,0 +1,205 @@ @@ -985296,7 +986510,7 @@ index 000000000000..5e709aa52d4e +#endif /* _SBSOCRAM_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsysmem.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsysmem.h new file mode 100755 -index 000000000000..065b3f1980f6 +index 000000000..065b3f198 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsysmem.h @@ -0,0 +1,181 @@ @@ -985483,7 +986697,7 @@ index 000000000000..065b3f1980f6 +#endif /* _SBSYSMEM_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdio.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdio.h new file mode 100755 -index 000000000000..844fc2780d5b +index 000000000..844fc2780 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdio.h @@ -0,0 +1,626 @@ @@ -986115,7 +987329,7 @@ index 000000000000..844fc2780d5b +#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 +index 000000000..327d1c4d0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdioh.h @@ -0,0 +1,451 @@ @@ -986572,7 +987786,7 @@ index 000000000000..327d1c4d0e1f +#endif /* _SDIOH_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdiovar.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdiovar.h new file mode 100755 -index 000000000000..bfbe2bf94390 +index 000000000..bfbe2bf94 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdiovar.h @@ -0,0 +1,125 @@ @@ -986703,7 +987917,7 @@ index 000000000000..bfbe2bf94390 +#endif /* _sdiovar_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdspi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdspi.h new file mode 100755 -index 000000000000..d42f4c783490 +index 000000000..d42f4c783 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdspi.h @@ -0,0 +1,79 @@ @@ -986788,7 +988002,7 @@ index 000000000000..d42f4c783490 +#endif /* _SD_SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/siutils.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/siutils.h new file mode 100755 -index 000000000000..eba0d0a97c89 +index 000000000..eba0d0a97 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/siutils.h @@ -0,0 +1,810 @@ @@ -987604,7 +988818,7 @@ index 000000000000..eba0d0a97c89 +#endif /* _siutils_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/spid.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/spid.h new file mode 100755 -index 000000000000..3a08b59986ac +index 000000000..3a08b5998 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/spid.h @@ -0,0 +1,169 @@ @@ -987779,7 +988993,7 @@ index 000000000000..3a08b59986ac +#endif /* _SPI_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/trxhdr.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/trxhdr.h new file mode 100755 -index 000000000000..b717e62017d9 +index 000000000..b717e6201 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/trxhdr.h @@ -0,0 +1,96 @@ @@ -987881,7 +989095,7 @@ index 000000000000..b717e62017d9 +#endif /* _TRX_HDR_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/typedefs.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/typedefs.h new file mode 100755 -index 000000000000..c446005668db +index 000000000..c44600566 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/typedefs.h @@ -0,0 +1,368 @@ @@ -988255,7 +989469,7 @@ index 000000000000..c446005668db +#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 +index 000000000..f15fbd697 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/usbrdl.h @@ -0,0 +1,135 @@ @@ -988396,7 +989610,7 @@ index 000000000000..f15fbd697cea +#endif /* _USB_RDL_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/vlan.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/vlan.h new file mode 100755 -index 000000000000..ddc64a9381cb +index 000000000..ddc64a938 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/vlan.h @@ -0,0 +1,98 @@ @@ -988500,7 +989714,7 @@ index 000000000000..ddc64a9381cb +#endif /* _vlan_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlfc_proto.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlfc_proto.h new file mode 100755 -index 000000000000..0b592c6a2bc6 +index 000000000..0b592c6a2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlfc_proto.h @@ -0,0 +1,414 @@ @@ -988920,7 +990134,7 @@ index 000000000000..0b592c6a2bc6 +#endif /* __wlfc_proto_definitions_h__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl.h new file mode 100755 -index 000000000000..7f14967db99d +index 000000000..7f14967db --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl.h @@ -0,0 +1,20752 @@ @@ -1009678,7 +1010892,7 @@ index 000000000000..7f14967db99d +#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 +index 000000000..100b83628 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_defs.h @@ -0,0 +1,2466 @@ @@ -1012150,7 +1013364,7 @@ index 000000000000..100b836284ce +#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 +index 000000000..6dee521a3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_utils.h @@ -0,0 +1,62 @@ @@ -1012218,7 +1013432,7 @@ index 000000000000..6dee521a3853 +#endif /* _wlioctl_utils_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wpa.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wpa.h new file mode 100755 -index 000000000000..d618ea91b1ee +index 000000000..d618ea91b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wpa.h @@ -0,0 +1,312 @@ @@ -1012536,7 +1013750,7 @@ index 000000000000..d618ea91b1ee +#endif /* _proto_wpa_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wps.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wps.h new file mode 100755 -index 000000000000..c2ebace54013 +index 000000000..c2ebace54 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wps.h @@ -0,0 +1,386 @@ @@ -1012928,7 +1014142,7 @@ index 000000000000..c2ebace54013 +#endif /* _WPS_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl.c new file mode 100755 -index 000000000000..321ee05c4ccb +index 000000000..321ee05c4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl.c @@ -0,0 +1,2124 @@ @@ -1015059,7 +1016273,7 @@ index 000000000000..321ee05c4ccb \ No newline at end of file diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl_priv.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl_priv.h new file mode 100755 -index 000000000000..f56f292c0ecf +index 000000000..f56f292c0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl_priv.h @@ -0,0 +1,185 @@ @@ -1015250,7 +1016464,7 @@ index 000000000000..f56f292c0ecf +#endif /* _LINUX_OSL_PRIV_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_pkt.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_pkt.c new file mode 100755 -index 000000000000..e66ea740c092 +index 000000000..e66ea740c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_pkt.c @@ -0,0 +1,694 @@ @@ -1015950,7 +1017164,7 @@ index 000000000000..e66ea740c092 +#endif /* LINUX_VERSION >= 3.6.0 && TSQ_MULTIPLIER */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/otpdefs.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/otpdefs.h new file mode 100755 -index 000000000000..542e5a90b3f3 +index 000000000..542e5a90b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/otpdefs.h @@ -0,0 +1,122 @@ @@ -1016078,7 +1017292,7 @@ index 000000000000..542e5a90b3f3 +#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 +index 000000000..dd54c675a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/pcie_core.c @@ -0,0 +1,159 @@ @@ -1016243,7 +1017457,7 @@ index 000000000000..dd54c675a180 +#endif /* BCMDRIVER */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/sbutils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/sbutils.c new file mode 100755 -index 000000000000..bd22c9aab076 +index 000000000..bd22c9aab --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/sbutils.c @@ -0,0 +1,1094 @@ @@ -1017343,7 +1018557,7 @@ index 000000000000..bd22c9aab076 +#endif // endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils.c new file mode 100755 -index 000000000000..1f9cc39d17a4 +index 000000000..1f9cc39d1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils.c @@ -0,0 +1,3801 @@ @@ -1021150,7 +1022364,7 @@ index 000000000000..1f9cc39d17a4 +} 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 +index 000000000..1686e8882 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils_priv.h @@ -0,0 +1,356 @@ @@ -1021512,7 +1022726,7 @@ index 000000000000..1686e888248d +#endif /* _siutils_priv_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.c new file mode 100755 -index 000000000000..a8e96385bd8d +index 000000000..a8e96385b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.c @@ -0,0 +1,6630 @@ @@ -1028148,7 +1029362,7 @@ index 000000000000..a8e96385bd8d +#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..b0b4a4dce1ef +index 000000000..b0b4a4dce --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.h @@ -0,0 +1,418 @@ @@ -1028572,7 +1029786,7 @@ index 000000000000..b0b4a4dce1ef +#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..ff10499ff189 +index 000000000..ff10499ff --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android_ext.c @@ -0,0 +1,7973 @@ @@ -1036551,7 +1037765,7 @@ index 000000000000..ff10499ff189 + 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..7680903aa450 +index 000000000..7680903aa --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.c @@ -0,0 +1,24840 @@ @@ -1061397,7 +1062611,7 @@ index 000000000000..7680903aa450 +} 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 +index 000000000..39e827d8b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.h @@ -0,0 +1,2451 @@ @@ -1063854,7 +1065068,7 @@ index 000000000000..39e827d8b887 +#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 +index 000000000..4780d116e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg_btcoex.c @@ -0,0 +1,569 @@ @@ -1064429,7 +1065643,7 @@ index 000000000000..4780d116e5fe +} 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 +index 000000000..70a2022b0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.c @@ -0,0 +1,8182 @@ @@ -1072617,7 +1073831,7 @@ index 000000000000..70a2022b0c9f +#endif /* WL_NAN */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.h new file mode 100755 -index 000000000000..6eca82b8067c +index 000000000..6eca82b80 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.h @@ -0,0 +1,899 @@ @@ -1073522,7 +1074736,7 @@ index 000000000000..6eca82b8067c +#endif /* _wl_cfgnan_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.c new file mode 100755 -index 000000000000..2452ffa3b44e +index 000000000..2452ffa3b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.c @@ -0,0 +1,2741 @@ @@ -1076269,7 +1077483,7 @@ index 000000000000..2452ffa3b44e +} 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 +index 000000000..e47f8af9b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.h @@ -0,0 +1,458 @@ @@ -1076733,7 +1077947,7 @@ index 000000000000..e47f8af9b4d6 +#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..8b9382deb9e0 +index 000000000..8b9382deb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.c @@ -0,0 +1,3298 @@ @@ -1080037,7 +1081251,7 @@ index 000000000000..8b9382deb9e0 +} 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..236d3ed2971f +index 000000000..236d3ed29 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.h @@ -0,0 +1,96 @@ @@ -1080139,7 +1081353,7 @@ index 000000000000..236d3ed2971f +#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 +index 000000000..b2f6cb508 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.c @@ -0,0 +1,8751 @@ @@ -1088896,7 +1090110,7 @@ index 000000000000..b2f6cb5087d0 +#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(3, 13, 0)) || defined(WL_VENDOR_EXT_SUPPORT) */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.h new file mode 100755 -index 000000000000..b70aa354dad3 +index 000000000..b70aa354d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.h @@ -0,0 +1,721 @@ @@ -1089623,7 +1090837,7 @@ index 000000000000..b70aa354dad3 +#endif /* _wl_cfgvendor_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_dbg.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_dbg.h new file mode 100755 -index 000000000000..640907ea81ff +index 000000000..640907ea8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_dbg.h @@ -0,0 +1,381 @@ @@ -1090010,7 +1091224,7 @@ index 000000000000..640907ea81ff +#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..9d611bd843ff +index 000000000..9d611bd84 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.c @@ -0,0 +1,1691 @@ @@ -1091707,7 +1092921,7 @@ index 000000000000..9d611bd843ff + 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 +index 000000000..7e4241eae --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.h @@ -0,0 +1,78 @@ @@ -1091791,7 +1093005,7 @@ index 000000000000..7e4241eae508 + 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..9d3d860061fb +index 000000000..9d3d86006 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_event.c @@ -0,0 +1,509 @@ @@ -1092306,7 +1093520,7 @@ index 000000000000..9d3d860061fb +#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..d1ff33ae4065 +index 000000000..d1ff33ae4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_ext_genl.c @@ -0,0 +1,568 @@ @@ -1092880,7 +1094094,7 @@ index 000000000000..d1ff33ae4065 + 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..9281cdbe472e +index 000000000..9281cdbe4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.c @@ -0,0 +1,4335 @@ @@ -1097221,7 +1098435,7 @@ index 000000000000..9281cdbe472e +#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 +index 000000000..ba2cae8bd --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.h @@ -0,0 +1,178 @@ @@ -1097405,7 +1098619,7 @@ index 000000000000..ba2cae8bd7c6 +#endif /* _wl_iw_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_linux_mon.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_linux_mon.c new file mode 100755 -index 000000000000..7ed4d120de51 +index 000000000..7ed4d120d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_linux_mon.c @@ -0,0 +1,407 @@ @@ -1097818,7 +1099032,7 @@ index 000000000000..7ed4d120de51 +} 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 +index 000000000..a7d49bddc --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_roam.c @@ -0,0 +1,375 @@ @@ -1098199,7 +1099413,7 @@ index 000000000000..a7d49bddc3e6 +#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 +index 000000000..4a1aae731 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.c @@ -0,0 +1,535 @@ @@ -1098740,7 +1099954,7 @@ index 000000000000..4a1aae7316e0 +} 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 +index 000000000..772152e79 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.h @@ -0,0 +1,135 @@ @@ -1098881,7 +1100095,7 @@ index 000000000000..772152e79070 +#endif /* __WLDEV_COMMON_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c b/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c new file mode 100755 -index 000000000000..82799df987e8 +index 000000000..82799df98 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c @@ -0,0 +1,30 @@ @@ -1098916,7 +1100130,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 6b170083cd24..a8d527cda933 100644 +index 6b170083c..a8d527cda 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -1665,7 +1665,11 @@ static void __exit nvmem_exit(void) @@ -1098932,7 +1100146,7 @@ index 6b170083cd24..a8d527cda933 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 { @@ -1121668,7 +1122882,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 53a0badc6b03..c03815d27e7d 100644 +index 53a0badc6..c03815d27 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -16,12 +16,14 @@ @@ -1125005,7 +1126219,7 @@ index 53a0badc6b03..c03815d27e7d 100644 +MODULE_DEVICE_TABLE(of, rockchip_pinctrl_dt_match); diff --git a/drivers/pinctrl/pinctrl-rockchip.h b/drivers/pinctrl/pinctrl-rockchip.h new file mode 100755 -index 000000000000..cd1662db5c97 +index 000000000..cd1662db5 --- /dev/null +++ b/drivers/pinctrl/pinctrl-rockchip.h @@ -0,0 +1,277 @@ @@ -1125288,7 +1126502,7 @@ 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 +index 000000000..9627cd1a0 --- /dev/null +++ b/drivers/power/ec_battery.c @@ -0,0 +1,466 @@ @@ -1125759,7 +1126973,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[] = { @@ -1125772,7 +1126986,7 @@ index 1c5af2fef142..c5067eb75370 100644 .probe = gpio_poweroff_probe, diff --git a/drivers/power/reset/reboot-mode.h b/drivers/power/reset/reboot-mode.h new file mode 100755 -index 000000000000..342df786d043 +index 000000000..342df786d --- /dev/null +++ b/drivers/power/reset/reboot-mode.h @@ -0,0 +1,7 @@ @@ -1125784,7 +1126998,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 @@ -1125853,7 +1127067,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 @@ -1125875,7 +1127089,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 4417d64c31f9..909f0242bacb 100644 +index 4417d64c3..909f0242b 100644 --- a/drivers/power/supply/ab8500_btemp.c +++ b/drivers/power/supply/ab8500_btemp.c @@ -1142,7 +1142,6 @@ static const struct of_device_id ab8500_btemp_match[] = { @@ -1125887,7 +1127101,7 @@ index 4417d64c31f9..909f0242bacb 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, @@ -1125931,7 +1127145,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 f1da757c939f..592a73d4dde6 100644 +index f1da757c9..592a73d4d 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[] = { @@ -1125943,7 +1127157,7 @@ index f1da757c939f..592a73d4dde6 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) @@ -1125966,7 +1127180,7 @@ index be24529157be..148eb8105803 100644 } diff --git a/drivers/power/supply/bq25700_charger.c b/drivers/power/supply/bq25700_charger.c new file mode 100755 -index 000000000000..5b2a516509ed +index 000000000..5b2a51650 --- /dev/null +++ b/drivers/power/supply/bq25700_charger.c @@ -0,0 +1,2105 @@ @@ -1128076,7 +1129290,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[] = { @@ -1128088,7 +1129302,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 de1fa71be..0146f1bfc 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) @@ -1128103,7 +1129317,7 @@ index de1fa71be1e8..0146f1bfc29b 100644 } diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c -index 69bb0f56e492..2e9672fe4df1 100644 +index 69bb0f56e..2e9672fe4 100644 --- a/drivers/power/supply/max17042_battery.c +++ b/drivers/power/supply/max17042_battery.c @@ -738,7 +738,7 @@ static inline void max17042_override_por_values(struct max17042_chip *chip) @@ -1128139,7 +1129353,7 @@ index 69bb0f56e492..2e9672fe4df1 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 38e3aa642131..668369b26f99 100644 +index 38e3aa642..668369b26 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); @@ -1128235,7 +1129449,7 @@ index 38e3aa642131..668369b26f99 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 a616b9d8f43c..a5e65636057d 100644 +index a616b9d8f..a5e656360 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[] = { @@ -1128248,7 +1129462,7 @@ index a616b9d8f43c..a5e65636057d 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 +index 000000000..d204a0129 --- /dev/null +++ b/drivers/power/supply/rk816_battery.c @@ -0,0 +1,5172 @@ @@ -1133426,7 +1134640,7 @@ index 000000000000..d204a0129a8d +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 +index 000000000..b8b467114 --- /dev/null +++ b/drivers/power/supply/rk816_battery.h @@ -0,0 +1,286 @@ @@ -1133718,7 +1134932,7 @@ index 000000000000..b8b467114c1f +#endif diff --git a/drivers/power/supply/rk817_battery.c b/drivers/power/supply/rk817_battery.c new file mode 100755 -index 000000000000..d9003ad9e534 +index 000000000..d9003ad9e --- /dev/null +++ b/drivers/power/supply/rk817_battery.c @@ -0,0 +1,3418 @@ @@ -1137142,7 +1138356,7 @@ index 000000000000..d9003ad9e534 +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 +index 000000000..b7e4f7627 --- /dev/null +++ b/drivers/power/supply/rk817_charger.c @@ -0,0 +1,1798 @@ @@ -1138946,7 +1140160,7 @@ index 000000000000..b7e4f7627bdb +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 +index 000000000..90ff1fac1 --- /dev/null +++ b/drivers/power/supply/rk818_battery.c @@ -0,0 +1,3622 @@ @@ -1142574,7 +1143788,7 @@ index 000000000000..90ff1fac163c +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 +index 000000000..66cbbe9da --- /dev/null +++ b/drivers/power/supply/rk818_battery.h @@ -0,0 +1,168 @@ @@ -1142748,7 +1143962,7 @@ index 000000000000..66cbbe9dac4c +#endif diff --git a/drivers/power/supply/rk818_charger.c b/drivers/power/supply/rk818_charger.c new file mode 100755 -index 000000000000..56961effd13c +index 000000000..56961effd --- /dev/null +++ b/drivers/power/supply/rk818_charger.c @@ -0,0 +1,1889 @@ @@ -1144642,7 +1145856,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 9ad0afe83d1b..f330452341f0 100644 +index 9ad0afe83..f33045234 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[] = { @@ -1144663,7 +1145877,7 @@ index 9ad0afe83d1b..f330452341f0 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[] = { @@ -1144675,7 +1145889,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 1ae8374e1ceb..9c627618c224 100644 +index 1ae8374e1..9c627618c 100644 --- a/drivers/power/supply/sc27xx_fuel_gauge.c +++ b/drivers/power/supply/sc27xx_fuel_gauge.c @@ -1342,7 +1342,6 @@ static const struct of_device_id sc27xx_fgu_of_match[] = { @@ -1144687,7 +1145901,7 @@ index 1ae8374e1ceb..9c627618c224 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 @@ @@ -1144716,7 +1145930,7 @@ index 912e2184f918..8cfbd8d6b478 100644 * command register unless pin control is specified in the platform diff --git a/drivers/power/sy6982c_charger.c b/drivers/power/sy6982c_charger.c new file mode 100755 -index 000000000000..dfa82c3f8d27 +index 000000000..dfa82c3f8 --- /dev/null +++ b/drivers/power/sy6982c_charger.c @@ -0,0 +1,401 @@ @@ -1145123,7 +1146337,7 @@ index 000000000000..dfa82c3f8d27 +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 +index 000000000..0f7b4c9e8 --- /dev/null +++ b/drivers/power/universal_charger.c @@ -0,0 +1,419 @@ @@ -1145547,7 +1146761,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 @@ -1145564,7 +1146778,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 @@ @@ -1145848,7 +1147062,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 9903c3a7e..54619969d 100644 --- a/drivers/pwm/sysfs.c +++ b/drivers/pwm/sysfs.c @@ -103,6 +103,43 @@ static ssize_t duty_cycle_store(struct device *child, @@ -1145916,7 +1147130,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 @@ -1145932,7 +1147146,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 @@ -1145967,7 +1147181,7 @@ index 6ebae516258e..17e3300e71d5 100644 ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c -index 043b5f63b94a..9ccad4f38f6c 100644 +index a6d27334a..470354ae0 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -51,6 +51,7 @@ static LIST_HEAD(regulator_map_list); @@ -1145990,7 +1147204,7 @@ index 043b5f63b94a..9ccad4f38f6c 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); -@@ -4925,11 +4931,265 @@ static void regulator_dev_release(struct device *dev) +@@ -4931,11 +4937,265 @@ static void regulator_dev_release(struct device *dev) kfree(rdev); } @@ -1146256,7 +1147470,7 @@ index 043b5f63b94a..9ccad4f38f6c 100644 /* Avoid duplicate debugfs directory names */ if (parent && rname == rdev->desc->name) { -@@ -4950,8 +5210,88 @@ static void rdev_init_debugfs(struct regulator_dev *rdev) +@@ -4956,8 +5216,88 @@ static void rdev_init_debugfs(struct regulator_dev *rdev) &rdev->open_count); debugfs_create_u32("bypass_count", 0444, rdev->debugfs, &rdev->bypass_count); @@ -1146345,7 +1147559,7 @@ index 043b5f63b94a..9ccad4f38f6c 100644 static int regulator_register_resolve_supply(struct device *dev, void *data) { struct regulator_dev *rdev = dev_to_rdev(dev); -@@ -5426,7 +5766,7 @@ void regulator_unregister(struct regulator_dev *rdev) +@@ -5432,7 +5772,7 @@ void regulator_unregister(struct regulator_dev *rdev) mutex_lock(®ulator_list_mutex); @@ -1146354,7 +1147568,7 @@ index 043b5f63b94a..9ccad4f38f6c 100644 WARN_ON(rdev->open_count); regulator_remove_coupling(rdev); unset_regulator_supplies(rdev); -@@ -5857,7 +6197,11 @@ static int __init regulator_init(void) +@@ -5863,7 +6203,11 @@ static int __init regulator_init(void) } /* init early to allow our consumers to complete system booting */ @@ -1146367,7 +1147581,7 @@ index 043b5f63b94a..9ccad4f38f6c 100644 static int regulator_late_cleanup(struct device *dev, void *data) { diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c -index aa426183b6a1..5d83e1311983 100644 +index aa426183b..5d83e1311 100644 --- a/drivers/regulator/fan53555.c +++ b/drivers/regulator/fan53555.c @@ -20,10 +20,23 @@ @@ -1147061,7 +1148275,7 @@ index aa426183b6a1..5d83e1311983 100644 diff --git a/drivers/regulator/lp8752.c b/drivers/regulator/lp8752.c new file mode 100755 -index 000000000000..cf8e685f304a +index 000000000..cf8e685f3 --- /dev/null +++ b/drivers/regulator/lp8752.c @@ -0,0 +1,316 @@ @@ -1147383,7 +1148597,7 @@ index 000000000000..cf8e685f304a +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 +index 000000000..607e3a8f2 --- /dev/null +++ b/drivers/regulator/mp8865-regulator.c @@ -0,0 +1,248 @@ @@ -1147636,7 +1148850,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 06c0b15fe4c0..564f928eb1db 100644 +index 06c0b15fe..564f928eb 100644 --- a/drivers/regulator/of_regulator.c +++ b/drivers/regulator/of_regulator.c @@ -413,8 +413,12 @@ device_node *regulator_of_get_init_node(struct device *dev, @@ -1147655,7 +1148869,7 @@ index 06c0b15fe4c0..564f928eb1db 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 @@ @@ -1148545,7 +1149759,7 @@ index e926c1a85846..bb8b2f604a24 100644 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 +index 000000000..9a4297276 --- /dev/null +++ b/drivers/regulator/scmi-regulator.c @@ -0,0 +1,421 @@ @@ -1148972,7 +1150186,7 @@ index 000000000000..9a4297276098 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/regulator/syr82x.c b/drivers/regulator/syr82x.c new file mode 100755 -index 000000000000..4f7b0892a3bc +index 000000000..4f7b0892a --- /dev/null +++ b/drivers/regulator/syr82x.c @@ -0,0 +1,520 @@ @@ -1149498,7 +1150712,7 @@ index 000000000000..4f7b0892a3bc + diff --git a/drivers/regulator/tps549b22-regulator.c b/drivers/regulator/tps549b22-regulator.c new file mode 100755 -index 000000000000..bae2a67f4345 +index 000000000..bae2a67f4 --- /dev/null +++ b/drivers/regulator/tps549b22-regulator.c @@ -0,0 +1,437 @@ @@ -1149941,7 +1151155,7 @@ index 000000000000..bae2a67f4345 +MODULE_DESCRIPTION(" tps549b22 dcdc driver"); diff --git a/drivers/regulator/xz3216.c b/drivers/regulator/xz3216.c new file mode 100755 -index 000000000000..54182559b161 +index 000000000..54182559b --- /dev/null +++ b/drivers/regulator/xz3216.c @@ -0,0 +1,404 @@ @@ -1150351,7 +1151565,7 @@ index 000000000000..54182559b161 +MODULE_DESCRIPTION("xz3216 PMIC driver"); diff --git a/drivers/rk_nand/Kconfig b/drivers/rk_nand/Kconfig new file mode 100755 -index 000000000000..c49a1c28b702 +index 000000000..c49a1c28b --- /dev/null +++ b/drivers/rk_nand/Kconfig @@ -0,0 +1,10 @@ @@ -1150367,7 +1151581,7 @@ index 000000000000..c49a1c28b702 +endif diff --git a/drivers/rk_nand/Makefile b/drivers/rk_nand/Makefile new file mode 100755 -index 000000000000..dbd156f6e78b +index 000000000..dbd156f6e --- /dev/null +++ b/drivers/rk_nand/Makefile @@ -0,0 +1,9 @@ @@ -1150382,7 +1151596,7 @@ index 000000000000..dbd156f6e78b +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 +index 000000000..ebde01e3d --- /dev/null +++ b/drivers/rk_nand/rk_ftl_api.h @@ -0,0 +1,41 @@ @@ -1150429,7 +1151643,7 @@ index 000000000000..ebde01e3dbb6 + 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 +index 000000000..db549c3b2 --- /dev/null +++ b/drivers/rk_nand/rk_ftl_arm_v7.S @@ -0,0 +1,30165 @@ @@ -1180600,7 +1181814,7 @@ index 000000000000..db549c3b269e + .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 +index 000000000..a67898acb --- /dev/null +++ b/drivers/rk_nand/rk_ftl_arm_v7_thumb.S @@ -0,0 +1,30192 @@ @@ -1210798,7 +1212012,7 @@ index 000000000000..a67898acb677 + .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 +index 000000000..537155f1f --- /dev/null +++ b/drivers/rk_nand/rk_ftl_arm_v8.S @@ -0,0 +1,27968 @@ @@ -1238772,7 +1239986,7 @@ index 000000000000..537155f1fcde + .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 +index 000000000..26e2a694f --- /dev/null +++ b/drivers/rk_nand/rk_ftlv5_arm32.S @@ -0,0 +1,27612 @@ @@ -1266390,7 +1267604,7 @@ index 000000000000..26e2a694fb6d + .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 +index 000000000..260a57d85 --- /dev/null +++ b/drivers/rk_nand/rk_ftlv5_arm64.S @@ -0,0 +1,25632 @@ @@ -1292028,7 +1293242,7 @@ index 000000000000..260a57d855b5 + .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 +index 000000000..9d5e2fb02 --- /dev/null +++ b/drivers/rk_nand/rk_nand_base.c @@ -0,0 +1,456 @@ @@ -1292490,7 +1293704,7 @@ index 000000000000..9d5e2fb02baa +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 +index 000000000..023e58d5f --- /dev/null +++ b/drivers/rk_nand/rk_nand_base.h @@ -0,0 +1,46 @@ @@ -1292542,7 +1293756,7 @@ index 000000000000..023e58d5fc5c +#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 +index 000000000..7d1c46966 --- /dev/null +++ b/drivers/rk_nand/rk_nand_blk.c @@ -0,0 +1,711 @@ @@ -1293259,7 +1294473,7 @@ index 000000000000..7d1c46966481 +} 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 +index 000000000..681c625f5 --- /dev/null +++ b/drivers/rk_nand/rk_nand_blk.h @@ -0,0 +1,67 @@ @@ -1293332,7 +1294546,7 @@ index 000000000000..681c625f5081 +#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 +index 000000000..ec6959a4c --- /dev/null +++ b/drivers/rk_nand/rk_zftl_arm32.S @@ -0,0 +1,37095 @@ @@ -1330433,7 +1331647,7 @@ index 000000000000..ec6959a4c9c9 + .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 +index 000000000..943e37110 --- /dev/null +++ b/drivers/rk_nand/rk_zftl_arm64.S @@ -0,0 +1,35207 @@ @@ -1365646,7 +1366860,7 @@ index 000000000000..943e37110677 + .string "\0013vendor storage %x,%x,%x\n" diff --git a/drivers/rkflash/Kconfig b/drivers/rkflash/Kconfig new file mode 100755 -index 000000000000..4c791915e7bc +index 000000000..4c791915e --- /dev/null +++ b/drivers/rkflash/Kconfig @@ -0,0 +1,80 @@ @@ -1365732,7 +1366946,7 @@ index 000000000000..4c791915e7bc +endif # ARCH_ROCKCHIP diff --git a/drivers/rkflash/Makefile b/drivers/rkflash/Makefile new file mode 100755 -index 000000000000..283a217eb6ca +index 000000000..283a217eb --- /dev/null +++ b/drivers/rkflash/Makefile @@ -0,0 +1,14 @@ @@ -1365752,7 +1366966,7 @@ index 000000000000..283a217eb6ca +endif diff --git a/drivers/rkflash/flash.c b/drivers/rkflash/flash.c new file mode 100755 -index 000000000000..52be15969cda +index 000000000..52be15969 --- /dev/null +++ b/drivers/rkflash/flash.c @@ -0,0 +1,505 @@ @@ -1366263,7 +1367477,7 @@ index 000000000000..52be15969cda +} diff --git a/drivers/rkflash/flash.h b/drivers/rkflash/flash.h new file mode 100755 -index 000000000000..8f1284c9026a +index 000000000..8f1284c90 --- /dev/null +++ b/drivers/rkflash/flash.h @@ -0,0 +1,132 @@ @@ -1366401,7 +1367615,7 @@ 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 +index 000000000..da6eb2996 --- /dev/null +++ b/drivers/rkflash/flash_com.h @@ -0,0 +1,77 @@ @@ -1366484,7 +1367698,7 @@ 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 +index 000000000..7db6ff9e7 --- /dev/null +++ b/drivers/rkflash/nand_boot.c @@ -0,0 +1,83 @@ @@ -1366573,7 +1367787,7 @@ index 000000000000..7db6ff9e7f48 + diff --git a/drivers/rkflash/nandc.c b/drivers/rkflash/nandc.c new file mode 100755 -index 000000000000..69e3b0ed5598 +index 000000000..69e3b0ed5 --- /dev/null +++ b/drivers/rkflash/nandc.c @@ -0,0 +1,467 @@ @@ -1367046,7 +1368260,7 @@ index 000000000000..69e3b0ed5598 +} diff --git a/drivers/rkflash/nandc.h b/drivers/rkflash/nandc.h new file mode 100755 -index 000000000000..e650493dbe4d +index 000000000..e650493db --- /dev/null +++ b/drivers/rkflash/nandc.h @@ -0,0 +1,346 @@ @@ -1367398,7 +1368612,7 @@ 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 +index 000000000..378f83714 --- /dev/null +++ b/drivers/rkflash/rk_sftl.h @@ -0,0 +1,48 @@ @@ -1367452,7 +1368666,7 @@ index 000000000000..378f83714b5d +#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 +index 000000000..a8119e884 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v7.S @@ -0,0 +1,15787 @@ @@ -1383245,7 +1384459,7 @@ index 000000000000..a8119e884d35 + .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 +index 000000000..d4429f7f1 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v7_thumb.S @@ -0,0 +1,15586 @@ @@ -1398837,7 +1400051,7 @@ index 000000000000..d4429f7f1db4 + .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 +index 000000000..7e2944e55 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v8.S @@ -0,0 +1,15768 @@ @@ -1414611,7 +1415825,7 @@ index 000000000000..7e2944e55a76 + .align 3 diff --git a/drivers/rkflash/rkflash_api.h b/drivers/rkflash/rkflash_api.h new file mode 100755 -index 000000000000..402109b60521 +index 000000000..402109b60 --- /dev/null +++ b/drivers/rkflash/rkflash_api.h @@ -0,0 +1,58 @@ @@ -1414675,7 +1415889,7 @@ 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 +index 000000000..17ffe7386 --- /dev/null +++ b/drivers/rkflash/rkflash_blk.c @@ -0,0 +1,789 @@ @@ -1415470,7 +1416684,7 @@ index 000000000000..17ffe73865fe +} diff --git a/drivers/rkflash/rkflash_blk.h b/drivers/rkflash/rkflash_blk.h new file mode 100755 -index 000000000000..3d95436c55e7 +index 000000000..3d95436c5 --- /dev/null +++ b/drivers/rkflash/rkflash_blk.h @@ -0,0 +1,121 @@ @@ -1415597,7 +1416811,7 @@ 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 +index 000000000..ce742b038 --- /dev/null +++ b/drivers/rkflash/rkflash_debug.c @@ -0,0 +1,116 @@ @@ -1415719,7 +1416933,7 @@ index 000000000000..ce742b0382ef +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 +index 000000000..3fe406832 --- /dev/null +++ b/drivers/rkflash/rkflash_debug.h @@ -0,0 +1,42 @@ @@ -1415767,7 +1416981,7 @@ index 000000000000..3fe4068322e7 + diff --git a/drivers/rkflash/rknandc_base.c b/drivers/rkflash/rknandc_base.c new file mode 100755 -index 000000000000..d2e97883dec4 +index 000000000..d2e97883d --- /dev/null +++ b/drivers/rkflash/rknandc_base.c @@ -0,0 +1,192 @@ @@ -1415965,7 +1417179,7 @@ index 000000000000..d2e97883dec4 +MODULE_ALIAS("rknandc"); diff --git a/drivers/rkflash/rksfc_base.c b/drivers/rkflash/rksfc_base.c new file mode 100755 -index 000000000000..6cf74e103972 +index 000000000..6cf74e103 --- /dev/null +++ b/drivers/rkflash/rksfc_base.c @@ -0,0 +1,267 @@ @@ -1416238,7 +1417452,7 @@ index 000000000000..6cf74e103972 +MODULE_ALIAS("rksfc"); diff --git a/drivers/rkflash/sfc.c b/drivers/rkflash/sfc.c new file mode 100755 -index 000000000000..9ee5d6a97f13 +index 000000000..9ee5d6a97 --- /dev/null +++ b/drivers/rkflash/sfc.c @@ -0,0 +1,255 @@ @@ -1416499,7 +1417713,7 @@ index 000000000000..9ee5d6a97f13 +} diff --git a/drivers/rkflash/sfc.h b/drivers/rkflash/sfc.h new file mode 100755 -index 000000000000..355cd26170c6 +index 000000000..355cd2617 --- /dev/null +++ b/drivers/rkflash/sfc.h @@ -0,0 +1,224 @@ @@ -1416729,7 +1417943,7 @@ index 000000000000..355cd26170c6 +#endif diff --git a/drivers/rkflash/sfc_nand.c b/drivers/rkflash/sfc_nand.c new file mode 100755 -index 000000000000..cf3d3e887198 +index 000000000..cf3d3e887 --- /dev/null +++ b/drivers/rkflash/sfc_nand.c @@ -0,0 +1,1051 @@ @@ -1417786,7 +1419000,7 @@ index 000000000000..cf3d3e887198 +} diff --git a/drivers/rkflash/sfc_nand.h b/drivers/rkflash/sfc_nand.h new file mode 100755 -index 000000000000..43f4adf4508b +index 000000000..43f4adf45 --- /dev/null +++ b/drivers/rkflash/sfc_nand.h @@ -0,0 +1,133 @@ @@ -1417925,7 +1419139,7 @@ index 000000000000..43f4adf4508b +#endif diff --git a/drivers/rkflash/sfc_nand_boot.c b/drivers/rkflash/sfc_nand_boot.c new file mode 100755 -index 000000000000..8db7f8df968f +index 000000000..8db7f8df9 --- /dev/null +++ b/drivers/rkflash/sfc_nand_boot.c @@ -0,0 +1,89 @@ @@ -1418020,7 +1419234,7 @@ index 000000000000..8db7f8df968f +}; diff --git a/drivers/rkflash/sfc_nand_mtd.c b/drivers/rkflash/sfc_nand_mtd.c new file mode 100755 -index 000000000000..1b4d306050cf +index 000000000..1b4d30605 --- /dev/null +++ b/drivers/rkflash/sfc_nand_mtd.c @@ -0,0 +1,423 @@ @@ -1418449,7 +1419663,7 @@ index 000000000000..1b4d306050cf +#endif diff --git a/drivers/rkflash/sfc_nand_mtd.h b/drivers/rkflash/sfc_nand_mtd.h new file mode 100755 -index 000000000000..0d49c74654ab +index 000000000..0d49c7465 --- /dev/null +++ b/drivers/rkflash/sfc_nand_mtd.h @@ -0,0 +1,82 @@ @@ -1418537,7 +1419751,7 @@ index 000000000000..0d49c74654ab +#endif diff --git a/drivers/rkflash/sfc_nand_mtd_bbt.c b/drivers/rkflash/sfc_nand_mtd_bbt.c new file mode 100755 -index 000000000000..eb641f89306c +index 000000000..eb641f893 --- /dev/null +++ b/drivers/rkflash/sfc_nand_mtd_bbt.c @@ -0,0 +1,441 @@ @@ -1418984,7 +1420198,7 @@ index 000000000000..eb641f89306c +EXPORT_SYMBOL_GPL(snanddev_bbt_set_block_status); diff --git a/drivers/rkflash/sfc_nor.c b/drivers/rkflash/sfc_nor.c new file mode 100755 -index 000000000000..f7abe75a5b09 +index 000000000..f7abe75a5 --- /dev/null +++ b/drivers/rkflash/sfc_nor.c @@ -0,0 +1,783 @@ @@ -1419773,7 +1420987,7 @@ index 000000000000..f7abe75a5b09 + diff --git a/drivers/rkflash/sfc_nor.h b/drivers/rkflash/sfc_nor.h new file mode 100755 -index 000000000000..950af6a5e686 +index 000000000..950af6a5e --- /dev/null +++ b/drivers/rkflash/sfc_nor.h @@ -0,0 +1,176 @@ @@ -1419955,7 +1421169,7 @@ index 000000000000..950af6a5e686 +#endif diff --git a/drivers/rkflash/sfc_nor_boot.c b/drivers/rkflash/sfc_nor_boot.c new file mode 100755 -index 000000000000..791c1291b475 +index 000000000..791c1291b --- /dev/null +++ b/drivers/rkflash/sfc_nor_boot.c @@ -0,0 +1,180 @@ @@ -1420141,7 +1421355,7 @@ index 000000000000..791c1291b475 +}; diff --git a/drivers/rkflash/sfc_nor_mtd.c b/drivers/rkflash/sfc_nor_mtd.c new file mode 100755 -index 000000000000..8c9d69a581f2 +index 000000000..8c9d69a58 --- /dev/null +++ b/drivers/rkflash/sfc_nor_mtd.c @@ -0,0 +1,266 @@ @@ -1420413,7 +1421627,7 @@ index 000000000000..8c9d69a581f2 +} diff --git a/drivers/rkflash/typedef.h b/drivers/rkflash/typedef.h new file mode 100755 -index 000000000000..5808ec281fa2 +index 000000000..5808ec281 --- /dev/null +++ b/drivers/rkflash/typedef.h @@ -0,0 +1,30 @@ @@ -1420448,7 +1421662,7 @@ index 000000000000..5808ec281fa2 + +#endif /*__TYPEDEF_H */ diff --git a/drivers/soc/rockchip/Kconfig b/drivers/soc/rockchip/Kconfig -index 25eb2c1e31bb..d7be49a834fa 100644 +index 25eb2c1e3..d7be49a83 100644 --- a/drivers/soc/rockchip/Kconfig +++ b/drivers/soc/rockchip/Kconfig @@ -1,19 +1,49 @@ @@ -1420603,7 +1421817,7 @@ index 25eb2c1e31bb..d7be49a834fa 100644 endif diff --git a/drivers/soc/rockchip/Kconfig.cpu b/drivers/soc/rockchip/Kconfig.cpu new file mode 100755 -index 000000000000..027a87e5998f +index 000000000..027a87e59 --- /dev/null +++ b/drivers/soc/rockchip/Kconfig.cpu @@ -0,0 +1,59 @@ @@ -1420667,7 +1421881,7 @@ index 000000000000..027a87e5998f + +endmenu diff --git a/drivers/soc/rockchip/Makefile b/drivers/soc/rockchip/Makefile -index 875032f7344e..440523610087 100644 +index 875032f73..440523610 100644 --- a/drivers/soc/rockchip/Makefile +++ b/drivers/soc/rockchip/Makefile @@ -2,6 +2,19 @@ @@ -1420692,7 +1421906,7 @@ index 875032f7344e..440523610087 100644 +obj-$(CONFIG_ROCKCHIP_DEBUG) += rockchip_debug.o diff --git a/drivers/soc/rockchip/flash_vendor_storage.c b/drivers/soc/rockchip/flash_vendor_storage.c new file mode 100755 -index 000000000000..72961108ee5a +index 000000000..72961108e --- /dev/null +++ b/drivers/soc/rockchip/flash_vendor_storage.c @@ -0,0 +1,363 @@ @@ -1421061,7 +1422275,7 @@ index 000000000000..72961108ee5a +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 +index 000000000..55ca52486 --- /dev/null +++ b/drivers/soc/rockchip/flash_vendor_storage.h @@ -0,0 +1,16 @@ @@ -1421082,7 +1422296,7 @@ index 000000000000..55ca52486de7 +#endif + diff --git a/drivers/soc/rockchip/grf.c b/drivers/soc/rockchip/grf.c -index 494cf2b5bf7b..a252b07a696a 100644 +index 494cf2b5b..a252b07a6 100644 --- a/drivers/soc/rockchip/grf.c +++ b/drivers/soc/rockchip/grf.c @@ -7,6 +7,7 @@ @@ -1421199,7 +1422413,7 @@ index 494cf2b5bf7b..a252b07a696a 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..7bedfdab09a0 100644 +index b29e829e8..7bedfdab0 100644 --- a/drivers/soc/rockchip/io-domain.c +++ b/drivers/soc/rockchip/io-domain.c @@ -51,6 +51,10 @@ @@ -1421364,7 +1422578,7 @@ index b29e829e815e..7bedfdab09a0 100644 goto unreg_notify; diff --git a/drivers/soc/rockchip/mtd_vendor_storage.c b/drivers/soc/rockchip/mtd_vendor_storage.c new file mode 100755 -index 000000000000..1d41190e9926 +index 000000000..1d41190e9 --- /dev/null +++ b/drivers/soc/rockchip/mtd_vendor_storage.c @@ -0,0 +1,463 @@ @@ -1421832,7 +1423046,7 @@ index 000000000000..1d41190e9926 +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..b33042694831 100644 +index 54eb6cfc5..b33042694 100644 --- a/drivers/soc/rockchip/pm_domains.c +++ b/drivers/soc/rockchip/pm_domains.c @@ -5,6 +5,7 @@ @@ -1422984,7 +1424198,7 @@ index 54eb6cfc5d5b..b33042694831 100644 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/pm_test.c b/drivers/soc/rockchip/pm_test.c new file mode 100755 -index 000000000000..211bde78cc5e +index 000000000..211bde78c --- /dev/null +++ b/drivers/soc/rockchip/pm_test.c @@ -0,0 +1,730 @@ @@ -1423720,7 +1424934,7 @@ index 000000000000..211bde78cc5e +MODULE_LICENSE("GPL v2"); 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 +index 000000000..55823b383 --- /dev/null +++ b/drivers/soc/rockchip/rk_camera_sensor_info.h @@ -0,0 +1,421 @@ @@ -1424147,7 +1425361,7 @@ index 000000000000..55823b3839b2 +#endif diff --git a/drivers/soc/rockchip/rk_devinfo.c b/drivers/soc/rockchip/rk_devinfo.c new file mode 100755 -index 000000000000..74c98c0f7c63 +index 000000000..74c98c0f7 --- /dev/null +++ b/drivers/soc/rockchip/rk_devinfo.c @@ -0,0 +1,76 @@ @@ -1424229,7 +1425443,7 @@ index 000000000000..74c98c0f7c63 +module_init(rk_devinfo_init); diff --git a/drivers/soc/rockchip/rk_fiq_debugger.c b/drivers/soc/rockchip/rk_fiq_debugger.c new file mode 100755 -index 000000000000..96862e46953e +index 000000000..96862e469 --- /dev/null +++ b/drivers/soc/rockchip/rk_fiq_debugger.c @@ -0,0 +1,1026 @@ @@ -1425261,7 +1426475,7 @@ index 000000000000..96862e46953e +MODULE_ALIAS("platform:rk-fiq-debugger"); diff --git a/drivers/soc/rockchip/rk_vendor_storage.c b/drivers/soc/rockchip/rk_vendor_storage.c new file mode 100755 -index 000000000000..5c49667e7e5c +index 000000000..5c49667e7 --- /dev/null +++ b/drivers/soc/rockchip/rk_vendor_storage.c @@ -0,0 +1,52 @@ @@ -1425319,7 +1426533,7 @@ index 000000000000..5c49667e7e5c +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..724ba622a34d +index 000000000..724ba622a --- /dev/null +++ b/drivers/soc/rockchip/rockchip-cpuinfo.c @@ -0,0 +1,240 @@ @@ -1425565,7 +1426779,7 @@ index 000000000000..724ba622a34d +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_debug.c b/drivers/soc/rockchip/rockchip_debug.c new file mode 100755 -index 000000000000..67c46c15b6b4 +index 000000000..67c46c15b --- /dev/null +++ b/drivers/soc/rockchip/rockchip_debug.c @@ -0,0 +1,423 @@ @@ -1425994,7 +1427208,7 @@ index 000000000000..67c46c15b6b4 +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 +index 000000000..82036d8eb --- /dev/null +++ b/drivers/soc/rockchip/rockchip_debug.h @@ -0,0 +1,14 @@ @@ -1426014,7 +1427228,7 @@ index 000000000000..82036d8ebf72 +#endif diff --git a/drivers/soc/rockchip/rockchip_decompress.c b/drivers/soc/rockchip/rockchip_decompress.c new file mode 100755 -index 000000000000..47401f4b260f +index 000000000..47401f4b2 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_decompress.c @@ -0,0 +1,333 @@ @@ -1426353,7 +1427567,7 @@ index 000000000000..47401f4b260f +pure_initcall(rockchip_hw_decompress_init); diff --git a/drivers/soc/rockchip/rockchip_ipa.c b/drivers/soc/rockchip/rockchip_ipa.c new file mode 100755 -index 000000000000..e8982b7defee +index 000000000..e8982b7de --- /dev/null +++ b/drivers/soc/rockchip/rockchip_ipa.c @@ -0,0 +1,232 @@ @@ -1426591,7 +1427805,7 @@ index 000000000000..e8982b7defee +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..1520e2f96ea6 +index 000000000..1520e2f96 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_opp_select.c @@ -0,0 +1,1155 @@ @@ -1427752,7 +1428966,7 @@ index 000000000000..1520e2f96ea6 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_pm_config.c b/drivers/soc/rockchip/rockchip_pm_config.c new file mode 100755 -index 000000000000..6eda56fe2a89 +index 000000000..6eda56fe2 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_pm_config.c @@ -0,0 +1,291 @@ @@ -1428049,7 +1429263,7 @@ index 000000000000..6eda56fe2a89 +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..b1868b9c6491 +index 000000000..b1868b9c6 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_pvtm.c @@ -0,0 +1,872 @@ @@ -1428927,7 +1430141,7 @@ index 000000000000..b1868b9c6491 +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..c7143a9644b0 +index 000000000..c7143a964 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_ramdisk.c @@ -0,0 +1,285 @@ @@ -1429218,7 +1430432,7 @@ index 000000000000..c7143a9644b0 +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..8f7b0d72c8bd +index 000000000..8f7b0d72c --- /dev/null +++ b/drivers/soc/rockchip/rockchip_system_monitor.c @@ -0,0 +1,1592 @@ @@ -1430816,7 +1432030,7 @@ index 000000000000..8f7b0d72c8bd +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 +index 000000000..7a3c93a03 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_crypto.c @@ -0,0 +1,440 @@ @@ -1431262,7 +1432476,7 @@ index 000000000000..7a3c93a0304e +pure_initcall(rk_tb_crypto_init); diff --git a/drivers/soc/rockchip/rockchip_thunderboot_mmc.c b/drivers/soc/rockchip/rockchip_thunderboot_mmc.c new file mode 100755 -index 000000000000..5c8e0cbe4d78 +index 000000000..5c8e0cbe4 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_mmc.c @@ -0,0 +1,148 @@ @@ -1431416,7 +1432630,7 @@ index 000000000000..5c8e0cbe4d78 +pure_initcall(rk_tb_mmc_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 +index 000000000..d81ca755a --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_sfc.c @@ -0,0 +1,141 @@ @@ -1431563,7 +1432777,7 @@ index 000000000000..d81ca755aa12 +pure_initcall(rk_tb_sfc_init); diff --git a/drivers/soc/rockchip/sdmmc_vendor_storage.c b/drivers/soc/rockchip/sdmmc_vendor_storage.c new file mode 100755 -index 000000000000..469eda37e7e4 +index 000000000..469eda37e --- /dev/null +++ b/drivers/soc/rockchip/sdmmc_vendor_storage.c @@ -0,0 +1,635 @@ @@ -1432203,7 +1433417,7 @@ index 000000000000..469eda37e7e4 +module_exit(vendor_storage_deinit); +MODULE_LICENSE("GPL"); diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c -index 624273d0e727..93aba7d292c3 100644 +index 624273d0e..93aba7d29 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -10,6 +10,7 @@ @@ -1432599,7 +1433813,7 @@ index 624273d0e727..93aba7d292c3 100644 }; MODULE_DEVICE_TABLE(of, rockchip_spi_dt_match); diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c -index 859910ec8d9f..da816d5ba2d7 100644 +index 859910ec8..da816d5ba 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -682,6 +682,7 @@ static const struct of_device_id spidev_dt_ids[] = { @@ -1432611,7 +1433825,7 @@ index 859910ec8d9f..da816d5ba2d7 100644 }; MODULE_DEVICE_TABLE(of, spidev_dt_ids); diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig -index 8d8fd5c29349..24c79b442f2d 100644 +index 8d8fd5c29..24c79b442 100644 --- a/drivers/staging/android/Kconfig +++ b/drivers/staging/android/Kconfig @@ -16,6 +16,8 @@ config ASHMEM @@ -1432624,7 +1433838,7 @@ index 8d8fd5c29349..24c79b442f2d 100644 endmenu diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile -index 3b66cd0b0ec5..5788c4def0f5 100644 +index 3b66cd0b0..5788c4def 100644 --- a/drivers/staging/android/Makefile +++ b/drivers/staging/android/Makefile @@ -2,5 +2,6 @@ @@ -1432636,7 +1433850,7 @@ index 3b66cd0b0ec5..5788c4def0f5 100644 obj-$(CONFIG_ASHMEM) += ashmem.o diff --git a/drivers/staging/android/fiq_debugger/Kconfig b/drivers/staging/android/fiq_debugger/Kconfig new file mode 100755 -index 000000000000..74bf574d671c +index 000000000..74bf574d6 --- /dev/null +++ b/drivers/staging/android/fiq_debugger/Kconfig @@ -0,0 +1,72 @@ @@ -1432714,7 +1433928,7 @@ index 000000000000..74bf574d671c + Normal kernel printk will write out to UART by "kconsole" kthread diff --git a/drivers/staging/android/fiq_debugger/Makefile b/drivers/staging/android/fiq_debugger/Makefile new file mode 100755 -index 000000000000..47152bc21869 +index 000000000..47152bc21 --- /dev/null +++ b/drivers/staging/android/fiq_debugger/Makefile @@ -0,0 +1,2 @@ @@ -1432722,7 +1433936,7 @@ index 000000000000..47152bc21869 +obj-$(CONFIG_FIQ_WATCHDOG) += fiq_watchdog.o diff --git a/drivers/staging/android/fiq_debugger/fiq_debugger.c b/drivers/staging/android/fiq_debugger/fiq_debugger.c new file mode 100755 -index 000000000000..079b9e442e21 +index 000000000..079b9e442 --- /dev/null +++ b/drivers/staging/android/fiq_debugger/fiq_debugger.c @@ -0,0 +1,1672 @@ @@ -1434400,7 +1435614,7 @@ index 000000000000..079b9e442e21 +MODULE_ALIAS("platform:fiq-debugger"); diff --git a/drivers/staging/android/fiq_debugger/fiq_debugger.h b/drivers/staging/android/fiq_debugger/fiq_debugger.h new file mode 100755 -index 000000000000..2e7e33eea862 +index 000000000..2e7e33eea --- /dev/null +++ b/drivers/staging/android/fiq_debugger/fiq_debugger.h @@ -0,0 +1,73 @@ @@ -1434479,7 +1435693,7 @@ index 000000000000..2e7e33eea862 +#endif diff --git a/drivers/staging/android/fiq_debugger/fiq_debugger_arm.c b/drivers/staging/android/fiq_debugger/fiq_debugger_arm.c new file mode 100755 -index 000000000000..e91238332d6b +index 000000000..e91238332 --- /dev/null +++ b/drivers/staging/android/fiq_debugger/fiq_debugger_arm.c @@ -0,0 +1,273 @@ @@ -1434758,7 +1435972,7 @@ index 000000000000..e91238332d6b +#endif diff --git a/drivers/staging/android/fiq_debugger/fiq_debugger_arm64.c b/drivers/staging/android/fiq_debugger/fiq_debugger_arm64.c new file mode 100755 -index 000000000000..af4251c07de6 +index 000000000..af4251c07 --- /dev/null +++ b/drivers/staging/android/fiq_debugger/fiq_debugger_arm64.c @@ -0,0 +1,198 @@ @@ -1434962,7 +1436176,7 @@ index 000000000000..af4251c07de6 +#endif diff --git a/drivers/staging/android/fiq_debugger/fiq_debugger_priv.h b/drivers/staging/android/fiq_debugger/fiq_debugger_priv.h new file mode 100755 -index 000000000000..915860a6b38a +index 000000000..915860a6b --- /dev/null +++ b/drivers/staging/android/fiq_debugger/fiq_debugger_priv.h @@ -0,0 +1,39 @@ @@ -1435007,7 +1436221,7 @@ index 000000000000..915860a6b38a +#endif diff --git a/drivers/staging/android/fiq_debugger/fiq_debugger_ringbuf.h b/drivers/staging/android/fiq_debugger/fiq_debugger_ringbuf.h new file mode 100755 -index 000000000000..10c3c5d09098 +index 000000000..10c3c5d09 --- /dev/null +++ b/drivers/staging/android/fiq_debugger/fiq_debugger_ringbuf.h @@ -0,0 +1,94 @@ @@ -1435107,7 +1436321,7 @@ index 000000000000..10c3c5d09098 +} diff --git a/drivers/staging/android/fiq_debugger/fiq_watchdog.c b/drivers/staging/android/fiq_debugger/fiq_watchdog.c new file mode 100755 -index 000000000000..194b54138417 +index 000000000..194b54138 --- /dev/null +++ b/drivers/staging/android/fiq_debugger/fiq_watchdog.c @@ -0,0 +1,56 @@ @@ -1435169,7 +1436383,7 @@ index 000000000000..194b54138417 +} diff --git a/drivers/staging/android/fiq_debugger/fiq_watchdog.h b/drivers/staging/android/fiq_debugger/fiq_watchdog.h new file mode 100755 -index 000000000000..c6b507f8d976 +index 000000000..c6b507f8d --- /dev/null +++ b/drivers/staging/android/fiq_debugger/fiq_watchdog.h @@ -0,0 +1,20 @@ @@ -1435194,7 +1436408,7 @@ index 000000000000..c6b507f8d976 + +#endif 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 @@ -1435217,7 +1436431,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 @@ @@ -1435230,7 +1436444,7 @@ index 5f4487b1a224..7f8fd0f537b4 100644 +obj-y += heaps/ diff --git a/drivers/staging/android/ion/heaps/Kconfig b/drivers/staging/android/ion/heaps/Kconfig new file mode 100755 -index 000000000000..5034c45a397d +index 000000000..5034c45a3 --- /dev/null +++ b/drivers/staging/android/ion/heaps/Kconfig @@ -0,0 +1,15 @@ @@ -1435251,7 +1436465,7 @@ index 000000000000..5034c45a397d + 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 +index 000000000..82e36e89e --- /dev/null +++ b/drivers/staging/android/ion/heaps/Makefile @@ -0,0 +1,5 @@ @@ -1435266,7 +1436480,7 @@ new mode 100755 similarity index 72% rename from drivers/staging/android/ion/ion_cma_heap.c rename to drivers/staging/android/ion/heaps/ion_cma_heap.c -index bf65e67ef9d8..6ba7fd84c9ee +index bf65e67ef..6ba7fd84c --- a/drivers/staging/android/ion/ion_cma_heap.c +++ b/drivers/staging/android/ion/heaps/ion_cma_heap.c @@ -7,6 +7,7 @@ @@ -1435385,7 +1436599,7 @@ new mode 100755 similarity index 87% rename from drivers/staging/android/ion/ion_page_pool.c rename to drivers/staging/android/ion/heaps/ion_page_pool.c -index 0198b886d906..efd6ce4cc0ad +index 0198b886d..efd6ce4cc --- a/drivers/staging/android/ion/ion_page_pool.c +++ b/drivers/staging/android/ion/heaps/ion_page_pool.c @@ -10,7 +10,7 @@ @@ -1435453,7 +1436667,7 @@ index 0198b886d906..efd6ce4cc0ad +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 +index 000000000..10c79090c --- /dev/null +++ b/drivers/staging/android/ion/heaps/ion_page_pool.h @@ -0,0 +1,67 @@ @@ -1435530,7 +1436744,7 @@ new mode 100755 similarity index 65% rename from drivers/staging/android/ion/ion_system_heap.c rename to drivers/staging/android/ion/heaps/ion_system_heap.c -index eac0632ab4e8..45d23bea3822 +index eac0632ab..45d23bea3 --- a/drivers/staging/android/ion/ion_system_heap.c +++ b/drivers/staging/android/ion/heaps/ion_system_heap.c @@ -9,12 +9,14 @@ @@ -1435846,7 +1437060,7 @@ index eac0632ab4e8..45d23bea3822 +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 e1fe03ceb7f1..268c4610c25a 100644 +index e1fe03ceb..268c4610c 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -3,8 +3,11 @@ @@ -1436565,7 +1437779,7 @@ index e1fe03ceb7f1..268c4610c25a 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..000000000 --- a/drivers/staging/android/ion/ion.h +++ /dev/null @@ -1,302 +0,0 @@ @@ -1436873,7 +1438087,7 @@ index c199e88afc6c..000000000000 -#endif /* _ION_H */ diff --git a/drivers/staging/android/ion/ion_buffer.c b/drivers/staging/android/ion/ion_buffer.c new file mode 100755 -index 000000000000..9baca1a472b6 +index 000000000..9baca1a47 --- /dev/null +++ b/drivers/staging/android/ion/ion_buffer.c @@ -0,0 +1,278 @@ @@ -1437157,7 +1438371,7 @@ index 000000000000..9baca1a472b6 +} 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 +index 000000000..47ae54af5 --- /dev/null +++ b/drivers/staging/android/ion/ion_dma_buf.c @@ -0,0 +1,359 @@ @@ -1437521,7 +1438735,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 @@ @@ -1437927,7 +1439141,7 @@ index ea7e0a244ffc..aa29a4ee48a3 100644 } 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 +index 000000000..db4e90683 --- /dev/null +++ b/drivers/staging/android/ion/ion_private.h @@ -0,0 +1,58 @@ @@ -1437991,7 +1439205,7 @@ index 000000000000..db4e90683f4c +#endif /* _ION_PRIVATE_H */ diff --git a/drivers/staging/android/ion/ion_protected_heap.c b/drivers/staging/android/ion/ion_protected_heap.c new file mode 100755 -index 000000000000..c7f25373a744 +index 000000000..c7f25373a --- /dev/null +++ b/drivers/staging/android/ion/ion_protected_heap.c @@ -0,0 +1,526 @@ @@ -1438523,7 +1439737,7 @@ index 000000000000..c7f25373a744 +#endif 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 +index 000000000..eacb47d4f --- /dev/null +++ b/drivers/staging/android/ion/ion_trace.h @@ -0,0 +1,55 @@ @@ -1438584,7 +1439798,7 @@ index 000000000000..eacb47d4f135 +#include diff --git a/drivers/staging/android/ion/rockchip/Makefile b/drivers/staging/android/ion/rockchip/Makefile new file mode 100755 -index 000000000000..89265fcbbe6f +index 000000000..89265fcbb --- /dev/null +++ b/drivers/staging/android/ion/rockchip/Makefile @@ -0,0 +1,3 @@ @@ -1438593,7 +1439807,7 @@ index 000000000000..89265fcbbe6f +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 +index 000000000..d3c3d0685 --- /dev/null +++ b/drivers/staging/android/ion/rockchip/rockchip_ion.c @@ -0,0 +1,224 @@ @@ -1438823,7 +1440037,7 @@ index 000000000000..d3c3d06856ad +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 +index 000000000..ab27d0531 --- /dev/null +++ b/drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c @@ -0,0 +1,145 @@ @@ -1438973,7 +1440187,7 @@ index 000000000000..ab27d05319ae + +postcore_initcall(rockchip_ion_snapshot_init); 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 @@ @@ -1439936,7 +1441150,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 17de8a9b991e..c83fb45e1d67 100644 +index 17de8a9b9..c83fb45e1 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -540,6 +540,7 @@ int thermal_zone_device_is_enabled(struct thermal_zone_device *tz) @@ -1439948,7 +1441162,7 @@ index 17de8a9b991e..c83fb45e1d67 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) @@ -1439959,7 +1441173,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 34aa2714f3c9..71ace116fe6b 100644 +index 34aa2714f..71ace116f 100644 --- a/drivers/tty/serial/8250/8250.h +++ b/drivers/tty/serial/8250/8250.h @@ -48,6 +48,9 @@ struct uart_8250_dma { @@ -1440006,7 +1441220,7 @@ index 34aa2714f3c9..71ace116fe6b 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 cae61d1ebec5..fc81bbc7697e 100644 +index cae61d1eb..fc81bbc76 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -558,6 +558,7 @@ static void __init serial8250_isa_init_ports(void) @@ -1440049,7 +1441263,7 @@ index cae61d1ebec5..fc81bbc7697e 100644 MODULE_LICENSE("GPL"); diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c -index 890fa7ddaa7f..136ed708f3a7 100644 +index 890fa7dda..136ed708f 100644 --- a/drivers/tty/serial/8250/8250_dma.c +++ b/drivers/tty/serial/8250/8250_dma.c @@ -11,6 +11,12 @@ @@ -1440339,7 +1441553,7 @@ index 890fa7ddaa7f..136ed708f3a7 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 a3a0154da567..7f24617474f0 100644 +index a3a0154da..7f2461747 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -33,6 +33,7 @@ @@ -1440530,7 +1441744,7 @@ index a3a0154da567..7f24617474f0 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 6d6a78eea..fee4f2933 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) @@ -1440560,7 +1441774,7 @@ index 6d6a78eead3e..fee4f2933919 100644 } diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c -index 5d40f1010fbf..6e86ce405aaf 100644 +index 5d40f1010..6e86ce405 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -1567,8 +1567,13 @@ static inline void __start_tx(struct uart_port *port) @@ -1440773,7 +1441987,7 @@ index 5d40f1010fbf..6e86ce405aaf 100644 serial8250_rpm_put(up); diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 95a9bae72f13..e5cc1db2a15d 100644 +index 95a9bae72..e5cc1db2a 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1826,7 +1826,8 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) @@ -1440787,7 +1442001,7 @@ index 95a9bae72f13..e5cc1db2a15d 100644 const struct hc_driver *drv = bus_to_hcd(hdev->bus)->driver; diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c -index a54a735b6384..8b1f40384ce0 100644 +index a54a735b6..8b1f40384 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[] = { @@ -1440813,7 +1442027,7 @@ index a54a735b6384..8b1f40384ce0 100644 { USB_DEVICE(0x0c45, 0x7056), .driver_info = USB_QUIRK_IGNORE_REMOTE_WAKEUP }, diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig -index 2d152571a7de..c333d13b38c1 100644 +index 2d152571a..c333d13b3 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -216,6 +216,12 @@ config USB_F_PRINTER @@ -1440869,7 +1442083,7 @@ index 2d152571a7de..c333d13b38c1 100644 bool "Audio Class 1.0" depends on USB_CONFIGFS diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c -index a8704e6498ab..5d07dc572479 100644 +index a8704e649..5d07dc572 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -13,6 +13,7 @@ @@ -1441027,7 +1442241,7 @@ index a8704e6498ab..5d07dc572479 100644 .suspend = composite_suspend, diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c -index 9b7fa53d6642..13cd4a21a2c9 100644 +index 9b7fa53d6..13cd4a21a 100644 --- a/drivers/usb/gadget/configfs.c +++ b/drivers/usb/gadget/configfs.c @@ -10,6 +10,32 @@ @@ -1441424,7 +1442638,7 @@ index 9b7fa53d6642..13cd4a21a2c9 100644 } 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( @@ -1441466,7 +1442680,7 @@ index 1eb4fa2e623f..177645f3250a 100644 } EXPORT_SYMBOL_GPL(usb_ep_autoconfig_ss); diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c -index 725e35167837..e3f836977969 100644 +index 725e35167..e3f836977 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -71,7 +71,7 @@ struct ffs_function { @@ -1441512,7 +1442726,7 @@ index 725e35167837..e3f836977969 100644 } 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 = { @@ -1441563,7 +1442777,7 @@ index ee95e8f5f9d4..b550fcb234ff 100644 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 -index e65f474ad7b3..fc66ab8bbc58 100644 +index e65f474ad..fc66ab8bb 100644 --- a/drivers/usb/gadget/function/f_uac1.c +++ b/drivers/usb/gadget/function/f_uac1.c @@ -3,6 +3,7 @@ @@ -1442842,7 +1444056,7 @@ index e65f474ad7b3..fc66ab8bbc58 100644 } 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) @@ -1442866,7 +1444080,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 -index dd960cea642f..e4429c8462c7 100644 +index dd960cea6..e4429c846 100644 --- a/drivers/usb/gadget/function/f_uac2.c +++ b/drivers/usb/gadget/function/f_uac2.c @@ -5,6 +5,7 @@ @@ -1444221,7 +1445435,7 @@ index dd960cea642f..e4429c8462c7 100644 } diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c -index f48a00e49794..31cc58171905 100644 +index f48a00e49..31cc58171 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 = { @@ -1444944,7 +1446158,7 @@ index f48a00e49794..31cc58171905 100644 return &uvc->func; diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c -index 95605b1ef4eb..eaba6e7b3836 100644 +index 95605b1ef..eaba6e7b3 100644 --- a/drivers/usb/gadget/function/u_audio.c +++ b/drivers/usb/gadget/function/u_audio.c @@ -13,6 +13,8 @@ @@ -1445848,7 +1447062,7 @@ index 95605b1ef4eb..eaba6e7b3836 100644 MODULE_DESCRIPTION("USB gadget \"ALSA sound card\" utilities"); MODULE_AUTHOR("Ruslan Bilovol"); diff --git a/drivers/usb/gadget/function/u_audio.h b/drivers/usb/gadget/function/u_audio.h -index 5ea6b86f1fda..49764d1c09ee 100644 +index 5ea6b86f1..49764d1c0 100644 --- a/drivers/usb/gadget/function/u_audio.h +++ b/drivers/usb/gadget/function/u_audio.h @@ -11,21 +11,70 @@ @@ -1445936,7 +1447150,7 @@ index 5ea6b86f1fda..49764d1c09ee 100644 #endif /* __U_AUDIO_H */ diff --git a/drivers/usb/gadget/function/u_uac1.h b/drivers/usb/gadget/function/u_uac1.h deleted file mode 100644 -index 39c0e29e1b46..000000000000 +index 39c0e29e1..000000000 --- a/drivers/usb/gadget/function/u_uac1.h +++ /dev/null @@ -1,38 +0,0 @@ @@ -1445979,7 +1447193,7 @@ index 39c0e29e1b46..000000000000 - -#endif /* __U_UAC1_H */ 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) @@ -1445995,7 +1447209,7 @@ index 60ae8b2d3f6a..2f149853a91b 100644 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 deleted file mode 100644 -index b5035711172d..000000000000 +index b50357111..000000000 --- a/drivers/usb/gadget/function/u_uac2.h +++ /dev/null @@ -1,41 +0,0 @@ @@ -1446041,7 +1447255,7 @@ index b5035711172d..000000000000 - -#endif 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 @@ @@ -1446091,7 +1447305,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 23ee25383c1f..8fb61023dd14 100644 +index 23ee25383..8fb61023d 100644 --- a/drivers/usb/gadget/function/uvc.h +++ b/drivers/usb/gadget/function/uvc.h @@ -14,6 +14,7 @@ @@ -1446139,7 +1447353,7 @@ index 23ee25383c1f..8fb61023dd14 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 00fb58e50a15..62c20c0bcd87 100644 +index 00fb58e50..62c20c0bc 100644 --- a/drivers/usb/gadget/function/uvc_configfs.c +++ b/drivers/usb/gadget/function/uvc_configfs.c @@ -12,6 +12,7 @@ @@ -1446653,7 +1447867,7 @@ index 00fb58e50a15..62c20c0bcd87 100644 }; diff --git a/drivers/usb/gadget/function/uvc_queue.c b/drivers/usb/gadget/function/uvc_queue.c -index 61e2c94cc0b0..3cc3da8ffb77 100644 +index 61e2c94cc..3cc3da8ff 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, @@ -1446672,7 +1447886,7 @@ index 61e2c94cc0b0..3cc3da8ffb77 100644 if (ret) return ret; diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c -index 4ca89eab6159..2528c894254f 100644 +index 4ca89eab6..2528c8942 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) @@ -1446729,7 +1447943,7 @@ index 4ca89eab6159..2528c894254f 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 633e23d58d86..5311b0f40e78 100644 +index 633e23d58..5311b0f40 100644 --- a/drivers/usb/gadget/function/uvc_video.c +++ b/drivers/usb/gadget/function/uvc_video.c @@ -12,12 +12,14 @@ @@ -1446845,7 +1448059,7 @@ index 633e23d58d86..5311b0f40e78 100644 return ret; diff --git a/drivers/usb/gadget/legacy/audio.c b/drivers/usb/gadget/legacy/audio.c -index a748ed0842e8..104d1c4ce7f9 100644 +index a748ed084..104d1c4ce 100644 --- a/drivers/usb/gadget/legacy/audio.c +++ b/drivers/usb/gadget/legacy/audio.c @@ -17,69 +17,36 @@ @@ -1447009,7 +1448223,7 @@ index a748ed0842e8..104d1c4ce7f9 100644 status = usb_string_ids_tab(cdev, strings_dev); if (status < 0) diff --git a/drivers/usb/gadget/legacy/webcam.c b/drivers/usb/gadget/legacy/webcam.c -index 2c9eab2b863d..b18e011b57a1 100644 +index 2c9eab2b8..b18e011b5 100644 --- a/drivers/usb/gadget/legacy/webcam.c +++ b/drivers/usb/gadget/legacy/webcam.c @@ -383,6 +383,8 @@ webcam_bind(struct usb_composite_dev *cdev) @@ -1447022,7 +1448236,7 @@ index 2c9eab2b863d..b18e011b57a1 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 -index da691a69fec1..0e6dbf9da7a5 100644 +index da691a69f..0e6dbf9da 100644 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -755,7 +755,7 @@ int usb_gadget_deactivate(struct usb_gadget *gadget) @@ -1447035,7 +1448249,7 @@ index da691a69fec1..0e6dbf9da7a5 100644 if (gadget->connected) { diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c -index e5a971b83e3f..a345f2982b24 100644 +index e5a971b83..a345f2982 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) @@ -1447050,7 +1448264,7 @@ index e5a971b83e3f..a345f2982b24 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 29191d33c0e3..07150541e2ed 100644 +index 29191d33c..07150541e 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, @@ -1447067,7 +1448281,7 @@ index 29191d33c0e3..07150541e2ed 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 4051c8cd0cd8..1fcb871c6919 100644 +index 4051c8cd0..1fcb871c6 100644 --- a/drivers/usb/storage/unusual_uas.h +++ b/drivers/usb/storage/unusual_uas.h @@ -62,6 +62,12 @@ UNUSUAL_DEV(0x0984, 0x0301, 0x0128, 0x0128, @@ -1447110,7 +1448324,7 @@ index 4051c8cd0cd8..1fcb871c6919 100644 UNUSUAL_DEV(0x2109, 0x0711, 0x0000, 0x9999, "VIA", 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" @@ -1447133,7 +1448347,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/ @@ -1447145,7 +1448359,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) @@ -1447159,7 +1448373,7 @@ index 1cf924f3aecc..cd3676b96fb0 100644 diff --git a/drivers/video/rockchip/Kconfig b/drivers/video/rockchip/Kconfig new file mode 100755 -index 000000000000..790f1f4227c1 +index 000000000..790f1f422 --- /dev/null +++ b/drivers/video/rockchip/Kconfig @@ -0,0 +1,5 @@ @@ -1447170,7 +1448384,7 @@ index 000000000000..790f1f4227c1 +source "drivers/video/rockchip/mpp/Kconfig" diff --git a/drivers/video/rockchip/Makefile b/drivers/video/rockchip/Makefile new file mode 100755 -index 000000000000..e01d878568aa +index 000000000..e01d87856 --- /dev/null +++ b/drivers/video/rockchip/Makefile @@ -0,0 +1,5 @@ @@ -1447181,7 +1448395,7 @@ index 000000000000..e01d878568aa +obj-$(CONFIG_ROCKCHIP_MPP_SERVICE) += mpp/ diff --git a/drivers/video/rockchip/iep/Kconfig b/drivers/video/rockchip/iep/Kconfig new file mode 100755 -index 000000000000..cd8ba653f9ea +index 000000000..cd8ba653f --- /dev/null +++ b/drivers/video/rockchip/iep/Kconfig @@ -0,0 +1,10 @@ @@ -1447197,7 +1448411,7 @@ 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 +index 000000000..f4dba6e93 --- /dev/null +++ b/drivers/video/rockchip/iep/Makefile @@ -0,0 +1,4 @@ @@ -1447207,7 +1448421,7 @@ index 000000000000..f4dba6e9379a +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 +index 000000000..1f4a07062 --- /dev/null +++ b/drivers/video/rockchip/iep/hw_iep_config_addr.h @@ -0,0 +1,99 @@ @@ -1447312,7 +1448526,7 @@ index 000000000000..1f4a0706233f +#endif diff --git a/drivers/video/rockchip/iep/hw_iep_reg.c b/drivers/video/rockchip/iep/hw_iep_reg.c new file mode 100755 -index 000000000000..331a50865045 +index 000000000..331a50865 --- /dev/null +++ b/drivers/video/rockchip/iep/hw_iep_reg.c @@ -0,0 +1,1530 @@ @@ -1448848,7 +1450062,7 @@ index 000000000000..331a50865045 + diff --git a/drivers/video/rockchip/iep/hw_iep_reg.h b/drivers/video/rockchip/iep/hw_iep_reg.h new file mode 100755 -index 000000000000..03d9fe92ca23 +index 000000000..03d9fe92c --- /dev/null +++ b/drivers/video/rockchip/iep/hw_iep_reg.h @@ -0,0 +1,525 @@ @@ -1449379,7 +1450593,7 @@ index 000000000000..03d9fe92ca23 +#endif diff --git a/drivers/video/rockchip/iep/iep.h b/drivers/video/rockchip/iep/iep.h new file mode 100755 -index 000000000000..94e372e6a471 +index 000000000..94e372e6a --- /dev/null +++ b/drivers/video/rockchip/iep/iep.h @@ -0,0 +1,276 @@ @@ -1449661,7 +1450875,7 @@ index 000000000000..94e372e6a471 +#endif diff --git a/drivers/video/rockchip/iep/iep_drv.c b/drivers/video/rockchip/iep/iep_drv.c new file mode 100755 -index 000000000000..f0cfc7164e39 +index 000000000..f0cfc7164 --- /dev/null +++ b/drivers/video/rockchip/iep/iep_drv.c @@ -0,0 +1,1320 @@ @@ -1450987,7 +1452201,7 @@ index 000000000000..f0cfc7164e39 +#endif diff --git a/drivers/video/rockchip/iep/iep_drv.h b/drivers/video/rockchip/iep/iep_drv.h new file mode 100755 -index 000000000000..43d1e8167a8a +index 000000000..43d1e8167 --- /dev/null +++ b/drivers/video/rockchip/iep/iep_drv.h @@ -0,0 +1,163 @@ @@ -1451156,7 +1452370,7 @@ index 000000000000..43d1e8167a8a + 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..e1a57ce15d5d +index 000000000..e1a57ce15 --- /dev/null +++ b/drivers/video/rockchip/iep/iep_iommu_drm.c @@ -0,0 +1,473 @@ @@ -1451635,7 +1452849,7 @@ index 000000000000..e1a57ce15d5d +} 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 +index 000000000..e84772237 --- /dev/null +++ b/drivers/video/rockchip/iep/iep_iommu_ops.c @@ -0,0 +1,244 @@ @@ -1451885,7 +1453099,7 @@ index 000000000000..e84772237b89 +} 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..de92f5c67428 +index 000000000..de92f5c67 --- /dev/null +++ b/drivers/video/rockchip/iep/iep_iommu_ops.h @@ -0,0 +1,122 @@ @@ -1452013,7 +1453227,7 @@ index 000000000000..de92f5c67428 +#endif diff --git a/drivers/video/rockchip/mpp/Kconfig b/drivers/video/rockchip/mpp/Kconfig new file mode 100755 -index 000000000000..28d23fc7193f +index 000000000..28d23fc71 --- /dev/null +++ b/drivers/video/rockchip/mpp/Kconfig @@ -0,0 +1,71 @@ @@ -1452090,7 +1453304,7 @@ index 000000000000..28d23fc7193f + rockchip mpp rkv jpeg decoder. diff --git a/drivers/video/rockchip/mpp/Makefile b/drivers/video/rockchip/mpp/Makefile new file mode 100755 -index 000000000000..6766da8eed94 +index 000000000..6766da8ee --- /dev/null +++ b/drivers/video/rockchip/mpp/Makefile @@ -0,0 +1,24 @@ @@ -1452120,7 +1453334,7 @@ index 000000000000..6766da8eed94 +obj-$(CONFIG_ROCKCHIP_MPP_SERVICE) += rk_vcodec.o diff --git a/drivers/video/rockchip/mpp/mpp_common.c b/drivers/video/rockchip/mpp/mpp_common.c new file mode 100755 -index 000000000000..fcdbc00fa293 +index 000000000..fcdbc00fa --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_common.c @@ -0,0 +1,2120 @@ @@ -1454246,7 +1455460,7 @@ index 000000000000..fcdbc00fa293 +} diff --git a/drivers/video/rockchip/mpp/mpp_common.h b/drivers/video/rockchip/mpp/mpp_common.h new file mode 100755 -index 000000000000..991e6050e259 +index 000000000..991e6050e --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_common.h @@ -0,0 +1,705 @@ @@ -1454957,7 +1456171,7 @@ index 000000000000..991e6050e259 +#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..0c1132f2e947 +index 000000000..0c1132f2e --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_debug.h @@ -0,0 +1,91 @@ @@ -1455054,7 +1456268,7 @@ index 000000000000..0c1132f2e947 +#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..b116dd752bf3 +index 000000000..b116dd752 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iep2.c @@ -0,0 +1,1013 @@ @@ -1456073,7 +1457287,7 @@ index 000000000000..b116dd752bf3 + diff --git a/drivers/video/rockchip/mpp/mpp_iommu.c b/drivers/video/rockchip/mpp/mpp_iommu.c new file mode 100755 -index 000000000000..d123f42da7e6 +index 000000000..d123f42da --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iommu.c @@ -0,0 +1,584 @@ @@ -1456663,7 +1457877,7 @@ index 000000000000..d123f42da7e6 +} diff --git a/drivers/video/rockchip/mpp/mpp_iommu.h b/drivers/video/rockchip/mpp/mpp_iommu.h new file mode 100755 -index 000000000000..9663ce9bf612 +index 000000000..9663ce9bf --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iommu.h @@ -0,0 +1,107 @@ @@ -1456776,7 +1457990,7 @@ index 000000000000..9663ce9bf612 +#endif diff --git a/drivers/video/rockchip/mpp/mpp_jpgdec.c b/drivers/video/rockchip/mpp/mpp_jpgdec.c new file mode 100755 -index 000000000000..edb81e1f0801 +index 000000000..edb81e1f0 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_jpgdec.c @@ -0,0 +1,626 @@ @@ -1457408,7 +1458622,7 @@ index 000000000000..edb81e1f0801 +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..bd4ba960c4cd +index 000000000..bd4ba960c --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec.c @@ -0,0 +1,1903 @@ @@ -1459317,7 +1460531,7 @@ index 000000000000..bd4ba960c4cd +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..d765052ecfd8 +index 000000000..d765052ec --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2.c @@ -0,0 +1,1180 @@ @@ -1460503,7 +1461717,7 @@ index 000000000000..d765052ecfd8 +EXPORT_SYMBOL(rockchip_rkvdec2_driver); diff --git a/drivers/video/rockchip/mpp/mpp_rkvenc.c b/drivers/video/rockchip/mpp/mpp_rkvenc.c new file mode 100755 -index 000000000000..bbe82497f15f +index 000000000..bbe82497f --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvenc.c @@ -0,0 +1,1503 @@ @@ -1462012,7 +1463226,7 @@ index 000000000000..bbe82497f15f +}; diff --git a/drivers/video/rockchip/mpp/mpp_rkvenc.c.rej b/drivers/video/rockchip/mpp/mpp_rkvenc.c.rej new file mode 100644 -index 000000000000..f2edcaafad82 +index 000000000..f2edcaafa --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvenc.c.rej @@ -0,0 +1,15 @@ @@ -1462033,7 +1463247,7 @@ index 000000000000..f2edcaafad82 + return ret; diff --git a/drivers/video/rockchip/mpp/mpp_service.c b/drivers/video/rockchip/mpp/mpp_service.c new file mode 100755 -index 000000000000..430ea0715360 +index 000000000..430ea0715 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_service.c @@ -0,0 +1,415 @@ @@ -1462454,7 +1463668,7 @@ index 000000000000..430ea0715360 +MODULE_DESCRIPTION("Rockchip mpp service 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..64de10990d51 +index 000000000..64de10990 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vdpu1.c @@ -0,0 +1,868 @@ @@ -1463328,7 +1464542,7 @@ index 000000000000..64de10990d51 +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..fb0eca81e6f5 +index 000000000..fb0eca81e --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vdpu2.c @@ -0,0 +1,765 @@ @@ -1464099,7 +1465313,7 @@ index 000000000000..fb0eca81e6f5 +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..f140a0f828b9 +index 000000000..f140a0f82 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vepu1.c @@ -0,0 +1,795 @@ @@ -1464900,7 +1466114,7 @@ index 000000000000..f140a0f828b9 +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..8593fe6a8ab4 +index 000000000..8593fe6a8 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vepu2.c @@ -0,0 +1,885 @@ @@ -1465791,7 +1467005,7 @@ index 000000000000..8593fe6a8ab4 +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..8734bbddeaac +index 000000000..8734bbdde --- /dev/null +++ b/drivers/video/rockchip/mpp/rockchip_iep2_regs.h @@ -0,0 +1,172 @@ @@ -1465969,7 +1467183,7 @@ index 000000000000..8734bbddeaac + diff --git a/drivers/video/rockchip/rga/Kconfig b/drivers/video/rockchip/rga/Kconfig new file mode 100755 -index 000000000000..6023b2eb23a7 +index 000000000..6023b2eb2 --- /dev/null +++ b/drivers/video/rockchip/rga/Kconfig @@ -0,0 +1,10 @@ @@ -1465985,7 +1467199,7 @@ 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 +index 000000000..58dd4c6a3 --- /dev/null +++ b/drivers/video/rockchip/rga/Makefile @@ -0,0 +1,4 @@ @@ -1465995,7 +1467209,7 @@ index 000000000000..58dd4c6a3e42 +obj-$(CONFIG_ROCKCHIP_RGA) += rga.o diff --git a/drivers/video/rockchip/rga/RGA_API.c b/drivers/video/rockchip/rga/RGA_API.c new file mode 100755 -index 000000000000..947a9b925f60 +index 000000000..947a9b925 --- /dev/null +++ b/drivers/video/rockchip/rga/RGA_API.c @@ -0,0 +1,201 @@ @@ -1466202,7 +1467416,7 @@ index 000000000000..947a9b925f60 + diff --git a/drivers/video/rockchip/rga/RGA_API.h b/drivers/video/rockchip/rga/RGA_API.h new file mode 100755 -index 000000000000..ade17d03e85c +index 000000000..ade17d03e --- /dev/null +++ b/drivers/video/rockchip/rga/RGA_API.h @@ -0,0 +1,40 @@ @@ -1466248,7 +1467462,7 @@ index 000000000000..ade17d03e85c +#endif diff --git a/drivers/video/rockchip/rga/rga.h b/drivers/video/rockchip/rga/rga.h new file mode 100755 -index 000000000000..e54a6efba39f +index 000000000..e54a6efba --- /dev/null +++ b/drivers/video/rockchip/rga/rga.h @@ -0,0 +1,508 @@ @@ -1466762,7 +1467976,7 @@ index 000000000000..e54a6efba39f +#endif /*_RK29_IPP_DRIVER_H_*/ diff --git a/drivers/video/rockchip/rga/rga_drv.c b/drivers/video/rockchip/rga/rga_drv.c new file mode 100755 -index 000000000000..a5d43f90f21b +index 000000000..a5d43f90f --- /dev/null +++ b/drivers/video/rockchip/rga/rga_drv.c @@ -0,0 +1,2550 @@ @@ -1469318,7 +1470532,7 @@ index 000000000000..a5d43f90f21b +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 +index 000000000..8825183d9 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_mmu_info.c @@ -0,0 +1,1315 @@ @@ -1470639,7 +1471853,7 @@ index 000000000000..8825183d92fc + diff --git a/drivers/video/rockchip/rga/rga_mmu_info.h b/drivers/video/rockchip/rga/rga_mmu_info.h new file mode 100755 -index 000000000000..3e70894c7ee7 +index 000000000..3e70894c7 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_mmu_info.h @@ -0,0 +1,24 @@ @@ -1470669,7 +1471883,7 @@ index 000000000000..3e70894c7ee7 + diff --git a/drivers/video/rockchip/rga/rga_reg_info.c b/drivers/video/rockchip/rga/rga_reg_info.c new file mode 100755 -index 000000000000..94a6305b870b +index 000000000..94a6305b8 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_reg_info.c @@ -0,0 +1,1587 @@ @@ -1472262,7 +1473476,7 @@ index 000000000000..94a6305b870b + diff --git a/drivers/video/rockchip/rga/rga_reg_info.h b/drivers/video/rockchip/rga/rga_reg_info.h new file mode 100755 -index 000000000000..565e8f72d7f0 +index 000000000..565e8f72d --- /dev/null +++ b/drivers/video/rockchip/rga/rga_reg_info.h @@ -0,0 +1,467 @@ @@ -1472735,7 +1473949,7 @@ index 000000000000..565e8f72d7f0 + 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 +index 000000000..ed9758711 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_rop.h @@ -0,0 +1,56 @@ @@ -1472797,7 +1474011,7 @@ index 000000000000..ed9758711022 +#endif diff --git a/drivers/video/rockchip/rga/rga_type.h b/drivers/video/rockchip/rga/rga_type.h new file mode 100755 -index 000000000000..ce3610ab9b67 +index 000000000..ce3610ab9 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_type.h @@ -0,0 +1,49 @@ @@ -1472852,7 +1474066,7 @@ index 000000000000..ce3610ab9b67 + diff --git a/drivers/video/rockchip/rga2/Kconfig b/drivers/video/rockchip/rga2/Kconfig new file mode 100755 -index 000000000000..efc1ef6dfa85 +index 000000000..efc1ef6df --- /dev/null +++ b/drivers/video/rockchip/rga2/Kconfig @@ -0,0 +1,10 @@ @@ -1472868,7 +1474082,7 @@ index 000000000000..efc1ef6dfa85 +endmenu diff --git a/drivers/video/rockchip/rga2/Makefile b/drivers/video/rockchip/rga2/Makefile new file mode 100755 -index 000000000000..210981d11f82 +index 000000000..210981d11 --- /dev/null +++ b/drivers/video/rockchip/rga2/Makefile @@ -0,0 +1,4 @@ @@ -1472878,7 +1474092,7 @@ index 000000000000..210981d11f82 +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 +index 000000000..0be2c1ae6 --- /dev/null +++ b/drivers/video/rockchip/rga2/RGA2_API.c @@ -0,0 +1,23 @@ @@ -1472907,7 +1474121,7 @@ index 000000000000..0be2c1ae64b6 + diff --git a/drivers/video/rockchip/rga2/RGA2_API.h b/drivers/video/rockchip/rga2/RGA2_API.h new file mode 100755 -index 000000000000..e6c4e6247fed +index 000000000..e6c4e6247 --- /dev/null +++ b/drivers/video/rockchip/rga2/RGA2_API.h @@ -0,0 +1,35 @@ @@ -1472948,7 +1474162,7 @@ index 000000000000..e6c4e6247fed +#endif diff --git a/drivers/video/rockchip/rga2/rga2.h b/drivers/video/rockchip/rga2/rga2.h new file mode 100755 -index 000000000000..81ba59a3ba64 +index 000000000..81ba59a3b --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2.h @@ -0,0 +1,785 @@ @@ -1473739,7 +1474953,7 @@ index 000000000000..81ba59a3ba64 +#endif /*_RK29_IPP_DRIVER_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..394c495c93ff +index 000000000..394c495c9 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_drv.c @@ -0,0 +1,2905 @@ @@ -1476650,7 +1477864,7 @@ index 000000000000..394c495c93ff +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..753e2afdd6c1 +index 000000000..753e2afdd --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_mmu_info.c @@ -0,0 +1,1342 @@ @@ -1477998,7 +1479212,7 @@ index 000000000000..753e2afdd6c1 + 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..6809a4f40230 +index 000000000..6809a4f40 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_mmu_info.h @@ -0,0 +1,32 @@ @@ -1478036,7 +1479250,7 @@ index 000000000000..6809a4f40230 + 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..29e0dee977ad +index 000000000..29e0dee97 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_reg_info.c @@ -0,0 +1,1643 @@ @@ -1479685,7 +1480899,7 @@ index 000000000000..29e0dee977ad +} 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 +index 000000000..7aaac7d35 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_reg_info.h @@ -0,0 +1,331 @@ @@ -1480022,7 +1481236,7 @@ index 000000000000..7aaac7d3502b + 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 +index 000000000..dc2a343f4 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_rop.h @@ -0,0 +1,56 @@ @@ -1480084,7 +1481298,7 @@ index 000000000000..dc2a343f4c5c +#endif diff --git a/drivers/video/rockchip/rga2/rga2_type.h b/drivers/video/rockchip/rga2/rga2_type.h new file mode 100755 -index 000000000000..30f5df2f38e5 +index 000000000..30f5df2f3 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_type.h @@ -0,0 +1,49 @@ @@ -1480138,7 +1481352,7 @@ index 000000000000..30f5df2f38e5 +#endif /* __RGA_TYPR_H__ */ + diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c -index f116f7b3f9e5..4061fd58602f 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, @@ -1480190,7 +1481404,7 @@ index f116f7b3f9e5..4061fd58602f 100644 ret, lnum, offs); break; diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c -index 511c9363e1a9..2bfbcf28b1bd 100644 +index 511c9363e..2bfbcf28b 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -802,7 +802,6 @@ xfs_ialloc( @@ -1480227,7 +1481441,7 @@ index 511c9363e1a9..2bfbcf28b1bd 100644 /* diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h -index b0dcc07334a1..2ffa52afcf43 100644 +index b0dcc0733..2ffa52afc 100644 --- a/include/drm/bridge/analogix_dp.h +++ b/include/drm/bridge/analogix_dp.h @@ -8,6 +8,7 @@ @@ -1480292,7 +1481506,7 @@ index b0dcc07334a1..2ffa52afcf43 100644 + #endif /* _ANALOGIX_DP_H_ */ diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h -index ea34ca146b82..d696e9eb13ba 100644 +index ea34ca146..d696e9eb1 100644 --- a/include/drm/bridge/dw_hdmi.h +++ b/include/drm/bridge/dw_hdmi.h @@ -6,6 +6,7 @@ @@ -1480400,7 +1481614,7 @@ index ea34ca146b82..d696e9eb13ba 100644 void dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense); diff --git a/include/drm/bridge/dw_mipi_dsi.h b/include/drm/bridge/dw_mipi_dsi.h -index bda8aa7c2280..f89b0476aafd 100644 +index bda8aa7c2..f89b0476a 100644 --- a/include/drm/bridge/dw_mipi_dsi.h +++ b/include/drm/bridge/dw_mipi_dsi.h @@ -66,5 +66,6 @@ void dw_mipi_dsi_remove(struct dw_mipi_dsi *dsi); @@ -1480411,7 +1481625,7 @@ index bda8aa7c2280..f89b0476aafd 100644 #endif /* __DW_MIPI_DSI__ */ 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 { @@ -1480433,7 +1481647,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 @@ @@ -1480461,7 +1481675,7 @@ index e57d0440f00f..e395d1fc186e 100644 * @dumb_create: * diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h -index 42d04607d091..726cfe0ff5f5 100644 +index 42d04607d..726cfe0ff 100644 --- a/include/drm/drm_file.h +++ b/include/drm/drm_file.h @@ -411,6 +411,9 @@ void drm_event_cancel_free(struct drm_device *dev, @@ -1480475,7 +1481689,7 @@ index 42d04607d091..726cfe0ff5f5 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 360e6377e84b..952f475a68d6 100644 +index 360e6377e..952f475a6 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; @@ -1480518,7 +1481732,7 @@ index 360e6377e84b..952f475a68d6 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 { @@ -1480542,7 +1481756,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 { @@ -1480555,7 +1481769,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); @@ -1480567,7 +1481781,7 @@ index 0f69f9fbf12c..a9d0c6b0854e 100644 #endif /* __DRM_PRIME_H__ */ diff --git a/include/drm/drm_sync_helper.h b/include/drm/drm_sync_helper.h new file mode 100755 -index 000000000000..a5586c674fec +index 000000000..a5586c674 --- /dev/null +++ b/include/drm/drm_sync_helper.h @@ -0,0 +1,156 @@ @@ -1480728,7 +1481942,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 @@ @@ -1480742,7 +1481956,7 @@ index 5b1416fcde6f..33eac20e9ad4 100644 #define DCLK_VOPB 150 diff --git a/include/dt-bindings/clock/rk1808-cru.h b/include/dt-bindings/clock/rk1808-cru.h new file mode 100755 -index 000000000000..994896d111f1 +index 000000000..994896d11 --- /dev/null +++ b/include/dt-bindings/clock/rk1808-cru.h @@ -0,0 +1,473 @@ @@ -1481220,7 +1482434,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 @@ @@ -1481249,7 +1482463,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 @@ @@ -1481261,7 +1482475,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 @@ @@ -1481286,7 +1482500,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 @@ @@ -1481301,7 +1482515,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 @@ @@ -1481313,7 +1482527,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 @@ @@ -1481374,7 +1482588,7 @@ index 44e0a319f077..a06e18ebc4dd 100644 #define SRST_PVTM_CORE_B 47 diff --git a/include/dt-bindings/clock/rk3568-cru.h b/include/dt-bindings/clock/rk3568-cru.h new file mode 100755 -index 000000000000..aecfdd4ce084 +index 000000000..aecfdd4ce --- /dev/null +++ b/include/dt-bindings/clock/rk3568-cru.h @@ -0,0 +1,932 @@ @@ -1482312,7 +1483526,7 @@ index 000000000000..aecfdd4ce084 +#endif diff --git a/include/dt-bindings/clock/rk618-cru.h b/include/dt-bindings/clock/rk618-cru.h new file mode 100755 -index 000000000000..72ae0aef1378 +index 000000000..72ae0aef1 --- /dev/null +++ b/include/dt-bindings/clock/rk618-cru.h @@ -0,0 +1,38 @@ @@ -1482356,7 +1483570,7 @@ index 000000000000..72ae0aef1378 +#endif diff --git a/include/dt-bindings/clock/rk628-cgu.h b/include/dt-bindings/clock/rk628-cgu.h new file mode 100755 -index 000000000000..d1690907d208 +index 000000000..d1690907d --- /dev/null +++ b/include/dt-bindings/clock/rk628-cgu.h @@ -0,0 +1,50 @@ @@ -1482412,7 +1483626,7 @@ index 000000000000..d1690907d208 +#endif diff --git a/include/dt-bindings/clock/rockchip,rk3036.h b/include/dt-bindings/clock/rockchip,rk3036.h new file mode 100755 -index 000000000000..019550c7d0c1 +index 000000000..019550c7d --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3036.h @@ -0,0 +1,155 @@ @@ -1482573,7 +1483787,7 @@ index 000000000000..019550c7d0c1 +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3036_H */ diff --git a/include/dt-bindings/clock/rockchip,rk312x.h b/include/dt-bindings/clock/rockchip,rk312x.h new file mode 100755 -index 000000000000..0af5abca3470 +index 000000000..0af5abca3 --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk312x.h @@ -0,0 +1,167 @@ @@ -1482746,7 +1483960,7 @@ index 000000000000..0af5abca3470 +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3128_H */ diff --git a/include/dt-bindings/clock/rockchip,rk3188.h b/include/dt-bindings/clock/rockchip,rk3188.h new file mode 100755 -index 000000000000..b8c57e1cfed8 +index 000000000..b8c57e1cf --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3188.h @@ -0,0 +1,13 @@ @@ -1482765,7 +1483979,7 @@ index 000000000000..b8c57e1cfed8 +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3188_H */ diff --git a/include/dt-bindings/clock/rockchip,rk3228.h b/include/dt-bindings/clock/rockchip,rk3228.h new file mode 100755 -index 000000000000..b86e44536722 +index 000000000..b86e44536 --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3228.h @@ -0,0 +1,167 @@ @@ -1482938,7 +1484152,7 @@ index 000000000000..b86e44536722 +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3228_H */ diff --git a/include/dt-bindings/clock/rockchip,rk3288.h b/include/dt-bindings/clock/rockchip,rk3288.h new file mode 100755 -index 000000000000..1a2803c4f168 +index 000000000..1a2803c4f --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3288.h @@ -0,0 +1,220 @@ @@ -1483164,7 +1484378,7 @@ index 000000000000..1a2803c4f168 +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3288_H */ diff --git a/include/dt-bindings/clock/rockchip,rk3368.h b/include/dt-bindings/clock/rockchip,rk3368.h new file mode 100755 -index 000000000000..76630794b4d9 +index 000000000..76630794b --- /dev/null +++ b/include/dt-bindings/clock/rockchip,rk3368.h @@ -0,0 +1,263 @@ @@ -1483433,7 +1484647,7 @@ index 000000000000..76630794b4d9 +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_RK3368_H */ diff --git a/include/dt-bindings/clock/rockchip-ddr.h b/include/dt-bindings/clock/rockchip-ddr.h new file mode 100755 -index 000000000000..b065432e7793 +index 000000000..b065432e7 --- /dev/null +++ b/include/dt-bindings/clock/rockchip-ddr.h @@ -0,0 +1,63 @@ @@ -1483502,7 +1484716,7 @@ index 000000000000..b065432e7793 +#endif diff --git a/include/dt-bindings/clock/rockchip.h b/include/dt-bindings/clock/rockchip.h new file mode 100755 -index 000000000000..b438f7bd4083 +index 000000000..b438f7bd4 --- /dev/null +++ b/include/dt-bindings/clock/rockchip.h @@ -0,0 +1,101 @@ @@ -1483609,7 +1484823,7 @@ index 000000000000..b438f7bd4083 +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_H */ diff --git a/include/dt-bindings/clock/rv1126-cru.h b/include/dt-bindings/clock/rv1126-cru.h new file mode 100755 -index 000000000000..474bcbc546af +index 000000000..474bcbc54 --- /dev/null +++ b/include/dt-bindings/clock/rv1126-cru.h @@ -0,0 +1,633 @@ @@ -1484248,7 +1485462,7 @@ index 000000000000..474bcbc546af +#endif diff --git a/include/dt-bindings/display/drm_mipi_dsi.h b/include/dt-bindings/display/drm_mipi_dsi.h new file mode 100755 -index 000000000000..bc24ce4ddd08 +index 000000000..bc24ce4dd --- /dev/null +++ b/include/dt-bindings/display/drm_mipi_dsi.h @@ -0,0 +1,53 @@ @@ -1484307,7 +1485521,7 @@ index 000000000000..bc24ce4ddd08 +#endif /* __DRM_MIPI_DSI__ */ diff --git a/include/dt-bindings/display/media-bus-format.h b/include/dt-bindings/display/media-bus-format.h new file mode 100755 -index 000000000000..b8e9a1bb3f95 +index 000000000..b8e9a1bb3 --- /dev/null +++ b/include/dt-bindings/display/media-bus-format.h @@ -0,0 +1,152 @@ @@ -1484465,7 +1485679,7 @@ index 000000000000..b8e9a1bb3f95 +#endif /* __LINUX_MEDIA_BUS_FORMAT_H */ diff --git a/include/dt-bindings/display/mipi_dsi.h b/include/dt-bindings/display/mipi_dsi.h new file mode 100755 -index 000000000000..38aeee0ed51d +index 000000000..38aeee0ed --- /dev/null +++ b/include/dt-bindings/display/mipi_dsi.h @@ -0,0 +1,106 @@ @@ -1484577,7 +1485791,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 @@ @@ -1484604,7 +1485818,7 @@ index 000000000000..3e14128e7ab1 +#endif diff --git a/include/dt-bindings/dram/rockchip,rk322x.h b/include/dt-bindings/dram/rockchip,rk322x.h new file mode 100755 -index 000000000000..1ab3317d700e +index 000000000..1ab3317d7 --- /dev/null +++ b/include/dt-bindings/dram/rockchip,rk322x.h @@ -0,0 +1,90 @@ @@ -1484700,7 +1485914,7 @@ index 000000000000..1ab3317d700e +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK322X_H */ diff --git a/include/dt-bindings/dram/rockchip,rk3368.h b/include/dt-bindings/dram/rockchip,rk3368.h new file mode 100755 -index 000000000000..993f1eed9816 +index 000000000..993f1eed9 --- /dev/null +++ b/include/dt-bindings/dram/rockchip,rk3368.h @@ -0,0 +1,80 @@ @@ -1484786,7 +1486000,7 @@ index 000000000000..993f1eed9816 +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK3368_H*/ diff --git a/include/dt-bindings/input/rk-input.h b/include/dt-bindings/input/rk-input.h new file mode 100755 -index 000000000000..00b412927890 +index 000000000..00b412927 --- /dev/null +++ b/include/dt-bindings/input/rk-input.h @@ -0,0 +1,814 @@ @@ -1485606,7 +1486820,7 @@ index 000000000000..00b412927890 +#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 +index 000000000..17d799d80 --- /dev/null +++ b/include/dt-bindings/memory/px30-dram.h @@ -0,0 +1,132 @@ @@ -1485744,7 +1486958,7 @@ index 000000000000..17d799d802d9 +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_PX30_H*/ diff --git a/include/dt-bindings/memory/rk1808-dram.h b/include/dt-bindings/memory/rk1808-dram.h new file mode 100755 -index 000000000000..522bd75a4a55 +index 000000000..522bd75a4 --- /dev/null +++ b/include/dt-bindings/memory/rk1808-dram.h @@ -0,0 +1,180 @@ @@ -1485930,7 +1487144,7 @@ index 000000000000..522bd75a4a55 +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK1808_H*/ diff --git a/include/dt-bindings/memory/rk3128-dram.h b/include/dt-bindings/memory/rk3128-dram.h new file mode 100755 -index 000000000000..2598ac98e525 +index 000000000..2598ac98e --- /dev/null +++ b/include/dt-bindings/memory/rk3128-dram.h @@ -0,0 +1,95 @@ @@ -1486031,7 +1487245,7 @@ index 000000000000..2598ac98e525 +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK3128_H */ diff --git a/include/dt-bindings/memory/rk3288-dram.h b/include/dt-bindings/memory/rk3288-dram.h new file mode 100755 -index 000000000000..1c531dca755c +index 000000000..1c531dca7 --- /dev/null +++ b/include/dt-bindings/memory/rk3288-dram.h @@ -0,0 +1,127 @@ @@ -1486164,7 +1487378,7 @@ index 000000000000..1c531dca755c +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK3288_H*/ diff --git a/include/dt-bindings/memory/rk3328-dram.h b/include/dt-bindings/memory/rk3328-dram.h new file mode 100755 -index 000000000000..171f41c256d3 +index 000000000..171f41c25 --- /dev/null +++ b/include/dt-bindings/memory/rk3328-dram.h @@ -0,0 +1,159 @@ @@ -1486329,7 +1487543,7 @@ index 000000000000..171f41c256d3 +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK3328_H*/ diff --git a/include/dt-bindings/memory/rk3368-dram.h b/include/dt-bindings/memory/rk3368-dram.h new file mode 100755 -index 000000000000..c1f23d32d987 +index 000000000..c1f23d32d --- /dev/null +++ b/include/dt-bindings/memory/rk3368-dram.h @@ -0,0 +1,109 @@ @@ -1486444,7 +1487658,7 @@ index 000000000000..c1f23d32d987 +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK3368_H*/ diff --git a/include/dt-bindings/memory/rk3399-dram.h b/include/dt-bindings/memory/rk3399-dram.h new file mode 100755 -index 000000000000..44abb0aafb05 +index 000000000..44abb0aaf --- /dev/null +++ b/include/dt-bindings/memory/rk3399-dram.h @@ -0,0 +1,107 @@ @@ -1486557,7 +1487771,7 @@ index 000000000000..44abb0aafb05 +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK3399_H */ diff --git a/include/dt-bindings/memory/rk3568-dram.h b/include/dt-bindings/memory/rk3568-dram.h new file mode 100755 -index 000000000000..c05eae7fe32e +index 000000000..c05eae7fe --- /dev/null +++ b/include/dt-bindings/memory/rk3568-dram.h @@ -0,0 +1,111 @@ @@ -1486674,7 +1487888,7 @@ index 000000000000..c05eae7fe32e +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK3568_H */ diff --git a/include/dt-bindings/memory/rockchip-dram.h b/include/dt-bindings/memory/rockchip-dram.h new file mode 100755 -index 000000000000..17e5e34b05c5 +index 000000000..17e5e34b0 --- /dev/null +++ b/include/dt-bindings/memory/rockchip-dram.h @@ -0,0 +1,94 @@ @@ -1486774,7 +1487988,7 @@ index 000000000000..17e5e34b05c5 +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_H */ diff --git a/include/dt-bindings/memory/rv1126-dram.h b/include/dt-bindings/memory/rv1126-dram.h new file mode 100755 -index 000000000000..208227825044 +index 000000000..208227825 --- /dev/null +++ b/include/dt-bindings/memory/rv1126-dram.h @@ -0,0 +1,161 @@ @@ -1486941,7 +1488155,7 @@ index 000000000000..208227825044 +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RV1126_H*/ 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 +index 000000000..553c33579 --- /dev/null +++ b/include/dt-bindings/pinctrl/rockchip-rk3036.h @@ -0,0 +1,267 @@ @@ -1487214,7 +1488428,7 @@ index 000000000000..553c33579065 +#endif diff --git a/include/dt-bindings/pinctrl/rockchip-rk312x.h b/include/dt-bindings/pinctrl/rockchip-rk312x.h new file mode 100755 -index 000000000000..e0fa5976c18f +index 000000000..e0fa5976c --- /dev/null +++ b/include/dt-bindings/pinctrl/rockchip-rk312x.h @@ -0,0 +1,384 @@ @@ -1487604,7 +1488818,7 @@ index 000000000000..e0fa5976c18f +#endif diff --git a/include/dt-bindings/pinctrl/rockchip-rk3188.h b/include/dt-bindings/pinctrl/rockchip-rk3188.h new file mode 100755 -index 000000000000..58bba225d1de +index 000000000..58bba225d --- /dev/null +++ b/include/dt-bindings/pinctrl/rockchip-rk3188.h @@ -0,0 +1,457 @@ @@ -1488067,7 +1489281,7 @@ index 000000000000..58bba225d1de +#endif diff --git a/include/dt-bindings/pinctrl/rockchip-rk3288.h b/include/dt-bindings/pinctrl/rockchip-rk3288.h new file mode 100755 -index 000000000000..97aa66e2b329 +index 000000000..97aa66e2b --- /dev/null +++ b/include/dt-bindings/pinctrl/rockchip-rk3288.h @@ -0,0 +1,666 @@ @@ -1488739,7 +1489953,7 @@ index 000000000000..97aa66e2b329 +#endif diff --git a/include/dt-bindings/power/rk1808-power.h b/include/dt-bindings/power/rk1808-power.h new file mode 100755 -index 000000000000..32342c1e7ded +index 000000000..32342c1e7 --- /dev/null +++ b/include/dt-bindings/power/rk1808-power.h @@ -0,0 +1,20 @@ @@ -1488765,7 +1489979,7 @@ index 000000000000..32342c1e7ded +#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 +index 000000000..6cc1af1a9 --- /dev/null +++ b/include/dt-bindings/power/rk3568-power.h @@ -0,0 +1,32 @@ @@ -1488803,7 +1490017,7 @@ index 000000000000..6cc1af1a9d26 +#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 +index 000000000..3e2101036 --- /dev/null +++ b/include/dt-bindings/power/rv1126-power.h @@ -0,0 +1,34 @@ @@ -1488843,7 +1490057,7 @@ index 000000000000..3e210103646f +#endif diff --git a/include/dt-bindings/reset/rk628-rgu.h b/include/dt-bindings/reset/rk628-rgu.h new file mode 100755 -index 000000000000..e0c714bef00c +index 000000000..e0c714bef --- /dev/null +++ b/include/dt-bindings/reset/rk628-rgu.h @@ -0,0 +1,43 @@ @@ -1488892,7 +1490106,7 @@ index 000000000000..e0c714bef00c +#endif diff --git a/include/dt-bindings/sensor-dev.h b/include/dt-bindings/sensor-dev.h new file mode 100755 -index 000000000000..e03f0027d325 +index 000000000..e03f0027d --- /dev/null +++ b/include/dt-bindings/sensor-dev.h @@ -0,0 +1,18 @@ @@ -1488915,7 +1490129,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..1436e1d32619 100644 +index 4b0914c09..1436e1d32 100644 --- a/include/dt-bindings/soc/rockchip,boot-mode.h +++ b/include/dt-bindings/soc/rockchip,boot-mode.h @@ -10,7 +10,15 @@ @@ -1488937,7 +1490151,7 @@ index 4b0914c0989d..1436e1d32619 100644 #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..837a1a969c78 +index 000000000..837a1a969 --- /dev/null +++ b/include/dt-bindings/soc/rockchip-system-status.h @@ -0,0 +1,48 @@ @@ -1488991,7 +1490205,7 @@ index 000000000000..837a1a969c78 +#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 +index 000000000..4362028f6 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-px30.h @@ -0,0 +1,53 @@ @@ -1489050,7 +1490264,7 @@ index 000000000000..4362028f677c +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk1808.h b/include/dt-bindings/suspend/rockchip-rk1808.h new file mode 100755 -index 000000000000..3d565faabf4d +index 000000000..3d565faab --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk1808.h @@ -0,0 +1,46 @@ @@ -1489102,7 +1490316,7 @@ index 000000000000..3d565faabf4d +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk322x.h b/include/dt-bindings/suspend/rockchip-rk322x.h new file mode 100755 -index 000000000000..882ae053fa22 +index 000000000..882ae053f --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk322x.h @@ -0,0 +1,57 @@ @@ -1489165,7 +1490379,7 @@ index 000000000000..882ae053fa22 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3288.h b/include/dt-bindings/suspend/rockchip-rk3288.h new file mode 100755 -index 000000000000..d07cced43877 +index 000000000..d07cced43 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3288.h @@ -0,0 +1,59 @@ @@ -1489230,7 +1490444,7 @@ index 000000000000..d07cced43877 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3308.h b/include/dt-bindings/suspend/rockchip-rk3308.h new file mode 100755 -index 000000000000..a3e015e2209a +index 000000000..a3e015e22 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3308.h @@ -0,0 +1,104 @@ @@ -1489340,7 +1490554,7 @@ index 000000000000..a3e015e2209a +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3328.h b/include/dt-bindings/suspend/rockchip-rk3328.h new file mode 100755 -index 000000000000..972f8bb5e281 +index 000000000..972f8bb5e --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3328.h @@ -0,0 +1,19 @@ @@ -1489365,7 +1490579,7 @@ index 000000000000..972f8bb5e281 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3368.h b/include/dt-bindings/suspend/rockchip-rk3368.h new file mode 100755 -index 000000000000..9873f8236a8b +index 000000000..9873f8236 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3368.h @@ -0,0 +1,56 @@ @@ -1489427,7 +1490641,7 @@ index 000000000000..9873f8236a8b +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3399.h b/include/dt-bindings/suspend/rockchip-rk3399.h new file mode 100755 -index 000000000000..176c7cfcd989 +index 000000000..176c7cfcd --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3399.h @@ -0,0 +1,61 @@ @@ -1489494,7 +1490708,7 @@ index 000000000000..176c7cfcd989 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3568.h b/include/dt-bindings/suspend/rockchip-rk3568.h new file mode 100755 -index 000000000000..91e89f64a067 +index 000000000..91e89f64a --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3568.h @@ -0,0 +1,57 @@ @@ -1489557,7 +1490771,7 @@ index 000000000000..91e89f64a067 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rv1126.h b/include/dt-bindings/suspend/rockchip-rv1126.h new file mode 100755 -index 000000000000..7c28c2bd7619 +index 000000000..7c28c2bd7 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rv1126.h @@ -0,0 +1,46 @@ @@ -1489609,7 +1490823,7 @@ index 000000000000..7c28c2bd7619 +#endif diff --git a/include/linux/android_kabi.h b/include/linux/android_kabi.h new file mode 100755 -index 000000000000..efa52953fe35 +index 000000000..efa52953f --- /dev/null +++ b/include/linux/android_kabi.h @@ -0,0 +1,113 @@ @@ -1489727,7 +1490941,7 @@ index 000000000000..efa52953fe35 + +#endif /* _ANDROID_KABI_H */ diff --git a/include/linux/bpf.h b/include/linux/bpf.h -index 474a0d852614..1f62a4eec283 100644 +index 88245386a..89b07eaf4 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -173,7 +173,7 @@ struct bpf_map { @@ -1489739,7 +1490953,7 @@ index 474a0d852614..1f62a4eec283 100644 }; static inline bool map_value_has_spin_lock(const struct bpf_map *map) -@@ -1252,7 +1252,6 @@ void bpf_map_charge_move(struct bpf_map_memory *dst, +@@ -1273,7 +1273,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); @@ -1489748,7 +1490962,7 @@ index 474a0d852614..1f62a4eec283 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 03a5de5f9..d9897d0b1 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -599,6 +599,7 @@ struct clk_divider { @@ -1489804,7 +1491018,7 @@ index 03a5de5f99f4..d9897d0b10a2 100644 const struct clk_ops *rate_ops; diff --git a/include/linux/clk/rockchip.h b/include/linux/clk/rockchip.h new file mode 100755 -index 000000000000..07c563a42c60 +index 000000000..07c563a42 --- /dev/null +++ b/include/linux/clk/rockchip.h @@ -0,0 +1,18 @@ @@ -1489827,7 +1491041,7 @@ index 000000000000..07c563a42c60 + +#endif /* __LINUX_CLK_ROCKCHIP_H_ */ diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h -index acbad3b36322..54ee25053219 100644 +index acbad3b36..54ee25053 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -1023,14 +1023,6 @@ static inline bool policy_has_boost_freq(struct cpufreq_policy *policy) @@ -1489847,7 +1491061,7 @@ index acbad3b36322..54ee25053219 100644 diff --git a/include/linux/cpufreq_times.h b/include/linux/cpufreq_times.h new file mode 100755 -index 000000000000..38272a5f3163 +index 000000000..38272a5f3 --- /dev/null +++ b/include/linux/cpufreq_times.h @@ -0,0 +1,42 @@ @@ -1489894,7 +1491108,7 @@ index 000000000000..38272a5f3163 +#endif /* CONFIG_CPU_FREQ_TIMES */ +#endif /* _LINUX_CPUFREQ_TIMES_H */ diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h -index 04c20de66afc..2713db8395f6 100644 +index 04c20de66..2713db839 100644 --- a/include/linux/cpuset.h +++ b/include/linux/cpuset.h @@ -15,6 +15,7 @@ @@ -1489948,7 +1491162,7 @@ index 04c20de66afc..2713db8395f6 100644 #endif /* _LINUX_CPUSET_H */ diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h -index 957b398d30e5..f1242b50f627 100644 +index 957b398d3..f1242b50f 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -209,6 +209,41 @@ struct dma_buf_ops { @@ -1490147,7 +1491361,7 @@ index 957b398d30e5..f1242b50f627 100644 + #endif /* __DMA_BUF_H__ */ 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) {} @@ -1490161,7 +1491375,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 454e354d1ffb..e8f0e92c27dd 100644 +index 454e354d1..e8f0e92c2 100644 --- a/include/linux/dma-heap.h +++ b/include/linux/dma-heap.h @@ -16,15 +16,17 @@ struct dma_heap; @@ -1490260,7 +1491474,7 @@ index 454e354d1ffb..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, @@ -1490293,7 +1491507,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 a5f89fc4d..84c14dbcd 100644 --- a/include/linux/dma-map-ops.h +++ b/include/linux/dma-map-ops.h @@ -8,6 +8,7 @@ @@ -1490332,7 +1491546,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 @@ @@ -1490360,7 +1491574,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 dd357a747..493a047ed 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -418,6 +418,9 @@ enum dma_slave_buswidth { @@ -1490383,7 +1491597,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 { @@ -1490434,7 +1491648,7 @@ index 5f04a2b35e80..9ca1ea02fa72 100644 return -EINVAL; } diff --git a/include/linux/extcon.h b/include/linux/extcon.h -index 0c19010da77f..9c4ff7f7df29 100644 +index 0c19010da..9c4ff7f7d 100644 --- a/include/linux/extcon.h +++ b/include/linux/extcon.h @@ -37,6 +37,7 @@ @@ -1490446,7 +1491660,7 @@ index 0c19010da77f..9c4ff7f7df29 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) @@ -1490471,7 +1491685,7 @@ index 27828145ca09..f753c307b8b3 100644 diff --git a/include/linux/initramfs.h b/include/linux/initramfs.h new file mode 100755 -index 000000000000..26953171620f +index 000000000..269531716 --- /dev/null +++ b/include/linux/initramfs.h @@ -0,0 +1,40 @@ @@ -1490516,7 +1491730,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 @@ @@ -1490606,7 +1491820,7 @@ index e90c267e7f3e..f94cfde78201 100644 /** diff --git a/include/linux/iova.h b/include/linux/iova.h -index a0637abffee8..58713bb72a48 100644 +index a0637abff..58713bb72 100644 --- a/include/linux/iova.h +++ b/include/linux/iova.h @@ -95,6 +95,7 @@ struct iova_domain { @@ -1490618,7 +1491832,7 @@ index a0637abffee8..58713bb72a48 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) @@ -1490631,7 +1491845,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 6976b8331..943c3411c 100644 --- a/include/linux/irqchip/arm-gic-v4.h +++ b/include/linux/irqchip/arm-gic-v4.h @@ -39,6 +39,8 @@ struct its_vpe { @@ -1490660,7 +1491874,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 1a8d25f2e041..de15a4d153a4 100644 +index 1a8d25f2e..de15a4d15 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -25,6 +25,10 @@ extern unsigned long max_pfn; @@ -1490758,7 +1491972,7 @@ index 1a8d25f2e041..de15a4d153a4 100644 } diff --git a/include/linux/memory_group_manager.h b/include/linux/memory_group_manager.h new file mode 100755 -index 000000000000..b1ac253d9e15 +index 000000000..b1ac253d9 --- /dev/null +++ b/include/linux/memory_group_manager.h @@ -0,0 +1,198 @@ @@ -1490961,7 +1492175,7 @@ index 000000000000..b1ac253d9e15 + +#endif /* _MEMORY_GROUP_MANAGER_H_ */ diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h -index e07f6e61cd38..917174f8c2eb 100644 +index e07f6e61c..7cdc5dfa4 100644 --- a/include/linux/mfd/rk808.h +++ b/include/linux/mfd/rk808.h @@ -113,6 +113,235 @@ enum rk808_reg { @@ -1491484,7 +1492698,7 @@ index e07f6e61cd38..917174f8c2eb 100644 #define RK817_ID_MSB 0xed #define RK817_ID_LSB 0xee -@@ -609,16 +1047,26 @@ enum { +@@ -609,16 +1047,27 @@ enum { RK805_ID = 0x8050, RK808_ID = 0x0000, RK809_ID = 0x8090, @@ -1491508,11 +1492722,12 @@ index e07f6e61cd38..917174f8c2eb 100644 long variant; const struct regmap_config *regmap_cfg; const struct regmap_irq_chip *regmap_irq_chip; ++ void (*pm_pwroff_prep_fn)(void); + struct rk808_pin_info *pins; }; #endif /* __LINUX_REGULATOR_RK808_H */ diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h -index 40d7e98fc990..819f6119dff3 100644 +index 40d7e98fc..819f6119d 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -141,6 +141,7 @@ struct mmc_host_ops { @@ -1491534,7 +1492749,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 @@ @@ -1491552,7 +1492767,7 @@ 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 +index 000000000..93c997f52 --- /dev/null +++ b/include/linux/phy/pcie.h @@ -0,0 +1,12 @@ @@ -1491570,7 +1492785,7 @@ index 000000000000..93c997f520fe +#endif diff --git a/include/linux/phy/phy-rockchip-typec.h b/include/linux/phy/phy-rockchip-typec.h new file mode 100755 -index 000000000000..1d6af83d3b89 +index 000000000..1d6af83d3 --- /dev/null +++ b/include/linux/phy/phy-rockchip-typec.h @@ -0,0 +1,34 @@ @@ -1491610,7 +1492825,7 @@ index 000000000000..1d6af83d3b89 +#endif diff --git a/include/linux/power/bq25700-charge.h b/include/linux/power/bq25700-charge.h new file mode 100755 -index 000000000000..5e7d3e40d2ea +index 000000000..5e7d3e40d --- /dev/null +++ b/include/linux/power/bq25700-charge.h @@ -0,0 +1,20 @@ @@ -1491636,7 +1492851,7 @@ index 000000000000..5e7d3e40d2ea +#endif /* __CHARGER_BQ25700_H_ */ diff --git a/include/linux/power/cw2015_battery.h b/include/linux/power/cw2015_battery.h new file mode 100755 -index 000000000000..8e6b1fc7e344 +index 000000000..8e6b1fc7e --- /dev/null +++ b/include/linux/power/cw2015_battery.h @@ -0,0 +1,119 @@ @@ -1491761,7 +1492976,7 @@ index 000000000000..8e6b1fc7e344 +#endif diff --git a/include/linux/power/rk_usbbc.h b/include/linux/power/rk_usbbc.h new file mode 100755 -index 000000000000..45f7128b3a69 +index 000000000..45f7128b3 --- /dev/null +++ b/include/linux/power/rk_usbbc.h @@ -0,0 +1,44 @@ @@ -1491810,7 +1493025,7 @@ index 000000000000..45f7128b3a69 + +#endif diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h -index 81a55e974feb..aefa0b0bc4c4 100644 +index 81a55e974..aefa0b0bc 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -49,6 +49,12 @@ enum { @@ -1491867,7 +1493082,7 @@ index 81a55e974feb..aefa0b0bc4c4 100644 enum power_supply_property psp); extern void power_supply_external_power_changed(struct power_supply *psy); diff --git a/include/linux/pwm.h b/include/linux/pwm.h -index a13ff383fa1d..6b2a7fb80de8 100644 +index a13ff383f..6b2a7fb80 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h @@ -59,6 +59,9 @@ struct pwm_state { @@ -1491881,7 +1493096,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 *); @@ -1491912,7 +1493127,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 11cade73726c..d7c77ee370f3 100644 +index 11cade737..d7c77ee37 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -223,6 +223,8 @@ enum regulator_type { @@ -1491933,7 +1493148,7 @@ index 11cade73726c..d7c77ee370f3 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 { @@ -1491947,7 +1493162,7 @@ index ce8df21863f0..e8703b6fc13d 100644 #endif /* __FAN53555_H__ */ diff --git a/include/linux/rfkill-bt.h b/include/linux/rfkill-bt.h new file mode 100755 -index 000000000000..c4174b156580 +index 000000000..c4174b156 --- /dev/null +++ b/include/linux/rfkill-bt.h @@ -0,0 +1,73 @@ @@ -1492026,7 +1493241,7 @@ index 000000000000..c4174b156580 + diff --git a/include/linux/rfkill-wlan.h b/include/linux/rfkill-wlan.h new file mode 100755 -index 000000000000..431e71a7a844 +index 000000000..431e71a7a --- /dev/null +++ b/include/linux/rfkill-wlan.h @@ -0,0 +1,62 @@ @@ -1492094,7 +1493309,7 @@ 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 +index 000000000..aee656daf --- /dev/null +++ b/include/linux/rk_keys.h @@ -0,0 +1,19 @@ @@ -1492119,7 +1493334,7 @@ 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 +index 000000000..3005c745e --- /dev/null +++ b/include/linux/rockchip-iovmm.h @@ -0,0 +1,91 @@ @@ -1492216,7 +1493431,7 @@ index 000000000000..3005c745e5b8 +#endif /*__ASM_PLAT_IOVMM_H*/ diff --git a/include/linux/rockchip/cpu.h b/include/linux/rockchip/cpu.h new file mode 100755 -index 000000000000..727a2d621745 +index 000000000..727a2d621 --- /dev/null +++ b/include/linux/rockchip/cpu.h @@ -0,0 +1,186 @@ @@ -1492408,7 +1493623,7 @@ index 000000000000..727a2d621745 +#endif diff --git a/include/linux/rockchip/grf.h b/include/linux/rockchip/grf.h new file mode 100755 -index 000000000000..fae51232297c +index 000000000..fae512322 --- /dev/null +++ b/include/linux/rockchip/grf.h @@ -0,0 +1,700 @@ @@ -1493114,7 +1494329,7 @@ index 000000000000..fae51232297c +#endif diff --git a/include/linux/rockchip/psci.h b/include/linux/rockchip/psci.h new file mode 100755 -index 000000000000..870da27edf65 +index 000000000..870da27ed --- /dev/null +++ b/include/linux/rockchip/psci.h @@ -0,0 +1,76 @@ @@ -1493196,7 +1494411,7 @@ index 000000000000..870da27edf65 +#endif /* __ROCKCHIP_PSCI_H */ diff --git a/include/linux/rockchip/rockchip_sip.h b/include/linux/rockchip/rockchip_sip.h new file mode 100755 -index 000000000000..4331aa089ba0 +index 000000000..4331aa089 --- /dev/null +++ b/include/linux/rockchip/rockchip_sip.h @@ -0,0 +1,331 @@ @@ -1493533,7 +1494748,7 @@ index 000000000000..4331aa089ba0 +#endif diff --git a/include/linux/rockchip_ion.h b/include/linux/rockchip_ion.h new file mode 100755 -index 000000000000..39c497774fb0 +index 000000000..39c497774 --- /dev/null +++ b/include/linux/rockchip_ion.h @@ -0,0 +1,41 @@ @@ -1493579,10 +1494794,10 @@ index 000000000000..39c497774fb0 + +#endif diff --git a/include/linux/sched.h b/include/linux/sched.h -index b85b26d9ccef..8bd0121dfbe0 100644 +index 53198ac3d..4ab5d3e2f 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -717,6 +717,10 @@ struct task_struct { +@@ -718,6 +718,10 @@ struct task_struct { struct uclamp_se uclamp[UCLAMP_CNT]; #endif @@ -1493593,7 +1494808,7 @@ index b85b26d9ccef..8bd0121dfbe0 100644 #ifdef CONFIG_PREEMPT_NOTIFIERS /* List of struct preempt_notifier: */ struct hlist_head preempt_notifiers; -@@ -896,6 +900,10 @@ struct task_struct { +@@ -897,6 +901,10 @@ struct task_struct { u64 stimescaled; #endif u64 gtime; @@ -1493604,7 +1494819,7 @@ index b85b26d9ccef..8bd0121dfbe0 100644 struct prev_cputime prev_cputime; #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN struct vtime vtime; -@@ -1007,6 +1015,7 @@ struct task_struct { +@@ -1008,6 +1016,7 @@ struct task_struct { raw_spinlock_t pi_lock; struct wake_q_node wake_q; @@ -1493612,7 +1494827,7 @@ index b85b26d9ccef..8bd0121dfbe0 100644 #ifdef CONFIG_RT_MUTEXES /* PI waiters blocked on a rt_mutex held by this task: */ -@@ -1227,7 +1236,7 @@ struct task_struct { +@@ -1228,7 +1237,7 @@ struct task_struct { u64 timer_slack_ns; u64 default_timer_slack_ns; @@ -1493621,7 +1494836,7 @@ index b85b26d9ccef..8bd0121dfbe0 100644 unsigned int kasan_depth; #endif -@@ -1659,9 +1668,20 @@ current_restore_flags(unsigned long orig_flags, unsigned long flags) +@@ -1664,9 +1673,20 @@ current_restore_flags(unsigned long orig_flags, unsigned long flags) extern int cpuset_cpumask_can_shrink(const struct cpumask *cur, const struct cpumask *trial); extern int task_can_attach(struct task_struct *p, const struct cpumask *cs_cpus_allowed); @@ -1493643,7 +1494858,7 @@ index b85b26d9ccef..8bd0121dfbe0 100644 static inline void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask) { diff --git a/include/linux/sched/hotplug.h b/include/linux/sched/hotplug.h -index 9a62ffdd296f..89fb9b0278b0 100644 +index 9a62ffdd2..89fb9b027 100644 --- a/include/linux/sched/hotplug.h +++ b/include/linux/sched/hotplug.h @@ -8,7 +8,11 @@ @@ -1493659,7 +1494874,7 @@ index 9a62ffdd296f..89fb9b0278b0 100644 #ifdef CONFIG_HOTPLUG_CPU extern int sched_cpu_dying(unsigned int cpu); diff --git a/include/linux/sched/signal.h b/include/linux/sched/signal.h -index 657640015b33..fd534cbfa3ac 100644 +index 657640015..fd534cbfa 100644 --- a/include/linux/sched/signal.h +++ b/include/linux/sched/signal.h @@ -12,6 +12,7 @@ @@ -1493671,7 +1494886,7 @@ index 657640015b33..fd534cbfa3ac 100644 /* * Types defining task->signal and task->sighand and APIs using them: diff --git a/include/linux/sched/wake_q.h b/include/linux/sched/wake_q.h -index 26a2013ac39c..1e05e5669713 100644 +index 26a2013ac..1e05e5669 100644 --- a/include/linux/sched/wake_q.h +++ b/include/linux/sched/wake_q.h @@ -38,6 +38,7 @@ @@ -1493691,7 +1494906,7 @@ index 26a2013ac39c..1e05e5669713 100644 static inline bool wake_q_empty(struct wake_q_head *head) 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) @@ -1493719,7 +1494934,7 @@ index c078f0a94cec..9544c9d9d534 100644 #endif /* _LINUX_SCHED_XACCT_H */ diff --git a/include/linux/sensor-dev.h b/include/linux/sensor-dev.h new file mode 100755 -index 000000000000..6ae9c16e67a3 +index 000000000..6ae9c16e6 --- /dev/null +++ b/include/linux/sensor-dev.h @@ -0,0 +1,350 @@ @@ -1494075,7 +1495290,7 @@ index 000000000000..6ae9c16e67a3 + diff --git a/include/linux/soc/rockchip/pvtm.h b/include/linux/soc/rockchip/pvtm.h new file mode 100755 -index 000000000000..3d2495cfd6e5 +index 000000000..3d2495cfd --- /dev/null +++ b/include/linux/soc/rockchip/pvtm.h @@ -0,0 +1,17 @@ @@ -1494098,7 +1495313,7 @@ index 000000000000..3d2495cfd6e5 +#endif /* __SOC_ROCKCHIP_PVTM_H */ diff --git a/include/linux/soc/rockchip/rk_fiq_debugger.h b/include/linux/soc/rockchip/rk_fiq_debugger.h new file mode 100755 -index 000000000000..f5ec8d143b22 +index 000000000..f5ec8d143 --- /dev/null +++ b/include/linux/soc/rockchip/rk_fiq_debugger.h @@ -0,0 +1,22 @@ @@ -1494126,7 +1495341,7 @@ index 000000000000..f5ec8d143b22 +#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..33033a4cfe9f +index 000000000..33033a4cf --- /dev/null +++ b/include/linux/soc/rockchip/rk_vendor_storage.h @@ -0,0 +1,58 @@ @@ -1494190,7 +1495405,7 @@ index 000000000000..33033a4cfe9f +#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..dff419bd793b +index 000000000..dff419bd7 --- /dev/null +++ b/include/linux/soc/rockchip/rockchip_decompress.h @@ -0,0 +1,22 @@ @@ -1494218,7 +1495433,7 @@ index 000000000000..dff419bd793b +#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 +index 000000000..2fe176649 --- /dev/null +++ b/include/linux/soc/rockchip/rockchip_thunderboot_crypto.h @@ -0,0 +1,9 @@ @@ -1494232,7 +1495447,7 @@ index 000000000000..2fe176649409 + +#endif diff --git a/include/linux/stop_machine.h b/include/linux/stop_machine.h -index 63ea9aff368f..ddafb3cf4f48 100644 +index 63ea9aff3..ddafb3cf4 100644 --- a/include/linux/stop_machine.h +++ b/include/linux/stop_machine.h @@ -28,6 +28,16 @@ struct cpu_stop_work { @@ -1494264,7 +1495479,7 @@ index 63ea9aff368f..ddafb3cf4f48 100644 #else /* CONFIG_SMP */ diff --git a/include/linux/thermal.h b/include/linux/thermal.h -index 176d9454e8f3..aa4b4114bb01 100644 +index 176d9454e..aa4b4114b 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -399,6 +399,7 @@ void thermal_cdev_update(struct thermal_cooling_device *); @@ -1494287,7 +1495502,7 @@ index 176d9454e8f3..aa4b4114bb01 100644 #endif /* __THERMAL_H__ */ diff --git a/include/linux/usb/audio-v2.h b/include/linux/usb/audio-v2.h -index ead8c9a47c6a..899c84e7c738 100644 +index ead8c9a47..899c84e7c 100644 --- a/include/linux/usb/audio-v2.h +++ b/include/linux/usb/audio-v2.h @@ -168,6 +168,20 @@ struct uac2_effect_unit_descriptor { @@ -1494322,7 +1495537,7 @@ index ead8c9a47c6a..899c84e7c738 100644 #define UAC2_PE_UNDEFINED 0x00 #define UAC2_PE_ENABLE 0x01 diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h -index 170acd500ea1..646cb0a8dcd6 100644 +index 170acd500..646cb0a8d 100644 --- a/include/linux/usb/audio.h +++ b/include/linux/usb/audio.h @@ -31,6 +31,7 @@ struct usb_audio_control { @@ -1494334,7 +1495549,7 @@ index 170acd500ea1..646cb0a8dcd6 100644 struct usb_audio_control_selector { diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h -index 604c6c514a50..1cffa34740b0 100644 +index 604c6c514..1cffa3474 100644 --- a/include/linux/usb/ch9.h +++ b/include/linux/usb/ch9.h @@ -36,62 +36,24 @@ @@ -1494413,7 +1495628,7 @@ index 604c6c514a50..1cffa34740b0 100644 __u8 bRequest, __u16 wValue, __u16 wIndex, __u16 wLength); 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, @@ -1494435,7 +1495650,7 @@ index a2d229ab63ba..4d352204e819 100644 void (*free_func_inst)(struct usb_function_instance *inst); diff --git a/include/linux/usb/f_accessory.h b/include/linux/usb/f_accessory.h new file mode 100755 -index 000000000000..ebe3c4d59309 +index 000000000..ebe3c4d59 --- /dev/null +++ b/include/linux/usb/f_accessory.h @@ -0,0 +1,23 @@ @@ -1494463,7 +1495678,7 @@ index 000000000000..ebe3c4d59309 + +#endif /* __LINUX_USB_F_ACCESSORY_H */ diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h -index e7351d64f11f..e0ba1f0c13e6 100644 +index e7351d64f..e0ba1f0c1 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -26,6 +26,7 @@ @@ -1494537,7 +1495752,7 @@ index e7351d64f11f..e0ba1f0c13e6 100644 #define work_to_gadget(w) (container_of((w), struct usb_gadget, work)) 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 { @@ -1494577,7 +1495792,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 { @@ -1494590,7 +1495805,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 @@ @@ -1495033,7 +1496248,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 @@ @@ -1495045,7 +1496260,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 { @@ -1495155,7 +1496370,7 @@ index 09762d26fa0c..cb69546f87af 100644 #endif /* __LINUX_USB_TCPM_H */ diff --git a/include/linux/usb/typec.h b/include/linux/usb/typec.h -index 6be558045942..91b4303ca305 100644 +index 6be558045..91b4303ca 100644 --- a/include/linux/usb/typec.h +++ b/include/linux/usb/typec.h @@ -126,9 +126,12 @@ struct typec_altmode_desc { @@ -1495249,7 +1496464,7 @@ index 6be558045942..91b4303ca305 100644 +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 5e0a7b764..65933cbe9 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) @@ -1495270,7 +1496485,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 { @@ -1495292,7 +1496507,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 { @@ -1495306,7 +1496521,7 @@ index 8110c29fab42..2e4f7721fc4e 100644 static inline struct usb_driver *driver_of(struct usb_interface *intf) diff --git a/include/linux/wakelock.h b/include/linux/wakelock.h new file mode 100755 -index 000000000000..7b4825ba9521 +index 000000000..7b4825ba9 --- /dev/null +++ b/include/linux/wakelock.h @@ -0,0 +1,76 @@ @@ -1495388,7 +1496603,7 @@ 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 +index 000000000..54f5caaa5 --- /dev/null +++ b/include/linux/wakeup_reason.h @@ -0,0 +1,37 @@ @@ -1495431,7 +1496646,7 @@ index 000000000000..54f5caaa5cde +#endif /* _LINUX_WAKEUP_REASON_H */ diff --git a/include/soc/rockchip/android-version.h b/include/soc/rockchip/android-version.h new file mode 100755 -index 000000000000..e0d865bab335 +index 000000000..e0d865bab --- /dev/null +++ b/include/soc/rockchip/android-version.h @@ -0,0 +1,17 @@ @@ -1495454,7 +1496669,7 @@ index 000000000000..e0d865bab335 +#endif diff --git a/include/soc/rockchip/pm_domains.h b/include/soc/rockchip/pm_domains.h new file mode 100755 -index 000000000000..78c4f37246e8 +index 000000000..78c4f3724 --- /dev/null +++ b/include/soc/rockchip/pm_domains.h @@ -0,0 +1,38 @@ @@ -1495498,7 +1496713,7 @@ index 000000000000..78c4f37246e8 +#endif diff --git a/include/soc/rockchip/rk3368-mailbox.h b/include/soc/rockchip/rk3368-mailbox.h new file mode 100755 -index 000000000000..77208277f419 +index 000000000..77208277f --- /dev/null +++ b/include/soc/rockchip/rk3368-mailbox.h @@ -0,0 +1,22 @@ @@ -1495526,7 +1496741,7 @@ index 000000000000..77208277f419 +#endif /* __RK3368_MAILBOX_H__ */ diff --git a/include/soc/rockchip/rkfb_dmc.h b/include/soc/rockchip/rkfb_dmc.h new file mode 100755 -index 000000000000..5e82b3194dd3 +index 000000000..5e82b3194 --- /dev/null +++ b/include/soc/rockchip/rkfb_dmc.h @@ -0,0 +1,11 @@ @@ -1495543,7 +1496758,7 @@ index 000000000000..5e82b3194dd3 +#endif diff --git a/include/soc/rockchip/rockchip-system-status.h b/include/soc/rockchip/rockchip-system-status.h new file mode 100755 -index 000000000000..200b1ee89602 +index 000000000..200b1ee89 --- /dev/null +++ b/include/soc/rockchip/rockchip-system-status.h @@ -0,0 +1,53 @@ @@ -1495602,7 +1496817,7 @@ index 000000000000..200b1ee89602 +#endif diff --git a/include/soc/rockchip/rockchip_dmc.h b/include/soc/rockchip/rockchip_dmc.h new file mode 100755 -index 000000000000..1076b3a7c152 +index 000000000..1076b3a7c --- /dev/null +++ b/include/soc/rockchip/rockchip_dmc.h @@ -0,0 +1,77 @@ @@ -1495685,7 +1496900,7 @@ index 000000000000..1076b3a7c152 +#endif diff --git a/include/soc/rockchip/rockchip_ipa.h b/include/soc/rockchip/rockchip_ipa.h new file mode 100755 -index 000000000000..cb333f463c7b +index 000000000..cb333f463 --- /dev/null +++ b/include/soc/rockchip/rockchip_ipa.h @@ -0,0 +1,40 @@ @@ -1495731,7 +1496946,7 @@ index 000000000000..cb333f463c7b +#endif diff --git a/include/soc/rockchip/rockchip_opp_select.h b/include/soc/rockchip/rockchip_opp_select.h new file mode 100755 -index 000000000000..e31c36c7f506 +index 000000000..e31c36c7f --- /dev/null +++ b/include/soc/rockchip/rockchip_opp_select.h @@ -0,0 +1,116 @@ @@ -1495852,7 +1497067,7 @@ index 000000000000..e31c36c7f506 + +#endif diff --git a/include/soc/rockchip/rockchip_sip.h b/include/soc/rockchip/rockchip_sip.h -index c46a9ae2a2ab..1be62bb7a68a 100644 +index c46a9ae2a..1be62bb7a 100644 --- a/include/soc/rockchip/rockchip_sip.h +++ b/include/soc/rockchip/rockchip_sip.h @@ -15,6 +15,11 @@ @@ -1495870,7 +1497085,7 @@ index c46a9ae2a2ab..1be62bb7a68a 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..2a4b05f7e8ba +index 000000000..2a4b05f7e --- /dev/null +++ b/include/soc/rockchip/rockchip_system_monitor.h @@ -0,0 +1,200 @@ @@ -1496076,7 +1497291,7 @@ index 000000000000..2a4b05f7e8ba +#endif diff --git a/include/soc/rockchip/scpi.h b/include/soc/rockchip/scpi.h new file mode 100755 -index 000000000000..ad1a4e51a4dd +index 000000000..ad1a4e51a --- /dev/null +++ b/include/soc/rockchip/scpi.h @@ -0,0 +1,147 @@ @@ -1496228,7 +1497443,7 @@ index 000000000000..ad1a4e51a4dd +#endif +#endif 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, @@ -1496261,7 +1497476,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 c96a4337afe6..bcd7f1fbb8cd 100644 +index c96a4337a..bcd7f1fbb 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h @@ -198,6 +198,7 @@ TRACE_EVENT(sched_migrate_task, @@ -1496321,7 +1497536,7 @@ index c96a4337afe6..bcd7f1fbb8cd 100644 * on a CPU). 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 +index 000000000..a3a932c75 --- /dev/null +++ b/include/trace/events/thermal_ipa_power.h @@ -0,0 +1,47 @@ @@ -1496373,7 +1497588,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 5498d7a6556a..5b5db0381729 100644 +index 5498d7a65..5b5db0381 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -242,6 +242,8 @@ extern "C" { @@ -1496387,7 +1497602,7 @@ index 5498d7a6556a..5b5db0381729 100644 * 2 plane YCbCr MSB aligned diff --git a/include/uapi/drm/rockchip_drm.h b/include/uapi/drm/rockchip_drm.h new file mode 100755 -index 000000000000..aff0e49fb682 +index 000000000..aff0e49fb --- /dev/null +++ b/include/uapi/drm/rockchip_drm.h @@ -0,0 +1,132 @@ @@ -1496524,7 +1497739,7 @@ index 000000000000..aff0e49fb682 + +#endif /* _UAPI_ROCKCHIP_DRM_H */ diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h -index 84fa53ffb13f..096f891d4ca2 100644 +index 84fa53ffb..096f891d4 100644 --- a/include/uapi/linux/media-bus-format.h +++ b/include/uapi/linux/media-bus-format.h @@ -34,7 +34,7 @@ @@ -1496548,7 +1497763,7 @@ index 84fa53ffb13f..096f891d4ca2 100644 /* YUV (including grey) - next is 0x202e */ #define MEDIA_BUS_FMT_Y8_1X8 0x2001 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 @@ @@ -1496560,7 +1497775,7 @@ index f51bc8f36813..7e3fe68af328 100644 #define UART_IIR 2 /* In: Interrupt ID Register */ #define UART_IIR_NO_INT 0x01 /* No interrupts pending */ diff --git a/include/uapi/linux/usb/ch9.h b/include/uapi/linux/usb/ch9.h -index 0f865ae4ba89..17ce56198c9a 100644 +index 0f865ae4b..17ce56198 100644 --- a/include/uapi/linux/usb/ch9.h +++ b/include/uapi/linux/usb/ch9.h @@ -968,9 +968,22 @@ struct usb_ssp_cap_descriptor { @@ -1496588,7 +1497803,7 @@ index 0f865ae4ba89..17ce56198c9a 100644 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 +index 000000000..0baeb7d0d --- /dev/null +++ b/include/uapi/linux/usb/f_accessory.h @@ -0,0 +1,146 @@ @@ -1496739,7 +1497954,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 @@ @@ -1496754,7 +1497969,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 bfdae12cdacf..b82436fd9140 100644 +index bfdae12cd..b82436fd9 100644 --- a/include/uapi/linux/usb/video.h +++ b/include/uapi/linux/usb/video.h @@ -567,5 +567,63 @@ struct UVC_FRAME_MJPEG(n) { \ @@ -1496822,7 +1498037,7 @@ index bfdae12cdacf..b82436fd9140 100644 #endif /* __LINUX_USB_VIDEO_H */ diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index 534eaa4d39bc..eb01fb549b5c 100644 +index 534eaa4d3..eb01fb549 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -689,6 +689,7 @@ struct v4l2_pix_format { @@ -1496834,7 +1498049,7 @@ index 534eaa4d39bc..eb01fb549b5c 100644 #define V4L2_PIX_FMT_H264_NO_SC v4l2_fourcc('A', 'V', 'C', '1') /* H264 without start codes */ #define V4L2_PIX_FMT_H264_MVC v4l2_fourcc('M', '2', '6', '4') /* H264 MVC */ diff --git a/init/Kconfig b/init/Kconfig -index fc4c9f416fad..e4b7df427afc 100644 +index fc4c9f416..e4b7df427 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1284,6 +1284,12 @@ if BLK_DEV_INITRD @@ -1496851,7 +1498066,7 @@ index fc4c9f416fad..e4b7df427afc 100644 config BOOT_CONFIG diff --git a/init/initramfs.c b/init/initramfs.c -index 55b74d7e5260..f4c4e2404dfd 100644 +index 55b74d7e5..f4c4e2404 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -12,6 +12,7 @@ @@ -1496897,10 +1498112,10 @@ index 55b74d7e5260..f4c4e2404dfd 100644 rootfs_initcall(populate_rootfs); +#endif diff --git a/init/main.c b/init/main.c -index dd26a42e80a8..2e1b45a77bc2 100644 +index 63cdf49f7..d1118b3f2 100644 --- a/init/main.c +++ b/init/main.c -@@ -1516,6 +1516,10 @@ static noinline void __init kernel_init_freeable(void) +@@ -1518,6 +1518,10 @@ static noinline void __init kernel_init_freeable(void) smp_init(); sched_init_smp(); @@ -1496911,7 +1498126,7 @@ index dd26a42e80a8..2e1b45a77bc2 100644 padata_init(); page_alloc_init_late(); /* Initialize page ext after all struct pages are initialized. */ -@@ -1525,6 +1529,10 @@ static noinline void __init kernel_init_freeable(void) +@@ -1527,6 +1531,10 @@ static noinline void __init kernel_init_freeable(void) kunit_run_all_tests(); @@ -1496923,7 +1498138,7 @@ index dd26a42e80a8..2e1b45a77bc2 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) @@ -1496936,7 +1498151,7 @@ index 8ded6b8f10a2..6e6c8e0c9380 100644 return -ENOMEM; diff --git a/ipc/sem.c b/ipc/sem.c -index d3b9b73cd9ca..7d9c06b0ad6e 100644 +index d3b9b73cd..7d9c06b0a 100644 --- a/ipc/sem.c +++ b/ipc/sem.c @@ -511,7 +511,7 @@ static struct sem_array *sem_alloc(size_t nsems) @@ -1496977,7 +1498192,7 @@ index d3b9b73cd9ca..7d9c06b0ad6e 100644 return -ENOMEM; } diff --git a/ipc/shm.c b/ipc/shm.c -index fce0b7b12939..e25c7c6106bc 100644 +index fce0b7b12..e25c7c610 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -619,7 +619,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params) @@ -1496990,7 +1498205,7 @@ index fce0b7b12939..e25c7c6106bc 100644 return -ENOMEM; diff --git a/ipc/util.c b/ipc/util.c -index cc46cfa06e04..cfa0045e748d 100644 +index cc46cfa06..cfa0045e7 100644 --- a/ipc/util.c +++ b/ipc/util.c @@ -754,13 +754,21 @@ struct pid_namespace *ipc_seq_pid_ns(struct seq_file *s) @@ -1497020,7 +1498235,7 @@ index cc46cfa06e04..cfa0045e748d 100644 if (ipc != NULL) { rcu_read_lock(); diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index bb9a9cb1f321..5b6da64da46d 100644 +index bb9a9cb1f..5b6da64da 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -127,21 +127,6 @@ static struct bpf_map *find_and_alloc_map(union bpf_attr *attr) @@ -1497183,7 +1498398,7 @@ index bb9a9cb1f321..5b6da64da46d 100644 return err; } diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c -index 4215c2ff6aeb..0c26757ea7fb 100644 +index 4215c2ff6..0c26757ea 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -3486,22 +3486,7 @@ static void coerce_reg_to_size(struct bpf_reg_state *reg, int size) @@ -1497211,7 +1498426,7 @@ index 4215c2ff6aeb..0c26757ea7fb 100644 static int bpf_map_direct_read(struct bpf_map *map, int off, int size, u64 *val) diff --git a/kernel/cgroup/cgroup-internal.h b/kernel/cgroup/cgroup-internal.h -index bfbeabc17a9d..02f32b13d9e5 100644 +index bfbeabc17..02f32b13d 100644 --- a/kernel/cgroup/cgroup-internal.h +++ b/kernel/cgroup/cgroup-internal.h @@ -232,7 +232,8 @@ int cgroup_migrate(struct task_struct *leader, bool threadgroup, @@ -1497225,7 +1498440,7 @@ index bfbeabc17a9d..02f32b13d9e5 100644 void cgroup_procs_write_finish(struct task_struct *task, bool locked) __releases(&cgroup_threadgroup_rwsem); diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c -index 812dd4ed0129..0949f8805f63 100644 +index 88b72815a..8c519220d 100644 --- a/kernel/cgroup/cgroup-v1.c +++ b/kernel/cgroup/cgroup-v1.c @@ -497,7 +497,7 @@ static ssize_t __cgroup1_procs_write(struct kernfs_open_file *of, @@ -1497248,7 +1498463,7 @@ index 812dd4ed0129..0949f8805f63 100644 put_cred(tcred); if (ret) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c -index 017bfc698109..2bb58e5a4211 100644 +index 350297ad6..202895286 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -2345,6 +2345,7 @@ struct task_struct *cgroup_taskset_first(struct cgroup_taskset *tset, @@ -1497309,7 +1498524,7 @@ index 017bfc698109..2bb58e5a4211 100644 if (ret) goto out_unlock; diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c -index c33d70215079..19adc148f755 100644 +index c33d70215..19adc148f 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -334,26 +334,15 @@ static struct cpuset top_cpuset = { @@ -1497815,7 +1499030,7 @@ index c33d70215079..19adc148f755 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 = { @@ -1497824,7 +1499039,7 @@ index 08236798d173..081d026f13db 100644 }; +EXPORT_SYMBOL_GPL(freezer_cgrp_subsys); diff --git a/kernel/cpu.c b/kernel/cpu.c -index 67c22941b5f2..5add449f2788 100644 +index 67c22941b..5add449f2 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -32,12 +32,15 @@ @@ -1498179,7 +1499394,7 @@ index 67c22941b5f2..5add449f2788 100644 } pr_warn("Error taking CPU%d up: %d\n", cpu, error); diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c -index e2999a070a99..79cb6d063b80 100644 +index e2999a070..79cb6d063 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) @@ -1498191,7 +1499406,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 @@ -1498201,7 +1499416,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 be381eb6116a..5caf59d69331 100644 +index be381eb61..5caf59d69 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) @@ -1498267,7 +1499482,7 @@ index be381eb6116a..5caf59d69331 100644 dev_info(dev, "EM: created perf domain\n"); diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c -index 2fc7d509a34f..da0b41914177 100644 +index 2fc7d509a..da0b41914 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -326,7 +326,7 @@ static int create_image(int platform_mode) @@ -1498280,7 +1499495,7 @@ index 2fc7d509a34f..da0b41914177 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); @@ -1498293,7 +1499508,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 45b054b7b5ec..cc062308092b 100644 +index 45b054b7b..cc0623080 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c @@ -85,18 +85,21 @@ static int try_to_freeze_tasks(bool user_only) @@ -1498324,7 +1499539,7 @@ index 45b054b7b5ec..cc062308092b 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 46b1804c1ddf..a3491b29c5cc 100644 +index 46b1804c1..a3491b29c 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -1144,7 +1144,15 @@ void free_basic_memory_bitmaps(void) @@ -1498360,7 +1499575,7 @@ index 46b1804c1ddf..a3491b29c5cc 100644 pfn = memory_bm_next_pfn(bm); } diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c -index 32391acc806b..54595837730a 100644 +index 32391acc8..545958377 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -30,6 +30,7 @@ @@ -1498443,7 +1499658,7 @@ index 32391acc806b..54595837730a 100644 suspend_test_finish("suspend devices"); diff --git a/kernel/power/wakeup_reason.c b/kernel/power/wakeup_reason.c new file mode 100755 -index 000000000000..8fefaa3fdba2 +index 000000000..8fefaa3fd --- /dev/null +++ b/kernel/power/wakeup_reason.c @@ -0,0 +1,438 @@ @@ -1498886,7 +1500101,7 @@ index 000000000000..8fefaa3fdba2 + +late_initcall(wakeup_reason_init); diff --git a/kernel/reboot.c b/kernel/reboot.c -index af6f23d8bea1..bce629531d2a 100644 +index af6f23d8b..bce629531 100644 --- a/kernel/reboot.c +++ b/kernel/reboot.c @@ -215,6 +215,27 @@ void do_kernel_restart(char *cmd) @@ -1498918,7 +1500133,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 e4551d1736fa..e2d31233aaf8 100644 +index e4551d173..e2d31233a 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -41,8 +41,17 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(sched_overutilized_tp); @@ -1499842,7 +1501057,7 @@ index e4551d1736fa..e2d31233aaf8 100644 { } /* terminate */ }; diff --git a/kernel/sched/cpufreq.c b/kernel/sched/cpufreq.c -index 7c2fe50fd76d..3d5f5a80b401 100644 +index 7c2fe50fd..3d5f5a80b 100644 --- a/kernel/sched/cpufreq.c +++ b/kernel/sched/cpufreq.c @@ -75,3 +75,4 @@ bool cpufreq_this_cpu_can_update(struct cpufreq_policy *policy) @@ -1499851,7 +1501066,7 @@ index 7c2fe50fd76d..3d5f5a80b401 100644 } +EXPORT_SYMBOL_GPL(cpufreq_this_cpu_can_update); diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c -index 5e39da0ae086..7421b23177b3 100644 +index 5e39da0ae..7421b2317 100644 --- a/kernel/sched/cpufreq_schedutil.c +++ b/kernel/sched/cpufreq_schedutil.c @@ -277,6 +277,7 @@ unsigned long schedutil_cpu_util(int cpu, unsigned long util_cfs, @@ -1499900,7 +1501115,7 @@ index 5e39da0ae086..7421b23177b3 100644 -} -#endif diff --git a/kernel/sched/cpupri.c b/kernel/sched/cpupri.c -index 0033731a0797..cb11531945d9 100644 +index 0033731a0..cb1153194 100644 --- a/kernel/sched/cpupri.c +++ b/kernel/sched/cpupri.c @@ -41,8 +41,29 @@ static int convert_prio(int prio) @@ -1500009,7 +1501224,7 @@ index 0033731a0797..cb11531945d9 100644 +} +#endif diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c -index 5a55d2300452..1e1edea6affd 100644 +index 5a55d2300..1e1edea6a 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -2,6 +2,7 @@ @@ -1500057,7 +1501272,7 @@ index 5a55d2300452..1e1edea6affd 100644 #else /* !CONFIG_VIRT_CPU_ACCOUNTING_NATIVE: */ diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c -index 8255267ce323..cdcd87b3dc2d 100644 +index 8255267ce..cdcd87b3d 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -2381,9 +2381,13 @@ void dl_add_task_root_domain(struct task_struct *p) @@ -1500086,7 +1501301,7 @@ index 8255267ce323..cdcd87b3dc2d 100644 } diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c -index 70a578272436..9c95334d857e 100644 +index 70a578272..9c95334d8 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -48,10 +48,11 @@ static unsigned long nsec_low(unsigned long long nsec) @@ -1500111,7 +1501326,7 @@ index 70a578272436..9c95334d857e 100644 #undef SCHED_FEAT diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index c004e3b89c32..61d807022351 100644 +index c004e3b89..61d807022 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -36,6 +36,7 @@ @@ -1500350,7 +1501565,7 @@ index c004e3b89c32..61d807022351 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) @@ -1500362,7 +1501577,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..cd54fab42cf4 100644 +index 2c613e1cf..cd54fab42 100644 --- a/kernel/sched/pelt.c +++ b/kernel/sched/pelt.c @@ -28,6 +28,42 @@ @@ -1500426,7 +1501641,7 @@ index 2c613e1cff3a..cd54fab42cf4 100644 int __update_load_avg_se(u64 now, struct cfs_rq *cfs_rq, struct sched_entity *se) { diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c -index d50a31ecedee..24f189ff2855 100644 +index d50a31ece..24f189ff2 100644 --- a/kernel/sched/psi.c +++ b/kernel/sched/psi.c @@ -748,7 +748,7 @@ static void psi_group_change(struct psi_group *group, int cpu, @@ -1500439,10 +1501654,10 @@ index d50a31ecedee..24f189ff2855 100644 if (!*iter) diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c -index ad9bec90fb7a..47d415e62f73 100644 +index dae1e8eaa..24f859339 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c -@@ -1361,6 +1361,27 @@ static void dequeue_rt_entity(struct sched_rt_entity *rt_se, unsigned int flags) +@@ -1377,6 +1377,27 @@ static void dequeue_rt_entity(struct sched_rt_entity *rt_se, unsigned int flags) enqueue_top_rt_rq(&rq->rt); } @@ -1500470,7 +1501685,7 @@ index ad9bec90fb7a..47d415e62f73 100644 /* * Adding/removing a task to/from a priority array: */ -@@ -1368,13 +1389,15 @@ static void +@@ -1384,13 +1405,15 @@ static void enqueue_task_rt(struct rq *rq, struct task_struct *p, int flags) { struct sched_rt_entity *rt_se = &p->rt; @@ -1500487,7 +1501702,7 @@ index ad9bec90fb7a..47d415e62f73 100644 enqueue_pushable_task(rq, p); } -@@ -1425,12 +1448,38 @@ static void yield_task_rt(struct rq *rq) +@@ -1441,12 +1464,38 @@ static void yield_task_rt(struct rq *rq) #ifdef CONFIG_SMP static int find_lowest_rq(struct task_struct *task); @@ -1500526,7 +1501741,7 @@ index ad9bec90fb7a..47d415e62f73 100644 /* For anything but wake ups, just return the task_cpu */ if (sd_flag != SD_BALANCE_WAKE && sd_flag != SD_BALANCE_FORK) -@@ -1440,9 +1489,16 @@ select_task_rq_rt(struct task_struct *p, int cpu, int sd_flag, int flags) +@@ -1456,9 +1505,16 @@ select_task_rq_rt(struct task_struct *p, int cpu, int sd_flag, int flags) rcu_read_lock(); curr = READ_ONCE(rq->curr); /* unlocked access */ @@ -1500544,7 +1501759,7 @@ index ad9bec90fb7a..47d415e62f73 100644 * try to see if we can wake this RT task up on another * runqueue. Otherwise simply start this RT task * on its current runqueue. -@@ -1467,9 +1523,19 @@ select_task_rq_rt(struct task_struct *p, int cpu, int sd_flag, int flags) +@@ -1483,9 +1539,19 @@ select_task_rq_rt(struct task_struct *p, int cpu, int sd_flag, int flags) * requirement of the task - which is only important on heterogeneous * systems like big.LITTLE. */ @@ -1500567,7 +1501782,7 @@ index ad9bec90fb7a..47d415e62f73 100644 if (test || !rt_task_fits_capacity(p, cpu)) { int target = find_lowest_rq(p); -@@ -1482,11 +1548,14 @@ select_task_rq_rt(struct task_struct *p, int cpu, int sd_flag, int flags) +@@ -1498,11 +1564,14 @@ select_task_rq_rt(struct task_struct *p, int cpu, int sd_flag, int flags) goto out_unlock; /* @@ -1500584,7 +1501799,7 @@ index ad9bec90fb7a..47d415e62f73 100644 cpu = target; } -@@ -1666,7 +1735,7 @@ static int pick_rt_task(struct rq *rq, struct task_struct *p, int cpu) +@@ -1682,7 +1751,7 @@ static int pick_rt_task(struct rq *rq, struct task_struct *p, int cpu) * Return the highest pushable rq's task, which is suitable to be executed * on the CPU, NULL otherwise */ @@ -1500593,7 +1501808,7 @@ index ad9bec90fb7a..47d415e62f73 100644 { struct plist_head *head = &rq->rt.pushable_tasks; struct task_struct *p; -@@ -1681,6 +1750,7 @@ static struct task_struct *pick_highest_pushable_task(struct rq *rq, int cpu) +@@ -1697,6 +1766,7 @@ static struct task_struct *pick_highest_pushable_task(struct rq *rq, int cpu) return NULL; } @@ -1500601,7 +1501816,7 @@ index ad9bec90fb7a..47d415e62f73 100644 static DEFINE_PER_CPU(cpumask_var_t, local_cpu_mask); -@@ -1717,6 +1787,8 @@ static int find_lowest_rq(struct task_struct *task) +@@ -1733,6 +1803,8 @@ static int find_lowest_rq(struct task_struct *task) if (!ret) return -1; /* No targets found */ @@ -1500611,7 +1501826,7 @@ index ad9bec90fb7a..47d415e62f73 100644 * At this point we have built a mask of CPUs representing the * lowest priority tasks in the system. Now we want to elect 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 @@ @@ -1500647,7 +1501862,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 08db8e095e48..5109a91a651d 100644 +index 08db8e095..5109a91a6 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -431,6 +431,8 @@ struct task_group { @@ -1500789,7 +1502004,7 @@ index 08db8e095e48..5109a91a651d 100644 +} +#endif /* CONFIG_RT_SOFTINT_OPTIMIZATION */ diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c -index dd7770226086..285192e60599 100644 +index 004e9505f..a351e79fd 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -5,6 +5,9 @@ @@ -1500831,7 +1502046,7 @@ index dd7770226086..285192e60599 100644 tmp = pd_init(i); if (!tmp) diff --git a/kernel/sched/wait.c b/kernel/sched/wait.c -index 21005b980a6b..6cdf93634c29 100644 +index 21005b980..6cdf93634 100644 --- a/kernel/sched/wait.c +++ b/kernel/sched/wait.c @@ -389,7 +389,8 @@ void finish_wait(struct wait_queue_head *wq_head, struct wait_queue_entry *wq_en @@ -1500864,7 +1502079,7 @@ index 21005b980a6b..6cdf93634c29 100644 /* Pairs with the smp_store_mb() in wait_woken(). */ smp_mb(); /* C */ diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c -index 890b79cf0e7c..c65cfb7f7573 100644 +index 890b79cf0..c65cfb7f7 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c @@ -22,16 +22,7 @@ @@ -1500943,7 +1502158,7 @@ index 890b79cf0e7c..c65cfb7f7573 100644 cpu_stop_fn_t fn, void *arg, diff --git a/make-ohos.sh b/make-ohos.sh new file mode 100755 -index 000000000000..e737baa28fd1 +index 000000000..e737baa28 --- /dev/null +++ b/make-ohos.sh @@ -0,0 +1,124 @@ @@ -1501072,10 +1502287,10 @@ index 000000000000..e737baa28fd1 + help +fi diff --git a/mm/hugetlb.c b/mm/hugetlb.c -index 17679e80fbc4..43763d58a77a 100644 +index 4ecf9a062..20277864c 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c -@@ -3914,7 +3914,6 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, +@@ -3932,7 +3932,6 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, struct hstate *h = hstate_vma(vma); unsigned long sz = huge_page_size(h); struct mmu_notifier_range range; @@ -1501083,7 +1502298,7 @@ index 17679e80fbc4..43763d58a77a 100644 WARN_ON(!is_vm_hugetlb_page(vma)); BUG_ON(start & ~huge_page_mask(h)); -@@ -3943,8 +3942,10 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, +@@ -3961,8 +3960,10 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, ptl = huge_pte_lock(h, mm, ptep); if (huge_pmd_unshare(mm, vma, &address, ptep)) { spin_unlock(ptl); @@ -1501096,7 +1502311,7 @@ index 17679e80fbc4..43763d58a77a 100644 continue; } -@@ -4001,22 +4002,6 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, +@@ -4019,22 +4020,6 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, } mmu_notifier_invalidate_range_end(&range); tlb_end_vma(tlb, vma); @@ -1501120,7 +1502335,7 @@ index 17679e80fbc4..43763d58a77a 100644 void __unmap_hugepage_range_final(struct mmu_gather *tlb, diff --git a/mm/memblock.c b/mm/memblock.c -index c337df03b6a1..3b9d75e55f66 100644 +index c337df03b..3b9d75e55 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -97,6 +97,26 @@ struct pglist_data __refdata contig_page_data; @@ -1501196,7 +1502411,7 @@ index c337df03b6a1..3b9d75e55f66 100644 return end_pfn - start_pfn; diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 83c0146cb59e..17ec719d232c 100644 +index 83c0146cb..17ec719d2 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1441,9 +1441,15 @@ static void free_one_page(struct zone *zone, @@ -1501274,7 +1502489,7 @@ index 83c0146cb59e..17ec719d232c 100644 pgcnt++; } diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c -index 160c016a5dfb..c99d65ef13b1 100644 +index 160c016a5..c99d65ef1 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -1508,9 +1508,6 @@ static void l2cap_sock_close_cb(struct l2cap_chan *chan) @@ -1501310,7 +1502525,7 @@ index 160c016a5dfb..c99d65ef13b1 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 918df8d0e8b6..7c24a9acbc45 100644 +index 918df8d0e..7c24a9acb 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -93,10 +93,10 @@ static void sco_sock_timeout(struct work_struct *work) @@ -1501439,7 +1502654,7 @@ index 918df8d0e8b6..7c24a9acbc45 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 @@ -1501456,7 +1502671,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 @@ -1501467,7 +1502682,7 @@ index dc47b6174ec5..beed5b506307 100644 +obj-$(CONFIG_RFKILL_RK) += rfkill-rk.o diff --git a/net/rfkill/rfkill-bt.c b/net/rfkill/rfkill-bt.c new file mode 100755 -index 000000000000..48a0be7b306e +index 000000000..48a0be7b3 --- /dev/null +++ b/net/rfkill/rfkill-bt.c @@ -0,0 +1,827 @@ @@ -1502300,7 +1503515,7 @@ index 000000000000..48a0be7b306e +MODULE_LICENSE("GPL"); diff --git a/net/rfkill/rfkill-wlan.c b/net/rfkill/rfkill-wlan.c new file mode 100755 -index 000000000000..6a581c847a68 +index 000000000..6a581c847 --- /dev/null +++ b/net/rfkill/rfkill-wlan.c @@ -0,0 +1,979 @@ @@ -1503284,7 +1504499,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 9adb6d247..b7b7ad547 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -9,6 +9,7 @@ CRYPTO_CFLAGS = $(shell pkg-config --cflags libcrypto 2> /dev/null) @@ -1503296,7 +1504511,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 94133708889d..d018b4ad057d 100644 +index 941337088..d018b4ad0 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -316,8 +316,9 @@ $(obj)/%.dtb.S: $(obj)/%.dtb FORCE @@ -1503313,7 +1504528,7 @@ index 94133708889d..d018b4ad057d 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 @@ @@ -1503420,7 +1504635,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, @@ -1503450,7 +1504665,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 @@ @@ -1503691,7 +1504906,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 @@ @@ -1503850,7 +1505065,7 @@ index 000000000000..69065d28e0ea +--output $output diff --git a/scripts/resource_tool.c b/scripts/resource_tool.c new file mode 100755 -index 000000000000..8465c578b2d7 +index 000000000..8465c578b --- /dev/null +++ b/scripts/resource_tool.c @@ -0,0 +1,1575 @@ @@ -1505430,7 +1506645,7 @@ index 000000000000..8465c578b2d7 + +/************pack code end****************/ diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c -index 2c5f7e905ab8..51821334fcee 100644 +index 2c5f7e905..51821334f 100644 --- a/sound/drivers/aloop.c +++ b/sound/drivers/aloop.c @@ -37,6 +37,7 @@ MODULE_SUPPORTED_DEVICE("{{ALSA,Loopback soundcard}}"); @@ -1505520,7 +1506735,7 @@ index 2c5f7e905ab8..51821334fcee 100644 } diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig -index 34c6dd04b85a..fa128b8cdfc4 100644 +index 34c6dd04b..fa128b8cd 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -89,11 +89,16 @@ config SND_SOC_ALL_CODECS @@ -1505660,7 +1506875,7 @@ index 34c6dd04b85a..fa128b8cdfc4 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 @@ -1505732,7 +1506947,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[] = { @@ -1505771,7 +1506986,7 @@ index 4d286844e3c8..2be7ba425ee4 100644 }, diff --git a/sound/soc/codecs/dummy-codec.c b/sound/soc/codecs/dummy-codec.c new file mode 100755 -index 000000000000..35756c753357 +index 000000000..35756c753 --- /dev/null +++ b/sound/soc/codecs/dummy-codec.c @@ -0,0 +1,115 @@ @@ -1505892,7 +1507107,7 @@ index 000000000000..35756c753357 +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 +index 000000000..49035e8ca --- /dev/null +++ b/sound/soc/codecs/es7202.c @@ -0,0 +1,1170 @@ @@ -1507068,7 +1508283,7 @@ index 000000000000..49035e8ca52d +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 +index 000000000..fb8643c0a --- /dev/null +++ b/sound/soc/codecs/es7202.h @@ -0,0 +1,95 @@ @@ -1507169,7 +1508384,7 @@ 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 +index 000000000..dfb0e24e2 --- /dev/null +++ b/sound/soc/codecs/es7210.c @@ -0,0 +1,1754 @@ @@ -1508929,7 +1510144,7 @@ index 000000000000..dfb0e24e23c7 +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 +index 000000000..234a365c3 --- /dev/null +++ b/sound/soc/codecs/es7210.h @@ -0,0 +1,76 @@ @@ -1509011,7 +1510226,7 @@ index 000000000000..234a365c398e +#endif /* _ES7210_H_ */ diff --git a/sound/soc/codecs/es7243e.c b/sound/soc/codecs/es7243e.c new file mode 100755 -index 000000000000..e2bf03c526d8 +index 000000000..e2bf03c52 --- /dev/null +++ b/sound/soc/codecs/es7243e.c @@ -0,0 +1,2671 @@ @@ -1511688,7 +1512903,7 @@ index 000000000000..e2bf03c526d8 +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 +index 000000000..1d9760ada --- /dev/null +++ b/sound/soc/codecs/es7243e_usr_cfg.h @@ -0,0 +1,274 @@ @@ -1511968,7 +1513183,7 @@ index 000000000000..1d9760ada940 +#define VDDA_VOLTAGE VDDA_3V3 diff --git a/sound/soc/codecs/es8311.c b/sound/soc/codecs/es8311.c new file mode 100755 -index 000000000000..b13ece8be069 +index 000000000..b13ece8be --- /dev/null +++ b/sound/soc/codecs/es8311.c @@ -0,0 +1,756 @@ @@ -1512730,7 +1513945,7 @@ index 000000000000..b13ece8be069 +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/es8311.h b/sound/soc/codecs/es8311.h new file mode 100755 -index 000000000000..94d8472bd5de +index 000000000..94d8472bd --- /dev/null +++ b/sound/soc/codecs/es8311.h @@ -0,0 +1,69 @@ @@ -1512805,7 +1514020,7 @@ 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 +index 000000000..636510849 --- /dev/null +++ b/sound/soc/codecs/es8323.c @@ -0,0 +1,998 @@ @@ -1513809,7 +1515024,7 @@ index 000000000000..636510849a6d +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/es8323.h b/sound/soc/codecs/es8323.h new file mode 100755 -index 000000000000..355a6a7d3149 +index 000000000..355a6a7d3 --- /dev/null +++ b/sound/soc/codecs/es8323.h @@ -0,0 +1,151 @@ @@ -1513965,7 +1515180,7 @@ index 000000000000..355a6a7d3149 + +#endif diff --git a/sound/soc/codecs/es8328.c b/sound/soc/codecs/es8328.c -index 7e26231a596a..1d27a26e0907 100644 +index 7e26231a5..1d27a26e0 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 = { @@ -1514002,7 +1515217,7 @@ index 7e26231a596a..1d27a26e0907 100644 } diff --git a/sound/soc/codecs/es8396.c b/sound/soc/codecs/es8396.c new file mode 100755 -index 000000000000..4cd7916b026f +index 000000000..4cd7916b0 --- /dev/null +++ b/sound/soc/codecs/es8396.c @@ -0,0 +1,3207 @@ @@ -1517215,7 +1518430,7 @@ index 000000000000..4cd7916b026f +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/es8396.h b/sound/soc/codecs/es8396.h new file mode 100755 -index 000000000000..e6f2f390707d +index 000000000..e6f2f3907 --- /dev/null +++ b/sound/soc/codecs/es8396.h @@ -0,0 +1,354 @@ @@ -1517575,7 +1518790,7 @@ index 000000000000..e6f2f390707d +#endif diff --git a/sound/soc/codecs/rk1000_codec.c b/sound/soc/codecs/rk1000_codec.c new file mode 100755 -index 000000000000..9cabd0977813 +index 000000000..9cabd0977 --- /dev/null +++ b/sound/soc/codecs/rk1000_codec.c @@ -0,0 +1,580 @@ @@ -1518161,7 +1519376,7 @@ index 000000000000..9cabd0977813 +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 +index 000000000..0c9169cd6 --- /dev/null +++ b/sound/soc/codecs/rk1000_codec.h @@ -0,0 +1,320 @@ @@ -1518487,7 +1519702,7 @@ index 000000000000..0c9169cd6fb7 +#endif diff --git a/sound/soc/codecs/rk312x_codec.c b/sound/soc/codecs/rk312x_codec.c new file mode 100755 -index 000000000000..0e3ac4008962 +index 000000000..0e3ac4008 --- /dev/null +++ b/sound/soc/codecs/rk312x_codec.c @@ -0,0 +1,2526 @@ @@ -1521019,7 +1522234,7 @@ index 000000000000..0e3ac4008962 +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 +index 000000000..092408868 --- /dev/null +++ b/sound/soc/codecs/rk312x_codec.h @@ -0,0 +1,566 @@ @@ -1521591,7 +1522806,7 @@ index 000000000000..0924088681ba +#endif /* __RK312x_CODEC_H__ */ diff --git a/sound/soc/codecs/rk3228_codec.c b/sound/soc/codecs/rk3228_codec.c new file mode 100755 -index 000000000000..d82eec871ac8 +index 000000000..d82eec871 --- /dev/null +++ b/sound/soc/codecs/rk3228_codec.c @@ -0,0 +1,543 @@ @@ -1522140,7 +1523355,7 @@ index 000000000000..d82eec871ac8 +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 +index 000000000..7283d0ba8 --- /dev/null +++ b/sound/soc/codecs/rk3228_codec.h @@ -0,0 +1,218 @@ @@ -1522364,7 +1523579,7 @@ index 000000000000..7283d0ba86e8 +#endif diff --git a/sound/soc/codecs/rk3308_codec.c b/sound/soc/codecs/rk3308_codec.c new file mode 100755 -index 000000000000..a6ce7f061d73 +index 000000000..a6ce7f061 --- /dev/null +++ b/sound/soc/codecs/rk3308_codec.c @@ -0,0 +1,5128 @@ @@ -1527498,7 +1528713,7 @@ index 000000000000..a6ce7f061d73 +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 +index 000000000..93e089dae --- /dev/null +++ b/sound/soc/codecs/rk3308_codec.h @@ -0,0 +1,1069 @@ @@ -1528573,7 +1529788,7 @@ index 000000000000..93e089dae081 +#endif /* __RK3308_CODEC_H__ */ diff --git a/sound/soc/codecs/rk3308_codec_provider.h b/sound/soc/codecs/rk3308_codec_provider.h new file mode 100755 -index 000000000000..34c1ef86a507 +index 000000000..34c1ef86a --- /dev/null +++ b/sound/soc/codecs/rk3308_codec_provider.h @@ -0,0 +1,28 @@ @@ -1528607,7 +1529822,7 @@ index 000000000000..34c1ef86a507 +#endif /* __RK3308_CODEC_PROVIDER_H__ */ diff --git a/sound/soc/codecs/rk817_codec.c b/sound/soc/codecs/rk817_codec.c new file mode 100755 -index 000000000000..c063d48f3307 +index 000000000..c063d48f3 --- /dev/null +++ b/sound/soc/codecs/rk817_codec.c @@ -0,0 +1,1294 @@ @@ -1529907,7 +1531122,7 @@ index 000000000000..c063d48f3307 +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 +index 000000000..a928c3239 --- /dev/null +++ b/sound/soc/codecs/rk817_codec.h @@ -0,0 +1,215 @@ @@ -1530128,7 +1531343,7 @@ index 000000000000..a928c323928b +#endif /* __RK817_CODEC_H__ */ diff --git a/sound/soc/codecs/rk_codec_digital.c b/sound/soc/codecs/rk_codec_digital.c new file mode 100755 -index 000000000000..ec91b72fa6de +index 000000000..ec91b72fa --- /dev/null +++ b/sound/soc/codecs/rk_codec_digital.c @@ -0,0 +1,1109 @@ @@ -1531243,7 +1532458,7 @@ index 000000000000..ec91b72fa6de +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 +index 000000000..4bb409b8d --- /dev/null +++ b/sound/soc/codecs/rk_codec_digital.h @@ -0,0 +1,319 @@ @@ -1531567,7 +1532782,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[] = { @@ -1531582,7 +1532797,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 @@ @@ -1531744,7 +1532959,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 { @@ -1531759,7 +1532974,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 c86231dfc..0827b7e65 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c @@ -7,6 +7,7 @@ @@ -1531835,8 +1533050,10362 @@ index c86231dfcf4f..0827b7e65ac1 100644 ret = devm_snd_soc_register_component(&i2c->dev, &soc_component_dev_wm8974, &wm8974_dai, 1); +diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig +index d610b553e..2925971bc 100644 +--- a/sound/soc/rockchip/Kconfig ++++ b/sound/soc/rockchip/Kconfig +@@ -16,6 +16,15 @@ config SND_SOC_ROCKCHIP_I2S + Rockchip I2S device. The device supports upto maximum of + 8 channels each for play and record. + ++config SND_SOC_ROCKCHIP_I2S_TDM ++ tristate "Rockchip I2S/TDM Device Driver" ++ depends on CLKDEV_LOOKUP && SND_SOC_ROCKCHIP ++ select SND_SOC_GENERIC_DMAENGINE_PCM ++ help ++ Say Y or M if you want to add support for I2S/TDM driver for ++ Rockchip I2S/TDM device. The device supports up to maximum of ++ 8 channels each for play and record. ++ + config SND_SOC_ROCKCHIP_PDM + tristate "Rockchip PDM Controller Driver" + depends on CLKDEV_LOOKUP && SND_SOC_ROCKCHIP +@@ -34,6 +43,21 @@ config SND_SOC_ROCKCHIP_SPDIF + Say Y or M if you want to add support for SPDIF driver for + Rockchip SPDIF transceiver device. + ++config SND_SOC_ROCKCHIP_SPDIFRX ++ tristate "Rockchip SPDIFRX Device Driver" ++ depends on CLKDEV_LOOKUP && SND_SOC_ROCKCHIP ++ select SND_SOC_GENERIC_DMAENGINE_PCM ++ help ++ Say Y or M if you want to add support for SPDIFRX driver for ++ Rockchip SPDIF receiver device. ++ ++config SND_SOC_ROCKCHIP_VAD ++ tristate "Rockchip Voice Activity Detection Driver" ++ depends on CLKDEV_LOOKUP && SND_SOC_ROCKCHIP ++ help ++ Say Y or M if you want to add support for VAD driver for ++ Rockchip VAD device. ++ + config SND_SOC_ROCKCHIP_MAX98090 + tristate "ASoC support for Rockchip boards using a MAX98090 codec" + depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP +@@ -45,6 +69,13 @@ config SND_SOC_ROCKCHIP_MAX98090 + Say Y or M here if you want to add support for SoC audio on Rockchip + boards using the MAX98090 codec and HDMI codec, such as Veyron. + ++config SND_SOC_ROCKCHIP_MULTICODECS ++ tristate "ASoC support for Rockchip multicodecs" ++ depends on SND_SOC_ROCKCHIP && CLKDEV_LOOKUP ++ help ++ Say Y or M here if you want to add support for SoC audio on Rockchip ++ boards using multicodecs, such as RK3308 boards. ++ + config SND_SOC_ROCKCHIP_RT5645 + tristate "ASoC support for Rockchip boards using a RT5645/RT5650 codec" + depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP +@@ -54,6 +85,14 @@ config SND_SOC_ROCKCHIP_RT5645 + Say Y or M here if you want to add support for SoC audio on Rockchip + boards using the RT5645/RT5650 codec, such as Veyron. + ++config SND_SOC_ROCKCHIP_HDMI ++ tristate "ASoC support for Rockchip HDMI audio" ++ depends on SND_SOC_ROCKCHIP && CLKDEV_LOOKUP ++ select SND_SOC_HDMI_CODEC ++ help ++ Say Y or M here if you want to add support for SoC audio on Rockchip ++ boards using built-in HDMI or external HDMI. ++ + config SND_SOC_RK3288_HDMI_ANALOG + tristate "ASoC support multiple codecs for Rockchip RK3288 boards" + depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP +diff --git a/sound/soc/rockchip/Makefile b/sound/soc/rockchip/Makefile +index 65e814d46..ec17d97d0 100644 +--- a/sound/soc/rockchip/Makefile ++++ b/sound/soc/rockchip/Makefile +@@ -1,20 +1,35 @@ + # SPDX-License-Identifier: GPL-2.0 + # ROCKCHIP Platform Support + snd-soc-rockchip-i2s-objs := rockchip_i2s.o +-snd-soc-rockchip-pcm-objs := rockchip_pcm.o ++snd-soc-rockchip-i2s-tdm-objs := rockchip_i2s_tdm.o + snd-soc-rockchip-pdm-objs := rockchip_pdm.o + snd-soc-rockchip-spdif-objs := rockchip_spdif.o ++snd-soc-rockchip-spdifrx-objs := rockchip_spdifrx.o ++snd-soc-rockchip-vad-objs := rockchip_vad.o ++ifdef CONFIG_THUMB2_KERNEL ++snd-soc-rockchip-vad-$(CONFIG_THUMB2_KERNEL) += vad_preprocess_thumb.o ++else ++snd-soc-rockchip-vad-$(CONFIG_ARM64) += vad_preprocess_arm64.o ++snd-soc-rockchip-vad-$(CONFIG_ARM) += vad_preprocess_arm.o ++endif + +-obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-rockchip-i2s.o snd-soc-rockchip-pcm.o ++obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-rockchip-i2s.o ++obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S_TDM) += snd-soc-rockchip-i2s-tdm.o + obj-$(CONFIG_SND_SOC_ROCKCHIP_PDM) += snd-soc-rockchip-pdm.o + obj-$(CONFIG_SND_SOC_ROCKCHIP_SPDIF) += snd-soc-rockchip-spdif.o ++obj-$(CONFIG_SND_SOC_ROCKCHIP_SPDIFRX) += snd-soc-rockchip-spdifrx.o ++obj-$(CONFIG_SND_SOC_ROCKCHIP_VAD) += snd-soc-rockchip-vad.o + ++snd-soc-rockchip-hdmi-objs := rockchip_hdmi.o + snd-soc-rockchip-max98090-objs := rockchip_max98090.o ++snd-soc-rockchip-multicodecs-objs := rockchip_multicodecs.o + snd-soc-rockchip-rt5645-objs := rockchip_rt5645.o + snd-soc-rk3288-hdmi-analog-objs := rk3288_hdmi_analog.o + snd-soc-rk3399-gru-sound-objs := rk3399_gru_sound.o + ++obj-$(CONFIG_SND_SOC_ROCKCHIP_HDMI) += snd-soc-rockchip-hdmi.o + obj-$(CONFIG_SND_SOC_ROCKCHIP_MAX98090) += snd-soc-rockchip-max98090.o ++obj-$(CONFIG_SND_SOC_ROCKCHIP_MULTICODECS) += snd-soc-rockchip-multicodecs.o + obj-$(CONFIG_SND_SOC_ROCKCHIP_RT5645) += snd-soc-rockchip-rt5645.o + obj-$(CONFIG_SND_SOC_RK3288_HDMI_ANALOG) += snd-soc-rk3288-hdmi-analog.o + obj-$(CONFIG_SND_SOC_RK3399_GRU_SOUND) += snd-soc-rk3399-gru-sound.o +diff --git a/sound/soc/rockchip/rockchip_audio_pwm.c b/sound/soc/rockchip/rockchip_audio_pwm.c +new file mode 100644 +index 000000000..44ca66f1e +--- /dev/null ++++ b/sound/soc/rockchip/rockchip_audio_pwm.c +@@ -0,0 +1,372 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Rockchip Audio PWM Driver ++ * ++ * Copyright (C) 2020 Fuzhou Rockchip Electronics Co.,Ltd ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "rockchip_audio_pwm.h" ++ ++#define AUDIO_PWM_DMA_BURST_SIZE (16) /* size * width: 16*4 = 64 bytes */ ++ ++struct rk_audio_pwm_dev { ++ struct device *dev; ++ struct clk *clk; ++ struct clk *hclk; ++ struct regmap *regmap; ++ struct snd_dmaengine_dai_dma_data playback_dma_data; ++ struct gpio_desc *spk_ctl_gpio; ++ int interpolat_points; ++ int sample_width_bits; ++}; ++ ++static inline struct rk_audio_pwm_dev *to_info(struct snd_soc_dai *dai) ++{ ++ return snd_soc_dai_get_drvdata(dai); ++} ++ ++static void rockchip_audio_spk_ctl(struct rk_audio_pwm_dev *apwm, int on) ++{ ++ if (apwm->spk_ctl_gpio) ++ gpiod_direction_output(apwm->spk_ctl_gpio, on); ++} ++ ++static void rockchip_audio_pwm_xfer(struct rk_audio_pwm_dev *apwm, int on) ++{ ++ if (on) { ++ regmap_write(apwm->regmap, AUDPWM_FIFO_CFG, AUDPWM_DMA_EN); ++ regmap_write(apwm->regmap, AUDPWM_XFER, AUDPWM_XFER_START); ++ rockchip_audio_spk_ctl(apwm, on); ++ } else { ++ rockchip_audio_spk_ctl(apwm, on); ++ regmap_write(apwm->regmap, AUDPWM_FIFO_CFG, AUDPWM_DMA_DIS); ++ regmap_write(apwm->regmap, AUDPWM_XFER, AUDPWM_XFER_STOP); ++ } ++} ++ ++static int rockchip_audio_pwm_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params, ++ struct snd_soc_dai *dai) ++{ ++ struct rk_audio_pwm_dev *apwm = to_info(dai); ++ unsigned long rate; ++ int ret; ++ ++ rate = params_rate(params) << apwm->sample_width_bits; ++ if (apwm->interpolat_points) { ++ rate *= (apwm->interpolat_points + 1); ++ regmap_write(apwm->regmap, AUDPWM_PWM_CFG, ++ AUDPWM_LINEAR_INTERP_EN | ++ AUDPWM_INTERP_RATE(apwm->interpolat_points)); ++ } ++ if (!rate) ++ return -EINVAL; ++ ret = clk_set_rate(apwm->clk, rate); ++ if (ret) ++ return -EINVAL; ++ ++ regmap_write(apwm->regmap, AUDPWM_SRC_CFG, ++ AUDPWM_SRC_WIDTH(params_width(params))); ++ regmap_write(apwm->regmap, AUDPWM_PWM_CFG, ++ AUDPWM_SAMPLE_WIDTH(apwm->sample_width_bits)); ++ regmap_write(apwm->regmap, AUDPWM_FIFO_CFG, ++ AUDPWM_DMA_WATERMARK(16)); ++ ++ return 0; ++} ++ ++static int rockchip_audio_pwm_trigger(struct snd_pcm_substream *substream, ++ int cmd, struct snd_soc_dai *dai) ++{ ++ struct rk_audio_pwm_dev *apwm = to_info(dai); ++ int ret = 0; ++ ++ switch (cmd) { ++ case SNDRV_PCM_TRIGGER_START: ++ case SNDRV_PCM_TRIGGER_RESUME: ++ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ rockchip_audio_pwm_xfer(apwm, 1); ++ break; ++ case SNDRV_PCM_TRIGGER_SUSPEND: ++ case SNDRV_PCM_TRIGGER_STOP: ++ case SNDRV_PCM_TRIGGER_PAUSE_PUSH: ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ rockchip_audio_pwm_xfer(apwm, 0); ++ break; ++ default: ++ ret = -EINVAL; ++ break; ++ } ++ ++ return ret; ++} ++ ++static int rockchip_audio_pwm_dai_probe(struct snd_soc_dai *dai) ++{ ++ struct rk_audio_pwm_dev *apwm = to_info(dai); ++ ++ dai->playback_dma_data = &apwm->playback_dma_data; ++ ++ return 0; ++} ++ ++static const struct snd_soc_dai_ops rockchip_audio_pwm_dai_ops = { ++ .trigger = rockchip_audio_pwm_trigger, ++ .hw_params = rockchip_audio_pwm_hw_params, ++}; ++ ++#define ROCKCHIP_AUDIO_PWM_RATES SNDRV_PCM_RATE_8000_48000 ++#define ROCKCHIP_AUDIO_PWM_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ ++ SNDRV_PCM_FMTBIT_S24_LE | \ ++ SNDRV_PCM_FMTBIT_S32_LE) ++ ++static struct snd_soc_dai_driver rockchip_audio_pwm_dai = { ++ .probe = rockchip_audio_pwm_dai_probe, ++ .playback = { ++ .stream_name = "Playback", ++ .channels_min = 1, ++ .channels_max = 2, ++ .rates = ROCKCHIP_AUDIO_PWM_RATES, ++ .formats = ROCKCHIP_AUDIO_PWM_FORMATS, ++ }, ++ .ops = &rockchip_audio_pwm_dai_ops, ++}; ++ ++static const struct snd_soc_component_driver rockchip_audio_pwm_component = { ++ .name = "rockchip-audio-pwm", ++}; ++ ++static int __maybe_unused rockchip_audio_pwm_runtime_suspend(struct device *dev) ++{ ++ struct rk_audio_pwm_dev *apwm = dev_get_drvdata(dev); ++ ++ regcache_cache_only(apwm->regmap, true); ++ clk_disable_unprepare(apwm->clk); ++ clk_disable_unprepare(apwm->hclk); ++ ++ return 0; ++} ++ ++static int __maybe_unused rockchip_audio_pwm_runtime_resume(struct device *dev) ++{ ++ struct rk_audio_pwm_dev *apwm = dev_get_drvdata(dev); ++ int ret; ++ ++ ret = clk_prepare_enable(apwm->clk); ++ if (ret) ++ return ret; ++ ++ ret = clk_prepare_enable(apwm->hclk); ++ if (ret) ++ return ret; ++ ++ regcache_cache_only(apwm->regmap, false); ++ regcache_mark_dirty(apwm->regmap); ++ ret = regcache_sync(apwm->regmap); ++ if (ret) { ++ clk_disable_unprepare(apwm->clk); ++ clk_disable_unprepare(apwm->hclk); ++ } ++ ++ return 0; ++} ++ ++static bool rockchip_audio_pwm_wr_reg(struct device *dev, unsigned int reg) ++{ ++ switch (reg) { ++ case AUDPWM_XFER: ++ case AUDPWM_SRC_CFG: ++ case AUDPWM_PWM_CFG: ++ case AUDPWM_FIFO_CFG: ++ case AUDPWM_FIFO_INT_EN: ++ case AUDPWM_FIFO_INT_ST: ++ case AUDPWM_FIFO_ENTRY: ++ return true; ++ default: ++ return false; ++ } ++} ++ ++static bool rockchip_audio_pwm_rd_reg(struct device *dev, unsigned int reg) ++{ ++ switch (reg) { ++ case AUDPWM_VERSION: ++ case AUDPWM_XFER: ++ case AUDPWM_SRC_CFG: ++ case AUDPWM_PWM_CFG: ++ case AUDPWM_PWM_ST: ++ case AUDPWM_PWM_BUF_01: ++ case AUDPWM_PWM_BUF_23: ++ case AUDPWM_FIFO_CFG: ++ case AUDPWM_FIFO_LVL: ++ case AUDPWM_FIFO_INT_EN: ++ case AUDPWM_FIFO_INT_ST: ++ return true; ++ default: ++ return false; ++ } ++} ++ ++static bool rockchip_audio_pwm_volatile_reg(struct device *dev, ++ unsigned int reg) ++{ ++ switch (reg) { ++ case AUDPWM_XFER: ++ case AUDPWM_PWM_ST: ++ case AUDPWM_PWM_BUF_01: ++ case AUDPWM_PWM_BUF_23: ++ case AUDPWM_FIFO_LVL: ++ case AUDPWM_FIFO_INT_ST: ++ return true; ++ default: ++ return false; ++ } ++} ++ ++static const struct regmap_config rockchip_audio_pwm_config = { ++ .reg_bits = 32, ++ .reg_stride = 4, ++ .val_bits = 32, ++ .max_register = AUDPWM_FIFO_ENTRY, ++ .writeable_reg = rockchip_audio_pwm_wr_reg, ++ .readable_reg = rockchip_audio_pwm_rd_reg, ++ .volatile_reg = rockchip_audio_pwm_volatile_reg, ++ .cache_type = REGCACHE_FLAT, ++}; ++ ++static const struct of_device_id rockchip_audio_pwm_match[] = { ++ { .compatible = "rockchip,audio-pwm-v1" }, ++ {}, ++}; ++MODULE_DEVICE_TABLE(of, rockchip_audio_pwm_match); ++ ++static int rockchip_audio_pwm_probe(struct platform_device *pdev) ++{ ++ struct device_node *np = pdev->dev.of_node; ++ struct rk_audio_pwm_dev *apwm; ++ struct resource *res; ++ void __iomem *regs; ++ int ret; ++ int val; ++ ++ apwm = devm_kzalloc(&pdev->dev, sizeof(*apwm), GFP_KERNEL); ++ if (!apwm) ++ return -ENOMEM; ++ ++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ regs = devm_ioremap_resource(&pdev->dev, res); ++ if (IS_ERR(regs)) ++ return PTR_ERR(regs); ++ ++ apwm->regmap = devm_regmap_init_mmio(&pdev->dev, regs, ++ &rockchip_audio_pwm_config); ++ if (IS_ERR(apwm->regmap)) ++ return PTR_ERR(apwm->regmap); ++ ++ apwm->playback_dma_data.addr = res->start + AUDPWM_FIFO_ENTRY; ++ apwm->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; ++ apwm->playback_dma_data.maxburst = AUDIO_PWM_DMA_BURST_SIZE; ++ ++ apwm->dev = &pdev->dev; ++ dev_set_drvdata(&pdev->dev, apwm); ++ ++ apwm->clk = devm_clk_get(&pdev->dev, "clk"); ++ if (IS_ERR(apwm->clk)) ++ return PTR_ERR(apwm->clk); ++ ++ apwm->hclk = devm_clk_get(&pdev->dev, "hclk"); ++ if (IS_ERR(apwm->hclk)) ++ return PTR_ERR(apwm->hclk); ++ ++ pm_runtime_enable(&pdev->dev); ++ if (!pm_runtime_enabled(&pdev->dev)) { ++ ret = rockchip_audio_pwm_runtime_resume(&pdev->dev); ++ if (ret) ++ goto err_pm_disable; ++ } ++ ++ apwm->sample_width_bits = 8; ++ of_property_read_u32(np, "rockchip,sample-width-bits", &val); ++ if (val >= 8 && val <= 11) ++ apwm->sample_width_bits = val; ++ ++ of_property_read_u32(np, "rockchip,interpolat-points", ++ &apwm->interpolat_points); ++ ++ apwm->spk_ctl_gpio = devm_gpiod_get_optional(&pdev->dev, "spk-ctl", ++ GPIOD_OUT_LOW); ++ ++ if (!apwm->spk_ctl_gpio) { ++ dev_info(&pdev->dev, "no need spk-ctl gpio\n"); ++ } else if (IS_ERR(apwm->spk_ctl_gpio)) { ++ ret = PTR_ERR(apwm->spk_ctl_gpio); ++ dev_err(&pdev->dev, "fail to request gpio spk-ctl\n"); ++ goto err_suspend; ++ } ++ ++ ret = devm_snd_soc_register_component(&pdev->dev, ++ &rockchip_audio_pwm_component, ++ &rockchip_audio_pwm_dai, 1); ++ if (ret) { ++ dev_err(&pdev->dev, "could not register dai: %d\n", ret); ++ goto err_suspend; ++ } ++ ++ ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); ++ if (ret) { ++ dev_err(&pdev->dev, "could not register pcm: %d\n", ret); ++ goto err_suspend; ++ } ++ ++ return 0; ++ ++err_suspend: ++ if (!pm_runtime_status_suspended(&pdev->dev)) ++ rockchip_audio_pwm_runtime_suspend(&pdev->dev); ++err_pm_disable: ++ pm_runtime_disable(&pdev->dev); ++ ++ return ret; ++} ++ ++static int rockchip_audio_pwm_remove(struct platform_device *pdev) ++{ ++ pm_runtime_disable(&pdev->dev); ++ if (!pm_runtime_status_suspended(&pdev->dev)) ++ rockchip_audio_pwm_runtime_suspend(&pdev->dev); ++ ++ return 0; ++} ++ ++static const struct dev_pm_ops rockchip_audio_pwm_pm_ops = { ++ SET_RUNTIME_PM_OPS(rockchip_audio_pwm_runtime_suspend, ++ rockchip_audio_pwm_runtime_resume, NULL) ++}; ++ ++static struct platform_driver rockchip_audio_pwm_driver = { ++ .probe = rockchip_audio_pwm_probe, ++ .remove = rockchip_audio_pwm_remove, ++ .driver = { ++ .name = "rockchip-audio-pwm", ++ .of_match_table = of_match_ptr(rockchip_audio_pwm_match), ++ .pm = &rockchip_audio_pwm_pm_ops, ++ }, ++}; ++ ++module_platform_driver(rockchip_audio_pwm_driver); ++ ++MODULE_AUTHOR("Sugar Zhang "); ++MODULE_DESCRIPTION("Rockchip Audio PWM Driver"); ++MODULE_LICENSE("GPL v2"); +diff --git a/sound/soc/rockchip/rockchip_audio_pwm.h b/sound/soc/rockchip/rockchip_audio_pwm.h +new file mode 100644 +index 000000000..ad6866043 +--- /dev/null ++++ b/sound/soc/rockchip/rockchip_audio_pwm.h +@@ -0,0 +1,48 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Rockchip Audio PWM driver ++ * ++ * Copyright (C) 2020 Fuzhou Rockchip Electronics Co., Ltd ++ * ++ */ ++ ++#ifndef _ROCKCHIP_AUDIO_PWM_H ++#define _ROCKCHIP_AUDIO_PWM_H ++ ++/* AUDIO PWM REGS offset */ ++#define AUDPWM_VERSION (0x0000) ++#define AUDPWM_XFER (0x0004) ++#define AUDPWM_SRC_CFG (0x0008) ++#define AUDPWM_PWM_CFG (0x0010) ++#define AUDPWM_PWM_ST (0x0014) ++#define AUDPWM_PWM_BUF_01 (0x0018) ++#define AUDPWM_PWM_BUF_23 (0x001c) ++#define AUDPWM_FIFO_CFG (0x0020) ++#define AUDPWM_FIFO_LVL (0x0024) ++#define AUDPWM_FIFO_INT_EN (0x0028) ++#define AUDPWM_FIFO_INT_ST (0x002c) ++#define AUDPWM_FIFO_ENTRY (0x0080) ++ ++#define HIWORD_UPDATE(v, h, l) (((v) << (l)) | (GENMASK((h), (l)) << 16)) ++ ++/* Transfer Control Register */ ++#define AUDPWM_XFER_LSTOP HIWORD_UPDATE(1, 1, 1) ++#define AUDPWM_XFER_START HIWORD_UPDATE(1, 0, 0) ++#define AUDPWM_XFER_STOP HIWORD_UPDATE(0, 0, 0) ++ ++/* Source Data Configuration Register */ ++#define AUDPWM_ALIGN_LEFT HIWORD_UPDATE(1, 5, 5) ++#define AUDPWM_ALIGN_RIGHT HIWORD_UPDATE(0, 5, 5) ++#define AUDPWM_SRC_WIDTH(x) HIWORD_UPDATE((x) - 1, 4, 0) ++ ++/* PWM Configuration Register */ ++#define AUDPWM_SAMPLE_WIDTH(x) HIWORD_UPDATE((x) - 8, 9, 8) ++#define AUDPWM_LINEAR_INTERP_EN HIWORD_UPDATE(1, 4, 4) ++#define AUDPWM_INTERP_RATE(x) HIWORD_UPDATE((x), 3, 0) ++ ++/* FIFO Configuration Register */ ++#define AUDPWM_DMA_EN HIWORD_UPDATE(1, 7, 7) ++#define AUDPWM_DMA_DIS HIWORD_UPDATE(0, 7, 7) ++#define AUDPWM_DMA_WATERMARK(x) HIWORD_UPDATE((x) - 1, 4, 0) ++ ++#endif /* _ROCKCHIP_AUDIO_PWM_H */ +diff --git a/sound/soc/rockchip/rockchip_cdndp.c b/sound/soc/rockchip/rockchip_cdndp.c +new file mode 100644 +index 000000000..aafeab5b4 +--- /dev/null ++++ b/sound/soc/rockchip/rockchip_cdndp.c +@@ -0,0 +1,166 @@ ++/* ++ * Rockchip machine ASoC driver for boards using CDN DP ++ * ++ * Copyright (c) 2016, ROCKCHIP CORPORATION. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms and conditions of the GNU General Public License, ++ * version 2, as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for ++ * more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see . ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#define DRV_NAME "rockchip-cdndp-sound" ++ ++static int rockchip_sound_cdndp_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_dai *cpu_dai = rtd->cpu_dai; ++ int mclk, ret; ++ ++ /* in bypass mode, the mclk has to be one of the frequencies below */ ++ switch (params_rate(params)) { ++ case 8000: ++ case 16000: ++ case 24000: ++ case 32000: ++ case 48000: ++ case 64000: ++ case 96000: ++ mclk = 12288000; ++ break; ++ case 11025: ++ case 22050: ++ case 44100: ++ case 88200: ++ mclk = 11289600; ++ break; ++ case 176400: ++ mclk = 11289600 * 2; ++ break; ++ case 192000: ++ mclk = 12288000 * 2; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ ret = snd_soc_dai_set_sysclk(cpu_dai, 0, mclk, ++ SND_SOC_CLOCK_OUT); ++ if (ret && ret != -ENOTSUPP) { ++ dev_err(cpu_dai->dev, "Can't set cpu clock %d\n", ret); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static struct snd_soc_jack cdn_dp_card_jack; ++ ++static int rockchip_sound_cdndp_init(struct snd_soc_pcm_runtime *runtime) ++{ ++ struct snd_soc_card *card = runtime->card; ++ struct snd_soc_codec *codec = runtime->codec; ++ int ret; ++ ++ /* enable jack detection */ ++ ret = snd_soc_card_jack_new(card, "DP Jack", SND_JACK_LINEOUT, ++ &cdn_dp_card_jack, NULL, 0); ++ if (ret) { ++ dev_err(card->dev, "Can't create DP Jack %d\n", ret); ++ return ret; ++ } ++ ++ return hdmi_codec_set_jack_detect(codec, &cdn_dp_card_jack); ++} ++ ++static struct snd_soc_ops rockchip_sound_cdndp_ops = { ++ .hw_params = rockchip_sound_cdndp_hw_params, ++}; ++ ++static struct snd_soc_dai_link cdndp_dailink = { ++ .name = "DP", ++ .stream_name = "DP PCM", ++ .codec_dai_name = "spdif-hifi", ++ .init = rockchip_sound_cdndp_init, ++ .ops = &rockchip_sound_cdndp_ops, ++ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBS_CFS, ++}; ++ ++static struct snd_soc_card rockchip_sound_card = { ++ .name = "rockchip-cdndp-sound", ++ .owner = THIS_MODULE, ++ .dai_link = &cdndp_dailink, ++ .num_links = 1, ++}; ++ ++static int rockchip_sound_probe(struct platform_device *pdev) ++{ ++ struct snd_soc_card *card = &rockchip_sound_card; ++ struct device_node *cpu_node; ++ int ret; ++ ++ cpu_node = of_parse_phandle(pdev->dev.of_node, "rockchip,cpu", 0); ++ if (!cpu_node) { ++ dev_err(&pdev->dev, "Property 'rockchip,cpu' missing or invalid\n"); ++ return -EINVAL; ++ } ++ ++ cdndp_dailink.platform_of_node = cpu_node; ++ cdndp_dailink.cpu_of_node = cpu_node; ++ ++ cdndp_dailink.codec_of_node = of_parse_phandle(pdev->dev.of_node, ++ "rockchip,codec", 0); ++ if (!cdndp_dailink.codec_of_node) { ++ dev_err(&pdev->dev, "Property 'rockchip,codec' invalid\n"); ++ return -EINVAL; ++ } ++ ++ card->dev = &pdev->dev; ++ platform_set_drvdata(pdev, card); ++ ++ ret = devm_snd_soc_register_card(&pdev->dev, card); ++ if (ret) ++ dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n", ++ __func__, ret); ++ ++ return ret; ++} ++ ++static const struct of_device_id rockchip_sound_of_match[] = { ++ { .compatible = "rockchip,cdndp-sound", }, ++ {}, ++}; ++ ++static struct platform_driver rockchip_sound_driver = { ++ .probe = rockchip_sound_probe, ++ .driver = { ++ .name = DRV_NAME, ++ .of_match_table = rockchip_sound_of_match, ++#ifdef CONFIG_PM ++ .pm = &snd_soc_pm_ops, ++#endif ++ }, ++}; ++ ++module_platform_driver(rockchip_sound_driver); ++ ++MODULE_AUTHOR("Chris Zhong "); ++MODULE_DESCRIPTION("Rockchip CDN DP Machine Driver"); ++MODULE_LICENSE("GPL v2"); ++MODULE_ALIAS("platform:" DRV_NAME); ++MODULE_DEVICE_TABLE(of, rockchip_sound_of_match); +diff --git a/sound/soc/rockchip/rockchip_da7219.c b/sound/soc/rockchip/rockchip_da7219.c +new file mode 100644 +index 000000000..bf675defb +--- /dev/null ++++ b/sound/soc/rockchip/rockchip_da7219.c +@@ -0,0 +1,235 @@ ++/* ++ * Rockchip machine ASoC driver for boards using a DA7219 CODEC. ++ * ++ * Copyright (c) 2016, ROCKCHIP CORPORATION. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms and conditions of the GNU General Public License, ++ * version 2, as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for ++ * more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see . ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "rockchip_i2s.h" ++#include "../codecs/da7219.h" ++#include "../codecs/da7219-aad.h" ++ ++#define DRV_NAME "rockchip-snd-da7219" ++ ++static struct snd_soc_jack mach_da7219_jack; ++ ++static const struct snd_soc_dapm_widget rk_dapm_widgets[] = { ++ SND_SOC_DAPM_HP("Headphones", NULL), ++ SND_SOC_DAPM_SPK("Speakers", NULL), ++ SND_SOC_DAPM_MIC("Headset Mic", NULL), ++ SND_SOC_DAPM_MIC("Int Mic", NULL), ++}; ++ ++static const struct snd_soc_dapm_route rk_audio_map[] = { ++ /* Input Lines */ ++ {"MIC", NULL, "Headset Mic"}, ++ ++ /* Output Lines */ ++ {"Headphones", NULL, "HPL"}, ++ {"Headphones", NULL, "HPR"}, ++}; ++ ++static const struct snd_kcontrol_new rk_mc_controls[] = { ++ SOC_DAPM_PIN_SWITCH("Headphones"), ++ SOC_DAPM_PIN_SWITCH("Speakers"), ++ SOC_DAPM_PIN_SWITCH("Headset Mic"), ++ SOC_DAPM_PIN_SWITCH("Int Mic"), ++}; ++ ++static int rk_aif1_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_dai *cpu_dai = rtd->cpu_dai; ++ struct snd_soc_dai *codec_dai = rtd->codec_dai; ++ int mclk; ++ int ret = 0; ++ ++ switch (params_rate(params)) { ++ case 8000: ++ case 16000: ++ case 32000: ++ case 48000: ++ case 96000: ++ mclk = 12288000; ++ break; ++ case 11025: ++ case 22050: ++ case 44100: ++ mclk = 11289600; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ ret = snd_soc_dai_set_sysclk(cpu_dai, 0, mclk, ++ SND_SOC_CLOCK_OUT); ++ if (ret < 0) { ++ dev_err(codec_dai->dev, "Can't set cpu clock out %d\n", ret); ++ return ret; ++ } ++ ++ ret = snd_soc_dai_set_sysclk(codec_dai, 0, mclk, ++ SND_SOC_CLOCK_IN); ++ if (ret < 0) { ++ dev_err(codec_dai->dev, "Can't set codec clock in %d\n", ret); ++ return ret; ++ } ++ ++ ret = snd_soc_dai_set_pll(codec_dai, 0, DA7219_SYSCLK_MCLK, 0, 0); ++ if (ret < 0) { ++ dev_err(codec_dai->dev, "Can't set pll sysclk mclk %d\n", ret); ++ return ret; ++ } ++ ++ return ret; ++} ++ ++static int rk_init(struct snd_soc_pcm_runtime *runtime) ++{ ++ struct snd_soc_card *card = runtime->card; ++ struct snd_soc_dapm_context *dapm = &card->dapm; ++ int ret = 0; ++ ++ card->dapm.idle_bias_off = true; ++ ++ snd_soc_dapm_enable_pin(dapm, "Headphones"); ++ snd_soc_dapm_enable_pin(dapm, "Speakers"); ++ snd_soc_dapm_enable_pin(dapm, "Headset Mic"); ++ snd_soc_dapm_enable_pin(dapm, "Int Mic"); ++ ++ snd_soc_dapm_sync(dapm); ++ ++ /* Enable Headset and 4 Buttons Jack detection */ ++ ret = snd_soc_card_jack_new(card, "Headset Jack", ++ SND_JACK_HEADSET | ++ SND_JACK_BTN_0 | SND_JACK_BTN_1 | ++ SND_JACK_BTN_2 | SND_JACK_BTN_3, ++ &mach_da7219_jack, NULL, 0); ++ ++ if (ret) { ++ dev_err(card->dev, "New Headset Jack failed! (%d)\n", ret); ++ return ret; ++ } ++ ++ da7219_aad_jack_det(runtime->codec, &mach_da7219_jack); ++ ++ return ret; ++} ++ ++static struct snd_soc_ops rk_aif1_ops = { ++ .hw_params = rk_aif1_hw_params, ++}; ++ ++static struct snd_soc_dai_link rk_dailink = { ++ .name = "da7219", ++ .stream_name = "da7219 PCM", ++ .codec_dai_name = "da7219-hifi", ++ .init = rk_init, ++ .ops = &rk_aif1_ops, ++ /* set da7219 as slave */ ++ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBS_CFS, ++}; ++ ++static struct snd_soc_card snd_soc_card_rk = { ++ .name = "audio-da7219", ++ .dai_link = &rk_dailink, ++ .num_links = 1, ++ .dapm_widgets = rk_dapm_widgets, ++ .num_dapm_widgets = ARRAY_SIZE(rk_dapm_widgets), ++ .dapm_routes = rk_audio_map, ++ .num_dapm_routes = ARRAY_SIZE(rk_audio_map), ++ .controls = rk_mc_controls, ++ .num_controls = ARRAY_SIZE(rk_mc_controls), ++}; ++ ++static int snd_rk_mc_probe(struct platform_device *pdev) ++{ ++ int ret = 0; ++ struct snd_soc_card *card = &snd_soc_card_rk; ++ struct device_node *np = pdev->dev.of_node; ++ ++ /* register the soc card */ ++ card->dev = &pdev->dev; ++ platform_set_drvdata(pdev, card); ++ ++ rk_dailink.codec_of_node = of_parse_phandle(np, ++ "rockchip,audio-codec", 0); ++ if (!rk_dailink.codec_of_node) { ++ dev_err(&pdev->dev, ++ "Property 'rockchip,audio-codec' missing or invalid\n"); ++ return -EINVAL; ++ } ++ ++ rk_dailink.cpu_of_node = of_parse_phandle(np, ++ "rockchip,i2s-controller", 0); ++ if (!rk_dailink.cpu_of_node) { ++ dev_err(&pdev->dev, ++ "Property 'rockchip,i2s-controller' missing or invalid\n"); ++ return -EINVAL; ++ } ++ ++ rk_dailink.platform_of_node = rk_dailink.cpu_of_node; ++ ++ ret = snd_soc_of_parse_card_name(card, "rockchip,model"); ++ if (ret) { ++ dev_err(&pdev->dev, ++ "snd_soc_of_parse_card_name failed %d\n", ret); ++ return ret; ++ } ++ ++ ret = devm_snd_soc_register_card(&pdev->dev, card); ++ if (ret) { ++ dev_err(&pdev->dev, ++ "snd_soc_register_card failed %d\n", ret); ++ return ret; ++ } ++ ++ return ret; ++} ++ ++static const struct of_device_id rockchip_da7219_of_match[] = { ++ { .compatible = "rockchip,rockchip-audio-da7219", }, ++ {}, ++}; ++ ++static struct platform_driver snd_rk_mc_driver = { ++ .probe = snd_rk_mc_probe, ++ .driver = { ++ .name = DRV_NAME, ++ .pm = &snd_soc_pm_ops, ++ .of_match_table = rockchip_da7219_of_match, ++ }, ++}; ++ ++module_platform_driver(snd_rk_mc_driver); ++ ++MODULE_AUTHOR("Xing Zheng "); ++MODULE_DESCRIPTION("Rockchip da7219 machine ASoC driver"); ++MODULE_LICENSE("GPL v2"); ++MODULE_ALIAS("platform:" DRV_NAME); ++MODULE_DEVICE_TABLE(of, rockchip_da7219_of_match); +diff --git a/sound/soc/rockchip/rockchip_hdmi.c b/sound/soc/rockchip/rockchip_hdmi.c +new file mode 100644 +index 000000000..ed107d4d2 +--- /dev/null ++++ b/sound/soc/rockchip/rockchip_hdmi.c +@@ -0,0 +1,279 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Rockchip machine ASoC driver for Rockchip HDMI audio output ++ * ++ * Copyright (C) 2021 Rockchip Electronics Co., Ltd ++ * ++ * Authors: XiaoTan Luo ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define DRV_NAME "rk-hdmi-sound" ++#define MAX_CODECS 2 ++#define DEFAULT_MCLK_FS 256 ++ ++struct rk_hdmi_data { ++ struct snd_soc_card card; ++ struct snd_soc_dai_link dai; ++ struct snd_soc_jack hdmi_jack; ++ struct snd_soc_jack_pin hdmi_jack_pin; ++ unsigned int mclk_fs; ++ bool jack_det; ++}; ++ ++static int rk_hdmi_fill_widget_info(struct device *dev, ++ struct snd_soc_dapm_widget *w, enum snd_soc_dapm_type id, ++ void *priv, const char *wname, const char *stream, ++ struct snd_kcontrol_new *wc, int numkc, ++ int (*event)(struct snd_soc_dapm_widget *, ++ struct snd_kcontrol *, int), unsigned short event_flags) ++{ ++ w->id = id; ++ w->name = devm_kstrdup(dev, wname, GFP_KERNEL); ++ if (!w->name) ++ return -ENOMEM; ++ ++ w->sname = stream; ++ w->reg = SND_SOC_NOPM; ++ w->shift = 0; ++ w->kcontrol_news = wc; ++ w->num_kcontrols = numkc; ++ w->priv = priv; ++ w->event = event; ++ w->event_flags = event_flags; ++ ++ return 0; ++} ++ ++static int rk_dailink_init(struct snd_soc_pcm_runtime *rtd) ++{ ++ struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); ++ struct snd_soc_card *card = rtd->card; ++ struct rk_hdmi_data *rk_data = snd_soc_card_get_drvdata(rtd->card); ++ struct device *dev = rtd->card->dev; ++ int ret = 0; ++ struct snd_soc_dapm_widget *widgets; ++ ++ if (!rk_data->jack_det) ++ return 0; ++ ++ widgets = devm_kcalloc(card->dapm.dev, 1, ++ sizeof(*widgets), GFP_KERNEL); ++ if (!widgets) ++ return -ENOMEM; ++ ++ ret = rk_hdmi_fill_widget_info(card->dapm.dev, widgets, ++ snd_soc_dapm_line, NULL, ++ rk_data->hdmi_jack_pin.pin, ++ NULL, NULL, 0, NULL, 0); ++ if (ret < 0) ++ return ret; ++ ++ ret = snd_soc_dapm_new_controls(&card->dapm, widgets, 1); ++ if (ret < 0) ++ return ret; ++ ++ ret = snd_soc_dapm_new_widgets(rtd->card); ++ if (ret < 0) ++ return ret; ++ ++ ret = snd_soc_card_jack_new(rtd->card, ++ rk_data->hdmi_jack_pin.pin, ++ rk_data->hdmi_jack_pin.mask, ++ &rk_data->hdmi_jack, ++ &rk_data->hdmi_jack_pin, 1); ++ if (ret) { ++ dev_err(dev, "Can't new HDMI Jack %d\n", ret); ++ return ret; ++ } ++ return snd_soc_component_set_jack(codec_dai->component, ++ &rk_data->hdmi_jack, NULL); ++ ++} ++ ++static int rk_hdmi_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); ++ struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); ++ struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); ++ struct rk_hdmi_data *rk_data = snd_soc_card_get_drvdata(rtd->card); ++ unsigned int mclk; ++ int ret; ++ ++ mclk = params_rate(params) * rk_data->mclk_fs; ++ ++ ret = snd_soc_dai_set_sysclk(codec_dai, substream->stream, mclk, ++ SND_SOC_CLOCK_IN); ++ if (ret && ret != -ENOTSUPP) { ++ dev_err(codec_dai->dev, ++ "Set codec_dai sysclk failed: %d\n", ret); ++ return ret; ++ } ++ ++ ret = snd_soc_dai_set_sysclk(cpu_dai, substream->stream, mclk, ++ SND_SOC_CLOCK_OUT); ++ if (ret && ret != -ENOTSUPP) { ++ dev_err(cpu_dai->dev, ++ "Set cpu_dai sysclk failed: %d\n", ret); ++ return ret; ++ } ++ ++ return 0; ++ ++} ++ ++static const struct snd_soc_ops rk_ops = { ++ .hw_params = rk_hdmi_hw_params, ++}; ++ ++static int rk_hdmi_probe(struct platform_device *pdev) ++{ ++ struct device_node *np = pdev->dev.of_node; ++ struct snd_soc_dai_link_component *codecs; ++ struct snd_soc_dai_link_component *platforms; ++ struct snd_soc_dai_link_component *cpus; ++ struct of_phandle_args args; ++ struct device_node *codec_np, *cpu_np; ++ struct rk_hdmi_data *rk_data; ++ int count; ++ u32 val; ++ int ret = 0, i = 0, idx = 0; ++ ++ rk_data = devm_kzalloc(&pdev->dev, sizeof(*rk_data), GFP_KERNEL); ++ if (!rk_data) ++ return -ENOMEM; ++ ++ cpus = devm_kzalloc(&pdev->dev, sizeof(*cpus), GFP_KERNEL); ++ if (!cpus) ++ return -ENOMEM; ++ ++ platforms = devm_kzalloc(&pdev->dev, sizeof(*platforms), GFP_KERNEL); ++ if (!platforms) ++ return -ENOMEM; ++ ++ rk_data->card.dev = &pdev->dev; ++ rk_data->dai.init = &rk_dailink_init; ++ rk_data->dai.ops = &rk_ops; ++ rk_data->dai.cpus = cpus; ++ rk_data->dai.platforms = platforms; ++ rk_data->dai.num_cpus = 1; ++ rk_data->dai.num_platforms = 1; ++ rk_data->dai.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBS_CFS; ++ /* Parse the card name from DT */ ++ ret = snd_soc_of_parse_card_name(&rk_data->card, "rockchip,card-name"); ++ if (ret < 0) ++ return ret; ++ rk_data->dai.name = rk_data->card.name; ++ rk_data->dai.stream_name = rk_data->card.name; ++ count = of_count_phandle_with_args(np, "rockchip,codec", NULL); ++ if (count < 0 || count > MAX_CODECS) ++ return -EINVAL; ++ ++ /* refine codecs, remove unavailable node */ ++ for (i = 0; i < count; i++) { ++ codec_np = of_parse_phandle(np, "rockchip,codec", i); ++ if (!codec_np) ++ return -ENODEV; ++ if (of_device_is_available(codec_np)) ++ idx++; ++ of_node_put(codec_np); ++ } ++ ++ if (!idx) ++ return -ENODEV; ++ ++ codecs = devm_kcalloc(&pdev->dev, idx, ++ sizeof(*codecs), GFP_KERNEL); ++ rk_data->dai.codecs = codecs; ++ rk_data->dai.num_codecs = idx; ++ idx = 0; ++ for (i = 0; i < count; i++) { ++ codec_np = of_parse_phandle(np, "rockchip,codec", i); ++ if (!codec_np) ++ return -ENODEV; ++ if (!of_device_is_available(codec_np)) ++ continue; ++ ++ ret = of_parse_phandle_with_fixed_args(np, "rockchip,codec", ++ 0, i, &args); ++ if (ret) { ++ of_node_put(codec_np); ++ return ret; ++ } ++ ++ codecs[idx].of_node = codec_np; ++ of_node_put(codec_np); ++ ret = snd_soc_get_dai_name(&args, &codecs[idx].dai_name); ++ if (ret) ++ return ret; ++ idx++; ++ } ++ ++ cpu_np = of_parse_phandle(np, "rockchip,cpu", 0); ++ if (!cpu_np) ++ return -ENODEV; ++ ++ rk_data->mclk_fs = DEFAULT_MCLK_FS; ++ if (!of_property_read_u32(np, "rockchip,mclk-fs", &val)) ++ rk_data->mclk_fs = val; ++ ++ rk_data->jack_det = ++ of_property_read_bool(np, "rockchip,jack-det"); ++ ++ rk_data->dai.cpus->of_node = cpu_np; ++ rk_data->dai.platforms->of_node = cpu_np; ++ of_node_put(cpu_np); ++ ++ rk_data->hdmi_jack_pin.pin = rk_data->card.name; ++ rk_data->hdmi_jack_pin.mask = SND_JACK_LINEOUT; ++ rk_data->card.num_links = 1; ++ rk_data->card.owner = THIS_MODULE; ++ rk_data->card.dai_link = &rk_data->dai; ++ ++ snd_soc_card_set_drvdata(&rk_data->card, rk_data); ++ ret = devm_snd_soc_register_card(&pdev->dev, &rk_data->card); ++ if (ret == -EPROBE_DEFER) ++ return -EPROBE_DEFER; ++ if (ret) { ++ dev_err(&pdev->dev, "card register failed %d\n", ret); ++ return ret; ++ } ++ platform_set_drvdata(pdev, &rk_data->card); ++ ++ return ret; ++} ++ ++static const struct of_device_id rockchip_sound_of_match[] = { ++ { .compatible = "rockchip,hdmi", }, ++ {}, ++}; ++ ++MODULE_DEVICE_TABLE(of, rockchip_sound_of_match); ++ ++static struct platform_driver rockchip_sound_driver = { ++ .probe = rk_hdmi_probe, ++ .driver = { ++ .name = DRV_NAME, ++ .pm = &snd_soc_pm_ops, ++ .of_match_table = rockchip_sound_of_match, ++ }, ++}; ++ ++module_platform_driver(rockchip_sound_driver); ++ ++MODULE_AUTHOR("XiaoTan Luo "); ++MODULE_DESCRIPTION("Rockchip HDMI ASoC machine driver"); ++MODULE_LICENSE("GPL v2"); ++MODULE_ALIAS("platform:" DRV_NAME); +diff --git a/sound/soc/rockchip/rockchip_hdmi_analog.c b/sound/soc/rockchip/rockchip_hdmi_analog.c +new file mode 100644 +index 000000000..02a282e8f +--- /dev/null ++++ b/sound/soc/rockchip/rockchip_hdmi_analog.c +@@ -0,0 +1,222 @@ ++/* ++ * Rockchip machine ASoC driver for Rockchip built-in HDMI and external codec IC ++ * which use the same i2s interface ++ * ++ * Copyright (C) 2017 Fuzhou Rockchip Electronics Co., Ltd ++ * ++ * Authors: Zhangjun , ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms and conditions of the GNU General Public License, ++ * version 2, as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for ++ * more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see . ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "rockchip_i2s.h" ++ ++#define DRV_NAME "rk-hdmi-analog-sound" ++#define MAX_CODECS 2 ++ ++static int rk_hdmi_analog_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ int ret = 0; ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_dai *cpu_dai = rtd->cpu_dai; ++ struct snd_soc_dai **codec_dais = rtd->codec_dais; ++ int mclk; ++ unsigned int i; ++ ++ switch (params_rate(params)) { ++ case 8000: ++ case 16000: ++ case 24000: ++ case 32000: ++ case 48000: ++ case 64000: ++ case 96000: ++ mclk = 12288000; ++ break; ++ case 11025: ++ case 22050: ++ case 44100: ++ case 88200: ++ mclk = 11289600; ++ break; ++ case 176400: ++ mclk = 11289600 * 2; ++ break; ++ case 192000: ++ mclk = 12288000 * 2; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ ret = snd_soc_dai_set_sysclk(cpu_dai, 0, mclk, ++ SND_SOC_CLOCK_OUT); ++ ++ if (ret && ret != -ENOTSUPP) { ++ dev_err(cpu_dai->dev, "Can't set cpu clock %d\n", ret); ++ return ret; ++ } ++ ++ for (i = 0; i < rtd->num_codecs; i++) { ++ struct snd_soc_dai *codec_dai = codec_dais[i]; ++ ++ ret = snd_soc_dai_set_sysclk(codec_dai, 0, mclk, ++ SND_SOC_CLOCK_IN); ++ if (ret && ret != -ENOTSUPP) { ++ dev_err(codec_dai->dev, ++ "Can't set codec clock %d\n", ret); ++ return ret; ++ } ++ ++ } ++ ++ return 0; ++} ++ ++static struct snd_soc_ops rk_ops = { ++ .hw_params = rk_hdmi_analog_hw_params, ++}; ++ ++static struct snd_soc_dai_link rk_dailink = { ++ .name = "HDMI-ANALOG", ++ .stream_name = "HDMI-ANALOG", ++ .ops = &rk_ops, ++ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBS_CFS, ++}; ++ ++static struct snd_soc_card snd_soc_card_rk = { ++ .name = "rk-hdmi-analog-snd", ++ .dai_link = &rk_dailink, ++ .num_links = 1, ++ .num_aux_devs = 0, ++}; ++ ++static int rk_hdmi_analog_probe(struct platform_device *pdev) ++{ ++ struct snd_soc_card *card = &snd_soc_card_rk; ++ struct device_node *np = pdev->dev.of_node; ++ struct snd_soc_dai_link *link = card->dai_link; ++ struct snd_soc_dai_link_component *codecs; ++ struct of_phandle_args args; ++ struct device_node *node; ++ int count; ++ int ret = 0, i = 0, idx = 0; ++ ++ snd_soc_of_parse_card_name(card, "rockchip,model"); ++ ++ card->dev = &pdev->dev; ++ count = of_count_phandle_with_args(np, "rockchip,codec", NULL); ++ if (count < 0 || count > MAX_CODECS) ++ return -EINVAL; ++ ++ /* refine codecs, remove unavailable node */ ++ for (i = 0; i < count; i++) { ++ node = of_parse_phandle(np, "rockchip,codec", i); ++ if (!node) ++ return -ENODEV; ++ if (of_device_is_available(node)) ++ idx++; ++ } ++ ++ if (!idx) ++ return -ENODEV; ++ ++ codecs = devm_kcalloc(&pdev->dev, idx, ++ sizeof(*codecs), GFP_KERNEL); ++ link->codecs = codecs; ++ link->num_codecs = idx; ++ idx = 0; ++ for (i = 0; i < count; i++) { ++ node = of_parse_phandle(np, "rockchip,codec", i); ++ if (!node) ++ return -ENODEV; ++ if (!of_device_is_available(node)) ++ continue; ++ ++ ret = of_parse_phandle_with_fixed_args(np, "rockchip,codec", ++ 0, i, &args); ++ if (ret) ++ return ret; ++ ++ codecs[idx].of_node = node; ++ ret = snd_soc_get_dai_name(&args, &codecs[idx].dai_name); ++ if (ret) ++ return ret; ++ idx++; ++ } ++ ++ link->cpu_of_node = of_parse_phandle(np, "rockchip,cpu", 0); ++ if (!link->cpu_of_node) ++ return -ENODEV; ++ ++ link->platform_of_node = link->cpu_of_node; ++ ++ ret = snd_soc_of_parse_audio_simple_widgets(card, "rockchip,widgets"); ++ if (ret) { ++ dev_err(&pdev->dev, ++ "Unable to parse 'rockchip,widget' property\n"); ++ } ++ ++ ret = snd_soc_of_parse_audio_routing(card, "rockchip,routing"); ++ if (ret) { ++ dev_err(&pdev->dev, ++ "Unable to parse 'rockchip,routing' property\n"); ++ } ++ ++ ret = devm_snd_soc_register_card(&pdev->dev, card); ++ if (ret == -EPROBE_DEFER) ++ return -EPROBE_DEFER; ++ if (ret) { ++ dev_err(&pdev->dev, "card register failed %d\n", ret); ++ return ret; ++ } ++ ++ platform_set_drvdata(pdev, card); ++ ++ return ret; ++} ++ ++static const struct of_device_id rockchip_sound_of_match[] = { ++ { .compatible = "rockchip,rk3368-hdmi-analog", }, ++ {}, ++}; ++ ++MODULE_DEVICE_TABLE(of, rockchip_sound_of_match); ++ ++static struct platform_driver rockchip_sound_driver = { ++ .probe = rk_hdmi_analog_probe, ++ .driver = { ++ .name = DRV_NAME, ++ .pm = &snd_soc_pm_ops, ++ .of_match_table = rockchip_sound_of_match, ++ }, ++}; ++ ++module_platform_driver(rockchip_sound_driver); ++ ++MODULE_AUTHOR("Zhangjun "); ++MODULE_DESCRIPTION("Rockchip Built-in HDMI and Codec IC machine ASoC driver"); ++MODULE_LICENSE("GPL v2"); ++MODULE_ALIAS("platform:" DRV_NAME); +diff --git a/sound/soc/rockchip/rockchip_hdmi_dp.c b/sound/soc/rockchip/rockchip_hdmi_dp.c +new file mode 100644 +index 000000000..4db9fb7b7 +--- /dev/null ++++ b/sound/soc/rockchip/rockchip_hdmi_dp.c +@@ -0,0 +1,193 @@ ++/* ++ * Rockchip machine ASoC driver for Rockchip built-in HDMI and DP audio output ++ * ++ * Copyright (C) 2017 Fuzhou Rockchip Electronics Co., Ltd ++ * ++ * Authors: Sugar Zhang , ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms and conditions of the GNU General Public License, ++ * version 2, as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for ++ * more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see . ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "rockchip_i2s.h" ++ ++#define DRV_NAME "rk-hdmi-dp-sound" ++#define MAX_CODECS 2 ++ ++static int rk_hdmi_dp_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ int ret = 0; ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_dai *cpu_dai = rtd->cpu_dai; ++ int mclk; ++ ++ switch (params_rate(params)) { ++ case 8000: ++ case 16000: ++ case 24000: ++ case 32000: ++ case 48000: ++ case 64000: ++ case 96000: ++ mclk = 12288000; ++ break; ++ case 11025: ++ case 22050: ++ case 44100: ++ case 88200: ++ mclk = 11289600; ++ break; ++ case 176400: ++ mclk = 11289600 * 2; ++ break; ++ case 192000: ++ mclk = 12288000 * 2; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ ret = snd_soc_dai_set_sysclk(cpu_dai, 0, mclk, ++ SND_SOC_CLOCK_OUT); ++ ++ if (ret && ret != -ENOTSUPP) { ++ dev_err(cpu_dai->dev, "Can't set cpu clock %d\n", ret); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static struct snd_soc_ops rk_ops = { ++ .hw_params = rk_hdmi_dp_hw_params, ++}; ++ ++static struct snd_soc_dai_link rk_dailink = { ++ .name = "HDMI-DP", ++ .stream_name = "HDMI-DP", ++ .ops = &rk_ops, ++ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBS_CFS, ++}; ++ ++static struct snd_soc_card snd_soc_card_rk = { ++ .name = "rk-hdmi-dp-sound", ++ .dai_link = &rk_dailink, ++ .num_links = 1, ++ .num_aux_devs = 0, ++}; ++ ++static int rk_hdmi_dp_probe(struct platform_device *pdev) ++{ ++ struct snd_soc_card *card = &snd_soc_card_rk; ++ struct device_node *np = pdev->dev.of_node; ++ struct snd_soc_dai_link *link = card->dai_link; ++ struct snd_soc_dai_link_component *codecs; ++ struct of_phandle_args args; ++ struct device_node *node; ++ int count; ++ int ret = 0, i = 0, idx = 0; ++ ++ card->dev = &pdev->dev; ++ ++ count = of_count_phandle_with_args(np, "rockchip,codec", NULL); ++ if (count < 0 || count > MAX_CODECS) ++ return -EINVAL; ++ ++ /* refine codecs, remove unavailable node */ ++ for (i = 0; i < count; i++) { ++ node = of_parse_phandle(np, "rockchip,codec", i); ++ if (!node) ++ return -ENODEV; ++ if (of_device_is_available(node)) ++ idx++; ++ } ++ ++ if (!idx) ++ return -ENODEV; ++ ++ codecs = devm_kcalloc(&pdev->dev, idx, ++ sizeof(*codecs), GFP_KERNEL); ++ link->codecs = codecs; ++ link->num_codecs = idx; ++ idx = 0; ++ for (i = 0; i < count; i++) { ++ node = of_parse_phandle(np, "rockchip,codec", i); ++ if (!node) ++ return -ENODEV; ++ if (!of_device_is_available(node)) ++ continue; ++ ++ ret = of_parse_phandle_with_fixed_args(np, "rockchip,codec", ++ 0, i, &args); ++ if (ret) ++ return ret; ++ ++ codecs[idx].of_node = node; ++ ret = snd_soc_get_dai_name(&args, &codecs[idx].dai_name); ++ if (ret) ++ return ret; ++ idx++; ++ } ++ ++ link->cpu_of_node = of_parse_phandle(np, "rockchip,cpu", 0); ++ if (!link->cpu_of_node) ++ return -ENODEV; ++ ++ link->platform_of_node = link->cpu_of_node; ++ ++ ret = devm_snd_soc_register_card(&pdev->dev, card); ++ if (ret == -EPROBE_DEFER) ++ return -EPROBE_DEFER; ++ if (ret) { ++ dev_err(&pdev->dev, "card register failed %d\n", ret); ++ return ret; ++ } ++ ++ platform_set_drvdata(pdev, card); ++ ++ return ret; ++} ++ ++static const struct of_device_id rockchip_sound_of_match[] = { ++ { .compatible = "rockchip,rk3399-hdmi-dp", }, ++ {}, ++}; ++ ++MODULE_DEVICE_TABLE(of, rockchip_sound_of_match); ++ ++static struct platform_driver rockchip_sound_driver = { ++ .probe = rk_hdmi_dp_probe, ++ .driver = { ++ .name = DRV_NAME, ++ .pm = &snd_soc_pm_ops, ++ .of_match_table = rockchip_sound_of_match, ++ }, ++}; ++ ++module_platform_driver(rockchip_sound_driver); ++ ++MODULE_AUTHOR("Sugar Zhang "); ++MODULE_DESCRIPTION("Rockchip Built-in HDMI and DP machine ASoC driver"); ++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 fa84ec695..b31431327 100644 +--- a/sound/soc/rockchip/rockchip_i2s.c ++++ b/sound/soc/rockchip/rockchip_i2s.c +@@ -15,11 +15,11 @@ + #include + #include + #include ++#include + #include + #include + + #include "rockchip_i2s.h" +-#include "rockchip_pcm.h" + + #define DRV_NAME "rockchip-i2s" + +@@ -40,6 +40,9 @@ struct rk_i2s_dev { + struct regmap *regmap; + struct regmap *grf; + ++ bool has_capture; ++ bool has_playback; ++ + /* + * Used to indicate the tx/rx status. + * I2S controller hopes to start the tx and rx together, +@@ -49,6 +52,8 @@ struct rk_i2s_dev { + bool rx_start; + bool is_master_mode; + const struct rk_i2s_pins *pins; ++ unsigned int bclk_ratio; ++ spinlock_t lock; /* tx/rx lock */ + }; + + static int i2s_runtime_suspend(struct device *dev) +@@ -92,6 +97,7 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) + unsigned int val = 0; + int retry = 10; + ++ spin_lock(&i2s->lock); + if (on) { + regmap_update_bits(i2s->regmap, I2S_DMACR, + I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_ENABLE); +@@ -132,6 +138,7 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) + } + } + } ++ spin_unlock(&i2s->lock); + } + + static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) +@@ -139,6 +146,7 @@ static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) + unsigned int val = 0; + int retry = 10; + ++ spin_lock(&i2s->lock); + if (on) { + regmap_update_bits(i2s->regmap, I2S_DMACR, + I2S_DMACR_RDE_ENABLE, I2S_DMACR_RDE_ENABLE); +@@ -179,6 +187,7 @@ static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) + } + } + } ++ spin_unlock(&i2s->lock); + } + + static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai, +@@ -207,13 +216,27 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai, + + regmap_update_bits(i2s->regmap, I2S_CKR, mask, val); + +- mask = I2S_CKR_CKP_MASK; ++ mask = I2S_CKR_CKP_MASK | I2S_CKR_TLP_MASK | I2S_CKR_RLP_MASK; + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: +- val = I2S_CKR_CKP_NEG; ++ val = I2S_CKR_CKP_NORMAL | ++ I2S_CKR_TLP_NORMAL | ++ I2S_CKR_RLP_NORMAL; ++ break; ++ case SND_SOC_DAIFMT_NB_IF: ++ val = I2S_CKR_CKP_NORMAL | ++ I2S_CKR_TLP_INVERTED | ++ I2S_CKR_RLP_INVERTED; + break; + case SND_SOC_DAIFMT_IB_NF: +- val = I2S_CKR_CKP_POS; ++ val = I2S_CKR_CKP_INVERTED | ++ I2S_CKR_TLP_NORMAL | ++ I2S_CKR_RLP_NORMAL; ++ break; ++ case SND_SOC_DAIFMT_IB_IF: ++ val = I2S_CKR_CKP_INVERTED | ++ I2S_CKR_TLP_INVERTED | ++ I2S_CKR_RLP_INVERTED; + break; + default: + ret = -EINVAL; +@@ -287,11 +310,11 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream, + + if (i2s->is_master_mode) { + mclk_rate = clk_get_rate(i2s->mclk); +- bclk_rate = 2 * 32 * params_rate(params); +- if (bclk_rate == 0 || mclk_rate % bclk_rate) ++ bclk_rate = i2s->bclk_ratio * params_rate(params); ++ if (!bclk_rate) + return -EINVAL; + +- div_bclk = mclk_rate / bclk_rate; ++ div_bclk = DIV_ROUND_CLOSEST(mclk_rate, bclk_rate); + div_lrck = bclk_rate / params_rate(params); + regmap_update_bits(i2s->regmap, I2S_CKR, + I2S_CKR_MDIV_MASK, +@@ -422,6 +445,16 @@ static int rockchip_i2s_trigger(struct snd_pcm_substream *substream, + return ret; + } + ++static int rockchip_i2s_set_bclk_ratio(struct snd_soc_dai *dai, ++ unsigned int ratio) ++{ ++ struct rk_i2s_dev *i2s = to_info(dai); ++ ++ i2s->bclk_ratio = ratio; ++ ++ return 0; ++} ++ + static int rockchip_i2s_set_sysclk(struct snd_soc_dai *cpu_dai, int clk_id, + unsigned int freq, int dir) + { +@@ -442,14 +475,16 @@ static int rockchip_i2s_dai_probe(struct snd_soc_dai *dai) + { + struct rk_i2s_dev *i2s = snd_soc_dai_get_drvdata(dai); + +- dai->capture_dma_data = &i2s->capture_dma_data; +- dai->playback_dma_data = &i2s->playback_dma_data; ++ snd_soc_dai_init_dma_data(dai, ++ i2s->has_playback ? &i2s->playback_dma_data : NULL, ++ i2s->has_capture ? &i2s->capture_dma_data : NULL); + + return 0; + } + + static const struct snd_soc_dai_ops rockchip_i2s_dai_ops = { + .hw_params = rockchip_i2s_hw_params, ++ .set_bclk_ratio = rockchip_i2s_set_bclk_ratio, + .set_sysclk = rockchip_i2s_set_sysclk, + .set_fmt = rockchip_i2s_set_fmt, + .trigger = rockchip_i2s_trigger, +@@ -457,28 +492,6 @@ static const struct snd_soc_dai_ops rockchip_i2s_dai_ops = { + + static struct snd_soc_dai_driver rockchip_i2s_dai = { + .probe = rockchip_i2s_dai_probe, +- .playback = { +- .stream_name = "Playback", +- .channels_min = 2, +- .channels_max = 8, +- .rates = SNDRV_PCM_RATE_8000_192000, +- .formats = (SNDRV_PCM_FMTBIT_S8 | +- SNDRV_PCM_FMTBIT_S16_LE | +- SNDRV_PCM_FMTBIT_S20_3LE | +- SNDRV_PCM_FMTBIT_S24_LE | +- SNDRV_PCM_FMTBIT_S32_LE), +- }, +- .capture = { +- .stream_name = "Capture", +- .channels_min = 2, +- .channels_max = 2, +- .rates = SNDRV_PCM_RATE_8000_192000, +- .formats = (SNDRV_PCM_FMTBIT_S8 | +- SNDRV_PCM_FMTBIT_S16_LE | +- SNDRV_PCM_FMTBIT_S20_3LE | +- SNDRV_PCM_FMTBIT_S24_LE | +- SNDRV_PCM_FMTBIT_S32_LE), +- }, + .ops = &rockchip_i2s_dai_ops, + .symmetric_rates = 1, + }; +@@ -575,29 +588,108 @@ static const struct rk_i2s_pins rk3399_i2s_pins = { + .shift = 11, + }; + +-static const struct of_device_id rockchip_i2s_match[] = { ++static const struct of_device_id rockchip_i2s_match[] __maybe_unused = { ++ { .compatible = "rockchip,px30-i2s", }, ++ { .compatible = "rockchip,rk1808-i2s", }, ++ { .compatible = "rockchip,rk3036-i2s", }, + { .compatible = "rockchip,rk3066-i2s", }, ++ { .compatible = "rockchip,rk3128-i2s", }, + { .compatible = "rockchip,rk3188-i2s", }, ++ { .compatible = "rockchip,rk3228-i2s", }, + { .compatible = "rockchip,rk3288-i2s", }, ++ { .compatible = "rockchip,rk3308-i2s", }, ++ { .compatible = "rockchip,rk3328-i2s", }, ++ { .compatible = "rockchip,rk3366-i2s", }, ++ { .compatible = "rockchip,rk3368-i2s", }, + { .compatible = "rockchip,rk3399-i2s", .data = &rk3399_i2s_pins }, ++ { .compatible = "rockchip,rv1126-i2s", }, + {}, + }; + ++static int rockchip_i2s_init_dai(struct rk_i2s_dev *i2s, struct resource *res, ++ struct snd_soc_dai_driver **dp) ++{ ++ struct device_node *node = i2s->dev->of_node; ++ struct snd_soc_dai_driver *dai; ++ struct property *dma_names; ++ const char *dma_name; ++ unsigned int val; ++ ++ of_property_for_each_string(node, "dma-names", dma_names, dma_name) { ++ if (!strcmp(dma_name, "tx")) ++ i2s->has_playback = true; ++ if (!strcmp(dma_name, "rx")) ++ i2s->has_capture = true; ++ } ++ ++ dai = devm_kmemdup(i2s->dev, &rockchip_i2s_dai, ++ sizeof(*dai), GFP_KERNEL); ++ if (!dai) ++ return -ENOMEM; ++ ++ if (i2s->has_playback) { ++ dai->playback.stream_name = "Playback"; ++ dai->playback.channels_min = 2; ++ dai->playback.channels_max = 8; ++ dai->playback.rates = SNDRV_PCM_RATE_8000_192000; ++ dai->playback.formats = SNDRV_PCM_FMTBIT_S8 | ++ SNDRV_PCM_FMTBIT_S16_LE | ++ SNDRV_PCM_FMTBIT_S20_3LE | ++ SNDRV_PCM_FMTBIT_S24_LE | ++ SNDRV_PCM_FMTBIT_S32_LE; ++ ++ i2s->playback_dma_data.addr = res->start + I2S_TXDR; ++ i2s->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; ++ i2s->playback_dma_data.maxburst = 8; ++ ++ if (!of_property_read_u32(node, "rockchip,playback-channels", &val)) { ++ if (val >= 2 && val <= 8) ++ dai->playback.channels_max = val; ++ } ++ } ++ ++ if (i2s->has_capture) { ++ dai->capture.stream_name = "Capture"; ++ dai->capture.channels_min = 2; ++ dai->capture.channels_max = 8; ++ dai->capture.rates = SNDRV_PCM_RATE_8000_192000; ++ dai->capture.formats = SNDRV_PCM_FMTBIT_S8 | ++ SNDRV_PCM_FMTBIT_S16_LE | ++ SNDRV_PCM_FMTBIT_S20_3LE | ++ SNDRV_PCM_FMTBIT_S24_LE | ++ SNDRV_PCM_FMTBIT_S32_LE; ++ ++ i2s->capture_dma_data.addr = res->start + I2S_RXDR; ++ i2s->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; ++ i2s->capture_dma_data.maxburst = 8; ++ ++ if (!of_property_read_u32(node, "rockchip,capture-channels", &val)) { ++ if (val >= 2 && val <= 8) ++ dai->capture.channels_max = val; ++ } ++ } ++ ++ if (dp) ++ *dp = dai; ++ ++ return 0; ++} ++ + static int rockchip_i2s_probe(struct platform_device *pdev) + { + struct device_node *node = pdev->dev.of_node; + const struct of_device_id *of_id; + struct rk_i2s_dev *i2s; +- struct snd_soc_dai_driver *soc_dai; ++ struct snd_soc_dai_driver *dai; + struct resource *res; + void __iomem *regs; + int ret; +- int val; + + i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL); + if (!i2s) + return -ENOMEM; + ++ spin_lock_init(&i2s->lock); + i2s->dev = &pdev->dev; + + i2s->grf = syscon_regmap_lookup_by_phandle(node, "rockchip,grf"); +@@ -609,26 +701,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev) + i2s->pins = of_id->data; + } + +- /* try to prepare related clocks */ +- i2s->hclk = devm_clk_get(&pdev->dev, "i2s_hclk"); +- if (IS_ERR(i2s->hclk)) { +- dev_err(&pdev->dev, "Can't retrieve i2s bus clock\n"); +- return PTR_ERR(i2s->hclk); +- } +- ret = clk_prepare_enable(i2s->hclk); +- if (ret) { +- dev_err(i2s->dev, "hclock enable failed %d\n", ret); +- return ret; +- } +- +- i2s->mclk = devm_clk_get(&pdev->dev, "i2s_clk"); +- if (IS_ERR(i2s->mclk)) { +- dev_err(&pdev->dev, "Can't retrieve i2s master clock\n"); +- return PTR_ERR(i2s->mclk); +- } +- +- res = platform_get_resource(pdev, IORESOURCE_MEM, 0); +- regs = devm_ioremap_resource(&pdev->dev, res); ++ regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res); + if (IS_ERR(regs)) + return PTR_ERR(regs); + +@@ -640,16 +713,28 @@ static int rockchip_i2s_probe(struct platform_device *pdev) + return PTR_ERR(i2s->regmap); + } + +- i2s->playback_dma_data.addr = res->start + I2S_TXDR; +- i2s->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; +- i2s->playback_dma_data.maxburst = 4; +- +- i2s->capture_dma_data.addr = res->start + I2S_RXDR; +- i2s->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; +- i2s->capture_dma_data.maxburst = 4; ++ i2s->bclk_ratio = 64; + + dev_set_drvdata(&pdev->dev, i2s); + ++ i2s->mclk = devm_clk_get(&pdev->dev, "i2s_clk"); ++ if (IS_ERR(i2s->mclk)) { ++ dev_err(&pdev->dev, "Can't retrieve i2s master clock\n"); ++ return PTR_ERR(i2s->mclk); ++ } ++ ++ /* try to prepare related clocks */ ++ i2s->hclk = devm_clk_get(&pdev->dev, "i2s_hclk"); ++ if (IS_ERR(i2s->hclk)) { ++ dev_err(&pdev->dev, "Can't retrieve i2s bus clock\n"); ++ return PTR_ERR(i2s->hclk); ++ } ++ ret = clk_prepare_enable(i2s->hclk); ++ if (ret) { ++ dev_err(i2s->dev, "hclock enable failed %d\n", ret); ++ return ret; ++ } ++ + pm_runtime_enable(&pdev->dev); + if (!pm_runtime_enabled(&pdev->dev)) { + ret = i2s_runtime_resume(&pdev->dev); +@@ -657,33 +742,20 @@ static int rockchip_i2s_probe(struct platform_device *pdev) + goto err_pm_disable; + } + +- soc_dai = devm_kmemdup(&pdev->dev, &rockchip_i2s_dai, +- sizeof(*soc_dai), GFP_KERNEL); +- if (!soc_dai) { +- ret = -ENOMEM; ++ ret = rockchip_i2s_init_dai(i2s, res, &dai); ++ if (ret) + goto err_pm_disable; +- } +- +- if (!of_property_read_u32(node, "rockchip,playback-channels", &val)) { +- if (val >= 2 && val <= 8) +- soc_dai->playback.channels_max = val; +- } +- +- if (!of_property_read_u32(node, "rockchip,capture-channels", &val)) { +- if (val >= 2 && val <= 8) +- soc_dai->capture.channels_max = val; +- } + + ret = devm_snd_soc_register_component(&pdev->dev, + &rockchip_i2s_component, +- soc_dai, 1); ++ dai, 1); + + if (ret) { + dev_err(&pdev->dev, "Could not register DAI\n"); + goto err_suspend; + } + +- ret = rockchip_pcm_platform_register(&pdev->dev); ++ ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); + if (ret) { + dev_err(&pdev->dev, "Could not register PCM\n"); + goto err_suspend; +@@ -697,6 +769,8 @@ static int rockchip_i2s_probe(struct platform_device *pdev) + err_pm_disable: + pm_runtime_disable(&pdev->dev); + ++ clk_disable_unprepare(i2s->hclk); ++ + return ret; + } + +diff --git a/sound/soc/rockchip/rockchip_i2s.h b/sound/soc/rockchip/rockchip_i2s.h +index fcaae24e4..251851bf4 100644 +--- a/sound/soc/rockchip/rockchip_i2s.h ++++ b/sound/soc/rockchip/rockchip_i2s.h +@@ -88,15 +88,17 @@ + #define I2S_CKR_MSS_SLAVE (1 << I2S_CKR_MSS_SHIFT) + #define I2S_CKR_MSS_MASK (1 << I2S_CKR_MSS_SHIFT) + #define I2S_CKR_CKP_SHIFT 26 +-#define I2S_CKR_CKP_NEG (0 << I2S_CKR_CKP_SHIFT) +-#define I2S_CKR_CKP_POS (1 << I2S_CKR_CKP_SHIFT) ++#define I2S_CKR_CKP_NORMAL (0 << I2S_CKR_CKP_SHIFT) ++#define I2S_CKR_CKP_INVERTED (1 << I2S_CKR_CKP_SHIFT) + #define I2S_CKR_CKP_MASK (1 << I2S_CKR_CKP_SHIFT) + #define I2S_CKR_RLP_SHIFT 25 + #define I2S_CKR_RLP_NORMAL (0 << I2S_CKR_RLP_SHIFT) +-#define I2S_CKR_RLP_OPPSITE (1 << I2S_CKR_RLP_SHIFT) ++#define I2S_CKR_RLP_INVERTED (1 << I2S_CKR_RLP_SHIFT) ++#define I2S_CKR_RLP_MASK (1 << I2S_CKR_RLP_SHIFT) + #define I2S_CKR_TLP_SHIFT 24 + #define I2S_CKR_TLP_NORMAL (0 << I2S_CKR_TLP_SHIFT) +-#define I2S_CKR_TLP_OPPSITE (1 << I2S_CKR_TLP_SHIFT) ++#define I2S_CKR_TLP_INVERTED (1 << I2S_CKR_TLP_SHIFT) ++#define I2S_CKR_TLP_MASK (1 << I2S_CKR_TLP_SHIFT) + #define I2S_CKR_MDIV_SHIFT 16 + #define I2S_CKR_MDIV(x) ((x - 1) << I2S_CKR_MDIV_SHIFT) + #define I2S_CKR_MDIV_MASK (0xff << I2S_CKR_MDIV_SHIFT) +diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c +new file mode 100644 +index 000000000..81865dcdb +--- /dev/null ++++ b/sound/soc/rockchip/rockchip_i2s_tdm.c +@@ -0,0 +1,1952 @@ ++/* sound/soc/rockchip/rockchip_i2s_tdm.c ++ * ++ * ALSA SoC Audio Layer - Rockchip I2S/TDM Controller driver ++ * ++ * Copyright (c) 2018 Rockchip Electronics Co. Ltd. ++ * Author: Sugar Zhang ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "rockchip_i2s_tdm.h" ++ ++#define DRV_NAME "rockchip-i2s-tdm" ++ ++#define DEFAULT_MCLK_FS 256 ++#define CH_GRP_MAX 4 /* The max channel 8 / 2 */ ++#define MULTIPLEX_CH_MAX 10 ++#define CLK_PPM_MIN (-1000) ++#define CLK_PPM_MAX (1000) ++ ++struct txrx_config { ++ u32 addr; ++ u32 reg; ++ u32 txonly; ++ u32 rxonly; ++}; ++ ++struct rk_i2s_soc_data { ++ u32 softrst_offset; ++ u32 grf_reg_offset; ++ u32 grf_shift; ++ int config_count; ++ const struct txrx_config *configs; ++ int (*init)(struct device *dev, u32 addr); ++}; ++ ++struct rk_i2s_tdm_dev { ++ struct device *dev; ++ struct clk *hclk; ++ struct clk *mclk_tx; ++ struct clk *mclk_rx; ++ /* The mclk_tx_src is parent of mclk_tx */ ++ struct clk *mclk_tx_src; ++ /* The mclk_rx_src is parent of mclk_rx */ ++ struct clk *mclk_rx_src; ++ /* ++ * The mclk_root0 and mclk_root1 are root parent and supplies for ++ * the different FS. ++ * ++ * e.g: ++ * mclk_root0 is VPLL0, used for FS=48000Hz ++ * mclk_root0 is VPLL1, used for FS=44100Hz ++ */ ++ struct clk *mclk_root0; ++ struct clk *mclk_root1; ++ struct regmap *regmap; ++ struct regmap *grf; ++ struct snd_dmaengine_dai_dma_data capture_dma_data; ++ struct snd_dmaengine_dai_dma_data playback_dma_data; ++ struct reset_control *tx_reset; ++ struct reset_control *rx_reset; ++ const struct rk_i2s_soc_data *soc_data; ++ void __iomem *cru_base; ++ bool is_master_mode; ++ bool io_multiplex; ++ bool mclk_calibrate; ++ bool tdm_mode; ++ bool tdm_fsync_half_frame; ++ unsigned int mclk_rx_freq; ++ unsigned int mclk_tx_freq; ++ unsigned int mclk_root0_freq; ++ unsigned int mclk_root1_freq; ++ unsigned int mclk_root0_initial_freq; ++ unsigned int mclk_root1_initial_freq; ++ unsigned int bclk_fs; ++ unsigned int clk_trcm; ++ unsigned int i2s_sdis[CH_GRP_MAX]; ++ unsigned int i2s_sdos[CH_GRP_MAX]; ++ int clk_ppm; ++ int tx_reset_id; ++ int rx_reset_id; ++ atomic_t refcount; ++ spinlock_t lock; /* xfer lock */ ++}; ++ ++static int to_ch_num(unsigned int val) ++{ ++ int chs; ++ ++ switch (val) { ++ case I2S_CHN_4: ++ chs = 4; ++ break; ++ case I2S_CHN_6: ++ chs = 6; ++ break; ++ case I2S_CHN_8: ++ chs = 8; ++ break; ++ default: ++ chs = 2; ++ break; ++ } ++ ++ return chs; ++} ++ ++static int i2s_tdm_runtime_suspend(struct device *dev) ++{ ++ struct rk_i2s_tdm_dev *i2s_tdm = dev_get_drvdata(dev); ++ ++ regcache_cache_only(i2s_tdm->regmap, true); ++ if (!IS_ERR(i2s_tdm->mclk_tx)) ++ clk_disable_unprepare(i2s_tdm->mclk_tx); ++ if (!IS_ERR(i2s_tdm->mclk_rx)) ++ clk_disable_unprepare(i2s_tdm->mclk_rx); ++ ++ return 0; ++} ++ ++static int i2s_tdm_runtime_resume(struct device *dev) ++{ ++ struct rk_i2s_tdm_dev *i2s_tdm = dev_get_drvdata(dev); ++ int ret; ++ ++ if (!IS_ERR(i2s_tdm->mclk_tx)) ++ clk_prepare_enable(i2s_tdm->mclk_tx); ++ if (!IS_ERR(i2s_tdm->mclk_rx)) ++ clk_prepare_enable(i2s_tdm->mclk_rx); ++ ++ regcache_cache_only(i2s_tdm->regmap, false); ++ regcache_mark_dirty(i2s_tdm->regmap); ++ ++ ret = regcache_sync(i2s_tdm->regmap); ++ if (ret) { ++ if (!IS_ERR(i2s_tdm->mclk_tx)) ++ clk_disable_unprepare(i2s_tdm->mclk_tx); ++ if (!IS_ERR(i2s_tdm->mclk_rx)) ++ clk_disable_unprepare(i2s_tdm->mclk_rx); ++ } ++ ++ return ret; ++} ++ ++static inline struct rk_i2s_tdm_dev *to_info(struct snd_soc_dai *dai) ++{ ++ return snd_soc_dai_get_drvdata(dai); ++} ++ ++#if defined(CONFIG_ARM) && !defined(writeq) ++static inline void __raw_writeq(u64 val, volatile void __iomem *addr) ++{ ++ asm volatile("strd %0, %H0, [%1]" : : "r" (val), "r" (addr)); ++} ++#define writeq(v,c) ({ __iowmb(); __raw_writeq((__force u64) cpu_to_le64(v), c); }) ++#endif ++ ++static void rockchip_snd_xfer_reset_assert(struct rk_i2s_tdm_dev *i2s_tdm, ++ int tx_bank, int tx_offset, ++ int rx_bank, int rx_offset) ++{ ++ void __iomem *cru_reset, *addr; ++ unsigned long flags; ++ u64 val; ++ ++ cru_reset = i2s_tdm->cru_base + i2s_tdm->soc_data->softrst_offset; ++ ++ switch (abs(tx_bank - rx_bank)) { ++ case 0: ++ writel(BIT(tx_offset) | BIT(rx_offset) | ++ (BIT(tx_offset) << 16) | (BIT(rx_offset) << 16), ++ cru_reset + (tx_bank * 4)); ++ break; ++ case 1: ++ if (tx_bank < rx_bank) { ++ val = BIT(rx_offset) | (BIT(rx_offset) << 16); ++ val <<= 32; ++ val |= BIT(tx_offset) | (BIT(tx_offset) << 16); ++ addr = cru_reset + (tx_bank * 4); ++ } else { ++ val = BIT(tx_offset) | (BIT(tx_offset) << 16); ++ val <<= 32; ++ val |= BIT(rx_offset) | (BIT(rx_offset) << 16); ++ addr = cru_reset + (rx_bank * 4); ++ } ++ ++ if (IS_ALIGNED((uintptr_t)addr, 8)) { ++ writeq(val, addr); ++ break; ++ } ++ /* fall through */ ++ default: ++ local_irq_save(flags); ++ writel(BIT(tx_offset) | (BIT(tx_offset) << 16), ++ cru_reset + (tx_bank * 4)); ++ writel(BIT(rx_offset) | (BIT(rx_offset) << 16), ++ cru_reset + (rx_bank * 4)); ++ local_irq_restore(flags); ++ break; ++ } ++ /* delay for reset assert done */ ++ udelay(10); ++} ++ ++static void rockchip_snd_xfer_reset_deassert(struct rk_i2s_tdm_dev *i2s_tdm, ++ int tx_bank, int tx_offset, ++ int rx_bank, int rx_offset) ++{ ++ void __iomem *cru_reset, *addr; ++ unsigned long flags; ++ u64 val; ++ ++ cru_reset = i2s_tdm->cru_base + i2s_tdm->soc_data->softrst_offset; ++ ++ switch (abs(tx_bank - rx_bank)) { ++ case 0: ++ writel((BIT(tx_offset) << 16) | (BIT(rx_offset) << 16), ++ cru_reset + (tx_bank * 4)); ++ break; ++ case 1: ++ if (tx_bank < rx_bank) { ++ val = (BIT(rx_offset) << 16); ++ val <<= 32; ++ val |= (BIT(tx_offset) << 16); ++ addr = cru_reset + (tx_bank * 4); ++ } else { ++ val = (BIT(tx_offset) << 16); ++ val <<= 32; ++ val |= (BIT(rx_offset) << 16); ++ addr = cru_reset + (rx_bank * 4); ++ } ++ ++ if (IS_ALIGNED((uintptr_t)addr, 8)) { ++ writeq(val, addr); ++ break; ++ } ++ /* fall through */ ++ default: ++ local_irq_save(flags); ++ writel((BIT(tx_offset) << 16), ++ cru_reset + (tx_bank * 4)); ++ writel((BIT(rx_offset) << 16), ++ cru_reset + (rx_bank * 4)); ++ local_irq_restore(flags); ++ break; ++ } ++ /* delay for reset deassert done */ ++ udelay(10); ++} ++ ++/* ++ * make sure both tx and rx are reset at the same time for sync lrck ++ * when clk_trcm > 0 ++ */ ++static void rockchip_snd_xfer_sync_reset(struct rk_i2s_tdm_dev *i2s_tdm) ++{ ++ int tx_id, rx_id; ++ int tx_bank, rx_bank, tx_offset, rx_offset; ++ ++ if (!i2s_tdm->cru_base || !i2s_tdm->soc_data) ++ return; ++ ++ tx_id = i2s_tdm->tx_reset_id; ++ rx_id = i2s_tdm->rx_reset_id; ++ if (tx_id < 0 || rx_id < 0) ++ return; ++ ++ tx_bank = tx_id / 16; ++ tx_offset = tx_id % 16; ++ rx_bank = rx_id / 16; ++ rx_offset = rx_id % 16; ++ dev_dbg(i2s_tdm->dev, ++ "tx_bank: %d, rx_bank: %d,tx_offset: %d, rx_offset: %d\n", ++ tx_bank, rx_bank, tx_offset, rx_offset); ++ ++ rockchip_snd_xfer_reset_assert(i2s_tdm, tx_bank, tx_offset, ++ rx_bank, rx_offset); ++ rockchip_snd_xfer_reset_deassert(i2s_tdm, tx_bank, tx_offset, ++ rx_bank, rx_offset); ++} ++ ++/* only used when clk_trcm > 0 */ ++static void rockchip_snd_txrxctrl(struct snd_pcm_substream *substream, ++ struct snd_soc_dai *dai, int on) ++{ ++ struct rk_i2s_tdm_dev *i2s_tdm = to_info(dai); ++ unsigned int val = 0; ++ unsigned long flags; ++ int retry = 10; ++ ++ spin_lock_irqsave(&i2s_tdm->lock, flags); ++ if (on) { ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ regmap_update_bits(i2s_tdm->regmap, I2S_DMACR, ++ I2S_DMACR_TDE_ENABLE, ++ I2S_DMACR_TDE_ENABLE); ++ else ++ regmap_update_bits(i2s_tdm->regmap, I2S_DMACR, ++ I2S_DMACR_RDE_ENABLE, ++ I2S_DMACR_RDE_ENABLE); ++ ++ if (atomic_inc_return(&i2s_tdm->refcount) == 1) { ++ rockchip_snd_xfer_sync_reset(i2s_tdm); ++ regmap_update_bits(i2s_tdm->regmap, I2S_XFER, ++ I2S_XFER_TXS_START | ++ I2S_XFER_RXS_START, ++ I2S_XFER_TXS_START | ++ I2S_XFER_RXS_START); ++ } ++ } else { ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ regmap_update_bits(i2s_tdm->regmap, I2S_DMACR, ++ I2S_DMACR_TDE_ENABLE, ++ I2S_DMACR_TDE_DISABLE); ++ else ++ regmap_update_bits(i2s_tdm->regmap, I2S_DMACR, ++ I2S_DMACR_RDE_ENABLE, ++ I2S_DMACR_RDE_DISABLE); ++ ++ if (atomic_dec_and_test(&i2s_tdm->refcount)) { ++ regmap_update_bits(i2s_tdm->regmap, I2S_XFER, ++ I2S_XFER_TXS_START | ++ I2S_XFER_RXS_START, ++ I2S_XFER_TXS_STOP | ++ I2S_XFER_RXS_STOP); ++ ++ udelay(150); ++ regmap_update_bits(i2s_tdm->regmap, I2S_CLR, ++ I2S_CLR_TXC | I2S_CLR_RXC, ++ I2S_CLR_TXC | I2S_CLR_RXC); ++ ++ regmap_read(i2s_tdm->regmap, I2S_CLR, &val); ++ ++ /* Should wait for clear operation to finish */ ++ while (val) { ++ regmap_read(i2s_tdm->regmap, I2S_CLR, &val); ++ retry--; ++ if (!retry) { ++ dev_info(i2s_tdm->dev, "reset txrx\n"); ++ rockchip_snd_xfer_sync_reset(i2s_tdm); ++ break; ++ } ++ } ++ } ++ } ++ spin_unlock_irqrestore(&i2s_tdm->lock, flags); ++} ++ ++static void rockchip_snd_reset(struct reset_control *rc) ++{ ++ if (IS_ERR(rc)) ++ return; ++ ++ reset_control_assert(rc); ++ /* delay for reset assert done */ ++ udelay(10); ++ reset_control_deassert(rc); ++ /* delay for reset deassert done */ ++ udelay(10); ++} ++ ++static void rockchip_snd_txctrl(struct rk_i2s_tdm_dev *i2s_tdm, int on) ++{ ++ unsigned int val = 0; ++ int retry = 10; ++ ++ if (on) { ++ regmap_update_bits(i2s_tdm->regmap, I2S_DMACR, ++ I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_ENABLE); ++ ++ regmap_update_bits(i2s_tdm->regmap, I2S_XFER, ++ I2S_XFER_TXS_START, ++ I2S_XFER_TXS_START); ++ } else { ++ regmap_update_bits(i2s_tdm->regmap, I2S_DMACR, ++ I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_DISABLE); ++ ++ regmap_update_bits(i2s_tdm->regmap, I2S_XFER, ++ I2S_XFER_TXS_START, ++ I2S_XFER_TXS_STOP); ++ ++ udelay(150); ++ regmap_update_bits(i2s_tdm->regmap, I2S_CLR, ++ I2S_CLR_TXC, ++ I2S_CLR_TXC); ++ ++ regmap_read(i2s_tdm->regmap, I2S_CLR, &val); ++ ++ /* Should wait for clear operation to finish */ ++ while (val) { ++ regmap_read(i2s_tdm->regmap, I2S_CLR, &val); ++ retry--; ++ if (!retry) { ++ dev_warn(i2s_tdm->dev, "reset tx\n"); ++ rockchip_snd_reset(i2s_tdm->tx_reset); ++ break; ++ } ++ } ++ } ++} ++ ++static void rockchip_snd_rxctrl(struct rk_i2s_tdm_dev *i2s_tdm, int on) ++{ ++ unsigned int val = 0; ++ int retry = 10; ++ ++ if (on) { ++ regmap_update_bits(i2s_tdm->regmap, I2S_DMACR, ++ I2S_DMACR_RDE_ENABLE, I2S_DMACR_RDE_ENABLE); ++ ++ regmap_update_bits(i2s_tdm->regmap, I2S_XFER, ++ I2S_XFER_RXS_START, ++ I2S_XFER_RXS_START); ++ } else { ++ regmap_update_bits(i2s_tdm->regmap, I2S_DMACR, ++ I2S_DMACR_RDE_ENABLE, I2S_DMACR_RDE_DISABLE); ++ ++ regmap_update_bits(i2s_tdm->regmap, I2S_XFER, ++ I2S_XFER_RXS_START, ++ I2S_XFER_RXS_STOP); ++ ++ udelay(150); ++ regmap_update_bits(i2s_tdm->regmap, I2S_CLR, ++ I2S_CLR_RXC, ++ I2S_CLR_RXC); ++ ++ regmap_read(i2s_tdm->regmap, I2S_CLR, &val); ++ ++ /* Should wait for clear operation to finish */ ++ while (val) { ++ regmap_read(i2s_tdm->regmap, I2S_CLR, &val); ++ retry--; ++ if (!retry) { ++ dev_warn(i2s_tdm->dev, "reset rx\n"); ++ rockchip_snd_reset(i2s_tdm->rx_reset); ++ break; ++ } ++ } ++ } ++} ++ ++static int rockchip_i2s_tdm_set_fmt(struct snd_soc_dai *cpu_dai, ++ unsigned int fmt) ++{ ++ struct rk_i2s_tdm_dev *i2s_tdm = to_info(cpu_dai); ++ unsigned int mask = 0, val = 0, tdm_val = 0; ++ int ret = 0; ++ bool is_tdm = i2s_tdm->tdm_mode; ++ ++ pm_runtime_get_sync(cpu_dai->dev); ++ mask = I2S_CKR_MSS_MASK; ++ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { ++ case SND_SOC_DAIFMT_CBS_CFS: ++ val = I2S_CKR_MSS_MASTER; ++ i2s_tdm->is_master_mode = true; ++ break; ++ case SND_SOC_DAIFMT_CBM_CFM: ++ val = I2S_CKR_MSS_SLAVE; ++ i2s_tdm->is_master_mode = false; ++ break; ++ default: ++ ret = -EINVAL; ++ goto err_pm_put; ++ } ++ ++ regmap_update_bits(i2s_tdm->regmap, I2S_CKR, mask, val); ++ ++ mask = I2S_CKR_CKP_MASK | I2S_CKR_TLP_MASK | I2S_CKR_RLP_MASK; ++ switch (fmt & SND_SOC_DAIFMT_INV_MASK) { ++ case SND_SOC_DAIFMT_NB_NF: ++ val = I2S_CKR_CKP_NORMAL | ++ I2S_CKR_TLP_NORMAL | ++ I2S_CKR_RLP_NORMAL; ++ break; ++ case SND_SOC_DAIFMT_NB_IF: ++ val = I2S_CKR_CKP_NORMAL | ++ I2S_CKR_TLP_INVERTED | ++ I2S_CKR_RLP_INVERTED; ++ break; ++ case SND_SOC_DAIFMT_IB_NF: ++ val = I2S_CKR_CKP_INVERTED | ++ I2S_CKR_TLP_NORMAL | ++ I2S_CKR_RLP_NORMAL; ++ break; ++ case SND_SOC_DAIFMT_IB_IF: ++ val = I2S_CKR_CKP_INVERTED | ++ I2S_CKR_TLP_INVERTED | ++ I2S_CKR_RLP_INVERTED; ++ break; ++ default: ++ ret = -EINVAL; ++ goto err_pm_put; ++ } ++ ++ regmap_update_bits(i2s_tdm->regmap, I2S_CKR, mask, val); ++ ++ mask = I2S_TXCR_IBM_MASK | I2S_TXCR_TFS_MASK | I2S_TXCR_PBM_MASK; ++ switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { ++ case SND_SOC_DAIFMT_RIGHT_J: ++ val = I2S_TXCR_IBM_RSJM; ++ break; ++ case SND_SOC_DAIFMT_LEFT_J: ++ val = I2S_TXCR_IBM_LSJM; ++ break; ++ case SND_SOC_DAIFMT_I2S: ++ val = I2S_TXCR_IBM_NORMAL; ++ break; ++ case SND_SOC_DAIFMT_DSP_A: /* PCM no delay mode */ ++ val = I2S_TXCR_TFS_PCM; ++ break; ++ case SND_SOC_DAIFMT_DSP_B: /* PCM delay 1 mode */ ++ val = I2S_TXCR_TFS_PCM | I2S_TXCR_PBM_MODE(1); ++ break; ++ default: ++ ret = -EINVAL; ++ goto err_pm_put; ++ } ++ ++ regmap_update_bits(i2s_tdm->regmap, I2S_TXCR, mask, val); ++ ++ mask = I2S_RXCR_IBM_MASK | I2S_RXCR_TFS_MASK | I2S_RXCR_PBM_MASK; ++ switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { ++ case SND_SOC_DAIFMT_RIGHT_J: ++ val = I2S_RXCR_IBM_RSJM; ++ break; ++ case SND_SOC_DAIFMT_LEFT_J: ++ val = I2S_RXCR_IBM_LSJM; ++ break; ++ case SND_SOC_DAIFMT_I2S: ++ val = I2S_RXCR_IBM_NORMAL; ++ break; ++ case SND_SOC_DAIFMT_DSP_A: /* PCM no delay mode */ ++ val = I2S_RXCR_TFS_PCM; ++ break; ++ case SND_SOC_DAIFMT_DSP_B: /* PCM delay 1 mode */ ++ val = I2S_RXCR_TFS_PCM | I2S_RXCR_PBM_MODE(1); ++ break; ++ default: ++ ret = -EINVAL; ++ goto err_pm_put; ++ } ++ ++ regmap_update_bits(i2s_tdm->regmap, I2S_RXCR, mask, val); ++ ++ if (is_tdm) { ++ switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { ++ case SND_SOC_DAIFMT_RIGHT_J: ++ val = I2S_TXCR_TFS_TDM_I2S; ++ tdm_val = TDM_SHIFT_CTRL(2); ++ break; ++ case SND_SOC_DAIFMT_LEFT_J: ++ val = I2S_TXCR_TFS_TDM_I2S; ++ tdm_val = TDM_SHIFT_CTRL(1); ++ break; ++ case SND_SOC_DAIFMT_I2S: ++ val = I2S_TXCR_TFS_TDM_I2S; ++ tdm_val = TDM_SHIFT_CTRL(0); ++ break; ++ case SND_SOC_DAIFMT_DSP_A: ++ val = I2S_TXCR_TFS_TDM_PCM; ++ tdm_val = TDM_SHIFT_CTRL(0); ++ break; ++ case SND_SOC_DAIFMT_DSP_B: ++ val = I2S_TXCR_TFS_TDM_PCM; ++ tdm_val = TDM_SHIFT_CTRL(2); ++ break; ++ default: ++ ret = -EINVAL; ++ goto err_pm_put; ++ } ++ ++ tdm_val |= TDM_FSYNC_WIDTH_SEL1(1); ++ if (i2s_tdm->tdm_fsync_half_frame) ++ tdm_val |= TDM_FSYNC_WIDTH_HALF_FRAME; ++ else ++ tdm_val |= TDM_FSYNC_WIDTH_ONE_FRAME; ++ ++ mask = I2S_TXCR_TFS_MASK; ++ regmap_update_bits(i2s_tdm->regmap, I2S_TXCR, mask, val); ++ regmap_update_bits(i2s_tdm->regmap, I2S_RXCR, mask, val); ++ ++ mask = TDM_FSYNC_WIDTH_SEL1_MSK | TDM_FSYNC_WIDTH_SEL0_MSK | ++ TDM_SHIFT_CTRL_MSK; ++ regmap_update_bits(i2s_tdm->regmap, I2S_TDM_TXCR, ++ mask, tdm_val); ++ regmap_update_bits(i2s_tdm->regmap, I2S_TDM_RXCR, ++ mask, tdm_val); ++ ++ if (val == I2S_TXCR_TFS_TDM_I2S && !i2s_tdm->tdm_fsync_half_frame) { ++ /* refine frame width for TDM_I2S_ONE_FRAME */ ++ mask = TDM_FRAME_WIDTH_MSK; ++ tdm_val = TDM_FRAME_WIDTH(i2s_tdm->bclk_fs >> 1); ++ regmap_update_bits(i2s_tdm->regmap, I2S_TDM_TXCR, ++ mask, tdm_val); ++ regmap_update_bits(i2s_tdm->regmap, I2S_TDM_RXCR, ++ mask, tdm_val); ++ } ++ } ++ ++err_pm_put: ++ pm_runtime_put(cpu_dai->dev); ++ ++ return ret; ++} ++ ++static void rockchip_i2s_tdm_xfer_pause(struct snd_pcm_substream *substream, ++ struct rk_i2s_tdm_dev *i2s_tdm) ++{ ++ int stream; ++ unsigned int val = 0; ++ int retry = 10; ++ ++ stream = SNDRV_PCM_STREAM_LAST - substream->stream; ++ if (stream == SNDRV_PCM_STREAM_PLAYBACK) ++ regmap_update_bits(i2s_tdm->regmap, I2S_DMACR, ++ I2S_DMACR_TDE_ENABLE, ++ I2S_DMACR_TDE_DISABLE); ++ else ++ regmap_update_bits(i2s_tdm->regmap, I2S_DMACR, ++ I2S_DMACR_RDE_ENABLE, ++ I2S_DMACR_RDE_DISABLE); ++ ++ regmap_update_bits(i2s_tdm->regmap, I2S_XFER, ++ I2S_XFER_TXS_START | ++ I2S_XFER_RXS_START, ++ I2S_XFER_TXS_STOP | ++ I2S_XFER_RXS_STOP); ++ ++ udelay(150); ++ regmap_update_bits(i2s_tdm->regmap, I2S_CLR, ++ I2S_CLR_TXC | I2S_CLR_RXC, ++ I2S_CLR_TXC | I2S_CLR_RXC); ++ ++ regmap_read(i2s_tdm->regmap, I2S_CLR, &val); ++ ++ /* Should wait for clear operation to finish */ ++ while (val) { ++ regmap_read(i2s_tdm->regmap, I2S_CLR, &val); ++ retry--; ++ if (!retry) { ++ dev_info(i2s_tdm->dev, "reset txrx\n"); ++ rockchip_snd_xfer_sync_reset(i2s_tdm); ++ break; ++ } ++ } ++} ++ ++static void rockchip_i2s_tdm_xfer_resume(struct snd_pcm_substream *substream, ++ struct rk_i2s_tdm_dev *i2s_tdm) ++{ ++ int stream; ++ ++ stream = SNDRV_PCM_STREAM_LAST - substream->stream; ++ if (stream == SNDRV_PCM_STREAM_PLAYBACK) ++ regmap_update_bits(i2s_tdm->regmap, I2S_DMACR, ++ I2S_DMACR_TDE_ENABLE, ++ I2S_DMACR_TDE_ENABLE); ++ else ++ regmap_update_bits(i2s_tdm->regmap, I2S_DMACR, ++ I2S_DMACR_RDE_ENABLE, ++ I2S_DMACR_RDE_ENABLE); ++ ++ regmap_update_bits(i2s_tdm->regmap, I2S_XFER, ++ I2S_XFER_TXS_START | ++ I2S_XFER_RXS_START, ++ I2S_XFER_TXS_START | ++ I2S_XFER_RXS_START); ++} ++ ++static int rockchip_i2s_tdm_clk_set_rate(struct rk_i2s_tdm_dev *i2s_tdm, ++ struct clk *clk, unsigned long rate, ++ int ppm) ++{ ++ unsigned long rate_target; ++ int delta, ret; ++ ++ if (ppm == i2s_tdm->clk_ppm) ++ return 0; ++ ++ ret = rockchip_pll_clk_compensation(clk, ppm); ++ if (ret != -ENOSYS) ++ goto out; ++ ++ delta = (ppm < 0) ? -1 : 1; ++ delta *= (int)div64_u64((uint64_t)rate * (uint64_t)abs(ppm) + 500000, 1000000); ++ ++ rate_target = rate + delta; ++ ++ if (!rate_target) ++ return -EINVAL; ++ ++ ret = clk_set_rate(clk, rate_target); ++ if (ret) ++ return ret; ++out: ++ if (!ret) ++ i2s_tdm->clk_ppm = ppm; ++ ++ return ret; ++} ++ ++static int rockchip_i2s_tdm_calibrate_mclk(struct rk_i2s_tdm_dev *i2s_tdm, ++ struct snd_pcm_substream *substream, ++ unsigned int lrck_freq) ++{ ++ struct clk *mclk_root; ++ struct clk *mclk_parent; ++ unsigned int mclk_root_freq; ++ unsigned int mclk_root_initial_freq; ++ unsigned int mclk_parent_freq; ++ unsigned int div, delta; ++ uint64_t ppm; ++ int ret; ++ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ mclk_parent = i2s_tdm->mclk_tx_src; ++ else ++ mclk_parent = i2s_tdm->mclk_rx_src; ++ ++ switch (lrck_freq) { ++ case 8000: ++ case 16000: ++ case 24000: ++ case 32000: ++ case 48000: ++ case 64000: ++ case 96000: ++ case 192000: ++ mclk_root = i2s_tdm->mclk_root0; ++ mclk_root_freq = i2s_tdm->mclk_root0_freq; ++ mclk_root_initial_freq = i2s_tdm->mclk_root0_initial_freq; ++ mclk_parent_freq = DEFAULT_MCLK_FS * 192000; ++ break; ++ case 11025: ++ case 22050: ++ case 44100: ++ case 88200: ++ case 176400: ++ mclk_root = i2s_tdm->mclk_root1; ++ mclk_root_freq = i2s_tdm->mclk_root1_freq; ++ mclk_root_initial_freq = i2s_tdm->mclk_root1_initial_freq; ++ mclk_parent_freq = DEFAULT_MCLK_FS * 176400; ++ break; ++ default: ++ dev_err(i2s_tdm->dev, "Invalid LRCK freq: %u Hz\n", ++ lrck_freq); ++ return -EINVAL; ++ } ++ ++ ret = clk_set_parent(mclk_parent, mclk_root); ++ if (ret) ++ goto out; ++ ++ ret = rockchip_i2s_tdm_clk_set_rate(i2s_tdm, mclk_root, ++ mclk_root_freq, 0); ++ if (ret) ++ goto out; ++ ++ delta = abs(mclk_root_freq % mclk_parent_freq - mclk_parent_freq); ++ ppm = div64_u64((uint64_t)delta * 1000000, (uint64_t)mclk_root_freq); ++ ++ if (ppm) { ++ div = DIV_ROUND_CLOSEST(mclk_root_initial_freq, mclk_parent_freq); ++ if (!div) ++ return -EINVAL; ++ ++ mclk_root_freq = mclk_parent_freq * round_up(div, 2); ++ ++ ret = clk_set_rate(mclk_root, mclk_root_freq); ++ if (ret) ++ goto out; ++ ++ i2s_tdm->mclk_root0_freq = clk_get_rate(i2s_tdm->mclk_root0); ++ i2s_tdm->mclk_root1_freq = clk_get_rate(i2s_tdm->mclk_root1); ++ } ++ ++ ret = clk_set_rate(mclk_parent, mclk_parent_freq); ++ if (ret) ++ goto out; ++ ++out: ++ return ret; ++} ++ ++static int rockchip_i2s_tdm_set_mclk(struct rk_i2s_tdm_dev *i2s_tdm, ++ struct snd_pcm_substream *substream, ++ struct clk **mclk) ++{ ++ unsigned int mclk_freq; ++ int ret; ++ ++ if (i2s_tdm->clk_trcm) { ++ if (i2s_tdm->mclk_tx_freq != i2s_tdm->mclk_rx_freq) { ++ dev_err(i2s_tdm->dev, ++ "clk_trcm, tx: %d and rx: %d should be same\n", ++ i2s_tdm->mclk_tx_freq, ++ i2s_tdm->mclk_rx_freq); ++ ret = -EINVAL; ++ goto err; ++ } ++ ++ ret = clk_set_rate(i2s_tdm->mclk_tx, i2s_tdm->mclk_tx_freq); ++ if (ret) ++ goto err; ++ ++ ret = clk_set_rate(i2s_tdm->mclk_rx, i2s_tdm->mclk_rx_freq); ++ if (ret) ++ goto err; ++ ++ /* mclk_rx is also ok. */ ++ *mclk = i2s_tdm->mclk_tx; ++ } else { ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { ++ *mclk = i2s_tdm->mclk_tx; ++ mclk_freq = i2s_tdm->mclk_tx_freq; ++ } else { ++ *mclk = i2s_tdm->mclk_rx; ++ mclk_freq = i2s_tdm->mclk_rx_freq; ++ } ++ ++ ret = clk_set_rate(*mclk, mclk_freq); ++ if (ret) ++ goto err; ++ } ++ ++ return 0; ++ ++err: ++ return ret; ++} ++ ++static int rockchip_i2s_io_multiplex(struct snd_pcm_substream *substream, ++ struct snd_soc_dai *dai) ++{ ++ struct rk_i2s_tdm_dev *i2s_tdm = to_info(dai); ++ int usable_chs = MULTIPLEX_CH_MAX; ++ unsigned int val = 0; ++ ++ if (!i2s_tdm->io_multiplex) ++ return 0; ++ ++ if (IS_ERR(i2s_tdm->grf)) ++ return 0; ++ ++ if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) { ++ struct snd_pcm_str *playback_str = ++ &substream->pcm->streams[SNDRV_PCM_STREAM_PLAYBACK]; ++ ++ if (playback_str->substream_opened) { ++ regmap_read(i2s_tdm->regmap, I2S_TXCR, &val); ++ val &= I2S_TXCR_CSR_MASK; ++ usable_chs = MULTIPLEX_CH_MAX - to_ch_num(val); ++ } ++ ++ regmap_read(i2s_tdm->regmap, I2S_RXCR, &val); ++ val &= I2S_RXCR_CSR_MASK; ++ ++ if (to_ch_num(val) > usable_chs) { ++ dev_err(i2s_tdm->dev, ++ "Capture chs(%d) > usable chs(%d)\n", ++ to_ch_num(val), usable_chs); ++ return -EINVAL; ++ } ++ ++ switch (val) { ++ case I2S_CHN_4: ++ val = I2S_IO_6CH_OUT_4CH_IN; ++ break; ++ case I2S_CHN_6: ++ val = I2S_IO_4CH_OUT_6CH_IN; ++ break; ++ case I2S_CHN_8: ++ val = I2S_IO_2CH_OUT_8CH_IN; ++ break; ++ default: ++ val = I2S_IO_8CH_OUT_2CH_IN; ++ break; ++ } ++ } else { ++ struct snd_pcm_str *capture_str = ++ &substream->pcm->streams[SNDRV_PCM_STREAM_CAPTURE]; ++ ++ if (capture_str->substream_opened) { ++ regmap_read(i2s_tdm->regmap, I2S_RXCR, &val); ++ val &= I2S_RXCR_CSR_MASK; ++ usable_chs = MULTIPLEX_CH_MAX - to_ch_num(val); ++ } ++ ++ regmap_read(i2s_tdm->regmap, I2S_TXCR, &val); ++ val &= I2S_TXCR_CSR_MASK; ++ ++ if (to_ch_num(val) > usable_chs) { ++ dev_err(i2s_tdm->dev, ++ "Playback chs(%d) > usable chs(%d)\n", ++ to_ch_num(val), usable_chs); ++ return -EINVAL; ++ } ++ ++ switch (val) { ++ case I2S_CHN_4: ++ val = I2S_IO_4CH_OUT_6CH_IN; ++ break; ++ case I2S_CHN_6: ++ val = I2S_IO_6CH_OUT_4CH_IN; ++ break; ++ case I2S_CHN_8: ++ val = I2S_IO_8CH_OUT_2CH_IN; ++ break; ++ default: ++ val = I2S_IO_2CH_OUT_8CH_IN; ++ break; ++ } ++ } ++ ++ val <<= i2s_tdm->soc_data->grf_shift; ++ val |= (I2S_IO_DIRECTION_MASK << i2s_tdm->soc_data->grf_shift) << 16; ++ regmap_write(i2s_tdm->grf, i2s_tdm->soc_data->grf_reg_offset, val); ++ ++ return 0; ++} ++ ++static int rockchip_i2s_trcm_mode(struct snd_pcm_substream *substream, ++ struct snd_soc_dai *dai, ++ unsigned int div_bclk, ++ unsigned int div_lrck, ++ unsigned int fmt) ++{ ++ struct rk_i2s_tdm_dev *i2s_tdm = to_info(dai); ++ unsigned long flags; ++ ++ if (!i2s_tdm->clk_trcm) ++ return 0; ++ ++ spin_lock_irqsave(&i2s_tdm->lock, flags); ++ if (atomic_read(&i2s_tdm->refcount)) ++ rockchip_i2s_tdm_xfer_pause(substream, i2s_tdm); ++ ++ regmap_update_bits(i2s_tdm->regmap, I2S_CLKDIV, ++ I2S_CLKDIV_TXM_MASK | I2S_CLKDIV_RXM_MASK, ++ I2S_CLKDIV_TXM(div_bclk) | I2S_CLKDIV_RXM(div_bclk)); ++ regmap_update_bits(i2s_tdm->regmap, I2S_CKR, ++ I2S_CKR_TSD_MASK | I2S_CKR_RSD_MASK, ++ I2S_CKR_TSD(div_lrck) | I2S_CKR_RSD(div_lrck)); ++ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ regmap_update_bits(i2s_tdm->regmap, I2S_TXCR, ++ I2S_TXCR_VDW_MASK | I2S_TXCR_CSR_MASK, ++ fmt); ++ else ++ regmap_update_bits(i2s_tdm->regmap, I2S_RXCR, ++ I2S_RXCR_VDW_MASK | I2S_RXCR_CSR_MASK, ++ fmt); ++ ++ if (atomic_read(&i2s_tdm->refcount)) ++ rockchip_i2s_tdm_xfer_resume(substream, i2s_tdm); ++ spin_unlock_irqrestore(&i2s_tdm->lock, flags); ++ ++ return 0; ++} ++ ++static int rockchip_i2s_tdm_params_channels(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params, ++ struct snd_soc_dai *dai) ++{ ++ struct rk_i2s_tdm_dev *i2s_tdm = to_info(dai); ++ unsigned int reg_fmt, fmt; ++ int ret = 0; ++ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ reg_fmt = I2S_TXCR; ++ else ++ reg_fmt = I2S_RXCR; ++ ++ regmap_read(i2s_tdm->regmap, reg_fmt, &fmt); ++ fmt &= I2S_TXCR_TFS_MASK; ++ ++ if (fmt == I2S_TXCR_TFS_TDM_I2S && !i2s_tdm->tdm_fsync_half_frame) { ++ switch (params_channels(params)) { ++ case 16: ++ ret = I2S_CHN_8; ++ break; ++ case 12: ++ ret = I2S_CHN_6; ++ break; ++ case 8: ++ ret = I2S_CHN_4; ++ break; ++ case 4: ++ ret = I2S_CHN_2; ++ break; ++ default: ++ ret = -EINVAL; ++ break; ++ } ++ } else { ++ switch (params_channels(params)) { ++ case 8: ++ ret = I2S_CHN_8; ++ break; ++ case 6: ++ ret = I2S_CHN_6; ++ break; ++ case 4: ++ ret = I2S_CHN_4; ++ break; ++ case 2: ++ ret = I2S_CHN_2; ++ break; ++ default: ++ ret = -EINVAL; ++ break; ++ } ++ } ++ ++ return ret; ++} ++ ++static int rockchip_i2s_tdm_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params, ++ struct snd_soc_dai *dai) ++{ ++ struct rk_i2s_tdm_dev *i2s_tdm = to_info(dai); ++ struct clk *mclk; ++ int ret = 0; ++ unsigned int val = 0; ++ unsigned int mclk_rate, bclk_rate, div_bclk = 4, div_lrck = 64; ++ ++ if (i2s_tdm->is_master_mode) { ++ if (i2s_tdm->mclk_calibrate) ++ rockchip_i2s_tdm_calibrate_mclk(i2s_tdm, substream, ++ params_rate(params)); ++ ++ ret = rockchip_i2s_tdm_set_mclk(i2s_tdm, substream, &mclk); ++ if (ret) ++ goto err; ++ ++ mclk_rate = clk_get_rate(mclk); ++ bclk_rate = i2s_tdm->bclk_fs * params_rate(params); ++ if (!bclk_rate) { ++ ret = -EINVAL; ++ goto err; ++ } ++ div_bclk = DIV_ROUND_CLOSEST(mclk_rate, bclk_rate); ++ div_lrck = bclk_rate / params_rate(params); ++ } ++ ++ switch (params_format(params)) { ++ case SNDRV_PCM_FORMAT_S8: ++ val |= I2S_TXCR_VDW(8); ++ break; ++ case SNDRV_PCM_FORMAT_S16_LE: ++ val |= I2S_TXCR_VDW(16); ++ break; ++ case SNDRV_PCM_FORMAT_S20_3LE: ++ val |= I2S_TXCR_VDW(20); ++ break; ++ case SNDRV_PCM_FORMAT_S24_LE: ++ val |= I2S_TXCR_VDW(24); ++ break; ++ case SNDRV_PCM_FORMAT_S32_LE: ++ case SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE: ++ val |= I2S_TXCR_VDW(32); ++ break; ++ default: ++ ret = -EINVAL; ++ goto err; ++ } ++ ++ ret = rockchip_i2s_tdm_params_channels(substream, params, dai); ++ if (ret < 0) ++ goto err; ++ ++ val |= ret; ++ if (i2s_tdm->clk_trcm) { ++ rockchip_i2s_trcm_mode(substream, dai, div_bclk, div_lrck, val); ++ } else if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { ++ regmap_update_bits(i2s_tdm->regmap, I2S_CLKDIV, ++ I2S_CLKDIV_TXM_MASK, ++ I2S_CLKDIV_TXM(div_bclk)); ++ regmap_update_bits(i2s_tdm->regmap, I2S_CKR, ++ I2S_CKR_TSD_MASK, ++ I2S_CKR_TSD(div_lrck)); ++ regmap_update_bits(i2s_tdm->regmap, I2S_TXCR, ++ I2S_TXCR_VDW_MASK | I2S_TXCR_CSR_MASK, ++ val); ++ } else { ++ regmap_update_bits(i2s_tdm->regmap, I2S_CLKDIV, ++ I2S_CLKDIV_RXM_MASK, ++ I2S_CLKDIV_RXM(div_bclk)); ++ regmap_update_bits(i2s_tdm->regmap, I2S_CKR, ++ I2S_CKR_RSD_MASK, ++ I2S_CKR_RSD(div_lrck)); ++ regmap_update_bits(i2s_tdm->regmap, I2S_RXCR, ++ I2S_RXCR_VDW_MASK | I2S_RXCR_CSR_MASK, ++ val); ++ } ++ ++ ret = rockchip_i2s_io_multiplex(substream, dai); ++ ++err: ++ return ret; ++} ++ ++static int rockchip_i2s_tdm_trigger(struct snd_pcm_substream *substream, ++ int cmd, struct snd_soc_dai *dai) ++{ ++ struct rk_i2s_tdm_dev *i2s_tdm = to_info(dai); ++ int ret = 0; ++ ++ switch (cmd) { ++ case SNDRV_PCM_TRIGGER_START: ++ case SNDRV_PCM_TRIGGER_RESUME: ++ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: ++ if (i2s_tdm->clk_trcm) ++ rockchip_snd_txrxctrl(substream, dai, 1); ++ else if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) ++ rockchip_snd_rxctrl(i2s_tdm, 1); ++ else ++ rockchip_snd_txctrl(i2s_tdm, 1); ++ break; ++ case SNDRV_PCM_TRIGGER_SUSPEND: ++ case SNDRV_PCM_TRIGGER_STOP: ++ case SNDRV_PCM_TRIGGER_PAUSE_PUSH: ++ if (i2s_tdm->clk_trcm) ++ rockchip_snd_txrxctrl(substream, dai, 0); ++ else if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) ++ rockchip_snd_rxctrl(i2s_tdm, 0); ++ else ++ rockchip_snd_txctrl(i2s_tdm, 0); ++ break; ++ default: ++ ret = -EINVAL; ++ break; ++ } ++ ++ return ret; ++} ++ ++static int rockchip_i2s_tdm_set_sysclk(struct snd_soc_dai *cpu_dai, int stream, ++ unsigned int freq, int dir) ++{ ++ struct rk_i2s_tdm_dev *i2s_tdm = to_info(cpu_dai); ++ ++ /* Put set mclk rate into rockchip_i2s_tdm_set_mclk() */ ++ if (i2s_tdm->clk_trcm) { ++ i2s_tdm->mclk_tx_freq = freq; ++ i2s_tdm->mclk_rx_freq = freq; ++ } else { ++ if (stream == SNDRV_PCM_STREAM_PLAYBACK) ++ i2s_tdm->mclk_tx_freq = freq; ++ else ++ i2s_tdm->mclk_rx_freq = freq; ++ } ++ ++ dev_dbg(i2s_tdm->dev, "The target mclk_%s freq is: %d\n", ++ stream ? "rx" : "tx", freq); ++ ++ return 0; ++} ++ ++static int rockchip_i2s_tdm_clk_compensation_info(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_info *uinfo) ++{ ++ uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; ++ uinfo->count = 1; ++ uinfo->value.integer.min = CLK_PPM_MIN; ++ uinfo->value.integer.max = CLK_PPM_MAX; ++ uinfo->value.integer.step = 1; ++ ++ return 0; ++} ++ ++static int rockchip_i2s_tdm_clk_compensation_get(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ struct snd_soc_dai *dai = snd_kcontrol_chip(kcontrol); ++ struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_dai_get_drvdata(dai); ++ ++ ucontrol->value.integer.value[0] = i2s_tdm->clk_ppm; ++ ++ return 0; ++} ++ ++static int rockchip_i2s_tdm_clk_compensation_put(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ struct snd_soc_dai *dai = snd_kcontrol_chip(kcontrol); ++ struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_dai_get_drvdata(dai); ++ int ret = 0, ppm = 0; ++ ++ if ((ucontrol->value.integer.value[0] < CLK_PPM_MIN) || ++ (ucontrol->value.integer.value[0] > CLK_PPM_MAX)) ++ return -EINVAL; ++ ++ ppm = ucontrol->value.integer.value[0]; ++ ++ ret = rockchip_i2s_tdm_clk_set_rate(i2s_tdm, i2s_tdm->mclk_root0, ++ i2s_tdm->mclk_root0_freq, ppm); ++ if (ret) ++ return ret; ++ ++ if (clk_is_match(i2s_tdm->mclk_root0, i2s_tdm->mclk_root1)) ++ return 0; ++ ++ ret = rockchip_i2s_tdm_clk_set_rate(i2s_tdm, i2s_tdm->mclk_root1, ++ i2s_tdm->mclk_root1_freq, ppm); ++ ++ return ret; ++} ++ ++static struct snd_kcontrol_new rockchip_i2s_tdm_compensation_control = { ++ .iface = SNDRV_CTL_ELEM_IFACE_PCM, ++ .name = "PCM Clk Compensation In PPM", ++ .info = rockchip_i2s_tdm_clk_compensation_info, ++ .get = rockchip_i2s_tdm_clk_compensation_get, ++ .put = rockchip_i2s_tdm_clk_compensation_put, ++}; ++ ++static int rockchip_i2s_tdm_dai_probe(struct snd_soc_dai *dai) ++{ ++ struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_dai_get_drvdata(dai); ++ ++ dai->capture_dma_data = &i2s_tdm->capture_dma_data; ++ dai->playback_dma_data = &i2s_tdm->playback_dma_data; ++ ++ if (i2s_tdm->mclk_calibrate) ++ snd_soc_add_dai_controls(dai, &rockchip_i2s_tdm_compensation_control, 1); ++ ++ return 0; ++} ++ ++static int rockchip_dai_tdm_slot(struct snd_soc_dai *dai, ++ unsigned int tx_mask, unsigned int rx_mask, ++ int slots, int slot_width) ++{ ++ struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_dai_get_drvdata(dai); ++ unsigned int mask, val; ++ ++ i2s_tdm->tdm_mode = true; ++ i2s_tdm->bclk_fs = slots * slot_width; ++ mask = TDM_SLOT_BIT_WIDTH_MSK | TDM_FRAME_WIDTH_MSK; ++ val = TDM_SLOT_BIT_WIDTH(slot_width) | ++ TDM_FRAME_WIDTH(slots * slot_width); ++ regmap_update_bits(i2s_tdm->regmap, I2S_TDM_TXCR, ++ mask, val); ++ regmap_update_bits(i2s_tdm->regmap, I2S_TDM_RXCR, ++ mask, val); ++ ++ return 0; ++} ++ ++static const struct snd_soc_dai_ops rockchip_i2s_tdm_dai_ops = { ++ .hw_params = rockchip_i2s_tdm_hw_params, ++ .set_sysclk = rockchip_i2s_tdm_set_sysclk, ++ .set_fmt = rockchip_i2s_tdm_set_fmt, ++ .set_tdm_slot = rockchip_dai_tdm_slot, ++ .trigger = rockchip_i2s_tdm_trigger, ++}; ++ ++static const struct snd_soc_component_driver rockchip_i2s_tdm_component = { ++ .name = DRV_NAME, ++}; ++ ++static bool rockchip_i2s_tdm_wr_reg(struct device *dev, unsigned int reg) ++{ ++ switch (reg) { ++ case I2S_TXCR: ++ case I2S_RXCR: ++ case I2S_CKR: ++ case I2S_DMACR: ++ case I2S_INTCR: ++ case I2S_XFER: ++ case I2S_CLR: ++ case I2S_TXDR: ++ case I2S_TDM_TXCR: ++ case I2S_TDM_RXCR: ++ case I2S_CLKDIV: ++ return true; ++ default: ++ return false; ++ } ++} ++ ++static bool rockchip_i2s_tdm_rd_reg(struct device *dev, unsigned int reg) ++{ ++ switch (reg) { ++ case I2S_TXCR: ++ case I2S_RXCR: ++ case I2S_CKR: ++ case I2S_DMACR: ++ case I2S_INTCR: ++ case I2S_XFER: ++ case I2S_CLR: ++ case I2S_TXDR: ++ case I2S_RXDR: ++ case I2S_TXFIFOLR: ++ case I2S_INTSR: ++ case I2S_RXFIFOLR: ++ case I2S_TDM_TXCR: ++ case I2S_TDM_RXCR: ++ case I2S_CLKDIV: ++ return true; ++ default: ++ return false; ++ } ++} ++ ++static bool rockchip_i2s_tdm_volatile_reg(struct device *dev, unsigned int reg) ++{ ++ switch (reg) { ++ case I2S_TXFIFOLR: ++ case I2S_INTSR: ++ case I2S_CLR: ++ case I2S_TXDR: ++ case I2S_RXDR: ++ case I2S_RXFIFOLR: ++ return true; ++ default: ++ return false; ++ } ++} ++ ++static bool rockchip_i2s_tdm_precious_reg(struct device *dev, unsigned int reg) ++{ ++ switch (reg) { ++ case I2S_RXDR: ++ return true; ++ default: ++ return false; ++ } ++} ++ ++static const struct reg_default rockchip_i2s_tdm_reg_defaults[] = { ++ {0x00, 0x7200000f}, ++ {0x04, 0x01c8000f}, ++ {0x08, 0x00001f1f}, ++ {0x10, 0x001f0000}, ++ {0x14, 0x01f00000}, ++ {0x30, 0x00003eff}, ++ {0x34, 0x00003eff}, ++ {0x38, 0x00000707}, ++}; ++ ++static const struct regmap_config rockchip_i2s_tdm_regmap_config = { ++ .reg_bits = 32, ++ .reg_stride = 4, ++ .val_bits = 32, ++ .max_register = I2S_CLKDIV, ++ .reg_defaults = rockchip_i2s_tdm_reg_defaults, ++ .num_reg_defaults = ARRAY_SIZE(rockchip_i2s_tdm_reg_defaults), ++ .writeable_reg = rockchip_i2s_tdm_wr_reg, ++ .readable_reg = rockchip_i2s_tdm_rd_reg, ++ .volatile_reg = rockchip_i2s_tdm_volatile_reg, ++ .precious_reg = rockchip_i2s_tdm_precious_reg, ++ .cache_type = REGCACHE_FLAT, ++}; ++ ++static int common_soc_init(struct device *dev, u32 addr) ++{ ++ struct rk_i2s_tdm_dev *i2s_tdm = dev_get_drvdata(dev); ++ const struct txrx_config *configs = i2s_tdm->soc_data->configs; ++ u32 reg = 0, val = 0, trcm = i2s_tdm->clk_trcm; ++ int i; ++ ++ if (IS_ERR(i2s_tdm->grf)) ++ return 0; ++ ++ switch (trcm) { ++ case I2S_CKR_TRCM_TXONLY: ++ /* fall through */ ++ case I2S_CKR_TRCM_RXONLY: ++ break; ++ default: ++ return 0; ++ } ++ ++ for (i = 0; i < i2s_tdm->soc_data->config_count; i++) { ++ if (addr != configs[i].addr) ++ continue; ++ reg = configs[i].reg; ++ if (trcm == I2S_CKR_TRCM_TXONLY) ++ val = configs[i].txonly; ++ else ++ val = configs[i].rxonly; ++ ++ if (reg) ++ regmap_write(i2s_tdm->grf, reg, val); ++ } ++ ++ return 0; ++} ++ ++static const struct txrx_config px30_txrx_config[] = { ++ { 0xff060000, 0x184, PX30_I2S0_CLK_TXONLY, PX30_I2S0_CLK_RXONLY }, ++}; ++ ++static const struct txrx_config rk1808_txrx_config[] = { ++ { 0xff7e0000, 0x190, RK1808_I2S0_CLK_TXONLY, RK1808_I2S0_CLK_RXONLY }, ++}; ++ ++static const struct txrx_config rk3308_txrx_config[] = { ++ { 0xff300000, 0x308, RK3308_I2S0_CLK_TXONLY, RK3308_I2S0_CLK_RXONLY }, ++ { 0xff310000, 0x308, RK3308_I2S1_CLK_TXONLY, RK3308_I2S1_CLK_RXONLY }, ++}; ++ ++static const struct txrx_config rk3568_txrx_config[] = { ++ { 0xfe410000, 0x504, RK3568_I2S1_CLK_TXONLY, RK3568_I2S1_CLK_RXONLY }, ++ { 0xfe430000, 0x504, RK3568_I2S3_CLK_TXONLY, RK3568_I2S3_CLK_RXONLY }, ++ { 0xfe430000, 0x508, RK3568_I2S3_MCLK_TXONLY, RK3568_I2S3_MCLK_RXONLY }, ++}; ++ ++static const struct txrx_config rv1126_txrx_config[] = { ++ { 0xff800000, 0x10260, RV1126_I2S0_CLK_TXONLY, RV1126_I2S0_CLK_RXONLY }, ++}; ++ ++static const struct rk_i2s_soc_data px30_i2s_soc_data = { ++ .softrst_offset = 0x0300, ++ .configs = px30_txrx_config, ++ .config_count = ARRAY_SIZE(px30_txrx_config), ++ .init = common_soc_init, ++}; ++ ++static const struct rk_i2s_soc_data rk1808_i2s_soc_data = { ++ .softrst_offset = 0x0300, ++ .configs = rk1808_txrx_config, ++ .config_count = ARRAY_SIZE(rk1808_txrx_config), ++ .init = common_soc_init, ++}; ++ ++static const struct rk_i2s_soc_data rk3308_i2s_soc_data = { ++ .softrst_offset = 0x0400, ++ .grf_reg_offset = 0x0308, ++ .grf_shift = 5, ++ .configs = rk3308_txrx_config, ++ .config_count = ARRAY_SIZE(rk3308_txrx_config), ++ .init = common_soc_init, ++}; ++ ++static const struct rk_i2s_soc_data rk3568_i2s_soc_data = { ++ .softrst_offset = 0x0400, ++ .configs = rk3568_txrx_config, ++ .config_count = ARRAY_SIZE(rk3568_txrx_config), ++ .init = common_soc_init, ++}; ++ ++static const struct rk_i2s_soc_data rv1126_i2s_soc_data = { ++ .softrst_offset = 0x0300, ++ .configs = rv1126_txrx_config, ++ .config_count = ARRAY_SIZE(rv1126_txrx_config), ++ .init = common_soc_init, ++}; ++ ++static const struct of_device_id rockchip_i2s_tdm_match[] = { ++ { .compatible = "rockchip,px30-i2s-tdm", .data = &px30_i2s_soc_data }, ++ { .compatible = "rockchip,rk1808-i2s-tdm", .data = &rk1808_i2s_soc_data }, ++ { .compatible = "rockchip,rk3308-i2s-tdm", .data = &rk3308_i2s_soc_data }, ++ { .compatible = "rockchip,rk3568-i2s-tdm", .data = &rk3568_i2s_soc_data }, ++ { .compatible = "rockchip,rk3588-i2s-tdm", }, ++ { .compatible = "rockchip,rv1126-i2s-tdm", .data = &rv1126_i2s_soc_data }, ++ {}, ++}; ++ ++static int of_i2s_resetid_get(struct device_node *node, ++ const char *id) ++{ ++ struct of_phandle_args args; ++ int index = 0; ++ int ret; ++ ++ if (id) ++ index = of_property_match_string(node, ++ "reset-names", id); ++ ret = of_parse_phandle_with_args(node, "resets", "#reset-cells", ++ index, &args); ++ if (ret) ++ return ret; ++ ++ return args.args[0]; ++} ++ ++static int rockchip_i2s_tdm_dai_prepare(struct platform_device *pdev, ++ struct snd_soc_dai_driver **soc_dai) ++{ ++ struct snd_soc_dai_driver rockchip_i2s_tdm_dai = { ++ .probe = rockchip_i2s_tdm_dai_probe, ++ .playback = { ++ .stream_name = "Playback", ++ .channels_min = 2, ++ .channels_max = 16, ++ .rates = SNDRV_PCM_RATE_8000_192000, ++ .formats = (SNDRV_PCM_FMTBIT_S8 | ++ SNDRV_PCM_FMTBIT_S16_LE | ++ SNDRV_PCM_FMTBIT_S20_3LE | ++ SNDRV_PCM_FMTBIT_S24_LE | ++ SNDRV_PCM_FMTBIT_S32_LE | ++ SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE), ++ }, ++ .capture = { ++ .stream_name = "Capture", ++ .channels_min = 2, ++ .channels_max = 16, ++ .rates = SNDRV_PCM_RATE_8000_192000, ++ .formats = (SNDRV_PCM_FMTBIT_S8 | ++ SNDRV_PCM_FMTBIT_S16_LE | ++ SNDRV_PCM_FMTBIT_S20_3LE | ++ SNDRV_PCM_FMTBIT_S24_LE | ++ SNDRV_PCM_FMTBIT_S32_LE | ++ SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE), ++ }, ++ .ops = &rockchip_i2s_tdm_dai_ops, ++ }; ++ ++ *soc_dai = devm_kmemdup(&pdev->dev, &rockchip_i2s_tdm_dai, ++ sizeof(rockchip_i2s_tdm_dai), GFP_KERNEL); ++ if (!(*soc_dai)) ++ return -ENOMEM; ++ ++ return 0; ++} ++ ++static int rockchip_i2s_tdm_path_check(struct rk_i2s_tdm_dev *i2s_tdm, ++ int num, ++ bool is_rx_path) ++{ ++ unsigned int *i2s_data; ++ int i, j, ret = 0; ++ ++ if (is_rx_path) ++ i2s_data = i2s_tdm->i2s_sdis; ++ else ++ i2s_data = i2s_tdm->i2s_sdos; ++ ++ for (i = 0; i < num; i++) { ++ if (i2s_data[i] > CH_GRP_MAX - 1) { ++ dev_err(i2s_tdm->dev, ++ "%s path i2s_data[%d]: %d is overflow, max is: %d\n", ++ is_rx_path ? "RX" : "TX", ++ i, i2s_data[i], CH_GRP_MAX); ++ ret = -EINVAL; ++ goto err; ++ } ++ ++ for (j = 0; j < num; j++) { ++ if (i == j) ++ continue; ++ ++ if (i2s_data[i] == i2s_data[j]) { ++ dev_err(i2s_tdm->dev, ++ "%s path invalid routed i2s_data: [%d]%d == [%d]%d\n", ++ is_rx_path ? "RX" : "TX", ++ i, i2s_data[i], ++ j, i2s_data[j]); ++ ret = -EINVAL; ++ goto err; ++ } ++ } ++ } ++ ++err: ++ return ret; ++} ++ ++static void rockchip_i2s_tdm_tx_path_config(struct rk_i2s_tdm_dev *i2s_tdm, ++ int num) ++{ ++ int idx; ++ ++ for (idx = 0; idx < num; idx++) { ++ regmap_update_bits(i2s_tdm->regmap, I2S_TXCR, ++ I2S_TXCR_PATH_MASK(idx), ++ I2S_TXCR_PATH(idx, i2s_tdm->i2s_sdos[idx])); ++ } ++} ++ ++static void rockchip_i2s_tdm_rx_path_config(struct rk_i2s_tdm_dev *i2s_tdm, ++ int num) ++{ ++ int idx; ++ ++ for (idx = 0; idx < num; idx++) { ++ regmap_update_bits(i2s_tdm->regmap, I2S_RXCR, ++ I2S_RXCR_PATH_MASK(idx), ++ I2S_RXCR_PATH(idx, i2s_tdm->i2s_sdis[idx])); ++ } ++} ++ ++static void rockchip_i2s_tdm_path_config(struct rk_i2s_tdm_dev *i2s_tdm, ++ int num, bool is_rx_path) ++{ ++ if (is_rx_path) ++ rockchip_i2s_tdm_rx_path_config(i2s_tdm, num); ++ else ++ rockchip_i2s_tdm_tx_path_config(i2s_tdm, num); ++} ++ ++static int rockchip_i2s_tdm_path_prepare(struct rk_i2s_tdm_dev *i2s_tdm, ++ struct device_node *np, ++ bool is_rx_path) ++{ ++ char *i2s_tx_path_prop = "rockchip,i2s-tx-route"; ++ char *i2s_rx_path_prop = "rockchip,i2s-rx-route"; ++ char *i2s_path_prop; ++ unsigned int *i2s_data; ++ int num, ret = 0; ++ ++ if (is_rx_path) { ++ i2s_path_prop = i2s_rx_path_prop; ++ i2s_data = i2s_tdm->i2s_sdis; ++ } else { ++ i2s_path_prop = i2s_tx_path_prop; ++ i2s_data = i2s_tdm->i2s_sdos; ++ } ++ ++ num = of_count_phandle_with_args(np, i2s_path_prop, NULL); ++ if (num < 0) { ++ if (num != -ENOENT) { ++ dev_err(i2s_tdm->dev, ++ "Failed to read '%s' num: %d\n", ++ i2s_path_prop, num); ++ ret = num; ++ } ++ goto out; ++ } else if (num != CH_GRP_MAX) { ++ dev_err(i2s_tdm->dev, ++ "The num: %d should be: %d\n", num, CH_GRP_MAX); ++ ret = -EINVAL; ++ goto out; ++ } ++ ++ ret = of_property_read_u32_array(np, i2s_path_prop, ++ i2s_data, num); ++ if (ret < 0) { ++ dev_err(i2s_tdm->dev, ++ "Failed to read '%s': %d\n", ++ i2s_path_prop, ret); ++ goto out; ++ } ++ ++ ret = rockchip_i2s_tdm_path_check(i2s_tdm, num, is_rx_path); ++ if (ret < 0) { ++ dev_err(i2s_tdm->dev, ++ "Failed to check i2s data bus: %d\n", ret); ++ goto out; ++ } ++ ++ rockchip_i2s_tdm_path_config(i2s_tdm, num, is_rx_path); ++ ++out: ++ return ret; ++} ++ ++static int rockchip_i2s_tdm_tx_path_prepare(struct rk_i2s_tdm_dev *i2s_tdm, ++ struct device_node *np) ++{ ++ return rockchip_i2s_tdm_path_prepare(i2s_tdm, np, 0); ++} ++ ++static int rockchip_i2s_tdm_rx_path_prepare(struct rk_i2s_tdm_dev *i2s_tdm, ++ struct device_node *np) ++{ ++ return rockchip_i2s_tdm_path_prepare(i2s_tdm, np, 1); ++} ++ ++static int rockchip_i2s_tdm_probe(struct platform_device *pdev) ++{ ++ struct device_node *node = pdev->dev.of_node; ++ struct device_node *cru_node; ++ const struct of_device_id *of_id; ++ struct rk_i2s_tdm_dev *i2s_tdm; ++ struct snd_soc_dai_driver *soc_dai; ++ struct resource *res; ++ void __iomem *regs; ++ bool sync; ++ int ret; ++ int val; ++ ++ ret = rockchip_i2s_tdm_dai_prepare(pdev, &soc_dai); ++ if (ret) ++ return ret; ++ ++ i2s_tdm = devm_kzalloc(&pdev->dev, sizeof(*i2s_tdm), GFP_KERNEL); ++ if (!i2s_tdm) ++ return -ENOMEM; ++ ++ i2s_tdm->dev = &pdev->dev; ++ ++ of_id = of_match_device(rockchip_i2s_tdm_match, &pdev->dev); ++ if (!of_id) ++ return -EINVAL; ++ ++ spin_lock_init(&i2s_tdm->lock); ++ i2s_tdm->soc_data = (const struct rk_i2s_soc_data *)of_id->data; ++ ++ i2s_tdm->bclk_fs = 64; ++ if (!of_property_read_u32(node, "rockchip,bclk-fs", &val)) { ++ if ((val >= 32) && (val % 2 == 0)) ++ i2s_tdm->bclk_fs = val; ++ } ++ ++ i2s_tdm->clk_trcm = I2S_CKR_TRCM_TXRX; ++ if (!of_property_read_u32(node, "rockchip,clk-trcm", &val)) { ++ if (val >= 0 && val <= 2) { ++ i2s_tdm->clk_trcm = val << I2S_CKR_TRCM_SHIFT; ++ if (i2s_tdm->clk_trcm) ++ soc_dai->symmetric_rates = 1; ++ } ++ } ++ ++ i2s_tdm->tdm_fsync_half_frame = ++ of_property_read_bool(node, "rockchip,tdm-fsync-half-frame"); ++ ++ if (of_property_read_bool(node, "rockchip,playback-only")) ++ soc_dai->capture.channels_min = 0; ++ else if (of_property_read_bool(node, "rockchip,capture-only")) ++ soc_dai->playback.channels_min = 0; ++ ++ i2s_tdm->grf = syscon_regmap_lookup_by_phandle(node, "rockchip,grf"); ++ ++ sync = of_device_is_compatible(node, "rockchip,px30-i2s-tdm") || ++ of_device_is_compatible(node, "rockchip,rk1808-i2s-tdm") || ++ of_device_is_compatible(node, "rockchip,rk3308-i2s-tdm"); ++ ++ if (i2s_tdm->clk_trcm && sync) { ++ cru_node = of_parse_phandle(node, "rockchip,cru", 0); ++ i2s_tdm->cru_base = of_iomap(cru_node, 0); ++ if (!i2s_tdm->cru_base) ++ return -ENOENT; ++ ++ i2s_tdm->tx_reset_id = of_i2s_resetid_get(node, "tx-m"); ++ i2s_tdm->rx_reset_id = of_i2s_resetid_get(node, "rx-m"); ++ } ++ ++ i2s_tdm->tx_reset = devm_reset_control_get(&pdev->dev, "tx-m"); ++ if (IS_ERR(i2s_tdm->tx_reset)) { ++ ret = PTR_ERR(i2s_tdm->tx_reset); ++ if (ret != -ENOENT) ++ return ret; ++ } ++ ++ i2s_tdm->rx_reset = devm_reset_control_get(&pdev->dev, "rx-m"); ++ if (IS_ERR(i2s_tdm->rx_reset)) { ++ ret = PTR_ERR(i2s_tdm->rx_reset); ++ if (ret != -ENOENT) ++ return ret; ++ } ++ ++ i2s_tdm->hclk = devm_clk_get(&pdev->dev, "hclk"); ++ if (IS_ERR(i2s_tdm->hclk)) ++ return PTR_ERR(i2s_tdm->hclk); ++ ++ ret = clk_prepare_enable(i2s_tdm->hclk); ++ if (ret) ++ return ret; ++ ++ i2s_tdm->mclk_tx = devm_clk_get(&pdev->dev, "mclk_tx"); ++ if (IS_ERR(i2s_tdm->mclk_tx)) ++ return PTR_ERR(i2s_tdm->mclk_tx); ++ ++ i2s_tdm->mclk_rx = devm_clk_get(&pdev->dev, "mclk_rx"); ++ if (IS_ERR(i2s_tdm->mclk_rx)) ++ return PTR_ERR(i2s_tdm->mclk_rx); ++ ++ i2s_tdm->io_multiplex = ++ of_property_read_bool(node, "rockchip,io-multiplex"); ++ ++ i2s_tdm->mclk_calibrate = ++ of_property_read_bool(node, "rockchip,mclk-calibrate"); ++ if (i2s_tdm->mclk_calibrate) { ++ i2s_tdm->mclk_tx_src = devm_clk_get(&pdev->dev, "mclk_tx_src"); ++ if (IS_ERR(i2s_tdm->mclk_tx_src)) ++ return PTR_ERR(i2s_tdm->mclk_tx_src); ++ ++ i2s_tdm->mclk_rx_src = devm_clk_get(&pdev->dev, "mclk_rx_src"); ++ if (IS_ERR(i2s_tdm->mclk_rx_src)) ++ return PTR_ERR(i2s_tdm->mclk_rx_src); ++ ++ i2s_tdm->mclk_root0 = devm_clk_get(&pdev->dev, "mclk_root0"); ++ if (IS_ERR(i2s_tdm->mclk_root0)) ++ return PTR_ERR(i2s_tdm->mclk_root0); ++ ++ i2s_tdm->mclk_root1 = devm_clk_get(&pdev->dev, "mclk_root1"); ++ if (IS_ERR(i2s_tdm->mclk_root1)) ++ return PTR_ERR(i2s_tdm->mclk_root1); ++ ++ i2s_tdm->mclk_root0_initial_freq = clk_get_rate(i2s_tdm->mclk_root0); ++ i2s_tdm->mclk_root1_initial_freq = clk_get_rate(i2s_tdm->mclk_root1); ++ i2s_tdm->mclk_root0_freq = i2s_tdm->mclk_root0_initial_freq; ++ i2s_tdm->mclk_root1_freq = i2s_tdm->mclk_root1_initial_freq; ++ } ++ ++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ regs = devm_ioremap_resource(&pdev->dev, res); ++ if (IS_ERR(regs)) ++ return PTR_ERR(regs); ++ ++ i2s_tdm->regmap = devm_regmap_init_mmio(&pdev->dev, regs, ++ &rockchip_i2s_tdm_regmap_config); ++ if (IS_ERR(i2s_tdm->regmap)) ++ return PTR_ERR(i2s_tdm->regmap); ++ ++ i2s_tdm->playback_dma_data.addr = res->start + I2S_TXDR; ++ i2s_tdm->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; ++ i2s_tdm->playback_dma_data.maxburst = 8; ++ ++ i2s_tdm->capture_dma_data.addr = res->start + I2S_RXDR; ++ i2s_tdm->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; ++ i2s_tdm->capture_dma_data.maxburst = 8; ++ ++ ret = rockchip_i2s_tdm_tx_path_prepare(i2s_tdm, node); ++ if (ret < 0) { ++ dev_err(&pdev->dev, "I2S TX path prepare failed: %d\n", ret); ++ return ret; ++ } ++ ++ ret = rockchip_i2s_tdm_rx_path_prepare(i2s_tdm, node); ++ if (ret < 0) { ++ dev_err(&pdev->dev, "I2S RX path prepare failed: %d\n", ret); ++ return ret; ++ } ++ ++ atomic_set(&i2s_tdm->refcount, 0); ++ dev_set_drvdata(&pdev->dev, i2s_tdm); ++ ++ pm_runtime_enable(&pdev->dev); ++ if (!pm_runtime_enabled(&pdev->dev)) { ++ ret = i2s_tdm_runtime_resume(&pdev->dev); ++ if (ret) ++ goto err_pm_disable; ++ } ++ ++ regmap_update_bits(i2s_tdm->regmap, I2S_DMACR, I2S_DMACR_TDL_MASK, ++ I2S_DMACR_TDL(16)); ++ regmap_update_bits(i2s_tdm->regmap, I2S_DMACR, I2S_DMACR_RDL_MASK, ++ I2S_DMACR_RDL(16)); ++ regmap_update_bits(i2s_tdm->regmap, I2S_CKR, ++ I2S_CKR_TRCM_MASK, i2s_tdm->clk_trcm); ++ ++ if (i2s_tdm->soc_data && i2s_tdm->soc_data->init) ++ i2s_tdm->soc_data->init(&pdev->dev, res->start); ++ ++ ret = devm_snd_soc_register_component(&pdev->dev, ++ &rockchip_i2s_tdm_component, ++ soc_dai, 1); ++ ++ if (ret) { ++ dev_err(&pdev->dev, "Could not register DAI\n"); ++ goto err_suspend; ++ } ++ ++ if (of_property_read_bool(node, "rockchip,no-dmaengine")) ++ return ret; ++ ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); ++ if (ret) { ++ dev_err(&pdev->dev, "Could not register PCM\n"); ++ return ret; ++ } ++ ++ return 0; ++ ++err_suspend: ++ if (!pm_runtime_status_suspended(&pdev->dev)) ++ i2s_tdm_runtime_suspend(&pdev->dev); ++err_pm_disable: ++ pm_runtime_disable(&pdev->dev); ++ ++ return ret; ++} ++ ++static int rockchip_i2s_tdm_remove(struct platform_device *pdev) ++{ ++ struct rk_i2s_tdm_dev *i2s_tdm = dev_get_drvdata(&pdev->dev); ++ ++ pm_runtime_disable(&pdev->dev); ++ if (!pm_runtime_status_suspended(&pdev->dev)) ++ i2s_tdm_runtime_suspend(&pdev->dev); ++ ++ if (!IS_ERR(i2s_tdm->mclk_tx)) ++ clk_prepare_enable(i2s_tdm->mclk_tx); ++ if (!IS_ERR(i2s_tdm->mclk_rx)) ++ clk_prepare_enable(i2s_tdm->mclk_rx); ++ if (!IS_ERR(i2s_tdm->hclk)) ++ clk_disable_unprepare(i2s_tdm->hclk); ++ ++ return 0; ++} ++ ++#ifdef CONFIG_PM_SLEEP ++static int rockchip_i2s_tdm_suspend(struct device *dev) ++{ ++ struct rk_i2s_tdm_dev *i2s_tdm = dev_get_drvdata(dev); ++ ++ regcache_mark_dirty(i2s_tdm->regmap); ++ ++ return 0; ++} ++ ++static int rockchip_i2s_tdm_resume(struct device *dev) ++{ ++ struct rk_i2s_tdm_dev *i2s_tdm = dev_get_drvdata(dev); ++ int ret; ++ ++ ret = pm_runtime_get_sync(dev); ++ if (ret < 0) ++ return ret; ++ ret = regcache_sync(i2s_tdm->regmap); ++ pm_runtime_put(dev); ++ ++ return ret; ++} ++#endif ++ ++static const struct dev_pm_ops rockchip_i2s_tdm_pm_ops = { ++ SET_RUNTIME_PM_OPS(i2s_tdm_runtime_suspend, i2s_tdm_runtime_resume, ++ NULL) ++ SET_SYSTEM_SLEEP_PM_OPS(rockchip_i2s_tdm_suspend, ++ rockchip_i2s_tdm_resume) ++}; ++ ++static struct platform_driver rockchip_i2s_tdm_driver = { ++ .probe = rockchip_i2s_tdm_probe, ++ .remove = rockchip_i2s_tdm_remove, ++ .driver = { ++ .name = DRV_NAME, ++ .of_match_table = of_match_ptr(rockchip_i2s_tdm_match), ++ .pm = &rockchip_i2s_tdm_pm_ops, ++ }, ++}; ++module_platform_driver(rockchip_i2s_tdm_driver); ++ ++MODULE_DESCRIPTION("ROCKCHIP I2S/TDM ASoC Interface"); ++MODULE_AUTHOR("Sugar Zhang "); ++MODULE_LICENSE("GPL v2"); ++MODULE_ALIAS("platform:" DRV_NAME); ++MODULE_DEVICE_TABLE(of, rockchip_i2s_tdm_match); +diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.h b/sound/soc/rockchip/rockchip_i2s_tdm.h +new file mode 100644 +index 000000000..fa41f8142 +--- /dev/null ++++ b/sound/soc/rockchip/rockchip_i2s_tdm.h +@@ -0,0 +1,393 @@ ++/* ++ * sound/soc/rockchip/rockchip_i2s_tdm.h ++ * ++ * ALSA SoC Audio Layer - Rockchip I2S_TDM Controller driver ++ * ++ * Copyright (c) 2018 Rockchip Electronics Co. Ltd. ++ * Author: Sugar Zhang ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#ifndef _ROCKCHIP_I2S_TDM_H ++#define _ROCKCHIP_I2S_TDM_H ++ ++/* ++ * TXCR ++ * transmit operation control register ++ */ ++#define I2S_TXCR_PATH_SHIFT(x) (23 + (x) * 2) ++#define I2S_TXCR_PATH_MASK(x) (0x3 << I2S_TXCR_PATH_SHIFT(x)) ++#define I2S_TXCR_PATH(x, v) ((v) << I2S_TXCR_PATH_SHIFT(x)) ++#define I2S_TXCR_RCNT_SHIFT 17 ++#define I2S_TXCR_RCNT_MASK (0x3f << I2S_TXCR_RCNT_SHIFT) ++#define I2S_TXCR_CSR_SHIFT 15 ++#define I2S_TXCR_CSR(x) ((x) << I2S_TXCR_CSR_SHIFT) ++#define I2S_TXCR_CSR_MASK (3 << I2S_TXCR_CSR_SHIFT) ++#define I2S_TXCR_HWT BIT(14) ++#define I2S_TXCR_SJM_SHIFT 12 ++#define I2S_TXCR_SJM_R (0 << I2S_TXCR_SJM_SHIFT) ++#define I2S_TXCR_SJM_L (1 << I2S_TXCR_SJM_SHIFT) ++#define I2S_TXCR_FBM_SHIFT 11 ++#define I2S_TXCR_FBM_MSB (0 << I2S_TXCR_FBM_SHIFT) ++#define I2S_TXCR_FBM_LSB (1 << I2S_TXCR_FBM_SHIFT) ++#define I2S_TXCR_IBM_SHIFT 9 ++#define I2S_TXCR_IBM_NORMAL (0 << I2S_TXCR_IBM_SHIFT) ++#define I2S_TXCR_IBM_LSJM (1 << I2S_TXCR_IBM_SHIFT) ++#define I2S_TXCR_IBM_RSJM (2 << I2S_TXCR_IBM_SHIFT) ++#define I2S_TXCR_IBM_MASK (3 << I2S_TXCR_IBM_SHIFT) ++#define I2S_TXCR_PBM_SHIFT 7 ++#define I2S_TXCR_PBM_MODE(x) ((x) << I2S_TXCR_PBM_SHIFT) ++#define I2S_TXCR_PBM_MASK (3 << I2S_TXCR_PBM_SHIFT) ++#define I2S_TXCR_TFS_SHIFT 5 ++#define I2S_TXCR_TFS_I2S (0 << I2S_TXCR_TFS_SHIFT) ++#define I2S_TXCR_TFS_PCM (1 << I2S_TXCR_TFS_SHIFT) ++#define I2S_TXCR_TFS_TDM_PCM (2 << I2S_TXCR_TFS_SHIFT) ++#define I2S_TXCR_TFS_TDM_I2S (3 << I2S_TXCR_TFS_SHIFT) ++#define I2S_TXCR_TFS_MASK (3 << I2S_TXCR_TFS_SHIFT) ++#define I2S_TXCR_VDW_SHIFT 0 ++#define I2S_TXCR_VDW(x) (((x) - 1) << I2S_TXCR_VDW_SHIFT) ++#define I2S_TXCR_VDW_MASK (0x1f << I2S_TXCR_VDW_SHIFT) ++ ++/* ++ * RXCR ++ * receive operation control register ++ */ ++#define I2S_RXCR_PATH_SHIFT(x) (17 + (x) * 2) ++#define I2S_RXCR_PATH_MASK(x) (0x3 << I2S_RXCR_PATH_SHIFT(x)) ++#define I2S_RXCR_PATH(x, v) ((v) << I2S_RXCR_PATH_SHIFT(x)) ++#define I2S_RXCR_CSR_SHIFT 15 ++#define I2S_RXCR_CSR(x) ((x) << I2S_RXCR_CSR_SHIFT) ++#define I2S_RXCR_CSR_MASK (3 << I2S_RXCR_CSR_SHIFT) ++#define I2S_RXCR_HWT BIT(14) ++#define I2S_RXCR_SJM_SHIFT 12 ++#define I2S_RXCR_SJM_R (0 << I2S_RXCR_SJM_SHIFT) ++#define I2S_RXCR_SJM_L (1 << I2S_RXCR_SJM_SHIFT) ++#define I2S_RXCR_FBM_SHIFT 11 ++#define I2S_RXCR_FBM_MSB (0 << I2S_RXCR_FBM_SHIFT) ++#define I2S_RXCR_FBM_LSB (1 << I2S_RXCR_FBM_SHIFT) ++#define I2S_RXCR_IBM_SHIFT 9 ++#define I2S_RXCR_IBM_NORMAL (0 << I2S_RXCR_IBM_SHIFT) ++#define I2S_RXCR_IBM_LSJM (1 << I2S_RXCR_IBM_SHIFT) ++#define I2S_RXCR_IBM_RSJM (2 << I2S_RXCR_IBM_SHIFT) ++#define I2S_RXCR_IBM_MASK (3 << I2S_RXCR_IBM_SHIFT) ++#define I2S_RXCR_PBM_SHIFT 7 ++#define I2S_RXCR_PBM_MODE(x) ((x) << I2S_RXCR_PBM_SHIFT) ++#define I2S_RXCR_PBM_MASK (3 << I2S_RXCR_PBM_SHIFT) ++#define I2S_RXCR_TFS_SHIFT 5 ++#define I2S_RXCR_TFS_I2S (0 << I2S_RXCR_TFS_SHIFT) ++#define I2S_RXCR_TFS_PCM (1 << I2S_RXCR_TFS_SHIFT) ++#define I2S_RXCR_TFS_TDM_PCM (2 << I2S_RXCR_TFS_SHIFT) ++#define I2S_RXCR_TFS_TDM_I2S (3 << I2S_RXCR_TFS_SHIFT) ++#define I2S_RXCR_TFS_MASK (3 << I2S_RXCR_TFS_SHIFT) ++#define I2S_RXCR_VDW_SHIFT 0 ++#define I2S_RXCR_VDW(x) (((x) - 1) << I2S_RXCR_VDW_SHIFT) ++#define I2S_RXCR_VDW_MASK (0x1f << I2S_RXCR_VDW_SHIFT) ++ ++/* ++ * CKR ++ * clock generation register ++ */ ++#define I2S_CKR_TRCM_SHIFT 28 ++#define I2S_CKR_TRCM(x) ((x) << I2S_CKR_TRCM_SHIFT) ++#define I2S_CKR_TRCM_TXRX (0 << I2S_CKR_TRCM_SHIFT) ++#define I2S_CKR_TRCM_TXONLY (1 << I2S_CKR_TRCM_SHIFT) ++#define I2S_CKR_TRCM_RXONLY (2 << I2S_CKR_TRCM_SHIFT) ++#define I2S_CKR_TRCM_MASK (3 << I2S_CKR_TRCM_SHIFT) ++#define I2S_CKR_MSS_SHIFT 27 ++#define I2S_CKR_MSS_MASTER (0 << I2S_CKR_MSS_SHIFT) ++#define I2S_CKR_MSS_SLAVE (1 << I2S_CKR_MSS_SHIFT) ++#define I2S_CKR_MSS_MASK (1 << I2S_CKR_MSS_SHIFT) ++#define I2S_CKR_CKP_SHIFT 26 ++#define I2S_CKR_CKP_NORMAL (0 << I2S_CKR_CKP_SHIFT) ++#define I2S_CKR_CKP_INVERTED (1 << I2S_CKR_CKP_SHIFT) ++#define I2S_CKR_CKP_MASK (1 << I2S_CKR_CKP_SHIFT) ++#define I2S_CKR_RLP_SHIFT 25 ++#define I2S_CKR_RLP_NORMAL (0 << I2S_CKR_RLP_SHIFT) ++#define I2S_CKR_RLP_INVERTED (1 << I2S_CKR_RLP_SHIFT) ++#define I2S_CKR_RLP_MASK (1 << I2S_CKR_RLP_SHIFT) ++#define I2S_CKR_TLP_SHIFT 24 ++#define I2S_CKR_TLP_NORMAL (0 << I2S_CKR_TLP_SHIFT) ++#define I2S_CKR_TLP_INVERTED (1 << I2S_CKR_TLP_SHIFT) ++#define I2S_CKR_TLP_MASK (1 << I2S_CKR_TLP_SHIFT) ++#define I2S_CKR_MDIV_SHIFT 16 ++#define I2S_CKR_MDIV(x) (((x) - 1) << I2S_CKR_MDIV_SHIFT) ++#define I2S_CKR_MDIV_MASK (0xff << I2S_CKR_MDIV_SHIFT) ++#define I2S_CKR_RSD_SHIFT 8 ++#define I2S_CKR_RSD(x) (((x) - 1) << I2S_CKR_RSD_SHIFT) ++#define I2S_CKR_RSD_MASK (0xff << I2S_CKR_RSD_SHIFT) ++#define I2S_CKR_TSD_SHIFT 0 ++#define I2S_CKR_TSD(x) (((x) - 1) << I2S_CKR_TSD_SHIFT) ++#define I2S_CKR_TSD_MASK (0xff << I2S_CKR_TSD_SHIFT) ++ ++/* ++ * FIFOLR ++ * FIFO level register ++ */ ++#define I2S_FIFOLR_RFL_SHIFT 24 ++#define I2S_FIFOLR_RFL_MASK (0x3f << I2S_FIFOLR_RFL_SHIFT) ++#define I2S_FIFOLR_TFL3_SHIFT 18 ++#define I2S_FIFOLR_TFL3_MASK (0x3f << I2S_FIFOLR_TFL3_SHIFT) ++#define I2S_FIFOLR_TFL2_SHIFT 12 ++#define I2S_FIFOLR_TFL2_MASK (0x3f << I2S_FIFOLR_TFL2_SHIFT) ++#define I2S_FIFOLR_TFL1_SHIFT 6 ++#define I2S_FIFOLR_TFL1_MASK (0x3f << I2S_FIFOLR_TFL1_SHIFT) ++#define I2S_FIFOLR_TFL0_SHIFT 0 ++#define I2S_FIFOLR_TFL0_MASK (0x3f << I2S_FIFOLR_TFL0_SHIFT) ++ ++/* ++ * DMACR ++ * DMA control register ++ */ ++#define I2S_DMACR_RDE_SHIFT 24 ++#define I2S_DMACR_RDE_DISABLE (0 << I2S_DMACR_RDE_SHIFT) ++#define I2S_DMACR_RDE_ENABLE (1 << I2S_DMACR_RDE_SHIFT) ++#define I2S_DMACR_RDL_SHIFT 16 ++#define I2S_DMACR_RDL(x) (((x) - 1) << I2S_DMACR_RDL_SHIFT) ++#define I2S_DMACR_RDL_MASK (0x1f << I2S_DMACR_RDL_SHIFT) ++#define I2S_DMACR_TDE_SHIFT 8 ++#define I2S_DMACR_TDE_DISABLE (0 << I2S_DMACR_TDE_SHIFT) ++#define I2S_DMACR_TDE_ENABLE (1 << I2S_DMACR_TDE_SHIFT) ++#define I2S_DMACR_TDL_SHIFT 0 ++#define I2S_DMACR_TDL(x) ((x) << I2S_DMACR_TDL_SHIFT) ++#define I2S_DMACR_TDL_MASK (0x1f << I2S_DMACR_TDL_SHIFT) ++ ++/* ++ * INTCR ++ * interrupt control register ++ */ ++#define I2S_INTCR_RFT_SHIFT 20 ++#define I2S_INTCR_RFT(x) (((x) - 1) << I2S_INTCR_RFT_SHIFT) ++#define I2S_INTCR_RXOIC BIT(18) ++#define I2S_INTCR_RXOIE_SHIFT 17 ++#define I2S_INTCR_RXOIE_DISABLE (0 << I2S_INTCR_RXOIE_SHIFT) ++#define I2S_INTCR_RXOIE_ENABLE (1 << I2S_INTCR_RXOIE_SHIFT) ++#define I2S_INTCR_RXFIE_SHIFT 16 ++#define I2S_INTCR_RXFIE_DISABLE (0 << I2S_INTCR_RXFIE_SHIFT) ++#define I2S_INTCR_RXFIE_ENABLE (1 << I2S_INTCR_RXFIE_SHIFT) ++#define I2S_INTCR_TFT_SHIFT 4 ++#define I2S_INTCR_TFT(x) (((x) - 1) << I2S_INTCR_TFT_SHIFT) ++#define I2S_INTCR_TFT_MASK (0x1f << I2S_INTCR_TFT_SHIFT) ++#define I2S_INTCR_TXUIC BIT(2) ++#define I2S_INTCR_TXUIE_SHIFT 1 ++#define I2S_INTCR_TXUIE_DISABLE (0 << I2S_INTCR_TXUIE_SHIFT) ++#define I2S_INTCR_TXUIE_ENABLE (1 << I2S_INTCR_TXUIE_SHIFT) ++ ++/* ++ * INTSR ++ * interrupt status register ++ */ ++#define I2S_INTSR_TXEIE_SHIFT 0 ++#define I2S_INTSR_TXEIE_DISABLE (0 << I2S_INTSR_TXEIE_SHIFT) ++#define I2S_INTSR_TXEIE_ENABLE (1 << I2S_INTSR_TXEIE_SHIFT) ++#define I2S_INTSR_RXOI_SHIFT 17 ++#define I2S_INTSR_RXOI_INA (0 << I2S_INTSR_RXOI_SHIFT) ++#define I2S_INTSR_RXOI_ACT (1 << I2S_INTSR_RXOI_SHIFT) ++#define I2S_INTSR_RXFI_SHIFT 16 ++#define I2S_INTSR_RXFI_INA (0 << I2S_INTSR_RXFI_SHIFT) ++#define I2S_INTSR_RXFI_ACT (1 << I2S_INTSR_RXFI_SHIFT) ++#define I2S_INTSR_TXUI_SHIFT 1 ++#define I2S_INTSR_TXUI_INA (0 << I2S_INTSR_TXUI_SHIFT) ++#define I2S_INTSR_TXUI_ACT (1 << I2S_INTSR_TXUI_SHIFT) ++#define I2S_INTSR_TXEI_SHIFT 0 ++#define I2S_INTSR_TXEI_INA (0 << I2S_INTSR_TXEI_SHIFT) ++#define I2S_INTSR_TXEI_ACT (1 << I2S_INTSR_TXEI_SHIFT) ++ ++/* ++ * XFER ++ * Transfer start register ++ */ ++#define I2S_XFER_RXS_SHIFT 1 ++#define I2S_XFER_RXS_STOP (0 << I2S_XFER_RXS_SHIFT) ++#define I2S_XFER_RXS_START (1 << I2S_XFER_RXS_SHIFT) ++#define I2S_XFER_TXS_SHIFT 0 ++#define I2S_XFER_TXS_STOP (0 << I2S_XFER_TXS_SHIFT) ++#define I2S_XFER_TXS_START (1 << I2S_XFER_TXS_SHIFT) ++ ++/* ++ * CLR ++ * clear SCLK domain logic register ++ */ ++#define I2S_CLR_RXC BIT(1) ++#define I2S_CLR_TXC BIT(0) ++ ++/* ++ * TXDR ++ * Transimt FIFO data register, write only. ++ */ ++#define I2S_TXDR_MASK (0xff) ++ ++/* ++ * RXDR ++ * Receive FIFO data register, write only. ++ */ ++#define I2S_RXDR_MASK (0xff) ++ ++/* ++ * TDM_CTRL ++ * TDM ctrl register ++ */ ++#define TDM_FSYNC_WIDTH_SEL1_MSK GENMASK(20, 18) ++#define TDM_FSYNC_WIDTH_SEL1(x) (((x) - 1) << 18) ++#define TDM_FSYNC_WIDTH_SEL0_MSK BIT(17) ++#define TDM_FSYNC_WIDTH_HALF_FRAME 0 ++#define TDM_FSYNC_WIDTH_ONE_FRAME BIT(17) ++#define TDM_SHIFT_CTRL_MSK GENMASK(16, 14) ++#define TDM_SHIFT_CTRL(x) ((x) << 14) ++#define TDM_SLOT_BIT_WIDTH_MSK GENMASK(13, 9) ++#define TDM_SLOT_BIT_WIDTH(x) (((x) - 1) << 9) ++#define TDM_FRAME_WIDTH_MSK GENMASK(8, 0) ++#define TDM_FRAME_WIDTH(x) (((x) - 1) << 0) ++ ++/* ++ * CLKDIV ++ * Mclk div register ++ */ ++#define I2S_CLKDIV_TXM_SHIFT 0 ++#define I2S_CLKDIV_TXM(x) (((x) - 1) << I2S_CLKDIV_TXM_SHIFT) ++#define I2S_CLKDIV_TXM_MASK (0xff << I2S_CLKDIV_TXM_SHIFT) ++#define I2S_CLKDIV_RXM_SHIFT 8 ++#define I2S_CLKDIV_RXM(x) (((x) - 1) << I2S_CLKDIV_RXM_SHIFT) ++#define I2S_CLKDIV_RXM_MASK (0xff << I2S_CLKDIV_RXM_SHIFT) ++ ++/* Clock divider id */ ++enum { ++ ROCKCHIP_DIV_MCLK = 0, ++ ROCKCHIP_DIV_BCLK, ++}; ++ ++/* channel select */ ++#define I2S_CSR_SHIFT 15 ++#define I2S_CHN_2 (0 << I2S_CSR_SHIFT) ++#define I2S_CHN_4 (1 << I2S_CSR_SHIFT) ++#define I2S_CHN_6 (2 << I2S_CSR_SHIFT) ++#define I2S_CHN_8 (3 << I2S_CSR_SHIFT) ++ ++/* io direction cfg register */ ++#define I2S_IO_DIRECTION_MASK (7) ++#define I2S_IO_8CH_OUT_2CH_IN (7) ++#define I2S_IO_6CH_OUT_4CH_IN (3) ++#define I2S_IO_4CH_OUT_6CH_IN (1) ++#define I2S_IO_2CH_OUT_8CH_IN (0) ++ ++/* I2S REGS */ ++#define I2S_TXCR (0x0000) ++#define I2S_RXCR (0x0004) ++#define I2S_CKR (0x0008) ++#define I2S_TXFIFOLR (0x000c) ++#define I2S_DMACR (0x0010) ++#define I2S_INTCR (0x0014) ++#define I2S_INTSR (0x0018) ++#define I2S_XFER (0x001c) ++#define I2S_CLR (0x0020) ++#define I2S_TXDR (0x0024) ++#define I2S_RXDR (0x0028) ++#define I2S_RXFIFOLR (0x002c) ++#define I2S_TDM_TXCR (0x0030) ++#define I2S_TDM_RXCR (0x0034) ++#define I2S_CLKDIV (0x0038) ++ ++#define HIWORD_UPDATE(v, h, l) (((v) << (l)) | (GENMASK((h), (l)) << 16)) ++ ++/* PX30 GRF CONFIGS*/ ++#define PX30_I2S0_CLK_IN_SRC_FROM_TX HIWORD_UPDATE(1, 13, 12) ++#define PX30_I2S0_CLK_IN_SRC_FROM_RX HIWORD_UPDATE(2, 13, 12) ++#define PX30_I2S0_MCLK_OUT_SRC_FROM_TX HIWORD_UPDATE(1, 5, 5) ++#define PX30_I2S0_MCLK_OUT_SRC_FROM_RX HIWORD_UPDATE(0, 5, 5) ++ ++#define PX30_I2S0_CLK_TXONLY \ ++ (PX30_I2S0_MCLK_OUT_SRC_FROM_TX | PX30_I2S0_CLK_IN_SRC_FROM_TX) ++ ++#define PX30_I2S0_CLK_RXONLY \ ++ (PX30_I2S0_MCLK_OUT_SRC_FROM_RX | PX30_I2S0_CLK_IN_SRC_FROM_RX) ++ ++/* RK1808 GRF CONFIGS*/ ++#define RK1808_I2S0_MCLK_OUT_SRC_FROM_RX HIWORD_UPDATE(1, 2, 2) ++#define RK1808_I2S0_MCLK_OUT_SRC_FROM_TX HIWORD_UPDATE(0, 2, 2) ++#define RK1808_I2S0_CLK_IN_SRC_FROM_TX HIWORD_UPDATE(1, 1, 0) ++#define RK1808_I2S0_CLK_IN_SRC_FROM_RX HIWORD_UPDATE(2, 1, 0) ++ ++#define RK1808_I2S0_CLK_TXONLY \ ++ (RK1808_I2S0_MCLK_OUT_SRC_FROM_TX | RK1808_I2S0_CLK_IN_SRC_FROM_TX) ++ ++#define RK1808_I2S0_CLK_RXONLY \ ++ (RK1808_I2S0_MCLK_OUT_SRC_FROM_RX | RK1808_I2S0_CLK_IN_SRC_FROM_RX) ++ ++/* RK3308 GRF CONFIGS*/ ++#define RK3308_I2S0_8CH_MCLK_OUT_SRC_FROM_RX HIWORD_UPDATE(1, 10, 10) ++#define RK3308_I2S0_8CH_MCLK_OUT_SRC_FROM_TX HIWORD_UPDATE(0, 10, 10) ++#define RK3308_I2S0_8CH_CLK_IN_RX_SRC_FROM_TX HIWORD_UPDATE(1, 9, 9) ++#define RK3308_I2S0_8CH_CLK_IN_RX_SRC_FROM_RX HIWORD_UPDATE(0, 9, 9) ++#define RK3308_I2S0_8CH_CLK_IN_TX_SRC_FROM_RX HIWORD_UPDATE(1, 8, 8) ++#define RK3308_I2S0_8CH_CLK_IN_TX_SRC_FROM_TX HIWORD_UPDATE(0, 8, 8) ++#define RK3308_I2S1_8CH_MCLK_OUT_SRC_FROM_RX HIWORD_UPDATE(1, 2, 2) ++#define RK3308_I2S1_8CH_MCLK_OUT_SRC_FROM_TX HIWORD_UPDATE(0, 2, 2) ++#define RK3308_I2S1_8CH_CLK_IN_RX_SRC_FROM_TX HIWORD_UPDATE(1, 1, 1) ++#define RK3308_I2S1_8CH_CLK_IN_RX_SRC_FROM_RX HIWORD_UPDATE(0, 1, 1) ++#define RK3308_I2S1_8CH_CLK_IN_TX_SRC_FROM_RX HIWORD_UPDATE(1, 0, 0) ++#define RK3308_I2S1_8CH_CLK_IN_TX_SRC_FROM_TX HIWORD_UPDATE(0, 0, 0) ++ ++#define RK3308_I2S0_CLK_TXONLY \ ++ (RK3308_I2S0_8CH_MCLK_OUT_SRC_FROM_TX | \ ++ RK3308_I2S0_8CH_CLK_IN_RX_SRC_FROM_TX | \ ++ RK3308_I2S0_8CH_CLK_IN_TX_SRC_FROM_TX) ++ ++#define RK3308_I2S0_CLK_RXONLY \ ++ (RK3308_I2S0_8CH_MCLK_OUT_SRC_FROM_RX | \ ++ RK3308_I2S0_8CH_CLK_IN_RX_SRC_FROM_RX | \ ++ RK3308_I2S0_8CH_CLK_IN_TX_SRC_FROM_RX) ++ ++#define RK3308_I2S1_CLK_TXONLY \ ++ (RK3308_I2S1_8CH_MCLK_OUT_SRC_FROM_TX | \ ++ RK3308_I2S1_8CH_CLK_IN_RX_SRC_FROM_TX | \ ++ RK3308_I2S1_8CH_CLK_IN_TX_SRC_FROM_TX) ++ ++#define RK3308_I2S1_CLK_RXONLY \ ++ (RK3308_I2S1_8CH_MCLK_OUT_SRC_FROM_RX | \ ++ RK3308_I2S1_8CH_CLK_IN_RX_SRC_FROM_RX | \ ++ RK3308_I2S1_8CH_CLK_IN_TX_SRC_FROM_RX) ++ ++/* RK3568 GRF CONFIGS*/ ++#define RK3568_I2S1_MCLK_OUT_SRC_FROM_TX HIWORD_UPDATE(1, 5, 5) ++#define RK3568_I2S1_MCLK_OUT_SRC_FROM_RX HIWORD_UPDATE(0, 5, 5) ++ ++#define RK3568_I2S1_CLK_TXONLY \ ++ RK3568_I2S1_MCLK_OUT_SRC_FROM_TX ++ ++#define RK3568_I2S1_CLK_RXONLY \ ++ RK3568_I2S1_MCLK_OUT_SRC_FROM_RX ++ ++#define RK3568_I2S3_MCLK_OUT_SRC_FROM_TX HIWORD_UPDATE(1, 15, 15) ++#define RK3568_I2S3_MCLK_OUT_SRC_FROM_RX HIWORD_UPDATE(0, 15, 15) ++#define RK3568_I2S3_SCLK_SRC_FROM_TX HIWORD_UPDATE(1, 7, 7) ++#define RK3568_I2S3_SCLK_SRC_FROM_RX HIWORD_UPDATE(0, 7, 7) ++#define RK3568_I2S3_LRCK_SRC_FROM_TX HIWORD_UPDATE(1, 6, 6) ++#define RK3568_I2S3_LRCK_SRC_FROM_RX HIWORD_UPDATE(0, 6, 6) ++ ++#define RK3568_I2S3_MCLK_TXONLY \ ++ RK3568_I2S3_MCLK_OUT_SRC_FROM_TX ++ ++#define RK3568_I2S3_CLK_TXONLY \ ++ (RK3568_I2S3_SCLK_SRC_FROM_TX | \ ++ RK3568_I2S3_LRCK_SRC_FROM_TX) ++ ++#define RK3568_I2S3_MCLK_RXONLY \ ++ RK3568_I2S3_MCLK_OUT_SRC_FROM_RX ++ ++#define RK3568_I2S3_CLK_RXONLY \ ++ (RK3568_I2S3_SCLK_SRC_FROM_RX | \ ++ RK3568_I2S3_LRCK_SRC_FROM_RX) ++ ++/* RV1126 GRF CONFIGS*/ ++#define RV1126_I2S0_MCLK_OUT_SRC_FROM_TX HIWORD_UPDATE(0, 9, 9) ++#define RV1126_I2S0_MCLK_OUT_SRC_FROM_RX HIWORD_UPDATE(1, 9, 9) ++ ++#define RV1126_I2S0_CLK_TXONLY \ ++ RV1126_I2S0_MCLK_OUT_SRC_FROM_TX ++ ++#define RV1126_I2S0_CLK_RXONLY \ ++ RV1126_I2S0_MCLK_OUT_SRC_FROM_RX ++ ++#endif /* _ROCKCHIP_I2S_TDM_H */ +diff --git a/sound/soc/rockchip/rockchip_multi_dais.c b/sound/soc/rockchip/rockchip_multi_dais.c +new file mode 100644 +index 000000000..7a789c8c7 +--- /dev/null ++++ b/sound/soc/rockchip/rockchip_multi_dais.c +@@ -0,0 +1,541 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * ALSA SoC Audio Layer - Rockchip Multi-DAIS driver ++ * ++ * Copyright (c) 2018 Rockchip Electronics Co. Ltd. ++ * Author: Sugar Zhang ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "rockchip_multi_dais.h" ++ ++#define BITCLOCK_INV_STR "bitclock-inversion" ++#define FRAME_INV_STR "frame-inversion" ++#define BITCLOCK_MASTER_STR "bitclock-master" ++#define FRAME_MASTER_STR "frame-master" ++#define DAIS_DRV_NAME "rockchip-mdais" ++#define RK3308_GRF_SOC_CON2 0x308 ++ ++static inline struct rk_mdais_dev *to_info(struct snd_soc_dai *dai) ++{ ++ return snd_soc_dai_get_drvdata(dai); ++} ++ ++static void hw_refine_channels(struct snd_pcm_hw_params *params, ++ unsigned int channel) ++{ ++ struct snd_interval *c = ++ hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS); ++ ++ c->min = channel; ++ c->max = channel; ++} ++ ++static int rockchip_mdais_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params, ++ struct snd_soc_dai *dai) ++{ ++ struct rk_mdais_dev *mdais = to_info(dai); ++ struct snd_pcm_hw_params *cparams; ++ struct snd_soc_dai *child; ++ unsigned int *channel_maps; ++ int ret = 0, i = 0; ++ ++ cparams = kmemdup(params, sizeof(*params), GFP_KERNEL); ++ if (IS_ERR(cparams)) ++ return PTR_ERR(cparams); ++ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ channel_maps = mdais->playback_channel_maps; ++ else ++ channel_maps = mdais->capture_channel_maps; ++ ++ for (i = 0; i < mdais->num_dais; i++) { ++ child = mdais->dais[i].dai; ++ if (channel_maps[i]) ++ hw_refine_channels(cparams, channel_maps[i]); ++ if (child->driver->ops && child->driver->ops->hw_params) { ++ ret = child->driver->ops->hw_params(substream, cparams, child); ++ if (ret < 0) { ++ dev_err(dai->dev, "ASoC: can't set %s hw params: %d\n", ++ dai->name, ret); ++ return ret; ++ } ++ } ++ } ++ ++ kfree(cparams); ++ return 0; ++} ++ ++static int rockchip_mdais_trigger(struct snd_pcm_substream *substream, ++ int cmd, struct snd_soc_dai *dai) ++{ ++ struct rk_mdais_dev *mdais = to_info(dai); ++ struct snd_soc_dai *child; ++ int ret = 0, i = 0; ++ ++ for (i = 0; i < mdais->num_dais; i++) { ++ child = mdais->dais[i].dai; ++ if (child->driver->ops && child->driver->ops->trigger) { ++ ret = child->driver->ops->trigger(substream, ++ cmd, child); ++ if (ret < 0) ++ return ret; ++ } ++ } ++ ++ return 0; ++} ++ ++static int rockchip_mdais_set_sysclk(struct snd_soc_dai *cpu_dai, int clk_id, ++ unsigned int freq, int dir) ++{ ++ struct rk_mdais_dev *mdais = to_info(cpu_dai); ++ struct snd_soc_dai *child; ++ int ret, i = 0; ++ ++ for (i = 0; i < mdais->num_dais; i++) { ++ child = mdais->dais[i].dai; ++ ret = snd_soc_dai_set_sysclk(child, clk_id, freq, dir); ++ if (ret && ret != -ENOTSUPP) ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static int rockchip_mdais_set_fmt(struct snd_soc_dai *cpu_dai, ++ unsigned int fmt) ++{ ++ struct rk_mdais_dev *mdais = to_info(cpu_dai); ++ struct snd_soc_dai *child; ++ unsigned int dai_fmt; ++ int ret, i = 0; ++ ++ for (i = 0; i < mdais->num_dais; i++) { ++ child = mdais->dais[i].dai; ++ dai_fmt = fmt; ++ if (mdais->dais[i].fmt_msk) { ++ dai_fmt &= ~(mdais->dais[i].fmt_msk); ++ dai_fmt |= mdais->dais[i].fmt; ++ } ++ ret = snd_soc_dai_set_fmt(child, dai_fmt); ++ if (ret && ret != -ENOTSUPP) ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static int rockchip_mdais_tdm_slot(struct snd_soc_dai *dai, ++ unsigned int tx_mask, unsigned int rx_mask, ++ int slots, int slot_width) ++{ ++ struct rk_mdais_dev *mdais = to_info(dai); ++ struct snd_soc_dai *child; ++ int ret, i = 0; ++ ++ for (i = 0; i < mdais->num_dais; i++) { ++ child = mdais->dais[i].dai; ++ ret = snd_soc_dai_set_tdm_slot(child, tx_mask, rx_mask, ++ slots, slot_width); ++ if (ret && ret != -ENOTSUPP) ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static int rockchip_mdais_dai_probe(struct snd_soc_dai *dai) ++{ ++ struct rk_mdais_dev *mdais = to_info(dai); ++ struct snd_soc_dai *child; ++ int ret, i = 0; ++ ++ for (i = 0; i < mdais->num_dais; i++) { ++ child = mdais->dais[i].dai; ++ if (!child->probed && child->driver->probe) { ++ ret = child->driver->probe(child); ++ if (ret < 0) { ++ dev_err(child->dev, ++ "ASoC: failed to probe DAI %s: %d\n", ++ child->name, ret); ++ return ret; ++ } ++ dai->probed = 1; ++ } ++ } ++ ++ return 0; ++} ++ ++static const struct snd_soc_dai_ops rockchip_mdais_dai_ops = { ++ .hw_params = rockchip_mdais_hw_params, ++ .set_sysclk = rockchip_mdais_set_sysclk, ++ .set_fmt = rockchip_mdais_set_fmt, ++ .set_tdm_slot = rockchip_mdais_tdm_slot, ++ .trigger = rockchip_mdais_trigger, ++}; ++ ++static const struct snd_soc_component_driver rockchip_mdais_component = { ++ .name = DAIS_DRV_NAME, ++}; ++ ++static const struct of_device_id rockchip_mdais_match[] = { ++ { .compatible = "rockchip,multi-dais", }, ++ { .compatible = "rockchip,rk3308-multi-dais", }, ++ {}, ++}; ++ ++static struct snd_soc_dai *rockchip_mdais_find_dai(struct device_node *np) ++{ ++ struct snd_soc_dai_link_component dai_component = { 0 }; ++ ++ dai_component.of_node = np; ++ ++ return snd_soc_find_dai(&dai_component); ++} ++ ++static int mdais_runtime_suspend(struct device *dev) ++{ ++ struct rk_mdais_dev *mdais = dev_get_drvdata(dev); ++ struct snd_soc_dai *child; ++ int i = 0; ++ ++ for (i = 0; i < mdais->num_dais; i++) { ++ child = mdais->dais[i].dai; ++ pm_runtime_put(child->dev); ++ } ++ ++ return 0; ++} ++ ++static int mdais_runtime_resume(struct device *dev) ++{ ++ struct rk_mdais_dev *mdais = dev_get_drvdata(dev); ++ struct snd_soc_dai *child; ++ int i = 0; ++ ++ for (i = 0; i < mdais->num_dais; i++) { ++ child = mdais->dais[i].dai; ++ pm_runtime_get_sync(child->dev); ++ } ++ ++ return 0; ++} ++ ++static int mdais_read_prop_array(struct device_node *node, ++ const char *propname, ++ unsigned int *array, int num) ++{ ++ int ret = 0; ++ ++ memset(array, 0, sizeof(*array) * num); ++ if (of_property_read_bool(node, propname)) { ++ ret = of_property_read_u32_array(node, propname, array, num); ++ if (ret) ++ ret = -EINVAL; ++ } else { ++ ret = -EINVAL; ++ } ++ ++ return ret; ++} ++ ++static void mdais_parse_daifmt(struct device_node *node, struct rk_dai *dais, ++ int num_dai) ++{ ++ unsigned int cinv[MAX_DAIS], finv[MAX_DAIS]; ++ unsigned int cmst[MAX_DAIS], fmst[MAX_DAIS]; ++ unsigned int format = 0, format_mask = 0; ++ int i = 0, ret = 0; ++ ++ ret = mdais_read_prop_array(node, BITCLOCK_INV_STR, cinv, num_dai); ++ if (!ret) ++ format_mask |= SND_SOC_DAIFMT_INV_MASK; ++ ret = mdais_read_prop_array(node, FRAME_INV_STR, finv, num_dai); ++ if (!ret) ++ format_mask |= SND_SOC_DAIFMT_INV_MASK; ++ ret = mdais_read_prop_array(node, BITCLOCK_MASTER_STR, cmst, num_dai); ++ if (!ret) ++ format_mask |= SND_SOC_DAIFMT_MASTER_MASK; ++ ret = mdais_read_prop_array(node, FRAME_MASTER_STR, fmst, num_dai); ++ if (!ret) ++ format_mask |= SND_SOC_DAIFMT_MASTER_MASK; ++ ++ for (i = 0; i < num_dai; i++) { ++ format = 0; ++ ++ switch ((cinv[i] << 4) + finv[i]) { ++ case 0x11: ++ format |= SND_SOC_DAIFMT_IB_IF; ++ break; ++ case 0x10: ++ format |= SND_SOC_DAIFMT_IB_NF; ++ break; ++ case 0x01: ++ format |= SND_SOC_DAIFMT_NB_IF; ++ break; ++ default: ++ /* SND_SOC_DAIFMT_NB_NF is default */ ++ break; ++ } ++ ++ switch ((!cmst[i] << 4) + !fmst[i]) { ++ case 0x11: ++ format |= SND_SOC_DAIFMT_CBM_CFM; ++ break; ++ case 0x10: ++ format |= SND_SOC_DAIFMT_CBM_CFS; ++ break; ++ case 0x01: ++ format |= SND_SOC_DAIFMT_CBS_CFM; ++ break; ++ default: ++ format |= SND_SOC_DAIFMT_CBS_CFS; ++ break; ++ } ++ ++ dais[i].fmt = format & format_mask; ++ dais[i].fmt_msk = format_mask; ++ } ++} ++ ++static int rockchip_mdais_dai_prepare(struct platform_device *pdev, ++ struct snd_soc_dai_driver **soc_dai) ++{ ++ struct snd_soc_dai_driver rockchip_mdais_dai = { ++ .probe = rockchip_mdais_dai_probe, ++ .playback = { ++ .stream_name = "Playback", ++ .channels_min = 2, ++ .channels_max = 32, ++ .rates = SNDRV_PCM_RATE_8000_192000, ++ .formats = (SNDRV_PCM_FMTBIT_S8 | ++ SNDRV_PCM_FMTBIT_S16_LE | ++ SNDRV_PCM_FMTBIT_S20_3LE | ++ SNDRV_PCM_FMTBIT_S24_LE | ++ SNDRV_PCM_FMTBIT_S32_LE), ++ }, ++ .capture = { ++ .stream_name = "Capture", ++ .channels_min = 2, ++ .channels_max = 32, ++ .rates = SNDRV_PCM_RATE_8000_192000, ++ .formats = (SNDRV_PCM_FMTBIT_S8 | ++ SNDRV_PCM_FMTBIT_S16_LE | ++ SNDRV_PCM_FMTBIT_S20_3LE | ++ SNDRV_PCM_FMTBIT_S24_LE | ++ SNDRV_PCM_FMTBIT_S32_LE), ++ }, ++ .ops = &rockchip_mdais_dai_ops, ++ }; ++ ++ *soc_dai = devm_kmemdup(&pdev->dev, &rockchip_mdais_dai, ++ sizeof(rockchip_mdais_dai), GFP_KERNEL); ++ if (!(*soc_dai)) ++ return -ENOMEM; ++ ++ return 0; ++} ++ ++static void mdais_fixup_dai(struct snd_soc_dai_driver *soc_dai, ++ struct rk_mdais_dev *mdais) ++{ ++ int i, tch, rch; ++ unsigned int *tx_maps, *rx_maps; ++ ++ tch = 0; ++ rch = 0; ++ tx_maps = mdais->playback_channel_maps; ++ rx_maps = mdais->capture_channel_maps; ++ for (i = 0; i < mdais->num_dais; i++) { ++ tch += tx_maps[i]; ++ rch += rx_maps[i]; ++ } ++ ++ soc_dai->playback.channels_min = tch; ++ soc_dai->playback.channels_max = tch; ++ soc_dai->capture.channels_min = rch; ++ soc_dai->capture.channels_max = rch; ++} ++ ++static int rockchip_mdais_probe(struct platform_device *pdev) ++{ ++ struct device_node *np = pdev->dev.of_node; ++ struct platform_device *sub_pdev; ++ struct rk_mdais_dev *mdais; ++ struct device_node *node; ++ struct snd_soc_dai_driver *soc_dai; ++ struct rk_dai *dais; ++ unsigned int *map; ++ int count, mp_count; ++ int ret = 0, i = 0; ++ ++ ret = rockchip_mdais_dai_prepare(pdev, &soc_dai); ++ if (ret < 0) ++ return ret; ++ ++ mdais = devm_kzalloc(&pdev->dev, sizeof(*mdais), GFP_KERNEL); ++ if (!mdais) ++ return -ENOMEM; ++ ++ count = of_count_phandle_with_args(np, "dais", NULL); ++ if (count < 0 || count > MAX_DAIS) ++ return -EINVAL; ++ ++ mp_count = of_property_count_u32_elems(np, "capture,channel-mapping"); ++ if (mp_count != count) ++ return -EINVAL; ++ mp_count = of_property_count_u32_elems(np, "playback,channel-mapping"); ++ if (mp_count != count) ++ return -EINVAL; ++ ++ mdais->num_dais = count; ++ dais = devm_kcalloc(&pdev->dev, count, ++ sizeof(*dais), GFP_KERNEL); ++ if (!dais) ++ return -ENOMEM; ++ ++ map = devm_kcalloc(&pdev->dev, count, ++ sizeof(*map), GFP_KERNEL); ++ if (!map) ++ return -ENOMEM; ++ ret = of_property_read_u32_array(np, "capture,channel-mapping", ++ map, count); ++ if (ret) ++ return -EINVAL; ++ mdais->capture_channel_maps = map; ++ map = devm_kcalloc(&pdev->dev, count, ++ sizeof(*map), GFP_KERNEL); ++ if (!map) ++ return -ENOMEM; ++ ret = of_property_read_u32_array(np, "playback,channel-mapping", ++ map, count); ++ if (ret) ++ return -EINVAL; ++ mdais->playback_channel_maps = map; ++ ++ for (i = 0; i < count; i++) { ++ node = of_parse_phandle(np, "dais", i); ++ sub_pdev = of_find_device_by_node(node); ++ if (!sub_pdev) { ++ dev_err(&pdev->dev, "fail to find subnode dev\n"); ++ return -ENODEV; ++ } ++ dais[i].of_node = node; ++ dais[i].dev = &sub_pdev->dev; ++ dais[i].dai = rockchip_mdais_find_dai(node); ++ if (!dais[i].dai) ++ return -EPROBE_DEFER; ++ } ++ ++ mdais_parse_daifmt(np, dais, count); ++ mdais_fixup_dai(soc_dai, mdais); ++ ++ if (of_device_is_compatible(np, "rockchip,rk3308-multi-dais")) { ++ struct regmap *grf; ++ const char *name; ++ unsigned int i2s0_fmt = 0, i2s1_fmt = 0; ++ ++ for (i = 0; i < count; i++) { ++ name = dev_name(dais[i].dev); ++ if (strstr(name, "ff300000")) ++ i2s0_fmt = dais[i].fmt; ++ else if (strstr(name, "ff310000")) ++ i2s1_fmt = dais[i].fmt; ++ } ++ i2s0_fmt &= SND_SOC_DAIFMT_MASTER_MASK; ++ i2s1_fmt &= SND_SOC_DAIFMT_MASTER_MASK; ++ ++ if ((i2s0_fmt == SND_SOC_DAIFMT_CBS_CFS && ++ i2s1_fmt == SND_SOC_DAIFMT_CBM_CFM) || ++ (i2s0_fmt == SND_SOC_DAIFMT_CBM_CFM && ++ i2s1_fmt == SND_SOC_DAIFMT_CBS_CFS)) { ++ grf = syscon_regmap_lookup_by_phandle(np, ++ "rockchip,grf"); ++ if (IS_ERR(grf)) ++ return PTR_ERR(grf); ++ ++ dev_info(&pdev->dev, "enable i2s 16ch ctrl en\n"); ++ regmap_write(grf, RK3308_GRF_SOC_CON2, ++ BIT(14) << 16 | BIT(14)); ++ } ++ } ++ ++ mdais->dais = dais; ++ mdais->dev = &pdev->dev; ++ dev_set_drvdata(&pdev->dev, mdais); ++ ++ pm_runtime_enable(&pdev->dev); ++ if (!pm_runtime_enabled(&pdev->dev)) { ++ ret = mdais_runtime_resume(&pdev->dev); ++ if (ret) ++ goto err_pm_disable; ++ } ++ ++ ret = devm_snd_soc_register_component(&pdev->dev, ++ &rockchip_mdais_component, ++ soc_dai, 1); ++ ++ if (ret) { ++ dev_err(&pdev->dev, "could not register dai: %d\n", ret); ++ goto err_suspend; ++ } ++ ++ ret = snd_dmaengine_mpcm_register(mdais); ++ if (ret) { ++ dev_err(&pdev->dev, "Could not register PCM\n"); ++ return ret; ++ } ++ ++ return 0; ++ ++err_suspend: ++ if (!pm_runtime_status_suspended(&pdev->dev)) ++ mdais_runtime_resume(&pdev->dev); ++err_pm_disable: ++ pm_runtime_disable(&pdev->dev); ++ ++ return ret; ++} ++ ++static int rockchip_mdais_remove(struct platform_device *pdev) ++{ ++ snd_dmaengine_mpcm_unregister(&pdev->dev); ++ pm_runtime_disable(&pdev->dev); ++ if (!pm_runtime_status_suspended(&pdev->dev)) ++ mdais_runtime_suspend(&pdev->dev); ++ ++ return 0; ++} ++ ++static const struct dev_pm_ops rockchip_mdais_pm_ops = { ++ SET_RUNTIME_PM_OPS(mdais_runtime_suspend, mdais_runtime_resume, ++ NULL) ++}; ++ ++static struct platform_driver rockchip_mdais_driver = { ++ .probe = rockchip_mdais_probe, ++ .remove = rockchip_mdais_remove, ++ .driver = { ++ .name = DAIS_DRV_NAME, ++ .of_match_table = of_match_ptr(rockchip_mdais_match), ++ .pm = &rockchip_mdais_pm_ops, ++ }, ++}; ++module_platform_driver(rockchip_mdais_driver); ++ ++MODULE_DESCRIPTION("ROCKCHIP MULTI-DAIS ASoC Interface"); ++MODULE_AUTHOR("Sugar Zhang "); ++MODULE_LICENSE("GPL v2"); ++MODULE_ALIAS("platform:" DAIS_DRV_NAME); ++MODULE_DEVICE_TABLE(of, rockchip_mdais_match); +diff --git a/sound/soc/rockchip/rockchip_multi_dais.h b/sound/soc/rockchip/rockchip_multi_dais.h +new file mode 100644 +index 000000000..5d9a076af +--- /dev/null ++++ b/sound/soc/rockchip/rockchip_multi_dais.h +@@ -0,0 +1,33 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Rockchip MULTI DAIS driver ++ * ++ * Copyright (C) 2018 Fuzhou Rockchip Electronics Co., Ltd ++ * ++ */ ++ ++#ifndef _ROCKCHIP_MULTI_DAIS_H ++#define _ROCKCHIP_MULTI_DAIS_H ++ ++#define MAX_DAIS 4 ++ ++struct rk_dai { ++ struct device *dev; ++ struct device_node *of_node; ++ struct snd_soc_dai *dai; ++ unsigned int fmt; ++ unsigned int fmt_msk; ++}; ++ ++struct rk_mdais_dev { ++ struct device *dev; ++ struct rk_dai *dais; ++ unsigned int *playback_channel_maps; ++ unsigned int *capture_channel_maps; ++ int num_dais; ++}; ++ ++int snd_dmaengine_mpcm_register(struct rk_mdais_dev *mdais); ++void snd_dmaengine_mpcm_unregister(struct device *dev); ++ ++#endif +diff --git a/sound/soc/rockchip/rockchip_multi_dais_pcm.c b/sound/soc/rockchip/rockchip_multi_dais_pcm.c +new file mode 100644 +index 000000000..38f2220ee +--- /dev/null ++++ b/sound/soc/rockchip/rockchip_multi_dais_pcm.c +@@ -0,0 +1,704 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * ALSA SoC Audio Layer - Rockchip Multi-DAIS-PCM driver ++ * ++ * Copyright (c) 2018 Rockchip Electronics Co. Ltd. ++ * Author: Sugar Zhang ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "rockchip_multi_dais.h" ++ ++#define MAX_FIFO_SIZE 32 /* max fifo size in frames */ ++ ++struct dmaengine_mpcm { ++ struct rk_mdais_dev *mdais; ++ struct dma_chan *tx_chans[MAX_DAIS]; ++ struct dma_chan *rx_chans[MAX_DAIS]; ++ struct snd_soc_platform platform; ++}; ++ ++struct dmaengine_mpcm_runtime_data { ++ struct dma_chan *chans[MAX_DAIS]; ++ dma_cookie_t cookies[MAX_DAIS]; ++ unsigned int *channel_maps; ++ int num_chans; ++ unsigned int pos; ++ unsigned int master_chan; ++ bool start_flag; ++#ifdef CONFIG_SND_SOC_ROCKCHIP_VAD ++ unsigned int vpos; ++ unsigned int vresidue_bytes; ++#endif ++}; ++ ++static inline struct dmaengine_mpcm_runtime_data *substream_to_prtd( ++ const struct snd_pcm_substream *substream) ++{ ++ return substream->runtime->private_data; ++} ++ ++static struct dmaengine_mpcm *soc_platform_to_pcm(struct snd_soc_platform *p) ++{ ++ return container_of(p, struct dmaengine_mpcm, platform); ++} ++ ++static struct dma_chan *to_chan(struct dmaengine_mpcm *pcm, ++ struct snd_pcm_substream *substream) ++{ ++ struct dma_chan *chan = NULL; ++ int i; ++ ++ for (i = 0; i < pcm->mdais->num_dais; i++) { ++ chan = substream->stream ? pcm->rx_chans[i] : pcm->tx_chans[i]; ++ if (chan) ++ break; ++ } ++ ++ return chan; ++} ++ ++static struct device *dmaengine_dma_dev(struct dmaengine_mpcm *pcm, ++ struct snd_pcm_substream *substream) ++{ ++ struct dma_chan *chan; ++ ++ chan = to_chan(pcm, substream); ++ if (!chan) ++ return NULL; ++ ++ return chan->device->dev; ++} ++ ++static void snd_dmaengine_mpcm_set_config_from_dai_data( ++ const struct snd_pcm_substream *substream, ++ const struct snd_dmaengine_dai_dma_data *dma_data, ++ struct dma_slave_config *slave_config) ++{ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { ++ slave_config->dst_addr = dma_data->addr; ++ if (dma_data->addr_width != DMA_SLAVE_BUSWIDTH_UNDEFINED) ++ slave_config->dst_addr_width = dma_data->addr_width; ++ } else { ++ slave_config->src_addr = dma_data->addr; ++ if (dma_data->addr_width != DMA_SLAVE_BUSWIDTH_UNDEFINED) ++ slave_config->src_addr_width = dma_data->addr_width; ++ } ++ ++ slave_config->slave_id = dma_data->slave_id; ++} ++ ++static void dmaengine_mpcm_dma_complete(void *arg) ++{ ++ struct snd_pcm_substream *substream = arg; ++#ifdef CONFIG_SND_SOC_ROCKCHIP_VAD ++ struct dmaengine_mpcm_runtime_data *prtd = substream_to_prtd(substream); ++ ++ if (snd_pcm_vad_attached(substream) && ++ substream->stream == SNDRV_PCM_STREAM_CAPTURE) { ++ void *buf = substream->runtime->dma_area + prtd->pos; ++ ++ snd_pcm_vad_preprocess(substream, buf, ++ substream->runtime->period_size); ++ } ++ ++ prtd->pos += snd_pcm_lib_period_bytes(substream); ++ if (prtd->pos >= snd_pcm_lib_buffer_bytes(substream)) ++ prtd->pos = 0; ++ ++#endif ++ snd_pcm_period_elapsed(substream); ++} ++ ++static int dmaengine_mpcm_prepare_and_submit(struct snd_pcm_substream *substream) ++{ ++ struct dmaengine_mpcm_runtime_data *prtd = substream_to_prtd(substream); ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct dma_async_tx_descriptor *desc; ++ enum dma_transfer_direction direction; ++ unsigned long flags = DMA_CTRL_ACK; ++ unsigned int *maps = prtd->channel_maps; ++ int offset, buffer_bytes, period_bytes; ++ int i; ++ bool callback = false; ++ ++ direction = snd_pcm_substream_to_dma_direction(substream); ++ ++ if (!substream->runtime->no_period_wakeup) ++ flags |= DMA_PREP_INTERRUPT; ++ ++ prtd->pos = 0; ++ offset = 0; ++ period_bytes = snd_pcm_lib_period_bytes(substream); ++ buffer_bytes = snd_pcm_lib_buffer_bytes(substream); ++ for (i = 0; i < prtd->num_chans; i++) { ++ if (!prtd->chans[i]) ++ continue; ++ desc = dmaengine_prep_dma_cyclic(prtd->chans[i], ++ runtime->dma_addr + offset, ++ buffer_bytes, period_bytes, ++ direction, flags); ++ ++ if (!desc) ++ return -ENOMEM; ++ if (!callback) { ++ desc->callback = dmaengine_mpcm_dma_complete; ++ desc->callback_param = substream; ++ callback = true; ++ prtd->master_chan = i; ++ } ++ prtd->cookies[i] = dmaengine_submit(desc); ++ offset += samples_to_bytes(runtime, maps[i]); ++ } ++ ++ return 0; ++} ++ ++static void mpcm_dma_async_issue_pending(struct dmaengine_mpcm_runtime_data *prtd) ++{ ++ int i; ++ ++ for (i = 0; i < prtd->num_chans; i++) { ++ if (prtd->chans[i]) ++ dma_async_issue_pending(prtd->chans[i]); ++ } ++} ++ ++static void mpcm_dmaengine_resume(struct dmaengine_mpcm_runtime_data *prtd) ++{ ++ int i; ++ ++ for (i = 0; i < prtd->num_chans; i++) { ++ if (prtd->chans[i]) ++ dmaengine_resume(prtd->chans[i]); ++ } ++} ++ ++static void mpcm_dmaengine_pause(struct dmaengine_mpcm_runtime_data *prtd) ++{ ++ int i; ++ ++ for (i = 0; i < prtd->num_chans; i++) { ++ if (prtd->chans[i]) ++ dmaengine_pause(prtd->chans[i]); ++ } ++} ++ ++static void mpcm_dmaengine_terminate_all(struct dmaengine_mpcm_runtime_data *prtd) ++{ ++ int i; ++ ++ for (i = 0; i < prtd->num_chans; i++) { ++ if (prtd->chans[i]) ++ dmaengine_terminate_all(prtd->chans[i]); ++ } ++} ++ ++#ifdef CONFIG_SND_SOC_ROCKCHIP_VAD ++static void dmaengine_mpcm_single_dma_complete(void *arg) ++{ ++ struct snd_pcm_substream *substream = arg; ++ struct dmaengine_mpcm_runtime_data *prtd = substream_to_prtd(substream); ++ unsigned int pos, size; ++ void *buf; ++ ++ if (snd_pcm_vad_attached(substream) && ++ substream->stream == SNDRV_PCM_STREAM_CAPTURE) { ++ buf = substream->runtime->dma_area + prtd->vpos; ++ pos = prtd->vpos + snd_pcm_lib_period_bytes(substream); ++ ++ if (pos <= snd_pcm_lib_buffer_bytes(substream)) ++ size = substream->runtime->period_size; ++ else ++ size = bytes_to_frames(substream->runtime, ++ prtd->vresidue_bytes); ++ snd_pcm_vad_preprocess(substream, buf, size); ++ } ++ ++ prtd->vpos += snd_pcm_lib_period_bytes(substream); ++ if (prtd->vpos >= snd_pcm_lib_buffer_bytes(substream)) ++ prtd->vpos = 0; ++ snd_pcm_period_elapsed(substream); ++} ++ ++static int __mpcm_prepare_single_and_submit(struct snd_pcm_substream *substream, ++ dma_addr_t buf_start, int size) ++{ ++ struct dmaengine_mpcm_runtime_data *prtd = substream_to_prtd(substream); ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct dma_async_tx_descriptor *desc; ++ enum dma_transfer_direction direction; ++ unsigned long flags = DMA_CTRL_ACK; ++ unsigned int *maps = prtd->channel_maps; ++ int offset, i; ++ bool callback = false; ++ ++ direction = snd_pcm_substream_to_dma_direction(substream); ++ ++ if (!substream->runtime->no_period_wakeup) ++ flags |= DMA_PREP_INTERRUPT; ++ ++ offset = 0; ++ for (i = 0; i < prtd->num_chans; i++) { ++ if (!prtd->chans[i]) ++ continue; ++ desc = dmaengine_prep_slave_single(prtd->chans[i], ++ buf_start + offset, ++ size, ++ direction, flags); ++ ++ if (!desc) ++ return -ENOMEM; ++ if (!callback) { ++ desc->callback = dmaengine_mpcm_single_dma_complete; ++ desc->callback_param = substream; ++ callback = true; ++ } ++ dmaengine_submit(desc); ++ offset += samples_to_bytes(runtime, maps[i]); ++ } ++ ++ return 0; ++} ++ ++static int dmaengine_mpcm_prepare_single_and_submit(struct snd_pcm_substream *substream) ++{ ++ struct dmaengine_mpcm_runtime_data *prtd = substream_to_prtd(substream); ++ enum dma_transfer_direction direction; ++ unsigned long flags = DMA_CTRL_ACK; ++ snd_pcm_uframes_t avail; ++ dma_addr_t buf_start, buf_end; ++ int offset, i, count, ret; ++ int buffer_bytes, period_bytes, residue_bytes; ++ ++ direction = snd_pcm_substream_to_dma_direction(substream); ++ ++ if (!substream->runtime->no_period_wakeup) ++ flags |= DMA_PREP_INTERRUPT; ++ ++ period_bytes = snd_pcm_lib_period_bytes(substream); ++ buffer_bytes = snd_pcm_lib_buffer_bytes(substream); ++ avail = snd_pcm_vad_avail(substream); ++ offset = frames_to_bytes(substream->runtime, avail); ++ prtd->vpos = offset; ++ buf_start = substream->runtime->dma_addr + offset; ++ buf_end = substream->runtime->dma_addr + snd_pcm_lib_buffer_bytes(substream); ++ count = (buf_end - buf_start) / period_bytes; ++ residue_bytes = (buf_end - buf_start) % period_bytes; ++ prtd->vresidue_bytes = residue_bytes; ++ pr_debug("%s: offset: %d, buffer_bytes: %d\n", __func__, offset, buffer_bytes); ++ pr_debug("%s: count: %d, residue_bytes: %d\n", __func__, count, residue_bytes); ++ for (i = 0; i < count; i++) { ++ ret = __mpcm_prepare_single_and_submit(substream, buf_start, ++ period_bytes); ++ if (ret) ++ return ret; ++ buf_start += period_bytes; ++ } ++ ++ if (residue_bytes) { ++ ret = __mpcm_prepare_single_and_submit(substream, buf_start, ++ residue_bytes); ++ if (ret) ++ return ret; ++ } ++ ++ return 0; ++} ++#endif ++ ++static int snd_dmaengine_mpcm_trigger(struct snd_pcm_substream *substream, int cmd) ++{ ++ struct dmaengine_mpcm_runtime_data *prtd = substream_to_prtd(substream); ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ int ret; ++ ++ switch (cmd) { ++ case SNDRV_PCM_TRIGGER_START: ++#ifdef CONFIG_SND_SOC_ROCKCHIP_VAD ++ if (substream->stream == SNDRV_PCM_STREAM_CAPTURE && ++ snd_pcm_vad_attached(substream) && ++ snd_pcm_vad_avail(substream)) { ++ dmaengine_mpcm_prepare_single_and_submit(substream); ++ mpcm_dma_async_issue_pending(prtd); ++ } ++#endif ++ ret = dmaengine_mpcm_prepare_and_submit(substream); ++ if (ret) ++ return ret; ++ mpcm_dma_async_issue_pending(prtd); ++ break; ++ case SNDRV_PCM_TRIGGER_RESUME: ++ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: ++ mpcm_dmaengine_resume(prtd); ++ break; ++ case SNDRV_PCM_TRIGGER_SUSPEND: ++ if (runtime->info & SNDRV_PCM_INFO_PAUSE) ++ mpcm_dmaengine_pause(prtd); ++ else ++ mpcm_dmaengine_terminate_all(prtd); ++ prtd->start_flag = false; ++ break; ++ case SNDRV_PCM_TRIGGER_PAUSE_PUSH: ++ mpcm_dmaengine_pause(prtd); ++ prtd->start_flag = false; ++ break; ++ case SNDRV_PCM_TRIGGER_STOP: ++ mpcm_dmaengine_terminate_all(prtd); ++ prtd->start_flag = false; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ return 0; ++} ++ ++static int dmaengine_mpcm_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct dmaengine_mpcm *pcm = soc_platform_to_pcm(rtd->platform); ++ struct dma_chan *chan; ++ struct snd_dmaengine_dai_dma_data *dma_data; ++ struct dma_slave_config slave_config; ++ snd_pcm_format_t format; ++ unsigned int *maps; ++ int frame_bytes; ++ int ret, num, i, sz; ++ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ maps = pcm->mdais->playback_channel_maps; ++ else ++ maps = pcm->mdais->capture_channel_maps; ++ format = params_format(params); ++ frame_bytes = snd_pcm_format_size(format, params_channels(params)); ++ num = pcm->mdais->num_dais; ++ ++ for (i = 0; i < num; i++) { ++ memset(&slave_config, 0, sizeof(slave_config)); ++ ret = snd_hwparams_to_dma_slave_config(substream, params, ++ &slave_config); ++ if (ret) ++ return ret; ++ ++ dma_data = snd_soc_dai_get_dma_data(pcm->mdais->dais[i].dai, ++ substream); ++ if (!dma_data) ++ continue; ++ ++ snd_dmaengine_mpcm_set_config_from_dai_data(substream, ++ dma_data, ++ &slave_config); ++ ++ /* refine params for interlace access */ ++ sz = snd_pcm_format_size(format, maps[i]); ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { ++ chan = pcm->tx_chans[i]; ++ if (sz) { ++ slave_config.src_interlace_size = frame_bytes - sz; ++ if (slave_config.src_interlace_size) ++ slave_config.dst_maxburst = sz / slave_config.dst_addr_width; ++ } ++ } else { ++ chan = pcm->rx_chans[i]; ++ if (sz) { ++ slave_config.dst_interlace_size = frame_bytes - sz; ++ if (slave_config.dst_interlace_size) ++ slave_config.src_maxburst = sz / slave_config.src_addr_width; ++ } ++ } ++ if (!chan) ++ continue; ++ ++ ret = dmaengine_slave_config(chan, &slave_config); ++ if (ret) ++ return ret; ++ } ++ return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params)); ++} ++ ++static int dmaengine_mpcm_set_runtime_hwparams(struct snd_pcm_substream *substream) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct dmaengine_mpcm *pcm = soc_platform_to_pcm(rtd->platform); ++ struct device *dma_dev = dmaengine_dma_dev(pcm, substream); ++ struct dma_chan *chan; ++ struct dma_slave_caps dma_caps; ++ struct snd_pcm_hardware hw; ++ u32 addr_widths = BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | ++ BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | ++ BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); ++ int i, ret; ++ ++ chan = to_chan(pcm, substream); ++ if (!chan) ++ return -EINVAL; ++ ++ memset(&hw, 0, sizeof(hw)); ++ hw.info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | ++ SNDRV_PCM_INFO_INTERLEAVED; ++ hw.periods_min = 2; ++ hw.periods_max = UINT_MAX; ++ hw.period_bytes_min = 256; ++ hw.period_bytes_max = dma_get_max_seg_size(dma_dev); ++ hw.buffer_bytes_max = SIZE_MAX; ++ ++ ret = dma_get_slave_caps(chan, &dma_caps); ++ if (ret == 0) { ++ if (dma_caps.cmd_pause) ++ hw.info |= SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME; ++ if (dma_caps.residue_granularity <= DMA_RESIDUE_GRANULARITY_SEGMENT) ++ hw.info |= SNDRV_PCM_INFO_BATCH; ++ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ addr_widths = dma_caps.dst_addr_widths; ++ else ++ addr_widths = dma_caps.src_addr_widths; ++ } ++ ++ /* ++ * Prepare formats mask for valid/allowed sample types. If the dma does ++ * not have support for the given physical word size, it needs to be ++ * masked out so user space can not use the format which produces ++ * corrupted audio. ++ * In case the dma driver does not implement the slave_caps the default ++ * assumption is that it supports 1, 2 and 4 bytes widths. ++ */ ++ for (i = 0; i <= SNDRV_PCM_FORMAT_LAST; i++) { ++ int bits = snd_pcm_format_physical_width(i); ++ ++ /* Enable only samples with DMA supported physical widths */ ++ switch (bits) { ++ case 8: ++ case 16: ++ case 24: ++ case 32: ++ case 64: ++ if (addr_widths & (1 << (bits / 8))) ++ hw.formats |= (1LL << i); ++ break; ++ default: ++ /* Unsupported types */ ++ break; ++ } ++ } ++ ++ return snd_soc_set_runtime_hwparams(substream, &hw); ++} ++ ++static int dmaengine_mpcm_open(struct snd_pcm_substream *substream) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct dmaengine_mpcm *pcm = soc_platform_to_pcm(rtd->platform); ++ struct dmaengine_mpcm_runtime_data *prtd; ++ int ret, i; ++ ++ ret = dmaengine_mpcm_set_runtime_hwparams(substream); ++ if (ret) ++ return ret; ++ ++ ret = snd_pcm_hw_constraint_integer(substream->runtime, ++ SNDRV_PCM_HW_PARAM_PERIODS); ++ if (ret < 0) ++ return ret; ++ ++ prtd = kzalloc(sizeof(*prtd), GFP_KERNEL); ++ if (!prtd) ++ return -ENOMEM; ++ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { ++ prtd->channel_maps = pcm->mdais->playback_channel_maps; ++ for (i = 0; i < pcm->mdais->num_dais; i++) ++ prtd->chans[i] = pcm->tx_chans[i]; ++ } else { ++ prtd->channel_maps = pcm->mdais->capture_channel_maps; ++ for (i = 0; i < pcm->mdais->num_dais; i++) ++ prtd->chans[i] = pcm->rx_chans[i]; ++ } ++ ++ prtd->num_chans = pcm->mdais->num_dais; ++ prtd->start_flag = false; ++ substream->runtime->private_data = prtd; ++ ++ return 0; ++} ++ ++static int dmaengine_mpcm_new(struct snd_soc_pcm_runtime *rtd) ++{ ++ struct dmaengine_mpcm *pcm = soc_platform_to_pcm(rtd->platform); ++ struct snd_pcm_substream *substream; ++ size_t prealloc_buffer_size; ++ size_t max_buffer_size; ++ unsigned int i; ++ int ret; ++ ++ prealloc_buffer_size = 512 * 1024; ++ max_buffer_size = SIZE_MAX; ++ ++ for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) { ++ substream = rtd->pcm->streams[i].substream; ++ if (!substream) ++ continue; ++ ++ ret = snd_pcm_lib_preallocate_pages(substream, ++ SNDRV_DMA_TYPE_DEV_IRAM, ++ dmaengine_dma_dev(pcm, substream), ++ prealloc_buffer_size, ++ max_buffer_size); ++ if (ret) ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static snd_pcm_uframes_t dmaengine_mpcm_pointer(struct snd_pcm_substream *substream) ++{ ++ struct dmaengine_mpcm_runtime_data *prtd = substream_to_prtd(substream); ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct dma_tx_state state; ++ snd_pcm_uframes_t frames; ++ unsigned int buf_size; ++ unsigned int pos = 0; ++ unsigned int master = prtd->master_chan; ++ ++ buf_size = snd_pcm_lib_buffer_bytes(substream); ++ dmaengine_tx_status(prtd->chans[master], prtd->cookies[master], &state); ++ if (state.residue > 0 && state.residue <= buf_size) ++ pos = buf_size - state.residue; ++ ++ frames = bytes_to_frames(substream->runtime, pos); ++#ifdef CONFIG_SND_SOC_ROCKCHIP_VAD ++ if (prtd->vpos) ++ frames = bytes_to_frames(substream->runtime, prtd->vpos); ++#endif ++ if (!prtd->start_flag && frames >= MAX_FIFO_SIZE) ++ prtd->start_flag = true; ++ ++ if (prtd->start_flag) { ++ if (frames >= MAX_FIFO_SIZE) ++ frames -= MAX_FIFO_SIZE; ++ else ++ frames = runtime->buffer_size + frames - MAX_FIFO_SIZE; ++ } else { ++ frames = 0; ++ } ++ ++ return frames; ++} ++ ++static int dmaengine_mpcm_close(struct snd_pcm_substream *substream) ++{ ++ struct dmaengine_mpcm_runtime_data *prtd = substream_to_prtd(substream); ++ ++ kfree(prtd); ++ ++ return 0; ++} ++ ++static const struct snd_pcm_ops dmaengine_mpcm_ops = { ++ .open = dmaengine_mpcm_open, ++ .close = dmaengine_mpcm_close, ++ .ioctl = snd_pcm_lib_ioctl, ++ .hw_params = dmaengine_mpcm_hw_params, ++ .hw_free = snd_pcm_lib_free_pages, ++ .trigger = snd_dmaengine_mpcm_trigger, ++ .pointer = dmaengine_mpcm_pointer, ++}; ++ ++static const struct snd_soc_platform_driver dmaengine_mpcm_platform = { ++ .component_driver = { ++ .probe_order = SND_SOC_COMP_ORDER_LATE, ++ }, ++ .ops = &dmaengine_mpcm_ops, ++ .pcm_new = dmaengine_mpcm_new, ++}; ++ ++static void dmaengine_mpcm_release_chan(struct dmaengine_mpcm *pcm) ++{ ++ int i; ++ ++ for (i = 0; i < pcm->mdais->num_dais; i++) { ++ if (pcm->tx_chans[i]) ++ dma_release_channel(pcm->tx_chans[i]); ++ if (pcm->rx_chans[i]) ++ dma_release_channel(pcm->rx_chans[i]); ++ } ++} ++ ++int snd_dmaengine_mpcm_register(struct rk_mdais_dev *mdais) ++{ ++ struct device *dev; ++ struct device *child; ++ struct dmaengine_mpcm *pcm; ++ struct dma_chan *chan; ++ unsigned int *tx_maps, *rx_maps; ++ int ret, i, num; ++ ++ dev = mdais->dev; ++ num = mdais->num_dais; ++ tx_maps = mdais->playback_channel_maps; ++ rx_maps = mdais->capture_channel_maps; ++ pcm = kzalloc(sizeof(*pcm), GFP_KERNEL); ++ if (!pcm) ++ return -ENOMEM; ++ ++ pcm->mdais = mdais; ++ for (i = 0; i < num; i++) { ++ child = mdais->dais[i].dev; ++ if (tx_maps[i]) { ++ chan = dma_request_slave_channel_reason(child, "tx"); ++ if (IS_ERR(chan)) ++ chan = NULL; ++ pcm->tx_chans[i] = chan; ++ } ++ ++ if (rx_maps[i]) { ++ chan = dma_request_slave_channel_reason(child, "rx"); ++ if (IS_ERR(chan)) ++ chan = NULL; ++ pcm->rx_chans[i] = chan; ++ } ++ } ++ ++ ret = snd_soc_add_platform(dev, &pcm->platform, ++ &dmaengine_mpcm_platform); ++ if (ret) ++ goto err_free_dma; ++ ++ return 0; ++ ++err_free_dma: ++ dmaengine_mpcm_release_chan(pcm); ++ kfree(pcm); ++ return ret; ++} ++EXPORT_SYMBOL_GPL(snd_dmaengine_mpcm_register); ++ ++void snd_dmaengine_mpcm_unregister(struct device *dev) ++{ ++ struct snd_soc_platform *platform; ++ struct dmaengine_mpcm *pcm; ++ ++ platform = snd_soc_lookup_platform(dev); ++ if (!platform) ++ return; ++ ++ pcm = soc_platform_to_pcm(platform); ++ ++ snd_soc_remove_platform(platform); ++ dmaengine_mpcm_release_chan(pcm); ++ kfree(pcm); ++} ++EXPORT_SYMBOL_GPL(snd_dmaengine_mpcm_unregister); ++ ++MODULE_LICENSE("GPL"); +diff --git a/sound/soc/rockchip/rockchip_multicodecs.c b/sound/soc/rockchip/rockchip_multicodecs.c +new file mode 100644 +index 000000000..9486a2e5d +--- /dev/null ++++ b/sound/soc/rockchip/rockchip_multicodecs.c +@@ -0,0 +1,809 @@ ++/* ++ * Rockchip machine ASoC driver for Rockchip Multi-codecs audio ++ * ++ * Copyright (C) 2018 Fuzhou Rockchip Electronics Co., Ltd ++ * ++ * Authors: Sugar Zhang , ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms and conditions of the GNU General Public License, ++ * version 2, as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for ++ * more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see . ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define DRV_NAME "rk-multicodecs" ++#define MAX_CODECS 2 ++#define WAIT_CARDS (SNDRV_CARDS - 1) ++#define DEFAULT_MCLK_FS 256 ++ ++struct adc_keys_button { ++ u32 voltage; ++ u32 keycode; ++}; ++ ++struct input_dev_poller { ++ void (*poll)(struct input_dev *dev); ++ ++ unsigned int poll_interval_ms; ++ struct input_dev *input; ++ struct delayed_work work; ++}; ++ ++struct multicodecs_data { ++ struct snd_soc_card snd_card; ++ struct snd_soc_dai_link dai_link; ++ struct snd_soc_jack *jack_headset; ++ struct gpio_desc *hp_ctl_gpio; ++ struct gpio_desc *spk_ctl_gpio; ++ struct gpio_desc *hp_det_gpio; ++ struct iio_channel *adc; ++ struct extcon_dev *extcon; ++ struct delayed_work handler; ++ unsigned int mclk_fs; ++ bool codec_hp_det; ++ u32 num_keys; ++ u32 last_key; ++ u32 keyup_voltage; ++ const struct adc_keys_button *map; ++ struct input_dev *input; ++ struct input_dev_poller *poller; ++}; ++ ++static struct snd_soc_jack_pin jack_pins[] = { ++ { ++ .pin = "Headphone", ++ .mask = SND_JACK_HEADPHONE, ++ }, { ++ .pin = "Headset Mic", ++ .mask = SND_JACK_MICROPHONE, ++ }, ++}; ++ ++static struct snd_soc_jack_zone headset_zones[] = { ++ { ++ .min_mv = 0, ++ .max_mv = 222, ++ .jack_type = SND_JACK_HEADPHONE, ++ }, { ++ .min_mv = 223, ++ .max_mv = 1500, ++ .jack_type = SND_JACK_HEADSET, ++ }, { ++ .min_mv = 1501, ++ .max_mv = UINT_MAX, ++ .jack_type = SND_JACK_HEADPHONE, ++ } ++}; ++ ++static const unsigned int headset_extcon_cable[] = { ++ EXTCON_JACK_MICROPHONE, ++ EXTCON_JACK_HEADPHONE, ++ EXTCON_NONE, ++}; ++ ++static void mc_set_poll_interval(struct input_dev_poller *poller, unsigned int interval) ++{ ++ if (poller) ++ poller->poll_interval_ms = interval; ++} ++ ++static void mc_keys_poller_queue_work(struct input_dev_poller *poller) ++{ ++ unsigned long delay; ++ ++ delay = msecs_to_jiffies(poller->poll_interval_ms); ++ if (delay >= HZ) ++ delay = round_jiffies_relative(delay); ++ ++ queue_delayed_work(system_freezable_wq, &poller->work, delay); ++} ++ ++static void mc_keys_poller_work(struct work_struct *work) ++{ ++ struct input_dev_poller *poller = ++ container_of(work, struct input_dev_poller, work.work); ++ ++ poller->poll(poller->input); ++ mc_keys_poller_queue_work(poller); ++} ++ ++static void mc_keys_poller_start(struct input_dev_poller *poller) ++{ ++ if (poller->poll_interval_ms > 0) { ++ poller->poll(poller->input); ++ mc_keys_poller_queue_work(poller); ++ } ++} ++ ++static void mc_keys_poller_stop(struct input_dev_poller *poller) ++{ ++ cancel_delayed_work_sync(&poller->work); ++} ++ ++static int mc_keys_setup_polling(struct multicodecs_data *mc_data, ++ void (*poll_fn)(struct input_dev *dev)) ++{ ++ struct input_dev_poller *poller; ++ ++ poller = devm_kzalloc(mc_data->snd_card.dev, sizeof(*poller), GFP_KERNEL); ++ if (!poller) ++ return -ENOMEM; ++ ++ INIT_DELAYED_WORK(&poller->work, mc_keys_poller_work); ++ poller->input = mc_data->input; ++ poller->poll = poll_fn; ++ mc_data->poller = poller; ++ ++ return 0; ++} ++ ++static void mc_keys_poll(struct input_dev *input) ++{ ++ struct multicodecs_data *mc_data = input_get_drvdata(input); ++ int i, value, ret; ++ u32 diff, closest = 0xffffffff; ++ int keycode = 0; ++ ++ ret = iio_read_channel_processed(mc_data->adc, &value); ++ if (unlikely(ret < 0)) { ++ /* Forcibly release key if any was pressed */ ++ value = mc_data->keyup_voltage; ++ } else { ++ for (i = 0; i < mc_data->num_keys; i++) { ++ diff = abs(mc_data->map[i].voltage - value); ++ if (diff < closest) { ++ closest = diff; ++ keycode = mc_data->map[i].keycode; ++ } ++ } ++ } ++ ++ if (abs(mc_data->keyup_voltage - value) < closest) ++ keycode = 0; ++ ++ if (mc_data->last_key && mc_data->last_key != keycode) ++ input_report_key(input, mc_data->last_key, 0); ++ ++ if (keycode) ++ input_report_key(input, keycode, 1); ++ ++ input_sync(input); ++ mc_data->last_key = keycode; ++} ++ ++static int mc_keys_load_keymap(struct device *dev, ++ struct multicodecs_data *mc_data) ++{ ++ struct adc_keys_button *map; ++ struct fwnode_handle *child; ++ int i = 0; ++ ++ mc_data->num_keys = device_get_child_node_count(dev); ++ if (mc_data->num_keys == 0) { ++ dev_err(dev, "keymap is missing\n"); ++ return -EINVAL; ++ } ++ ++ map = devm_kmalloc_array(dev, mc_data->num_keys, sizeof(*map), GFP_KERNEL); ++ if (!map) ++ return -ENOMEM; ++ ++ device_for_each_child_node(dev, child) { ++ if (fwnode_property_read_u32(child, "press-threshold-microvolt", ++ &map[i].voltage)) { ++ dev_err(dev, "Key with invalid or missing voltage\n"); ++ fwnode_handle_put(child); ++ return -EINVAL; ++ } ++ map[i].voltage /= 1000; ++ ++ if (fwnode_property_read_u32(child, "linux,code", ++ &map[i].keycode)) { ++ dev_err(dev, "Key with invalid or missing linux,code\n"); ++ fwnode_handle_put(child); ++ return -EINVAL; ++ } ++ ++ i++; ++ } ++ mc_data->map = map; ++ return 0; ++} ++ ++static void adc_jack_handler(struct work_struct *work) ++{ ++ struct multicodecs_data *mc_data = container_of(to_delayed_work(work), ++ struct multicodecs_data, ++ handler); ++ struct snd_soc_jack *jack_headset = mc_data->jack_headset; ++ int adc, ret = 0; ++ ++ if (!gpiod_get_value(mc_data->hp_det_gpio)) { ++ snd_soc_jack_report(jack_headset, 0, SND_JACK_HEADSET); ++ extcon_set_state_sync(mc_data->extcon, ++ EXTCON_JACK_HEADPHONE, false); ++ extcon_set_state_sync(mc_data->extcon, ++ EXTCON_JACK_MICROPHONE, false); ++ if (mc_data->poller) ++ mc_keys_poller_stop(mc_data->poller); ++ ++ return; ++ } ++ if (!mc_data->adc) { ++ /* no ADC, so is headphone */ ++ snd_soc_jack_report(jack_headset, SND_JACK_HEADPHONE, SND_JACK_HEADSET); ++ extcon_set_state_sync(mc_data->extcon, EXTCON_JACK_HEADPHONE, true); ++ extcon_set_state_sync(mc_data->extcon, EXTCON_JACK_MICROPHONE, false); ++ return; ++ } ++ ret = iio_read_channel_processed(mc_data->adc, &adc); ++ if (ret < 0) { ++ /* failed to read ADC, so assume headphone */ ++ snd_soc_jack_report(jack_headset, SND_JACK_HEADPHONE, SND_JACK_HEADSET); ++ extcon_set_state_sync(mc_data->extcon, EXTCON_JACK_HEADPHONE, true); ++ extcon_set_state_sync(mc_data->extcon, EXTCON_JACK_MICROPHONE, false); ++ ++ } else { ++ snd_soc_jack_report(jack_headset, ++ snd_soc_jack_get_type(jack_headset, adc), ++ SND_JACK_HEADSET); ++ extcon_set_state_sync(mc_data->extcon, EXTCON_JACK_HEADPHONE, true); ++ ++ if (snd_soc_jack_get_type(jack_headset, adc) == SND_JACK_HEADSET) { ++ extcon_set_state_sync(mc_data->extcon, EXTCON_JACK_MICROPHONE, true); ++ if (mc_data->poller) ++ mc_keys_poller_start(mc_data->poller); ++ } ++ } ++}; ++ ++static irqreturn_t headset_det_irq_thread(int irq, void *data) ++{ ++ struct multicodecs_data *mc_data = (struct multicodecs_data *)data; ++ ++ queue_delayed_work(system_power_efficient_wq, &mc_data->handler, msecs_to_jiffies(200)); ++ ++ return IRQ_HANDLED; ++}; ++ ++static int mc_hp_event(struct snd_soc_dapm_widget *w, ++ struct snd_kcontrol *kcontrol, int event) ++{ ++ struct snd_soc_card *card = w->dapm->card; ++ struct multicodecs_data *mc_data = snd_soc_card_get_drvdata(card); ++ ++ switch (event) { ++ case SND_SOC_DAPM_POST_PMU: ++ gpiod_set_value_cansleep(mc_data->hp_ctl_gpio, 1); ++ break; ++ case SND_SOC_DAPM_PRE_PMD: ++ gpiod_set_value_cansleep(mc_data->hp_ctl_gpio, 0); ++ break; ++ default: ++ return 0; ++ ++ } ++ ++ return 0; ++} ++ ++static int mc_spk_event(struct snd_soc_dapm_widget *w, ++ struct snd_kcontrol *kcontrol, int event) ++{ ++ struct snd_soc_card *card = w->dapm->card; ++ struct multicodecs_data *mc_data = snd_soc_card_get_drvdata(card); ++ ++ switch (event) { ++ case SND_SOC_DAPM_POST_PMU: ++ gpiod_set_value_cansleep(mc_data->spk_ctl_gpio, 1); ++ break; ++ case SND_SOC_DAPM_PRE_PMD: ++ gpiod_set_value_cansleep(mc_data->spk_ctl_gpio, 0); ++ break; ++ default: ++ return 0; ++ ++ } ++ ++ return 0; ++} ++ ++static const struct snd_soc_dapm_widget mc_dapm_widgets[] = { ++ ++ SND_SOC_DAPM_HP("Headphone", NULL), ++ SND_SOC_DAPM_SPK("Speaker", NULL), ++ SND_SOC_DAPM_MIC("Main Mic", NULL), ++ SND_SOC_DAPM_MIC("Headset Mic", NULL), ++ SND_SOC_DAPM_SUPPLY("Speaker Power", ++ SND_SOC_NOPM, 0, 0, ++ mc_spk_event, ++ SND_SOC_DAPM_POST_PMU | ++ SND_SOC_DAPM_PRE_PMD), ++ SND_SOC_DAPM_SUPPLY("Headphone Power", ++ SND_SOC_NOPM, 0, 0, ++ mc_hp_event, ++ SND_SOC_DAPM_POST_PMU | ++ SND_SOC_DAPM_PRE_PMD), ++}; ++ ++static const struct snd_kcontrol_new mc_controls[] = { ++ SOC_DAPM_PIN_SWITCH("Headphone"), ++ SOC_DAPM_PIN_SWITCH("Speaker"), ++ SOC_DAPM_PIN_SWITCH("Main Mic"), ++ SOC_DAPM_PIN_SWITCH("Headset Mic"), ++}; ++ ++static int rk_multicodecs_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); ++ struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); ++ struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); ++ struct multicodecs_data *mc_data = snd_soc_card_get_drvdata(rtd->card); ++ unsigned int mclk; ++ int ret; ++ ++ mclk = params_rate(params) * mc_data->mclk_fs; ++ ++ ret = snd_soc_dai_set_sysclk(codec_dai, substream->stream, mclk, ++ SND_SOC_CLOCK_IN); ++ if (ret && ret != -ENOTSUPP) { ++ pr_err("Set codec_dai sysclk failed: %d\n", ret); ++ goto out; ++ } ++ ++ ret = snd_soc_dai_set_sysclk(cpu_dai, substream->stream, mclk, ++ SND_SOC_CLOCK_OUT); ++ if (ret && ret != -ENOTSUPP) { ++ pr_err("Set cpu_dai sysclk failed: %d\n", ret); ++ goto out; ++ } ++ ++ return 0; ++ ++out: ++ return ret; ++} ++ ++static int rk_dailink_init(struct snd_soc_pcm_runtime *rtd) ++{ ++ struct multicodecs_data *mc_data = snd_soc_card_get_drvdata(rtd->card); ++ struct snd_soc_card *card = rtd->card; ++ struct snd_soc_jack *jack_headset; ++ int ret, irq; ++ ++ jack_headset = devm_kzalloc(card->dev, sizeof(*jack_headset), GFP_KERNEL); ++ if (!jack_headset) ++ return -ENOMEM; ++ ++ ret = snd_soc_card_jack_new(card, "Headset", ++ SND_JACK_HEADSET, ++ jack_headset, ++ jack_pins, ARRAY_SIZE(jack_pins)); ++ if (ret) ++ return ret; ++ ret = snd_soc_jack_add_zones(jack_headset, ARRAY_SIZE(headset_zones), ++ headset_zones); ++ if (ret) ++ return ret; ++ ++ mc_data->jack_headset = jack_headset; ++ ++ if (mc_data->codec_hp_det) { ++ struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; ++ ++ snd_soc_component_set_jack(component, jack_headset, NULL); ++ } else { ++ irq = gpiod_to_irq(mc_data->hp_det_gpio); ++ if (irq >= 0) { ++ ret = devm_request_threaded_irq(card->dev, irq, NULL, ++ headset_det_irq_thread, ++ IRQF_TRIGGER_RISING | ++ IRQF_TRIGGER_FALLING | ++ IRQF_ONESHOT, ++ "headset_detect", ++ mc_data); ++ if (ret) { ++ dev_err(card->dev, "Failed to request headset detect irq"); ++ return ret; ++ } ++ ++ queue_delayed_work(system_power_efficient_wq, ++ &mc_data->handler, msecs_to_jiffies(50)); ++ } else { ++ dev_warn(card->dev, "Failed to map headset detect gpio to irq"); ++ } ++ } ++ ++ return 0; ++} ++ ++static int rk_multicodecs_parse_daifmt(struct device_node *node, ++ struct device_node *codec, ++ struct multicodecs_data *mc_data, ++ const char *prefix) ++{ ++ struct snd_soc_dai_link *dai_link = &mc_data->dai_link; ++ struct device_node *bitclkmaster = NULL; ++ struct device_node *framemaster = NULL; ++ unsigned int daifmt; ++ ++ daifmt = snd_soc_of_parse_daifmt(node, prefix, ++ &bitclkmaster, &framemaster); ++ ++ daifmt &= ~SND_SOC_DAIFMT_MASTER_MASK; ++ ++ if (strlen(prefix) && !bitclkmaster && !framemaster) { ++ /* ++ * No dai-link level and master setting was not found from ++ * sound node level, revert back to legacy DT parsing and ++ * take the settings from codec node. ++ */ ++ pr_debug("%s: Revert to legacy daifmt parsing\n", __func__); ++ ++ daifmt = snd_soc_of_parse_daifmt(codec, NULL, NULL, NULL) | ++ (daifmt & ~SND_SOC_DAIFMT_CLOCK_MASK); ++ } else { ++ if (codec == bitclkmaster) ++ daifmt |= (codec == framemaster) ? ++ SND_SOC_DAIFMT_CBM_CFM : SND_SOC_DAIFMT_CBM_CFS; ++ else ++ daifmt |= (codec == framemaster) ? ++ SND_SOC_DAIFMT_CBS_CFM : SND_SOC_DAIFMT_CBS_CFS; ++ } ++ ++ /* ++ * If there is NULL format means that the format isn't specified, we ++ * need to set i2s format by default. ++ */ ++ if (!(daifmt & SND_SOC_DAIFMT_FORMAT_MASK)) ++ daifmt |= SND_SOC_DAIFMT_I2S; ++ ++ dai_link->dai_fmt = daifmt; ++ ++ of_node_put(bitclkmaster); ++ of_node_put(framemaster); ++ ++ return 0; ++} ++ ++static int wait_locked_card(struct device_node *np, struct device *dev) ++{ ++ char *propname = "rockchip,wait-card-locked"; ++ u32 cards[WAIT_CARDS]; ++ int num; ++ int ret; ++#ifndef MODULE ++ int i; ++#endif ++ ++ ret = of_property_count_u32_elems(np, propname); ++ if (ret < 0) { ++ if (ret == -EINVAL) { ++ /* ++ * -EINVAL means the property does not exist, this is ++ * fine. ++ */ ++ return 0; ++ } ++ ++ dev_err(dev, "Property '%s' elems could not be read: %d\n", ++ propname, ret); ++ return ret; ++ } ++ ++ num = ret; ++ if (num > WAIT_CARDS) ++ num = WAIT_CARDS; ++ ++ ret = of_property_read_u32_array(np, propname, cards, num); ++ if (ret < 0) { ++ if (ret == -EINVAL) { ++ /* ++ * -EINVAL means the property does not exist, this is ++ * fine. ++ */ ++ return 0; ++ } ++ ++ dev_err(dev, "Property '%s' could not be read: %d\n", ++ propname, ret); ++ return ret; ++ } ++ ++ ret = 0; ++#ifndef MODULE ++ for (i = 0; i < num; i++) { ++ if (!snd_card_locked(cards[i])) { ++ dev_warn(dev, "card: %d has not been locked, re-probe again\n", ++ cards[i]); ++ ret = -EPROBE_DEFER; ++ break; ++ } ++ } ++#endif ++ ++ return ret; ++} ++ ++static struct snd_soc_ops rk_ops = { ++ .hw_params = rk_multicodecs_hw_params, ++}; ++ ++static int rk_multicodecs_probe(struct platform_device *pdev) ++{ ++ struct snd_soc_card *card; ++ struct device_node *np = pdev->dev.of_node; ++ struct snd_soc_dai_link *link; ++ struct snd_soc_dai_link_component *cpus; ++ struct snd_soc_dai_link_component *platforms; ++ struct snd_soc_dai_link_component *codecs; ++ struct multicodecs_data *mc_data; ++ struct of_phandle_args args; ++ struct device_node *node; ++ struct input_dev *input; ++ u32 val; ++ int count, value; ++ int ret = 0, i = 0, idx = 0; ++ const char *prefix = "rockchip,"; ++ ++ ret = wait_locked_card(np, &pdev->dev); ++ if (ret < 0) { ++ dev_err(&pdev->dev, "check_lock_card failed: %d\n", ret); ++ return ret; ++ } ++ ++ mc_data = devm_kzalloc(&pdev->dev, sizeof(*mc_data), GFP_KERNEL); ++ if (!mc_data) ++ return -ENOMEM; ++ ++ cpus = devm_kzalloc(&pdev->dev, sizeof(*cpus), GFP_KERNEL); ++ if (!cpus) ++ return -ENOMEM; ++ ++ platforms = devm_kzalloc(&pdev->dev, sizeof(*platforms), GFP_KERNEL); ++ if (!platforms) ++ return -ENOMEM; ++ ++ card = &mc_data->snd_card; ++ card->dev = &pdev->dev; ++ ++ /* Parse the card name from DT */ ++ ret = snd_soc_of_parse_card_name(card, "rockchip,card-name"); ++ if (ret < 0) ++ return ret; ++ ++ link = &mc_data->dai_link; ++ link->name = "dailink-multicodecs"; ++ link->stream_name = link->name; ++ link->init = rk_dailink_init; ++ link->ops = &rk_ops; ++ link->cpus = cpus; ++ link->platforms = platforms; ++ link->num_cpus = 1; ++ link->num_platforms = 1; ++ link->ignore_pmdown_time = 1; ++ ++ card->dai_link = link; ++ card->num_links = 1; ++ card->dapm_widgets = mc_dapm_widgets; ++ card->num_dapm_widgets = ARRAY_SIZE(mc_dapm_widgets); ++ card->controls = mc_controls; ++ card->num_controls = ARRAY_SIZE(mc_controls); ++ card->num_aux_devs = 0; ++ ++ count = of_count_phandle_with_args(np, "rockchip,codec", NULL); ++ if (count < 0 || count > MAX_CODECS) ++ return -EINVAL; ++ ++ /* refine codecs, remove unavailable node */ ++ for (i = 0; i < count; i++) { ++ node = of_parse_phandle(np, "rockchip,codec", i); ++ if (!node) ++ return -ENODEV; ++ if (of_device_is_available(node)) ++ idx++; ++ } ++ ++ if (!idx) ++ return -ENODEV; ++ ++ codecs = devm_kcalloc(&pdev->dev, idx, ++ sizeof(*codecs), GFP_KERNEL); ++ link->codecs = codecs; ++ link->num_codecs = idx; ++ idx = 0; ++ for (i = 0; i < count; i++) { ++ node = of_parse_phandle(np, "rockchip,codec", i); ++ if (!node) ++ return -ENODEV; ++ if (!of_device_is_available(node)) ++ continue; ++ ++ ret = of_parse_phandle_with_fixed_args(np, "rockchip,codec", ++ 0, i, &args); ++ if (ret) ++ return ret; ++ ++ codecs[idx].of_node = node; ++ ret = snd_soc_get_dai_name(&args, &codecs[idx].dai_name); ++ if (ret) ++ return ret; ++ idx++; ++ } ++ ++ /* Only reference the codecs[0].of_node which maybe as master. */ ++ rk_multicodecs_parse_daifmt(np, codecs[0].of_node, mc_data, prefix); ++ ++ link->cpus->of_node = of_parse_phandle(np, "rockchip,cpu", 0); ++ if (!link->cpus->of_node) ++ return -ENODEV; ++ ++ link->platforms->of_node = link->cpus->of_node; ++ ++ mc_data->mclk_fs = DEFAULT_MCLK_FS; ++ if (!of_property_read_u32(np, "rockchip,mclk-fs", &val)) ++ mc_data->mclk_fs = val; ++ ++ mc_data->codec_hp_det = ++ of_property_read_bool(np, "rockchip,codec-hp-det"); ++ ++ mc_data->adc = devm_iio_channel_get(&pdev->dev, "adc-detect"); ++ ++ if (IS_ERR(mc_data->adc)) { ++ if (PTR_ERR(mc_data->adc) != -EPROBE_DEFER) { ++ mc_data->adc = NULL; ++ dev_warn(&pdev->dev, "Failed to get ADC channel"); ++ } ++ } else { ++ if (mc_data->adc->channel->type != IIO_VOLTAGE) ++ return -EINVAL; ++ ++ if (device_property_read_u32(&pdev->dev, "keyup-threshold-microvolt", ++ &mc_data->keyup_voltage)) { ++ dev_warn(&pdev->dev, "Invalid or missing keyup voltage\n"); ++ return -EINVAL; ++ } ++ mc_data->keyup_voltage /= 1000; ++ ++ ret = mc_keys_load_keymap(&pdev->dev, mc_data); ++ if (ret) ++ return ret; ++ ++ input = devm_input_allocate_device(&pdev->dev); ++ if (IS_ERR(input)) { ++ dev_err(&pdev->dev, "failed to allocate input device\n"); ++ return PTR_ERR(input); ++ } ++ ++ input_set_drvdata(input, mc_data); ++ ++ input->name = "headset-keys"; ++ input->phys = "headset-keys/input0"; ++ input->id.bustype = BUS_HOST; ++ input->id.vendor = 0x0001; ++ input->id.product = 0x0001; ++ input->id.version = 0x0100; ++ ++ __set_bit(EV_KEY, input->evbit); ++ for (i = 0; i < mc_data->num_keys; i++) ++ __set_bit(mc_data->map[i].keycode, input->keybit); ++ ++ if (device_property_read_bool(&pdev->dev, "autorepeat")) ++ __set_bit(EV_REP, input->evbit); ++ ++ mc_data->input = input; ++ ret = mc_keys_setup_polling(mc_data, mc_keys_poll); ++ if (ret) { ++ dev_err(&pdev->dev, "Unable to set up polling: %d\n", ret); ++ return ret; ++ } ++ ++ if (!device_property_read_u32(&pdev->dev, "poll-interval", &value)) ++ mc_set_poll_interval(mc_data->poller, value); ++ ++ ret = input_register_device(mc_data->input); ++ if (ret) { ++ dev_err(&pdev->dev, "Unable to register input device: %d\n", ret); ++ return ret; ++ } ++ } ++ ++ INIT_DEFERRABLE_WORK(&mc_data->handler, adc_jack_handler); ++ ++ mc_data->spk_ctl_gpio = devm_gpiod_get_optional(&pdev->dev, ++ "spk-con", ++ GPIOD_OUT_LOW); ++ if (IS_ERR(mc_data->spk_ctl_gpio)) ++ return PTR_ERR(mc_data->spk_ctl_gpio); ++ ++ mc_data->hp_ctl_gpio = devm_gpiod_get_optional(&pdev->dev, ++ "hp-con", ++ GPIOD_OUT_LOW); ++ if (IS_ERR(mc_data->hp_ctl_gpio)) ++ return PTR_ERR(mc_data->hp_ctl_gpio); ++ ++ mc_data->hp_det_gpio = devm_gpiod_get_optional(&pdev->dev, "hp-det", GPIOD_IN); ++ if (IS_ERR(mc_data->hp_det_gpio)) ++ return PTR_ERR(mc_data->hp_det_gpio); ++ ++ mc_data->extcon = devm_extcon_dev_allocate(&pdev->dev, headset_extcon_cable); ++ if (IS_ERR(mc_data->extcon)) { ++ dev_err(&pdev->dev, "allocate extcon failed\n"); ++ return PTR_ERR(mc_data->extcon); ++ } ++ ++ ret = devm_extcon_dev_register(&pdev->dev, mc_data->extcon); ++ if (ret) { ++ dev_err(&pdev->dev, "failed to register extcon: %d\n", ret); ++ return ret; ++ } ++ ++ ret = snd_soc_of_parse_audio_routing(card, "rockchip,audio-routing"); ++ if (ret < 0) ++ dev_warn(&pdev->dev, "Audio routing invalid/unspecified\n"); ++ ++ snd_soc_card_set_drvdata(card, mc_data); ++ ++ ret = devm_snd_soc_register_card(&pdev->dev, card); ++ if (ret == -EPROBE_DEFER) ++ return -EPROBE_DEFER; ++ if (ret) { ++ dev_err(&pdev->dev, "card register failed %d\n", ret); ++ return ret; ++ } ++ ++ platform_set_drvdata(pdev, card); ++ ++ return ret; ++} ++ ++static const struct of_device_id rockchip_multicodecs_of_match[] = { ++ { .compatible = "rockchip,multicodecs-card", }, ++ {}, ++}; ++ ++MODULE_DEVICE_TABLE(of, rockchip_multicodecs_of_match); ++ ++static struct platform_driver rockchip_multicodecs_driver = { ++ .probe = rk_multicodecs_probe, ++ .driver = { ++ .name = DRV_NAME, ++ .pm = &snd_soc_pm_ops, ++ .of_match_table = rockchip_multicodecs_of_match, ++ }, ++}; ++ ++module_platform_driver(rockchip_multicodecs_driver); ++ ++MODULE_AUTHOR("Sugar Zhang "); ++MODULE_DESCRIPTION("Rockchip General Multicodecs ASoC driver"); ++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 5adb293d0..67f426f2e 100644 +--- a/sound/soc/rockchip/rockchip_pdm.c ++++ b/sound/soc/rockchip/rockchip_pdm.c +@@ -19,11 +19,15 @@ + #include "rockchip_pdm.h" + + #define PDM_DMA_BURST_SIZE (8) /* size * width: 8*4 = 32 bytes */ +-#define PDM_SIGNOFF_CLK_RATE (100000000) ++#define PDM_SIGNOFF_CLK_100M (100000000) ++#define PDM_SIGNOFF_CLK_300M (300000000) ++#define PDM_PATH_MAX (4) + + enum rk_pdm_version { + RK_PDM_RK3229, + RK_PDM_RK3308, ++ RK_PDM_RK3588, ++ RK_PDM_RV1126, + }; + + struct rk_pdm_dev { +@@ -74,7 +78,8 @@ static struct rk_pdm_ds_ratio ds_ratio[] = { + }; + + static unsigned int get_pdm_clk(struct rk_pdm_dev *pdm, unsigned int sr, +- unsigned int *clk_src, unsigned int *clk_out) ++ unsigned int *clk_src, unsigned int *clk_out, ++ unsigned int signoff) + { + unsigned int i, count, clk, div, rate; + +@@ -99,7 +104,7 @@ static unsigned int get_pdm_clk(struct rk_pdm_dev *pdm, unsigned int sr, + } + + if (!clk) { +- clk = clk_round_rate(pdm->clk, PDM_SIGNOFF_CLK_RATE); ++ clk = clk_round_rate(pdm->clk, signoff); + *clk_src = clk; + } + return clk; +@@ -121,6 +126,55 @@ static unsigned int get_pdm_ds_ratio(unsigned int sr) + return ratio; + } + ++static unsigned int get_pdm_cic_ratio(unsigned int clk) ++{ ++ switch (clk) { ++ case 4096000: ++ case 5644800: ++ case 6144000: ++ return 0; ++ case 2048000: ++ case 2822400: ++ case 3072000: ++ return 1; ++ case 1024000: ++ case 1411200: ++ case 1536000: ++ return 2; ++ default: ++ return 1; ++ } ++} ++ ++static unsigned int samplerate_to_bit(unsigned int samplerate) ++{ ++ switch (samplerate) { ++ case 8000: ++ case 11025: ++ case 12000: ++ return 0; ++ case 16000: ++ case 22050: ++ case 24000: ++ return 1; ++ case 32000: ++ return 2; ++ case 44100: ++ case 48000: ++ return 3; ++ case 64000: ++ case 88200: ++ case 96000: ++ return 4; ++ case 128000: ++ case 176400: ++ case 192000: ++ return 5; ++ default: ++ return 1; ++ } ++} ++ + static inline struct rk_pdm_dev *to_info(struct snd_soc_dai *dai) + { + return snd_soc_dai_get_drvdata(dai); +@@ -149,7 +203,7 @@ static int rockchip_pdm_hw_params(struct snd_pcm_substream *substream, + struct rk_pdm_dev *pdm = to_info(dai); + unsigned int val = 0; + unsigned int clk_rate, clk_div, samplerate; +- unsigned int clk_src, clk_out = 0; ++ unsigned int clk_src = 0, clk_out = 0, signoff = PDM_SIGNOFF_CLK_100M; + unsigned long m, n; + bool change; + int ret; +@@ -158,7 +212,10 @@ static int rockchip_pdm_hw_params(struct snd_pcm_substream *substream, + return 0; + + samplerate = params_rate(params); +- clk_rate = get_pdm_clk(pdm, samplerate, &clk_src, &clk_out); ++ ++ if (pdm->version == RK_PDM_RK3588) ++ signoff = PDM_SIGNOFF_CLK_300M; ++ clk_rate = get_pdm_clk(pdm, samplerate, &clk_src, &clk_out, signoff); + if (!clk_rate) + return -EINVAL; + +@@ -166,7 +223,9 @@ static int rockchip_pdm_hw_params(struct snd_pcm_substream *substream, + if (ret) + return -EINVAL; + +- if (pdm->version == RK_PDM_RK3308) { ++ if (pdm->version == RK_PDM_RK3308 || ++ pdm->version == RK_PDM_RK3588 || ++ pdm->version == RK_PDM_RV1126) { + rational_best_approximation(clk_out, clk_src, + GENMASK(16 - 1, 0), + GENMASK(16 - 1, 0), +@@ -194,8 +253,18 @@ static int rockchip_pdm_hw_params(struct snd_pcm_substream *substream, + PDM_CLK_FD_RATIO_MSK, + val); + } +- val = get_pdm_ds_ratio(samplerate); +- regmap_update_bits(pdm->regmap, PDM_CLK_CTRL, PDM_DS_RATIO_MSK, val); ++ ++ if (pdm->version == RK_PDM_RK3588 || pdm->version == RK_PDM_RV1126) { ++ val = get_pdm_cic_ratio(clk_out); ++ regmap_update_bits(pdm->regmap, PDM_CLK_CTRL, PDM_CIC_RATIO_MSK, val); ++ val = samplerate_to_bit(samplerate); ++ regmap_update_bits(pdm->regmap, PDM_CTRL0, ++ PDM_SAMPLERATE_MSK, PDM_SAMPLERATE(val)); ++ } else { ++ val = get_pdm_ds_ratio(samplerate); ++ regmap_update_bits(pdm->regmap, PDM_CLK_CTRL, PDM_DS_RATIO_MSK, val); ++ } ++ + regmap_update_bits(pdm->regmap, PDM_HPF_CTRL, + PDM_HPF_CF_MSK, PDM_HPF_60HZ); + regmap_update_bits(pdm->regmap, PDM_HPF_CTRL, +@@ -441,9 +510,10 @@ static bool rockchip_pdm_precious_reg(struct device *dev, unsigned int reg) + } + + static const struct reg_default rockchip_pdm_reg_defaults[] = { +- {0x04, 0x78000017}, +- {0x08, 0x0bb8ea60}, +- {0x18, 0x0000001f}, ++ { PDM_CTRL0, 0x78000017 }, ++ { PDM_CTRL1, 0x0bb8ea60 }, ++ { PDM_CLK_CTRL, 0x0000e401 }, ++ { PDM_DMA_CTRL, 0x0000001f }, + }; + + static const struct regmap_config rockchip_pdm_regmap_config = { +@@ -460,7 +530,7 @@ static const struct regmap_config rockchip_pdm_regmap_config = { + .cache_type = REGCACHE_FLAT, + }; + +-static const struct of_device_id rockchip_pdm_match[] = { ++static const struct of_device_id rockchip_pdm_match[] __maybe_unused = { + { .compatible = "rockchip,pdm", + .data = (void *)RK_PDM_RK3229 }, + { .compatible = "rockchip,px30-pdm", +@@ -469,12 +539,46 @@ static const struct of_device_id rockchip_pdm_match[] = { + .data = (void *)RK_PDM_RK3308 }, + { .compatible = "rockchip,rk3308-pdm", + .data = (void *)RK_PDM_RK3308 }, ++ { .compatible = "rockchip,rk3568-pdm", ++ .data = (void *)RK_PDM_RV1126 }, ++ { .compatible = "rockchip,rk3588-pdm", ++ .data = (void *)RK_PDM_RK3588 }, ++ { .compatible = "rockchip,rv1126-pdm", ++ .data = (void *)RK_PDM_RV1126 }, + {}, + }; + MODULE_DEVICE_TABLE(of, rockchip_pdm_match); + ++static int rockchip_pdm_path_parse(struct rk_pdm_dev *pdm, struct device_node *node) ++{ ++ unsigned int path[PDM_PATH_MAX]; ++ int cnt = 0, ret = 0, i = 0, val = 0, msk = 0; ++ ++ cnt = of_count_phandle_with_args(node, "rockchip,path-map", ++ NULL); ++ if (cnt != PDM_PATH_MAX) ++ return cnt; ++ ++ ret = of_property_read_u32_array(node, "rockchip,path-map", ++ path, cnt); ++ if (ret) ++ return ret; ++ ++ for (i = 0; i < cnt; i++) { ++ if (path[i] >= PDM_PATH_MAX) ++ return -EINVAL; ++ msk |= PDM_PATH_MASK(i); ++ val |= PDM_PATH(i, path[i]); ++ } ++ ++ regmap_update_bits(pdm->regmap, PDM_CLK_CTRL, msk, val); ++ ++ return 0; ++} ++ + static int rockchip_pdm_probe(struct platform_device *pdev) + { ++ struct device_node *node = pdev->dev.of_node; + const struct of_device_id *match; + struct rk_pdm_dev *pdm; + struct resource *res; +@@ -495,8 +599,7 @@ static int rockchip_pdm_probe(struct platform_device *pdev) + return PTR_ERR(pdm->reset); + } + +- res = platform_get_resource(pdev, IORESOURCE_MEM, 0); +- regs = devm_ioremap_resource(&pdev->dev, res); ++ regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res); + if (IS_ERR(regs)) + return PTR_ERR(regs); + +@@ -541,6 +644,11 @@ static int rockchip_pdm_probe(struct platform_device *pdev) + } + + rockchip_pdm_rxctrl(pdm, 0); ++ ++ ret = rockchip_pdm_path_parse(pdm, node); ++ if (ret != 0 && ret != -ENOENT) ++ goto err_suspend; ++ + ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); + if (ret) { + dev_err(&pdev->dev, "could not register pcm: %d\n", ret); +diff --git a/sound/soc/rockchip/rockchip_pdm.h b/sound/soc/rockchip/rockchip_pdm.h +index 8e5bbafef..cab977272 100644 +--- a/sound/soc/rockchip/rockchip_pdm.h ++++ b/sound/soc/rockchip/rockchip_pdm.h +@@ -41,6 +41,8 @@ + #define PDM_PATH1_EN BIT(28) + #define PDM_PATH0_EN BIT(27) + #define PDM_HWT_EN BIT(26) ++#define PDM_SAMPLERATE_MSK GENMASK(7, 5) ++#define PDM_SAMPLERATE(x) ((x) << 5) + #define PDM_VDW_MSK (0x1f << 0) + #define PDM_VDW(X) ((X - 1) << 0) + +@@ -51,6 +53,9 @@ + #define PDM_FD_DENOMINATOR_MSK GENMASK(15, 0) + + /* PDM CLK CTRL */ ++#define PDM_PATH_SHIFT(x) (8 + (x) * 2) ++#define PDM_PATH_MASK(x) (0x3 << PDM_PATH_SHIFT(x)) ++#define PDM_PATH(x, v) ((v) << PDM_PATH_SHIFT(x)) + #define PDM_CLK_FD_RATIO_MSK BIT(6) + #define PDM_CLK_FD_RATIO_40 (0X0 << 6) + #define PDM_CLK_FD_RATIO_35 BIT(6) +@@ -66,6 +71,7 @@ + #define PDM_CLK_1280FS (0x2 << 0) + #define PDM_CLK_2560FS (0x3 << 0) + #define PDM_CLK_5120FS (0x4 << 0) ++#define PDM_CIC_RATIO_MSK (0x3 << 0) + + /* PDM HPF CTRL */ + #define PDM_HPF_LE BIT(3) +diff --git a/sound/soc/rockchip/rockchip_rt5651.c b/sound/soc/rockchip/rockchip_rt5651.c +new file mode 100644 +index 000000000..4dc91c2a1 +--- /dev/null ++++ b/sound/soc/rockchip/rockchip_rt5651.c +@@ -0,0 +1,245 @@ ++/* ++ * rockchip_rt5651.c -- RK3399 machine driver with RT5651 codecs ++ * ++ * Copyright (c) 2016, ROCKCHIP CORPORATION. All rights reserved. ++ * Author: Xiaotan Luo ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 and ++ * only version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#include ++#include ++ ++#include "rockchip_i2s.h" ++#include "../codecs/rt5651.h" ++ ++#define DRV_NAME "rockchip-rt5651" ++ ++static const struct snd_soc_dapm_widget rockchip_dapm_widgets[] = { ++ SND_SOC_DAPM_HP("Headphones", NULL), ++ SND_SOC_DAPM_SPK("Lineout", NULL), ++ SND_SOC_DAPM_MIC("Headset Mic", NULL), ++ SND_SOC_DAPM_MIC("Int Mic", NULL), ++ SND_SOC_DAPM_MIC("HDMIIN", NULL), ++}; ++ ++static const struct snd_soc_dapm_route rockchip_dapm_routes[] = { ++ {"Headphones", NULL, "HPOL"}, ++ {"Headphones", NULL, "HPOR"}, ++ {"Lineout", NULL, "LOUTL"}, ++ {"Lineout", NULL, "LOUTR"}, ++ {"AIF2 Playback", NULL, "HDMIIN"}, ++}; ++ ++static const struct snd_kcontrol_new rockchip_controls[] = { ++ SOC_DAPM_PIN_SWITCH("Headphones"), ++ SOC_DAPM_PIN_SWITCH("Lineout"), ++ SOC_DAPM_PIN_SWITCH("Headset Mic"), ++ SOC_DAPM_PIN_SWITCH("Int Mic"), ++}; ++ ++static int rockchip_rt5651_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_dai *cpu_dai = rtd->cpu_dai; ++ struct snd_soc_dai *codec_dai = rtd->codec_dai; ++ int mclk, ret; ++ ++ /* in bypass mode, the mclk has to be one of the frequencies below */ ++ switch (params_rate(params)) { ++ case 8000: ++ case 16000: ++ case 24000: ++ case 32000: ++ case 48000: ++ case 64000: ++ case 96000: ++ mclk = 12288000; ++ break; ++ case 11025: ++ case 22050: ++ case 44100: ++ case 88200: ++ mclk = 11289600; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ ret = snd_soc_dai_set_sysclk(cpu_dai, 0, mclk, SND_SOC_CLOCK_OUT); ++ if (ret < 0) { ++ dev_err(codec_dai->dev, "Can't set cpu clock out %d\n", ret); ++ return ret; ++ } ++ ++ snd_soc_dai_set_pll(codec_dai, 0, RT5651_PLL1_S_MCLK, mclk, mclk * 2); ++ ++ ret = snd_soc_dai_set_sysclk(codec_dai, RT5651_SCLK_S_PLL1, mclk * 2, ++ SND_SOC_CLOCK_IN); ++ if (ret < 0) { ++ dev_err(codec_dai->dev, "Can't set codec clock in %d\n", ret); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static int rockchip_rt5651_voice_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_dai *codec_dai = rtd->codec_dai; ++ int mclk, ret; ++ ++ /* in bypass mode, the mclk has to be one of the frequencies below */ ++ switch (params_rate(params)) { ++ case 8000: ++ case 16000: ++ case 24000: ++ case 32000: ++ case 48000: ++ case 64000: ++ case 96000: ++ mclk = 12288000; ++ break; ++ case 11025: ++ case 22050: ++ case 44100: ++ case 88200: ++ mclk = 11289600; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ /*Set the system clk for codec*/ ++ snd_soc_dai_set_pll(codec_dai, 0, RT5651_PLL1_S_MCLK, mclk, 24576000); ++ ++ ret = snd_soc_dai_set_sysclk(codec_dai, RT5651_SCLK_S_PLL1, 24576000, ++ SND_SOC_CLOCK_IN); ++ if (ret < 0) { ++ dev_err(codec_dai->dev, "Can't set codec clock in %d\n", ret); ++ return ret; ++ } ++ return 0; ++} ++ ++static struct snd_soc_ops rockchip_sound_rt5651_hifi_ops = { ++ .hw_params = rockchip_rt5651_hw_params, ++}; ++ ++static struct snd_soc_ops rockchip_sound_rt5651_voice_ops = { ++ .hw_params = rockchip_rt5651_voice_hw_params, ++}; ++ ++enum { ++ DAILINK_RT5651_HIFI, ++ DAILINK_RT5651_VOICE, ++ DAILINK_RT5651_MAX ++}; ++ ++static struct snd_soc_dai_link rockchip_dailinks[] = { ++ [DAILINK_RT5651_HIFI] = { ++ .name = "RT5651 HIFI", ++ .stream_name = "RT5651 PCM", ++ .codec_dai_name = "rt5651-aif1", ++ .ops = &rockchip_sound_rt5651_hifi_ops, ++ /* set rt5651 as slave */ ++ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBS_CFS, ++ }, ++ [DAILINK_RT5651_VOICE] = { ++ .name = "RT5651 HDMIIN", ++ .stream_name = "RT5651 PCM", ++ .codec_dai_name = "rt5651-aif2", ++ .ops = &rockchip_sound_rt5651_voice_ops, ++ /* set rt5651 as slave */ ++ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBS_CFS, ++ }, ++}; ++ ++static struct snd_soc_card rockchip_sound_card = { ++ .name = "realtekrt5651codec_hdmiin", ++ .owner = THIS_MODULE, ++ .dai_link = rockchip_dailinks, ++ .num_links = ARRAY_SIZE(rockchip_dailinks), ++ .dapm_widgets = rockchip_dapm_widgets, ++ .num_dapm_widgets = ARRAY_SIZE(rockchip_dapm_widgets), ++ .dapm_routes = rockchip_dapm_routes, ++ .num_dapm_routes = ARRAY_SIZE(rockchip_dapm_routes), ++ .controls = rockchip_controls, ++ .num_controls = ARRAY_SIZE(rockchip_controls), ++}; ++ ++static int rockchip_sound_probe(struct platform_device *pdev) ++{ ++ struct snd_soc_card *card = &rockchip_sound_card; ++ struct device_node *cpu_node; ++ int i, ret; ++ ++ dev_info(&pdev->dev, "%s\n", __func__); ++ ++ cpu_node = of_parse_phandle(pdev->dev.of_node, "rockchip,cpu", 0); ++ if (!cpu_node) { ++ dev_err(&pdev->dev, ++ "Property 'rockchip,cpu' failed\n"); ++ return -EINVAL; ++ } ++ ++ for (i = 0; i < DAILINK_RT5651_MAX; i++) { ++ rockchip_dailinks[i].platform_of_node = cpu_node; ++ rockchip_dailinks[i].cpu_of_node = cpu_node; ++ ++ rockchip_dailinks[i].codec_of_node = ++ of_parse_phandle(pdev->dev.of_node, ++ "rockchip,codec", i); ++ if (!rockchip_dailinks[i].codec_of_node) { ++ dev_err(&pdev->dev, ++ "Property[%d] 'rockchip,codec' failed\n", i); ++ return -EINVAL; ++ } ++ } ++ ++ card->dev = &pdev->dev; ++ platform_set_drvdata(pdev, card); ++ ret = devm_snd_soc_register_card(&pdev->dev, card); ++ if (ret) ++ dev_err(&pdev->dev, "%s register card failed %d\n", ++ __func__, ret); ++ ++ dev_info(&pdev->dev, "snd_soc_register_card successful\n"); ++ return ret; ++} ++ ++static const struct of_device_id rockchip_sound_of_match[] = { ++ { .compatible = "rockchip,rockchip-rt5651-sound", }, ++ {}, ++}; ++ ++static struct platform_driver rockchip_sound_driver = { ++ .probe = rockchip_sound_probe, ++ .driver = { ++ .name = DRV_NAME, ++ .of_match_table = rockchip_sound_of_match, ++#ifdef CONFIG_PM ++ .pm = &snd_soc_pm_ops, ++#endif ++ }, ++}; ++ ++module_platform_driver(rockchip_sound_driver); ++ ++MODULE_AUTHOR("Xiaotan Luo "); ++MODULE_DESCRIPTION("Rockchip ASoC Machine Driver"); ++MODULE_LICENSE("GPL v2"); ++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 674810851..f71736144 100644 +--- a/sound/soc/rockchip/rockchip_spdif.c ++++ b/sound/soc/rockchip/rockchip_spdif.c +@@ -41,7 +41,7 @@ struct rk_spdif_dev { + struct regmap *regmap; + }; + +-static const struct of_device_id rk_spdif_match[] = { ++static const struct of_device_id rk_spdif_match[] __maybe_unused = { + { .compatible = "rockchip,rk3066-spdif", + .data = (void *)RK_SPDIF_RK3066 }, + { .compatible = "rockchip,rk3188-spdif", +@@ -58,6 +58,10 @@ static const struct of_device_id rk_spdif_match[] = { + .data = (void *)RK_SPDIF_RK3366 }, + { .compatible = "rockchip,rk3399-spdif", + .data = (void *)RK_SPDIF_RK3366 }, ++ { .compatible = "rockchip,rk3568-spdif", ++ .data = (void *)RK_SPDIF_RK3366 }, ++ { .compatible = "rockchip,rk3588-spdif", ++ .data = (void *)RK_SPDIF_RK3366 }, + {}, + }; + MODULE_DEVICE_TABLE(of, rk_spdif_match); +@@ -103,8 +107,8 @@ static int __maybe_unused rk_spdif_runtime_resume(struct device *dev) + } + + static int rk_spdif_hw_params(struct snd_pcm_substream *substream, +- struct snd_pcm_hw_params *params, +- struct snd_soc_dai *dai) ++ struct snd_pcm_hw_params *params, ++ struct snd_soc_dai *dai) + { + struct rk_spdif_dev *spdif = snd_soc_dai_get_drvdata(dai); + unsigned int val = SPDIF_CFGR_HALFWORD_ENABLE; +@@ -137,15 +141,15 @@ static int rk_spdif_hw_params(struct snd_pcm_substream *substream, + } + + ret = regmap_update_bits(spdif->regmap, SPDIF_CFGR, +- SPDIF_CFGR_CLK_DIV_MASK | SPDIF_CFGR_HALFWORD_ENABLE | +- SDPIF_CFGR_VDW_MASK, +- val); ++ SPDIF_CFGR_CLK_DIV_MASK | ++ SPDIF_CFGR_HALFWORD_ENABLE | ++ SDPIF_CFGR_VDW_MASK, val); + + return ret; + } + + static int rk_spdif_trigger(struct snd_pcm_substream *substream, +- int cmd, struct snd_soc_dai *dai) ++ int cmd, struct snd_soc_dai *dai) + { + struct rk_spdif_dev *spdif = snd_soc_dai_get_drvdata(dai); + int ret; +@@ -155,31 +159,31 @@ static int rk_spdif_trigger(struct snd_pcm_substream *substream, + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + ret = regmap_update_bits(spdif->regmap, SPDIF_DMACR, +- SPDIF_DMACR_TDE_ENABLE | +- SPDIF_DMACR_TDL_MASK, +- SPDIF_DMACR_TDE_ENABLE | +- SPDIF_DMACR_TDL(16)); ++ SPDIF_DMACR_TDE_ENABLE | ++ SPDIF_DMACR_TDL_MASK, ++ SPDIF_DMACR_TDE_ENABLE | ++ SPDIF_DMACR_TDL(16)); + + if (ret != 0) + return ret; + + ret = regmap_update_bits(spdif->regmap, SPDIF_XFER, +- SPDIF_XFER_TXS_START, +- SPDIF_XFER_TXS_START); ++ SPDIF_XFER_TXS_START, ++ SPDIF_XFER_TXS_START); + break; + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + ret = regmap_update_bits(spdif->regmap, SPDIF_DMACR, +- SPDIF_DMACR_TDE_ENABLE, +- SPDIF_DMACR_TDE_DISABLE); ++ SPDIF_DMACR_TDE_ENABLE, ++ SPDIF_DMACR_TDE_DISABLE); + + if (ret != 0) + return ret; + + ret = regmap_update_bits(spdif->regmap, SPDIF_XFER, +- SPDIF_XFER_TXS_START, +- SPDIF_XFER_TXS_STOP); ++ SPDIF_XFER_TXS_START, ++ SPDIF_XFER_TXS_STOP); + break; + default: + ret = -EINVAL; +@@ -247,6 +251,7 @@ static bool rk_spdif_rd_reg(struct device *dev, unsigned int reg) + case SPDIF_INTCR: + case SPDIF_INTSR: + case SPDIF_XFER: ++ case SPDIF_SMPDR: + return true; + default: + return false; +@@ -258,6 +263,7 @@ static bool rk_spdif_volatile_reg(struct device *dev, unsigned int reg) + switch (reg) { + case SPDIF_INTSR: + case SPDIF_SDBLR: ++ case SPDIF_SMPDR: + return true; + default: + return false; +@@ -291,7 +297,7 @@ static int rk_spdif_probe(struct platform_device *pdev) + grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf"); + if (IS_ERR(grf)) { + dev_err(&pdev->dev, +- "rockchip_spdif missing 'rockchip,grf' \n"); ++ "rockchip_spdif missing 'rockchip,grf'\n"); + return PTR_ERR(grf); + } + +@@ -313,8 +319,7 @@ static int rk_spdif_probe(struct platform_device *pdev) + if (IS_ERR(spdif->mclk)) + return PTR_ERR(spdif->mclk); + +- res = platform_get_resource(pdev, IORESOURCE_MEM, 0); +- regs = devm_ioremap_resource(&pdev->dev, res); ++ regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res); + if (IS_ERR(regs)) + return PTR_ERR(regs); + +diff --git a/sound/soc/rockchip/rockchip_spdifrx.c b/sound/soc/rockchip/rockchip_spdifrx.c +new file mode 100644 +index 000000000..0e4572321 +--- /dev/null ++++ b/sound/soc/rockchip/rockchip_spdifrx.c +@@ -0,0 +1,415 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * ALSA SoC Audio Layer - Rockchip SPDIF_RX Controller driver ++ * ++ * Copyright (C) 2018 Fuzhou Rockchip Electronics Co., Ltd ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "rockchip_spdifrx.h" ++ ++struct rk_spdifrx_dev { ++ struct device *dev; ++ struct clk *mclk; ++ struct clk *hclk; ++ struct snd_dmaengine_dai_dma_data capture_dma_data; ++ struct regmap *regmap; ++ struct reset_control *reset; ++ int irq; ++}; ++ ++static int rk_spdifrx_runtime_suspend(struct device *dev) ++{ ++ struct rk_spdifrx_dev *spdifrx = dev_get_drvdata(dev); ++ ++ clk_disable_unprepare(spdifrx->mclk); ++ clk_disable_unprepare(spdifrx->hclk); ++ ++ return 0; ++} ++ ++static int rk_spdifrx_runtime_resume(struct device *dev) ++{ ++ struct rk_spdifrx_dev *spdifrx = dev_get_drvdata(dev); ++ int ret; ++ ++ ret = clk_prepare_enable(spdifrx->mclk); ++ if (ret) { ++ dev_err(spdifrx->dev, "mclk clock enable failed %d\n", ret); ++ return ret; ++ } ++ ++ ret = clk_prepare_enable(spdifrx->hclk); ++ if (ret) { ++ dev_err(spdifrx->dev, "hclk clock enable failed %d\n", ret); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static int rk_spdifrx_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params, ++ struct snd_soc_dai *dai) ++{ ++ struct rk_spdifrx_dev *spdifrx = snd_soc_dai_get_drvdata(dai); ++ ++ regmap_update_bits(spdifrx->regmap, SPDIFRX_INTEN, ++ SPDIFRX_INTEN_SYNCIE_MASK | ++ SPDIFRX_INTEN_NSYNCIE_MASK, ++ SPDIFRX_INTEN_SYNCIE_EN | ++ SPDIFRX_INTEN_NSYNCIE_EN); ++ regmap_update_bits(spdifrx->regmap, SPDIFRX_DMACR, ++ SPDIFRX_DMACR_RDL_MASK, SPDIFRX_DMACR_RDL(8)); ++ regmap_update_bits(spdifrx->regmap, SPDIFRX_CDR, ++ SPDIFRX_CDR_AVGSEL_MASK | SPDIFRX_CDR_BYPASS_MASK, ++ SPDIFRX_CDR_AVGSEL_MIN | SPDIFRX_CDR_BYPASS_DIS); ++ return 0; ++} ++ ++static void rk_spdifrx_reset(struct rk_spdifrx_dev *spdifrx) ++{ ++ reset_control_assert(spdifrx->reset); ++ udelay(1); ++ reset_control_deassert(spdifrx->reset); ++} ++ ++static int rk_spdifrx_trigger(struct snd_pcm_substream *substream, ++ int cmd, struct snd_soc_dai *dai) ++{ ++ struct rk_spdifrx_dev *spdifrx = snd_soc_dai_get_drvdata(dai); ++ int ret; ++ ++ switch (cmd) { ++ case SNDRV_PCM_TRIGGER_START: ++ case SNDRV_PCM_TRIGGER_RESUME: ++ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: ++ rk_spdifrx_reset(spdifrx); ++ ret = regmap_update_bits(spdifrx->regmap, SPDIFRX_DMACR, ++ SPDIFRX_DMACR_RDE_MASK, ++ SPDIFRX_DMACR_RDE_ENABLE); ++ ++ if (ret != 0) ++ return ret; ++ ++ ret = regmap_update_bits(spdifrx->regmap, SPDIFRX_CFGR, ++ SPDIFRX_EN_MASK, ++ SPDIFRX_EN); ++ break; ++ case SNDRV_PCM_TRIGGER_SUSPEND: ++ case SNDRV_PCM_TRIGGER_STOP: ++ case SNDRV_PCM_TRIGGER_PAUSE_PUSH: ++ ret = regmap_update_bits(spdifrx->regmap, SPDIFRX_DMACR, ++ SPDIFRX_DMACR_RDE_MASK, ++ SPDIFRX_DMACR_RDE_DISABLE); ++ ++ if (ret != 0) ++ return ret; ++ ++ ret = regmap_update_bits(spdifrx->regmap, SPDIFRX_CFGR, ++ SPDIFRX_EN_MASK, ++ SPDIFRX_DIS); ++ break; ++ default: ++ ret = -EINVAL; ++ break; ++ } ++ ++ return ret; ++} ++ ++static int rk_spdifrx_dai_probe(struct snd_soc_dai *dai) ++{ ++ struct rk_spdifrx_dev *spdifrx = snd_soc_dai_get_drvdata(dai); ++ ++ dai->capture_dma_data = &spdifrx->capture_dma_data; ++ ++ return 0; ++} ++ ++static const struct snd_soc_dai_ops rk_spdifrx_dai_ops = { ++ .hw_params = rk_spdifrx_hw_params, ++ .trigger = rk_spdifrx_trigger, ++}; ++ ++static struct snd_soc_dai_driver rk_spdifrx_dai = { ++ .probe = rk_spdifrx_dai_probe, ++ .capture = { ++ .stream_name = "Capture", ++ .channels_min = 2, ++ .channels_max = 2, ++ .rates = (SNDRV_PCM_RATE_32000 | ++ SNDRV_PCM_RATE_44100 | ++ SNDRV_PCM_RATE_48000 | ++ SNDRV_PCM_RATE_96000 | ++ SNDRV_PCM_RATE_192000), ++ .formats = (SNDRV_PCM_FMTBIT_S16_LE | ++ SNDRV_PCM_FMTBIT_S20_3LE | ++ SNDRV_PCM_FMTBIT_S24_LE), ++ }, ++ .ops = &rk_spdifrx_dai_ops, ++}; ++ ++static const struct snd_soc_component_driver rk_spdifrx_component = { ++ .name = "rockchip-spdifrx", ++}; ++ ++static bool rk_spdifrx_wr_reg(struct device *dev, unsigned int reg) ++{ ++ switch (reg) { ++ case SPDIFRX_CFGR: ++ case SPDIFRX_CLR: ++ case SPDIFRX_CDR: ++ case SPDIFRX_CDRST: ++ case SPDIFRX_DMACR: ++ case SPDIFRX_FIFOCTRL: ++ case SPDIFRX_INTEN: ++ case SPDIFRX_INTMASK: ++ case SPDIFRX_INTSR: ++ case SPDIFRX_INTCLR: ++ case SPDIFRX_SMPDR: ++ case SPDIFRX_BURSTINFO: ++ return true; ++ default: ++ return false; ++ } ++} ++ ++static bool rk_spdifrx_rd_reg(struct device *dev, unsigned int reg) ++{ ++ switch (reg) { ++ case SPDIFRX_CFGR: ++ case SPDIFRX_CLR: ++ case SPDIFRX_CDR: ++ case SPDIFRX_CDRST: ++ case SPDIFRX_DMACR: ++ case SPDIFRX_FIFOCTRL: ++ case SPDIFRX_INTEN: ++ case SPDIFRX_INTMASK: ++ case SPDIFRX_INTSR: ++ case SPDIFRX_INTCLR: ++ case SPDIFRX_SMPDR: ++ case SPDIFRX_BURSTINFO: ++ return true; ++ default: ++ return false; ++ } ++} ++ ++static bool rk_spdifrx_volatile_reg(struct device *dev, unsigned int reg) ++{ ++ switch (reg) { ++ case SPDIFRX_CLR: ++ case SPDIFRX_CDR: ++ case SPDIFRX_CDRST: ++ case SPDIFRX_FIFOCTRL: ++ case SPDIFRX_INTSR: ++ case SPDIFRX_INTCLR: ++ case SPDIFRX_SMPDR: ++ case SPDIFRX_BURSTINFO: ++ return true; ++ default: ++ return false; ++ } ++} ++ ++static bool rk_spdifrx_precious_reg(struct device *dev, unsigned int reg) ++{ ++ switch (reg) { ++ case SPDIFRX_SMPDR: ++ return true; ++ default: ++ return false; ++ } ++} ++ ++static const struct regmap_config rk_spdifrx_regmap_config = { ++ .reg_bits = 32, ++ .reg_stride = 4, ++ .val_bits = 32, ++ .max_register = SPDIFRX_BURSTINFO, ++ .writeable_reg = rk_spdifrx_wr_reg, ++ .readable_reg = rk_spdifrx_rd_reg, ++ .volatile_reg = rk_spdifrx_volatile_reg, ++ .precious_reg = rk_spdifrx_precious_reg, ++ .cache_type = REGCACHE_FLAT, ++}; ++ ++static irqreturn_t rk_spdifrx_isr(int irq, void *dev_id) ++{ ++ struct rk_spdifrx_dev *spdifrx = dev_id; ++ u32 intsr; ++ ++ regmap_read(spdifrx->regmap, SPDIFRX_INTSR, &intsr); ++ ++ if (intsr & BIT(7)) { ++ dev_dbg(spdifrx->dev, "NSYNC\n"); ++ regmap_write(spdifrx->regmap, SPDIFRX_INTCLR, BIT(7)); ++ } ++ ++ if (intsr & BIT(9)) { ++ dev_dbg(spdifrx->dev, "SYNC\n"); ++ regmap_write(spdifrx->regmap, SPDIFRX_INTCLR, BIT(9)); ++ } ++ ++ return IRQ_HANDLED; ++} ++ ++static int rk_spdifrx_probe(struct platform_device *pdev) ++{ ++ struct rk_spdifrx_dev *spdifrx; ++ struct resource *res; ++ void __iomem *regs; ++ int ret; ++ ++ spdifrx = devm_kzalloc(&pdev->dev, sizeof(*spdifrx), GFP_KERNEL); ++ if (!spdifrx) ++ return -ENOMEM; ++ ++ spdifrx->reset = devm_reset_control_get(&pdev->dev, "spdifrx-m"); ++ if (IS_ERR(spdifrx->reset)) { ++ ret = PTR_ERR(spdifrx->reset); ++ if (ret != -ENOENT) ++ return ret; ++ } ++ ++ spdifrx->hclk = devm_clk_get(&pdev->dev, "hclk"); ++ if (IS_ERR(spdifrx->hclk)) ++ return PTR_ERR(spdifrx->hclk); ++ ++ spdifrx->mclk = devm_clk_get(&pdev->dev, "mclk"); ++ if (IS_ERR(spdifrx->mclk)) ++ return PTR_ERR(spdifrx->mclk); ++ ++ spdifrx->irq = platform_get_irq(pdev, 0); ++ if (spdifrx->irq < 0) ++ return spdifrx->irq; ++ ++ ret = devm_request_threaded_irq(&pdev->dev, spdifrx->irq, NULL, ++ rk_spdifrx_isr, ++ IRQF_TRIGGER_HIGH | IRQF_ONESHOT, ++ dev_name(&pdev->dev), spdifrx); ++ if (ret) ++ return ret; ++ ++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ regs = devm_ioremap_resource(&pdev->dev, res); ++ if (IS_ERR(regs)) ++ return PTR_ERR(regs); ++ ++ spdifrx->regmap = devm_regmap_init_mmio(&pdev->dev, regs, ++ &rk_spdifrx_regmap_config); ++ if (IS_ERR(spdifrx->regmap)) ++ return PTR_ERR(spdifrx->regmap); ++ ++ spdifrx->capture_dma_data.addr = res->start + SPDIFRX_SMPDR; ++ spdifrx->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; ++ spdifrx->capture_dma_data.maxburst = 4; ++ ++ spdifrx->dev = &pdev->dev; ++ dev_set_drvdata(&pdev->dev, spdifrx); ++ ++ pm_runtime_enable(&pdev->dev); ++ if (!pm_runtime_enabled(&pdev->dev)) { ++ ret = rk_spdifrx_runtime_resume(&pdev->dev); ++ if (ret) ++ goto err_pm_runtime; ++ } ++ ++ ret = devm_snd_soc_register_component(&pdev->dev, ++ &rk_spdifrx_component, ++ &rk_spdifrx_dai, 1); ++ if (ret) { ++ dev_err(&pdev->dev, "Could not register DAI\n"); ++ goto err_pm_suspend; ++ } ++ ++ ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); ++ if (ret) { ++ dev_err(&pdev->dev, "Could not register PCM\n"); ++ goto err_pm_suspend; ++ } ++ ++ return 0; ++ ++err_pm_suspend: ++ if (!pm_runtime_status_suspended(&pdev->dev)) ++ rk_spdifrx_runtime_suspend(&pdev->dev); ++err_pm_runtime: ++ pm_runtime_disable(&pdev->dev); ++ ++ return ret; ++} ++ ++static int rk_spdifrx_remove(struct platform_device *pdev) ++{ ++ pm_runtime_disable(&pdev->dev); ++ if (!pm_runtime_status_suspended(&pdev->dev)) ++ rk_spdifrx_runtime_suspend(&pdev->dev); ++ ++ return 0; ++} ++ ++#ifdef CONFIG_PM_SLEEP ++static int rockchip_spdifrx_suspend(struct device *dev) ++{ ++ struct rk_spdifrx_dev *spdifrx = dev_get_drvdata(dev); ++ ++ regcache_mark_dirty(spdifrx->regmap); ++ ++ return 0; ++} ++ ++static int rockchip_spdifrx_resume(struct device *dev) ++{ ++ struct rk_spdifrx_dev *spdifrx = dev_get_drvdata(dev); ++ int ret; ++ ++ ret = pm_runtime_get_sync(dev); ++ if (ret < 0) ++ return ret; ++ ret = regcache_sync(spdifrx->regmap); ++ pm_runtime_put(dev); ++ ++ return ret; ++} ++#endif ++ ++static const struct dev_pm_ops rk_spdifrx_pm_ops = { ++ SET_RUNTIME_PM_OPS(rk_spdifrx_runtime_suspend, rk_spdifrx_runtime_resume, ++ NULL) ++ SET_SYSTEM_SLEEP_PM_OPS(rockchip_spdifrx_suspend, rockchip_spdifrx_resume) ++}; ++ ++static const struct of_device_id rk_spdifrx_match[] = { ++ { .compatible = "rockchip,rk3308-spdifrx", }, ++ {}, ++}; ++MODULE_DEVICE_TABLE(of, rk_spdifrx_match); ++ ++static struct platform_driver rk_spdifrx_driver = { ++ .probe = rk_spdifrx_probe, ++ .remove = rk_spdifrx_remove, ++ .driver = { ++ .name = "rockchip-spdifrx", ++ .of_match_table = of_match_ptr(rk_spdifrx_match), ++ .pm = &rk_spdifrx_pm_ops, ++ }, ++}; ++module_platform_driver(rk_spdifrx_driver); ++ ++MODULE_ALIAS("platform:rockchip-spdifrx"); ++MODULE_DESCRIPTION("ROCKCHIP SPDIFRX Controller Interface"); ++MODULE_AUTHOR("Sugar Zhang "); ++MODULE_LICENSE("GPL v2"); +diff --git a/sound/soc/rockchip/rockchip_spdifrx.h b/sound/soc/rockchip/rockchip_spdifrx.h +new file mode 100644 +index 000000000..e75b2d5af +--- /dev/null ++++ b/sound/soc/rockchip/rockchip_spdifrx.h +@@ -0,0 +1,113 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * ALSA SoC Audio Layer - Rockchip SPDIF_RX Controller driver ++ * ++ * Copyright (C) 2018 Fuzhou Rockchip Electronics Co., Ltd ++ * ++ */ ++ ++#ifndef _ROCKCHIP_SPDIFRX_H ++#define _ROCKCHIP_SPDIFRX_H ++ ++/* CFGR */ ++#define SPDIFRX_CFGR_TWAD_SHIFT 1 ++#define SPDIFRX_CFGR_TWAD_DATA_ONLY (0 << 1) ++#define SPDIFRX_CFGR_TWAD_STREAM BIT(1) ++#define SPDIFRX_EN_MASK BIT(0) ++#define SPDIFRX_EN BIT(0) ++#define SPDIFRX_DIS 0 ++ ++/* CLR */ ++#define SPDIFRX_CLR_RXSC BIT(0) ++ ++/* CDR */ ++#define SPDIFRX_CDR_CS_MASK GENMASK(10, 9) ++#define SPDIFRX_CDR_AVGSEL_MASK BIT(1) ++#define SPDIFRX_CDR_AVGSEL_MIN (0 << 1) ++#define SPDIFRX_CDR_AVGSEL_AVG BIT(1) ++#define SPDIFRX_CDR_BYPASS_MASK BIT(0) ++#define SPDIFRX_CDR_BYPASS_EN BIT(0) ++#define SPDIFRX_CDR_BYPASS_DIS 0 ++ ++/* CDRST */ ++#define SPDIFRX_CDRST_NOSTRTHR_MASK GENMASK(31, 16) ++#define SPDIFRX_CDRST_MAXCNT_MASK GENMASK(15, 8) ++#define SPDIFRX_CDRST_MINCNT_MASK GENMASK(7, 0) ++ ++/* DMACR */ ++#define SPDIFRX_DMACR_RDE_MASK BIT(5) ++#define SPDIFRX_DMACR_RDE_DISABLE (0 << 5) ++#define SPDIFRX_DMACR_RDE_ENABLE BIT(5) ++#define SPDIFRX_DMACR_RDL_MASK GENMASK(4, 0) ++#define SPDIFRX_DMACR_RDL(x) (((x) - 1) << 0) ++ ++/* FIFOCTRL */ ++#define SPDIFRX_FIFOCTRL_RFL_MASK GENMASK(13, 8) ++#define SPDIFRX_FIFOCTRL_RFT_MASK GENMASK(4, 0) ++ ++/* INTEN */ ++#define SPDIFRX_INTEN_UBCIE_MASK BIT(10) ++#define SPDIFRX_INTEN_UBCIE_EN BIT(10) ++#define SPDIFRX_INTEN_UBCIE_DIS (0 << 10) ++#define SPDIFRX_INTEN_SYNCIE_MASK BIT(9) ++#define SPDIFRX_INTEN_SYNCIE_EN BIT(9) ++#define SPDIFRX_INTEN_SYNCIE_DIS (0 << 9) ++#define SPDIFRX_INTEN_BTEIE_MASK BIT(8) ++#define SPDIFRX_INTEN_BTEIE_EN BIT(8) ++#define SPDIFRX_INTEN_BTEIE_DIS (0 << 8) ++#define SPDIFRX_INTEN_NSYNCIE_MASK BIT(7) ++#define SPDIFRX_INTEN_NSYNCIE_EN BIT(7) ++#define SPDIFRX_INTEN_NSYNCIE_DIS (0 << 7) ++ ++/* INTMASK */ ++#define SPDIFRX_INTMASK_UBCIMSK BIT(10) ++#define SPDIFRX_INTMASK_UBCIUMSK (0 << 10) ++#define SPDIFRX_INTMASK_SYNCIMSK BIT(9) ++#define SPDIFRX_INTMASK_SYNCIUMSK (0 << 9) ++#define SPDIFRX_INTMASK_BTEIMSK BIT(8) ++#define SPDIFRX_INTMASK_BTEIUMSK (0 << 8) ++#define SPDIFRX_INTMASK_NSYNCIMSK BIT(7) ++#define SPDIFRX_INTMASK_NSYNCIUMSK (0 << 7) ++ ++/* INTSR */ ++#define SPDIFRX_INTSR_UBCISR_ACTIVE BIT(10) ++#define SPDIFRX_INTSR_SYNCISR_ACTIVE BIT(9) ++#define SPDIFRX_INTSR_BTEISR_ACTIVE BIT(8) ++#define SPDIFRX_INTSR_NSYNCISR_ACTIVE BIT(7) ++ ++/* INTCLR */ ++#define SPDIFRX_INTCLR_UBCICLR_MASK BIT(10) ++#define SPDIFRX_INTCLR_UBCICLR BIT(10) ++#define SPDIFRX_INTCLR_SYNCICLR_MASK BIT(9) ++#define SPDIFRX_INTCLR_SYNCICLR BIT(9) ++#define SPDIFRX_INTCLR_BTECLR_MASK BIT(8) ++#define SPDIFRX_INTCLR_BIECLR BIT(8) ++#define SPDIFRX_INTCLR_NSYNCICLR_MASK BIT(7) ++#define SPDIFRX_INTCLR_NSYNCICLR BIT(7) ++ ++/* BURSTINFO */ ++#define SPDIFRX_BURSTINFO_PD_MASK GENMASK(31, 16) ++#define SPDIFRX_BURSTINFO_BSNUM_MASK GENMASK(15, 13) ++#define SPDIFRX_BURSTINFO_DATAINFO_MASK GENMASK(12, 8) ++#define SPDIFRX_BURSTINFO_ERRFLAG_MASK BIT(7) ++#define SPDIFRX_BURSTINFO_ERR BIT(7) ++#define SPDIFRX_BURSTINFO_VALID (0 << 7) ++#define SPDIFRX_BURSTINFO_DATATYPE_MASK GENMASK(6, 0) ++ ++#define SPDIFRX_VERSION (0x0000) ++#define SPDIFRX_CFGR (0x0004) ++#define SPDIFRX_CLR (0x0008) ++#define SPDIFRX_CDR (0x000c) ++#define SPDIFRX_CDRST (0x0010) ++#define SPDIFRX_DMACR (0x0014) ++#define SPDIFRX_FIFOCTRL (0x0018) ++#define SPDIFRX_INTEN (0x001C) ++#define SPDIFRX_INTMASK (0x0020) ++#define SPDIFRX_INTSR (0x0024) ++#define SPDIFRX_INTCLR (0x0028) ++#define SPDIFRX_SMPDR (0x002C) ++#define SPDIFRX_USRDRN (0x0030) ++#define SPDIFRX_CHNSRN (0x0060) ++#define SPDIFRX_BURSTINFO (0x0100) ++ ++#endif /* _ROCKCHIP_SPDIFRX_H */ +diff --git a/sound/soc/rockchip/rockchip_vad.c b/sound/soc/rockchip/rockchip_vad.c +new file mode 100644 +index 000000000..d69278aa5 +--- /dev/null ++++ b/sound/soc/rockchip/rockchip_vad.c +@@ -0,0 +1,1316 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Rockchip VAD driver ++ * ++ * Copyright (C) 2018 Fuzhou Rockchip Electronics Co., Ltd ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "rockchip_vad.h" ++#include "rockchip_multi_dais.h" ++#include "vad_preprocess.h" ++ ++#define DRV_NAME "rockchip-vad" ++ ++#define VAD_RATES SNDRV_PCM_RATE_8000_192000 ++#define VAD_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ ++ SNDRV_PCM_FMTBIT_S20_3LE | \ ++ SNDRV_PCM_FMTBIT_S24_LE | \ ++ SNDRV_PCM_FMTBIT_S32_LE) ++#define ACODEC_REG_NUM 28 ++#define CHUNK_SIZE 64 /* bytes */ ++ ++static struct snd_pcm_substream *vad_substream; ++static unsigned int voice_inactive_frames; ++module_param(voice_inactive_frames, uint, 0644); ++MODULE_PARM_DESC(voice_inactive_frames, "voice inactive frame count"); ++ ++enum rk_vad_version { ++ VAD_RK1808ES = 1, ++ VAD_RK1808, ++ VAD_RK3308, ++}; ++ ++struct vad_buf { ++ void __iomem *begin; ++ void __iomem *end; ++ void __iomem *cur; ++ void __iomem *pos; ++ int size; ++ int loop_cnt; ++ bool loop; ++ bool sorted; ++}; ++ ++struct audio_src_addr_map { ++ u32 id; ++ u32 addr; ++}; ++ ++struct vad_soc_data { ++ enum rk_vad_version version; ++ const struct audio_src_addr_map *map; ++}; ++ ++struct rockchip_vad { ++ struct device *dev; ++ struct device_node *audio_node; ++ struct clk *hclk; ++ struct regmap *regmap; ++ unsigned int memphy; ++ unsigned int memphy_end; ++ void __iomem *membase; ++ struct vad_buf vbuf; ++ struct vad_params params; ++ struct vad_uparams uparams; ++ struct snd_soc_dai *cpu_dai; ++ struct snd_pcm_substream *substream; ++ struct vad_soc_data *soc_data; ++ int mode; ++ u32 audio_src; ++ u32 audio_src_addr; ++ u32 audio_chnl; ++ u32 channels; ++ u32 sample_bytes; ++ u32 buffer_time; /* msec */ ++ struct dentry *debugfs_dir; ++ void *buf; ++ bool acodec_cfg; ++ bool vswitch; ++ bool h_16bit; ++ enum rk_vad_version version; ++}; ++ ++static inline int vframe_size(struct rockchip_vad *vad, int bytes) ++{ ++ return bytes / vad->channels / vad->sample_bytes; ++} ++ ++static int chunk_sort(void __iomem *pos, void __iomem *end, int loop_cnt) ++{ ++ char tbuf[CHUNK_SIZE]; ++ int size1, size2; ++ ++ size1 = loop_cnt * 4; ++ size2 = CHUNK_SIZE - size1; ++ ++ while (pos < end) { ++ memcpy_fromio(&tbuf[0], pos + size1, size2); ++ memcpy_fromio(&tbuf[size2], pos, size1); ++ memcpy_toio(pos, &tbuf[0], CHUNK_SIZE); ++ pos += CHUNK_SIZE; ++ } ++ ++ return 0; ++} ++ ++static int vad_buffer_sort(struct rockchip_vad *vad) ++{ ++ struct vad_buf *vbuf = &vad->vbuf; ++ int loop_cnt = vbuf->loop_cnt; ++ ++ if (vad->version != VAD_RK1808ES) ++ return 0; ++ ++ if (vbuf->sorted || !vbuf->loop) ++ return 0; ++ ++ /* 16 words align */ ++ if ((vbuf->pos - vbuf->begin) % CHUNK_SIZE || ++ (vbuf->end - vbuf->pos) % CHUNK_SIZE) ++ return -EINVAL; ++ ++ switch (loop_cnt) { ++ case 0: ++ loop_cnt = 16; ++ chunk_sort(vbuf->pos, vbuf->end, loop_cnt - 1); ++ vbuf->sorted = true; ++ break; ++ case 1: ++ chunk_sort(vbuf->begin, vbuf->pos, loop_cnt); ++ vbuf->sorted = true; ++ break; ++ case 2 ... 15: ++ chunk_sort(vbuf->pos, vbuf->end, loop_cnt - 1); ++ chunk_sort(vbuf->begin, vbuf->pos, loop_cnt); ++ vbuf->sorted = true; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ return 0; ++} ++ ++static int rockchip_vad_stop(struct rockchip_vad *vad) ++{ ++ unsigned int val, frames; ++ struct vad_buf *vbuf = &vad->vbuf; ++ struct vad_params *params = &vad->params; ++ ++ regmap_read(vad->regmap, VAD_CTRL, &val); ++ if ((val & VAD_EN_MASK) == VAD_DISABLE) ++ return 0; ++ ++ /* sample cnt will be clear after vad disabled */ ++ if (vad->version == VAD_RK1808ES) ++ regmap_read(vad->regmap, VAD_SAMPLE_CNT, &frames); ++ regmap_update_bits(vad->regmap, VAD_CTRL, VAD_EN_MASK, VAD_DISABLE); ++ regmap_read(vad->regmap, VAD_CTRL, &val); ++ vad->h_16bit = (val & AUDIO_24BIT_SAT_MASK) == AUDIO_H16B; ++ regmap_read(vad->regmap, VAD_RAM_END_ADDR, &val); ++ vbuf->end = vbuf->begin + (val - vad->memphy) + 0x8; ++ regmap_read(vad->regmap, VAD_INT, &val); ++ val &= BIT(8); ++ vbuf->loop = val; ++ regmap_read(vad->regmap, VAD_RAM_CUR_ADDR, &val); ++ if (!val) { ++ vbuf->size = 0; ++ vbuf->cur = vbuf->begin; ++ return 0; ++ } ++ vbuf->cur = vbuf->begin + (val - vad->memphy); ++ ++ if (vbuf->loop) { ++ vbuf->size = vbuf->end - vbuf->begin; ++ vbuf->pos = vbuf->cur; ++ } else { ++ vbuf->size = vbuf->cur - vbuf->begin; ++ vbuf->end = vbuf->cur; ++ vbuf->pos = vbuf->begin; ++ } ++ ++ if (vad->version == VAD_RK1808ES) { ++ vbuf->loop_cnt = (frames / vframe_size(vad, vbuf->size)) % 16; ++ /* due to get loop_cnt before vad disable, we should take ++ * the boundary issue into account, and judge whether the ++ * loop_cnt change to loop_cnt + 1 or not when vad disable. ++ */ ++ if (vbuf->loop) { ++ frames = frames % vframe_size(vad, vbuf->size); ++ val = vframe_size(vad, vbuf->pos - vbuf->begin); ++ if (frames > val) ++ vbuf->loop_cnt = (vbuf->loop_cnt + 1) % 16; ++ } ++ vbuf->sorted = false; ++ } ++ regmap_read(vad->regmap, VAD_DET_CON0, &val); ++ params->noise_level = (val & NOISE_LEVEL_MASK) >> NOISE_LEVEL_SHIFT; ++ params->vad_con_thd = (val & VAD_CON_THD_MASK) >> VAD_CON_THD_SHIFT; ++ params->voice_gain = (val & GAIN_MASK) >> GAIN_SHIFT; ++ regmap_read(vad->regmap, VAD_DET_CON1, &val); ++ params->sound_thd = val & SOUND_THD_MASK; ++ regmap_read(vad->regmap, VAD_DET_CON5, &val); ++ params->noise_abs = val & NOISE_ABS_MASK; ++ ++ vad_preprocess_init(params); ++ voice_inactive_frames = 0; ++ ++ dev_info(vad->dev, "bufsize: %d, hw_abs: 0x%x\n", ++ vbuf->size, params->noise_abs); ++ ++ return 0; ++} ++ ++static int rockchip_vad_setup(struct rockchip_vad *vad) ++{ ++ struct regmap *regmap = vad->regmap; ++ u32 val, mask; ++ ++ dev_info(vad->dev, "sw_abs: 0x%x\n", ++ vad->uparams.noise_abs); ++ regmap_update_bits(regmap, VAD_DET_CON5, ++ NOISE_ABS_MASK, vad->uparams.noise_abs); ++ regmap_update_bits(regmap, VAD_CTRL, VAD_EN_MASK, VAD_EN); ++ ++ val = ERR_INT_EN | VAD_DET_INT_EN; ++ mask = ERR_INT_EN_MASK | VAD_DET_INT_EN_MASK; ++ ++ regmap_update_bits(regmap, VAD_INT, mask, val); ++ ++ vad_preprocess_destroy(); ++ ++ return 0; ++} ++ ++static struct rockchip_vad *substream_get_drvdata(struct snd_pcm_substream *substream) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct rockchip_vad *vad = NULL; ++ unsigned int i; ++ ++ if (!rtd) ++ return NULL; ++ ++ for (i = 0; i < rtd->num_codecs; i++) { ++ struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, i); ++ ++ if (strstr(codec_dai->name, "vad")) ++ vad = snd_soc_component_get_drvdata(codec_dai->component); ++ } ++ ++ return vad; ++} ++ ++/** ++ * snd_pcm_vad_avail - Get the available (readable) space for vad ++ * @runtime: PCM substream instance ++ * ++ * Result is between 0 ... (boundary - 1) ++ */ ++snd_pcm_uframes_t snd_pcm_vad_avail(struct snd_pcm_substream *substream) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct rockchip_vad *vad = NULL; ++ struct vad_buf *vbuf; ++ snd_pcm_uframes_t vframes; ++ ++ vad = substream_get_drvdata(substream); ++ ++ if (!vad) ++ return 0; ++ ++ vbuf = &vad->vbuf; ++ ++ if (vbuf->size <= 0) ++ return 0; ++ ++ vframes = samples_to_bytes(runtime, vad->channels); ++ if (vframes) ++ vframes = vbuf->size / vframes; ++ if (!vframes) ++ dev_err(vad->dev, "residue bytes: %d\n", vbuf->size); ++ ++ return vframes; ++} ++EXPORT_SYMBOL(snd_pcm_vad_avail); ++ ++snd_pcm_sframes_t snd_pcm_vad_read(struct snd_pcm_substream *substream, ++ void __user *buf, snd_pcm_uframes_t frames) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct rockchip_vad *vad = NULL; ++ struct vad_buf *vbuf; ++ snd_pcm_uframes_t avail; ++ int bytes, vbytes, frame_sz, vframe_sz, padding_sz; ++ unsigned int i; ++ void *pbuf, *sbuf; ++ ++ vad = substream_get_drvdata(substream); ++ ++ if (!vad) ++ return -EFAULT; ++ ++ vbuf = &vad->vbuf; ++ ++ avail = snd_pcm_vad_avail(substream); ++ avail = avail > frames ? frames : avail; ++ bytes = frames_to_bytes(runtime, avail); ++ if (bytes <= 0) ++ return -EFAULT; ++ ++ if (vad_buffer_sort(vad) < 0) { ++ dev_err(vad->dev, "buffer sort failed\n"); ++ return -EFAULT; ++ } ++ ++ if (!vad->buf) { ++ vad->buf = kzalloc(bytes, GFP_KERNEL); ++ if (!vad->buf) ++ return -ENOMEM; ++ } ++ ++ frame_sz = frames_to_bytes(runtime, 1); ++ vframe_sz = samples_to_bytes(runtime, vad->channels); ++ padding_sz = frame_sz - vframe_sz; ++ vbytes = vframe_sz * avail; ++ sbuf = vad->buf; ++ pbuf = vad->buf + bytes - vbytes; ++ if (!vbuf->loop) { ++ memcpy_fromio(pbuf, vbuf->pos, vbytes); ++ vbuf->pos += vbytes; ++ } else { ++ if ((vbuf->pos + vbytes) <= vbuf->end) { ++ memcpy_fromio(pbuf, vbuf->pos, vbytes); ++ vbuf->pos += vbytes; ++ } else { ++ int part1 = vbuf->end - vbuf->pos; ++ int part2 = vbytes - part1; ++ ++ memcpy_fromio(pbuf, vbuf->pos, part1); ++ memcpy_fromio(pbuf + part1, vbuf->begin, part2); ++ vbuf->pos = vbuf->begin + part2; ++ } ++ } ++ ++ if (padding_sz) { ++ for (i = 0; i < avail; i++) { ++ memmove(sbuf, pbuf, vframe_sz); ++ sbuf += vframe_sz; ++ pbuf += vframe_sz; ++ memset(sbuf, 0x0, padding_sz); ++ sbuf += padding_sz; ++ } ++ } ++ ++ if (copy_to_user(buf, vad->buf, bytes)) ++ return -EFAULT; ++ ++ vbuf->size -= vbytes; ++ if (vbuf->size <= 0) { ++ kfree(vad->buf); ++ vad->buf = NULL; ++ } ++ ++ return avail; ++} ++EXPORT_SYMBOL(snd_pcm_vad_read); ++ ++int snd_pcm_vad_preprocess(struct snd_pcm_substream *substream, ++ void *buf, snd_pcm_uframes_t size) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct rockchip_vad *vad = NULL; ++ unsigned int i; ++ s16 *data; ++ ++ vad = substream_get_drvdata(substream); ++ ++ if (!vad) ++ return 0; ++ ++ buf += samples_to_bytes(runtime, vad->audio_chnl); ++ /* retrieve the high 16bit data */ ++ if (runtime->sample_bits == 32 && vad->h_16bit) ++ buf += 2; ++ for (i = 0; i < size; i++) { ++ data = buf; ++ if (vad_preprocess(*data)) ++ voice_inactive_frames = 0; ++ else ++ voice_inactive_frames++; ++ buf += frames_to_bytes(runtime, 1); ++ } ++ ++ vad_preprocess_update_params(&vad->uparams); ++ return 0; ++} ++EXPORT_SYMBOL(snd_pcm_vad_preprocess); ++ ++/** ++ * snd_pcm_vad_attached - Check whether vad is attached to substream or not ++ * @substream: PCM substream instance ++ * ++ * Result is true for attached or false for detached ++ */ ++bool snd_pcm_vad_attached(struct snd_pcm_substream *substream) ++{ ++ struct rockchip_vad *vad = NULL; ++ ++ if (vad_substream == substream) ++ vad = substream_get_drvdata(substream); ++ ++ if (vad && vad->vswitch) ++ return true; ++ else ++ return false; ++} ++EXPORT_SYMBOL(snd_pcm_vad_attached); ++ ++static int vad_memcpy_fromio(void *to, void __iomem *from, ++ int size, int frame_sz, int padding_sz) ++{ ++ int i, step_src, step_dst, fcount; ++ ++ step_src = frame_sz; ++ step_dst = frame_sz + padding_sz; ++ ++ if (size % frame_sz) { ++ pr_err("%s: invalid size: %d\n", __func__, size); ++ return -EINVAL; ++ } ++ ++ fcount = size / frame_sz; ++ if (padding_sz) { ++ for (i = 0; i < fcount; i++) { ++ memcpy_fromio(to, from, frame_sz); ++ to += step_dst; ++ from += step_src; ++ } ++ } else { ++ memcpy_fromio(to, from, size); ++ } ++ ++ return 0; ++} ++ ++/** ++ * snd_pcm_vad_memcpy - Copy vad data to dst ++ * @substream: PCM substream instance ++ * @buf: dst buf ++ * @frames: size in frame ++ * ++ * Result is copied frames for success or errno for fail ++ */ ++snd_pcm_sframes_t snd_pcm_vad_memcpy(struct snd_pcm_substream *substream, ++ void *buf, snd_pcm_uframes_t frames) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct rockchip_vad *vad = NULL; ++ struct vad_buf *vbuf; ++ snd_pcm_uframes_t avail; ++ int bytes, vbytes, frame_sz, vframe_sz, padding_sz; ++ ++ vad = substream_get_drvdata(substream); ++ ++ if (!vad) ++ return -EFAULT; ++ ++ vbuf = &vad->vbuf; ++ ++ avail = snd_pcm_vad_avail(substream); ++ avail = avail > frames ? frames : avail; ++ bytes = frames_to_bytes(runtime, avail); ++ ++ if (bytes <= 0) ++ return -EFAULT; ++ ++ if (vad_buffer_sort(vad) < 0) { ++ dev_err(vad->dev, "buffer sort failed\n"); ++ return -EFAULT; ++ } ++ ++ frame_sz = frames_to_bytes(runtime, 1); ++ vframe_sz = samples_to_bytes(runtime, vad->channels); ++ padding_sz = frame_sz - vframe_sz; ++ vbytes = vframe_sz * avail; ++ ++ memset(buf, 0x0, bytes); ++ if (!vbuf->loop) { ++ vad_memcpy_fromio(buf, vbuf->pos, vbytes, ++ vframe_sz, padding_sz); ++ vbuf->pos += vbytes; ++ } else { ++ if ((vbuf->pos + vbytes) <= vbuf->end) { ++ vad_memcpy_fromio(buf, vbuf->pos, vbytes, ++ vframe_sz, padding_sz); ++ vbuf->pos += vbytes; ++ } else { ++ int part1 = vbuf->end - vbuf->pos; ++ int part2 = vbytes - part1; ++ int offset = part1; ++ ++ if (padding_sz) ++ offset = part1 / vframe_sz * frame_sz; ++ vad_memcpy_fromio(buf, vbuf->pos, part1, ++ vframe_sz, padding_sz); ++ vad_memcpy_fromio(buf + offset, vbuf->begin, part2, ++ vframe_sz, padding_sz); ++ vbuf->pos = vbuf->begin + part2; ++ } ++ } ++ ++ vbuf->size -= vbytes; ++ ++ return avail; ++} ++EXPORT_SYMBOL(snd_pcm_vad_memcpy); ++ ++static bool rockchip_vad_writeable_reg(struct device *dev, unsigned int reg) ++{ ++ return true; ++} ++ ++static bool rockchip_vad_readable_reg(struct device *dev, unsigned int reg) ++{ ++ return true; ++} ++ ++static bool rockchip_vad_volatile_reg(struct device *dev, unsigned int reg) ++{ ++ switch (reg) { ++ case VAD_INT: ++ case VAD_RAM_CUR_ADDR: ++ case VAD_DET_CON5: ++ case VAD_SAMPLE_CNT: ++ return true; ++ default: ++ return false; ++ } ++} ++ ++static const struct reg_default rk1808_vad_reg_defaults[] = { ++ {VAD_CTRL, 0x03000000}, ++ {VAD_DET_CON0, 0x01024008}, ++ {VAD_DET_CON1, 0x04ff0064}, ++ {VAD_DET_CON2, 0x3bf5e663}, ++ {VAD_DET_CON3, 0x3bf58817}, ++ {VAD_DET_CON4, 0x382b8858}, ++}; ++ ++static const struct reg_default rk3308_vad_reg_defaults[] = { ++ {VAD_CTRL, 0x03000000}, ++ {VAD_DET_CON0, 0x00024020}, ++ {VAD_DET_CON1, 0x00ff0064}, ++ {VAD_DET_CON2, 0x3bf5e663}, ++ {VAD_DET_CON3, 0x3bf58817}, ++ {VAD_DET_CON4, 0x382b8858}, ++ {VAD_RAM_BEGIN_ADDR, 0xfff88000}, ++ {VAD_RAM_END_ADDR, 0xfffbfff8}, ++}; ++ ++static const struct regmap_config rk1808_vad_regmap_config = { ++ .reg_bits = 32, ++ .reg_stride = 4, ++ .val_bits = 32, ++ .max_register = VAD_NOISE_DATA, ++ .reg_defaults = rk1808_vad_reg_defaults, ++ .num_reg_defaults = ARRAY_SIZE(rk1808_vad_reg_defaults), ++ .writeable_reg = rockchip_vad_writeable_reg, ++ .readable_reg = rockchip_vad_readable_reg, ++ .volatile_reg = rockchip_vad_volatile_reg, ++ .cache_type = REGCACHE_FLAT, ++}; ++ ++static const struct regmap_config rk3308_vad_regmap_config = { ++ .reg_bits = 32, ++ .reg_stride = 4, ++ .val_bits = 32, ++ .max_register = VAD_INT, ++ .reg_defaults = rk3308_vad_reg_defaults, ++ .num_reg_defaults = ARRAY_SIZE(rk3308_vad_reg_defaults), ++ .writeable_reg = rockchip_vad_writeable_reg, ++ .readable_reg = rockchip_vad_readable_reg, ++ .volatile_reg = rockchip_vad_volatile_reg, ++ .cache_type = REGCACHE_FLAT, ++}; ++ ++static const struct audio_src_addr_map rk1808_addr_map[] = { ++ { 1, RK1808_I2S0 }, ++ { 3, RK1808_I2S1 }, ++ { 4, RK1808_PDM }, ++ { /* sentinel */ }, ++}; ++ ++static const struct audio_src_addr_map rk3308_addr_map[] = { ++ { 0, RK3308_I2S_8CH_0 }, ++ { 1, RK3308_I2S_8CH_1 }, ++ { 2, RK3308_I2S_8CH_2 }, ++ { 3, RK3308_I2S_8CH_3 }, ++ { 4, RK3308_PDM_8CH }, ++ { /* sentinel */ }, ++}; ++ ++static const struct audio_src_addr_map rk3568_addr_map[] = { ++ { 0, RK3568_I2S_8CH_1 }, ++ { 1, RK3568_I2S_2CH_2 }, ++ { 2, RK3568_I2S_2CH_3 }, ++ { 3, RK3568_PDM }, ++ { /* sentinel */ }, ++}; ++ ++static const struct audio_src_addr_map rk3588_addr_map[] = { ++ { 0, RK3588_PDM0 }, ++ { 1, RK3588_I2S1_8CH }, ++ { /* sentinel */ }, ++}; ++ ++static const struct vad_soc_data rk1808es_soc_data = { ++ .version = VAD_RK1808ES, ++ .map = rk1808_addr_map, ++}; ++ ++static const struct vad_soc_data rk1808_soc_data = { ++ .version = VAD_RK1808, ++ .map = rk1808_addr_map, ++}; ++ ++static const struct vad_soc_data rk3308_soc_data = { ++ .version = VAD_RK3308, ++ .map = rk3308_addr_map, ++}; ++ ++static const struct vad_soc_data rk3568_soc_data = { ++ .version = VAD_RK1808, ++ .map = rk3568_addr_map, ++}; ++ ++static const struct vad_soc_data rk3588_soc_data = { ++ .version = VAD_RK1808, ++ .map = rk3588_addr_map, ++}; ++ ++static int rockchip_vad_get_audio_src_address(struct rockchip_vad *vad, ++ u32 addr) ++{ ++ const struct audio_src_addr_map *map = vad->soc_data->map; ++ ++ for (; map->addr; map++) { ++ if ((map->addr & 0xffff0000) == addr) { ++ vad->audio_src = map->id; ++ vad->audio_src_addr = map->addr; ++ return 0; ++ } ++ } ++ ++ return -ENODEV; ++} ++ ++static irqreturn_t rockchip_vad_irq(int irqno, void *dev_id) ++{ ++ struct rockchip_vad *vad = dev_id; ++ unsigned int val; ++ ++ regmap_read(vad->regmap, VAD_INT, &val); ++ regmap_write(vad->regmap, VAD_INT, val); ++ ++ dev_dbg(vad->dev, "irq 0x%08x\n", val); ++ ++ return IRQ_HANDLED; ++} ++ ++static const struct reg_sequence rockchip_vad_acodec_adc_enable[] = { ++ { VAD_OD_ADDR0, 0x36261606 }, ++ { VAD_D_DATA0, 0x51515151 }, ++ { VAD_OD_ADDR1, 0x30201000 }, ++ { VAD_D_DATA1, 0xbbbbbbbb }, ++ { VAD_OD_ADDR2, 0x32221202 }, ++ { VAD_D_DATA2, 0x11111111 }, ++ { VAD_OD_ADDR3, 0x35251505 }, ++ { VAD_D_DATA3, 0x77777777 }, ++ { VAD_OD_ADDR4, 0x32221202 }, ++ { VAD_D_DATA4, 0x33333333 }, ++ { VAD_OD_ADDR5, 0x30201000 }, ++ { VAD_D_DATA5, 0xffffffff }, ++ { VAD_OD_ADDR6, 0x32221202 }, ++ { VAD_D_DATA6, 0x77777777 }, ++}; ++ ++static int rockchip_vad_config_acodec(struct snd_pcm_hw_params *params, ++ struct snd_soc_dai *dai) ++{ ++ struct snd_soc_component *component = dai->component; ++ struct rockchip_vad *vad = snd_soc_component_get_drvdata(component); ++ unsigned int val = 0; ++ ++ if (!vad->acodec_cfg) ++ return 0; ++ ++ val = ACODEC_BASE + ACODEC_ADC_ANA_CON0; ++ regmap_write(vad->regmap, VAD_ID_ADDR, val); ++ ++ regmap_multi_reg_write(vad->regmap, rockchip_vad_acodec_adc_enable, ++ ARRAY_SIZE(rockchip_vad_acodec_adc_enable)); ++ ++ regmap_update_bits(vad->regmap, VAD_CTRL, ACODE_CFG_REG_NUM_MASK, ++ ACODE_CFG_REG_NUM(ACODEC_REG_NUM)); ++ regmap_update_bits(vad->regmap, VAD_CTRL, CFG_ACODE_AFTER_DET_EN_MASK, ++ CFG_ACODE_AFTER_DET_EN); ++ ++ return 0; ++} ++ ++static struct snd_soc_dai *rockchip_vad_find_dai(struct device_node *np) ++{ ++ struct snd_soc_dai_link_component dai_component = { 0 }; ++ ++ dai_component.of_node = np; ++ ++ return snd_soc_find_dai(&dai_component); ++} ++ ++static void hw_refine_channels(struct snd_pcm_hw_params *params, ++ unsigned int channel) ++{ ++ struct snd_interval *c = ++ hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS); ++ ++ c->min = channel; ++ c->max = channel; ++} ++ ++static void rockchip_vad_params_fixup(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params, ++ struct snd_soc_dai *dai) ++{ ++ struct rockchip_vad *vad = snd_soc_component_get_drvdata(dai->component); ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_dai *cpu_dai, *audio_src_dai; ++ struct device_node *np; ++ struct rk_mdais_dev *mdais; ++ unsigned int *channel_maps; ++ int i; ++ ++ cpu_dai = asoc_rtd_to_cpu(rtd, 0); ++ vad->cpu_dai = cpu_dai; ++ vad->substream = substream; ++ np = cpu_dai->dev->of_node; ++ if (of_device_is_compatible(np, "rockchip,multi-dais")) { ++ audio_src_dai = rockchip_vad_find_dai(vad->audio_node); ++ mdais = snd_soc_dai_get_drvdata(cpu_dai); ++ channel_maps = mdais->capture_channel_maps; ++ for (i = 0; i < mdais->num_dais; i++) { ++ if (audio_src_dai == mdais->dais[i].dai && ++ channel_maps[i]) ++ hw_refine_channels(params, channel_maps[i]); ++ } ++ } ++} ++ ++static int rockchip_vad_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params, ++ struct snd_soc_dai *dai) ++{ ++ struct snd_soc_component *component = dai->component; ++ struct rockchip_vad *vad = snd_soc_component_get_drvdata(component); ++ unsigned int val = 0, mask = 0, frame_bytes, buf_time; ++ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ return 0; ++ ++ rockchip_vad_params_fixup(substream, params, dai); ++ vad->channels = params_channels(params); ++ switch (params_format(params)) { ++ case SNDRV_PCM_FORMAT_S16_LE: ++ val = AUDIO_CHNL_16B; ++ vad->sample_bytes = 2; ++ break; ++ case SNDRV_PCM_FORMAT_S24_LE: ++ case SNDRV_PCM_FORMAT_S32_LE: ++ val = AUDIO_CHNL_24B; ++ vad->sample_bytes = 4; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ regmap_update_bits(vad->regmap, VAD_CTRL, AUDIO_CHNL_BW_MASK, val); ++ regmap_update_bits(vad->regmap, VAD_CTRL, AUDIO_CHNL_NUM_MASK, ++ AUDIO_CHNL_NUM(params_channels(params))); ++ ++ val = SRC_ADDR_MODE_INC | SRC_BURST_INCR; ++ mask = SRC_ADDR_MODE_MASK | SRC_BURST_MASK | INCR_BURST_LEN_MASK; ++ switch (params_channels(params)) { ++ case 8: ++ /* fallthrough */ ++ case 6: ++ /* fallthrough */ ++ case 4: ++ /* fallthrough */ ++ case 2: ++ val |= INCR_BURST_LEN(params_channels(params)); ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ if (vad->version == VAD_RK1808ES) { ++ val = SRC_ADDR_MODE_INC | SRC_BURST_INCR16; ++ mask = SRC_ADDR_MODE_MASK | SRC_BURST_MASK | SRC_BURST_NUM_MASK; ++ if (params_channels(params) == 6) ++ val |= SRC_BURST_NUM(3); ++ } ++ regmap_update_bits(vad->regmap, VAD_CTRL, mask, val); ++ ++ /* calculate buffer space according buffer time */ ++ if (vad->buffer_time) { ++ frame_bytes = snd_pcm_format_size(params_format(params), ++ params_channels(params)); ++ ++ buf_time = vad->memphy_end - vad->memphy + 0x8; ++ buf_time *= 1000; ++ buf_time /= (frame_bytes * params_rate(params)); ++ if (buf_time < vad->buffer_time) ++ dev_info(vad->dev, "max buffer time: %u ms.\n", buf_time); ++ buf_time = min(buf_time, vad->buffer_time); ++ ++ val = params_rate(params) * buf_time / 1000; ++ if (vad->version == VAD_RK1808ES) ++ val &= ~0xf; /* 16 align */ ++ val *= frame_bytes; ++ val += vad->memphy; ++ val -= 0x8; ++ if (val < vad->memphy || val > vad->memphy_end) ++ return -EINVAL; ++ regmap_write(vad->regmap, VAD_RAM_END_ADDR, val); ++ } ++ ++ /* ++ * config acodec ++ * audio_src 2/3 is connected to acodec ++ */ ++ val = vad->audio_src >> AUDIO_SRC_SEL_SHIFT; ++ if (val == 2 || val == 3) ++ rockchip_vad_config_acodec(params, dai); ++ ++ return 0; ++} ++ ++static int rockchip_vad_enable_cpudai(struct rockchip_vad *vad) ++{ ++ struct snd_soc_dai *cpu_dai; ++ struct snd_pcm_substream *substream; ++ int ret = 0; ++ ++ cpu_dai = vad->cpu_dai; ++ substream = vad->substream; ++ ++ if (!cpu_dai || !substream) ++ return 0; ++ ++ pm_runtime_get_sync(cpu_dai->dev); ++ ++ if (cpu_dai->driver->ops && cpu_dai->driver->ops->trigger) ++ ret = cpu_dai->driver->ops->trigger(substream, ++ SNDRV_PCM_TRIGGER_START, ++ cpu_dai); ++ ++ return ret; ++} ++ ++static int rockchip_vad_disable_cpudai(struct rockchip_vad *vad) ++{ ++ struct snd_soc_dai *cpu_dai; ++ struct snd_pcm_substream *substream; ++ int ret = 0; ++ ++ cpu_dai = vad->cpu_dai; ++ substream = vad->substream; ++ ++ if (!cpu_dai || !substream) ++ return 0; ++ ++ pm_runtime_get_sync(cpu_dai->dev); ++ ++ if (cpu_dai->driver->ops && cpu_dai->driver->ops->trigger) ++ ret = cpu_dai->driver->ops->trigger(substream, ++ SNDRV_PCM_TRIGGER_STOP, ++ cpu_dai); ++ ++ pm_runtime_put(cpu_dai->dev); ++ return ret; ++} ++ ++static int rockchip_vad_pcm_startup(struct snd_pcm_substream *substream, ++ struct snd_soc_dai *dai) ++{ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ return 0; ++ ++ vad_substream = substream; ++ ++ return 0; ++} ++ ++static void rockchip_vad_pcm_shutdown(struct snd_pcm_substream *substream, ++ struct snd_soc_dai *dai) ++{ ++ struct snd_soc_component *component = dai->component; ++ struct rockchip_vad *vad = snd_soc_component_get_drvdata(component); ++ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ return; ++ ++ if (vad->vswitch) { ++ rockchip_vad_enable_cpudai(vad); ++ rockchip_vad_setup(vad); ++ } ++ ++ vad_substream = NULL; ++} ++ ++static int rockchip_vad_trigger(struct snd_pcm_substream *substream, int cmd, ++ struct snd_soc_dai *dai) ++{ ++ struct snd_soc_component *component = dai->component; ++ struct rockchip_vad *vad = snd_soc_component_get_drvdata(component); ++ ++ switch (cmd) { ++ case SNDRV_PCM_TRIGGER_START: ++ case SNDRV_PCM_TRIGGER_RESUME: ++ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ return 0; ++ rockchip_vad_stop(vad); ++ break; ++ case SNDRV_PCM_TRIGGER_STOP: ++ case SNDRV_PCM_TRIGGER_SUSPEND: ++ case SNDRV_PCM_TRIGGER_PAUSE_PUSH: ++ break; ++ default: ++ break; ++ } ++ ++ return 0; ++} ++ ++static struct snd_soc_dai_ops rockchip_vad_dai_ops = { ++ .hw_params = rockchip_vad_hw_params, ++ .shutdown = rockchip_vad_pcm_shutdown, ++ .startup = rockchip_vad_pcm_startup, ++ .trigger = rockchip_vad_trigger, ++}; ++ ++static struct snd_soc_dai_driver vad_dai = { ++ .name = "vad", ++ .playback = { ++ .stream_name = "Playback", ++ .channels_min = 1, ++ .channels_max = 8, ++ .rates = VAD_RATES, ++ .formats = VAD_FORMATS, ++ }, ++ .capture = { ++ .stream_name = "Capture", ++ .channels_min = 1, ++ .channels_max = 8, ++ .rates = VAD_RATES, ++ .formats = VAD_FORMATS, ++ }, ++ .ops = &rockchip_vad_dai_ops, ++}; ++ ++static int rockchip_vad_switch_info(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_info *uinfo) ++{ ++ uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; ++ uinfo->count = 1; ++ uinfo->value.integer.min = 0; ++ uinfo->value.integer.max = 1; ++ ++ return 0; ++} ++ ++static int rockchip_vad_switch_get(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); ++ struct rockchip_vad *vad = snd_soc_component_get_drvdata(component); ++ ++ ucontrol->value.integer.value[0] = vad->vswitch; ++ ++ return 0; ++} ++ ++static int rockchip_vad_switch_put(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); ++ struct rockchip_vad *vad = snd_soc_component_get_drvdata(component); ++ int val; ++ ++ val = ucontrol->value.integer.value[0]; ++ if (val && !vad->vswitch) { ++ vad->vswitch = true; ++ } else if (!val && vad->vswitch) { ++ vad->vswitch = false; ++ ++ regmap_read(vad->regmap, VAD_CTRL, &val); ++ if ((val & VAD_EN_MASK) == VAD_DISABLE) ++ return 0; ++ rockchip_vad_stop(vad); ++ rockchip_vad_disable_cpudai(vad); ++ /* this case we don't need vad data */ ++ vad->vbuf.size = 0; ++ } ++ ++ return 0; ++} ++ ++#define SOC_ROCKCHIP_VAD_SWITCH_DECL(xname) \ ++{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ ++ .info = rockchip_vad_switch_info, .get = rockchip_vad_switch_get, \ ++ .put = rockchip_vad_switch_put, } ++ ++static const struct snd_kcontrol_new rockchip_vad_dapm_controls[] = { ++ SOC_ROCKCHIP_VAD_SWITCH_DECL("vad switch"), ++}; ++ ++static const struct snd_soc_component_driver soc_vad_codec = { ++ .controls = rockchip_vad_dapm_controls, ++ .num_controls = ARRAY_SIZE(rockchip_vad_dapm_controls), ++}; ++ ++#if defined(CONFIG_DEBUG_FS) ++#include ++#include ++#include ++ ++static int rockchip_vad_debugfs_reg_show(struct seq_file *s, void *v) ++{ ++ struct rockchip_vad *vad = s->private; ++ unsigned int i; ++ unsigned int val; ++ unsigned int max_register; ++ ++ if (vad->version == VAD_RK1808 || ++ vad->version == VAD_RK1808ES) ++ max_register = VAD_NOISE_DATA; ++ else ++ max_register = VAD_INT; ++ for (i = VAD_CTRL; i <= max_register; i += 4) { ++ regmap_read(vad->regmap, i, &val); ++ if (!(i % 16)) ++ seq_printf(s, "\n%08x: ", i); ++ seq_printf(s, "%08x ", val); ++ } ++ ++ return 0; ++} ++ ++static ssize_t rockchip_vad_debugfs_reg_write(struct file *file, ++ const char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ struct rockchip_vad *vad = ((struct seq_file *)file->private_data)->private; ++ unsigned int reg, val; ++ char kbuf[24]; ++ ++ if (count >= sizeof(kbuf)) ++ return -EINVAL; ++ ++ if (copy_from_user(kbuf, buf, count)) ++ return -EFAULT; ++ kbuf[count] = '\0'; ++ if (sscanf(kbuf, "%x %x", ®, &val) != 2) ++ return -EFAULT; ++ ++ regmap_write(vad->regmap, reg, val); ++ ++ return count; ++} ++ ++static int rockchip_vad_debugfs_open(struct inode *inode, struct file *file) ++{ ++ return single_open(file, rockchip_vad_debugfs_reg_show, inode->i_private); ++} ++ ++static const struct file_operations rockchip_vad_reg_debugfs_fops = { ++ .owner = THIS_MODULE, ++ .open = rockchip_vad_debugfs_open, ++ .read = seq_read, ++ .write = rockchip_vad_debugfs_reg_write, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; ++#endif ++ ++static void rockchip_vad_init(struct rockchip_vad *vad) ++{ ++ unsigned int val, mask; ++ ++ regmap_write(vad->regmap, VAD_RAM_BEGIN_ADDR, vad->memphy); ++ regmap_write(vad->regmap, VAD_RAM_END_ADDR, vad->memphy_end); ++ vad->vbuf.begin = vad->membase; ++ regmap_write(vad->regmap, VAD_IS_ADDR, vad->audio_src_addr); ++ ++ val = VAD_DET_CHNL(vad->audio_chnl); ++ val |= vad->audio_src; ++ val |= vad->mode << VAD_MODE_SHIFT; ++ mask = VAD_DET_CHNL_MASK | AUDIO_SRC_SEL_MASK | ++ VAD_MODE_MASK; ++ ++ regmap_update_bits(vad->regmap, VAD_CTRL, mask, val); ++ if (vad->version == VAD_RK1808 || ++ vad->version == VAD_RK1808ES) { ++ regmap_update_bits(vad->regmap, VAD_AUX_CONTROL, ++ RAM_ITF_EN_MASK | BUS_WRITE_EN_MASK, ++ RAM_ITF_DIS | BUS_WRITE_EN); ++ regmap_update_bits(vad->regmap, VAD_AUX_CONTROL, ++ SAMPLE_CNT_EN_MASK, SAMPLE_CNT_EN); ++ } ++} ++ ++static const struct of_device_id rockchip_vad_match[] = { ++ { .compatible = "rockchip,rk1808es-vad", .data = &rk1808es_soc_data }, ++ { .compatible = "rockchip,rk1808-vad", .data = &rk1808_soc_data }, ++ { .compatible = "rockchip,rk3308-vad", .data = &rk3308_soc_data }, ++ { .compatible = "rockchip,rk3568-vad", .data = &rk3568_soc_data }, ++ { .compatible = "rockchip,rk3588-vad", .data = &rk3588_soc_data }, ++ {}, ++}; ++ ++static int rockchip_vad_probe(struct platform_device *pdev) ++{ ++ struct device_node *np = pdev->dev.of_node; ++ struct device_node *asrc_np = NULL; ++ struct device_node *sram_np = NULL; ++ const struct of_device_id *match; ++ const struct regmap_config *regmap_config; ++ struct rockchip_vad *vad; ++ struct resource *res; ++ struct resource audio_res; ++ struct resource sram_res; ++ void __iomem *regbase; ++ int irq; ++ int ret; ++ ++ vad = devm_kzalloc(&pdev->dev, sizeof(*vad), GFP_KERNEL); ++ if (!vad) ++ return -ENOMEM; ++ ++ vad->dev = &pdev->dev; ++ ++ match = of_match_device(rockchip_vad_match, &pdev->dev); ++ if (!match || !match->data) ++ return -EINVAL; ++ ++ vad->soc_data = (struct vad_soc_data *)match->data; ++ vad->version = vad->soc_data->version; ++ ++ switch (vad->version) { ++ case VAD_RK1808: ++ case VAD_RK1808ES: ++ regmap_config = &rk1808_vad_regmap_config; ++ break; ++ case VAD_RK3308: ++ regmap_config = &rk3308_vad_regmap_config; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ vad->acodec_cfg = of_property_read_bool(np, "rockchip,acodec-cfg"); ++ of_property_read_u32(np, "rockchip,mode", &vad->mode); ++ of_property_read_u32(np, "rockchip,det-channel", &vad->audio_chnl); ++ of_property_read_u32(np, "rockchip,buffer-time-ms", &vad->buffer_time); ++ ++ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "vad"); ++ regbase = devm_ioremap_resource(&pdev->dev, res); ++ if (IS_ERR(regbase)) ++ return PTR_ERR(regbase); ++ ++ sram_np = of_parse_phandle(np, "rockchip,audio-sram", 0); ++ if (!sram_np) { ++ dev_err(&pdev->dev, "could not find sram dt node\n"); ++ return -ENODEV; ++ } ++ ++ asrc_np = of_parse_phandle(np, "rockchip,audio-src", 0); ++ if (!asrc_np) { ++ ret = -ENODEV; ++ goto err_phandle; ++ } ++ ++ ret = of_address_to_resource(asrc_np, 0, &audio_res); ++ if (ret) ++ goto err_phandle; ++ ret = rockchip_vad_get_audio_src_address(vad, audio_res.start); ++ if (ret) ++ goto err_phandle; ++ vad->audio_node = asrc_np; ++ vad->audio_src <<= AUDIO_SRC_SEL_SHIFT; ++ ++ ret = of_address_to_resource(sram_np, 0, &sram_res); ++ if (ret) ++ goto err_phandle; ++ vad->memphy = sram_res.start; ++ vad->memphy_end = sram_res.start + resource_size(&sram_res) - 0x8; ++ vad->membase = devm_ioremap(&pdev->dev, sram_res.start, ++ resource_size(&sram_res)); ++ if (!vad->membase) { ++ ret = -ENOMEM; ++ goto err_phandle; ++ } ++ ++ if (IS_ERR(vad->membase)) { ++ ret = PTR_ERR(vad->membase); ++ goto err_phandle; ++ } ++ ++ vad->hclk = devm_clk_get(&pdev->dev, "hclk"); ++ if (IS_ERR(vad->hclk)) { ++ ret = PTR_ERR(vad->hclk); ++ goto err_phandle; ++ } ++ ++ ret = clk_prepare_enable(vad->hclk); ++ if (ret) ++ goto err_phandle; ++ ++ vad->regmap = devm_regmap_init_mmio(&pdev->dev, regbase, ++ regmap_config); ++ if (IS_ERR(vad->regmap)) { ++ ret = PTR_ERR(vad->regmap); ++ goto err; ++ } ++ ++ rockchip_vad_init(vad); ++ ++ irq = platform_get_irq(pdev, 0); ++ if (irq < 0) { ++ ret = irq; ++ goto err; ++ } ++ ++ ret = devm_request_irq(&pdev->dev, irq, rockchip_vad_irq, ++ 0, dev_name(&pdev->dev), vad); ++ if (ret < 0) ++ goto err; ++ ++#if defined(CONFIG_DEBUG_FS) ++ vad->debugfs_dir = debugfs_create_dir("vad", NULL); ++ if (IS_ERR(vad->debugfs_dir)) ++ dev_err(&pdev->dev, "failed to create debugfs dir for vad!\n"); ++ else ++ debugfs_create_file("reg", 0644, vad->debugfs_dir, vad, ++ &rockchip_vad_reg_debugfs_fops); ++#endif ++ ++ platform_set_drvdata(pdev, vad); ++ ret = snd_soc_register_component(&pdev->dev, &soc_vad_codec, ++ &vad_dai, 1); ++ if (ret) ++ goto err; ++ ++ of_node_put(sram_np); ++ ++ return 0; ++err: ++ clk_disable_unprepare(vad->hclk); ++err_phandle: ++ of_node_put(sram_np); ++ of_node_put(asrc_np); ++ return ret; ++} ++ ++static int rockchip_vad_remove(struct platform_device *pdev) ++{ ++ struct rockchip_vad *vad = dev_get_drvdata(&pdev->dev); ++ ++ if (!IS_ERR(vad->hclk)) ++ clk_disable_unprepare(vad->hclk); ++ of_node_put(vad->audio_node); ++ snd_soc_unregister_component(&pdev->dev); ++ return 0; ++} ++ ++static struct platform_driver rockchip_vad_driver = { ++ .probe = rockchip_vad_probe, ++ .remove = rockchip_vad_remove, ++ .driver = { ++ .name = DRV_NAME, ++ .of_match_table = of_match_ptr(rockchip_vad_match), ++ }, ++}; ++module_platform_driver(rockchip_vad_driver); ++ ++MODULE_DESCRIPTION("Rockchip VAD Controller"); ++MODULE_AUTHOR("Andy Yan "); ++MODULE_AUTHOR("Sugar Zhang "); ++MODULE_LICENSE("GPL v2"); ++MODULE_ALIAS("platform:" DRV_NAME); ++MODULE_DEVICE_TABLE(of, rockchip_vad_match); +diff --git a/sound/soc/rockchip/rockchip_vad.h b/sound/soc/rockchip/rockchip_vad.h +new file mode 100644 +index 000000000..1121e7149 +--- /dev/null ++++ b/sound/soc/rockchip/rockchip_vad.h +@@ -0,0 +1,231 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Rockchip VAD driver ++ * ++ * Copyright (C) 2018 Fuzhou Rockchip Electronics Co., Ltd ++ * ++ */ ++ ++#ifndef _ROCKCHIP_VAD_H ++#define _ROCKCHIP_VAD_H ++ ++#define VAD_CTRL 0x00 ++#define VAD_DET_CHNL_SHIFT 29 ++#define VAD_DET_CHNL_MASK GENMASK(31, 29) ++#define VAD_DET_CHNL(x) ((x) << VAD_DET_CHNL_SHIFT) ++#define AUDIO_24BIT_SAT_SHIFT 28 ++#define AUDIO_24BIT_SAT_MASK BIT(28) ++#define AUDIO_H16B 0 ++#define AUDIO_SAT_24TO16 BIT(28) ++#define AUDIO_24BIT_ALIGN_MODE_SHIFT 27 ++#define AUDIO_24BIT_ALIGN_MODE_MASK BIT(27) ++#define AUDIO_24BIT_ALIGN_8_31B 0 ++#define AUDIO_24BIT_ALIGN_0_23B BIT(27) ++#define AUDIO_CHNL_BW_SHIFT 26 ++#define AUDIO_CHNL_BW_MASK BIT(26) ++#define AUDIO_CHNL_16B 0 ++#define AUDIO_CHNL_24B BIT(26) ++#define AUDIO_CHNL_NUM_SHIFT 23 ++#define AUDIO_CHNL_NUM_MASK GENMASK(25, 23) ++#define AUDIO_CHNL_NUM(x) ((x - 1) << AUDIO_CHNL_NUM_SHIFT) ++#define CFG_ACODE_AFTER_DET_EN_SHIFT 22 ++#define CFG_ACODE_AFTER_DET_EN_MASK BIT(22) ++#define CFG_ACODE_AFTER_DET_EN BIT(22) ++#define VAD_MODE_SHIFT 20 ++#define VAD_MODE_MASK GENMASK(21, 20) ++#define STORE_DATA_VAD_DET_ONLY 0 ++#define STORE_DATA_ALL (1 << VAD_MODE_SHIFT) ++#define NO_STORE_DATA (2 << VAD_MODE_SHIFT) ++#define ACODE_CFG_REG_NUM_SHIFT 15 ++#define ACODE_CFG_REG_NUM_MASK GENMASK(19, 15) ++#define ACODE_CFG_REG_NUM(x) ((x - 1) << ACODE_CFG_REG_NUM_SHIFT) ++#define SRC_ADDR_MODE_SHIFT 14 ++#define SRC_ADDR_MODE_MASK BIT(14) ++#define SRC_ADDR_MODE_INC 0 ++#define SRC_ADDR_MODE_FIXED BIT(14) ++#define INCR_BURST_LEN_SHIFT 10 ++#define INCR_BURST_LEN_MASK GENMASK(13, 10) ++#define INCR_BURST_LEN(x) ((x - 1) << INCR_BURST_LEN_SHIFT) ++#define SRC_BURST_NUM_SHIFT 7 ++#define SRC_BURST_NUM_MASK GENMASK(9, 7) ++#define SRC_BURST_NUM(x) ((x - 1) << SRC_BURST_NUM_SHIFT) ++#define SRC_BURST_SHIFT 4 ++#define SRC_BURST_MASK GENMASK(6, 4) ++#define SRC_BURST_SIGNLE 0 ++#define SRC_BURST_INCR (1 << SRC_BURST_SHIFT) ++#define SRC_BURST_INCR4 (3 << SRC_BURST_SHIFT) ++#define SRC_BURST_INCR8 (5 << SRC_BURST_SHIFT) ++#define SRC_BURST_INCR16 (7 << SRC_BURST_SHIFT) ++#define AUDIO_SRC_SEL_SHIFT 1 ++#define AUDIO_SRC_SEL_MASK GENMASK(3, 1) ++#define AUDIO_SRC_SEL_I2S0 0 ++#define AUDIO_SRC_SEL_I2S1 (1 << AUDIO_SRC_SEL_MASK) ++#define AUDIO_SRC_SEL_I2S2 (2 << AUDIO_SRC_SEL_MASK) ++#define AUDIO_SRC_SEL_I2S3 (3 << AUDIO_SRC_SEL_MASK) ++#define AUDIO_SRC_SEL_PDM (4 << AUDIO_SRC_SEL_MASK) ++#define VAD_EN_SHIFT 0 ++#define VAD_EN_MASK BIT(0) ++#define VAD_EN BIT(0) ++#define VAD_DISABLE 0 ++#define VAD_IS_ADDR 4 ++#define VAD_ID_ADDR 8 ++#define VAD_OD_ADDR0 0x0c ++#define VAD_OD_ADDR1 0x10 ++#define VAD_OD_ADDR2 0x14 ++#define VAD_OD_ADDR3 0x18 ++#define VAD_OD_ADDR4 0x1c ++#define VAD_OD_ADDR5 0x20 ++#define VAD_OD_ADDR6 0x24 ++#define VAD_OD_ADDR7 0x28 ++#define VAD_D_DATA0 0x2c ++#define VAD_D_DATA1 0x30 ++#define VAD_D_DATA2 0x34 ++#define VAD_D_DATA3 0x38 ++#define VAD_D_DATA4 0x3c ++#define VAD_D_DATA5 0x40 ++#define VAD_D_DATA6 0x44 ++#define VAD_D_DATA7 0x48 ++ ++#define VAD_TIMEOUT 0x4c ++#define WORK_TIMEOUT_EN_MASK BIT(31) ++#define WORK_TIMEOUT_EN BIT(31) ++#define WORK_TIMEOUT_DISABLE 0 ++#define IDLE_TIMEOUT_EN_MASK BIT(30) ++#define IDLE_TIMEOUT_EN BIT(30) ++#define IDLE_TIMEOUT_DISABLE 0 ++#define WORK_TIMEOUT_THD_SHIFT 20 ++#define WORK_TIMEOUT_THD_MASK GENMASK(29, 20) ++#define WORK_TIMEOUT_THD(x) ((x) << WORK_TIMEOUT_THD_SHIFT) ++#define IDLE_TIMEOUT_THD_SHIFT 0 ++#define IDLE_TIMEOUT_THD_MASK GENMASK(19, 0) ++#define IDLE_TIMEOUT_THD(x) ((x) << IDLE_TIMEOUT_THD_SHIFT) ++ ++#define VAD_RAM_BEGIN_ADDR 0x50 ++#define VAD_RAM_END_ADDR 0x54 ++#define VAD_RAM_CUR_ADDR 0x58 ++#define VAD_DET_CON0 0x5c ++#define VAD_CON_THD_SHIFT 16 ++#define VAD_CON_THD_MASK GENMASK(23, 16) ++#define VAD_CON_THD(x) ((x) << VAD_CON_THD_SHIFT) ++#define NOISE_LEVEL_SHIFT 12 ++#define NOISE_LEVEL_MASK GENMASK(14, 12) ++#define NOISE_LEVEL(x) ((x) << NOISE_LEVEL_SHIFT) ++#define GAIN_SHIFT 0 ++#define GAIN_MASK GENMASK(9, 0) ++#define GAIN(x) (x) ++ ++#define VAD_DET_CON1 0x60 ++#define MIN_NOISE_FIND_MODE_SHIFT 30 ++#define MIN_NOISE_FIN_MODE_MASK BIT(30) ++#define MIN_NOISE_FIND_MODE0 0 ++#define MIN_NOISE_FIND_MODE1 BIT(30) ++#define NOISE_CLEAN_MODE_SHIFT 29 ++#define NOISE_CLEAN_MODE_MASK BIT(29) ++#define NOISE_CLEAN_MODE0 0 ++#define NOISE_CLEAN_MODE1 BIT(29) ++#define NOISE_CLK_FORCE_EN_MASK BIT(28) ++#define NOISE_CLK_AUTO_GATING 0 ++#define NOISE_CLK_FORCE_EN BIT(28) ++#define NOISE_SAMPLE_NUM_SHIFT 16 ++#define NOISE_SAMPLE_NUM_MASK GENMASK(25, 16) ++#define NOISE_SAMPLE_NUM ((x) << NOISE_SAMPLE_NUM_SHIFT) ++#define SOUND_THD_MASK GENMASK(15, 0) ++#define SOUND_THD(x) (x) ++ ++#define VAD_DET_CON2 0x64 ++#define IIR_B0_SHIFT 16 ++#define IIR_B0_MASK GENMASK(31, 16) ++#define IIR_B0(x) ((x) << IIR_B0_SHIFT) ++#define NOISE_ALPHA_SHIFT 8 ++#define NOISE_ALPHA_MASK GENMASK(15, 8) ++#define NOISE_ALPHA(x) ((x) << NOISE_ALPHA_SHIFT) ++#define NOISE_FRM_NUM_MASK GENMASK(6, 0) ++#define NOISE_FRM_NUM(x) (x) ++ ++#define VAD_DET_CON3 0x68 ++#define IIR_B2_MASK GENMASK(31, 16) ++#define IIR_B2(x) ((x) << 16) ++#define IIR_B1_MASK GENMASK(15, 0) ++#define IIR_B1(x) (x) ++ ++#define VAD_DET_CON4 0x6c ++#define IIR_A2_MASK GENMASK(31, 16) ++#define IIR_A2(x) ((x) << 16) ++#define IIR_A1_MASK GENMASK(15, 0) ++#define IIR_A1(x) (x) ++ ++#define VAD_DET_CON5 0x70 ++#define IIR_RESULT_SHIFT 16 ++#define IIR_RESULT_MASK GENMASK(31, 16) ++#define NOISE_ABS_MASK GENMASK(15, 0) ++#define NOISE_ABS(x) (x) ++ ++#define VAD_INT 0x74 ++#define VAD_DATA_TRANS_INT_FLAG_MASK BIT(11) ++#define VAD_DATA_TRANS_INT_EN_MASK BIT(10) ++#define VAD_DATA_TRANS_INT_EN BIT(10) ++#define VAD_IDLE_MASK BIT(9) ++#define RAM_LOOP_FLGA_MASK BIT(8) ++#define WORK_TIMEOUT_FLAG_MASK BIT(7) ++#define IDLE_TIMEOUT_FLAG_MASK BIT(6) ++#define ERR_INT_FLAG_MASK BIT(5) ++#define VAD_DET_INT_FLAG_MASK BIT(4) ++#define WORK_TIMEOUT_INT_EN_MASK BIT(3) ++#define WORK_TIMEOUT_INT_EN BIT(3) ++#define IDLE_TIMEOUT_INT_EN_MASK BIT(2) ++#define IDLE_TIMEOUT_INT_EN BIT(2) ++#define ERR_INT_EN_MASK BIT(1) ++#define ERR_INT_EN BIT(1) ++#define VAD_DET_INT_EN_MASK BIT(0) ++#define VAD_DET_INT_EN BIT(0) ++ ++#define VAD_AUX_CONTROL 0x78 ++#define SAMPLE_CNT_EN_MASK BIT(29) ++#define SAMPLE_CNT_EN BIT(29) ++#define SAMPLE_CNT_DIS 0 ++#define INT_TRIG_CTRL_EN_MASK BIT(28) ++#define INT_TRIG_CTRL_EN BIT(28) ++#define INT_TRIG_CTRL_DIS 0 ++#define INT_TRIG_VALID_THD_MASK GENMASK(27, 16) ++#define INT_TRIG_VALID_THD(x) (((x) - 1) << 16) ++#define DATA_TRANS_KBYTE_THD_MASK GENMASK(11, 4) ++#define DATA_TRANS_KBYTE_THD(x) (((x) - 1) << 4) ++#define DATA_TRANS_TRIG_INT_EN_MASK BIT(2) ++#define DATA_TRANS_TRIG_INT_EN BIT(2) ++#define DATA_TRANS_TRIG_INT_DIS 0 ++#define RAM_ITF_EN_MASK BIT(1) ++#define RAM_ITF_EN 0 ++#define RAM_ITF_DIS BIT(1) ++#define BUS_WRITE_EN_MASK BIT(0) ++#define BUS_WRITE_EN BIT(0) ++#define BUS_WRITE_DIS 0 ++ ++#define VAD_SAMPLE_CNT 0x7c ++#define VAD_NOISE_DATA 0x100 ++ ++/* RK1808 SOC */ ++#define RK1808_I2S0 0xff7e0800 ++#define RK1808_I2S1 0xff7f0800 ++#define RK1808_PDM 0xff800400 ++ ++/* RK3308 SOC */ ++#define ACODEC_BASE 0xff560000 ++#define ACODEC_ADC_ANA_CON0 0X340 ++ ++#define RK3308_I2S_8CH_0 0xff300800 ++#define RK3308_I2S_8CH_1 0xff310800 ++#define RK3308_I2S_8CH_2 0xff320800 ++#define RK3308_I2S_8CH_3 0xff330800 ++#define RK3308_PDM_8CH 0xff380400 ++ ++/* RK3568 SOC */ ++#define RK3568_I2S_8CH_1 0xfe410800 ++#define RK3568_I2S_2CH_2 0xfe420800 ++#define RK3568_I2S_2CH_3 0xfe430800 ++#define RK3568_PDM 0xfe440400 ++ ++/* RK3588 SOC */ ++#define RK3588_I2S1_8CH 0xfe480800 ++#define RK3588_PDM0 0xfe4b0400 ++ ++#endif +diff --git a/sound/soc/rockchip/vad_preprocess.h b/sound/soc/rockchip/vad_preprocess.h +new file mode 100644 +index 000000000..85e4d1022 +--- /dev/null ++++ b/sound/soc/rockchip/vad_preprocess.h +@@ -0,0 +1,29 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Rockchip VAD Preprocess ++ * ++ * Copyright (C) 2018 Fuzhou Rockchip Electronics Co., Ltd ++ * ++ */ ++ ++#ifndef _ROCKCHIP_VAD_PREPROCESS_H ++#define _ROCKCHIP_VAD_PREPROCESS_H ++ ++struct vad_params { ++ int noise_abs; ++ int noise_level; ++ int sound_thd; ++ int vad_con_thd; ++ int voice_gain; ++}; ++ ++struct vad_uparams { ++ int noise_abs; ++}; ++ ++void vad_preprocess_init(struct vad_params *params); ++void vad_preprocess_destroy(void); ++void vad_preprocess_update_params(struct vad_uparams *uparams); ++int vad_preprocess(int data); ++ ++#endif +diff --git a/sound/soc/rockchip/vad_preprocess_arm.S b/sound/soc/rockchip/vad_preprocess_arm.S +new file mode 100644 +index 000000000..a0d3eabf2 +--- /dev/null ++++ b/sound/soc/rockchip/vad_preprocess_arm.S +@@ -0,0 +1,348 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Rockchip VAD Preprocess ++ * ++ * Copyright (C) 2018 Fuzhou Rockchip Electronics Co., Ltd ++ * ++ */ ++ ++ .arch armv7-a ++ .fpu softvfp ++ .eabi_attribute 20, 1 ++ .eabi_attribute 21, 1 ++ .eabi_attribute 23, 3 ++ .eabi_attribute 24, 1 ++ .eabi_attribute 25, 1 ++ .eabi_attribute 26, 2 ++ .eabi_attribute 30, 4 ++ .eabi_attribute 34, 1 ++ .eabi_attribute 18, 4 ++ .file "vad_preprocess_arm.S" ++ .text ++ .align 2 ++ .global vad_preprocess_init ++ .type vad_preprocess_init, %function ++vad_preprocess_init: ++ .fnstart ++ @ args = 0, pretend = 0, frame = 0 ++ @ frame_needed = 0, uses_anonymous_args = 0 ++ @ link register save eliminated. ++ ldr r2, .L4 ++ ldr r3, [r0, #8] ++ strh r3, [r2] @ movhi ++ ldr r3, [r0, #4] ++ strh r3, [r2, #2] @ movhi ++ ldr r3, [r0, #12] ++ strh r3, [r2, #4] @ movhi ++ ldr r3, [r0] ++ strh r3, [r2, #6] @ movhi ++ ldr r3, [r0, #16] ++ tst r3, #512 ++ ubfx r3, r3, #0, #9 ++ eorne r3, r3, #65280 ++ eorne r3, r3, #255 ++ uxtheq r3, r3 ++ strh r3, [r2, #8] @ movhi ++ bx lr ++.L5: ++ .align 2 ++.L4: ++ .word .LANCHOR0 ++ .fnend ++ .size vad_preprocess_init, .-vad_preprocess_init ++ .align 2 ++ .global vad_preprocess ++ .type vad_preprocess, %function ++vad_preprocess: ++ .fnstart ++ @ args = 0, pretend = 0, frame = 0 ++ @ frame_needed = 0, uses_anonymous_args = 0 ++ ldr r3, .L27 ++ stmfd sp!, {r4, r5, r6, r7, r8, r9, lr} ++ .save {r4, r5, r6, r7, r8, r9, lr} ++ movw lr, #15349 ++ ldrsh r2, [r3, #8] ++ ldrh ip, [r3, #10] ++ ldr r1, .L27+4 ++ mul r0, r2, r0 ++ ldrh r4, [r3, #12] ++ smulbb r1, ip, r1 ++ add r2, r0, #31 ++ cmp r0, #0 ++ movlt r0, r2 ++ ldrh r2, [r3, #14] ++ mov r0, r0, asr #5 ++ mla r1, lr, r0, r1 ++ smlabb r1, r4, lr, r1 ++ ldr r4, .L27+8 ++ ldrsh lr, [r3, #16] ++ smulbb r4, r2, r4 ++ rsb r4, r4, r1 ++ movw r1, #14379 ++ mls r4, lr, r1, r4 ++ cmp r4, #1 ++ mov r5, r4, asr #31 ++ sbcs r1, r5, #0 ++ blt .L7 ++ adds r4, r4, #8192 ++ adc r5, r5, #0 ++ b .L24 ++.L7: ++ subs r4, r4, #8192 ++ movw r8, #16383 ++ sbc r5, r5, #0 ++ mov r9, #0 ++ mov r6, r5, asr #31 ++ mov r7, r6, asr #31 ++ and r6, r6, r8 ++ and r7, r7, r9 ++ adds r4, r4, r6 ++ adc r5, r5, r7 ++.L24: ++ strh ip, [r3, #12] @ movhi ++ mov r1, r4, lsr #14 ++ ldrh ip, [r3, #18] ++ orr r1, r1, r5, asl #18 ++ strh r0, [r3, #10] @ movhi ++ add ip, ip, #1 ++ uxth r1, r1 ++ ldr r0, .L27+12 ++ uxth ip, ip ++ strh r1, [r3, #14] @ movhi ++ strh ip, [r3, #18] @ movhi ++ sxth r1, r1 ++ sxth ip, ip ++ cmp r1, #0 ++ and r0, r0, ip ++ rsblt r1, r1, #0 ++ cmp r0, #0 ++ strh r2, [r3, #16] @ movhi ++ sublt r0, r0, #1 ++ ldr r2, [r3, #20] ++ mvnlt r0, r0, asl #24 ++ add r2, r1, r2 ++ mvnlt r0, r0, lsr #24 ++ addlt r0, r0, #1 ++ cmp r0, #0 ++ str r2, [r3, #20] ++ bne .L9 ++ ldr r0, [r3, #24] ++ ldr ip, .L27 ++ cmp r0, #99 ++ bgt .L11 ++ add r2, r2, #128 ++ add ip, ip, r0, asl #1 ++ add lr, r2, #255 ++ cmp r2, #0 ++ movlt r2, lr ++ mov r2, r2, asr #8 ++ strh r2, [ip, #28] @ movhi ++ b .L12 ++.L11: ++ add lr, ip, #28 ++ add ip, ip, #226 ++.L13: ++ ldrh r4, [lr, #2] ++ strh r4, [lr], #2 @ movhi ++ cmp lr, ip ++ bne .L13 ++ add r2, r2, #128 ++ add ip, r2, #255 ++ cmp r2, #0 ++ movlt r2, ip ++ mov r2, r2, asr #8 ++ strh r2, [r3, #226] @ movhi ++.L12: ++ cmp r0, #99 ++ ldrh r2, [r3, #28] ++ ldrle r4, .L27+16 ++ movle lr, #1 ++ bgt .L26 ++.L15: ++ cmp lr, r0 ++ bge .L17 ++ ldrsh ip, [r4], #2 ++ sxth r2, r2 ++ add lr, lr, #1 ++ cmp ip, r2 ++ movge ip, r2 ++ uxth r2, ip ++ b .L15 ++.L26: ++ ldr ip, .L27+16 ++ add r4, ip, #198 ++.L18: ++ ldrsh lr, [ip], #2 ++ sxth r2, r2 ++ cmp r2, lr ++ movge r2, lr ++ cmp ip, r4 ++ uxth r2, r2 ++ bne .L18 ++.L17: ++ ldrh lr, [r3, #6] ++ mov ip, #128 ++ mov r4, #230 ++ add r0, r0, #1 ++ str r0, [r3, #24] ++ smlabb ip, lr, r4, ip ++ mov lr, #26 ++ smlabb r2, r2, lr, ip ++ add ip, r2, #255 ++ cmp r2, #0 ++ movlt r2, ip ++ mov r2, r2, asr #8 ++ strh r2, [r3, #6] @ movhi ++ mov r2, #0 ++ str r2, [r3, #20] ++ strh r2, [r3, #18] @ movhi ++.L9: ++ ldrh r2, [r3, #6] ++ ldrh ip, [r3, #2] ++ ldrsh r3, [r3] ++ ldr r0, .L27 ++ smlabb r3, r2, ip, r3 ++ add r2, r0, #428 ++ cmp r1, r3 ++ ble .L19 ++ ldrh r3, [r2] ++ ldrsh r0, [r0, #4] ++ add r3, r3, #1 ++ uxth r3, r3 ++ strh r3, [r2] @ movhi ++ sxth r3, r3 ++ cmp r0, r3 ++ movge r0, #0 ++ movlt r0, #1 ++ ldmfd sp!, {r4, r5, r6, r7, r8, r9, pc} ++.L19: ++ mov r0, #0 ++ strh r0, [r2] @ movhi ++ ldmfd sp!, {r4, r5, r6, r7, r8, r9, pc} ++.L28: ++ .align 2 ++.L27: ++ .word .LANCHOR0 ++ .word -30697 ++ .word -30632 ++ .word -2147483393 ++ .word .LANCHOR0+30 ++ .fnend ++ .size vad_preprocess, .-vad_preprocess ++ .align 2 ++ .global vad_preprocess_destroy ++ .type vad_preprocess_destroy, %function ++vad_preprocess_destroy: ++ .fnstart ++ @ args = 0, pretend = 0, frame = 0 ++ @ frame_needed = 0, uses_anonymous_args = 0 ++ @ link register save eliminated. ++ ldr r2, .L32 ++ mov r3, #0 ++ mov ip, r3 ++ strh r3, [r2, #10] @ movhi ++ strh r3, [r2, #12] @ movhi ++ strh r3, [r2, #14] @ movhi ++ strh r3, [r2, #16] @ movhi ++ strh r3, [r2, #18] @ movhi ++ add r2, r2, #428 ++ strh r3, [r2] @ movhi ++.L30: ++ ldr r2, .L32 ++ mov r1, #0 ++ add r0, r2, #28 ++ strh ip, [r3, r0] @ movhi ++ add r3, r3, #2 ++ cmp r3, #200 ++ bne .L30 ++ mov r3, #32 ++ str r1, [r2, #20] ++ strh r1, [r2, #6] @ movhi ++ strh r3, [r2, #8] @ movhi ++ str r1, [r2, #24] ++ bx lr ++.L33: ++ .align 2 ++.L32: ++ .word .LANCHOR0 ++ .fnend ++ .size vad_preprocess_destroy, .-vad_preprocess_destroy ++ .align 2 ++ .global vad_preprocess_update_params ++ .type vad_preprocess_update_params, %function ++vad_preprocess_update_params: ++ .fnstart ++ @ args = 0, pretend = 0, frame = 0 ++ @ frame_needed = 0, uses_anonymous_args = 0 ++ @ link register save eliminated. ++ ldr r3, .L35 ++ ldrsh r3, [r3, #6] ++ str r3, [r0] ++ bx lr ++.L36: ++ .align 2 ++.L35: ++ .word .LANCHOR0 ++ .fnend ++ .size vad_preprocess_update_params, .-vad_preprocess_update_params ++ .bss ++ .align 2 ++.LANCHOR0 = . + 0 ++ .type g_sound_thd, %object ++ .size g_sound_thd, 2 ++g_sound_thd: ++ .space 2 ++ .type g_noise_level, %object ++ .size g_noise_level, 2 ++g_noise_level: ++ .space 2 ++ .type g_vad_con_thd, %object ++ .size g_vad_con_thd, 2 ++g_vad_con_thd: ++ .space 2 ++ .type g_noise_abs, %object ++ .size g_noise_abs, 2 ++g_noise_abs: ++ .space 2 ++ .type g_signal_gain, %object ++ .size g_signal_gain, 2 ++g_signal_gain: ++ .space 2 ++ .type g_xn_1, %object ++ .size g_xn_1, 2 ++g_xn_1: ++ .space 2 ++ .type g_xn_2, %object ++ .size g_xn_2, 2 ++g_xn_2: ++ .space 2 ++ .type g_yn_1, %object ++ .size g_yn_1, 2 ++g_yn_1: ++ .space 2 ++ .type g_yn_2, %object ++ .size g_yn_2, 2 ++g_yn_2: ++ .space 2 ++ .type g_sample_cnt, %object ++ .size g_sample_cnt, 2 ++g_sample_cnt: ++ .space 2 ++ .type g_sum_abs_frm, %object ++ .size g_sum_abs_frm, 4 ++g_sum_abs_frm: ++ .space 4 ++ .type frm_count, %object ++ .size frm_count, 4 ++frm_count: ++ .space 4 ++ .type g_ave_abs_rec, %object ++ .size g_ave_abs_rec, 400 ++g_ave_abs_rec: ++ .space 400 ++ .type g_vad_cnt, %object ++ .size g_vad_cnt, 2 ++g_vad_cnt: ++ .space 2 ++ .ident "GCC: (GNU) 4.9 20150123 (prerelease)" ++ .section .note.GNU-stack,"",%progbits +diff --git a/sound/soc/rockchip/vad_preprocess_arm64.S b/sound/soc/rockchip/vad_preprocess_arm64.S +new file mode 100644 +index 000000000..823757c17 +--- /dev/null ++++ b/sound/soc/rockchip/vad_preprocess_arm64.S +@@ -0,0 +1,273 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Rockchip VAD Preprocess ++ * ++ * Copyright (C) 2018 Fuzhou Rockchip Electronics Co., Ltd ++ * ++ */ ++ ++ .arch armv8-a ++ .file "vad_preprocess_arm64.S" ++ .text ++ .align 2 ++ .global vad_preprocess_init ++ .type vad_preprocess_init, %function ++vad_preprocess_init: ++ adrp x2, .LANCHOR0 ++ add x1, x2, :lo12:.LANCHOR0 ++ ldr w3, [x0, 8] ++ strh w3, [x2, #:lo12:.LANCHOR0] ++ ldr w2, [x0, 4] ++ strh w2, [x1, 2] ++ ldr w2, [x0, 12] ++ strh w2, [x1, 4] ++ ldr w2, [x0] ++ strh w2, [x1, 6] ++ ldr w2, [x0, 16] ++ and w0, w2, 511 ++ tbz x2, 9, .L2 ++ mvn w0, w0 ++.L2: ++ strh w0, [x1, 8] ++ ret ++ .size vad_preprocess_init, .-vad_preprocess_init ++ .align 2 ++ .global vad_preprocess ++ .type vad_preprocess, %function ++vad_preprocess: ++ adrp x4, .LANCHOR0 ++ add x2, x4, :lo12:.LANCHOR0 ++ mov w8, 15349 ++ ldrsh w1, [x2, 8] ++ ldrsh w7, [x2, 10] ++ ldrsh w6, [x2, 12] ++ ldrsh w3, [x2, 16] ++ mul w0, w1, w0 ++ mov w1, 32 ++ sdiv w0, w0, w1 ++ ldrsh w1, [x2, 14] ++ mov w2, -30697 ++ mul w2, w7, w2 ++ mul w5, w0, w8 ++ sxtw x2, w2 ++ add x2, x2, w5, sxtw ++ smaddl x3, w3, w8, x2 ++ mov w2, -30632 ++ smsubl x2, w6, w2, x3 ++ mov w3, 14379 ++ smsubl x1, w1, w3, x2 ++ cmp x1, 0 ++ ble .L5 ++ add x1, x1, 8192 ++ asr x1, x1, 14 ++.L6: ++ add x2, x4, :lo12:.LANCHOR0 ++ sxth w1, w1 ++ cmp w1, 0 ++ ldrh w3, [x2, 18] ++ strh w0, [x2, 10] ++ add w3, w3, 1 ++ ldr w0, [x2, 20] ++ sxth w3, w3 ++ strh w1, [x2, 12] ++ csneg w1, w1, w1, ge ++ strh w3, [x2, 18] ++ negs w5, w3 ++ add w0, w1, w0 ++ strh w7, [x2, 16] ++ and w3, w3, 255 ++ strh w6, [x2, 14] ++ and w5, w5, 255 ++ str w0, [x2, 20] ++ csneg w3, w3, w5, mi ++ cbnz w3, .L7 ++ ldr w3, [x2, 24] ++ cmp w3, 99 ++ bgt .L8 ++ add w0, w0, 128 ++ mov w5, 256 ++ add x2, x2, 32 ++ sdiv w0, w0, w5 ++ strh w0, [x2, w3, sxtw 1] ++.L9: ++ add x2, x4, :lo12:.LANCHOR0 ++ cmp w3, 99 ++ ldrsh w0, [x2, 32] ++ bgt .L11 ++ add x2, x2, 32 ++ mov x5, 0 ++.L12: ++ add x5, x5, 1 ++ cmp w3, w5 ++ bgt .L13 ++.L14: ++ add x2, x4, :lo12:.LANCHOR0 ++ mov w6, 230 ++ add w3, w3, 1 ++ ldrsh w5, [x2, 6] ++ strh wzr, [x2, 18] ++ stp wzr, w3, [x2, 20] ++ mul w5, w5, w6 ++ mov w6, 26 ++ add w5, w5, 128 ++ madd w0, w0, w6, w5 ++ mov w5, 256 ++ sdiv w0, w0, w5 ++ strh w0, [x2, 6] ++.L7: ++ add x0, x4, :lo12:.LANCHOR0 ++ ldrsh w3, [x4, #:lo12:.LANCHOR0] ++ ldrsh w2, [x0, 6] ++ ldrsh w5, [x0, 2] ++ madd w2, w2, w5, w3 ++ cmp w1, w2 ++ ble .L16 ++ ldrh w1, [x0, 432] ++ add w1, w1, 1 ++ sxth w1, w1 ++ strh w1, [x0, 432] ++ ldrsh w0, [x0, 4] ++ cmp w0, w1 ++ cset w0, lt ++ ret ++.L5: ++ sub x1, x1, #8192 ++ mov x2, 16384 ++ sdiv x1, x1, x2 ++ b .L6 ++.L8: ++ add x5, x2, 34 ++ add x2, x2, 232 ++.L10: ++ ldrh w6, [x5] ++ add x5, x5, 2 ++ strh w6, [x5, -4] ++ cmp x2, x5 ++ bne .L10 ++ add w0, w0, 128 ++ mov w5, 256 ++ add x2, x4, :lo12:.LANCHOR0 ++ sdiv w0, w0, w5 ++ strh w0, [x2, 230] ++ b .L9 ++.L13: ++ lsl x6, x5, 1 ++ ldrsh w7, [x6, x2] ++ ldrh w6, [x6, x2] ++ cmp w7, w0 ++ csel w0, w6, w0, le ++ sxth w0, w0 ++ b .L12 ++.L11: ++ add x5, x2, 34 ++ add x2, x2, 232 ++.L15: ++ ldrsh w7, [x5] ++ ldrh w6, [x5], 2 ++ cmp w7, w0 ++ csel w0, w6, w0, le ++ cmp x2, x5 ++ sxth w0, w0 ++ bne .L15 ++ b .L14 ++.L16: ++ strh wzr, [x0, 432] ++ mov w0, 0 ++ ret ++ .size vad_preprocess, .-vad_preprocess ++ .align 2 ++ .global vad_preprocess_destroy ++ .type vad_preprocess_destroy, %function ++vad_preprocess_destroy: ++ adrp x0, .LANCHOR0 ++ add x0, x0, :lo12:.LANCHOR0 ++ add x2, x0, 32 ++ mov x1, 0 ++ strh wzr, [x0, 10] ++ strh wzr, [x0, 16] ++ strh wzr, [x0, 12] ++ strh wzr, [x0, 14] ++ strh wzr, [x0, 18] ++ strh wzr, [x0, 432] ++.L21: ++ strh wzr, [x1, x2] ++ add x1, x1, 2 ++ cmp x1, 200 ++ bne .L21 ++ mov w1, 32 ++ strh wzr, [x0, 6] ++ strh w1, [x0, 8] ++ stp wzr, wzr, [x0, 20] ++ ret ++ .size vad_preprocess_destroy, .-vad_preprocess_destroy ++ .align 2 ++ .global vad_preprocess_update_params ++ .type vad_preprocess_update_params, %function ++vad_preprocess_update_params: ++ adrp x1, .LANCHOR0+6 ++ ldrsh w1, [x1, #:lo12:.LANCHOR0+6] ++ str w1, [x0] ++ ret ++ .size vad_preprocess_update_params, .-vad_preprocess_update_params ++ .bss ++ .align 3 ++ .set .LANCHOR0,. + 0 ++ .type g_sound_thd, %object ++ .size g_sound_thd, 2 ++g_sound_thd: ++ .zero 2 ++ .type g_noise_level, %object ++ .size g_noise_level, 2 ++g_noise_level: ++ .zero 2 ++ .type g_vad_con_thd, %object ++ .size g_vad_con_thd, 2 ++g_vad_con_thd: ++ .zero 2 ++ .type g_noise_abs, %object ++ .size g_noise_abs, 2 ++g_noise_abs: ++ .zero 2 ++ .type g_signal_gain, %object ++ .size g_signal_gain, 2 ++g_signal_gain: ++ .zero 2 ++ .type g_xn_1, %object ++ .size g_xn_1, 2 ++g_xn_1: ++ .zero 2 ++ .type g_yn_1, %object ++ .size g_yn_1, 2 ++g_yn_1: ++ .zero 2 ++ .type g_yn_2, %object ++ .size g_yn_2, 2 ++g_yn_2: ++ .zero 2 ++ .type g_xn_2, %object ++ .size g_xn_2, 2 ++g_xn_2: ++ .zero 2 ++ .type g_sample_cnt, %object ++ .size g_sample_cnt, 2 ++g_sample_cnt: ++ .zero 2 ++ .type g_sum_abs_frm, %object ++ .size g_sum_abs_frm, 4 ++g_sum_abs_frm: ++ .zero 4 ++ .type frm_count, %object ++ .size frm_count, 4 ++frm_count: ++ .zero 4 ++ .zero 4 ++ .type g_ave_abs_rec, %object ++ .size g_ave_abs_rec, 400 ++g_ave_abs_rec: ++ .zero 400 ++ .type g_vad_cnt, %object ++ .size g_vad_cnt, 2 ++g_vad_cnt: ++ .zero 2 ++ .ident "GCC: (Linaro GCC 6.3-2017.05) 6.3.1 20170404" ++ .section .note.GNU-stack,"",@progbits +diff --git a/sound/soc/rockchip/vad_preprocess_thumb.S b/sound/soc/rockchip/vad_preprocess_thumb.S +new file mode 100644 +index 000000000..a105634e6 +--- /dev/null ++++ b/sound/soc/rockchip/vad_preprocess_thumb.S +@@ -0,0 +1,360 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Rockchip VAD Preprocess ++ * ++ * Copyright (C) 2018 Fuzhou Rockchip Electronics Co., Ltd ++ * ++ */ ++ ++ .syntax unified ++ .arch armv7-a ++ .fpu softvfp ++ .eabi_attribute 20, 1 ++ .eabi_attribute 21, 1 ++ .eabi_attribute 23, 3 ++ .eabi_attribute 24, 1 ++ .eabi_attribute 25, 1 ++ .eabi_attribute 26, 2 ++ .eabi_attribute 30, 4 ++ .eabi_attribute 34, 1 ++ .eabi_attribute 18, 4 ++ .thumb ++ .file "vad_preprocess_thumb.S" ++ .text ++ .align 1 ++ .global vad_preprocess_init ++ .thumb ++ .thumb_func ++ .type vad_preprocess_init, %function ++vad_preprocess_init: ++ .fnstart ++ @ args = 0, pretend = 0, frame = 0 ++ @ frame_needed = 0, uses_anonymous_args = 0 ++ @ link register save eliminated. ++ ldr r2, .L4 ++ ldr r3, [r0, #8] ++ strh r3, [r2] @ movhi ++ ldr r3, [r0, #4] ++ strh r3, [r2, #2] @ movhi ++ ldr r3, [r0, #12] ++ strh r3, [r2, #4] @ movhi ++ ldr r3, [r0] ++ strh r3, [r2, #6] @ movhi ++ ldr r3, [r0, #16] ++ tst r3, #512 ++ ubfx r3, r3, #0, #9 ++ itte ne ++ eorne r3, r3, #65280 ++ eorne r3, r3, #255 ++ uxtheq r3, r3 ++ strh r3, [r2, #8] @ movhi ++ bx lr ++.L5: ++ .align 2 ++.L4: ++ .word .LANCHOR0 ++ .fnend ++ .size vad_preprocess_init, .-vad_preprocess_init ++ .align 1 ++ .global vad_preprocess ++ .thumb ++ .thumb_func ++ .type vad_preprocess, %function ++vad_preprocess: ++ .fnstart ++ @ args = 0, pretend = 0, frame = 0 ++ @ frame_needed = 0, uses_anonymous_args = 0 ++ ldr r3, .L29 ++ movw r2, #34839 ++ push {r4, r5, r6, r7, r8, r9, lr} ++ .save {r4, r5, r6, r7, r8, r9, lr} ++ movw r1, #15349 ++ ldrsh r5, [r3, #8] ++ muls r0, r5, r0 ++ ldrh r7, [r3, #10] ++ it mi ++ addmi r0, r0, #31 ++ ldrh r4, [r3, #12] ++ asrs r0, r0, #5 ++ ldrh r6, [r3, #14] ++ smulbb r2, r7, r2 ++ mla r2, r1, r0, r2 ++ smlabb r2, r4, r1, r2 ++ movw r1, #34904 ++ smulbb r1, r6, r1 ++ ldrsh r4, [r3, #16] ++ subs r1, r2, r1 ++ movw r2, #14379 ++ mls r4, r4, r2, r1 ++ cmp r4, #1 ++ asr r5, r4, #31 ++ sbcs r2, r5, #0 ++ blt .L8 ++ adds r4, r4, #8192 ++ adc r5, r5, #0 ++ b .L10 ++.L8: ++ subs r4, r4, #8192 ++ adc r5, r5, #-1 ++ cmp r4, #0 ++ sbcs r2, r5, #0 ++ bge .L10 ++ movw r8, #16383 ++ mov r9, #0 ++ adds r4, r4, r8 ++ adc r5, r5, r9 ++.L10: ++ lsrs r1, r4, #14 ++ ldrh r4, [r3, #18] ++ orr r1, r1, r5, lsl #18 ++ ldr r2, .L29+4 ++ adds r4, r4, #1 ++ strh r0, [r3, #10] @ movhi ++ uxth r1, r1 ++ strh r1, [r3, #14] @ movhi ++ uxth r4, r4 ++ strh r4, [r3, #18] @ movhi ++ sxth r1, r1 ++ ldr r0, [r3, #20] ++ sxth r4, r4 ++ cmp r1, #0 ++ and r2, r2, r4 ++ it lt ++ rsblt r1, r1, #0 ++ cmp r2, #0 ++ add r0, r0, r1 ++ it lt ++ addlt r2, r2, #-1 ++ strh r7, [r3, #12] @ movhi ++ it lt ++ ornlt r2, r2, #255 ++ strh r6, [r3, #16] @ movhi ++ it lt ++ addlt r2, r2, #1 ++ str r0, [r3, #20] ++ cmp r2, #0 ++ bne .L11 ++ ldr r4, [r3, #24] ++ ldr r2, .L29 ++ cmp r4, #99 ++ bgt .L13 ++ adds r5, r0, #128 ++ add r2, r2, r4, lsl #1 ++ it mi ++ addwmi r5, r0, #383 ++ asrs r5, r5, #8 ++ strh r5, [r2, #28] @ movhi ++ b .L15 ++.L13: ++ add r5, r2, #28 ++ adds r2, r2, #226 ++.L16: ++ ldrh r6, [r5, #2] ++ strh r6, [r5], #2 @ movhi ++ cmp r5, r2 ++ bne .L16 ++ adds r2, r0, #128 ++ it mi ++ addwmi r2, r0, #383 ++ ldr r0, .L29 ++ asrs r2, r2, #8 ++ strh r2, [r0, #226] @ movhi ++.L15: ++ cmp r4, #99 ++ ldrh r2, [r3, #28] ++ mov r0, #1 ++ bgt .L18 ++ ldr r5, .L29+8 ++.L19: ++ cmp r0, r4 ++ bge .L21 ++ ldrsh r6, [r5, r0, lsl #1] ++ sxth r2, r2 ++ adds r0, r0, #1 ++ cmp r2, r6 ++ it ge ++ movge r2, r6 ++ uxth r2, r2 ++ b .L19 ++.L18: ++ ldr r6, .L29+8 ++.L22: ++ ldrsh r5, [r6, r0, lsl #1] ++ sxth r2, r2 ++ adds r0, r0, #1 ++ cmp r2, r5 ++ it ge ++ movge r2, r5 ++ cmp r0, #100 ++ uxth r2, r2 ++ bne .L22 ++.L21: ++ ldrh r5, [r3, #6] ++ movs r0, #128 ++ movs r6, #230 ++ adds r4, r4, #1 ++ str r4, [r3, #24] ++ smlabb r0, r5, r6, r0 ++ movs r5, #26 ++ smlabb r2, r2, r5, r0 ++ ldr r0, .L29 ++ cmp r2, #0 ++ it lt ++ addlt r2, r2, #255 ++ asrs r2, r2, #8 ++ strh r2, [r0, #6] @ movhi ++ movs r2, #0 ++ str r2, [r3, #20] ++ strh r2, [r3, #18] @ movhi ++.L11: ++ ldrh r0, [r3, #6] ++ ldrh r4, [r3, #2] ++ ldrsh r3, [r3] ++ ldr r2, .L29 ++ smlabb r3, r0, r4, r3 ++ cmp r1, r3 ++ ble .L24 ++ ldrh r3, [r2, #428] ++ ldrsh r0, [r2, #4] ++ adds r3, r3, #1 ++ uxth r3, r3 ++ strh r3, [r2, #428] @ movhi ++ sxth r3, r3 ++ cmp r0, r3 ++ ite ge ++ movge r0, #0 ++ movlt r0, #1 ++ pop {r4, r5, r6, r7, r8, r9, pc} ++.L24: ++ movs r0, #0 ++ strh r0, [r2, #428] @ movhi ++ pop {r4, r5, r6, r7, r8, r9, pc} ++.L30: ++ .align 2 ++.L29: ++ .word .LANCHOR0 ++ .word -2147483393 ++ .word .LANCHOR0+28 ++ .fnend ++ .size vad_preprocess, .-vad_preprocess ++ .align 1 ++ .global vad_preprocess_destroy ++ .thumb ++ .thumb_func ++ .type vad_preprocess_destroy, %function ++vad_preprocess_destroy: ++ .fnstart ++ @ args = 0, pretend = 0, frame = 0 ++ @ frame_needed = 0, uses_anonymous_args = 0 ++ movs r3, #0 ++ ldr r2, .L34 ++ push {r4, lr} ++ .save {r4, lr} ++ mov r4, r3 ++ strh r3, [r2, #10] @ movhi ++ strh r3, [r2, #12] @ movhi ++ strh r3, [r2, #14] @ movhi ++ strh r3, [r2, #16] @ movhi ++ strh r3, [r2, #18] @ movhi ++ strh r3, [r2, #428] @ movhi ++.L32: ++ ldr r2, .L34 ++ movs r1, #0 ++ add r0, r2, #28 ++ strh r4, [r0, r3, lsl #1] @ movhi ++ adds r3, r3, #1 ++ cmp r3, #100 ++ bne .L32 ++ movs r3, #32 ++ str r1, [r2, #20] ++ strh r1, [r2, #6] @ movhi ++ strh r3, [r2, #8] @ movhi ++ str r1, [r2, #24] ++ pop {r4, pc} ++.L35: ++ .align 2 ++.L34: ++ .word .LANCHOR0 ++ .fnend ++ .size vad_preprocess_destroy, .-vad_preprocess_destroy ++ .align 1 ++ .global vad_preprocess_update_params ++ .thumb ++ .thumb_func ++ .type vad_preprocess_update_params, %function ++vad_preprocess_update_params: ++ .fnstart ++ @ args = 0, pretend = 0, frame = 0 ++ @ frame_needed = 0, uses_anonymous_args = 0 ++ @ link register save eliminated. ++ ldr r3, .L37 ++ ldrsh r3, [r3, #6] ++ str r3, [r0] ++ bx lr ++.L38: ++ .align 2 ++.L37: ++ .word .LANCHOR0 ++ .fnend ++ .size vad_preprocess_update_params, .-vad_preprocess_update_params ++ .bss ++ .align 2 ++.LANCHOR0 = . + 0 ++ .type g_sound_thd, %object ++ .size g_sound_thd, 2 ++g_sound_thd: ++ .space 2 ++ .type g_noise_level, %object ++ .size g_noise_level, 2 ++g_noise_level: ++ .space 2 ++ .type g_vad_con_thd, %object ++ .size g_vad_con_thd, 2 ++g_vad_con_thd: ++ .space 2 ++ .type g_noise_abs, %object ++ .size g_noise_abs, 2 ++g_noise_abs: ++ .space 2 ++ .type g_signal_gain, %object ++ .size g_signal_gain, 2 ++g_signal_gain: ++ .space 2 ++ .type g_xn_1, %object ++ .size g_xn_1, 2 ++g_xn_1: ++ .space 2 ++ .type g_xn_2, %object ++ .size g_xn_2, 2 ++g_xn_2: ++ .space 2 ++ .type g_yn_1, %object ++ .size g_yn_1, 2 ++g_yn_1: ++ .space 2 ++ .type g_yn_2, %object ++ .size g_yn_2, 2 ++g_yn_2: ++ .space 2 ++ .type g_sample_cnt, %object ++ .size g_sample_cnt, 2 ++g_sample_cnt: ++ .space 2 ++ .type g_sum_abs_frm, %object ++ .size g_sum_abs_frm, 4 ++g_sum_abs_frm: ++ .space 4 ++ .type frm_count, %object ++ .size frm_count, 4 ++frm_count: ++ .space 4 ++ .type g_ave_abs_rec, %object ++ .size g_ave_abs_rec, 400 ++g_ave_abs_rec: ++ .space 400 ++ .type g_vad_cnt, %object ++ .size g_vad_cnt, 2 ++g_vad_cnt: ++ .space 2 ++ .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 a45b27a2ed4e..657c35354cc5 100644 +index a45b27a2e..657c35354 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1523,6 +1523,9 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) @@ -1531860,7 +1543429,7 @@ index a45b27a2ed4e..657c35354cc5 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 { @@ -1531955,7 +1543524,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 {