diff --git a/linux-6.6/rk3568_patch/kernel.patch b/linux-6.6/rk3568_patch/kernel.patch index 92404ae1ec753c817b3deebdb87ef057a4e5bc8c..1f423dc85df5538574e0df073084bebd002f0fdf 100644 --- a/linux-6.6/rk3568_patch/kernel.patch +++ b/linux-6.6/rk3568_patch/kernel.patch @@ -1,6 +1,6 @@ diff --git a/Documentation/devicetree/bindings/arm/mali-bifrost.txt b/Documentation/devicetree/bindings/arm/mali-bifrost.txt new file mode 100644 -index 000000000000..85672c6c6258 +index 000000000..85672c6c6 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/mali-bifrost.txt @@ -0,0 +1,243 @@ @@ -249,7 +249,7 @@ index 000000000000..85672c6c6258 +}; diff --git a/Documentation/devicetree/bindings/arm/mali-coresight-source.txt b/Documentation/devicetree/bindings/arm/mali-coresight-source.txt new file mode 100644 -index 000000000000..1018eafbccea +index 000000000..1018eafbc --- /dev/null +++ b/Documentation/devicetree/bindings/arm/mali-coresight-source.txt @@ -0,0 +1,116 @@ @@ -371,7 +371,7 @@ index 000000000000..1018eafbccea +shared JCN request and response channels. diff --git a/Documentation/devicetree/bindings/arm/mali-midgard.txt b/Documentation/devicetree/bindings/arm/mali-midgard.txt new file mode 100644 -index 000000000000..0722d0afce59 +index 000000000..0722d0afc --- /dev/null +++ b/Documentation/devicetree/bindings/arm/mali-midgard.txt @@ -0,0 +1,96 @@ @@ -473,7 +473,7 @@ index 000000000000..0722d0afce59 +}; diff --git a/Documentation/devicetree/bindings/arm/mali-utgard.txt b/Documentation/devicetree/bindings/arm/mali-utgard.txt new file mode 100644 -index 000000000000..ea315345e16f +index 000000000..ea315345e --- /dev/null +++ b/Documentation/devicetree/bindings/arm/mali-utgard.txt @@ -0,0 +1,68 @@ @@ -547,7 +547,7 @@ index 000000000000..ea315345e16f +} diff --git a/Documentation/devicetree/bindings/crypto/rockchip,rk3588-crypto.yaml b/Documentation/devicetree/bindings/crypto/rockchip,rk3588-crypto.yaml new file mode 100644 -index 000000000000..c01963413260 +index 000000000..c01963413 --- /dev/null +++ b/Documentation/devicetree/bindings/crypto/rockchip,rk3588-crypto.yaml @@ -0,0 +1,65 @@ @@ -618,7 +618,7 @@ index 000000000000..c01963413260 + }; diff --git a/Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml b/Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml new file mode 100644 -index 000000000000..50d3fabe958d +index 000000000..50d3fabe9 --- /dev/null +++ b/Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml @@ -0,0 +1,74 @@ @@ -698,7 +698,7 @@ index 000000000000..50d3fabe958d + }; diff --git a/Documentation/devicetree/bindings/devfreq/event/rockchip-nocp.txt b/Documentation/devicetree/bindings/devfreq/event/rockchip-nocp.txt new file mode 100644 -index 000000000000..77c504ff883d +index 000000000..77c504ff8 --- /dev/null +++ b/Documentation/devicetree/bindings/devfreq/event/rockchip-nocp.txt @@ -0,0 +1,24 @@ @@ -728,7 +728,7 @@ index 000000000000..77c504ff883d + }; diff --git a/Documentation/devicetree/bindings/devfreq/rockchip_dmc.txt b/Documentation/devicetree/bindings/devfreq/rockchip_dmc.txt new file mode 100644 -index 000000000000..3f1f99c221a4 +index 000000000..3f1f99c22 --- /dev/null +++ b/Documentation/devicetree/bindings/devfreq/rockchip_dmc.txt @@ -0,0 +1,120 @@ @@ -854,7 +854,7 @@ index 000000000000..3f1f99c221a4 + }; diff --git a/Documentation/devicetree/bindings/iommu/rockchip,rk32-iommu.txt b/Documentation/devicetree/bindings/iommu/rockchip,rk32-iommu.txt new file mode 100644 -index 000000000000..1b49e4d0f784 +index 000000000..1b49e4d0f --- /dev/null +++ b/Documentation/devicetree/bindings/iommu/rockchip,rk32-iommu.txt @@ -0,0 +1,16 @@ @@ -876,7 +876,7 @@ index 000000000000..1b49e4d0f784 + }; diff --git a/Documentation/devicetree/bindings/media/rockchip-cif.txt b/Documentation/devicetree/bindings/media/rockchip-cif.txt new file mode 100644 -index 000000000000..6828b3630b73 +index 000000000..6828b3630 --- /dev/null +++ b/Documentation/devicetree/bindings/media/rockchip-cif.txt @@ -0,0 +1,116 @@ @@ -998,7 +998,7 @@ index 000000000000..6828b3630b73 + }; diff --git a/Documentation/devicetree/bindings/media/rockchip-isp1.txt b/Documentation/devicetree/bindings/media/rockchip-isp1.txt new file mode 100644 -index 000000000000..bd83a6ad8e9c +index 000000000..bd83a6ad8 --- /dev/null +++ b/Documentation/devicetree/bindings/media/rockchip-isp1.txt @@ -0,0 +1,72 @@ @@ -1076,7 +1076,7 @@ index 000000000000..bd83a6ad8e9c + }; diff --git a/Documentation/devicetree/bindings/media/rockchip-mipi-dphy.txt b/Documentation/devicetree/bindings/media/rockchip-mipi-dphy.txt new file mode 100644 -index 000000000000..0b9bed35bb3c +index 000000000..0b9bed35b --- /dev/null +++ b/Documentation/devicetree/bindings/media/rockchip-mipi-dphy.txt @@ -0,0 +1,136 @@ @@ -1218,7 +1218,7 @@ index 000000000000..0b9bed35bb3c +}; diff --git a/Documentation/devicetree/bindings/media/rockchip-tsp.txt b/Documentation/devicetree/bindings/media/rockchip-tsp.txt new file mode 100644 -index 000000000000..f4a24fa21f44 +index 000000000..f4a24fa21 --- /dev/null +++ b/Documentation/devicetree/bindings/media/rockchip-tsp.txt @@ -0,0 +1,54 @@ @@ -1277,7 +1277,7 @@ index 000000000000..f4a24fa21f44 + status = "disabled"; + }; diff --git a/Makefile b/Makefile -index c122a50e4b40..32674b0e5490 100644 +index c122a50e4..32674b0e5 100644 --- a/Makefile +++ b/Makefile @@ -1130,6 +1130,15 @@ ifdef CONFIG_TRIM_UNUSED_KSYMS @@ -1306,7 +1306,7 @@ index c122a50e4b40..32674b0e5490 100644 prepare0: archprepare diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile -index 26b8c7630a21..76ab7e3e90f3 100644 +index 26b8c7630..76ab7e3e9 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -220,3 +220,16 @@ define archhelp @@ -1327,7 +1327,7 @@ index 26b8c7630a21..76ab7e3e90f3 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 e7728007fd1b..064f11d26803 100644 +index e7728007f..064f11d26 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -101,7 +101,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6a-io.dtb @@ -1341,10 +1341,10 @@ index e7728007fd1b..064f11d26803 100644 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5a.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-orangepi-5.dtb diff --git a/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts b/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts -index de0a1f2af983..7d4c5324c61b 100644 +index de0a1f2af..7d4c5324c 100644 --- a/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts -@@ -86,7 +86,7 @@ +@@ -86,7 +86,7 @@ simple-audio-card,cpu { sgtl5000_clk: sgtl5000-oscillator { compatible = "fixed-clock"; #clock-cells = <0>; @@ -1354,10 +1354,10 @@ index de0a1f2af983..7d4c5324c61b 100644 dc_12v: dc-12v-regulator { diff --git a/arch/arm64/boot/dts/rockchip/px30.dtsi b/arch/arm64/boot/dts/rockchip/px30.dtsi -index 20955556b624..42ce78beb413 100644 +index 20955556b..42ce78beb 100644 --- a/arch/arm64/boot/dts/rockchip/px30.dtsi +++ b/arch/arm64/boot/dts/rockchip/px30.dtsi -@@ -632,7 +632,6 @@ +@@ -632,7 +632,6 @@ spi0: spi@ff1d0000 { clock-names = "spiclk", "apb_pclk"; dmas = <&dmac 12>, <&dmac 13>; dma-names = "tx", "rx"; @@ -1365,7 +1365,7 @@ index 20955556b624..42ce78beb413 100644 pinctrl-names = "default"; pinctrl-0 = <&spi0_clk &spi0_csn &spi0_miso &spi0_mosi>; #address-cells = <1>; -@@ -648,7 +647,6 @@ +@@ -648,7 +647,6 @@ spi1: spi@ff1d8000 { clock-names = "spiclk", "apb_pclk"; dmas = <&dmac 14>, <&dmac 15>; dma-names = "tx", "rx"; @@ -1374,10 +1374,10 @@ index 20955556b624..42ce78beb413 100644 pinctrl-0 = <&spi1_clk &spi1_csn0 &spi1_csn1 &spi1_miso &spi1_mosi>; #address-cells = <1>; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts -index 4237f2ee8fee..5d7d567283e5 100644 +index 4237f2ee8..5d7d56728 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts -@@ -26,11 +26,9 @@ +@@ -26,11 +26,9 @@ yt8531c: ethernet-phy@0 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <0>; @@ -1391,10 +1391,10 @@ index 4237f2ee8fee..5d7d567283e5 100644 pinctrl-0 = <ð_phy_reset_pin>; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi -index e47d1398aeca..083452c67711 100644 +index e47d1398a..083452c67 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi -@@ -61,6 +61,7 @@ +@@ -61,6 +61,7 @@ backlight: backlight { pinctrl-names = "default"; pinctrl-0 = <&bl_en>; pwms = <&pwm0 0 1000000 PWM_POLARITY_INVERTED>; @@ -1403,10 +1403,10 @@ index e47d1398aeca..083452c67711 100644 emmc_pwrseq: emmc-pwrseq { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts b/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts -index 6464ef4d113d..d1f343345f67 100644 +index 6464ef4d1..d1f343345 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts -@@ -773,7 +773,7 @@ +@@ -773,7 +773,7 @@ brcmf: wifi@1 { compatible = "brcm,bcm4329-fmac"; reg = <1>; interrupt-parent = <&gpio0>; @@ -1416,10 +1416,10 @@ index 6464ef4d113d..d1f343345f67 100644 pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_l>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi -index cacbad35cfc8..ee6095baba4d 100644 +index cacbad35c..ee6095bab 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi -@@ -198,6 +198,7 @@ +@@ -198,6 +198,7 @@ backlight: backlight { power-supply = <&pp3300_disp>; pinctrl-names = "default"; pinctrl-0 = <&bl_en>; @@ -1427,7 +1427,7 @@ index cacbad35cfc8..ee6095baba4d 100644 }; gpio_keys: gpio-keys { -@@ -509,7 +510,8 @@ ap_i2c_tp: &i2c5 { +@@ -509,7 +510,8 @@ wacky_spi_audio: spi2@0 { &pci_rootport { mvl_wifi: wifi@0,0 { compatible = "pci1b4b,2b42"; @@ -1438,10 +1438,10 @@ index cacbad35cfc8..ee6095baba4d 100644 interrupts = <8 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi -index c5e7de60c121..a47d9f758611 100644 +index c5e7de60c..a47d9f758 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi -@@ -167,6 +167,7 @@ +@@ -167,6 +167,7 @@ backlight: backlight { pinctrl-names = "default"; pinctrl-0 = <&bl_en>; pwms = <&pwm1 0 1000000 0>; @@ -1450,10 +1450,10 @@ index c5e7de60c121..a47d9f758611 100644 dmic: dmic { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi -index 789fd0dcc88b..23bfba86daab 100644 +index 789fd0dcc..23bfba86d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi -@@ -250,7 +250,7 @@ +@@ -250,7 +250,7 @@ ppvar_sd_card_io: ppvar-sd-card-io { pinctrl-0 = <&sd_io_pwr_en &sd_pwr_1800_sel>; enable-active-high; @@ -1462,7 +1462,7 @@ index 789fd0dcc88b..23bfba86daab 100644 gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>; states = <1800000 0x1>, <3000000 0x0>; -@@ -489,7 +489,6 @@ ap_i2c_audio: &i2c8 { +@@ -489,7 +489,6 @@ pci_rootport: pcie@0,0 { #address-cells = <3>; #size-cells = <2>; ranges; @@ -1471,7 +1471,7 @@ index 789fd0dcc88b..23bfba86daab 100644 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi -index fee5e7111279..ea403de13228 100644 +index fee5e7111..ea403de13 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi @@ -3,35 +3,99 @@ @@ -1580,7 +1580,7 @@ index fee5e7111279..ea403de13228 100644 }; }; -@@ -39,93 +103,253 @@ +@@ -39,93 +103,253 @@ cluster1_opp: opp-table-1 { compatible = "operating-points-v2"; opp-shared; @@ -1853,10 +1853,10 @@ index fee5e7111279..ea403de13228 100644 &gpu { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi -index 20e3f41efe97..aa3e21bd6c8f 100644 +index 20e3f41ef..aa3e21bd6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi -@@ -27,7 +27,7 @@ +@@ -27,7 +27,7 @@ module_led: led-0 { extcon_usb3: extcon-usb3 { compatible = "linux,extcon-usb-gpio"; @@ -1866,7 +1866,7 @@ index 20e3f41efe97..aa3e21bd6c8f 100644 pinctrl-0 = <&usb3_id>; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi -index f2279aa6ca9e..1f76d3501bda 100644 +index f2279aa6c..1f76d3501 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi @@ -9,11 +9,12 @@ @@ -1884,7 +1884,7 @@ index f2279aa6ca9e..1f76d3501bda 100644 }; chosen { -@@ -44,7 +45,7 @@ +@@ -44,7 +45,7 @@ led-0 { sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&rk808 1>; @@ -1893,7 +1893,7 @@ index f2279aa6ca9e..1f76d3501bda 100644 pinctrl-names = "default"; pinctrl-0 = <&wifi_enable_h>; reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; -@@ -492,7 +493,6 @@ +@@ -492,7 +493,6 @@ &i2c4 { &i2s0 { pinctrl-0 = <&i2s0_2ch_bus>; @@ -1901,7 +1901,7 @@ index f2279aa6ca9e..1f76d3501bda 100644 rockchip,capture-channels = <2>; rockchip,playback-channels = <2>; status = "okay"; -@@ -645,9 +645,9 @@ +@@ -645,9 +645,9 @@ &saradc { }; &sdhci { @@ -1914,7 +1914,7 @@ index f2279aa6ca9e..1f76d3501bda 100644 status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -index 4a3d0af5ecfe..b13208797352 100644 +index 4a3d0af5e..b13208797 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -9,8 +9,13 @@ @@ -1931,7 +1931,7 @@ index 4a3d0af5ecfe..b13208797352 100644 / { compatible = "rockchip,rk3399"; -@@ -19,7 +24,14 @@ +@@ -19,7 +24,14 @@ / { #size-cells = <2>; aliases { @@ -1946,7 +1946,7 @@ index 4a3d0af5ecfe..b13208797352 100644 i2c0 = &i2c0; i2c1 = &i2c1; i2c2 = &i2c2; -@@ -173,17 +185,21 @@ +@@ -173,17 +185,21 @@ CLUSTER_SLEEP: cluster-sleep { }; }; @@ -1969,7 +1969,7 @@ index 4a3d0af5ecfe..b13208797352 100644 status = "disabled"; }; -@@ -218,6 +234,20 @@ +@@ -218,6 +234,20 @@ xin24m: xin24m { #clock-cells = <0>; }; @@ -1990,7 +1990,7 @@ index 4a3d0af5ecfe..b13208797352 100644 pcie0: pcie@f8000000 { compatible = "rockchip,rk3399-pcie"; reg = <0x0 0xf8000000 0x0 0x2000000>, -@@ -248,6 +278,7 @@ +@@ -248,6 +278,7 @@ pcie0: pcie@f8000000 { <&pcie_phy 2>, <&pcie_phy 3>; phy-names = "pcie-phy-0", "pcie-phy-1", "pcie-phy-2", "pcie-phy-3"; @@ -1998,7 +1998,7 @@ index 4a3d0af5ecfe..b13208797352 100644 ranges = <0x82000000 0x0 0xfa000000 0x0 0xfa000000 0x0 0x1e00000>, <0x81000000 0x0 0xfbe00000 0x0 0xfbe00000 0x0 0x100000>; resets = <&cru SRST_PCIE_CORE>, <&cru SRST_PCIE_MGMT>, -@@ -265,33 +296,6 @@ +@@ -265,33 +296,6 @@ pcie0_intc: interrupt-controller { }; }; @@ -2032,7 +2032,7 @@ index 4a3d0af5ecfe..b13208797352 100644 gmac: ethernet@fe300000 { compatible = "rockchip,rk3399-gmac"; reg = <0x0 0xfe300000 0x0 0x10000>; -@@ -362,6 +366,7 @@ +@@ -362,6 +366,7 @@ sdhci: mmc@fe330000 { phy-names = "phy_arasan"; power-domains = <&power RK3399_PD_EMMC>; disable-cqe-dcmd; @@ -2040,7 +2040,7 @@ index 4a3d0af5ecfe..b13208797352 100644 status = "disabled"; }; -@@ -468,8 +473,6 @@ +@@ -468,8 +473,6 @@ usbdrd3_0: usb@fe800000 { clock-names = "ref_clk", "suspend_clk", "bus_clk", "aclk_usb3_rksoc_axi_perf", "aclk_usb3", "grf_clk"; @@ -2049,7 +2049,7 @@ index 4a3d0af5ecfe..b13208797352 100644 status = "disabled"; usbdrd_dwc3_0: usb@fe800000 { -@@ -479,15 +482,21 @@ +@@ -479,15 +482,21 @@ usbdrd_dwc3_0: usb@fe800000 { clocks = <&cru SCLK_USB3OTG0_REF>, <&cru ACLK_USB3OTG0>, <&cru SCLK_USB3OTG0_SUSPEND>; clock-names = "ref", "bus_early", "suspend"; @@ -2071,7 +2071,7 @@ index 4a3d0af5ecfe..b13208797352 100644 power-domains = <&power RK3399_PD_USB3>; status = "disabled"; }; -@@ -504,8 +513,6 @@ +@@ -504,8 +513,6 @@ usbdrd3_1: usb@fe900000 { clock-names = "ref_clk", "suspend_clk", "bus_clk", "aclk_usb3_rksoc_axi_perf", "aclk_usb3", "grf_clk"; @@ -2080,7 +2080,7 @@ index 4a3d0af5ecfe..b13208797352 100644 status = "disabled"; usbdrd_dwc3_1: usb@fe900000 { -@@ -515,6 +522,8 @@ +@@ -515,6 +522,8 @@ usbdrd_dwc3_1: usb@fe900000 { clocks = <&cru SCLK_USB3OTG1_REF>, <&cru ACLK_USB3OTG1>, <&cru SCLK_USB3OTG1_SUSPEND>; clock-names = "ref", "bus_early", "suspend"; @@ -2089,7 +2089,7 @@ index 4a3d0af5ecfe..b13208797352 100644 dr_mode = "otg"; phys = <&u2phy1_otg>, <&tcphy1_usb3>; phy-names = "usb2-phy", "usb3-phy"; -@@ -524,6 +533,8 @@ +@@ -524,6 +533,8 @@ usbdrd_dwc3_1: usb@fe900000 { snps,dis_u2_susphy_quirk; snps,dis-del-phy-power-chg-quirk; snps,dis-tx-ipgap-linecheck-quirk; @@ -2098,7 +2098,7 @@ index 4a3d0af5ecfe..b13208797352 100644 power-domains = <&power RK3399_PD_USB3>; status = "disabled"; }; -@@ -579,7 +590,7 @@ +@@ -579,7 +590,7 @@ gic: interrupt-controller@fee00000 { <0x0 0xfff10000 0 0x10000>, /* GICH */ <0x0 0xfff20000 0 0x10000>; /* GICV */ interrupts = ; @@ -2107,7 +2107,7 @@ index 4a3d0af5ecfe..b13208797352 100644 compatible = "arm,gic-v3-its"; msi-controller; #msi-cells = <1>; -@@ -609,26 +620,6 @@ +@@ -609,26 +620,6 @@ saradc: saradc@ff100000 { status = "disabled"; }; @@ -2134,7 +2134,7 @@ index 4a3d0af5ecfe..b13208797352 100644 i2c1: i2c@ff110000 { compatible = "rockchip,rk3399-i2c"; reg = <0x0 0xff110000 0x0 0x1000>; -@@ -848,46 +839,49 @@ +@@ -848,46 +839,49 @@ spi5: spi@ff200000 { }; thermal_zones: thermal-zones { @@ -2202,7 +2202,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; }; }; -@@ -899,25 +893,12 @@ +@@ -899,25 +893,12 @@ gpu_thermal: gpu-thermal { thermal-sensors = <&tsadc 1>; trips { @@ -2230,7 +2230,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; }; -@@ -933,10 +914,9 @@ +@@ -933,10 +914,9 @@ tsadc: tsadc@ff260000 { reset-names = "tsadc-apb"; rockchip,grf = <&grf>; rockchip,hw-tshut-temp = <95000>; @@ -2242,7 +2242,7 @@ index 4a3d0af5ecfe..b13208797352 100644 #thermal-sensor-cells = <1>; status = "disabled"; }; -@@ -1109,9 +1089,7 @@ +@@ -1109,9 +1089,7 @@ power-domain@RK3399_PD_VCODEC { power-domain@RK3399_PD_VDU { reg = ; clocks = <&cru ACLK_VDU>, @@ -2253,7 +2253,7 @@ index 4a3d0af5ecfe..b13208797352 100644 pm_qos = <&qos_video_m1_r>, <&qos_video_m1_w>; #power-domain-cells = <0>; -@@ -1144,12 +1122,22 @@ +@@ -1144,12 +1122,22 @@ power-domain@RK3399_PD_GMAC { pm_qos = <&qos_gmac>; #power-domain-cells = <0>; }; @@ -2282,7 +2282,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; power-domain@RK3399_PD_SDIOAUDIO { reg = ; -@@ -1240,6 +1228,33 @@ +@@ -1240,6 +1228,33 @@ pmu_io_domains: io-domains { compatible = "rockchip,rk3399-pmu-io-voltage-domain"; status = "disabled"; }; @@ -2316,7 +2316,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; spi3: spi@ff350000 { -@@ -1317,7 +1332,7 @@ +@@ -1317,7 +1332,7 @@ pwm0: pwm@ff420000 { compatible = "rockchip,rk3399-pwm", "rockchip,rk3288-pwm"; reg = <0x0 0xff420000 0x0 0x10>; #pwm-cells = <3>; @@ -2325,7 +2325,7 @@ index 4a3d0af5ecfe..b13208797352 100644 pinctrl-0 = <&pwm0_pin>; clocks = <&pmucru PCLK_RKPWM_PMU>; status = "disabled"; -@@ -1327,7 +1342,7 @@ +@@ -1327,7 +1342,7 @@ pwm1: pwm@ff420010 { compatible = "rockchip,rk3399-pwm", "rockchip,rk3288-pwm"; reg = <0x0 0xff420010 0x0 0x10>; #pwm-cells = <3>; @@ -2334,7 +2334,7 @@ index 4a3d0af5ecfe..b13208797352 100644 pinctrl-0 = <&pwm1_pin>; clocks = <&pmucru PCLK_RKPWM_PMU>; status = "disabled"; -@@ -1337,7 +1352,7 @@ +@@ -1337,7 +1352,7 @@ pwm2: pwm@ff420020 { compatible = "rockchip,rk3399-pwm", "rockchip,rk3288-pwm"; reg = <0x0 0xff420020 0x0 0x10>; #pwm-cells = <3>; @@ -2343,7 +2343,7 @@ index 4a3d0af5ecfe..b13208797352 100644 pinctrl-0 = <&pwm2_pin>; clocks = <&pmucru PCLK_RKPWM_PMU>; status = "disabled"; -@@ -1347,7 +1362,7 @@ +@@ -1347,7 +1362,7 @@ pwm3: pwm@ff420030 { compatible = "rockchip,rk3399-pwm", "rockchip,rk3288-pwm"; reg = <0x0 0xff420030 0x0 0x10>; #pwm-cells = <3>; @@ -2352,7 +2352,7 @@ index 4a3d0af5ecfe..b13208797352 100644 pinctrl-0 = <&pwm3a_pin>; clocks = <&pmucru PCLK_RKPWM_PMU>; status = "disabled"; -@@ -1363,6 +1378,13 @@ +@@ -1363,6 +1378,13 @@ dfi: dfi@ff630000 { status = "disabled"; }; @@ -2366,7 +2366,7 @@ index 4a3d0af5ecfe..b13208797352 100644 vpu: video-codec@ff650000 { compatible = "rockchip,rk3399-vpu"; reg = <0x0 0xff650000 0x0 0x800>; -@@ -1373,6 +1395,41 @@ +@@ -1373,6 +1395,41 @@ vpu: video-codec@ff650000 { clock-names = "aclk", "hclk"; iommus = <&vpu_mmu>; power-domains = <&power RK3399_PD_VCODEC>; @@ -2408,7 +2408,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; vpu_mmu: iommu@ff650800 { -@@ -1383,17 +1440,41 @@ +@@ -1383,17 +1440,41 @@ vpu_mmu: iommu@ff650800 { clock-names = "aclk", "iface"; #iommu-cells = <0>; power-domains = <&power RK3399_PD_VCODEC>; @@ -2451,7 +2451,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; vdec_mmu: iommu@ff660480 { -@@ -1404,6 +1485,21 @@ +@@ -1404,6 +1485,21 @@ vdec_mmu: iommu@ff660480 { clock-names = "aclk", "iface"; power-domains = <&power RK3399_PD_VDU>; #iommu-cells = <0>; @@ -2473,7 +2473,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; iep_mmu: iommu@ff670800 { -@@ -1412,6 +1508,7 @@ +@@ -1412,6 +1508,7 @@ iep_mmu: iommu@ff670800 { interrupts = ; clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>; clock-names = "aclk", "iface"; @@ -2481,7 +2481,7 @@ index 4a3d0af5ecfe..b13208797352 100644 #iommu-cells = <0>; status = "disabled"; }; -@@ -1436,6 +1533,10 @@ +@@ -1436,6 +1533,10 @@ efuse0: efuse@ff690000 { clock-names = "pclk_efuse"; /* Data cells */ @@ -2492,7 +2492,7 @@ index 4a3d0af5ecfe..b13208797352 100644 cpu_id: cpu-id@7 { reg = <0x07 0x10>; }; -@@ -1457,6 +1558,10 @@ +@@ -1457,6 +1558,10 @@ logic_leakage: logic-leakage@1b { wafer_info: wafer-info@1c { reg = <0x1c 0x1>; }; @@ -2503,7 +2503,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; dmac_bus: dma-controller@ff6d0000 { -@@ -1539,7 +1644,7 @@ +@@ -1539,7 +1644,7 @@ io_domains: io-domains { }; mipi_dphy_rx0: mipi-dphy-rx0 { @@ -2512,7 +2512,7 @@ index 4a3d0af5ecfe..b13208797352 100644 clocks = <&cru SCLK_MIPIDPHY_REF>, <&cru SCLK_DPHY_RX0_CFG>, <&cru PCLK_VIO_GRF>; -@@ -1610,6 +1715,7 @@ +@@ -1610,6 +1715,7 @@ emmc_phy: phy@f780 { clock-names = "emmcclk"; drive-impedance-ohm = <50>; #phy-cells = <0>; @@ -2520,7 +2520,7 @@ index 4a3d0af5ecfe..b13208797352 100644 status = "disabled"; }; -@@ -1622,6 +1728,42 @@ +@@ -1622,6 +1728,42 @@ pcie_phy: pcie-phy { reset-names = "phy"; status = "disabled"; }; @@ -2563,7 +2563,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; tcphy0: phy@ff7c0000 { -@@ -1713,6 +1855,8 @@ +@@ -1713,6 +1855,8 @@ i2s0: i2s@ff880000 { dma-names = "tx", "rx"; clock-names = "i2s_clk", "i2s_hclk"; clocks = <&cru SCLK_I2S0_8CH>, <&cru HCLK_I2S0_8CH>; @@ -2572,7 +2572,7 @@ index 4a3d0af5ecfe..b13208797352 100644 pinctrl-names = "bclk_on", "bclk_off"; pinctrl-0 = <&i2s0_8ch_bus>; pinctrl-1 = <&i2s0_8ch_bus_bclk_off>; -@@ -1729,6 +1873,8 @@ +@@ -1729,6 +1873,8 @@ i2s1: i2s@ff890000 { dma-names = "tx", "rx"; clock-names = "i2s_clk", "i2s_hclk"; clocks = <&cru SCLK_I2S1_8CH>, <&cru HCLK_I2S1_8CH>; @@ -2581,7 +2581,7 @@ index 4a3d0af5ecfe..b13208797352 100644 pinctrl-names = "default"; pinctrl-0 = <&i2s1_2ch_bus>; power-domains = <&power RK3399_PD_SDIOAUDIO>; -@@ -1744,19 +1890,32 @@ +@@ -1744,19 +1890,32 @@ i2s2: i2s@ff8a0000 { dma-names = "tx", "rx"; clock-names = "i2s_clk", "i2s_hclk"; clocks = <&cru SCLK_I2S2_8CH>, <&cru HCLK_I2S2_8CH>; @@ -2619,7 +2619,7 @@ index 4a3d0af5ecfe..b13208797352 100644 iommus = <&vopl_mmu>; power-domains = <&power RK3399_PD_VOPL>; resets = <&cru SRST_A_VOP1>, <&cru SRST_H_VOP1>, <&cru SRST_D_VOP1>; -@@ -1767,9 +1926,9 @@ +@@ -1767,9 +1926,9 @@ vopl_out: port { #address-cells = <1>; #size-cells = <0>; @@ -2631,7 +2631,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; vopl_out_edp: endpoint@1 { -@@ -1782,9 +1941,9 @@ +@@ -1782,9 +1941,9 @@ vopl_out_hdmi: endpoint@2 { remote-endpoint = <&hdmi_in_vopl>; }; @@ -2643,7 +2643,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; vopl_out_dp: endpoint@4 { -@@ -1794,6 +1953,17 @@ +@@ -1794,6 +1953,17 @@ vopl_out_dp: endpoint@4 { }; }; @@ -2661,7 +2661,7 @@ index 4a3d0af5ecfe..b13208797352 100644 vopl_mmu: iommu@ff8f3f00 { compatible = "rockchip,iommu"; reg = <0x0 0xff8f3f00 0x0 0x100>; -@@ -1802,17 +1972,19 @@ +@@ -1802,17 +1972,19 @@ vopl_mmu: iommu@ff8f3f00 { clock-names = "aclk", "iface"; power-domains = <&power RK3399_PD_VOPL>; #iommu-cells = <0>; @@ -2686,7 +2686,7 @@ index 4a3d0af5ecfe..b13208797352 100644 iommus = <&vopb_mmu>; power-domains = <&power RK3399_PD_VOPB>; resets = <&cru SRST_A_VOP0>, <&cru SRST_H_VOP0>, <&cru SRST_D_VOP0>; -@@ -1828,9 +2000,9 @@ +@@ -1828,9 +2000,9 @@ vopb_out_edp: endpoint@0 { remote-endpoint = <&edp_in_vopb>; }; @@ -2698,7 +2698,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; vopb_out_hdmi: endpoint@2 { -@@ -1838,9 +2010,9 @@ +@@ -1838,9 +2010,9 @@ vopb_out_hdmi: endpoint@2 { remote-endpoint = <&hdmi_in_vopb>; }; @@ -2710,7 +2710,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; vopb_out_dp: endpoint@4 { -@@ -1850,6 +2022,17 @@ +@@ -1850,6 +2022,17 @@ vopb_out_dp: endpoint@4 { }; }; @@ -2728,7 +2728,7 @@ index 4a3d0af5ecfe..b13208797352 100644 vopb_mmu: iommu@ff903f00 { compatible = "rockchip,iommu"; reg = <0x0 0xff903f00 0x0 0x100>; -@@ -1858,6 +2041,24 @@ +@@ -1858,6 +2041,24 @@ vopb_mmu: iommu@ff903f00 { clock-names = "aclk", "iface"; power-domains = <&power RK3399_PD_VOPB>; #iommu-cells = <0>; @@ -2753,7 +2753,7 @@ index 4a3d0af5ecfe..b13208797352 100644 status = "disabled"; }; -@@ -1896,6 +2097,7 @@ +@@ -1896,6 +2097,7 @@ isp0_mmu: iommu@ff914000 { #iommu-cells = <0>; power-domains = <&power RK3399_PD_ISP0>; rockchip,disable-mmu-reset; @@ -2761,7 +2761,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; isp1: isp1@ff920000 { -@@ -1924,6 +2126,25 @@ +@@ -1924,6 +2126,25 @@ port@0 { }; }; @@ -2787,7 +2787,7 @@ index 4a3d0af5ecfe..b13208797352 100644 isp1_mmu: iommu@ff924000 { compatible = "rockchip,iommu"; reg = <0x0 0xff924000 0x0 0x100>, <0x0 0xff925000 0x0 0x100>; -@@ -1933,6 +2154,7 @@ +@@ -1933,6 +2154,7 @@ isp1_mmu: iommu@ff924000 { #iommu-cells = <0>; power-domains = <&power RK3399_PD_ISP1>; rockchip,disable-mmu-reset; @@ -2795,7 +2795,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; hdmi_sound: hdmi-sound { -@@ -1964,6 +2186,8 @@ +@@ -1964,6 +2186,8 @@ hdmi: hdmi@ff940000 { reg-io-width = <4>; rockchip,grf = <&grf>; #sound-dai-cells = <0>; @@ -2804,7 +2804,7 @@ index 4a3d0af5ecfe..b13208797352 100644 status = "disabled"; ports { -@@ -1983,7 +2207,7 @@ +@@ -1983,7 +2207,7 @@ hdmi_in_vopl: endpoint@1 { }; }; @@ -2813,7 +2813,7 @@ index 4a3d0af5ecfe..b13208797352 100644 compatible = "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi"; reg = <0x0 0xff960000 0x0 0x8000>; interrupts = ; -@@ -2002,29 +2226,24 @@ +@@ -2002,29 +2226,24 @@ ports { #address-cells = <1>; #size-cells = <0>; @@ -2849,7 +2849,7 @@ index 4a3d0af5ecfe..b13208797352 100644 compatible = "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi"; reg = <0x0 0xff968000 0x0 0x8000>; interrupts = ; -@@ -2044,29 +2263,39 @@ +@@ -2044,29 +2263,39 @@ ports { #address-cells = <1>; #size-cells = <0>; @@ -2899,7 +2899,7 @@ index 4a3d0af5ecfe..b13208797352 100644 compatible = "rockchip,rk3399-edp"; reg = <0x0 0xff970000 0x0 0x8000>; interrupts = ; -@@ -2083,7 +2312,6 @@ +@@ -2083,7 +2312,6 @@ edp: dp@ff970000 { ports { #address-cells = <1>; #size-cells = <0>; @@ -2907,7 +2907,7 @@ index 4a3d0af5ecfe..b13208797352 100644 edp_in: port@0 { reg = <0>; #address-cells = <1>; -@@ -2099,24 +2327,112 @@ +@@ -2099,24 +2327,112 @@ edp_in_vopl: endpoint@1 { remote-endpoint = <&vopl_out_edp>; }; }; @@ -3025,7 +3025,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; pinctrl: pinctrl { -@@ -2204,6 +2520,11 @@ +@@ -2204,6 +2520,11 @@ pcfg_pull_none: pcfg-pull-none { bias-disable; }; @@ -3037,7 +3037,7 @@ index 4a3d0af5ecfe..b13208797352 100644 pcfg_pull_none_12ma: pcfg-pull-none-12ma { bias-disable; drive-strength = <12>; -@@ -2234,6 +2555,11 @@ +@@ -2234,6 +2555,11 @@ pcfg_pull_up_8ma: pcfg-pull-up-8ma { drive-strength = <8>; }; @@ -3049,7 +3049,7 @@ index 4a3d0af5ecfe..b13208797352 100644 pcfg_pull_up_18ma: pcfg-pull-up-18ma { bias-pull-up; drive-strength = <18>; -@@ -2406,6 +2732,13 @@ +@@ -2406,6 +2732,13 @@ i2c3_xfer: i2c3-xfer { <4 RK_PC1 1 &pcfg_pull_none>, <4 RK_PC0 1 &pcfg_pull_none>; }; @@ -3063,7 +3063,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; i2c4 { -@@ -2459,16 +2792,6 @@ +@@ -2459,16 +2792,6 @@ i2s0_2ch_bus: i2s0-2ch-bus { <4 RK_PA0 1 &pcfg_pull_none>; }; @@ -3080,7 +3080,7 @@ index 4a3d0af5ecfe..b13208797352 100644 i2s0_8ch_bus: i2s0-8ch-bus { rockchip,pins = <3 RK_PD0 1 &pcfg_pull_none>, -@@ -2478,7 +2801,11 @@ +@@ -2478,7 +2801,11 @@ i2s0_8ch_bus: i2s0-8ch-bus { <3 RK_PD4 1 &pcfg_pull_none>, <3 RK_PD5 1 &pcfg_pull_none>, <3 RK_PD6 1 &pcfg_pull_none>, @@ -3093,7 +3093,7 @@ index 4a3d0af5ecfe..b13208797352 100644 <4 RK_PA0 1 &pcfg_pull_none>; }; -@@ -2772,7 +3099,7 @@ +@@ -2772,7 +3099,7 @@ uart0 { uart0_xfer: uart0-xfer { rockchip,pins = <2 RK_PC0 1 &pcfg_pull_up>, @@ -3102,7 +3102,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; uart0_cts: uart0-cts { -@@ -2790,7 +3117,7 @@ +@@ -2790,7 +3117,7 @@ uart1 { uart1_xfer: uart1-xfer { rockchip,pins = <3 RK_PB4 2 &pcfg_pull_up>, @@ -3111,7 +3111,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; }; -@@ -2798,7 +3125,7 @@ +@@ -2798,7 +3125,7 @@ uart2a { uart2a_xfer: uart2a-xfer { rockchip,pins = <4 RK_PB0 2 &pcfg_pull_up>, @@ -3120,7 +3120,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; }; -@@ -2806,7 +3133,7 @@ +@@ -2806,7 +3133,7 @@ uart2b { uart2b_xfer: uart2b-xfer { rockchip,pins = <4 RK_PC0 2 &pcfg_pull_up>, @@ -3129,7 +3129,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; }; -@@ -2814,7 +3141,7 @@ +@@ -2814,7 +3141,7 @@ uart2c { uart2c_xfer: uart2c-xfer { rockchip,pins = <4 RK_PC3 1 &pcfg_pull_up>, @@ -3138,7 +3138,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; }; -@@ -2822,7 +3149,7 @@ +@@ -2822,7 +3149,7 @@ uart3 { uart3_xfer: uart3-xfer { rockchip,pins = <3 RK_PB6 2 &pcfg_pull_up>, @@ -3147,7 +3147,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; uart3_cts: uart3-cts { -@@ -2840,7 +3167,7 @@ +@@ -2840,7 +3167,7 @@ uart4 { uart4_xfer: uart4-xfer { rockchip,pins = <1 RK_PA7 1 &pcfg_pull_up>, @@ -3156,7 +3156,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; }; -@@ -2848,7 +3175,7 @@ +@@ -2848,7 +3175,7 @@ uarthdcp { uarthdcp_xfer: uarthdcp-xfer { rockchip,pins = <4 RK_PC5 2 &pcfg_pull_up>, @@ -3165,7 +3165,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; }; -@@ -2903,6 +3230,11 @@ +@@ -2903,6 +3230,11 @@ pwm3a_pin: pwm3a-pin { rockchip,pins = <0 RK_PA6 1 &pcfg_pull_none>; }; @@ -3177,7 +3177,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; pwm3b { -@@ -2910,6 +3242,11 @@ +@@ -2910,6 +3242,11 @@ pwm3b_pin: pwm3b-pin { rockchip,pins = <1 RK_PB6 1 &pcfg_pull_none>; }; @@ -3189,7 +3189,7 @@ index 4a3d0af5ecfe..b13208797352 100644 }; hdmi { -@@ -2938,4 +3275,27 @@ +@@ -2938,4 +3275,27 @@ pcie_clkreqnb_cpm: pci-clkreqnb-cpm { }; }; @@ -3218,7 +3218,7 @@ index 4a3d0af5ecfe..b13208797352 100644 + }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566.dtsi b/arch/arm64/boot/dts/rockchip/rk3566.dtsi -index 6c4b17d27bdc..4e2a2fb1daaa 100644 +index 6c4b17d27..4e2a2fb1d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566.dtsi @@ -1,4 +1,7 @@ @@ -3229,7 +3229,7 @@ index 6c4b17d27bdc..4e2a2fb1daaa 100644 #include "rk356x.dtsi" -@@ -6,6 +9,16 @@ +@@ -6,6 +9,16 @@ / { compatible = "rockchip,rk3566"; }; @@ -3246,7 +3246,7 @@ index 6c4b17d27bdc..4e2a2fb1daaa 100644 &pipegrf { compatible = "rockchip,rk3566-pipe-grf", "syscon"; }; -@@ -23,13 +36,15 @@ +@@ -23,13 +36,15 @@ power-domain@RK3568_PD_PIPE { }; }; @@ -3269,10 +3269,10 @@ index 6c4b17d27bdc..4e2a2fb1daaa 100644 + snps,usb2-lpm-disable; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts -index f9127ddfbb7d..26d7fda275ed 100644 +index f9127ddfb..26d7fda27 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts -@@ -66,13 +66,6 @@ +@@ -66,13 +66,6 @@ hdmi_con_in: endpoint { }; }; @@ -3286,7 +3286,7 @@ index f9127ddfbb7d..26d7fda275ed 100644 vcc3v3_sys: vcc3v3-sys-regulator { compatible = "regulator-fixed"; regulator-name = "vcc3v3_sys"; -@@ -308,6 +301,7 @@ +@@ -308,6 +301,7 @@ vdd_logic: DCDC_REG1 { regulator-name = "vdd_logic"; regulator-always-on; regulator-boot-on; @@ -3294,7 +3294,7 @@ index f9127ddfbb7d..26d7fda275ed 100644 regulator-initial-mode = <0x2>; regulator-min-microvolt = <500000>; regulator-max-microvolt = <1350000>; -@@ -321,6 +315,7 @@ +@@ -321,6 +315,7 @@ regulator-state-mem { vdd_gpu: DCDC_REG2 { regulator-name = "vdd_gpu"; regulator-always-on; @@ -3302,7 +3302,7 @@ index f9127ddfbb7d..26d7fda275ed 100644 regulator-initial-mode = <0x2>; regulator-min-microvolt = <500000>; regulator-max-microvolt = <1350000>; -@@ -344,6 +339,7 @@ +@@ -344,6 +339,7 @@ regulator-state-mem { vdd_npu: DCDC_REG4 { regulator-name = "vdd_npu"; @@ -3310,7 +3310,7 @@ index f9127ddfbb7d..26d7fda275ed 100644 regulator-initial-mode = <0x2>; regulator-min-microvolt = <500000>; regulator-max-microvolt = <1350000>; -@@ -618,12 +614,6 @@ +@@ -618,12 +614,6 @@ hym8563_int: hym8563-int { }; }; @@ -3325,7 +3325,7 @@ index f9127ddfbb7d..26d7fda275ed 100644 rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none_drv_level_5>; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-dram-default-timing.dtsi new file mode 100644 -index 000000000000..99247fb7921a +index 000000000..99247fb79 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-dram-default-timing.dtsi @@ -0,0 +1,400 @@ @@ -3730,10 +3730,10 @@ index 000000000000..99247fb7921a + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts -index 19f8fc369b13..674792567fa6 100644 +index 19f8fc369..674792567 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts -@@ -293,6 +293,7 @@ +@@ -293,6 +293,7 @@ vdd_logic: DCDC_REG1 { regulator-name = "vdd_logic"; regulator-always-on; regulator-boot-on; @@ -3741,7 +3741,7 @@ index 19f8fc369b13..674792567fa6 100644 regulator-initial-mode = <0x2>; regulator-min-microvolt = <500000>; regulator-max-microvolt = <1350000>; -@@ -306,6 +307,7 @@ +@@ -306,6 +307,7 @@ regulator-state-mem { vdd_gpu: DCDC_REG2 { regulator-name = "vdd_gpu"; regulator-always-on; @@ -3749,7 +3749,7 @@ index 19f8fc369b13..674792567fa6 100644 regulator-initial-mode = <0x2>; regulator-min-microvolt = <500000>; regulator-max-microvolt = <1350000>; -@@ -329,6 +331,7 @@ +@@ -329,6 +331,7 @@ regulator-state-mem { vdd_npu: DCDC_REG4 { regulator-name = "vdd_npu"; @@ -3759,7 +3759,7 @@ index 19f8fc369b13..674792567fa6 100644 regulator-max-microvolt = <1350000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi new file mode 100644 -index 000000000000..df2bd19f93ba +index 000000000..df2bd19f9 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi @@ -0,0 +1,60 @@ @@ -3824,7 +3824,7 @@ index 000000000000..df2bd19f93ba + disable-afbc-win; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi -index 0a979bfb63d9..a78bdf986a25 100644 +index 0a979bfb6..a78bdf986 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi @@ -1,6 +1,6 @@ @@ -3835,7 +3835,7 @@ index 0a979bfb63d9..a78bdf986a25 100644 */ #include -@@ -917,35 +917,35 @@ +@@ -917,35 +917,35 @@ i2s1 { i2s1m0_lrckrx: i2s1m0-lrckrx { rockchip,pins = /* i2s1m0_lrckrx */ @@ -3876,7 +3876,7 @@ index 0a979bfb63d9..a78bdf986a25 100644 }; /omit-if-no-ref/ -@@ -1008,35 +1008,35 @@ +@@ -1008,35 +1008,35 @@ i2s1m0_sdo3: i2s1m0-sdo3 { i2s1m1_lrckrx: i2s1m1-lrckrx { rockchip,pins = /* i2s1m1_lrckrx */ @@ -3917,7 +3917,7 @@ index 0a979bfb63d9..a78bdf986a25 100644 }; /omit-if-no-ref/ -@@ -1099,35 +1099,35 @@ +@@ -1099,35 +1099,35 @@ i2s1m1_sdo3: i2s1m1-sdo3 { i2s1m2_lrckrx: i2s1m2-lrckrx { rockchip,pins = /* i2s1m2_lrckrx */ @@ -3958,7 +3958,7 @@ index 0a979bfb63d9..a78bdf986a25 100644 }; /omit-if-no-ref/ -@@ -1192,35 +1192,35 @@ +@@ -1192,35 +1192,35 @@ i2s2 { i2s2m0_lrckrx: i2s2m0-lrckrx { rockchip,pins = /* i2s2m0_lrckrx */ @@ -3999,7 +3999,7 @@ index 0a979bfb63d9..a78bdf986a25 100644 }; /omit-if-no-ref/ -@@ -1241,35 +1241,35 @@ +@@ -1241,35 +1241,35 @@ i2s2m0_sdo: i2s2m0-sdo { i2s2m1_lrckrx: i2s2m1-lrckrx { rockchip,pins = /* i2s2m1_lrckrx */ @@ -4040,7 +4040,7 @@ index 0a979bfb63d9..a78bdf986a25 100644 }; /omit-if-no-ref/ -@@ -1292,21 +1292,21 @@ +@@ -1292,21 +1292,21 @@ i2s3 { i2s3m0_lrck: i2s3m0-lrck { rockchip,pins = /* i2s3m0_lrck */ @@ -4065,7 +4065,7 @@ index 0a979bfb63d9..a78bdf986a25 100644 }; /omit-if-no-ref/ -@@ -1327,21 +1327,21 @@ +@@ -1327,21 +1327,21 @@ i2s3m0_sdo: i2s3m0-sdo { i2s3m1_lrck: i2s3m1-lrck { rockchip,pins = /* i2s3m1_lrck */ @@ -4090,7 +4090,7 @@ index 0a979bfb63d9..a78bdf986a25 100644 }; /omit-if-no-ref/ -@@ -3109,106 +3109,11 @@ +@@ -3109,106 +3109,11 @@ gmac1m1_rgmii_clk_level2: gmac1m1-rgmii-clk-level2 { }; }; @@ -4201,10 +4201,10 @@ index 0a979bfb63d9..a78bdf986a25 100644 - }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts -index e05ab11981f5..bab46db2b18c 100644 +index e05ab1198..bab46db2b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts -@@ -13,8 +13,8 @@ +@@ -13,8 +13,8 @@ / { aliases { ethernet0 = &gmac1; @@ -4215,7 +4215,7 @@ index e05ab11981f5..bab46db2b18c 100644 }; chosen: chosen { -@@ -32,13 +32,6 @@ +@@ -32,13 +32,6 @@ hdmi_con_in: endpoint { }; }; @@ -4229,7 +4229,7 @@ index e05ab11981f5..bab46db2b18c 100644 leds { compatible = "gpio-leds"; -@@ -67,55 +60,13 @@ +@@ -67,55 +60,13 @@ simple-audio-card,codec { }; }; @@ -4286,7 +4286,7 @@ index e05ab11981f5..bab46db2b18c 100644 vcc3v3_pcie: vcc3v3-pcie-regulator { compatible = "regulator-fixed"; enable-active-high; -@@ -128,7 +79,7 @@ +@@ -128,7 +79,7 @@ vcc3v3_pcie: vcc3v3-pcie-regulator { vin-supply = <&vcc5v0_sys>; }; @@ -4295,7 +4295,7 @@ index e05ab11981f5..bab46db2b18c 100644 compatible = "regulator-fixed"; regulator-name = "vcc3v3_sys"; regulator-always-on; -@@ -138,7 +89,7 @@ +@@ -138,7 +89,7 @@ vcc3v3_sys: vcc3v3-sys-regulator { vin-supply = <&vcc12v_dcin>; }; @@ -4304,7 +4304,7 @@ index e05ab11981f5..bab46db2b18c 100644 compatible = "regulator-fixed"; regulator-name = "vcc5v0_sys"; regulator-always-on; -@@ -148,7 +99,7 @@ +@@ -148,7 +99,7 @@ vcc5v0_sys: vcc5v0-sys-regulator { vin-supply = <&vcc12v_dcin>; }; @@ -4313,7 +4313,7 @@ index e05ab11981f5..bab46db2b18c 100644 compatible = "regulator-fixed"; regulator-name = "vcc5v0_usb"; regulator-always-on; -@@ -158,7 +109,7 @@ +@@ -158,7 +109,7 @@ vcc5v0_usb: vcc5v0-usb-regulator { vin-supply = <&vcc12v_dcin>; }; @@ -4322,7 +4322,7 @@ index e05ab11981f5..bab46db2b18c 100644 compatible = "regulator-fixed"; enable-active-high; gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>; -@@ -193,7 +144,7 @@ +@@ -193,7 +144,7 @@ vcc5v0_usb_otg: vcc5v0-usb-otg-regulator { vin-supply = <&vcc5v0_usb>; }; @@ -4331,7 +4331,7 @@ index e05ab11981f5..bab46db2b18c 100644 compatible = "regulator-fixed"; enable-active-high; gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; -@@ -209,7 +160,7 @@ +@@ -209,7 +160,7 @@ regulator-state-mem { }; }; @@ -4340,7 +4340,7 @@ index e05ab11981f5..bab46db2b18c 100644 compatible = "regulator-fixed"; enable-active-high; gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; -@@ -256,17 +207,16 @@ +@@ -256,17 +207,16 @@ &cpu3 { &gmac1 { assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1>; @@ -4361,7 +4361,7 @@ index e05ab11981f5..bab46db2b18c 100644 &gmac1m1_rgmii_bus>; status = "okay"; }; -@@ -279,8 +229,6 @@ +@@ -279,8 +229,6 @@ &gpu { &hdmi { avdd-0v9-supply = <&vdda0v9_image>; avdd-1v8-supply = <&vcca1v8_image>; @@ -4370,7 +4370,7 @@ index e05ab11981f5..bab46db2b18c 100644 status = "okay"; }; -@@ -350,6 +298,7 @@ +@@ -350,6 +298,7 @@ vdd_logic: DCDC_REG1 { regulator-name = "vdd_logic"; regulator-always-on; regulator-boot-on; @@ -4378,7 +4378,7 @@ index e05ab11981f5..bab46db2b18c 100644 regulator-initial-mode = <0x2>; regulator-min-microvolt = <500000>; regulator-max-microvolt = <1350000>; -@@ -363,6 +312,7 @@ +@@ -363,6 +312,7 @@ regulator-state-mem { vdd_gpu: DCDC_REG2 { regulator-name = "vdd_gpu"; regulator-always-on; @@ -4386,7 +4386,7 @@ index e05ab11981f5..bab46db2b18c 100644 regulator-initial-mode = <0x2>; regulator-min-microvolt = <500000>; regulator-max-microvolt = <1350000>; -@@ -386,6 +336,7 @@ +@@ -386,6 +336,7 @@ regulator-state-mem { vdd_npu: DCDC_REG4 { regulator-name = "vdd_npu"; @@ -4394,7 +4394,7 @@ index e05ab11981f5..bab46db2b18c 100644 regulator-initial-mode = <0x2>; regulator-min-microvolt = <500000>; regulator-max-microvolt = <1350000>; -@@ -576,11 +527,6 @@ +@@ -576,11 +527,6 @@ &i2s1_8ch { status = "okay"; }; @@ -4406,7 +4406,7 @@ index e05ab11981f5..bab46db2b18c 100644 &mdio1 { rgmii_phy1: ethernet-phy@0 { compatible = "ethernet-phy-ieee802.3-c22"; -@@ -601,19 +547,6 @@ +@@ -601,19 +547,6 @@ &pcie2x1 { status = "okay"; }; @@ -4426,7 +4426,7 @@ index e05ab11981f5..bab46db2b18c 100644 &pinctrl { cam { vcc_cam_en: vcc_cam_en { -@@ -673,26 +606,6 @@ +@@ -673,26 +606,6 @@ vcc5v0_usb_otg_en: vcc5v0_usb_otg_en { rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; }; }; @@ -4453,7 +4453,7 @@ index e05ab11981f5..bab46db2b18c 100644 }; &pmu_io_domains { -@@ -737,49 +650,12 @@ +@@ -737,49 +650,12 @@ &sdmmc0 { status = "okay"; }; @@ -4505,7 +4505,7 @@ index e05ab11981f5..bab46db2b18c 100644 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts new file mode 100644 -index 000000000000..0ef442123d05 +index 000000000..0ef442123 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-base.dts @@ -0,0 +1,14 @@ @@ -4525,7 +4525,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 100644 -index 000000000000..459fc3b6d6a0 +index 000000000..459fc3b6d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-edp.dtsi @@ -0,0 +1,141 @@ @@ -4672,7 +4672,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 100644 -index 000000000000..5267b377d8fb +index 000000000..5267b377d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0-beiqicloud.dtsi @@ -0,0 +1,395 @@ @@ -5073,7 +5073,7 @@ index 000000000000..5267b377d8fb +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi new file mode 100644 -index 000000000000..bd32a4246df3 +index 000000000..bd32a4246 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx0.dtsi @@ -0,0 +1,91 @@ @@ -5170,7 +5170,7 @@ index 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 100644 -index 000000000000..2bae1a60a865 +index 000000000..2bae1a60a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-mipi-tx1.dtsi @@ -0,0 +1,97 @@ @@ -5273,7 +5273,7 @@ index 000000000000..2bae1a60a865 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-android.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-android.dts new file mode 100644 -index 000000000000..795506d6677c +index 000000000..795506d66 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-android.dts @@ -0,0 +1,13 @@ @@ -5292,7 +5292,7 @@ index 000000000000..795506d6677c + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts new file mode 100644 -index 000000000000..16764d3899ad +index 000000000..16764d389 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux-factory.dts @@ -0,0 +1,155 @@ @@ -5453,7 +5453,7 @@ index 000000000000..16764d3899ad + diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts new file mode 100644 -index 000000000000..57ce9e21c0b4 +index 000000000..57ce9e21c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0-linux.dts @@ -0,0 +1,21 @@ @@ -5480,10 +5480,10 @@ index 000000000000..57ce9e21c0b4 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi new file mode 100644 -index 000000000000..fc3652887b48 +index 000000000..ce4bc9aeb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi -@@ -0,0 +1,871 @@ +@@ -0,0 +1,872 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2023 Rockchip Electronics Co., Ltd. @@ -5948,6 +5948,7 @@ index 000000000000..fc3652887b48 + }; + + ov9750_1: ov9750_1@36 { ++ status = "disabled"; + compatible = "ovti,ov9750"; + reg = <0x36>; + clocks = <&cru CLK_CIF_OUT>; @@ -6357,7 +6358,7 @@ index 000000000000..fc3652887b48 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10-linux.dts new file mode 100644 -index 000000000000..8dd494ce3a1f +index 000000000..8dd494ce3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10-linux.dts @@ -0,0 +1,13 @@ @@ -6376,7 +6377,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 100644 -index 000000000000..775ed046a4c2 +index 000000000..775ed046a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x10.dtsi @@ -0,0 +1,816 @@ @@ -7198,7 +7199,7 @@ index 000000000000..775ed046a4c2 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi new file mode 100644 -index 000000000000..cf465047cdcf +index 000000000..cf465047c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick.dtsi @@ -0,0 +1,1895 @@ @@ -9098,7 +9099,7 @@ index 000000000000..cf465047cdcf + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi -index f1be76a54ceb..de92e744c519 100644 +index f1be76a54..de92e744c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi @@ -8,6 +8,35 @@ @@ -9137,7 +9138,7 @@ index f1be76a54ceb..de92e744c519 100644 sata0: sata@fc000000 { compatible = "rockchip,rk3568-dwc-ahci", "snps,dwc-ahci"; reg = <0 0xfc000000 0 0x1000>; -@@ -15,7 +44,8 @@ +@@ -15,7 +44,8 @@ sata0: sata@fc000000 { <&cru CLK_SATA0_RXOOB>; clock-names = "sata", "pmalive", "rxoob"; interrupts = ; @@ -9147,7 +9148,7 @@ index f1be76a54ceb..de92e744c519 100644 phy-names = "sata-phy"; ports-implemented = <0x1>; power-domains = <&power RK3568_PD_PIPE>; -@@ -23,10 +53,15 @@ +@@ -23,10 +53,15 @@ sata0: sata@fc000000 { }; pipe_phy_grf0: syscon@fdc70000 { @@ -9164,7 +9165,7 @@ index f1be76a54ceb..de92e744c519 100644 qos_pcie3x1: qos@fe190080 { compatible = "rockchip,rk3568-qos", "syscon"; reg = <0x0 0xfe190080 0x0 0x20>; -@@ -42,29 +77,11 @@ +@@ -42,29 +77,11 @@ qos_sata0: qos@fe190200 { reg = <0x0 0xfe190200 0x0 0x20>; }; @@ -9196,7 +9197,7 @@ index f1be76a54ceb..de92e744c519 100644 clocks = <&cru ACLK_PCIE30X1_MST>, <&cru ACLK_PCIE30X1_SLV>, <&cru ACLK_PCIE30X1_DBI>, <&cru PCLK_PCIE30X1>, <&cru CLK_PCIE30X1_AUX_NDFT>; -@@ -86,8 +103,9 @@ +@@ -86,8 +103,9 @@ pcie3x1: pcie@fe270000 { linux,pci-domain = <1>; num-ib-windows = <6>; num-ob-windows = <2>; @@ -9207,7 +9208,7 @@ index f1be76a54ceb..de92e744c519 100644 num-lanes = <1>; phys = <&pcie30phy>; phy-names = "pcie-phy"; -@@ -95,13 +113,13 @@ +@@ -95,13 +113,13 @@ pcie3x1: pcie@fe270000 { reg = <0x3 0xc0400000 0x0 0x00400000>, <0x0 0xfe270000 0x0 0x00010000>, <0x0 0xf2000000 0x0 0x00100000>; @@ -9224,7 +9225,7 @@ index f1be76a54ceb..de92e744c519 100644 status = "disabled"; pcie3x1_intc: legacy-interrupt-controller { -@@ -114,10 +132,10 @@ +@@ -114,10 +132,10 @@ pcie3x1_intc: legacy-interrupt-controller { }; pcie3x2: pcie@fe280000 { @@ -9237,7 +9238,7 @@ index f1be76a54ceb..de92e744c519 100644 clocks = <&cru ACLK_PCIE30X2_MST>, <&cru ACLK_PCIE30X2_SLV>, <&cru ACLK_PCIE30X2_DBI>, <&cru PCLK_PCIE30X2>, <&cru CLK_PCIE30X2_AUX_NDFT>; -@@ -138,9 +156,10 @@ +@@ -138,9 +156,10 @@ pcie3x2: pcie@fe280000 { <0 0 0 4 &pcie3x2_intc 3>; linux,pci-domain = <2>; num-ib-windows = <6>; @@ -9249,7 +9250,7 @@ index f1be76a54ceb..de92e744c519 100644 num-lanes = <2>; phys = <&pcie30phy>; phy-names = "pcie-phy"; -@@ -148,13 +167,13 @@ +@@ -148,13 +167,13 @@ pcie3x2: pcie@fe280000 { reg = <0x3 0xc0800000 0x0 0x00400000>, <0x0 0xfe280000 0x0 0x00010000>, <0x0 0xf0000000 0x0 0x00100000>; @@ -9266,7 +9267,7 @@ index f1be76a54ceb..de92e744c519 100644 status = "disabled"; pcie3x2_intc: legacy-interrupt-controller { -@@ -166,6 +185,13 @@ +@@ -166,6 +185,13 @@ pcie3x2_intc: legacy-interrupt-controller { }; }; @@ -9280,7 +9281,7 @@ index f1be76a54ceb..de92e744c519 100644 gmac0: ethernet@fe2a0000 { compatible = "rockchip,rk3568-gmac", "snps,dwmac-4.20a"; reg = <0x0 0xfe2a0000 0x0 0x10000>; -@@ -175,11 +201,13 @@ +@@ -175,11 +201,13 @@ gmac0: ethernet@fe2a0000 { clocks = <&cru SCLK_GMAC0>, <&cru SCLK_GMAC0_RX_TX>, <&cru SCLK_GMAC0_RX_TX>, <&cru CLK_MAC0_REFOUT>, <&cru ACLK_GMAC0>, <&cru PCLK_GMAC0>, @@ -9296,7 +9297,7 @@ index f1be76a54ceb..de92e744c519 100644 resets = <&cru SRST_A_GMAC0>; reset-names = "stmmaceth"; rockchip,grf = <&grf>; -@@ -213,27 +241,142 @@ +@@ -213,27 +241,142 @@ gmac0_mtl_tx_setup: tx-queues-config { }; }; @@ -9442,7 +9443,7 @@ index f1be76a54ceb..de92e744c519 100644 }; }; -@@ -257,11 +400,21 @@ +@@ -257,11 +400,21 @@ power-domain@RK3568_PD_PIPE { }; }; @@ -9469,7 +9470,7 @@ index f1be76a54ceb..de92e744c519 100644 + }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi -index b7e2b475f070..51ca0fd2ab9f 100644 +index b7e2b475f..51ca0fd2a 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi @@ -10,7 +10,10 @@ @@ -9483,7 +9484,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 / { interrupt-parent = <&gic>; -@@ -18,6 +21,12 @@ +@@ -18,6 +21,12 @@ / { #size-cells = <2>; aliases { @@ -9496,7 +9497,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 gpio0 = &gpio0; gpio1 = &gpio1; gpio2 = &gpio2; -@@ -29,6 +38,10 @@ +@@ -29,6 +38,10 @@ aliases { i2c3 = &i2c3; i2c4 = &i2c4; i2c5 = &i2c5; @@ -9507,7 +9508,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 serial0 = &uart0; serial1 = &uart1; serial2 = &uart2; -@@ -57,6 +70,8 @@ +@@ -57,6 +70,8 @@ cpu0: cpu@0 { #cooling-cells = <2>; enable-method = "psci"; operating-points-v2 = <&cpu0_opp_table>; @@ -9516,7 +9517,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 }; cpu1: cpu@100 { -@@ -66,6 +81,7 @@ +@@ -66,6 +81,7 @@ cpu1: cpu@100 { #cooling-cells = <2>; enable-method = "psci"; operating-points-v2 = <&cpu0_opp_table>; @@ -9524,7 +9525,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 }; cpu2: cpu@200 { -@@ -75,6 +91,7 @@ +@@ -75,6 +91,7 @@ cpu2: cpu@200 { #cooling-cells = <2>; enable-method = "psci"; operating-points-v2 = <&cpu0_opp_table>; @@ -9532,7 +9533,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 }; cpu3: cpu@300 { -@@ -84,6 +101,19 @@ +@@ -84,6 +101,19 @@ cpu3: cpu@300 { #cooling-cells = <2>; enable-method = "psci"; operating-points-v2 = <&cpu0_opp_table>; @@ -9552,7 +9553,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 }; }; -@@ -91,47 +121,166 @@ +@@ -91,47 +121,166 @@ cpu0_opp_table: opp-table-0 { compatible = "operating-points-v2"; opp-shared; @@ -9725,7 +9726,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 }; firmware { -@@ -145,41 +294,88 @@ +@@ -145,41 +294,88 @@ scmi: scmi { scmi_clk: protocol@14 { reg = <0x14>; #clock-cells = <1>; @@ -9820,7 +9821,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 }; }; -@@ -199,7 +395,20 @@ +@@ -199,7 +395,20 @@ simple-audio-card,cpu { }; }; @@ -9842,7 +9843,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 compatible = "arm,cortex-a55-pmu"; interrupts = , , -@@ -213,15 +422,108 @@ +@@ -213,15 +422,108 @@ psci { method = "smc"; }; @@ -9955,7 +9956,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 xin24m: xin24m { compatible = "fixed-clock"; clock-frequency = <24000000>; -@@ -238,17 +540,9 @@ +@@ -238,17 +540,9 @@ xin32k: xin32k { #clock-cells = <0>; }; @@ -9975,7 +9976,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 }; sata1: sata@fc400000 { -@@ -258,7 +552,7 @@ +@@ -258,7 +552,7 @@ sata1: sata@fc400000 { <&cru CLK_SATA1_RXOOB>; clock-names = "sata", "pmalive", "rxoob"; interrupts = ; @@ -9984,7 +9985,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 phy-names = "sata-phy"; ports-implemented = <0x1>; power-domains = <&power RK3568_PD_PIPE>; -@@ -272,57 +566,97 @@ +@@ -272,57 +566,97 @@ sata2: sata@fc800000 { <&cru CLK_SATA2_RXOOB>; clock-names = "sata", "pmalive", "rxoob"; interrupts = ; @@ -10113,7 +10114,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 }; usb_host0_ehci: usb@fd800000 { -@@ -330,9 +664,10 @@ +@@ -330,9 +664,10 @@ usb_host0_ehci: usb@fd800000 { reg = <0x0 0xfd800000 0x0 0x40000>; interrupts = ; clocks = <&cru HCLK_USB2HOST0>, <&cru HCLK_USB2HOST0_ARB>, @@ -10127,7 +10128,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 status = "disabled"; }; -@@ -341,9 +676,10 @@ +@@ -341,9 +676,10 @@ usb_host0_ohci: usb@fd840000 { reg = <0x0 0xfd840000 0x0 0x40000>; interrupts = ; clocks = <&cru HCLK_USB2HOST0>, <&cru HCLK_USB2HOST0_ARB>, @@ -10141,7 +10142,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 status = "disabled"; }; -@@ -352,9 +688,10 @@ +@@ -352,9 +688,10 @@ usb_host1_ehci: usb@fd880000 { reg = <0x0 0xfd880000 0x0 0x40000>; interrupts = ; clocks = <&cru HCLK_USB2HOST1>, <&cru HCLK_USB2HOST1_ARB>, @@ -10155,7 +10156,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 status = "disabled"; }; -@@ -363,9 +700,16 @@ +@@ -363,9 +700,16 @@ usb_host1_ohci: usb@fd8c0000 { reg = <0x0 0xfd8c0000 0x0 0x40000>; interrupts = ; clocks = <&cru HCLK_USB2HOST1>, <&cru HCLK_USB2HOST1_ARB>, @@ -10175,7 +10176,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 status = "disabled"; }; -@@ -377,24 +721,99 @@ +@@ -377,24 +721,99 @@ pmu_io_domains: io-domains { compatible = "rockchip,rk3568-pmu-io-voltage-domain"; status = "disabled"; }; @@ -10277,7 +10278,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 reg = <0x0 0xfdc90000 0x0 0x1000>; }; -@@ -408,24 +827,96 @@ +@@ -408,24 +827,96 @@ usb2phy1_grf: syscon@fdca8000 { reg = <0x0 0xfdca8000 0x0 0x8000>; }; @@ -10380,7 +10381,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 }; i2c0: i2c@fdd40000 { -@@ -458,10 +949,11 @@ +@@ -458,10 +949,11 @@ uart0: serial@fdd50000 { pwm0: pwm@fdd70000 { compatible = "rockchip,rk3568-pwm", "rockchip,rk3328-pwm"; reg = <0x0 0xfdd70000 0x0 0x10>; @@ -10393,7 +10394,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 #pwm-cells = <3>; status = "disabled"; }; -@@ -469,10 +961,11 @@ +@@ -469,10 +961,11 @@ pwm0: pwm@fdd70000 { pwm1: pwm@fdd70010 { compatible = "rockchip,rk3568-pwm", "rockchip,rk3328-pwm"; reg = <0x0 0xfdd70010 0x0 0x10>; @@ -10406,7 +10407,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 #pwm-cells = <3>; status = "disabled"; }; -@@ -480,10 +973,11 @@ +@@ -480,10 +973,11 @@ pwm1: pwm@fdd70010 { pwm2: pwm@fdd70020 { compatible = "rockchip,rk3568-pwm", "rockchip,rk3328-pwm"; reg = <0x0 0xfdd70020 0x0 0x10>; @@ -10419,7 +10420,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 #pwm-cells = <3>; status = "disabled"; }; -@@ -491,10 +985,12 @@ +@@ -491,10 +985,12 @@ pwm2: pwm@fdd70020 { pwm3: pwm@fdd70030 { compatible = "rockchip,rk3568-pwm", "rockchip,rk3328-pwm"; reg = <0x0 0xfdd70030 0x0 0x10>; @@ -10433,7 +10434,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 #pwm-cells = <3>; status = "disabled"; }; -@@ -509,6 +1005,14 @@ +@@ -509,6 +1005,14 @@ power: power-controller { #address-cells = <1>; #size-cells = <0>; @@ -10448,7 +10449,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 /* These power domains are grouped by VD_GPU */ power-domain@RK3568_PD_GPU { reg = ; -@@ -578,70 +1082,647 @@ +@@ -578,70 +1082,647 @@ power-domain@RK3568_PD_RKVENC { }; }; @@ -11118,7 +11119,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 }; sdmmc2: mmc@fe000000 { -@@ -658,6 +1739,13 @@ +@@ -658,6 +1739,13 @@ sdmmc2: mmc@fe000000 { status = "disabled"; }; @@ -11132,7 +11133,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 gmac1: ethernet@fe010000 { compatible = "rockchip,rk3568-gmac", "snps,dwmac-4.20a"; reg = <0x0 0xfe010000 0x0 0x10000>; -@@ -667,11 +1755,13 @@ +@@ -667,11 +1755,13 @@ gmac1: ethernet@fe010000 { clocks = <&cru SCLK_GMAC1>, <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1_RX_TX>, <&cru CLK_MAC1_REFOUT>, <&cru ACLK_GMAC1>, <&cru PCLK_GMAC1>, @@ -11148,7 +11149,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 resets = <&cru SRST_A_GMAC1>; reset-names = "stmmaceth"; rockchip,grf = <&grf>; -@@ -706,12 +1796,16 @@ +@@ -706,12 +1796,16 @@ gmac1_mtl_tx_setup: tx-queues-config { }; vop: vop@fe040000 { @@ -11167,7 +11168,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 iommus = <&vop_mmu>; power-domains = <&power RK3568_PD_VO>; rockchip,grf = <&grf>; -@@ -725,44 +1819,132 @@ +@@ -725,44 +1819,132 @@ vp0: port@0 { reg = <0>; #address-cells = <1>; #size-cells = <0>; @@ -11306,7 +11307,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 status = "disabled"; ports { -@@ -771,26 +1953,38 @@ +@@ -771,26 +1953,38 @@ ports { dsi0_in: port@0 { reg = <0>; @@ -11352,7 +11353,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 status = "disabled"; ports { -@@ -799,10 +1993,20 @@ +@@ -799,10 +1993,20 @@ ports { dsi1_in: port@0 { reg = <0>; @@ -11376,7 +11377,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 }; }; }; -@@ -814,9 +2018,9 @@ +@@ -814,9 +2018,9 @@ hdmi: hdmi@fe0a0000 { clocks = <&cru PCLK_HDMI_HOST>, <&cru CLK_HDMI_SFR>, <&cru CLK_HDMI_CEC>, @@ -11389,7 +11390,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 pinctrl-names = "default"; pinctrl-0 = <&hdmitx_scl &hdmitx_sda &hdmitxm0_cec>; power-domains = <&power RK3568_PD_VO>; -@@ -829,16 +2033,89 @@ +@@ -829,16 +2033,89 @@ ports { #address-cells = <1>; #size-cells = <0>; @@ -11482,7 +11483,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 qos_gpu: qos@fe128000 { compatible = "rockchip,rk3568-qos", "syscon"; reg = <0x0 0xfe128000 0x0 0x20>; -@@ -959,12 +2236,112 @@ +@@ -959,12 +2236,112 @@ qos_vop_m1: qos@fe1a8100 { reg = <0x0 0xfe1a8100 0x0 0x20>; }; @@ -11597,7 +11598,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 interrupts = , , , -@@ -980,29 +2357,30 @@ +@@ -980,29 +2357,30 @@ pcie2x1: pcie@fe260000 { device_type = "pci"; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; @@ -11638,7 +11639,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 #address-cells = <0>; #interrupt-cells = <1>; interrupt-controller; -@@ -1011,7 +2389,7 @@ +@@ -1011,7 +2389,7 @@ pcie_intc: legacy-interrupt-controller { }; }; @@ -11647,7 +11648,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 compatible = "rockchip,rk3568-dw-mshc", "rockchip,rk3288-dw-mshc"; reg = <0x0 0xfe2b0000 0x0 0x4000>; interrupts = ; -@@ -1025,7 +2403,7 @@ +@@ -1025,7 +2403,7 @@ sdmmc0: mmc@fe2b0000 { status = "disabled"; }; @@ -11656,7 +11657,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 compatible = "rockchip,rk3568-dw-mshc", "rockchip,rk3288-dw-mshc"; reg = <0x0 0xfe2c0000 0x0 0x4000>; interrupts = ; -@@ -1045,37 +2423,162 @@ +@@ -1045,37 +2423,162 @@ sfc: spi@fe300000 { interrupts = ; clocks = <&cru SCLK_SFC>, <&cru HCLK_SFC>; clock-names = "clk_sfc", "hclk_sfc"; @@ -11827,7 +11828,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 #sound-dai-cells = <0>; status = "disabled"; }; -@@ -1084,15 +2587,13 @@ +@@ -1084,15 +2587,13 @@ i2s1_8ch: i2s@fe410000 { compatible = "rockchip,rk3568-i2s-tdm"; reg = <0x0 0xfe410000 0x0 0x1000>; interrupts = ; @@ -11847,7 +11848,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 rockchip,grf = <&grf>; pinctrl-names = "default"; pinctrl-0 = <&i2s1m0_sclktx &i2s1m0_sclkrx -@@ -1109,20 +2610,18 @@ +@@ -1109,20 +2610,18 @@ i2s2_2ch: i2s@fe420000 { compatible = "rockchip,rk3568-i2s-tdm"; reg = <0x0 0xfe420000 0x0 0x1000>; interrupts = ; @@ -11873,7 +11874,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 #sound-dai-cells = <0>; status = "disabled"; }; -@@ -1138,13 +2637,20 @@ +@@ -1138,13 +2637,20 @@ i2s3_2ch: i2s@fe430000 { dma-names = "tx", "rx"; resets = <&cru SRST_M_I2S3_2CH_TX>, <&cru SRST_M_I2S3_2CH_RX>; reset-names = "tx-m", "rx-m"; @@ -11895,7 +11896,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 reg = <0x0 0xfe440000 0x0 0x1000>; interrupts = ; clocks = <&cru MCLK_PDM>, <&cru HCLK_PDM>; -@@ -1164,7 +2670,21 @@ +@@ -1164,7 +2670,21 @@ &pdmm0_sdi2 status = "disabled"; }; @@ -11918,7 +11919,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 compatible = "rockchip,rk3568-spdif"; reg = <0x0 0xfe460000 0x0 0x1000>; interrupts = ; -@@ -1178,6 +2698,34 @@ +@@ -1178,6 +2698,34 @@ spdif: spdif@fe460000 { status = "disabled"; }; @@ -11953,7 +11954,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 dmac0: dma-controller@fe530000 { compatible = "arm,pl330", "arm,primecell"; reg = <0x0 0xfe530000 0x0 0x4000>; -@@ -1200,6 +2748,56 @@ +@@ -1200,6 +2748,56 @@ dmac1: dma-controller@fe550000 { #dma-cells = <1>; }; @@ -12010,7 +12011,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 i2c1: i2c@fe5a0000 { compatible = "rockchip,rk3568-i2c", "rockchip,rk3399-i2c"; reg = <0x0 0xfe5a0000 0x0 0x1000>; -@@ -1265,6 +2863,14 @@ +@@ -1265,6 +2863,14 @@ i2c5: i2c@fe5e0000 { status = "disabled"; }; @@ -12025,7 +12026,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 wdt: watchdog@fe600000 { compatible = "rockchip,rk3568-wdt", "snps,dw-wdt"; reg = <0x0 0xfe600000 0x0 0x100>; -@@ -1281,10 +2887,12 @@ +@@ -1281,10 +2887,12 @@ spi0: spi@fe610000 { clock-names = "spiclk", "apb_pclk"; dmas = <&dmac0 20>, <&dmac0 21>; dma-names = "tx", "rx"; @@ -12039,7 +12040,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 status = "disabled"; }; -@@ -1296,10 +2904,12 @@ +@@ -1296,10 +2904,12 @@ spi1: spi@fe620000 { clock-names = "spiclk", "apb_pclk"; dmas = <&dmac0 22>, <&dmac0 23>; dma-names = "tx", "rx"; @@ -12053,7 +12054,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 status = "disabled"; }; -@@ -1311,10 +2921,12 @@ +@@ -1311,10 +2921,12 @@ spi2: spi@fe630000 { clock-names = "spiclk", "apb_pclk"; dmas = <&dmac0 24>, <&dmac0 25>; dma-names = "tx", "rx"; @@ -12067,7 +12068,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 status = "disabled"; }; -@@ -1326,10 +2938,12 @@ +@@ -1326,10 +2938,12 @@ spi3: spi@fe640000 { clock-names = "spiclk", "apb_pclk"; dmas = <&dmac0 26>, <&dmac0 27>; dma-names = "tx", "rx"; @@ -12081,7 +12082,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 status = "disabled"; }; -@@ -1459,116 +3073,14 @@ +@@ -1459,116 +3073,14 @@ uart9: serial@fe6d0000 { status = "disabled"; }; @@ -12200,7 +12201,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 #pwm-cells = <3>; status = "disabled"; }; -@@ -1576,10 +3088,11 @@ +@@ -1576,10 +3088,11 @@ pwm4: pwm@fe6e0000 { pwm5: pwm@fe6e0010 { compatible = "rockchip,rk3568-pwm", "rockchip,rk3328-pwm"; reg = <0x0 0xfe6e0010 0x0 0x10>; @@ -12213,7 +12214,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 #pwm-cells = <3>; status = "disabled"; }; -@@ -1587,10 +3100,11 @@ +@@ -1587,10 +3100,11 @@ pwm5: pwm@fe6e0010 { pwm6: pwm@fe6e0020 { compatible = "rockchip,rk3568-pwm", "rockchip,rk3328-pwm"; reg = <0x0 0xfe6e0020 0x0 0x10>; @@ -12226,7 +12227,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 #pwm-cells = <3>; status = "disabled"; }; -@@ -1598,10 +3112,12 @@ +@@ -1598,10 +3112,12 @@ pwm6: pwm@fe6e0020 { pwm7: pwm@fe6e0030 { compatible = "rockchip,rk3568-pwm", "rockchip,rk3328-pwm"; reg = <0x0 0xfe6e0030 0x0 0x10>; @@ -12240,7 +12241,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 #pwm-cells = <3>; status = "disabled"; }; -@@ -1609,10 +3125,11 @@ +@@ -1609,10 +3125,11 @@ pwm7: pwm@fe6e0030 { pwm8: pwm@fe6f0000 { compatible = "rockchip,rk3568-pwm", "rockchip,rk3328-pwm"; reg = <0x0 0xfe6f0000 0x0 0x10>; @@ -12253,7 +12254,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 #pwm-cells = <3>; status = "disabled"; }; -@@ -1623,7 +3140,7 @@ +@@ -1623,7 +3140,7 @@ pwm9: pwm@fe6f0010 { clocks = <&cru CLK_PWM2>, <&cru PCLK_PWM2>; clock-names = "pwm", "pclk"; pinctrl-0 = <&pwm9m0_pins>; @@ -12262,7 +12263,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 #pwm-cells = <3>; status = "disabled"; }; -@@ -1631,10 +3148,11 @@ +@@ -1631,10 +3148,11 @@ pwm9: pwm@fe6f0010 { pwm10: pwm@fe6f0020 { compatible = "rockchip,rk3568-pwm", "rockchip,rk3328-pwm"; reg = <0x0 0xfe6f0020 0x0 0x10>; @@ -12275,7 +12276,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 #pwm-cells = <3>; status = "disabled"; }; -@@ -1642,10 +3160,12 @@ +@@ -1642,10 +3160,12 @@ pwm10: pwm@fe6f0020 { pwm11: pwm@fe6f0030 { compatible = "rockchip,rk3568-pwm", "rockchip,rk3328-pwm"; reg = <0x0 0xfe6f0030 0x0 0x10>; @@ -12289,7 +12290,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 #pwm-cells = <3>; status = "disabled"; }; -@@ -1653,10 +3173,11 @@ +@@ -1653,10 +3173,11 @@ pwm11: pwm@fe6f0030 { pwm12: pwm@fe700000 { compatible = "rockchip,rk3568-pwm", "rockchip,rk3328-pwm"; reg = <0x0 0xfe700000 0x0 0x10>; @@ -12302,7 +12303,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 #pwm-cells = <3>; status = "disabled"; }; -@@ -1664,10 +3185,11 @@ +@@ -1664,10 +3185,11 @@ pwm12: pwm@fe700000 { pwm13: pwm@fe700010 { compatible = "rockchip,rk3568-pwm", "rockchip,rk3328-pwm"; reg = <0x0 0xfe700010 0x0 0x10>; @@ -12315,7 +12316,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 #pwm-cells = <3>; status = "disabled"; }; -@@ -1675,10 +3197,11 @@ +@@ -1675,10 +3197,11 @@ pwm13: pwm@fe700010 { pwm14: pwm@fe700020 { compatible = "rockchip,rk3568-pwm", "rockchip,rk3328-pwm"; reg = <0x0 0xfe700020 0x0 0x10>; @@ -12328,7 +12329,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 #pwm-cells = <3>; status = "disabled"; }; -@@ -1686,121 +3209,283 @@ +@@ -1686,121 +3209,283 @@ pwm14: pwm@fe700020 { pwm15: pwm@fe700030 { compatible = "rockchip,rk3568-pwm", "rockchip,rk3328-pwm"; reg = <0x0 0xfe700030 0x0 0x10>; @@ -12651,7 +12652,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 #phy-cells = <0>; status = "disabled"; }; -@@ -1814,61 +3499,56 @@ +@@ -1814,61 +3499,56 @@ pinctrl: pinctrl { #size-cells = <2>; ranges; @@ -12719,7 +12720,7 @@ index b7e2b475f070..51ca0fd2ab9f 100644 interrupt-controller; #interrupt-cells = <2>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts -index 229a9111f5eb..50822c2def7d 100644 +index 229a9111f..50822c2de 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts @@ -7,7 +7,10 @@ @@ -12733,7 +12734,7 @@ index 229a9111f5eb..50822c2def7d 100644 #include "rk3588.dtsi" / { -@@ -23,12 +26,95 @@ +@@ -23,12 +26,95 @@ chosen { stdout-path = "serial2:1500000n8"; }; @@ -12829,7 +12830,7 @@ index 229a9111f5eb..50822c2def7d 100644 vcc12v_dcin: vcc12v-dcin-regulator { compatible = "regulator-fixed"; regulator-name = "vcc12v_dcin"; -@@ -38,6 +124,19 @@ +@@ -38,6 +124,19 @@ vcc12v_dcin: vcc12v-dcin-regulator { regulator-max-microvolt = <12000000>; }; @@ -12849,7 +12850,7 @@ index 229a9111f5eb..50822c2def7d 100644 vcc5v0_host: vcc5v0-host-regulator { compatible = "regulator-fixed"; regulator-name = "vcc5v0_host"; -@@ -81,42 +180,103 @@ +@@ -81,42 +180,103 @@ vcc5v0_usb: vcc5v0-usb-regulator { regulator-max-microvolt = <5000000>; vin-supply = <&vcc5v0_usbdcin>; }; @@ -12953,7 +12954,7 @@ index 229a9111f5eb..50822c2def7d 100644 }; &gmac0 { -@@ -137,6 +297,56 @@ +@@ -137,6 +297,56 @@ &gmac0_rgmii_clk &i2c2 { status = "okay"; @@ -13010,7 +13011,7 @@ index 229a9111f5eb..50822c2def7d 100644 hym8563: rtc@51 { compatible = "haoyu,hym8563"; reg = <0x51>; -@@ -163,7 +373,32 @@ +@@ -163,7 +373,32 @@ rgmii_phy: ethernet-phy@1 { }; }; @@ -13043,7 +13044,7 @@ index 229a9111f5eb..50822c2def7d 100644 rtl8211f { rtl8211f_rst: rtl8211f-rst { rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; -@@ -177,17 +412,48 @@ +@@ -177,17 +412,48 @@ hym8563_int: hym8563-int { }; }; @@ -13092,7 +13093,7 @@ index 229a9111f5eb..50822c2def7d 100644 &sdhci { bus-width = <8>; no-sdio; -@@ -807,6 +1073,22 @@ +@@ -807,6 +1073,22 @@ &sata0 { status = "okay"; }; @@ -13115,7 +13116,7 @@ index 229a9111f5eb..50822c2def7d 100644 &u2phy2 { status = "okay"; }; -@@ -845,3 +1127,58 @@ +@@ -845,3 +1127,58 @@ &usb_host1_ehci { &usb_host1_ohci { status = "okay"; }; @@ -13176,7 +13177,7 @@ index 229a9111f5eb..50822c2def7d 100644 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts new file mode 100644 -index 000000000000..87803e6e0fa7 +index 000000000..87803e6e0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts @@ -0,0 +1,1044 @@ @@ -14225,7 +14226,7 @@ index 000000000000..87803e6e0fa7 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -index 8ab60968f275..76c546f5e4c8 100644 +index 8ab60968f..76c546f5e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -1,47 +1,153 @@ @@ -14406,7 +14407,7 @@ index 8ab60968f275..76c546f5e4c8 100644 }; vcc5v0_host: vcc5v0-host-regulator { -@@ -58,541 +164,518 @@ +@@ -58,541 +164,518 @@ vcc5v0_host: vcc5v0-host-regulator { vin-supply = <&vcc5v0_sys>; }; @@ -15325,7 +15326,7 @@ index 8ab60968f275..76c546f5e4c8 100644 status = "okay"; }; -@@ -601,7 +684,6 @@ +@@ -601,7 +684,6 @@ &u2phy3 { }; &u2phy3_host { @@ -15333,7 +15334,7 @@ index 8ab60968f275..76c546f5e4c8 100644 status = "okay"; }; -@@ -620,3 +702,554 @@ +@@ -620,3 +702,554 @@ &usb_host1_ehci { &usb_host1_ohci { status = "okay"; }; @@ -15889,7 +15890,7 @@ index 8ab60968f275..76c546f5e4c8 100644 + "", "", "", ""; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588.dtsi b/arch/arm64/boot/dts/rockchip/rk3588.dtsi -index 5519c1430cb7..fa4a7e35099e 100644 +index 5519c1430..fa4a7e350 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588.dtsi @@ -3,26 +3,193 @@ @@ -16092,7 +16093,7 @@ index 5519c1430cb7..fa4a7e35099e 100644 assigned-clocks = <&cru CLK_I2S8_8CH_TX_SRC>; assigned-clock-parents = <&cru PLL_AUPLL>; dmas = <&dmac2 22>; -@@ -30,6 +197,22 @@ +@@ -30,6 +197,22 @@ i2s8_8ch: i2s@fddc8000 { power-domains = <&power RK3588_PD_VO0>; resets = <&cru SRST_M_I2S8_8CH_TX>; reset-names = "tx-m"; @@ -16115,7 +16116,7 @@ index 5519c1430cb7..fa4a7e35099e 100644 #sound-dai-cells = <0>; status = "disabled"; }; -@@ -37,16 +220,19 @@ +@@ -37,16 +220,19 @@ i2s8_8ch: i2s@fddc8000 { i2s6_8ch: i2s@fddf4000 { compatible = "rockchip,rk3588-i2s-tdm"; reg = <0x0 0xfddf4000 0x0 0x1000>; @@ -16137,7 +16138,7 @@ index 5519c1430cb7..fa4a7e35099e 100644 #sound-dai-cells = <0>; status = "disabled"; }; -@@ -54,7 +240,7 @@ +@@ -54,7 +240,7 @@ i2s6_8ch: i2s@fddf4000 { i2s7_8ch: i2s@fddf8000 { compatible = "rockchip,rk3588-i2s-tdm"; reg = <0x0 0xfddf8000 0x0 0x1000>; @@ -16146,7 +16147,7 @@ index 5519c1430cb7..fa4a7e35099e 100644 clocks = <&cru MCLK_I2S7_8CH_RX>, <&cru MCLK_I2S7_8CH_RX>, <&cru HCLK_I2S7_8CH>; clock-names = "mclk_tx", "mclk_rx", "hclk"; assigned-clocks = <&cru CLK_I2S7_8CH_RX_SRC>; -@@ -64,6 +250,7 @@ +@@ -64,6 +250,7 @@ i2s7_8ch: i2s@fddf8000 { power-domains = <&power RK3588_PD_VO1>; resets = <&cru SRST_M_I2S7_8CH_RX>; reset-names = "rx-m"; @@ -16154,7 +16155,7 @@ index 5519c1430cb7..fa4a7e35099e 100644 #sound-dai-cells = <0>; status = "disabled"; }; -@@ -71,7 +258,7 @@ +@@ -71,7 +258,7 @@ i2s7_8ch: i2s@fddf8000 { i2s10_8ch: i2s@fde00000 { compatible = "rockchip,rk3588-i2s-tdm"; reg = <0x0 0xfde00000 0x0 0x1000>; @@ -16163,7 +16164,7 @@ index 5519c1430cb7..fa4a7e35099e 100644 clocks = <&cru MCLK_I2S10_8CH_RX>, <&cru MCLK_I2S10_8CH_RX>, <&cru HCLK_I2S10_8CH>; clock-names = "mclk_tx", "mclk_rx", "hclk"; assigned-clocks = <&cru CLK_I2S10_8CH_RX_SRC>; -@@ -81,12 +268,256 @@ +@@ -81,12 +268,256 @@ i2s10_8ch: i2s@fde00000 { power-domains = <&power RK3588_PD_VO1>; resets = <&cru SRST_M_I2S10_8CH_RX>; reset-names = "rx-m"; @@ -16421,7 +16422,7 @@ index 5519c1430cb7..fa4a7e35099e 100644 #address-cells = <3>; #size-cells = <2>; bus-range = <0x00 0x0f>; -@@ -97,11 +528,11 @@ +@@ -97,11 +528,11 @@ pcie3x4: pcie@fe150000 { "aclk_dbi", "pclk", "aux", "pipe"; device_type = "pci"; @@ -16438,7 +16439,7 @@ index 5519c1430cb7..fa4a7e35099e 100644 interrupt-names = "sys", "pmc", "msg", "legacy", "err"; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; -@@ -110,21 +541,25 @@ +@@ -110,21 +541,25 @@ pcie3x4: pcie@fe150000 { <0 0 0 3 &pcie3x4_intc 2>, <0 0 0 4 &pcie3x4_intc 3>; linux,pci-domain = <0>; @@ -16472,7 +16473,7 @@ index 5519c1430cb7..fa4a7e35099e 100644 status = "disabled"; pcie3x4_intc: legacy-interrupt-controller { -@@ -132,12 +567,12 @@ +@@ -132,12 +567,12 @@ pcie3x4_intc: legacy-interrupt-controller { #address-cells = <0>; #interrupt-cells = <1>; interrupt-parent = <&gic>; @@ -16487,7 +16488,7 @@ index 5519c1430cb7..fa4a7e35099e 100644 #address-cells = <3>; #size-cells = <2>; bus-range = <0x10 0x1f>; -@@ -148,11 +583,11 @@ +@@ -148,11 +583,11 @@ pcie3x2: pcie@fe160000 { "aclk_dbi", "pclk", "aux", "pipe"; device_type = "pci"; @@ -16504,7 +16505,7 @@ index 5519c1430cb7..fa4a7e35099e 100644 interrupt-names = "sys", "pmc", "msg", "legacy", "err"; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; -@@ -161,21 +596,25 @@ +@@ -161,21 +596,25 @@ pcie3x2: pcie@fe160000 { <0 0 0 3 &pcie3x2_intc 2>, <0 0 0 4 &pcie3x2_intc 3>; linux,pci-domain = <1>; @@ -16538,7 +16539,7 @@ index 5519c1430cb7..fa4a7e35099e 100644 status = "disabled"; pcie3x2_intc: legacy-interrupt-controller { -@@ -183,12 +622,14 @@ +@@ -183,12 +622,14 @@ pcie3x2_intc: legacy-interrupt-controller { #address-cells = <0>; #interrupt-cells = <1>; interrupt-parent = <&gic>; @@ -16555,7 +16556,7 @@ index 5519c1430cb7..fa4a7e35099e 100644 bus-range = <0x20 0x2f>; clocks = <&cru ACLK_PCIE_1L0_MSTR>, <&cru ACLK_PCIE_1L0_SLV>, <&cru ACLK_PCIE_1L0_DBI>, <&cru PCLK_PCIE_1L0>, -@@ -197,11 +638,11 @@ +@@ -197,11 +638,11 @@ pcie2x1l0: pcie@fe170000 { "aclk_dbi", "pclk", "aux", "pipe"; device_type = "pci"; @@ -16572,7 +16573,7 @@ index 5519c1430cb7..fa4a7e35099e 100644 interrupt-names = "sys", "pmc", "msg", "legacy", "err"; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; -@@ -210,23 +651,24 @@ +@@ -210,23 +651,24 @@ pcie2x1l0: pcie@fe170000 { <0 0 0 3 &pcie2x1l0_intc 2>, <0 0 0 4 &pcie2x1l0_intc 3>; linux,pci-domain = <2>; @@ -16608,7 +16609,7 @@ index 5519c1430cb7..fa4a7e35099e 100644 status = "disabled"; pcie2x1l0_intc: legacy-interrupt-controller { -@@ -234,32 +676,41 @@ +@@ -234,32 +676,41 @@ pcie2x1l0_intc: legacy-interrupt-controller { #address-cells = <0>; #interrupt-cells = <1>; interrupt-parent = <&gic>; @@ -16658,7 +16659,7 @@ index 5519c1430cb7..fa4a7e35099e 100644 status = "disabled"; mdio0: mdio { -@@ -269,60 +720,117 @@ +@@ -269,60 +720,117 @@ mdio0: mdio { }; gmac0_stmmac_axi_setup: stmmac-axi-config { @@ -16796,7 +16797,7 @@ index 5519c1430cb7..fa4a7e35099e 100644 status = "disabled"; }; -@@ -338,4 +846,78 @@ +@@ -338,4 +846,78 @@ pcie30phy: phy@fee80000 { rockchip,phy-grf = <&pcie30_phy_grf>; status = "disabled"; }; @@ -16876,7 +16877,7 @@ index 5519c1430cb7..fa4a7e35099e 100644 + }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588j.dtsi b/arch/arm64/boot/dts/rockchip/rk3588j.dtsi -index 38b9dbf38a21..7b084b273b27 100644 +index 38b9dbf38..7b084b273 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588j.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588j.dtsi @@ -5,3 +5,62 @@ @@ -16943,7 +16944,7 @@ index 38b9dbf38a21..7b084b273b27 100644 + /delete-node/ opp-j-m-950000000; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts -index 9299fa7e3e21..60f00ceb630e 100644 +index 9299fa7e3..60f00ceb6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts @@ -3,6 +3,7 @@ @@ -16954,7 +16955,7 @@ index 9299fa7e3e21..60f00ceb630e 100644 #include #include #include "rk3588s.dtsi" -@@ -11,6 +12,34 @@ +@@ -11,6 +12,34 @@ / { model = "Indiedroid Nova"; compatible = "indiedroid,nova", "rockchip,rk3588s"; @@ -16989,7 +16990,7 @@ index 9299fa7e3e21..60f00ceb630e 100644 aliases { mmc0 = &sdhci; mmc1 = &sdmmc; -@@ -109,6 +138,10 @@ +@@ -109,6 +138,10 @@ vcc5v0_usbdcin: vcc5v0-usbdcin-regulator { }; }; @@ -17000,7 +17001,7 @@ index 9299fa7e3e21..60f00ceb630e 100644 &cpu_l0 { cpu-supply = <&vdd_cpu_lit_s0>; }; -@@ -163,13 +196,13 @@ +@@ -163,13 +196,13 @@ &gpio0 { &gpio1 { gpio-line-names = /* GPIO1 A0-A7 */ @@ -17016,7 +17017,7 @@ index 9299fa7e3e21..60f00ceb630e 100644 "", "", "", "", /* GPIO1 D0-D7 */ "", "", "", "", -@@ -193,11 +226,11 @@ +@@ -193,11 +226,11 @@ &gpio3 { &gpio4 { gpio-line-names = /* GPIO4 A0-A7 */ @@ -17031,7 +17032,7 @@ index 9299fa7e3e21..60f00ceb630e 100644 /* GPIO4 C0-C7 */ "", "", "", "", "", "", "", "", -@@ -348,6 +381,12 @@ +@@ -348,6 +381,12 @@ i2s0_8ch_p0_0: endpoint { }; }; @@ -17044,7 +17045,7 @@ index 9299fa7e3e21..60f00ceb630e 100644 &pinctrl { bluetooth-pins { bt_reset: bt-reset { -@@ -366,6 +405,12 @@ +@@ -366,6 +405,12 @@ bt_wake_host: bt-wake-host { }; }; @@ -17057,7 +17058,7 @@ index 9299fa7e3e21..60f00ceb630e 100644 hym8563 { hym8563_int: hym8563-int { -@@ -394,6 +439,11 @@ +@@ -394,6 +439,11 @@ typec5v_pwren: typec5v-pwren { }; }; @@ -17069,7 +17070,7 @@ index 9299fa7e3e21..60f00ceb630e 100644 /* HS400 modes seemed to cause io errors. */ &sdhci { bus-width = <8>; -@@ -735,6 +785,24 @@ +@@ -735,6 +785,24 @@ &tsadc { status = "okay"; }; @@ -17094,7 +17095,7 @@ index 9299fa7e3e21..60f00ceb630e 100644 &uart2 { pinctrl-0 = <&uart2m0_xfer>; status = "okay"; -@@ -759,3 +827,19 @@ +@@ -759,3 +827,19 @@ bluetooth { pinctrl-names = "default"; }; }; @@ -17116,7 +17117,7 @@ index 9299fa7e3e21..60f00ceb630e 100644 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts new file mode 100644 -index 000000000000..3a57425115ac +index 000000000..3a5742511 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts @@ -0,0 +1,894 @@ @@ -18016,7 +18017,7 @@ index 000000000000..3a57425115ac +}; \ No newline at end of file diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi -index 0933652bafc3..87736c19075a 100644 +index 0933652ba..87736c190 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi @@ -4,7 +4,7 @@ @@ -18028,7 +18029,7 @@ index 0933652bafc3..87736c19075a 100644 /* * This file is auto generated by pin2dts tool, please keep these code -@@ -578,14 +578,14 @@ +@@ -578,14 +578,14 @@ hdmim0_tx0_hpd: hdmim0-tx0-hpd { hdmim0_tx0_scl: hdmim0-tx0-scl { rockchip,pins = /* hdmim0_tx0_scl */ @@ -18045,7 +18046,7 @@ index 0933652bafc3..87736c19075a 100644 }; /omit-if-no-ref/ -@@ -594,6 +594,20 @@ +@@ -594,6 +594,20 @@ hdmim0_tx1_hpd: hdmim0-tx1-hpd { /* hdmim0_tx1_hpd */ <1 RK_PA6 5 &pcfg_pull_none>; }; @@ -18066,7 +18067,7 @@ index 0933652bafc3..87736c19075a 100644 /omit-if-no-ref/ hdmim1_rx_cec: hdmim1-rx-cec { rockchip,pins = -@@ -612,14 +626,14 @@ +@@ -612,14 +626,14 @@ hdmim1_rx_hpdin: hdmim1-rx-hpdin { hdmim1_rx_scl: hdmim1-rx-scl { rockchip,pins = /* hdmim1_rx_scl */ @@ -18083,7 +18084,7 @@ index 0933652bafc3..87736c19075a 100644 }; /omit-if-no-ref/ -@@ -640,14 +654,14 @@ +@@ -640,14 +654,14 @@ hdmim1_tx0_hpd: hdmim1-tx0-hpd { hdmim1_tx0_scl: hdmim1-tx0-scl { rockchip,pins = /* hdmim1_tx0_scl */ @@ -18100,7 +18101,7 @@ index 0933652bafc3..87736c19075a 100644 }; /omit-if-no-ref/ -@@ -668,14 +682,14 @@ +@@ -668,14 +682,14 @@ hdmim1_tx1_hpd: hdmim1-tx1-hpd { hdmim1_tx1_scl: hdmim1-tx1-scl { rockchip,pins = /* hdmim1_tx1_scl */ @@ -18117,7 +18118,7 @@ index 0933652bafc3..87736c19075a 100644 }; /omit-if-no-ref/ hdmim2_rx_cec: hdmim2-rx-cec { -@@ -709,14 +723,14 @@ +@@ -709,14 +723,14 @@ hdmim2_rx_sda: hdmim2-rx-sda { hdmim2_tx0_scl: hdmim2-tx0-scl { rockchip,pins = /* hdmim2_tx0_scl */ @@ -18134,7 +18135,7 @@ index 0933652bafc3..87736c19075a 100644 }; /omit-if-no-ref/ -@@ -730,14 +744,14 @@ +@@ -730,14 +744,14 @@ hdmim2_tx1_cec: hdmim2-tx1-cec { hdmim2_tx1_scl: hdmim2-tx1-scl { rockchip,pins = /* hdmim2_tx1_scl */ @@ -18151,7 +18152,7 @@ index 0933652bafc3..87736c19075a 100644 }; /omit-if-no-ref/ -@@ -1115,25 +1129,34 @@ +@@ -1115,25 +1129,34 @@ i2c8m4_xfer: i2c8m4-xfer { }; i2s0 { @@ -18189,7 +18190,7 @@ index 0933652bafc3..87736c19075a 100644 }; /omit-if-no-ref/ -@@ -1198,21 +1221,21 @@ +@@ -1198,21 +1221,21 @@ i2s1 { i2s1m0_lrck: i2s1m0-lrck { rockchip,pins = /* i2s1m0_lrck */ @@ -18214,7 +18215,7 @@ index 0933652bafc3..87736c19075a 100644 }; /omit-if-no-ref/ -@@ -1274,21 +1297,21 @@ +@@ -1274,21 +1297,21 @@ i2s1m0_sdo3: i2s1m0-sdo3 { i2s1m1_lrck: i2s1m1-lrck { rockchip,pins = /* i2s1m1_lrck */ @@ -18239,7 +18240,7 @@ index 0933652bafc3..87736c19075a 100644 }; /omit-if-no-ref/ -@@ -1349,25 +1372,34 @@ +@@ -1349,25 +1372,34 @@ i2s1m1_sdo3: i2s1m1-sdo3 { }; i2s2 { @@ -18277,7 +18278,7 @@ index 0933652bafc3..87736c19075a 100644 }; /omit-if-no-ref/ -@@ -1386,25 +1418,34 @@ +@@ -1386,25 +1418,34 @@ i2s2m1_sdo: i2s2m1-sdo { }; i2s3 { @@ -18315,7 +18316,7 @@ index 0933652bafc3..87736c19075a 100644 }; /omit-if-no-ref/ -@@ -1805,6 +1846,15 @@ +@@ -1805,6 +1846,15 @@ pdm0m0_clk1: pdm0m0-clk1 { <1 RK_PC4 3 &pcfg_pull_none>; }; @@ -18331,7 +18332,7 @@ index 0933652bafc3..87736c19075a 100644 /omit-if-no-ref/ pdm0m0_sdi0: pdm0m0-sdi0 { rockchip,pins = -@@ -1846,6 +1896,15 @@ +@@ -1846,6 +1896,15 @@ pdm0m1_clk1: pdm0m1-clk1 { <0 RK_PC4 2 &pcfg_pull_none>; }; @@ -18347,7 +18348,7 @@ index 0933652bafc3..87736c19075a 100644 /omit-if-no-ref/ pdm0m1_sdi0: pdm0m1-sdi0 { rockchip,pins = -@@ -1890,6 +1949,15 @@ +@@ -1890,6 +1949,15 @@ pdm1m0_clk1: pdm1m0-clk1 { <4 RK_PD4 2 &pcfg_pull_none>; }; @@ -18363,7 +18364,7 @@ index 0933652bafc3..87736c19075a 100644 /omit-if-no-ref/ pdm1m0_sdi0: pdm1m0-sdi0 { rockchip,pins = -@@ -1917,6 +1985,7 @@ +@@ -1917,6 +1985,7 @@ pdm1m0_sdi3: pdm1m0-sdi3 { /* pdm1m0_sdi3 */ <4 RK_PD0 2 &pcfg_pull_none>; }; @@ -18371,7 +18372,7 @@ index 0933652bafc3..87736c19075a 100644 /omit-if-no-ref/ pdm1m1_clk: pdm1m1-clk { rockchip,pins = -@@ -1931,6 +2000,15 @@ +@@ -1931,6 +2000,15 @@ pdm1m1_clk1: pdm1m1-clk1 { <1 RK_PB3 2 &pcfg_pull_none>; }; @@ -18387,7 +18388,7 @@ index 0933652bafc3..87736c19075a 100644 /omit-if-no-ref/ pdm1m1_sdi0: pdm1m1-sdi0 { rockchip,pins = -@@ -2414,15 +2492,15 @@ +@@ -2414,15 +2492,15 @@ sdiom1_pins: sdiom1-pins { /* sdio_clk_m1 */ <3 RK_PA5 2 &pcfg_pull_none>, /* sdio_cmd_m1 */ @@ -18408,7 +18409,7 @@ index 0933652bafc3..87736c19075a 100644 }; }; -@@ -2513,97 +2591,97 @@ +@@ -2513,97 +2591,97 @@ spi0 { spi0m0_pins: spi0m0-pins { rockchip,pins = /* spi0_clk_m0 */ @@ -18526,7 +18527,7 @@ index 0933652bafc3..87736c19075a 100644 }; }; -@@ -2612,50 +2690,50 @@ +@@ -2612,50 +2690,50 @@ spi1 { spi1m1_pins: spi1m1-pins { rockchip,pins = /* spi1_clk_m1 */ @@ -18587,7 +18588,7 @@ index 0933652bafc3..87736c19075a 100644 }; }; -@@ -2664,50 +2742,50 @@ +@@ -2664,50 +2742,50 @@ spi2 { spi2m0_pins: spi2m0-pins { rockchip,pins = /* spi2_clk_m0 */ @@ -18648,7 +18649,7 @@ index 0933652bafc3..87736c19075a 100644 }; /omit-if-no-ref/ -@@ -2741,75 +2819,75 @@ +@@ -2741,75 +2819,75 @@ spi3 { spi3m1_pins: spi3m1-pins { rockchip,pins = /* spi3_clk_m1 */ @@ -18739,7 +18740,7 @@ index 0933652bafc3..87736c19075a 100644 }; }; -@@ -2818,68 +2896,68 @@ +@@ -2818,68 +2896,68 @@ spi4 { spi4m0_pins: spi4m0-pins { rockchip,pins = /* spi4_clk_m0 */ @@ -18823,7 +18824,7 @@ index 0933652bafc3..87736c19075a 100644 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts -index 8347adcbd003..23c0b8f721af 100644 +index 8347adcbd..23c0b8f72 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts @@ -5,6 +5,7 @@ @@ -18834,7 +18835,7 @@ index 8347adcbd003..23c0b8f721af 100644 #include "rk3588s.dtsi" / { -@@ -56,6 +57,17 @@ +@@ -56,6 +57,17 @@ fan: pwm-fan { #cooling-cells = <2>; }; @@ -18852,7 +18853,7 @@ index 8347adcbd003..23c0b8f721af 100644 vcc12v_dcin: vcc12v-dcin-regulator { compatible = "regulator-fixed"; regulator-name = "vcc12v_dcin"; -@@ -103,6 +115,15 @@ +@@ -103,6 +115,15 @@ vcc_5v0: vcc-5v0-regulator { vin-supply = <&vcc5v0_sys>; }; @@ -18868,7 +18869,7 @@ index 8347adcbd003..23c0b8f721af 100644 vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator { compatible = "regulator-fixed"; regulator-name = "vcc_1v1_nldo_s3"; -@@ -114,36 +135,52 @@ +@@ -114,36 +135,52 @@ vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator { }; }; @@ -18921,7 +18922,7 @@ index 8347adcbd003..23c0b8f721af 100644 }; &i2c0 { -@@ -373,6 +410,12 @@ +@@ -373,6 +410,12 @@ &sdmmc { status = "okay"; }; @@ -18934,7 +18935,7 @@ index 8347adcbd003..23c0b8f721af 100644 &spi2 { status = "okay"; assigned-clocks = <&cru CLK_SPI2>; -@@ -694,6 +737,14 @@ +@@ -694,6 +737,14 @@ regulator-state-mem { }; }; @@ -18949,7 +18950,7 @@ index 8347adcbd003..23c0b8f721af 100644 &u2phy2 { status = "okay"; }; -@@ -717,6 +768,15 @@ +@@ -717,6 +768,15 @@ &uart2 { status = "okay"; }; @@ -18965,7 +18966,7 @@ index 8347adcbd003..23c0b8f721af 100644 &usb_host0_ehci { status = "okay"; pinctrl-names = "default"; -@@ -727,6 +787,11 @@ +@@ -727,6 +787,11 @@ &usb_host0_ohci { status = "okay"; }; @@ -18977,7 +18978,7 @@ index 8347adcbd003..23c0b8f721af 100644 &usb_host1_ehci { status = "okay"; }; -@@ -734,3 +799,44 @@ +@@ -734,3 +799,44 @@ &usb_host1_ehci { &usb_host1_ohci { status = "okay"; }; @@ -19023,7 +19024,7 @@ index 8347adcbd003..23c0b8f721af 100644 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi -index 4aa516ff156d..c154a3a03f0a 100644 +index 4aa516ff1..c154a3a03 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -3,13 +3,15 @@ @@ -19046,7 +19047,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 / { compatible = "rockchip,rk3588"; -@@ -18,6 +20,365 @@ +@@ -18,6 +20,365 @@ / { #address-cells = <2>; #size-cells = <2>; @@ -19412,7 +19413,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 cpus { #address-cells = <1>; #size-cells = <0>; -@@ -62,8 +423,7 @@ +@@ -62,8 +423,7 @@ cpu_l0: cpu@0 { enable-method = "psci"; capacity-dmips-mhz = <530>; clocks = <&scmi_clk SCMI_CLK_CPUL>; @@ -19422,7 +19423,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 cpu-idle-states = <&CPU_SLEEP>; i-cache-size = <32768>; i-cache-line-size = <64>; -@@ -72,8 +432,8 @@ +@@ -72,8 +432,8 @@ cpu_l0: cpu@0 { d-cache-line-size = <64>; d-cache-sets = <128>; next-level-cache = <&l2_cache_l0>; @@ -19432,7 +19433,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 }; cpu_l1: cpu@100 { -@@ -83,6 +443,7 @@ +@@ -83,6 +443,7 @@ cpu_l1: cpu@100 { enable-method = "psci"; capacity-dmips-mhz = <530>; clocks = <&scmi_clk SCMI_CLK_CPUL>; @@ -19440,7 +19441,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 cpu-idle-states = <&CPU_SLEEP>; i-cache-size = <32768>; i-cache-line-size = <64>; -@@ -91,8 +452,6 @@ +@@ -91,8 +452,6 @@ cpu_l1: cpu@100 { d-cache-line-size = <64>; d-cache-sets = <128>; next-level-cache = <&l2_cache_l1>; @@ -19449,7 +19450,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 }; cpu_l2: cpu@200 { -@@ -102,6 +461,7 @@ +@@ -102,6 +461,7 @@ cpu_l2: cpu@200 { enable-method = "psci"; capacity-dmips-mhz = <530>; clocks = <&scmi_clk SCMI_CLK_CPUL>; @@ -19457,7 +19458,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 cpu-idle-states = <&CPU_SLEEP>; i-cache-size = <32768>; i-cache-line-size = <64>; -@@ -110,8 +470,6 @@ +@@ -110,8 +470,6 @@ cpu_l2: cpu@200 { d-cache-line-size = <64>; d-cache-sets = <128>; next-level-cache = <&l2_cache_l2>; @@ -19466,7 +19467,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 }; cpu_l3: cpu@300 { -@@ -121,6 +479,7 @@ +@@ -121,6 +479,7 @@ cpu_l3: cpu@300 { enable-method = "psci"; capacity-dmips-mhz = <530>; clocks = <&scmi_clk SCMI_CLK_CPUL>; @@ -19474,7 +19475,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 cpu-idle-states = <&CPU_SLEEP>; i-cache-size = <32768>; i-cache-line-size = <64>; -@@ -129,8 +488,6 @@ +@@ -129,8 +488,6 @@ cpu_l3: cpu@300 { d-cache-line-size = <64>; d-cache-sets = <128>; next-level-cache = <&l2_cache_l3>; @@ -19483,7 +19484,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 }; cpu_b0: cpu@400 { -@@ -140,8 +497,7 @@ +@@ -140,8 +497,7 @@ cpu_b0: cpu@400 { enable-method = "psci"; capacity-dmips-mhz = <1024>; clocks = <&scmi_clk SCMI_CLK_CPUB01>; @@ -19493,7 +19494,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 cpu-idle-states = <&CPU_SLEEP>; i-cache-size = <65536>; i-cache-line-size = <64>; -@@ -150,8 +506,8 @@ +@@ -150,8 +506,8 @@ cpu_b0: cpu@400 { d-cache-line-size = <64>; d-cache-sets = <256>; next-level-cache = <&l2_cache_b0>; @@ -19503,7 +19504,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 }; cpu_b1: cpu@500 { -@@ -161,6 +517,7 @@ +@@ -161,6 +517,7 @@ cpu_b1: cpu@500 { enable-method = "psci"; capacity-dmips-mhz = <1024>; clocks = <&scmi_clk SCMI_CLK_CPUB01>; @@ -19511,7 +19512,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 cpu-idle-states = <&CPU_SLEEP>; i-cache-size = <65536>; i-cache-line-size = <64>; -@@ -169,8 +526,6 @@ +@@ -169,8 +526,6 @@ cpu_b1: cpu@500 { d-cache-line-size = <64>; d-cache-sets = <256>; next-level-cache = <&l2_cache_b1>; @@ -19520,7 +19521,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 }; cpu_b2: cpu@600 { -@@ -180,8 +535,7 @@ +@@ -180,8 +535,7 @@ cpu_b2: cpu@600 { enable-method = "psci"; capacity-dmips-mhz = <1024>; clocks = <&scmi_clk SCMI_CLK_CPUB23>; @@ -19530,7 +19531,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 cpu-idle-states = <&CPU_SLEEP>; i-cache-size = <65536>; i-cache-line-size = <64>; -@@ -190,8 +544,8 @@ +@@ -190,8 +544,8 @@ cpu_b2: cpu@600 { d-cache-line-size = <64>; d-cache-sets = <256>; next-level-cache = <&l2_cache_b2>; @@ -19540,7 +19541,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 }; cpu_b3: cpu@700 { -@@ -201,6 +555,7 @@ +@@ -201,6 +555,7 @@ cpu_b3: cpu@700 { enable-method = "psci"; capacity-dmips-mhz = <1024>; clocks = <&scmi_clk SCMI_CLK_CPUB23>; @@ -19548,7 +19549,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 cpu-idle-states = <&CPU_SLEEP>; i-cache-size = <65536>; i-cache-line-size = <64>; -@@ -209,8 +564,6 @@ +@@ -209,8 +564,6 @@ cpu_b3: cpu@700 { d-cache-line-size = <64>; d-cache-sets = <256>; next-level-cache = <&l2_cache_b3>; @@ -19557,7 +19558,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 }; idle-states { -@@ -230,8 +583,6 @@ +@@ -230,8 +583,6 @@ l2_cache_l0: l2-cache-l0 { cache-size = <131072>; cache-line-size = <64>; cache-sets = <512>; @@ -19566,7 +19567,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 next-level-cache = <&l3_cache>; }; -@@ -240,8 +591,6 @@ +@@ -240,8 +591,6 @@ l2_cache_l1: l2-cache-l1 { cache-size = <131072>; cache-line-size = <64>; cache-sets = <512>; @@ -19575,7 +19576,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 next-level-cache = <&l3_cache>; }; -@@ -250,8 +599,6 @@ +@@ -250,8 +599,6 @@ l2_cache_l2: l2-cache-l2 { cache-size = <131072>; cache-line-size = <64>; cache-sets = <512>; @@ -19584,7 +19585,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 next-level-cache = <&l3_cache>; }; -@@ -260,8 +607,6 @@ +@@ -260,8 +607,6 @@ l2_cache_l3: l2-cache-l3 { cache-size = <131072>; cache-line-size = <64>; cache-sets = <512>; @@ -19593,7 +19594,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 next-level-cache = <&l3_cache>; }; -@@ -270,8 +615,6 @@ +@@ -270,8 +615,6 @@ l2_cache_b0: l2-cache-b0 { cache-size = <524288>; cache-line-size = <64>; cache-sets = <1024>; @@ -19602,7 +19603,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 next-level-cache = <&l3_cache>; }; -@@ -280,8 +623,6 @@ +@@ -280,8 +623,6 @@ l2_cache_b1: l2-cache-b1 { cache-size = <524288>; cache-line-size = <64>; cache-sets = <1024>; @@ -19611,7 +19612,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 next-level-cache = <&l3_cache>; }; -@@ -290,8 +631,6 @@ +@@ -290,8 +631,6 @@ l2_cache_b2: l2-cache-b2 { cache-size = <524288>; cache-line-size = <64>; cache-sets = <1024>; @@ -19620,7 +19621,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 next-level-cache = <&l3_cache>; }; -@@ -300,8 +639,6 @@ +@@ -300,8 +639,6 @@ l2_cache_b3: l2-cache-b3 { cache-size = <524288>; cache-line-size = <64>; cache-sets = <1024>; @@ -19629,7 +19630,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 next-level-cache = <&l3_cache>; }; -@@ -310,439 +647,2564 @@ +@@ -310,439 +647,2564 @@ l3_cache: l3-cache { cache-size = <3145728>; cache-line-size = <64>; cache-sets = <4096>; @@ -22538,7 +22539,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 <&cru ACLK_JPEG_DECODER_ROOT>, <&cru ACLK_IEP2P0>, <&cru HCLK_IEP2P0>, -@@ -766,470 +3228,2237 @@ +@@ -766,470 +3228,2237 @@ power-domain@RK3588_PD_VDPU { <&qos_jpeg_enc3>, <&qos_rga2_mro>, <&qos_rga2_mwo>; @@ -25008,7 +25009,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 bus-range = <0x30 0x3f>; clocks = <&cru ACLK_PCIE_1L1_MSTR>, <&cru ACLK_PCIE_1L1_SLV>, <&cru ACLK_PCIE_1L1_DBI>, <&cru PCLK_PCIE_1L1>, -@@ -1238,11 +5467,11 @@ +@@ -1238,11 +5467,11 @@ pcie2x1l1: pcie@fe180000 { "aclk_dbi", "pclk", "aux", "pipe"; device_type = "pci"; @@ -25025,7 +25026,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 interrupt-names = "sys", "pmc", "msg", "legacy", "err"; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; -@@ -1251,23 +5480,24 @@ +@@ -1251,23 +5480,24 @@ pcie2x1l1: pcie@fe180000 { <0 0 0 3 &pcie2x1l1_intc 2>, <0 0 0 4 &pcie2x1l1_intc 3>; linux,pci-domain = <3>; @@ -25061,7 +25062,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 status = "disabled"; pcie2x1l1_intc: legacy-interrupt-controller { -@@ -1275,12 +5505,14 @@ +@@ -1275,12 +5505,14 @@ pcie2x1l1_intc: legacy-interrupt-controller { #address-cells = <0>; #interrupt-cells = <1>; interrupt-parent = <&gic>; @@ -25078,7 +25079,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 bus-range = <0x40 0x4f>; clocks = <&cru ACLK_PCIE_1L2_MSTR>, <&cru ACLK_PCIE_1L2_SLV>, <&cru ACLK_PCIE_1L2_DBI>, <&cru PCLK_PCIE_1L2>, -@@ -1289,11 +5521,11 @@ +@@ -1289,11 +5521,11 @@ pcie2x1l2: pcie@fe190000 { "aclk_dbi", "pclk", "aux", "pipe"; device_type = "pci"; @@ -25095,7 +25096,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 interrupt-names = "sys", "pmc", "msg", "legacy", "err"; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; -@@ -1302,23 +5534,24 @@ +@@ -1302,23 +5534,24 @@ pcie2x1l2: pcie@fe190000 { <0 0 0 3 &pcie2x1l2_intc 2>, <0 0 0 4 &pcie2x1l2_intc 3>; linux,pci-domain = <4>; @@ -25131,7 +25132,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 status = "disabled"; pcie2x1l2_intc: legacy-interrupt-controller { -@@ -1326,32 +5559,41 @@ +@@ -1326,32 +5559,41 @@ pcie2x1l2_intc: legacy-interrupt-controller { #address-cells = <0>; #interrupt-cells = <1>; interrupt-parent = <&gic>; @@ -25181,7 +25182,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 status = "disabled"; mdio1: mdio { -@@ -1361,74 +5603,69 @@ +@@ -1361,74 +5603,69 @@ mdio1: mdio { }; gmac1_stmmac_axi_setup: stmmac-axi-config { @@ -25281,7 +25282,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 clocks = <&scmi_clk SCMI_HCLK_SD>, <&scmi_clk SCMI_CCLK_SD>, <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>; clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; -@@ -1442,8 +5679,8 @@ +@@ -1442,8 +5679,8 @@ sdmmc: mmc@fe2c0000 { sdio: mmc@fe2d0000 { compatible = "rockchip,rk3588-dw-mshc", "rockchip,rk3288-dw-mshc"; @@ -25292,7 +25293,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 clocks = <&cru HCLK_SDIO>, <&cru CCLK_SRC_SDIO>, <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>; clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; -@@ -1456,30 +5693,50 @@ +@@ -1456,30 +5693,50 @@ sdio: mmc@fe2d0000 { }; sdhci: mmc@fe2e0000 { @@ -25350,7 +25351,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 clocks = <&cru MCLK_I2S0_8CH_TX>, <&cru MCLK_I2S0_8CH_RX>, <&cru HCLK_I2S0_8CH>; clock-names = "mclk_tx", "mclk_rx", "hclk"; assigned-clocks = <&cru CLK_I2S0_8CH_TX_SRC>, <&cru CLK_I2S0_8CH_RX_SRC>; -@@ -1490,17 +5747,16 @@ +@@ -1490,17 +5747,16 @@ i2s0_8ch: i2s@fe470000 { resets = <&cru SRST_M_I2S0_8CH_TX>, <&cru SRST_M_I2S0_8CH_RX>; reset-names = "tx-m", "rx-m"; rockchip,trcm-sync-tx-only; @@ -25374,7 +25375,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 #sound-dai-cells = <0>; status = "disabled"; }; -@@ -1508,7 +5764,7 @@ +@@ -1508,7 +5764,7 @@ &i2s0_sdo2 i2s1_8ch: i2s@fe480000 { compatible = "rockchip,rk3588-i2s-tdm"; reg = <0x0 0xfe480000 0x0 0x1000>; @@ -25383,7 +25384,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 clocks = <&cru MCLK_I2S1_8CH_TX>, <&cru MCLK_I2S1_8CH_RX>, <&cru HCLK_I2S1_8CH>; clock-names = "mclk_tx", "mclk_rx", "hclk"; dmas = <&dmac0 2>, <&dmac0 3>; -@@ -1534,7 +5790,7 @@ +@@ -1534,7 +5790,7 @@ &i2s1m0_sdo2 i2s2_2ch: i2s@fe490000 { compatible = "rockchip,rk3588-i2s", "rockchip,rk3066-i2s"; reg = <0x0 0xfe490000 0x0 0x1000>; @@ -25392,7 +25393,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 clocks = <&cru MCLK_I2S2_2CH>, <&cru HCLK_I2S2_2CH>; clock-names = "i2s_clk", "i2s_hclk"; assigned-clocks = <&cru CLK_I2S2_2CH_SRC>; -@@ -1543,11 +5799,12 @@ +@@ -1543,11 +5799,12 @@ i2s2_2ch: i2s@fe490000 { dma-names = "tx", "rx"; power-domains = <&power RK3588_PD_AUDIO>; rockchip,trcm-sync-tx-only; @@ -25409,7 +25410,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 #sound-dai-cells = <0>; status = "disabled"; }; -@@ -1555,7 +5812,7 @@ +@@ -1555,7 +5812,7 @@ &i2s2m1_sdi i2s3_2ch: i2s@fe4a0000 { compatible = "rockchip,rk3588-i2s", "rockchip,rk3066-i2s"; reg = <0x0 0xfe4a0000 0x0 0x1000>; @@ -25418,7 +25419,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 clocks = <&cru MCLK_I2S3_2CH>, <&cru HCLK_I2S3_2CH>; clock-names = "i2s_clk", "i2s_hclk"; assigned-clocks = <&cru CLK_I2S3_2CH_SRC>; -@@ -1564,74 +5821,228 @@ +@@ -1564,74 +5821,228 @@ i2s3_2ch: i2s@fe4a0000 { dma-names = "tx", "rx"; power-domains = <&power RK3588_PD_AUDIO>; rockchip,trcm-sync-tx-only; @@ -25679,7 +25680,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 }; i2c1: i2c@fea90000 { -@@ -1639,9 +6050,11 @@ +@@ -1639,9 +6050,11 @@ i2c1: i2c@fea90000 { reg = <0x0 0xfea90000 0x0 0x1000>; clocks = <&cru CLK_I2C1>, <&cru PCLK_I2C1>; clock-names = "i2c", "pclk"; @@ -25693,7 +25694,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 #address-cells = <1>; #size-cells = <0>; status = "disabled"; -@@ -1652,9 +6065,11 @@ +@@ -1652,9 +6065,11 @@ i2c2: i2c@feaa0000 { reg = <0x0 0xfeaa0000 0x0 0x1000>; clocks = <&cru CLK_I2C2>, <&cru PCLK_I2C2>; clock-names = "i2c", "pclk"; @@ -25707,7 +25708,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 #address-cells = <1>; #size-cells = <0>; status = "disabled"; -@@ -1665,9 +6080,11 @@ +@@ -1665,9 +6080,11 @@ i2c3: i2c@feab0000 { reg = <0x0 0xfeab0000 0x0 0x1000>; clocks = <&cru CLK_I2C3>, <&cru PCLK_I2C3>; clock-names = "i2c", "pclk"; @@ -25721,7 +25722,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 #address-cells = <1>; #size-cells = <0>; status = "disabled"; -@@ -1678,9 +6095,11 @@ +@@ -1678,9 +6095,11 @@ i2c4: i2c@feac0000 { reg = <0x0 0xfeac0000 0x0 0x1000>; clocks = <&cru CLK_I2C4>, <&cru PCLK_I2C4>; clock-names = "i2c", "pclk"; @@ -25735,7 +25736,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 #address-cells = <1>; #size-cells = <0>; status = "disabled"; -@@ -1691,385 +6110,394 @@ +@@ -1691,385 +6110,394 @@ i2c5: i2c@fead0000 { reg = <0x0 0xfead0000 0x0 0x1000>; clocks = <&cru CLK_I2C5>, <&cru PCLK_I2C5>; clock-names = "i2c", "pclk"; @@ -26248,7 +26249,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 #io-channel-cells = <1>; clocks = <&cru CLK_SARADC>, <&cru PCLK_SARADC>; clock-names = "saradc", "apb_pclk"; -@@ -2078,14 +6506,44 @@ +@@ -2078,14 +6506,44 @@ saradc: adc@fec10000 { status = "disabled"; }; @@ -26295,7 +26296,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 #address-cells = <1>; #size-cells = <0>; status = "disabled"; -@@ -2096,9 +6554,11 @@ +@@ -2096,9 +6554,11 @@ i2c7: i2c@fec90000 { reg = <0x0 0xfec90000 0x0 0x1000>; clocks = <&cru CLK_I2C7>, <&cru PCLK_I2C7>; clock-names = "i2c", "pclk"; @@ -26309,7 +26310,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 #address-cells = <1>; #size-cells = <0>; status = "disabled"; -@@ -2109,106 +6569,271 @@ +@@ -2109,106 +6569,271 @@ i2c8: i2c@feca0000 { reg = <0x0 0xfeca0000 0x0 0x1000>; clocks = <&cru CLK_I2C8>, <&cru PCLK_I2C8>; clock-names = "i2c", "pclk"; @@ -26618,7 +26619,7 @@ index 4aa516ff156d..c154a3a03f0a 100644 rockchip,pipe-grf = <&php_grf>; rockchip,pipe-phy-grf = <&pipe_phy0_grf>; status = "disabled"; -@@ -2217,91 +6842,105 @@ +@@ -2217,91 +6842,105 @@ combphy0_ps: phy@fee00000 { combphy2_psu: phy@fee20000 { compatible = "rockchip,rk3588-naneng-combphy"; reg = <0x0 0xfee20000 0x0 0x100>; @@ -26742,10 +26743,10 @@ index 4aa516ff156d..c154a3a03f0a 100644 }; }; diff --git a/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi b/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi -index 5c645437b507..72d644575cf9 100644 +index 5c645437b..72d644575 100644 --- a/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi +++ b/arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi -@@ -332,13 +332,84 @@ +@@ -332,13 +332,84 @@ pcfg_pull_none_drv_level_0_smt: pcfg-pull-none-drv-level-0-smt { input-schmitt-enable; }; @@ -26832,7 +26833,7 @@ index 5c645437b507..72d644575cf9 100644 }; diff --git a/arch/arm64/include/asm/system_info.h b/arch/arm64/include/asm/system_info.h new file mode 100644 -index 000000000000..a82fe791b2f6 +index 000000000..a82fe791b --- /dev/null +++ b/arch/arm64/include/asm/system_info.h @@ -0,0 +1,14 @@ @@ -26851,7 +26852,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 98fda8500535..2078b98b34c6 100644 +index 98fda8500..2078b98b3 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -25,6 +25,12 @@ @@ -26878,7 +26879,7 @@ index 98fda8500535..2078b98b34c6 100644 } diff --git a/arch/arm64/mm/Makefile b/arch/arm64/mm/Makefile -index dbd1bc95967d..d29d7ef589a2 100644 +index dbd1bc959..d29d7ef58 100644 --- a/arch/arm64/mm/Makefile +++ b/arch/arm64/mm/Makefile @@ -14,3 +14,5 @@ KASAN_SANITIZE_physaddr.o += n @@ -26888,7 +26889,7 @@ index dbd1bc95967d..d29d7ef589a2 100644 + +obj-$(CONFIG_ROCKCHIP_ARM64_ALIGN_FAULT_FIX) += fixup_fault.o diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c -index 2e5d1e238af9..4b949cb32189 100644 +index 2e5d1e238..4b949cb32 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -713,9 +713,17 @@ static int __kprobes do_translation_fault(unsigned long far, @@ -26911,7 +26912,7 @@ index 2e5d1e238af9..4b949cb32189 100644 return do_compat_alignment_fixup(far, regs); diff --git a/arch/arm64/mm/fixup_fault.S b/arch/arm64/mm/fixup_fault.S new file mode 100644 -index 000000000000..0e94564ae68d +index 000000000..0e94564ae --- /dev/null +++ b/arch/arm64/mm/fixup_fault.S @@ -0,0 +1,3714 @@ @@ -30630,7 +30631,7 @@ index 000000000000..0e94564ae68d + .word 2 + .align 3 diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c -index 8a0f8604348b..6cd59a1e9f5d 100644 +index 8a0f86043..6cd59a1e9 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -31,6 +31,7 @@ @@ -30650,7 +30651,7 @@ index 8a0f8604348b..6cd59a1e9f5d 100644 /* * request_standard_resources() depends on crashkernel's memory being diff --git a/drivers/Kconfig b/drivers/Kconfig -index fcb8151bbf6e..6f055f3f921c 100644 +index fcb8151bb..6f055f3f9 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -247,4 +247,15 @@ source "drivers/cdx/Kconfig" @@ -30670,7 +30671,7 @@ index fcb8151bbf6e..6f055f3f921c 100644 +source "drivers/rk_nand/Kconfig" endmenu diff --git a/drivers/Makefile b/drivers/Makefile -index b341771cd6da..cb85c024401e 100644 +index b341771cd..cb85c0244 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -190,6 +190,7 @@ obj-$(CONFIG_NVMEM) += nvmem/ @@ -30691,7 +30692,7 @@ index b341771cd6da..cb85c024401e 100644 +obj-$(CONFIG_TZDRIVER) += tzdriver/ +obj-$(CONFIG_RK_NAND) += rk_nand/ diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index 81fc63f6b008..07f5021037dc 100644 +index 81fc63f6b..07f502103 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -13,10 +13,12 @@ @@ -30741,7 +30742,7 @@ index 81fc63f6b008..07f5021037dc 100644 }; MODULE_DEVICE_TABLE(of, ahci_of_match); diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c -index f1263364fa97..2b7080560c23 100644 +index f1263364f..2b7080560 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -1519,7 +1519,7 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class, @@ -30754,7 +30755,7 @@ index f1263364fa97..2b7080560c23 100644 return 0; diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c -index a26367e9fb19..72c2aa840cb4 100644 +index a26367e9f..72c2aa840 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c @@ -149,6 +149,11 @@ static void hci_uart_write_work(struct work_struct *work) @@ -30771,7 +30772,7 @@ index a26367e9fb19..72c2aa840cb4 100644 */ diff --git a/drivers/bluetooth/rtk_btusb.c b/drivers/bluetooth/rtk_btusb.c new file mode 100644 -index 000000000000..5db188416009 +index 000000000..5db188416 --- /dev/null +++ b/drivers/bluetooth/rtk_btusb.c @@ -0,0 +1,4563 @@ @@ -35340,7 +35341,7 @@ index 000000000000..5db188416009 +MODULE_LICENSE("GPL"); diff --git a/drivers/bluetooth/rtk_btusb.h b/drivers/bluetooth/rtk_btusb.h new file mode 100644 -index 000000000000..7f6222ebba59 +index 000000000..7f6222ebb --- /dev/null +++ b/drivers/bluetooth/rtk_btusb.h @@ -0,0 +1,759 @@ @@ -36104,7 +36105,7 @@ index 000000000000..7f6222ebba59 + +#endif /* CONFIG_BLUEDROID */ diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig -index 8de74dcfa18c..8ce7bc03eca1 100644 +index 8de74dcfa..8ce7bc03e 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -538,6 +538,19 @@ config HW_RANDOM_XIPHERA @@ -36128,7 +36129,7 @@ index 8de74dcfa18c..8ce7bc03eca1 100644 tristate "Arm SMCCC TRNG firmware interface support" depends on HAVE_ARM_SMCCC_DISCOVERY diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile -index 32549a1186dc..fd3bbf6e08e1 100644 +index 32549a118..fd3bbf6e0 100644 --- a/drivers/char/hw_random/Makefile +++ b/drivers/char/hw_random/Makefile @@ -35,6 +35,7 @@ obj-$(CONFIG_HW_RANDOM_IPROC_RNG200) += iproc-rng200.o @@ -36141,7 +36142,7 @@ index 32549a1186dc..fd3bbf6e08e1 100644 obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o diff --git a/drivers/char/hw_random/rockchip-rng.c b/drivers/char/hw_random/rockchip-rng.c new file mode 100644 -index 000000000000..f7a3a7f52cca +index 000000000..f7a3a7f52 --- /dev/null +++ b/drivers/char/hw_random/rockchip-rng.c @@ -0,0 +1,574 @@ @@ -36720,7 +36721,7 @@ index 000000000000..f7a3a7f52cca +MODULE_AUTHOR("Lin Jinhan "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig -index c30099866174..f202d0d246df 100644 +index c30099866..f202d0d24 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -33,6 +33,13 @@ menuconfig COMMON_CLK @@ -36747,7 +36748,7 @@ index c30099866174..f202d0d246df 100644 This driver supports RK805, RK809 and RK817, RK808 and RK818 crystal oscillator clock. These multi-function devices have two fixed-rate oscillators, clocked at 32KHz each. diff --git a/drivers/clk/clk-fractional-divider.c b/drivers/clk/clk-fractional-divider.c -index 479297763e70..8ba75101bcb5 100644 +index 479297763..8ba75101b 100644 --- a/drivers/clk/clk-fractional-divider.c +++ b/drivers/clk/clk-fractional-divider.c @@ -150,7 +150,7 @@ static long clk_fd_round_rate(struct clk_hw *hw, unsigned long rate, @@ -36813,7 +36814,7 @@ index 479297763e70..8ba75101bcb5 100644 clk_fd_writel(fd, val); diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c -index 64283807600b..5e3c95eed515 100644 +index 642838076..5e3c95eed 100644 --- a/drivers/clk/clk-gate.c +++ b/drivers/clk/clk-gate.c @@ -14,6 +14,10 @@ @@ -36838,7 +36839,7 @@ index 64283807600b..5e3c95eed515 100644 if (gate->lock) diff --git a/drivers/clk/clk-rk808.c b/drivers/clk/clk-rk808.c -index f7412b137e5e..32f833d732ed 100644 +index f7412b137..32f833d73 100644 --- a/drivers/clk/clk-rk808.c +++ b/drivers/clk/clk-rk808.c @@ -12,9 +12,10 @@ @@ -36952,7 +36953,7 @@ index f7412b137e5e..32f833d732ed 100644 return ret; diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c -index 473563bc7496..a5f451b5078c 100644 +index 473563bc7..a5f451b50 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -5431,3 +5431,274 @@ void __init of_clk_init(const struct of_device_id *matches) @@ -37231,7 +37232,7 @@ index 473563bc7496..a5f451b5078c 100644 +late_initcall_sync(clk_create_procfs); +#endif diff --git a/drivers/clk/rockchip/Kconfig b/drivers/clk/rockchip/Kconfig -index 9aad86925cd2..3a1840f5f0e2 100644 +index 9aad86925..3a1840f5f 100644 --- a/drivers/clk/rockchip/Kconfig +++ b/drivers/clk/rockchip/Kconfig @@ -2,7 +2,7 @@ @@ -37478,7 +37479,7 @@ index 9aad86925cd2..3a1840f5f0e2 100644 + endif diff --git a/drivers/clk/rockchip/Makefile b/drivers/clk/rockchip/Makefile -index 36894f6a7022..d6aafb106468 100644 +index 36894f6a7..d6aafb106 100644 --- a/drivers/clk/rockchip/Makefile +++ b/drivers/clk/rockchip/Makefile @@ -4,20 +4,27 @@ @@ -37522,7 +37523,7 @@ index 36894f6a7022..d6aafb106468 100644 -obj-$(CONFIG_CLK_RK3588) += clk-rk3588.o rst-rk3588.o +obj-$(CONFIG_CLK_RK3588) += clk-rk3588.o diff --git a/drivers/clk/rockchip/clk-cpu.c b/drivers/clk/rockchip/clk-cpu.c -index 6ea7fba9f9e5..9a9beeb8cfbc 100644 +index 6ea7fba9f..9a9beeb8c 100644 --- a/drivers/clk/rockchip/clk-cpu.c +++ b/drivers/clk/rockchip/clk-cpu.c @@ -51,6 +51,7 @@ @@ -37808,7 +37809,7 @@ index 6ea7fba9f9e5..9a9beeb8cfbc 100644 +} diff --git a/drivers/clk/rockchip/clk-dclk-divider.c b/drivers/clk/rockchip/clk-dclk-divider.c new file mode 100644 -index 000000000000..88cf7ab82a57 +index 000000000..88cf7ab82 --- /dev/null +++ b/drivers/clk/rockchip/clk-dclk-divider.c @@ -0,0 +1,168 @@ @@ -37981,7 +37982,7 @@ index 000000000000..88cf7ab82a57 + return ERR_PTR(-ENOMEM); +} diff --git a/drivers/clk/rockchip/clk-ddr.c b/drivers/clk/rockchip/clk-ddr.c -index 86718c54e56b..46df75f1a29c 100644 +index 86718c54e..46df75f1a 100644 --- a/drivers/clk/rockchip/clk-ddr.c +++ b/drivers/clk/rockchip/clk-ddr.c @@ -8,8 +8,14 @@ @@ -38165,7 +38166,7 @@ index 86718c54e56b..46df75f1a29c 100644 ddrclk->mux_offset = mux_offset; ddrclk->mux_shift = mux_shift; diff --git a/drivers/clk/rockchip/clk-half-divider.c b/drivers/clk/rockchip/clk-half-divider.c -index 64f7faad2148..9e0d0fc00f8b 100644 +index 64f7faad2..9e0d0fc00 100644 --- a/drivers/clk/rockchip/clk-half-divider.c +++ b/drivers/clk/rockchip/clk-half-divider.c @@ -14,9 +14,9 @@ static bool _is_best_half_div(unsigned long rate, unsigned long now, @@ -38267,7 +38268,7 @@ index 64f7faad2148..9e0d0fc00f8b 100644 div->lock = lock; diff --git a/drivers/clk/rockchip/clk-link.c b/drivers/clk/rockchip/clk-link.c new file mode 100644 -index 000000000000..78ff9b53c165 +index 000000000..78ff9b53c --- /dev/null +++ b/drivers/clk/rockchip/clk-link.c @@ -0,0 +1,244 @@ @@ -38517,7 +38518,7 @@ index 000000000000..78ff9b53c165 +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-out.c b/drivers/clk/rockchip/clk-out.c new file mode 100644 -index 000000000000..22dcd98fbbef +index 000000000..22dcd98fb --- /dev/null +++ b/drivers/clk/rockchip/clk-out.c @@ -0,0 +1,99 @@ @@ -38621,7 +38622,7 @@ index 000000000000..22dcd98fbbef +MODULE_LICENSE("GPL"); +MODULE_DEVICE_TABLE(of, rockchip_clk_out_match); diff --git a/drivers/clk/rockchip/clk-pll.c b/drivers/clk/rockchip/clk-pll.c -index 2d42eb628926..8aa9c30147c9 100644 +index 2d42eb628..8aa9c3014 100644 --- a/drivers/clk/rockchip/clk-pll.c +++ b/drivers/clk/rockchip/clk-pll.c @@ -15,6 +15,9 @@ @@ -40076,7 +40077,7 @@ index 2d42eb628926..8aa9c30147c9 100644 +#endif /* CONFIG_ROCKCHIP_CLK_BOOST */ diff --git a/drivers/clk/rockchip/clk-pvtm.c b/drivers/clk/rockchip/clk-pvtm.c new file mode 100644 -index 000000000000..c748589dd922 +index 000000000..c748589dd --- /dev/null +++ b/drivers/clk/rockchip/clk-pvtm.c @@ -0,0 +1,311 @@ @@ -40392,7 +40393,7 @@ index 000000000000..c748589dd922 +MODULE_DESCRIPTION("Rockchip Clock Pvtm Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/clk/rockchip/clk-px30.c b/drivers/clk/rockchip/clk-px30.c -index b58619eb412b..d76aaf04b3e7 100644 +index b58619eb4..d76aaf04b 100644 --- a/drivers/clk/rockchip/clk-px30.c +++ b/drivers/clk/rockchip/clk-px30.c @@ -6,8 +6,11 @@ @@ -40944,7 +40945,7 @@ index b58619eb412b..d76aaf04b3e7 100644 +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rk1808.c b/drivers/clk/rockchip/clk-rk1808.c new file mode 100644 -index 000000000000..e177a3dd634c +index 000000000..e177a3dd6 --- /dev/null +++ b/drivers/clk/rockchip/clk-rk1808.c @@ -0,0 +1,1249 @@ @@ -42198,7 +42199,7 @@ index 000000000000..e177a3dd634c +MODULE_DESCRIPTION("Rockchip RK1808 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3036.c b/drivers/clk/rockchip/clk-rk3036.c -index d644bc155ec6..ed05eb6c51f3 100644 +index d644bc155..ed05eb6c5 100644 --- a/drivers/clk/rockchip/clk-rk3036.c +++ b/drivers/clk/rockchip/clk-rk3036.c @@ -9,8 +9,10 @@ @@ -42500,7 +42501,7 @@ index d644bc155ec6..ed05eb6c51f3 100644 +MODULE_DESCRIPTION("Rockchip RK3036 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3128.c b/drivers/clk/rockchip/clk-rk3128.c -index 75071e0cd321..1b1111e88089 100644 +index 75071e0cd..1b1111e88 100644 --- a/drivers/clk/rockchip/clk-rk3128.c +++ b/drivers/clk/rockchip/clk-rk3128.c @@ -6,8 +6,11 @@ @@ -42831,7 +42832,7 @@ index 75071e0cd321..1b1111e88089 100644 +MODULE_DESCRIPTION("Rockchip RK3128 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c -index 9c8af4d1dae0..d891b80d6c73 100644 +index 9c8af4d1d..d891b80d6 100644 --- a/drivers/clk/rockchip/clk-rk3188.c +++ b/drivers/clk/rockchip/clk-rk3188.c @@ -5,10 +5,12 @@ @@ -43118,7 +43119,7 @@ index 9c8af4d1dae0..d891b80d6c73 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 a24a35553e13..18c94343b6b6 100644 +index a24a35553..18c94343b 100644 --- a/drivers/clk/rockchip/clk-rk3228.c +++ b/drivers/clk/rockchip/clk-rk3228.c @@ -7,8 +7,10 @@ @@ -43520,7 +43521,7 @@ index a24a35553e13..18c94343b6b6 100644 +MODULE_DESCRIPTION("Rockchip RK3228 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c -index baa5aebd3277..f9c4678fcd73 100644 +index baa5aebd3..f9c4678fc 100644 --- a/drivers/clk/rockchip/clk-rk3288.c +++ b/drivers/clk/rockchip/clk-rk3288.c @@ -6,11 +6,14 @@ @@ -43991,7 +43992,7 @@ index baa5aebd3277..f9c4678fcd73 100644 +MODULE_DESCRIPTION("Rockchip RK3288 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3308.c b/drivers/clk/rockchip/clk-rk3308.c -index db3396c3e6e9..6a8e38f11808 100644 +index db3396c3e..6a8e38f11 100644 --- a/drivers/clk/rockchip/clk-rk3308.c +++ b/drivers/clk/rockchip/clk-rk3308.c @@ -8,6 +8,9 @@ @@ -44275,7 +44276,7 @@ index db3396c3e6e9..6a8e38f11808 100644 +MODULE_DESCRIPTION("Rockchip RK3308 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3328.c b/drivers/clk/rockchip/clk-rk3328.c -index 267ab54937d3..8ec63aaae4f7 100644 +index 267ab5493..8ec63aaae 100644 --- a/drivers/clk/rockchip/clk-rk3328.c +++ b/drivers/clk/rockchip/clk-rk3328.c @@ -6,8 +6,10 @@ @@ -44720,7 +44721,7 @@ index 267ab54937d3..8ec63aaae4f7 100644 +MODULE_DESCRIPTION("Rockchip RK3328 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rk3368.c b/drivers/clk/rockchip/clk-rk3368.c -index 2c50cc2cc6db..3ddff548ecba 100644 +index 2c50cc2cc..3ddff548e 100644 --- a/drivers/clk/rockchip/clk-rk3368.c +++ b/drivers/clk/rockchip/clk-rk3368.c @@ -5,8 +5,10 @@ @@ -45048,7 +45049,7 @@ index 2c50cc2cc6db..3ddff548ecba 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 9ebd6c451b3d..e1b6c526720f 100644 +index 9ebd6c451..e1b6c5267 100644 --- a/drivers/clk/rockchip/clk-rk3399.c +++ b/drivers/clk/rockchip/clk-rk3399.c @@ -105,25 +105,95 @@ static struct rockchip_pll_rate_table rk3399_pll_rates[] = { @@ -46276,7 +46277,7 @@ index 9ebd6c451b3d..e1b6c526720f 100644 +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rk3528.c b/drivers/clk/rockchip/clk-rk3528.c new file mode 100644 -index 000000000000..1b14cd57be0a +index 000000000..1b14cd57b --- /dev/null +++ b/drivers/clk/rockchip/clk-rk3528.c @@ -0,0 +1,1174 @@ @@ -47456,7 +47457,7 @@ index 000000000000..1b14cd57be0a + diff --git a/drivers/clk/rockchip/clk-rk3562.c b/drivers/clk/rockchip/clk-rk3562.c new file mode 100644 -index 000000000000..3c6f78fecfa0 +index 000000000..3c6f78fec --- /dev/null +++ b/drivers/clk/rockchip/clk-rk3562.c @@ -0,0 +1,1134 @@ @@ -48595,7 +48596,7 @@ index 000000000000..3c6f78fecfa0 +MODULE_ALIAS("platform:clk-rk3562"); +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rk3568.c b/drivers/clk/rockchip/clk-rk3568.c -index db713e1526cd..3e6955066525 100644 +index db713e152..3e6955066 100644 --- a/drivers/clk/rockchip/clk-rk3568.c +++ b/drivers/clk/rockchip/clk-rk3568.c @@ -7,13 +7,21 @@ @@ -49195,7 +49196,7 @@ index db713e1526cd..3e6955066525 100644 +MODULE_ALIAS("platform:clk-rk3568"); +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rk3588.c b/drivers/clk/rockchip/clk-rk3588.c -index 6994165e0395..c297e4e1e9db 100644 +index 6994165e0..c297e4e1e 100644 --- a/drivers/clk/rockchip/clk-rk3588.c +++ b/drivers/clk/rockchip/clk-rk3588.c @@ -5,37 +5,18 @@ @@ -49940,7 +49941,7 @@ index 6994165e0395..c297e4e1e9db 100644 +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rv1106.c b/drivers/clk/rockchip/clk-rv1106.c new file mode 100644 -index 000000000000..0833bf2adb8b +index 000000000..0833bf2ad --- /dev/null +++ b/drivers/clk/rockchip/clk-rv1106.c @@ -0,0 +1,1280 @@ @@ -51225,7 +51226,7 @@ index 000000000000..0833bf2adb8b +MODULE_LICENSE("GPL"); +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk-rv1108.c b/drivers/clk/rockchip/clk-rv1108.c -index 5f49af3c970a..0a93b93338ba 100644 +index 5f49af3c9..0a93b9333 100644 --- a/drivers/clk/rockchip/clk-rv1108.c +++ b/drivers/clk/rockchip/clk-rv1108.c @@ -7,8 +7,10 @@ @@ -51458,7 +51459,7 @@ index 5f49af3c970a..0a93b93338ba 100644 +MODULE_DESCRIPTION("Rockchip RV1108 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk-rv1126.c b/drivers/clk/rockchip/clk-rv1126.c -index fc19c5522490..62b204d89101 100644 +index fc19c5522..62b204d89 100644 --- a/drivers/clk/rockchip/clk-rv1126.c +++ b/drivers/clk/rockchip/clk-rv1126.c @@ -8,7 +8,7 @@ @@ -52425,7 +52426,7 @@ index fc19c5522490..62b204d89101 100644 +MODULE_DESCRIPTION("Rockchip RV1126 Clock Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c -index 4059d9365ae6..96984dea0bc9 100644 +index 4059d9365..96984dea0 100644 --- a/drivers/clk/rockchip/clk.c +++ b/drivers/clk/rockchip/clk.c @@ -21,10 +21,15 @@ @@ -52787,7 +52788,7 @@ index 4059d9365ae6..96984dea0bc9 100644 +EXPORT_SYMBOL_GPL(rockchip_clk_disable_unused); +#endif /* MODULE */ diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h -index 758ebaf2236b..82345742cb61 100644 +index 758ebaf22..82345742c 100644 --- a/drivers/clk/rockchip/clk.h +++ b/drivers/clk/rockchip/clk.h @@ -19,6 +19,7 @@ @@ -53327,7 +53328,7 @@ index 758ebaf2236b..82345742cb61 100644 #endif diff --git a/drivers/clk/rockchip/regmap/Kconfig b/drivers/clk/rockchip/regmap/Kconfig new file mode 100644 -index 000000000000..65f691bc4141 +index 000000000..65f691bc4 --- /dev/null +++ b/drivers/clk/rockchip/regmap/Kconfig @@ -0,0 +1,16 @@ @@ -53349,7 +53350,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 100644 -index 000000000000..18d075d093d9 +index 000000000..18d075d09 --- /dev/null +++ b/drivers/clk/rockchip/regmap/Makefile @@ -0,0 +1,13 @@ @@ -53368,7 +53369,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 100644 -index 000000000000..43d2b9a45aca +index 000000000..43d2b9a45 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-composite.c @@ -0,0 +1,400 @@ @@ -53774,7 +53775,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 100644 -index 000000000000..d57f2c7f8350 +index 000000000..d57f2c7f8 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-divider.c @@ -0,0 +1,117 @@ @@ -53897,7 +53898,7 @@ index 000000000000..d57f2c7f8350 +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_divider); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c b/drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c new file mode 100644 -index 000000000000..1acbc16e7aae +index 000000000..1acbc16e7 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-fractional-divider.c @@ -0,0 +1,167 @@ @@ -54070,7 +54071,7 @@ index 000000000000..1acbc16e7aae +EXPORT_SYMBOL_GPL(devm_clk_regmap_register_fractional_divider); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-gate.c b/drivers/clk/rockchip/regmap/clk-regmap-gate.c new file mode 100644 -index 000000000000..36549b912fa2 +index 000000000..36549b912 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-gate.c @@ -0,0 +1,82 @@ @@ -54158,7 +54159,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 100644 -index 000000000000..eb37b5f9503c +index 000000000..eb37b5f95 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-mux.c @@ -0,0 +1,81 @@ @@ -54245,7 +54246,7 @@ index 000000000000..eb37b5f9503c +MODULE_LICENSE("GPL"); diff --git a/drivers/clk/rockchip/regmap/clk-regmap-pll.c b/drivers/clk/rockchip/regmap/clk-regmap-pll.c new file mode 100644 -index 000000000000..24ad7eda9d94 +index 000000000..24ad7eda9 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap-pll.c @@ -0,0 +1,363 @@ @@ -54614,7 +54615,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 100644 -index 000000000000..4626e1982beb +index 000000000..4626e1982 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-regmap.h @@ -0,0 +1,308 @@ @@ -54928,7 +54929,7 @@ index 000000000000..4626e1982beb +#endif diff --git a/drivers/clk/rockchip/regmap/clk-rk618.c b/drivers/clk/rockchip/regmap/clk-rk618.c new file mode 100644 -index 000000000000..c780f502b354 +index 000000000..c780f502b --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-rk618.c @@ -0,0 +1,408 @@ @@ -55342,7 +55343,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 100644 -index 000000000000..7f501db660e0 +index 000000000..7f501db66 --- /dev/null +++ b/drivers/clk/rockchip/regmap/clk-rk628.c @@ -0,0 +1,609 @@ @@ -55957,7 +55958,7 @@ index 000000000000..7f501db660e0 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/clk/rockchip/rst-rk3588.c b/drivers/clk/rockchip/rst-rk3588.c deleted file mode 100644 -index e855bb8d5413..000000000000 +index e855bb8d5..000000000 --- a/drivers/clk/rockchip/rst-rk3588.c +++ /dev/null @@ -1,857 +0,0 @@ @@ -56819,7 +56820,7 @@ index e855bb8d5413..000000000000 - ROCKCHIP_SOFTRST_HIWORD_MASK); -} diff --git a/drivers/clk/rockchip/softrst.c b/drivers/clk/rockchip/softrst.c -index fd56aaefe6d1..5d07266745b8 100644 +index fd56aaefe..5d0726674 100644 --- a/drivers/clk/rockchip/softrst.c +++ b/drivers/clk/rockchip/softrst.c @@ -12,7 +12,6 @@ @@ -56902,7 +56903,7 @@ index fd56aaefe6d1..5d07266745b8 100644 -EXPORT_SYMBOL_GPL(rockchip_register_softrst_lut); +EXPORT_SYMBOL_GPL(rockchip_register_softrst); diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig -index 0ba0dc4ecf06..93ad1b7180ed 100644 +index 0ba0dc4ec..93ad1b718 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -92,7 +92,9 @@ config IXP4XX_TIMER @@ -56917,7 +56918,7 @@ index 0ba0dc4ecf06..93ad1b7180ed 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 @@ @@ -57011,7 +57012,7 @@ index 1f95d0aca08f..2f4e970d7433 100644 +MODULE_LICENSE("GPL"); +#endif diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig -index f429b9b37b76..2533b01bde62 100644 +index f429b9b37..2533b01bd 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -105,6 +105,17 @@ config CPU_FREQ_DEFAULT_GOV_SCHEDUTIL @@ -57068,7 +57069,7 @@ index f429b9b37b76..2533b01bde62 100644 help This adds a generic DT based cpufreq driver for frequency management. diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm -index 123b4bbfcfee..6fdc2f0430bb 100644 +index 123b4bbfc..6fdc2f043 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -189,6 +189,16 @@ config ARM_RASPBERRYPI_CPUFREQ @@ -57089,7 +57090,7 @@ index 123b4bbfcfee..6fdc2f0430bb 100644 bool "Samsung S3C64XX" depends on CPU_S3C6410 diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile -index ef8510774913..a77074f7cca1 100644 +index ef8510774..a77074f7c 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_CPU_FREQ_GOV_POWERSAVE) += cpufreq_powersave.o @@ -57109,7 +57110,7 @@ index ef8510774913..a77074f7cca1 100644 obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c -index fb2875ce1fdd..52cdde09e448 100644 +index fb2875ce1..52cdde09e 100644 --- a/drivers/cpufreq/cpufreq-dt-platdev.c +++ b/drivers/cpufreq/cpufreq-dt-platdev.c @@ -66,21 +66,6 @@ static const struct of_device_id allowlist[] __initconst = { @@ -57172,7 +57173,7 @@ index fb2875ce1fdd..52cdde09e448 100644 { .compatible = "st,stih410", }, { .compatible = "st,stih418", }, diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c -index 8bd6e5e8f121..6e48000582ea 100644 +index 8bd6e5e8f..6e4800058 100644 --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c @@ -23,6 +23,9 @@ @@ -57210,7 +57211,7 @@ index 8bd6e5e8f121..6e48000582ea 100644 dev_err(cpu_dev, "failed to init cpufreq table: %d\n", ret); diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c new file mode 100644 -index 000000000000..a128216fc288 +index 000000000..a128216fc --- /dev/null +++ b/drivers/cpufreq/cpufreq_interactive.c @@ -0,0 +1,1643 @@ @@ -58858,7 +58859,7 @@ index 000000000000..a128216fc288 +MODULE_DESCRIPTION("'cpufreq_interactive' - A dynamic cpufreq governor for Latency sensitive workloads"); +MODULE_LICENSE("GPL"); diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c -index 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) @@ -58886,7 +58887,7 @@ index 50a4d7846580..1f001d281718 100644 diff --git a/drivers/cpufreq/rockchip-cpufreq.c b/drivers/cpufreq/rockchip-cpufreq.c new file mode 100644 -index 000000000000..dfed7d6b7841 +index 000000000..dfed7d6b7 --- /dev/null +++ b/drivers/cpufreq/rockchip-cpufreq.c @@ -0,0 +1,852 @@ @@ -59744,7 +59745,7 @@ index 000000000000..dfed7d6b7841 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/cpufreq/rockchip-cpufreq.h b/drivers/cpufreq/rockchip-cpufreq.h new file mode 100644 -index 000000000000..2eb920606d2a +index 000000000..2eb920606 --- /dev/null +++ b/drivers/cpufreq/rockchip-cpufreq.h @@ -0,0 +1,24 @@ @@ -59773,7 +59774,7 @@ index 000000000000..2eb920606d2a + +#endif diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig -index c761952f0dc6..5f1c9813b9e0 100644 +index c761952f0..5f1c9813b 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -638,26 +638,27 @@ config CRYPTO_DEV_ROCKCHIP @@ -59815,7 +59816,7 @@ index c761952f0dc6..5f1c9813b9e0 100644 tristate "Support for Xilinx ZynqMP AES hw accelerator" diff --git a/drivers/crypto/rockchip/Kconfig b/drivers/crypto/rockchip/Kconfig new file mode 100644 -index 000000000000..b7402e8a5e60 +index 000000000..b7402e8a5 --- /dev/null +++ b/drivers/crypto/rockchip/Kconfig @@ -0,0 +1,25 @@ @@ -59845,7 +59846,7 @@ index 000000000000..b7402e8a5e60 + access existing ciphers in kernel space from userspace, + thus enabling the re-use of a hardware implementation of a cipher. diff --git a/drivers/crypto/rockchip/Makefile b/drivers/crypto/rockchip/Makefile -index 785277aca71e..53e34aa47bc1 100644 +index 785277aca..53e34aa47 100644 --- a/drivers/crypto/rockchip/Makefile +++ b/drivers/crypto/rockchip/Makefile @@ -1,5 +1,30 @@ @@ -59884,7 +59885,7 @@ index 785277aca71e..53e34aa47bc1 100644 +obj-$(CONFIG_CRYPTO_DEV_ROCKCHIP_DEV) += cryptodev_linux/ diff --git a/drivers/crypto/rockchip/cryptodev_linux/Makefile b/drivers/crypto/rockchip/cryptodev_linux/Makefile new file mode 100644 -index 000000000000..628262fb2e50 +index 000000000..628262fb2 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/Makefile @@ -0,0 +1,10 @@ @@ -59900,7 +59901,7 @@ index 000000000000..628262fb2e50 + diff --git a/drivers/crypto/rockchip/cryptodev_linux/authenc.c b/drivers/crypto/rockchip/cryptodev_linux/authenc.c new file mode 100644 -index 000000000000..afca7f76dcd2 +index 000000000..afca7f76d --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/authenc.c @@ -0,0 +1,1106 @@ @@ -61012,7 +61013,7 @@ index 000000000000..afca7f76dcd2 +} diff --git a/drivers/crypto/rockchip/cryptodev_linux/cipherapi.h b/drivers/crypto/rockchip/cryptodev_linux/cipherapi.h new file mode 100644 -index 000000000000..7073588e1ddc +index 000000000..7073588e1 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/cipherapi.h @@ -0,0 +1,58 @@ @@ -61076,7 +61077,7 @@ index 000000000000..7073588e1ddc +#endif diff --git a/drivers/crypto/rockchip/cryptodev_linux/cryptlib.c b/drivers/crypto/rockchip/cryptodev_linux/cryptlib.c new file mode 100644 -index 000000000000..8b2a28c7347b +index 000000000..8b2a28c73 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/cryptlib.c @@ -0,0 +1,492 @@ @@ -61574,7 +61575,7 @@ index 000000000000..8b2a28c7347b +#endif /* CIOCCPHASH */ diff --git a/drivers/crypto/rockchip/cryptodev_linux/cryptlib.h b/drivers/crypto/rockchip/cryptodev_linux/cryptlib.h new file mode 100644 -index 000000000000..b8867d91b9e0 +index 000000000..b8867d91b --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/cryptlib.h @@ -0,0 +1,111 @@ @@ -61691,7 +61692,7 @@ index 000000000000..b8867d91b9e0 +#endif diff --git a/drivers/crypto/rockchip/cryptodev_linux/cryptodev.h b/drivers/crypto/rockchip/cryptodev_linux/cryptodev.h new file mode 100644 -index 000000000000..fd8619db6156 +index 000000000..fd8619db6 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/cryptodev.h @@ -0,0 +1,188 @@ @@ -61885,7 +61886,7 @@ index 000000000000..fd8619db6156 +#endif /* CRYPTODEV_INT_H */ diff --git a/drivers/crypto/rockchip/cryptodev_linux/ioctl.c b/drivers/crypto/rockchip/cryptodev_linux/ioctl.c new file mode 100644 -index 000000000000..032b016e476b +index 000000000..032b016e4 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/ioctl.c @@ -0,0 +1,1329 @@ @@ -63220,7 +63221,7 @@ index 000000000000..032b016e476b + diff --git a/drivers/crypto/rockchip/cryptodev_linux/main.c b/drivers/crypto/rockchip/cryptodev_linux/main.c new file mode 100644 -index 000000000000..23efae186acd +index 000000000..23efae186 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/main.c @@ -0,0 +1,266 @@ @@ -63492,7 +63493,7 @@ index 000000000000..23efae186acd +} diff --git a/drivers/crypto/rockchip/cryptodev_linux/rk_cryptodev.c b/drivers/crypto/rockchip/cryptodev_linux/rk_cryptodev.c new file mode 100644 -index 000000000000..be36478f8178 +index 000000000..be36478f8 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/rk_cryptodev.c @@ -0,0 +1,1527 @@ @@ -65025,7 +65026,7 @@ index 000000000000..be36478f8178 +} diff --git a/drivers/crypto/rockchip/cryptodev_linux/rk_cryptodev.h b/drivers/crypto/rockchip/cryptodev_linux/rk_cryptodev.h new file mode 100644 -index 000000000000..dff499be3ccb +index 000000000..dff499be3 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/rk_cryptodev.h @@ -0,0 +1,109 @@ @@ -65140,7 +65141,7 @@ index 000000000000..dff499be3ccb +#endif diff --git a/drivers/crypto/rockchip/cryptodev_linux/util.c b/drivers/crypto/rockchip/cryptodev_linux/util.c new file mode 100644 -index 000000000000..28c197eb58b9 +index 000000000..28c197eb5 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/util.c @@ -0,0 +1,80 @@ @@ -65226,7 +65227,7 @@ index 000000000000..28c197eb58b9 + diff --git a/drivers/crypto/rockchip/cryptodev_linux/util.h b/drivers/crypto/rockchip/cryptodev_linux/util.h new file mode 100644 -index 000000000000..f7bf132428a8 +index 000000000..f7bf13242 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/util.h @@ -0,0 +1,8 @@ @@ -65240,7 +65241,7 @@ index 000000000000..f7bf132428a8 + diff --git a/drivers/crypto/rockchip/cryptodev_linux/version.h b/drivers/crypto/rockchip/cryptodev_linux/version.h new file mode 100644 -index 000000000000..be0490244f8c +index 000000000..be0490244 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/version.h @@ -0,0 +1,9 @@ @@ -65255,7 +65256,7 @@ index 000000000000..be0490244f8c + diff --git a/drivers/crypto/rockchip/cryptodev_linux/zc.c b/drivers/crypto/rockchip/cryptodev_linux/zc.c new file mode 100644 -index 000000000000..7671c3131888 +index 000000000..7671c3131 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/zc.c @@ -0,0 +1,235 @@ @@ -65496,7 +65497,7 @@ index 000000000000..7671c3131888 +} diff --git a/drivers/crypto/rockchip/cryptodev_linux/zc.h b/drivers/crypto/rockchip/cryptodev_linux/zc.h new file mode 100644 -index 000000000000..808af48552a5 +index 000000000..808af4855 --- /dev/null +++ b/drivers/crypto/rockchip/cryptodev_linux/zc.h @@ -0,0 +1,27 @@ @@ -65529,7 +65530,7 @@ index 000000000000..808af48552a5 +#endif diff --git a/drivers/crypto/rockchip/procfs.c b/drivers/crypto/rockchip/procfs.c new file mode 100644 -index 000000000000..5689dc530736 +index 000000000..5689dc530 --- /dev/null +++ b/drivers/crypto/rockchip/procfs.c @@ -0,0 +1,160 @@ @@ -65695,7 +65696,7 @@ index 000000000000..5689dc530736 +#endif /* CONFIG_PROC_FS */ diff --git a/drivers/crypto/rockchip/procfs.h b/drivers/crypto/rockchip/procfs.h new file mode 100644 -index 000000000000..e491c53b4e04 +index 000000000..e491c53b4 --- /dev/null +++ b/drivers/crypto/rockchip/procfs.h @@ -0,0 +1,23 @@ @@ -65723,7 +65724,7 @@ index 000000000000..e491c53b4e04 + +#endif diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockchip/rk3288_crypto.c -index 77d5705a5d96..14a0aef18ab1 100644 +index 77d5705a5..14a0aef18 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.c +++ b/drivers/crypto/rockchip/rk3288_crypto.c @@ -10,155 +10,59 @@ @@ -66221,7 +66222,7 @@ index 77d5705a5d96..14a0aef18ab1 100644 }, }; diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockchip/rk3288_crypto.h -index 3aa03cbfb6be..045e811b4af8 100644 +index 3aa03cbfb..045e811b4 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h @@ -3,18 +3,19 @@ @@ -66366,7 +66367,7 @@ index 3aa03cbfb6be..045e811b4af8 100644 -struct rk_crypto_info *get_rk_crypto(void); #endif diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto/rockchip/rk3288_crypto_ahash.c -index 8c143180645e..edd40e16a3f0 100644 +index 8c1431806..edd40e16a 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c +++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c @@ -8,15 +8,8 @@ @@ -66723,7 +66724,7 @@ index 8c143180645e..edd40e16a3f0 100644 + } }; diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c -index da95747d973f..67a7e05d5ae3 100644 +index da95747d9..67a7e05d5 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c @@ -8,14 +8,8 @@ @@ -67313,7 +67314,7 @@ index da95747d973f..67a7e05d5ae3 100644 }; diff --git a/drivers/crypto/rockchip/rk_crypto_ahash_utils.c b/drivers/crypto/rockchip/rk_crypto_ahash_utils.c new file mode 100644 -index 000000000000..495c55485f14 +index 000000000..495c55485 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_ahash_utils.c @@ -0,0 +1,450 @@ @@ -67769,7 +67770,7 @@ index 000000000000..495c55485f14 +} diff --git a/drivers/crypto/rockchip/rk_crypto_ahash_utils.h b/drivers/crypto/rockchip/rk_crypto_ahash_utils.h new file mode 100644 -index 000000000000..46afd98a0252 +index 000000000..46afd98a0 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_ahash_utils.h @@ -0,0 +1,35 @@ @@ -67810,7 +67811,7 @@ index 000000000000..46afd98a0252 +#endif diff --git a/drivers/crypto/rockchip/rk_crypto_bignum.c b/drivers/crypto/rockchip/rk_crypto_bignum.c new file mode 100644 -index 000000000000..690c2fdf58ba +index 000000000..690c2fdf5 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_bignum.c @@ -0,0 +1,130 @@ @@ -67946,7 +67947,7 @@ index 000000000000..690c2fdf58ba +} diff --git a/drivers/crypto/rockchip/rk_crypto_bignum.h b/drivers/crypto/rockchip/rk_crypto_bignum.h new file mode 100644 -index 000000000000..780aa87661eb +index 000000000..780aa8766 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_bignum.h @@ -0,0 +1,27 @@ @@ -67979,7 +67980,7 @@ index 000000000000..780aa87661eb +#endif diff --git a/drivers/crypto/rockchip/rk_crypto_core.c b/drivers/crypto/rockchip/rk_crypto_core.c new file mode 100644 -index 000000000000..2a9cf2da6372 +index 000000000..2a9cf2da6 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_core.c @@ -0,0 +1,945 @@ @@ -68930,7 +68931,7 @@ index 000000000000..2a9cf2da6372 +MODULE_LICENSE("GPL"); diff --git a/drivers/crypto/rockchip/rk_crypto_core.h b/drivers/crypto/rockchip/rk_crypto_core.h new file mode 100644 -index 000000000000..b2b059e917e9 +index 000000000..b2b059e91 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_core.h @@ -0,0 +1,464 @@ @@ -69400,7 +69401,7 @@ index 000000000000..b2b059e917e9 + diff --git a/drivers/crypto/rockchip/rk_crypto_skcipher_utils.c b/drivers/crypto/rockchip/rk_crypto_skcipher_utils.c new file mode 100644 -index 000000000000..7d8d0aafa5f4 +index 000000000..7d8d0aafa --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_skcipher_utils.c @@ -0,0 +1,478 @@ @@ -69884,7 +69885,7 @@ index 000000000000..7d8d0aafa5f4 +} diff --git a/drivers/crypto/rockchip/rk_crypto_skcipher_utils.h b/drivers/crypto/rockchip/rk_crypto_skcipher_utils.h new file mode 100644 -index 000000000000..7d47f9719ac8 +index 000000000..7d47f9719 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_skcipher_utils.h @@ -0,0 +1,46 @@ @@ -69936,7 +69937,7 @@ index 000000000000..7d47f9719ac8 + diff --git a/drivers/crypto/rockchip/rk_crypto_utils.c b/drivers/crypto/rockchip/rk_crypto_utils.c new file mode 100644 -index 000000000000..5758e0eede97 +index 000000000..5758e0eed --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_utils.c @@ -0,0 +1,317 @@ @@ -70259,7 +70260,7 @@ index 000000000000..5758e0eede97 + diff --git a/drivers/crypto/rockchip/rk_crypto_utils.h b/drivers/crypto/rockchip/rk_crypto_utils.h new file mode 100644 -index 000000000000..26c931db86f8 +index 000000000..26c931db8 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_utils.h @@ -0,0 +1,63 @@ @@ -70328,7 +70329,7 @@ index 000000000000..26c931db86f8 + diff --git a/drivers/crypto/rockchip/rk_crypto_v1.c b/drivers/crypto/rockchip/rk_crypto_v1.c new file mode 100644 -index 000000000000..14347c4900bc +index 000000000..14347c490 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v1.c @@ -0,0 +1,60 @@ @@ -70394,7 +70395,7 @@ index 000000000000..14347c4900bc + diff --git a/drivers/crypto/rockchip/rk_crypto_v1.h b/drivers/crypto/rockchip/rk_crypto_v1.h new file mode 100644 -index 000000000000..417ead57565e +index 000000000..417ead575 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v1.h @@ -0,0 +1,65 @@ @@ -70465,7 +70466,7 @@ index 000000000000..417ead57565e + diff --git a/drivers/crypto/rockchip/rk_crypto_v1_ahash.c b/drivers/crypto/rockchip/rk_crypto_v1_ahash.c new file mode 100644 -index 000000000000..633961adfd4a +index 000000000..633961adf --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v1_ahash.c @@ -0,0 +1,382 @@ @@ -70853,7 +70854,7 @@ index 000000000000..633961adfd4a + diff --git a/drivers/crypto/rockchip/rk_crypto_v1_reg.h b/drivers/crypto/rockchip/rk_crypto_v1_reg.h new file mode 100644 -index 000000000000..cf520527a1a8 +index 000000000..cf520527a --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v1_reg.h @@ -0,0 +1,172 @@ @@ -71031,7 +71032,7 @@ index 000000000000..cf520527a1a8 +#endif diff --git a/drivers/crypto/rockchip/rk_crypto_v1_skcipher.c b/drivers/crypto/rockchip/rk_crypto_v1_skcipher.c new file mode 100644 -index 000000000000..dc7a57b80918 +index 000000000..dc7a57b80 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v1_skcipher.c @@ -0,0 +1,424 @@ @@ -71461,7 +71462,7 @@ index 000000000000..dc7a57b80918 + RK_CIPHER_ALGO_INIT(DES3_EDE, CBC, cbc(des3_ede), cbc-des3_ede-rk); diff --git a/drivers/crypto/rockchip/rk_crypto_v2.c b/drivers/crypto/rockchip/rk_crypto_v2.c new file mode 100644 -index 000000000000..e8f2a0a242a5 +index 000000000..e8f2a0a24 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v2.c @@ -0,0 +1,104 @@ @@ -71571,7 +71572,7 @@ index 000000000000..e8f2a0a242a5 + diff --git a/drivers/crypto/rockchip/rk_crypto_v2.h b/drivers/crypto/rockchip/rk_crypto_v2.h new file mode 100644 -index 000000000000..9e82346d6440 +index 000000000..9e82346d6 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v2.h @@ -0,0 +1,95 @@ @@ -71672,7 +71673,7 @@ index 000000000000..9e82346d6440 +#endif /* end of __RK_CRYPTO_V2_H__ */ diff --git a/drivers/crypto/rockchip/rk_crypto_v2_ahash.c b/drivers/crypto/rockchip/rk_crypto_v2_ahash.c new file mode 100644 -index 000000000000..919603ff4768 +index 000000000..919603ff4 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v2_ahash.c @@ -0,0 +1,379 @@ @@ -72057,7 +72058,7 @@ index 000000000000..919603ff4768 + diff --git a/drivers/crypto/rockchip/rk_crypto_v2_akcipher.c b/drivers/crypto/rockchip/rk_crypto_v2_akcipher.c new file mode 100644 -index 000000000000..1db5adde96ed +index 000000000..1db5adde9 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v2_akcipher.c @@ -0,0 +1,320 @@ @@ -72383,7 +72384,7 @@ index 000000000000..1db5adde96ed + diff --git a/drivers/crypto/rockchip/rk_crypto_v2_pka.c b/drivers/crypto/rockchip/rk_crypto_v2_pka.c new file mode 100644 -index 000000000000..d2c0a265b3ad +index 000000000..d2c0a265b --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v2_pka.c @@ -0,0 +1,686 @@ @@ -73075,7 +73076,7 @@ index 000000000000..d2c0a265b3ad +} diff --git a/drivers/crypto/rockchip/rk_crypto_v2_pka.h b/drivers/crypto/rockchip/rk_crypto_v2_pka.h new file mode 100644 -index 000000000000..3c0b236f9d88 +index 000000000..3c0b236f9 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v2_pka.h @@ -0,0 +1,17 @@ @@ -73098,7 +73099,7 @@ index 000000000000..3c0b236f9d88 +#endif diff --git a/drivers/crypto/rockchip/rk_crypto_v2_reg.h b/drivers/crypto/rockchip/rk_crypto_v2_reg.h new file mode 100644 -index 000000000000..a938ce3f69a7 +index 000000000..a938ce3f6 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v2_reg.h @@ -0,0 +1,378 @@ @@ -73482,7 +73483,7 @@ index 000000000000..a938ce3f69a7 + diff --git a/drivers/crypto/rockchip/rk_crypto_v2_skcipher.c b/drivers/crypto/rockchip/rk_crypto_v2_skcipher.c new file mode 100644 -index 000000000000..2bfff0d28771 +index 000000000..2bfff0d28 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v2_skcipher.c @@ -0,0 +1,685 @@ @@ -74173,7 +74174,7 @@ index 000000000000..2bfff0d28771 + diff --git a/drivers/crypto/rockchip/rk_crypto_v3.c b/drivers/crypto/rockchip/rk_crypto_v3.c new file mode 100644 -index 000000000000..7cd728599d88 +index 000000000..7cd728599 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v3.c @@ -0,0 +1,217 @@ @@ -74396,7 +74397,7 @@ index 000000000000..7cd728599d88 + diff --git a/drivers/crypto/rockchip/rk_crypto_v3.h b/drivers/crypto/rockchip/rk_crypto_v3.h new file mode 100644 -index 000000000000..a4b181416300 +index 000000000..a4b181416 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v3.h @@ -0,0 +1,96 @@ @@ -74498,7 +74499,7 @@ index 000000000000..a4b181416300 +#endif /* end of __RK_CRYPTO_V3_H__ */ diff --git a/drivers/crypto/rockchip/rk_crypto_v3_ahash.c b/drivers/crypto/rockchip/rk_crypto_v3_ahash.c new file mode 100644 -index 000000000000..0c91b45b2123 +index 000000000..0c91b45b2 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v3_ahash.c @@ -0,0 +1,468 @@ @@ -74972,7 +74973,7 @@ index 000000000000..0c91b45b2123 + diff --git a/drivers/crypto/rockchip/rk_crypto_v3_reg.h b/drivers/crypto/rockchip/rk_crypto_v3_reg.h new file mode 100644 -index 000000000000..1c4c45317a28 +index 000000000..1c4c45317 --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v3_reg.h @@ -0,0 +1,80 @@ @@ -75058,7 +75059,7 @@ index 000000000000..1c4c45317a28 + diff --git a/drivers/crypto/rockchip/rk_crypto_v3_skcipher.c b/drivers/crypto/rockchip/rk_crypto_v3_skcipher.c new file mode 100644 -index 000000000000..4220e6cbeb14 +index 000000000..4220e6cbe --- /dev/null +++ b/drivers/crypto/rockchip/rk_crypto_v3_skcipher.c @@ -0,0 +1,684 @@ @@ -75747,7 +75748,7 @@ index 000000000000..4220e6cbeb14 + RK_CIPHER_ALGO_INIT(DES3_EDE, OFB, ofb(des3_ede), ofb-des3_ede-rk); + diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig -index 3c4862a752b5..eeb1f12bc7f5 100644 +index 3c4862a75..eeb1f12bc 100644 --- a/drivers/devfreq/Kconfig +++ b/drivers/devfreq/Kconfig @@ -129,15 +129,20 @@ config ARM_MEDIATEK_CCI_DEVFREQ @@ -75776,7 +75777,7 @@ index 3c4862a752b5..eeb1f12bc7f5 100644 from hardware. diff --git a/drivers/devfreq/Makefile b/drivers/devfreq/Makefile -index bf40d04928d0..92018ab6c1e4 100644 +index bf40d0492..92018ab6c 100644 --- a/drivers/devfreq/Makefile +++ b/drivers/devfreq/Makefile @@ -12,7 +12,8 @@ obj-$(CONFIG_ARM_EXYNOS_BUS_DEVFREQ) += exynos-bus.o @@ -75790,7 +75791,7 @@ index bf40d04928d0..92018ab6c1e4 100644 obj-$(CONFIG_ARM_TEGRA_DEVFREQ) += tegra30-devfreq.o diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c -index 49c542ecccde..4385e176340b 100644 +index 49c542ecc..4385e1763 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -1807,6 +1807,40 @@ static ssize_t trans_stat_store(struct device *dev, @@ -75843,7 +75844,7 @@ index 49c542ecccde..4385e176340b 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 @@ -75859,7 +75860,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 @@ @@ -75868,7 +75869,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 74893c06aa08..6db7c494555f 100644 +index 74893c06a..6db7c4945 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -20,26 +20,81 @@ @@ -76690,7 +76691,7 @@ index 74893c06aa08..6db7c494555f 100644 diff --git a/drivers/devfreq/event/rockchip-nocp.c b/drivers/devfreq/event/rockchip-nocp.c new file mode 100644 -index 000000000000..954a27d3ff75 +index 000000000..954a27d3f --- /dev/null +++ b/drivers/devfreq/event/rockchip-nocp.c @@ -0,0 +1,210 @@ @@ -76905,7 +76906,7 @@ index 000000000000..954a27d3ff75 +MODULE_AUTHOR("Finley Xiao "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c -index daff40702615..fd2c5ffedf41 100644 +index daff40702..fd2c5ffed 100644 --- a/drivers/devfreq/rk3399_dmc.c +++ b/drivers/devfreq/rk3399_dmc.c @@ -22,6 +22,7 @@ @@ -76940,7 +76941,7 @@ index daff40702615..fd2c5ffedf41 100644 default: diff --git a/drivers/devfreq/rockchip_bus.c b/drivers/devfreq/rockchip_bus.c new file mode 100644 -index 000000000000..0f5487eaeb1c +index 000000000..0f5487eae --- /dev/null +++ b/drivers/devfreq/rockchip_bus.c @@ -0,0 +1,548 @@ @@ -77494,7 +77495,7 @@ index 000000000000..0f5487eaeb1c +MODULE_DESCRIPTION("rockchip busfreq driver with devfreq framework"); diff --git a/drivers/devfreq/rockchip_dmc.c b/drivers/devfreq/rockchip_dmc.c new file mode 100644 -index 000000000000..0fd3a50bbc32 +index 000000000..0fd3a50bb --- /dev/null +++ b/drivers/devfreq/rockchip_dmc.c @@ -0,0 +1,3411 @@ @@ -80911,7 +80912,7 @@ index 000000000000..0fd3a50bbc32 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/devfreq/rockchip_dmc_common.c b/drivers/devfreq/rockchip_dmc_common.c new file mode 100644 -index 000000000000..7765e7174ce2 +index 000000000..7765e7174 --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_common.c @@ -0,0 +1,180 @@ @@ -81097,7 +81098,7 @@ index 000000000000..7765e7174ce2 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/devfreq/rockchip_dmc_dbg.c b/drivers/devfreq/rockchip_dmc_dbg.c new file mode 100644 -index 000000000000..80b25e9046d1 +index 000000000..80b25e904 --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_dbg.c @@ -0,0 +1,1061 @@ @@ -82164,7 +82165,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 100644 -index 000000000000..2f7b7774cf4d +index 000000000..2f7b7774c --- /dev/null +++ b/drivers/devfreq/rockchip_dmc_timing.h @@ -0,0 +1,1231 @@ @@ -83400,7 +83401,7 @@ index 000000000000..2f7b7774cf4d +#endif /* __ROCKCHIP_DMC_TIMING_H__ */ + diff --git a/drivers/dma-buf/Kconfig b/drivers/dma-buf/Kconfig -index e4dc53a36428..82c7df8e482b 100644 +index e4dc53a36..82c7df8e4 100644 --- a/drivers/dma-buf/Kconfig +++ b/drivers/dma-buf/Kconfig @@ -1,6 +1,39 @@ @@ -83485,7 +83486,7 @@ index e4dc53a36428..82c7df8e482b 100644 endmenu diff --git a/drivers/dma-buf/Makefile b/drivers/dma-buf/Makefile -index 70ec901edf2c..b1fffd5cfd85 100644 +index 70ec901ed..b1fffd5cf 100644 --- a/drivers/dma-buf/Makefile +++ b/drivers/dma-buf/Makefile @@ -3,10 +3,13 @@ obj-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \ @@ -83511,7 +83512,7 @@ index 70ec901edf2c..b1fffd5cfd85 100644 +obj-$(CONFIG_DMABUF_PROCESS_INFO) += dma-buf-process-info.o diff --git a/drivers/dma-buf/dma-buf-cache.c b/drivers/dma-buf/dma-buf-cache.c new file mode 100644 -index 000000000000..5ec8896d3221 +index 000000000..5ec8896d3 --- /dev/null +++ b/drivers/dma-buf/dma-buf-cache.c @@ -0,0 +1,198 @@ @@ -83715,7 +83716,7 @@ index 000000000000..5ec8896d3221 +EXPORT_SYMBOL(dma_buf_cache_map_attachment); diff --git a/drivers/dma-buf/dma-buf-process-info.c b/drivers/dma-buf/dma-buf-process-info.c new file mode 100644 -index 000000000000..ff528d0ca758 +index 000000000..ff528d0ca --- /dev/null +++ b/drivers/dma-buf/dma-buf-process-info.c @@ -0,0 +1,165 @@ @@ -83886,7 +83887,7 @@ index 000000000000..ff528d0ca758 +} diff --git a/drivers/dma-buf/dma-buf-process-info.h b/drivers/dma-buf/dma-buf-process-info.h new file mode 100644 -index 000000000000..1275c1c7e2aa +index 000000000..1275c1c7e --- /dev/null +++ b/drivers/dma-buf/dma-buf-process-info.h @@ -0,0 +1,83 @@ @@ -83974,7 +83975,7 @@ index 000000000000..1275c1c7e2aa +#endif /* __DMA_BUF_PROCESS_INFO_H */ + diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c -index 21916bba77d5..8acdece05411 100644 +index 21916bba7..8acdece05 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -27,11 +27,13 @@ @@ -84474,7 +84475,7 @@ index 21916bba77d5..8acdece05411 100644 } __exitcall(dma_buf_deinit); diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c -index 84ae708fafe7..a777e9185cff 100644 +index 84ae708fa..a777e9185 100644 --- a/drivers/dma-buf/dma-heap.c +++ b/drivers/dma-buf/dma-heap.c @@ -105,9 +105,6 @@ static long dma_heap_ioctl_allocate(struct file *file, void *data) @@ -84521,7 +84522,7 @@ index 84ae708fafe7..a777e9185cff 100644 ret = -ENOTTY; goto err; diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig -index a5eef06c4226..c6b35f28a702 100644 +index a5eef06c4..c6b35f28a 100644 --- a/drivers/dma-buf/heaps/Kconfig +++ b/drivers/dma-buf/heaps/Kconfig @@ -1,3 +1,13 @@ @@ -84550,7 +84551,7 @@ index a5eef06c4226..c6b35f28a702 100644 + This driver allows the export of on-chip SRAM marked as exportable + to userspace using the DMA-Heaps interface. diff --git a/drivers/dma-buf/heaps/Makefile b/drivers/dma-buf/heaps/Makefile -index 974467791032..f373aa65dbca 100644 +index 974467791..f373aa65d 100644 --- a/drivers/dma-buf/heaps/Makefile +++ b/drivers/dma-buf/heaps/Makefile @@ -1,3 +1,6 @@ @@ -84561,7 +84562,7 @@ index 974467791032..f373aa65dbca 100644 obj-$(CONFIG_DMABUF_HEAPS_CMA) += cma_heap.o +obj-$(CONFIG_DMABUF_HEAPS_SRAM) += sram_heap.o diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c -index ee899f8e6721..16aa0cb5a843 100644 +index ee899f8e6..16aa0cb5a 100644 --- a/drivers/dma-buf/heaps/cma_heap.c +++ b/drivers/dma-buf/heaps/cma_heap.c @@ -351,6 +351,7 @@ static struct dma_buf *cma_heap_allocate(struct dma_heap *heap, @@ -84579,7 +84580,7 @@ index ee899f8e6721..16aa0cb5a843 100644 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/heaps/deferred-free-helper.c b/drivers/dma-buf/heaps/deferred-free-helper.c new file mode 100644 -index 000000000000..d207eac5800b +index 000000000..d207eac58 --- /dev/null +++ b/drivers/dma-buf/heaps/deferred-free-helper.c @@ -0,0 +1,138 @@ @@ -84723,7 +84724,7 @@ index 000000000000..d207eac5800b + diff --git a/drivers/dma-buf/heaps/deferred-free-helper.h b/drivers/dma-buf/heaps/deferred-free-helper.h new file mode 100644 -index 000000000000..11940328ce3f +index 000000000..11940328c --- /dev/null +++ b/drivers/dma-buf/heaps/deferred-free-helper.h @@ -0,0 +1,55 @@ @@ -84784,7 +84785,7 @@ index 000000000000..11940328ce3f +#endif diff --git a/drivers/dma-buf/heaps/page_pool.c b/drivers/dma-buf/heaps/page_pool.c new file mode 100644 -index 000000000000..f3e3598607fd +index 000000000..f3e359860 --- /dev/null +++ b/drivers/dma-buf/heaps/page_pool.c @@ -0,0 +1,247 @@ @@ -85037,7 +85038,7 @@ index 000000000000..f3e3598607fd +MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/heaps/page_pool.h b/drivers/dma-buf/heaps/page_pool.h new file mode 100644 -index 000000000000..6b083b04f195 +index 000000000..6b083b04f --- /dev/null +++ b/drivers/dma-buf/heaps/page_pool.h @@ -0,0 +1,55 @@ @@ -85098,7 +85099,7 @@ index 000000000000..6b083b04f195 +#endif /* _DMABUF_PAGE_POOL_H */ diff --git a/drivers/dma-buf/heaps/rk_cma_heap.c b/drivers/dma-buf/heaps/rk_cma_heap.c new file mode 100644 -index 000000000000..c93674c2a79c +index 000000000..c93674c2a --- /dev/null +++ b/drivers/dma-buf/heaps/rk_cma_heap.c @@ -0,0 +1,616 @@ @@ -85720,7 +85721,7 @@ index 000000000000..c93674c2a79c +MODULE_LICENSE("GPL"); diff --git a/drivers/dma-buf/heaps/rk_system_heap.c b/drivers/dma-buf/heaps/rk_system_heap.c new file mode 100644 -index 000000000000..52dcfc2bb82c +index 000000000..52dcfc2bb --- /dev/null +++ b/drivers/dma-buf/heaps/rk_system_heap.c @@ -0,0 +1,841 @@ @@ -86567,7 +86568,7 @@ index 000000000000..52dcfc2bb82c +MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/heaps/sram_heap.c b/drivers/dma-buf/heaps/sram_heap.c new file mode 100644 -index 000000000000..d9a9b70a79d4 +index 000000000..d9a9b70a7 --- /dev/null +++ b/drivers/dma-buf/heaps/sram_heap.c @@ -0,0 +1,437 @@ @@ -87009,7 +87010,7 @@ index 000000000000..d9a9b70a79d4 +MODULE_DESCRIPTION("Rockchip DMA-BUF SRAM Heap"); +MODULE_LICENSE("GPL"); diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c -index 9076d47ed2ef..43cd4a5bf25c 100644 +index 9076d47ed..43cd4a5bf 100644 --- a/drivers/dma-buf/heaps/system_heap.c +++ b/drivers/dma-buf/heaps/system_heap.c @@ -436,3 +436,4 @@ static int system_heap_create(void) @@ -87019,7 +87020,7 @@ index 9076d47ed2ef..43cd4a5bf25c 100644 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/rk_heaps/Kconfig b/drivers/dma-buf/rk_heaps/Kconfig new file mode 100644 -index 000000000000..6ca3fbe765ee +index 000000000..6ca3fbe76 --- /dev/null +++ b/drivers/dma-buf/rk_heaps/Kconfig @@ -0,0 +1,48 @@ @@ -87073,7 +87074,7 @@ index 000000000000..6ca3fbe765ee + Choose this option to enable dma-buf RockChip heap debug. diff --git a/drivers/dma-buf/rk_heaps/Makefile b/drivers/dma-buf/rk_heaps/Makefile new file mode 100644 -index 000000000000..30d44bb7d801 +index 000000000..30d44bb7d --- /dev/null +++ b/drivers/dma-buf/rk_heaps/Makefile @@ -0,0 +1,6 @@ @@ -87085,7 +87086,7 @@ index 000000000000..30d44bb7d801 +obj-$(CONFIG_DMABUF_HEAPS_ROCKCHIP_CMA_HEAP) += rk-cma-heap.o diff --git a/drivers/dma-buf/rk_heaps/rk-cma-heap.c b/drivers/dma-buf/rk_heaps/rk-cma-heap.c new file mode 100644 -index 000000000000..5b063f87bffe +index 000000000..5b063f87b --- /dev/null +++ b/drivers/dma-buf/rk_heaps/rk-cma-heap.c @@ -0,0 +1,687 @@ @@ -87778,7 +87779,7 @@ index 000000000000..5b063f87bffe +MODULE_LICENSE("GPL v2"); diff --git a/drivers/dma-buf/rk_heaps/rk-dma-cma.c b/drivers/dma-buf/rk_heaps/rk-dma-cma.c new file mode 100644 -index 000000000000..b6521f7dcc06 +index 000000000..b6521f7dc --- /dev/null +++ b/drivers/dma-buf/rk_heaps/rk-dma-cma.c @@ -0,0 +1,77 @@ @@ -87861,7 +87862,7 @@ index 000000000000..b6521f7dcc06 +} diff --git a/drivers/dma-buf/rk_heaps/rk-dma-heap.c b/drivers/dma-buf/rk_heaps/rk-dma-heap.c new file mode 100644 -index 000000000000..d0e76edf3128 +index 000000000..d0e76edf3 --- /dev/null +++ b/drivers/dma-buf/rk_heaps/rk-dma-heap.c @@ -0,0 +1,731 @@ @@ -88598,7 +88599,7 @@ index 000000000000..d0e76edf3128 +subsys_initcall(rk_dma_heap_init); diff --git a/drivers/dma-buf/rk_heaps/rk-dma-heap.h b/drivers/dma-buf/rk_heaps/rk-dma-heap.h new file mode 100644 -index 000000000000..3bc750b02023 +index 000000000..3bc750b02 --- /dev/null +++ b/drivers/dma-buf/rk_heaps/rk-dma-heap.h @@ -0,0 +1,178 @@ @@ -88781,7 +88782,7 @@ index 000000000000..3bc750b02023 +struct cma *rk_dma_heap_get_cma(void); +#endif /* _DMA_HEAPS_H */ diff --git a/drivers/dma-buf/sw_sync.c b/drivers/dma-buf/sw_sync.c -index f0a35277fd84..3daa6c76b8dd 100644 +index f0a35277f..3daa6c76b 100644 --- a/drivers/dma-buf/sw_sync.c +++ b/drivers/dma-buf/sw_sync.c @@ -7,6 +7,8 @@ @@ -88855,7 +88856,7 @@ index f0a35277fd84..3daa6c76b8dd 100644 + +MODULE_LICENSE("GPL v2"); diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig -index 110e99b86a66..012a4acd04f0 100644 +index 110e99b86..012a4acd0 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig @@ -561,4 +561,11 @@ config EDAC_NPCM @@ -88871,7 +88872,7 @@ index 110e99b86a66..012a4acd04f0 100644 + endif # EDAC diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile -index 61945d3113cc..146be451765e 100644 +index 61945d311..146be4517 100644 --- a/drivers/edac/Makefile +++ b/drivers/edac/Makefile @@ -86,3 +86,4 @@ obj-$(CONFIG_EDAC_BLUEFIELD) += bluefield_edac.o @@ -88881,7 +88882,7 @@ index 61945d3113cc..146be451765e 100644 +obj-$(CONFIG_EDAC_ROCKCHIP) += rockchip_edac.o diff --git a/drivers/edac/rockchip_edac.c b/drivers/edac/rockchip_edac.c new file mode 100644 -index 000000000000..4b1317bed1d0 +index 000000000..4b1317bed --- /dev/null +++ b/drivers/edac/rockchip_edac.c @@ -0,0 +1,358 @@ @@ -89244,7 +89245,7 @@ index 000000000000..4b1317bed1d0 +MODULE_AUTHOR("He Zhihuan \n"); +MODULE_DESCRIPTION("ROCKCHIP EDAC kernel module"); diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c -index e7f55c021e56..fc0db77909ee 100644 +index e7f55c021..fc0db7790 100644 --- a/drivers/extcon/extcon.c +++ b/drivers/extcon/extcon.c @@ -52,6 +52,11 @@ static const struct __extcon_info { @@ -89260,7 +89261,7 @@ index e7f55c021e56..fc0db77909ee 100644 /* Charging external connector */ [EXTCON_CHG_USB_SDP] = { diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig -index b59e3041fd62..303d2f79e606 100644 +index b59e3041f..303d2f79e 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -226,6 +226,13 @@ config QCOM_SCM_DOWNLOAD_MODE_DEFAULT @@ -89278,7 +89279,7 @@ index b59e3041fd62..303d2f79e606 100644 bool select BOOT_VESA_SUPPORT diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile -index 28fcddcd688f..f91d48e6e930 100644 +index 28fcddcd6..f91d48e6e 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -17,6 +17,7 @@ obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o @@ -89290,7 +89291,7 @@ index 28fcddcd688f..f91d48e6e930 100644 obj-$(CONFIG_QCOM_SCM) += qcom-scm.o qcom-scm-objs += qcom_scm.o qcom_scm-smc.o qcom_scm-legacy.o diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c -index 285fe7ad490d..cfa9eec1adad 100644 +index 285fe7ad4..cfa9eec1a 100644 --- a/drivers/firmware/arm_sdei.c +++ b/drivers/firmware/arm_sdei.c @@ -920,6 +920,86 @@ int sdei_unregister_ghes(struct ghes *ghes) @@ -89382,7 +89383,7 @@ index 285fe7ad490d..cfa9eec1adad 100644 const char *method; diff --git a/drivers/firmware/rockchip_sip.c b/drivers/firmware/rockchip_sip.c new file mode 100644 -index 000000000000..e483899d79fe +index 000000000..e483899d7 --- /dev/null +++ b/drivers/firmware/rockchip_sip.c @@ -0,0 +1,715 @@ @@ -90102,7 +90103,7 @@ index 000000000000..e483899d79fe +MODULE_DESCRIPTION("Rockchip SIP Call"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig -index 673bafb8be58..fa453718b26d 100644 +index 673bafb8b..fa453718b 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -1025,6 +1025,21 @@ config GPIO_ADNP @@ -90143,7 +90144,7 @@ index 673bafb8be58..fa453718b26d 100644 tristate "PCA95[357]x, PCA9698, TCA64xx, and MAX7310 I/O ports" select REGMAP_I2C diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile -index eb73b5d633eb..e34f8f222c72 100644 +index eb73b5d63..e34f8f222 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -36,6 +36,7 @@ obj-$(CONFIG_GPIO_ARIZONA) += gpio-arizona.o @@ -90164,7 +90165,7 @@ index eb73b5d633eb..e34f8f222c72 100644 obj-$(CONFIG_GPIO_PALMAS) += gpio-palmas.o diff --git a/drivers/gpio/gpio-aw9110.c b/drivers/gpio/gpio-aw9110.c new file mode 100644 -index 000000000000..ab97726fc7ce +index 000000000..ab97726fc --- /dev/null +++ b/drivers/gpio/gpio-aw9110.c @@ -0,0 +1,500 @@ @@ -90670,7 +90671,7 @@ index 000000000000..ab97726fc7ce + diff --git a/drivers/gpio/gpio-nca9539.c b/drivers/gpio/gpio-nca9539.c new file mode 100644 -index 000000000000..50fff6d90ddd +index 000000000..50fff6d90 --- /dev/null +++ b/drivers/gpio/gpio-nca9539.c @@ -0,0 +1,332 @@ @@ -91007,7 +91008,7 @@ index 000000000000..50fff6d90ddd +MODULE_DESCRIPTION("GPIO expander driver for Novosense nca9539"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c -index b35b9604413f..f251313c2606 100644 +index b35b96044..f251313c2 100644 --- a/drivers/gpio/gpio-rockchip.c +++ b/drivers/gpio/gpio-rockchip.c @@ -6,6 +6,7 @@ @@ -91401,7 +91402,7 @@ index b35b9604413f..f251313c2606 100644 return 0; diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c -index d9525d95e818..b3845291a054 100644 +index d9525d95e..b3845291a 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -25,21 +25,6 @@ @@ -91448,7 +91449,7 @@ index d9525d95e818..b3845291a054 100644 static unsigned long of_convert_gpio_flags(enum of_gpio_flags flags) { diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile -index 8997f0096545..b37172366686 100644 +index 8997f0096..b37172366 100644 --- a/drivers/gpu/Makefile +++ b/drivers/gpu/Makefile @@ -3,5 +3,6 @@ @@ -91460,7 +91461,7 @@ index 8997f0096545..b37172366686 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..f747fc889b5b +index 000000000..f747fc889 --- /dev/null +++ b/drivers/gpu/arm/Kbuild @@ -0,0 +1,25 @@ @@ -91491,7 +91492,7 @@ index 000000000000..f747fc889b5b +obj-$(CONFIG_MALI_BIFROST) += bifrost/ diff --git a/drivers/gpu/arm/Kconfig b/drivers/gpu/arm/Kconfig new file mode 100644 -index 000000000000..398a8e50a4cd +index 000000000..398a8e50a --- /dev/null +++ b/drivers/gpu/arm/Kconfig @@ -0,0 +1,25 @@ @@ -91522,7 +91523,7 @@ index 000000000000..398a8e50a4cd +source "drivers/gpu/arm/bifrost/Kconfig" diff --git a/drivers/gpu/arm/bifrost/Kbuild b/drivers/gpu/arm/bifrost/Kbuild new file mode 100755 -index 000000000000..9cadda188fbc +index 000000000..9cadda188 --- /dev/null +++ b/drivers/gpu/arm/bifrost/Kbuild @@ -0,0 +1,243 @@ @@ -91771,7 +91772,7 @@ index 000000000000..9cadda188fbc +endif diff --git a/drivers/gpu/arm/bifrost/Kconfig b/drivers/gpu/arm/bifrost/Kconfig new file mode 100644 -index 000000000000..ca3da57cffd3 +index 000000000..ca3da57cf --- /dev/null +++ b/drivers/gpu/arm/bifrost/Kconfig @@ -0,0 +1,389 @@ @@ -92166,7 +92167,7 @@ index 000000000000..ca3da57cffd3 +endif diff --git a/drivers/gpu/arm/bifrost/Makefile b/drivers/gpu/arm/bifrost/Makefile new file mode 100644 -index 000000000000..39df298ff01c +index 000000000..39df298ff --- /dev/null +++ b/drivers/gpu/arm/bifrost/Makefile @@ -0,0 +1,279 @@ @@ -92451,7 +92452,7 @@ index 000000000000..39df298ff01c + $(MAKE) -C $(KDIR) M=$(CURDIR) $(MAKE_ARGS) clean diff --git a/drivers/gpu/arm/bifrost/arbiter/Kbuild b/drivers/gpu/arm/bifrost/arbiter/Kbuild new file mode 100755 -index 000000000000..2e6b111441ca +index 000000000..2e6b11144 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/Kbuild @@ -0,0 +1,23 @@ @@ -92480,7 +92481,7 @@ index 000000000000..2e6b111441ca + arbiter/mali_kbase_arbiter_pm.o diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.c b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.c new file mode 100644 -index 000000000000..b5d3cd685ba5 +index 000000000..b5d3cd685 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.c @@ -0,0 +1,357 @@ @@ -92843,7 +92844,7 @@ index 000000000000..b5d3cd685ba5 +} diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.h b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.h new file mode 100644 -index 000000000000..701ffd42f6f7 +index 000000000..701ffd42f --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbif.h @@ -0,0 +1,121 @@ @@ -92970,7 +92971,7 @@ index 000000000000..701ffd42f6f7 +#endif /* _MALI_KBASE_ARBIF_H_ */ diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_defs.h b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_defs.h new file mode 100644 -index 000000000000..1c4901b3b4d9 +index 000000000..1c4901b3b --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_defs.h @@ -0,0 +1,76 @@ @@ -93052,7 +93053,7 @@ index 000000000000..1c4901b3b4d9 +#endif /* _MALI_KBASE_ARBITER_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c new file mode 100644 -index 000000000000..667552c561fb +index 000000000..667552c56 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.c @@ -0,0 +1,1138 @@ @@ -94196,7 +94197,7 @@ index 000000000000..667552c561fb +}; diff --git a/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h new file mode 100644 -index 000000000000..f863f88601e6 +index 000000000..f863f8860 --- /dev/null +++ b/drivers/gpu/arm/bifrost/arbiter/mali_kbase_arbiter_pm.h @@ -0,0 +1,196 @@ @@ -94398,7 +94399,7 @@ index 000000000000..f863f88601e6 +#endif /*_MALI_KBASE_ARBITER_PM_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/Kbuild b/drivers/gpu/arm/bifrost/backend/gpu/Kbuild new file mode 100755 -index 000000000000..efebc8a544d1 +index 000000000..efebc8a54 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/Kbuild @@ -0,0 +1,58 @@ @@ -94462,7 +94463,7 @@ index 000000000000..efebc8a544d1 + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_backend_config.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_backend_config.h new file mode 100644 -index 000000000000..6924fdb8a608 +index 000000000..6924fdb8a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_backend_config.h @@ -0,0 +1,30 @@ @@ -94498,7 +94499,7 @@ index 000000000000..6924fdb8a608 + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.c new file mode 100644 -index 000000000000..7c0abbaf860f +index 000000000..7c0abbaf8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.c @@ -0,0 +1,92 @@ @@ -94596,7 +94597,7 @@ index 000000000000..7c0abbaf860f +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.h new file mode 100644 -index 000000000000..758e3be08c16 +index 000000000..758e3be08 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_cache_policy_backend.h @@ -0,0 +1,65 @@ @@ -94667,7 +94668,7 @@ index 000000000000..758e3be08c16 +#endif /* _KBASE_CACHE_POLICY_BACKEND_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.c new file mode 100644 -index 000000000000..ddd03ca23de6 +index 000000000..ddd03ca23 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.c @@ -0,0 +1,326 @@ @@ -94999,7 +95000,7 @@ index 000000000000..ddd03ca23de6 +KBASE_EXPORT_TEST_API(kbase_clk_rate_trace_manager_notify_all); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.h new file mode 100644 -index 000000000000..35b3b8d06d96 +index 000000000..35b3b8d06 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_clk_rate_trace_mgr.h @@ -0,0 +1,154 @@ @@ -95159,7 +95160,7 @@ index 000000000000..35b3b8d06d96 + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_debug_job_fault_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_debug_job_fault_backend.c new file mode 100644 -index 000000000000..e121b417f80d +index 000000000..e121b417f --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_debug_job_fault_backend.c @@ -0,0 +1,163 @@ @@ -95328,7 +95329,7 @@ index 000000000000..e121b417f80d +#endif diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c new file mode 100644 -index 000000000000..e960f4602c37 +index 000000000..e960f4602 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c @@ -0,0 +1,741 @@ @@ -96075,7 +96076,7 @@ index 000000000000..e960f4602c37 +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.h new file mode 100644 -index 000000000000..ac88b025a37e +index 000000000..ac88b025a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.h @@ -0,0 +1,62 @@ @@ -96143,7 +96144,7 @@ index 000000000000..ac88b025a37e +#endif /* _BASE_DEVFREQ_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_gpuprops_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_gpuprops_backend.c new file mode 100644 -index 000000000000..10e92ec94d3a +index 000000000..10e92ec94 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_gpuprops_backend.c @@ -0,0 +1,200 @@ @@ -96349,7 +96350,7 @@ index 000000000000..10e92ec94d3a +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_backend.c new file mode 100644 -index 000000000000..53578ded58b9 +index 000000000..53578ded5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_backend.c @@ -0,0 +1,481 @@ @@ -96836,7 +96837,7 @@ index 000000000000..53578ded58b9 +#endif diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_defs.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_defs.h new file mode 100644 -index 000000000000..bd2eb8a12047 +index 000000000..bd2eb8a12 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_defs.h @@ -0,0 +1,60 @@ @@ -96902,7 +96903,7 @@ index 000000000000..bd2eb8a12047 +#endif /* _KBASE_INSTR_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_internal.h new file mode 100644 -index 000000000000..332cc6944d94 +index 000000000..332cc6944 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_internal.h @@ -0,0 +1,41 @@ @@ -96949,7 +96950,7 @@ index 000000000000..332cc6944d94 +#endif /* _KBASE_INSTR_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_internal.h new file mode 100644 -index 000000000000..66cda8c0b647 +index 000000000..66cda8c0b --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_internal.h @@ -0,0 +1,47 @@ @@ -97002,7 +97003,7 @@ index 000000000000..66cda8c0b647 +#endif /* _KBASE_IRQ_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_linux.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_linux.c new file mode 100644 -index 000000000000..eb63b2c56c3d +index 000000000..eb63b2c56 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_irq_linux.c @@ -0,0 +1,503 @@ @@ -97511,7 +97512,7 @@ index 000000000000..eb63b2c56c3d +#endif /* IS_ENABLED(CONFIG_MALI_REAL_HW) */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_as.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_as.c new file mode 100644 -index 000000000000..258dc6dac6c5 +index 000000000..258dc6dac --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_as.c @@ -0,0 +1,241 @@ @@ -97758,7 +97759,7 @@ index 000000000000..258dc6dac6c5 +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_defs.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_defs.h new file mode 100644 -index 000000000000..136aa526d41e +index 000000000..136aa526d --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_defs.h @@ -0,0 +1,135 @@ @@ -97899,7 +97900,7 @@ index 000000000000..136aa526d41e +#endif /* _KBASE_HWACCESS_GPU_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_hw.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_hw.c new file mode 100644 -index 000000000000..c7257117e98a +index 000000000..c7257117e --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_hw.c @@ -0,0 +1,1513 @@ @@ -99418,7 +99419,7 @@ index 000000000000..c7257117e98a +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_internal.h new file mode 100644 -index 000000000000..bfd55a6e2160 +index 000000000..bfd55a6e2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_internal.h @@ -0,0 +1,148 @@ @@ -99572,7 +99573,7 @@ index 000000000000..bfd55a6e2160 +#endif /* _KBASE_JM_HWACCESS_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.c new file mode 100644 -index 000000000000..7db2b353b67a +index 000000000..7db2b353b --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.c @@ -0,0 +1,1873 @@ @@ -101451,7 +101452,7 @@ index 000000000000..7db2b353b67a +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.h new file mode 100644 -index 000000000000..32be0bf44655 +index 000000000..32be0bf44 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_jm_rb.h @@ -0,0 +1,77 @@ @@ -101534,7 +101535,7 @@ index 000000000000..32be0bf44655 +#endif /* _KBASE_HWACCESS_GPU_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_backend.c new file mode 100644 -index 000000000000..cbc88f91a400 +index 000000000..cbc88f91a --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_backend.c @@ -0,0 +1,377 @@ @@ -101917,7 +101918,7 @@ index 000000000000..cbc88f91a400 +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_internal.h new file mode 100644 -index 000000000000..4f7c371a1f1a +index 000000000..4f7c371a1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_js_internal.h @@ -0,0 +1,72 @@ @@ -101995,7 +101996,7 @@ index 000000000000..4f7c371a1f1a +#endif /* _KBASE_JS_BACKEND_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.c new file mode 100644 -index 000000000000..9ce50758c240 +index 000000000..9ce50758c --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.c @@ -0,0 +1,131 @@ @@ -102132,7 +102133,7 @@ index 000000000000..9ce50758c240 +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.h new file mode 100644 -index 000000000000..07014ad360d8 +index 000000000..07014ad36 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_l2_mmu_config.h @@ -0,0 +1,36 @@ @@ -102174,7 +102175,7 @@ index 000000000000..07014ad360d8 +#endif /* _KBASE_L2_MMU_CONFIG_H */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.c new file mode 100644 -index 000000000000..6db7031764ea +index 000000000..6db703176 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.c @@ -0,0 +1,2229 @@ @@ -104409,7 +104410,7 @@ index 000000000000..6db7031764ea +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.h new file mode 100644 -index 000000000000..84842291c0f7 +index 000000000..84842291c --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.h @@ -0,0 +1,224 @@ @@ -104639,7 +104640,7 @@ index 000000000000..84842291c0f7 +#endif diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_error_generator.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_error_generator.c new file mode 100644 -index 000000000000..f310cc74cb24 +index 000000000..f310cc74c --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_error_generator.c @@ -0,0 +1,183 @@ @@ -104828,7 +104829,7 @@ index 000000000000..f310cc74cb24 +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.c new file mode 100644 -index 000000000000..e90e4df2f494 +index 000000000..e90e4df2f --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.c @@ -0,0 +1,244 @@ @@ -105078,7 +105079,7 @@ index 000000000000..e90e4df2f494 +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.h new file mode 100644 -index 000000000000..8f09afe3d1cc +index 000000000..8f09afe3d --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.h @@ -0,0 +1,151 @@ @@ -105235,7 +105236,7 @@ index 000000000000..8f09afe3d1cc +#endif /* _KBASE_MODEL_LINUX_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c new file mode 100644 -index 000000000000..bbf629065877 +index 000000000..bbf629065 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.c @@ -0,0 +1,73 @@ @@ -105314,7 +105315,7 @@ index 000000000000..bbf629065877 +KBASE_EXPORT_TEST_API(kbase_pm_always_on_policy_ops); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.h new file mode 100644 -index 000000000000..98d35dabec88 +index 000000000..98d35dabe --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_always_on.h @@ -0,0 +1,78 @@ @@ -105398,7 +105399,7 @@ index 000000000000..98d35dabec88 + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_backend.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_backend.c new file mode 100644 -index 000000000000..5c71fdf154b9 +index 000000000..5c71fdf15 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_backend.c @@ -0,0 +1,1238 @@ @@ -106642,7 +106643,7 @@ index 000000000000..5c71fdf154b9 +#endif diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.c new file mode 100644 -index 000000000000..e2b0a919282e +index 000000000..e2b0a9192 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.c @@ -0,0 +1,150 @@ @@ -106798,7 +106799,7 @@ index 000000000000..e2b0a919282e +} diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.h new file mode 100644 -index 000000000000..90dcaf5b67db +index 000000000..90dcaf5b6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca.h @@ -0,0 +1,88 @@ @@ -106892,7 +106893,7 @@ index 000000000000..90dcaf5b67db +#endif /* _KBASE_PM_CA_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca_devfreq.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca_devfreq.h new file mode 100644 -index 000000000000..d1e4b5327f8f +index 000000000..d1e4b5327 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_ca_devfreq.h @@ -0,0 +1,59 @@ @@ -106957,7 +106958,7 @@ index 000000000000..d1e4b5327f8f + diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.c new file mode 100644 -index 000000000000..f40b753850df +index 000000000..f40b75385 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.c @@ -0,0 +1,67 @@ @@ -107030,7 +107031,7 @@ index 000000000000..f40b753850df +KBASE_EXPORT_TEST_API(kbase_pm_coarse_demand_policy_ops); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.h new file mode 100644 -index 000000000000..a947e8f55643 +index 000000000..a947e8f55 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_coarse_demand.h @@ -0,0 +1,64 @@ @@ -107100,7 +107101,7 @@ index 000000000000..a947e8f55643 +#endif /* MALI_KBASE_PM_COARSE_DEMAND_H */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_defs.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_defs.h new file mode 100644 -index 000000000000..75d99a30efc0 +index 000000000..75d99a30e --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_defs.h @@ -0,0 +1,649 @@ @@ -107755,7 +107756,7 @@ index 000000000000..75d99a30efc0 +#endif /* _KBASE_PM_HWACCESS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_driver.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_driver.c new file mode 100644 -index 000000000000..5be8acd75d0a +index 000000000..5be8acd75 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_driver.c @@ -0,0 +1,3417 @@ @@ -111178,7 +111179,7 @@ index 000000000000..5be8acd75d0a +KBASE_EXPORT_TEST_API(kbase_pm_release_gpu_cycle_counter); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_internal.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_internal.h new file mode 100644 -index 000000000000..e66ce57d3120 +index 000000000..e66ce57d3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_internal.h @@ -0,0 +1,1021 @@ @@ -112205,7 +112206,7 @@ index 000000000000..e66ce57d3120 +#endif /* _KBASE_BACKEND_PM_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_l2_states.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_l2_states.h new file mode 100644 -index 000000000000..ef72f6083afd +index 000000000..ef72f6083 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_l2_states.h @@ -0,0 +1,50 @@ @@ -112261,7 +112262,7 @@ index 000000000000..ef72f6083afd +KBASEP_L2_STATE(RESET_WAIT) diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_mcu_states.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_mcu_states.h new file mode 100644 -index 000000000000..3b448e397e72 +index 000000000..3b448e397 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_mcu_states.h @@ -0,0 +1,108 @@ @@ -112375,7 +112376,7 @@ index 000000000000..3b448e397e72 +#endif /* IS_ENABLED(CONFIG_MALI_CORESIGHT) */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_metrics.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_metrics.c new file mode 100644 -index 000000000000..865f526f61f2 +index 000000000..865f526f6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_metrics.c @@ -0,0 +1,529 @@ @@ -112910,7 +112911,7 @@ index 000000000000..865f526f61f2 +#endif /* !MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.c new file mode 100644 -index 000000000000..4788f04132c1 +index 000000000..4788f0413 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.c @@ -0,0 +1,426 @@ @@ -113342,7 +113343,7 @@ index 000000000000..4788f04132c1 +KBASE_EXPORT_TEST_API(kbase_pm_set_policy); diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.h new file mode 100644 -index 000000000000..e8113659b92e +index 000000000..e8113659b --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_policy.h @@ -0,0 +1,105 @@ @@ -113453,7 +113454,7 @@ index 000000000000..e8113659b92e +#endif /* _KBASE_PM_POLICY_H_ */ diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_shader_states.h b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_shader_states.h new file mode 100644 -index 000000000000..8622ef78d363 +index 000000000..8622ef78d --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_pm_shader_states.h @@ -0,0 +1,79 @@ @@ -113538,7 +113539,7 @@ index 000000000000..8622ef78d363 +KBASEP_SHADER_STATE(RESET_WAIT) diff --git a/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_time.c b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_time.c new file mode 100644 -index 000000000000..1b33461796e2 +index 000000000..1b3346179 --- /dev/null +++ b/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_time.c @@ -0,0 +1,279 @@ @@ -113823,7 +113824,7 @@ index 000000000000..1b33461796e2 +} diff --git a/drivers/gpu/arm/bifrost/build.bp b/drivers/gpu/arm/bifrost/build.bp new file mode 100755 -index 000000000000..0a61a12d902a +index 000000000..0a61a12d9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/build.bp @@ -0,0 +1,280 @@ @@ -114109,7 +114110,7 @@ index 000000000000..0a61a12d902a +} diff --git a/drivers/gpu/arm/bifrost/context/Kbuild b/drivers/gpu/arm/bifrost/context/Kbuild new file mode 100755 -index 000000000000..156b46a12870 +index 000000000..156b46a12 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/Kbuild @@ -0,0 +1,27 @@ @@ -114142,7 +114143,7 @@ index 000000000000..156b46a12870 +endif diff --git a/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_csf.c b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_csf.c new file mode 100644 -index 000000000000..07d277b947d2 +index 000000000..07d277b94 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_csf.c @@ -0,0 +1,207 @@ @@ -114355,7 +114356,7 @@ index 000000000000..07d277b947d2 +KBASE_EXPORT_SYMBOL(kbase_destroy_context); diff --git a/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_jm.c b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_jm.c new file mode 100644 -index 000000000000..f49b4734ef1a +index 000000000..f49b4734e --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/backend/mali_kbase_context_jm.c @@ -0,0 +1,272 @@ @@ -114633,7 +114634,7 @@ index 000000000000..f49b4734ef1a +KBASE_EXPORT_SYMBOL(kbase_destroy_context); diff --git a/drivers/gpu/arm/bifrost/context/mali_kbase_context.c b/drivers/gpu/arm/bifrost/context/mali_kbase_context.c new file mode 100644 -index 000000000000..88be6c2e7587 +index 000000000..88be6c2e7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context.c @@ -0,0 +1,392 @@ @@ -115031,7 +115032,7 @@ index 000000000000..88be6c2e7587 +} diff --git a/drivers/gpu/arm/bifrost/context/mali_kbase_context.h b/drivers/gpu/arm/bifrost/context/mali_kbase_context.h new file mode 100644 -index 000000000000..7c90e2708fa3 +index 000000000..7c90e2708 --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context.h @@ -0,0 +1,141 @@ @@ -115178,7 +115179,7 @@ index 000000000000..7c90e2708fa3 +#endif /* _KBASE_CONTEXT_H_ */ diff --git a/drivers/gpu/arm/bifrost/context/mali_kbase_context_internal.h b/drivers/gpu/arm/bifrost/context/mali_kbase_context_internal.h new file mode 100644 -index 000000000000..1cde7394c705 +index 000000000..1cde7394c --- /dev/null +++ b/drivers/gpu/arm/bifrost/context/mali_kbase_context_internal.h @@ -0,0 +1,54 @@ @@ -115238,7 +115239,7 @@ index 000000000000..1cde7394c705 +void kbase_context_remove_from_dev_list(struct kbase_context *kctx); diff --git a/drivers/gpu/arm/bifrost/csf/Kbuild b/drivers/gpu/arm/bifrost/csf/Kbuild new file mode 100755 -index 000000000000..44217dba10c0 +index 000000000..44217dba1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/Kbuild @@ -0,0 +1,58 @@ @@ -115302,7 +115303,7 @@ index 000000000000..44217dba10c0 +endif diff --git a/drivers/gpu/arm/bifrost/csf/ipa_control/Kbuild b/drivers/gpu/arm/bifrost/csf/ipa_control/Kbuild new file mode 100755 -index 000000000000..dc30281e4781 +index 000000000..dc30281e4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/ipa_control/Kbuild @@ -0,0 +1,22 @@ @@ -115330,7 +115331,7 @@ index 000000000000..dc30281e4781 + csf/ipa_control/mali_kbase_csf_ipa_control.o diff --git a/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.c b/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.c new file mode 100644 -index 000000000000..c81d0a5a7236 +index 000000000..c81d0a5a7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.c @@ -0,0 +1,1063 @@ @@ -116399,7 +116400,7 @@ index 000000000000..c81d0a5a7236 + diff --git a/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.h b/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.h new file mode 100644 -index 000000000000..69ff8973bac4 +index 000000000..69ff8973b --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/ipa_control/mali_kbase_csf_ipa_control.h @@ -0,0 +1,271 @@ @@ -116676,7 +116677,7 @@ index 000000000000..69ff8973bac4 +#endif /* _KBASE_CSF_IPA_CONTROL_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c new file mode 100644 -index 000000000000..7a939fc3382d +index 000000000..7a939fc33 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.c @@ -0,0 +1,3289 @@ @@ -119971,7 +119972,7 @@ index 000000000000..7a939fc3382d +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.h new file mode 100644 -index 000000000000..dd947dcbab1c +index 000000000..dd947dcba --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf.h @@ -0,0 +1,506 @@ @@ -120483,7 +120484,7 @@ index 000000000000..dd947dcbab1c +#endif /* _KBASE_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.c new file mode 100644 -index 000000000000..516a33ff7465 +index 000000000..516a33ff7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.c @@ -0,0 +1,191 @@ @@ -120680,7 +120681,7 @@ index 000000000000..516a33ff7465 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.h new file mode 100644 -index 000000000000..435a993955fe +index 000000000..435a99395 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_cpu_queue_debugfs.h @@ -0,0 +1,90 @@ @@ -120776,7 +120777,7 @@ index 000000000000..435a993955fe +#endif /* _KBASE_CSF_CPU_QUEUE_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c new file mode 100644 -index 000000000000..e96044ae6239 +index 000000000..e96044ae6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.c @@ -0,0 +1,767 @@ @@ -121549,7 +121550,7 @@ index 000000000000..e96044ae6239 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.h new file mode 100644 -index 000000000000..16a548bf8acb +index 000000000..16a548bf8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_csg_debugfs.h @@ -0,0 +1,54 @@ @@ -121609,7 +121610,7 @@ index 000000000000..16a548bf8acb +#endif /* _KBASE_CSF_CSG_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_defs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_defs.h new file mode 100644 -index 000000000000..6fa0e27d657f +index 000000000..6fa0e27d6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_defs.h @@ -0,0 +1,1666 @@ @@ -123281,7 +123282,7 @@ index 000000000000..6fa0e27d657f +#endif /* _KBASE_CSF_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.c new file mode 100644 -index 000000000000..49e52938499f +index 000000000..49e529384 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.c @@ -0,0 +1,265 @@ @@ -123552,7 +123553,7 @@ index 000000000000..49e52938499f +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.h new file mode 100644 -index 000000000000..52122a9ef4d1 +index 000000000..52122a9ef --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_event.h @@ -0,0 +1,171 @@ @@ -123729,7 +123730,7 @@ index 000000000000..52122a9ef4d1 +#endif /* _KBASE_CSF_EVENT_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.c new file mode 100644 -index 000000000000..42bff1e91584 +index 000000000..42bff1e91 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.c @@ -0,0 +1,3144 @@ @@ -126879,7 +126880,7 @@ index 000000000000..42bff1e91584 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.h new file mode 100644 -index 000000000000..714a14001189 +index 000000000..714a14001 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware.h @@ -0,0 +1,916 @@ @@ -127801,7 +127802,7 @@ index 000000000000..714a14001189 +#endif diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.c new file mode 100644 -index 000000000000..c895b080143a +index 000000000..c895b0801 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.c @@ -0,0 +1,354 @@ @@ -128161,7 +128162,7 @@ index 000000000000..c895b080143a +#endif /* CONFIG_SYSFS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.h new file mode 100644 -index 000000000000..b227cf158925 +index 000000000..b227cf158 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_cfg.h @@ -0,0 +1,72 @@ @@ -128239,7 +128240,7 @@ index 000000000000..b227cf158925 +#endif /* _KBASE_CSF_FIRMWARE_CFG_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.c new file mode 100644 -index 000000000000..f0a10d197eec +index 000000000..f0a10d197 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.c @@ -0,0 +1,807 @@ @@ -129052,7 +129053,7 @@ index 000000000000..f0a10d197eec +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.h new file mode 100644 -index 000000000000..0537dca4f37f +index 000000000..0537dca4f --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_core_dump.h @@ -0,0 +1,65 @@ @@ -129123,7 +129124,7 @@ index 000000000000..0537dca4f37f +#endif /* _KBASE_CSF_FIRMWARE_CORE_DUMP_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.c new file mode 100644 -index 000000000000..6e0d3c2f5071 +index 000000000..6e0d3c2f5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.c @@ -0,0 +1,451 @@ @@ -129580,7 +129581,7 @@ index 000000000000..6e0d3c2f5071 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.h new file mode 100644 -index 000000000000..1008320464a9 +index 000000000..100832046 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_log.h @@ -0,0 +1,77 @@ @@ -129663,7 +129664,7 @@ index 000000000000..1008320464a9 +#endif /* _KBASE_CSF_FIRMWARE_LOG_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c new file mode 100644 -index 000000000000..833947facce3 +index 000000000..833947fac --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_firmware_no_mali.c @@ -0,0 +1,1661 @@ @@ -131330,7 +131331,7 @@ index 000000000000..833947facce3 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.c new file mode 100644 -index 000000000000..7c14b8eb554c +index 000000000..7c14b8eb5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.c @@ -0,0 +1,236 @@ @@ -131572,7 +131573,7 @@ index 000000000000..7c14b8eb554c +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.h new file mode 100644 -index 000000000000..9aab7abfb649 +index 000000000..9aab7abfb --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_heap_context_alloc.h @@ -0,0 +1,75 @@ @@ -131653,7 +131654,7 @@ index 000000000000..9aab7abfb649 +#endif /* _KBASE_CSF_HEAP_CONTEXT_ALLOC_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.c new file mode 100644 -index 000000000000..da8dde239972 +index 000000000..da8dde239 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.c @@ -0,0 +1,2595 @@ @@ -134254,7 +134255,7 @@ index 000000000000..da8dde239972 +KBASE_EXPORT_TEST_API(kbase_csf_kcpu_queue_new); diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.h new file mode 100644 -index 000000000000..5cad8b200c93 +index 000000000..5cad8b200 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu.h @@ -0,0 +1,384 @@ @@ -134644,7 +134645,7 @@ index 000000000000..5cad8b200c93 +#endif /* _KBASE_CSF_KCPU_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.c new file mode 100644 -index 000000000000..fa877778ca79 +index 000000000..fa877778c --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.c @@ -0,0 +1,193 @@ @@ -134843,7 +134844,7 @@ index 000000000000..fa877778ca79 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.h new file mode 100644 -index 000000000000..08f2fda034a2 +index 000000000..08f2fda03 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_kcpu_debugfs.h @@ -0,0 +1,37 @@ @@ -134886,7 +134887,7 @@ index 000000000000..08f2fda034a2 +#endif /* _KBASE_CSF_KCPU_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.c new file mode 100644 -index 000000000000..4056a9d933d7 +index 000000000..4056a9d93 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.c @@ -0,0 +1,817 @@ @@ -135709,7 +135710,7 @@ index 000000000000..4056a9d933d7 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.h new file mode 100644 -index 000000000000..61943cbbf083 +index 000000000..61943cbbf --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_mcu_shared_reg.h @@ -0,0 +1,139 @@ @@ -135854,7 +135855,7 @@ index 000000000000..61943cbbf083 +#endif /* _KBASE_CSF_MCU_SHARED_REG_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.c new file mode 100644 -index 000000000000..bf1835b5be25 +index 000000000..bf1835b5b --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.c @@ -0,0 +1,163 @@ @@ -136023,7 +136024,7 @@ index 000000000000..bf1835b5be25 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.h new file mode 100644 -index 000000000000..8c1aa919fbb0 +index 000000000..8c1aa919f --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_protected_memory.h @@ -0,0 +1,75 @@ @@ -136104,7 +136105,7 @@ index 000000000000..8c1aa919fbb0 +#endif diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_registers.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_registers.h new file mode 100644 -index 000000000000..b5bf7bbbc056 +index 000000000..b5bf7bbbc --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_registers.h @@ -0,0 +1,1678 @@ @@ -137788,7 +137789,7 @@ index 000000000000..b5bf7bbbc056 +#endif /* _KBASE_CSF_REGISTERS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_reset_gpu.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_reset_gpu.c new file mode 100644 -index 000000000000..fe3b91a4845d +index 000000000..fe3b91a48 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_reset_gpu.c @@ -0,0 +1,637 @@ @@ -138431,7 +138432,7 @@ index 000000000000..fe3b91a4845d +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.c new file mode 100644 -index 000000000000..edaa6d17e304 +index 000000000..edaa6d17e --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.c @@ -0,0 +1,6889 @@ @@ -145326,7 +145327,7 @@ index 000000000000..edaa6d17e304 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.h new file mode 100644 -index 000000000000..d22d7c8b9dce +index 000000000..d22d7c8b9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_scheduler.h @@ -0,0 +1,681 @@ @@ -146013,7 +146014,7 @@ index 000000000000..d22d7c8b9dce +#endif /* _KBASE_CSF_SCHEDULER_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.c new file mode 100644 -index 000000000000..a5e0ab5eaf17 +index 000000000..a5e0ab5ea --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.c @@ -0,0 +1,788 @@ @@ -146807,7 +146808,7 @@ index 000000000000..a5e0ab5eaf17 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.h new file mode 100644 -index 000000000000..177e15d85341 +index 000000000..177e15d85 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.h @@ -0,0 +1,37 @@ @@ -146850,7 +146851,7 @@ index 000000000000..177e15d85341 +#endif /* _KBASE_CSF_SYNC_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.c new file mode 100644 -index 000000000000..8072a8bd2c32 +index 000000000..8072a8bd2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.c @@ -0,0 +1,1372 @@ @@ -148228,7 +148229,7 @@ index 000000000000..8072a8bd2c32 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.h new file mode 100644 -index 000000000000..1b5cb560894f +index 000000000..1b5cb5608 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap.h @@ -0,0 +1,142 @@ @@ -148376,7 +148377,7 @@ index 000000000000..1b5cb560894f +#endif diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.c new file mode 100644 -index 000000000000..96e0f2829854 +index 000000000..96e0f2829 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.c @@ -0,0 +1,162 @@ @@ -148544,7 +148545,7 @@ index 000000000000..96e0f2829854 + diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.h new file mode 100644 -index 000000000000..4a1b413eff6d +index 000000000..4a1b413ef --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_debugfs.h @@ -0,0 +1,44 @@ @@ -148594,7 +148595,7 @@ index 000000000000..4a1b413eff6d +#endif /* _KBASE_CSF_TILER_HEAP_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_def.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_def.h new file mode 100644 -index 000000000000..96f2b03d2d31 +index 000000000..96f2b03d2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_def.h @@ -0,0 +1,140 @@ @@ -148740,7 +148741,7 @@ index 000000000000..96f2b03d2d31 +#endif /* !_KBASE_CSF_TILER_HEAP_DEF_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.c new file mode 100644 -index 000000000000..6357e3518d87 +index 000000000..6357e3518 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.c @@ -0,0 +1,359 @@ @@ -149105,7 +149106,7 @@ index 000000000000..6357e3518d87 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.h new file mode 100644 -index 000000000000..b6e580e48df6 +index 000000000..b6e580e48 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tiler_heap_reclaim.h @@ -0,0 +1,80 @@ @@ -149191,7 +149192,7 @@ index 000000000000..b6e580e48df6 +#endif diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c new file mode 100644 -index 000000000000..ea6c11624157 +index 000000000..ea6c11624 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.c @@ -0,0 +1,177 @@ @@ -149374,7 +149375,7 @@ index 000000000000..ea6c11624157 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.h new file mode 100644 -index 000000000000..b406eaad2d51 +index 000000000..b406eaad2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_timeout.h @@ -0,0 +1,66 @@ @@ -149446,7 +149447,7 @@ index 000000000000..b406eaad2d51 +#endif /* _KBASE_CSF_TIMEOUT_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.c new file mode 100644 -index 000000000000..6859d65295c4 +index 000000000..6859d6529 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.c @@ -0,0 +1,441 @@ @@ -149893,7 +149894,7 @@ index 000000000000..6859d65295c4 +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.h new file mode 100644 -index 000000000000..2f8eb1dd4168 +index 000000000..2f8eb1dd4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_tl_reader.h @@ -0,0 +1,144 @@ @@ -150043,7 +150044,7 @@ index 000000000000..2f8eb1dd4168 +#endif /* _KBASE_CSFFW_TL_READER_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c new file mode 100644 -index 000000000000..46872f937dbf +index 000000000..46872f937 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c @@ -0,0 +1,555 @@ @@ -150604,7 +150605,7 @@ index 000000000000..46872f937dbf +} diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.h new file mode 100644 -index 000000000000..0389d093a904 +index 000000000..0389d093a --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.h @@ -0,0 +1,187 @@ @@ -150797,7 +150798,7 @@ index 000000000000..0389d093a904 +#endif /* _KBASE_CSF_TRACE_BUFFER_H_ */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.c b/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.c new file mode 100644 -index 000000000000..185779c16815 +index 000000000..185779c16 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.c @@ -0,0 +1,271 @@ @@ -151074,7 +151075,7 @@ index 000000000000..185779c16815 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.h b/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.h new file mode 100644 -index 000000000000..6e9b1a9d51de +index 000000000..6e9b1a9d5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/csf/mali_kbase_debug_csf_fault.h @@ -0,0 +1,137 @@ @@ -151217,7 +151218,7 @@ index 000000000000..6e9b1a9d51de +#endif /*_KBASE_DEBUG_CSF_FAULT_H*/ diff --git a/drivers/gpu/arm/bifrost/debug/Kbuild b/drivers/gpu/arm/bifrost/debug/Kbuild new file mode 100755 -index 000000000000..ebf3ddb763a2 +index 000000000..ebf3ddb76 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/Kbuild @@ -0,0 +1,28 @@ @@ -151251,7 +151252,7 @@ index 000000000000..ebf3ddb763a2 +endif diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_csf.c b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_csf.c new file mode 100644 -index 000000000000..ff5f947e2da5 +index 000000000..ff5f947e2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_csf.c @@ -0,0 +1,851 @@ @@ -152108,7 +152109,7 @@ index 000000000000..ff5f947e2da5 +} diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_internal_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_internal_csf.h new file mode 100644 -index 000000000000..06d62dc70182 +index 000000000..06d62dc70 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_coresight_internal_csf.h @@ -0,0 +1,182 @@ @@ -152296,7 +152297,7 @@ index 000000000000..06d62dc70182 +#endif /* _KBASE_DEBUG_CORESIGHT_INTERNAL_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_csf.h new file mode 100644 -index 000000000000..41b2b00f18c8 +index 000000000..41b2b00f1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_csf.h @@ -0,0 +1,322 @@ @@ -152624,7 +152625,7 @@ index 000000000000..41b2b00f18c8 + /* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_jm.h new file mode 100644 -index 000000000000..6ba98b7c4a6c +index 000000000..6ba98b7c4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_codes_jm.h @@ -0,0 +1,206 @@ @@ -152836,7 +152837,7 @@ index 000000000000..6ba98b7c4a6c +/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.c b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.c new file mode 100644 -index 000000000000..cff6f8959c35 +index 000000000..cff6f8959 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.c @@ -0,0 +1,199 @@ @@ -153041,7 +153042,7 @@ index 000000000000..cff6f8959c35 +#endif /* KBASE_KTRACE_TARGET_RBUF */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.h new file mode 100644 -index 000000000000..e3d03730734d +index 000000000..e3d037307 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_csf.h @@ -0,0 +1,203 @@ @@ -153250,7 +153251,7 @@ index 000000000000..e3d03730734d +#endif /* _KBASE_DEBUG_KTRACE_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_csf.h new file mode 100644 -index 000000000000..1896e10ed4ab +index 000000000..1896e10ed --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_csf.h @@ -0,0 +1,116 @@ @@ -153372,7 +153373,7 @@ index 000000000000..1896e10ed4ab +#endif /* _KBASE_DEBUG_KTRACE_DEFS_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_jm.h new file mode 100644 -index 000000000000..efa8ab05b1cd +index 000000000..efa8ab05b --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_defs_jm.h @@ -0,0 +1,112 @@ @@ -153490,7 +153491,7 @@ index 000000000000..efa8ab05b1cd +#endif /* _KBASE_DEBUG_KTRACE_DEFS_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.c b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.c new file mode 100644 -index 000000000000..6597a15e5000 +index 000000000..6597a15e5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.c @@ -0,0 +1,121 @@ @@ -153617,7 +153618,7 @@ index 000000000000..6597a15e5000 +#endif /* KBASE_KTRACE_TARGET_RBUF */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.h new file mode 100644 -index 000000000000..41be7a120dcc +index 000000000..41be7a120 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_ktrace_jm.h @@ -0,0 +1,309 @@ @@ -153932,7 +153933,7 @@ index 000000000000..41be7a120dcc +#endif /* _KBASE_DEBUG_KTRACE_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_csf.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_csf.h new file mode 100644 -index 000000000000..ddcac906c492 +index 000000000..ddcac906c --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_csf.h @@ -0,0 +1,267 @@ @@ -154205,7 +154206,7 @@ index 000000000000..ddcac906c492 +#endif /* !defined(_KBASE_DEBUG_LINUX_KTRACE_CSF_H_) || defined(TRACE_HEADER_MULTI_READ) */ diff --git a/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_jm.h b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_jm.h new file mode 100644 -index 000000000000..8fa4e2a7c10b +index 000000000..8fa4e2a7c --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/backend/mali_kbase_debug_linux_ktrace_jm.h @@ -0,0 +1,174 @@ @@ -154385,7 +154386,7 @@ index 000000000000..8fa4e2a7c10b +#endif /* !defined(_KBASE_DEBUG_LINUX_KTRACE_JM_H_) || defined(TRACE_HEADER_MULTI_READ)*/ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.c b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.c new file mode 100644 -index 000000000000..f521b47120fb +index 000000000..f521b4712 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.c @@ -0,0 +1,361 @@ @@ -154752,7 +154753,7 @@ index 000000000000..f521b47120fb +#endif /* KBASE_KTRACE_TARGET_RBUF */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.h new file mode 100644 -index 000000000000..11f0b5c42c89 +index 000000000..11f0b5c42 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace.h @@ -0,0 +1,238 @@ @@ -154996,7 +154997,7 @@ index 000000000000..11f0b5c42c89 +#endif /* _KBASE_DEBUG_KTRACE_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_codes.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_codes.h new file mode 100644 -index 000000000000..6103c3ee04a8 +index 000000000..6103c3ee0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_codes.h @@ -0,0 +1,181 @@ @@ -155183,7 +155184,7 @@ index 000000000000..6103c3ee04a8 +/* ***** THE LACK OF HEADER GUARDS IS INTENTIONAL ***** */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_defs.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_defs.h new file mode 100644 -index 000000000000..a0fc9e51d274 +index 000000000..a0fc9e51d --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_defs.h @@ -0,0 +1,187 @@ @@ -155376,7 +155377,7 @@ index 000000000000..a0fc9e51d274 +#endif /* _KBASE_DEBUG_KTRACE_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_internal.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_internal.h new file mode 100644 -index 000000000000..ba93f29fe5e6 +index 000000000..ba93f29fe --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_ktrace_internal.h @@ -0,0 +1,90 @@ @@ -155472,7 +155473,7 @@ index 000000000000..ba93f29fe5e6 +#endif /* _KBASE_DEBUG_KTRACE_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_linux_ktrace.h b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_linux_ktrace.h new file mode 100644 -index 000000000000..6d96647161b4 +index 000000000..6d9664716 --- /dev/null +++ b/drivers/gpu/arm/bifrost/debug/mali_kbase_debug_linux_ktrace.h @@ -0,0 +1,123 @@ @@ -155601,7 +155602,7 @@ index 000000000000..6d96647161b4 +#endif /* !defined(_KBASE_DEBUG_LINUX_KTRACE_H_) || defined(TRACE_HEADER_MULTI_READ) */ diff --git a/drivers/gpu/arm/bifrost/device/Kbuild b/drivers/gpu/arm/bifrost/device/Kbuild new file mode 100755 -index 000000000000..723ffd215696 +index 000000000..723ffd215 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/Kbuild @@ -0,0 +1,33 @@ @@ -155640,7 +155641,7 @@ index 000000000000..723ffd215696 +endif diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_csf.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_csf.c new file mode 100644 -index 000000000000..f7054f5b0090 +index 000000000..f7054f5b0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_csf.c @@ -0,0 +1,525 @@ @@ -156171,7 +156172,7 @@ index 000000000000..f7054f5b0090 +KBASE_EXPORT_TEST_API(kbase_device_firmware_init_once); diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_csf.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_csf.c new file mode 100644 -index 000000000000..2abd62aaa8b1 +index 000000000..2abd62aaa --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_csf.c @@ -0,0 +1,252 @@ @@ -156429,7 +156430,7 @@ index 000000000000..2abd62aaa8b1 +#endif /* !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_jm.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_jm.c new file mode 100644 -index 000000000000..38223af213d1 +index 000000000..38223af21 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_hw_jm.c @@ -0,0 +1,143 @@ @@ -156578,7 +156579,7 @@ index 000000000000..38223af213d1 +#endif /* IS_ENABLED(CONFIG_MALI_REAL_HW) */ diff --git a/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_jm.c b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_jm.c new file mode 100644 -index 000000000000..2d3672383630 +index 000000000..2d3672383 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/backend/mali_kbase_device_jm.c @@ -0,0 +1,344 @@ @@ -156928,7 +156929,7 @@ index 000000000000..2d3672383630 +} diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device.c b/drivers/gpu/arm/bifrost/device/mali_kbase_device.c new file mode 100644 -index 000000000000..b2b0cfd6cc97 +index 000000000..b2b0cfd6c --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device.c @@ -0,0 +1,611 @@ @@ -157545,7 +157546,7 @@ index 000000000000..b2b0cfd6cc97 +} diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device.h b/drivers/gpu/arm/bifrost/device/mali_kbase_device.h new file mode 100644 -index 000000000000..f025011009d5 +index 000000000..f02501100 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device.h @@ -0,0 +1,227 @@ @@ -157778,7 +157779,7 @@ index 000000000000..f025011009d5 +void kbase_gpu_interrupt(struct kbase_device *kbdev, u32 val); diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device_hw.c b/drivers/gpu/arm/bifrost/device/mali_kbase_device_hw.c new file mode 100644 -index 000000000000..d55495045892 +index 000000000..d55495045 --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device_hw.c @@ -0,0 +1,291 @@ @@ -158075,7 +158076,7 @@ index 000000000000..d55495045892 +} diff --git a/drivers/gpu/arm/bifrost/device/mali_kbase_device_internal.h b/drivers/gpu/arm/bifrost/device/mali_kbase_device_internal.h new file mode 100644 -index 000000000000..6f77592dfff2 +index 000000000..6f77592df --- /dev/null +++ b/drivers/gpu/arm/bifrost/device/mali_kbase_device_internal.h @@ -0,0 +1,101 @@ @@ -158182,7 +158183,7 @@ index 000000000000..6f77592dfff2 +#endif /* MALI_USE_CSF && !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ diff --git a/drivers/gpu/arm/bifrost/gpu/Kbuild b/drivers/gpu/arm/bifrost/gpu/Kbuild new file mode 100755 -index 000000000000..f3a48caf6b2c +index 000000000..f3a48caf6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/Kbuild @@ -0,0 +1,27 @@ @@ -158215,7 +158216,7 @@ index 000000000000..f3a48caf6b2c +endif diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_csf.c b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_csf.c new file mode 100644 -index 000000000000..60ba9beab91c +index 000000000..60ba9beab --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_csf.c @@ -0,0 +1,179 @@ @@ -158400,7 +158401,7 @@ index 000000000000..60ba9beab91c +} diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_jm.c b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_jm.c new file mode 100644 -index 000000000000..7f3743ca6432 +index 000000000..7f3743ca6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_fault_jm.c @@ -0,0 +1,176 @@ @@ -158582,7 +158583,7 @@ index 000000000000..7f3743ca6432 +} diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h new file mode 100644 -index 000000000000..e7457ddb5534 +index 000000000..e7457ddb5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h @@ -0,0 +1,381 @@ @@ -158969,7 +158970,7 @@ index 000000000000..e7457ddb5534 +#endif /* _KBASE_GPU_REGMAP_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h new file mode 100644 -index 000000000000..f86f493c7f7e +index 000000000..f86f493c7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h @@ -0,0 +1,276 @@ @@ -159251,7 +159252,7 @@ index 000000000000..f86f493c7f7e +#endif /* _KBASE_GPU_REGMAP_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.c b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.c new file mode 100644 -index 000000000000..8a84ef54100a +index 000000000..8a84ef541 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu.c @@ -0,0 +1,41 @@ @@ -159298,7 +159299,7 @@ index 000000000000..8a84ef54100a +} diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_fault.h b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_fault.h new file mode 100644 -index 000000000000..6a937a5ed16d +index 000000000..6a937a5ed --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_fault.h @@ -0,0 +1,48 @@ @@ -159352,7 +159353,7 @@ index 000000000000..6a937a5ed16d +#endif /* _KBASE_GPU_FAULT_H_ */ diff --git a/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h new file mode 100644 -index 000000000000..6cef2bdd11e0 +index 000000000..6cef2bdd1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h @@ -0,0 +1,637 @@ @@ -159995,7 +159996,7 @@ index 000000000000..6cef2bdd11e0 +#endif /* _KBASE_GPU_REGMAP_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/Kbuild b/drivers/gpu/arm/bifrost/hwcnt/Kbuild new file mode 100755 -index 000000000000..c1a381b24593 +index 000000000..c1a381b24 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/Kbuild @@ -0,0 +1,37 @@ @@ -160038,7 +160039,7 @@ index 000000000000..c1a381b24593 +endif diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend.h b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend.h new file mode 100644 -index 000000000000..6cfa6f5ee6f4 +index 000000000..6cfa6f5ee --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend.h @@ -0,0 +1,225 @@ @@ -160269,7 +160270,7 @@ index 000000000000..6cfa6f5ee6f4 +#endif /* _KBASE_HWCNT_BACKEND_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.c b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.c new file mode 100644 -index 000000000000..4a429a6cd1ae +index 000000000..4a429a6cd --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.c @@ -0,0 +1,1896 @@ @@ -162171,7 +162172,7 @@ index 000000000000..4a429a6cd1ae +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.h b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.h new file mode 100644 -index 000000000000..9c5a5c996ebd +index 000000000..9c5a5c996 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf.h @@ -0,0 +1,153 @@ @@ -162330,7 +162331,7 @@ index 000000000000..9c5a5c996ebd +#endif /* _KBASE_HWCNT_BACKEND_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if.h b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if.h new file mode 100644 -index 000000000000..382a3adaa127 +index 000000000..382a3adaa --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if.h @@ -0,0 +1,302 @@ @@ -162638,7 +162639,7 @@ index 000000000000..382a3adaa127 +#endif /* #define _KBASE_HWCNT_BACKEND_CSF_IF_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.c b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.c new file mode 100644 -index 000000000000..b11f3a4e50e2 +index 000000000..b11f3a4e5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.c @@ -0,0 +1,787 @@ @@ -163431,7 +163432,7 @@ index 000000000000..b11f3a4e50e2 +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.h b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.h new file mode 100644 -index 000000000000..71d1506694f4 +index 000000000..71d150669 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_csf_if_fw.h @@ -0,0 +1,49 @@ @@ -163486,7 +163487,7 @@ index 000000000000..71d1506694f4 +#endif /* _KBASE_HWCNT_BACKEND_CSF_IF_FW_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.c b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.c new file mode 100644 -index 000000000000..669701c29152 +index 000000000..669701c29 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.c @@ -0,0 +1,860 @@ @@ -164352,7 +164353,7 @@ index 000000000000..669701c29152 +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.h b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.h new file mode 100644 -index 000000000000..4a6293c25473 +index 000000000..4a6293c25 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm.h @@ -0,0 +1,58 @@ @@ -164416,7 +164417,7 @@ index 000000000000..4a6293c25473 +#endif /* _KBASE_HWCNT_BACKEND_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.c b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.c new file mode 100644 -index 000000000000..564700b2d978 +index 000000000..564700b2d --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.c @@ -0,0 +1,829 @@ @@ -165251,7 +165252,7 @@ index 000000000000..564700b2d978 +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.h b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.h new file mode 100644 -index 000000000000..02a7952cced2 +index 000000000..02a7952cc --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/backend/mali_kbase_hwcnt_backend_jm_watchdog.h @@ -0,0 +1,65 @@ @@ -165322,7 +165323,7 @@ index 000000000000..02a7952cced2 +#endif /* _KBASE_HWCNT_BACKEND_JM_WATCHDOG_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt.c b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt.c new file mode 100644 -index 000000000000..34deb5d9e3fc +index 000000000..34deb5d9e --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt.c @@ -0,0 +1,775 @@ @@ -166103,7 +166104,7 @@ index 000000000000..34deb5d9e3fc +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_accumulator.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_accumulator.h new file mode 100644 -index 000000000000..069e02068902 +index 000000000..069e02068 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_accumulator.h @@ -0,0 +1,139 @@ @@ -166248,7 +166249,7 @@ index 000000000000..069e02068902 +#endif /* _KBASE_HWCNT_ACCUMULATOR_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_context.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_context.h new file mode 100644 -index 000000000000..89732a908789 +index 000000000..89732a908 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_context.h @@ -0,0 +1,148 @@ @@ -166402,7 +166403,7 @@ index 000000000000..89732a908789 +#endif /* _KBASE_HWCNT_CONTEXT_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.c b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.c new file mode 100644 -index 000000000000..74916dab060d +index 000000000..74916dab0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.c @@ -0,0 +1,738 @@ @@ -167146,7 +167147,7 @@ index 000000000000..74916dab060d +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.h new file mode 100644 -index 000000000000..a49c31e52f98 +index 000000000..a49c31e52 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu.h @@ -0,0 +1,407 @@ @@ -167559,7 +167560,7 @@ index 000000000000..a49c31e52f98 +#endif /* _KBASE_HWCNT_GPU_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.c b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.c new file mode 100644 -index 000000000000..0cf2f94cfb87 +index 000000000..0cf2f94cf --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.c @@ -0,0 +1,298 @@ @@ -167863,7 +167864,7 @@ index 000000000000..0cf2f94cfb87 +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.h new file mode 100644 -index 000000000000..afd236d71a7c +index 000000000..afd236d71 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_gpu_narrow.h @@ -0,0 +1,330 @@ @@ -168199,7 +168200,7 @@ index 000000000000..afd236d71a7c +#endif /* _KBASE_HWCNT_GPU_NARROW_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.c b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.c new file mode 100644 -index 000000000000..763eb315d9a2 +index 000000000..763eb315d --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.c @@ -0,0 +1,511 @@ @@ -168716,7 +168717,7 @@ index 000000000000..763eb315d9a2 +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.h new file mode 100644 -index 000000000000..5c5ada401768 +index 000000000..5c5ada401 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_types.h @@ -0,0 +1,1231 @@ @@ -169953,7 +169954,7 @@ index 000000000000..5c5ada401768 +#endif /* _KBASE_HWCNT_TYPES_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.c b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.c new file mode 100644 -index 000000000000..d618764d3b32 +index 000000000..d618764d3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.c @@ -0,0 +1,744 @@ @@ -170703,7 +170704,7 @@ index 000000000000..d618764d3b32 +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.h new file mode 100644 -index 000000000000..485ba74960f6 +index 000000000..485ba7496 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_virtualizer.h @@ -0,0 +1,151 @@ @@ -170860,7 +170861,7 @@ index 000000000000..485ba74960f6 +#endif /* _KBASE_HWCNT_VIRTUALIZER_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if.h new file mode 100644 -index 000000000000..501c0087b7e6 +index 000000000..501c0087b --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if.h @@ -0,0 +1,89 @@ @@ -170955,7 +170956,7 @@ index 000000000000..501c0087b7e6 +#endif /* _KBASE_HWCNT_WATCHDOG_IF_H_ */ diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.c b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.c new file mode 100644 -index 000000000000..4caa832cd587 +index 000000000..4caa832cd --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.c @@ -0,0 +1,157 @@ @@ -171118,7 +171119,7 @@ index 000000000000..4caa832cd587 +} diff --git a/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.h b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.h new file mode 100644 -index 000000000000..a545ad3e39e3 +index 000000000..a545ad3e3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/hwcnt/mali_kbase_hwcnt_watchdog_if_timer.h @@ -0,0 +1,48 @@ @@ -171172,7 +171173,7 @@ index 000000000000..a545ad3e39e3 +#endif /* _KBASE_HWCNT_WATCHDOG_IF_TIMER_H_ */ diff --git a/drivers/gpu/arm/bifrost/ipa/Kbuild b/drivers/gpu/arm/bifrost/ipa/Kbuild new file mode 100755 -index 000000000000..0be664c47b54 +index 000000000..0be664c47 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/Kbuild @@ -0,0 +1,35 @@ @@ -171213,7 +171214,7 @@ index 000000000000..0be664c47b54 +endif diff --git a/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.c b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.c new file mode 100644 -index 000000000000..60b061ef623d +index 000000000..60b061ef6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.c @@ -0,0 +1,457 @@ @@ -171676,7 +171677,7 @@ index 000000000000..60b061ef623d +} diff --git a/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.h b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.h new file mode 100644 -index 000000000000..37d2efc59fcc +index 000000000..37d2efc59 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_csf.h @@ -0,0 +1,159 @@ @@ -171841,7 +171842,7 @@ index 000000000000..37d2efc59fcc +#endif /* _KBASE_IPA_COUNTER_COMMON_CSF_H_ */ diff --git a/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.c b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.c new file mode 100644 -index 000000000000..34515a934b33 +index 000000000..34515a934 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.c @@ -0,0 +1,355 @@ @@ -172202,7 +172203,7 @@ index 000000000000..34515a934b33 +} diff --git a/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.h b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.h new file mode 100644 -index 000000000000..6089610847b4 +index 000000000..608961084 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_common_jm.h @@ -0,0 +1,234 @@ @@ -172442,7 +172443,7 @@ index 000000000000..6089610847b4 +#endif /* _KBASE_IPA_COUNTER_COMMON_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_csf.c b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_csf.c new file mode 100644 -index 000000000000..21b4e52884c5 +index 000000000..21b4e5288 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_csf.c @@ -0,0 +1,280 @@ @@ -172728,7 +172729,7 @@ index 000000000000..21b4e52884c5 +} diff --git a/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_jm.c b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_jm.c new file mode 100644 -index 000000000000..2092db042dec +index 000000000..2092db042 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/backend/mali_kbase_ipa_counter_jm.c @@ -0,0 +1,561 @@ @@ -173295,7 +173296,7 @@ index 000000000000..2092db042dec +} diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c new file mode 100644 -index 000000000000..b2e6bc459f22 +index 000000000..b2e6bc459 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.c @@ -0,0 +1,778 @@ @@ -174079,7 +174080,7 @@ index 000000000000..b2e6bc459f22 +} diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h new file mode 100644 -index 000000000000..c875ffb4990e +index 000000000..c875ffb49 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h @@ -0,0 +1,304 @@ @@ -174389,7 +174390,7 @@ index 000000000000..c875ffb4990e +#endif diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c new file mode 100644 -index 000000000000..a0963bbb2068 +index 000000000..a0963bbb2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.c @@ -0,0 +1,324 @@ @@ -174719,7 +174720,7 @@ index 000000000000..a0963bbb2068 +} diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h new file mode 100644 -index 000000000000..f690367757c9 +index 000000000..f69036775 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_debugfs.h @@ -0,0 +1,70 @@ @@ -174795,7 +174796,7 @@ index 000000000000..f690367757c9 +#endif /* _KBASE_IPA_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c new file mode 100644 -index 000000000000..8557fe8723cf +index 000000000..8557fe872 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.c @@ -0,0 +1,370 @@ @@ -175171,7 +175172,7 @@ index 000000000000..8557fe8723cf +KBASE_EXPORT_TEST_API(kbase_simple_ipa_model_ops); diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h new file mode 100644 -index 000000000000..dd17786a51d9 +index 000000000..dd17786a5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa_simple.h @@ -0,0 +1,44 @@ @@ -175221,7 +175222,7 @@ index 000000000000..dd17786a51d9 +#endif /* _KBASE_IPA_SIMPLE_H_ */ diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h new file mode 100644 -index 000000000000..debc3ad25fd7 +index 000000000..debc3ad25 --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_defs.h @@ -0,0 +1,878 @@ @@ -176105,7 +176106,7 @@ index 000000000000..debc3ad25fd7 +#endif /* _KBASE_JM_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h new file mode 100644 -index 000000000000..53819caaf616 +index 000000000..53819caaf --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_jm_js.h @@ -0,0 +1,1044 @@ @@ -177155,7 +177156,7 @@ index 000000000000..53819caaf616 +#endif /* _KBASE_JM_JS_H_ */ diff --git a/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h b/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h new file mode 100644 -index 000000000000..465cf7ec05bd +index 000000000..465cf7ec0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/jm/mali_kbase_js_defs.h @@ -0,0 +1,447 @@ @@ -177608,7 +177609,7 @@ index 000000000000..465cf7ec05bd +#endif /* _KBASE_JS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h b/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h new file mode 100644 -index 000000000000..11aedef80109 +index 000000000..11aedef80 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_base_hwconfig_features.h @@ -0,0 +1,185 @@ @@ -177799,7 +177800,7 @@ index 000000000000..11aedef80109 +#endif /* _BASE_HWCONFIG_FEATURES_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h b/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h new file mode 100644 -index 000000000000..0fbdec0bb0b6 +index 000000000..0fbdec0bb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_base_hwconfig_issues.h @@ -0,0 +1,835 @@ @@ -178640,7 +178641,7 @@ index 000000000000..0fbdec0bb0b6 +#endif /* _BASE_HWCONFIG_ISSUES_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase.h b/drivers/gpu/arm/bifrost/mali_kbase.h new file mode 100644 -index 000000000000..542e8f63fb5b +index 000000000..542e8f63f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase.h @@ -0,0 +1,752 @@ @@ -179398,7 +179399,7 @@ index 000000000000..542e8f63fb5b +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c new file mode 100644 -index 000000000000..10dbeee02e40 +index 000000000..10dbeee02 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.c @@ -0,0 +1,109 @@ @@ -179513,7 +179514,7 @@ index 000000000000..10dbeee02e40 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h new file mode 100644 -index 000000000000..59bbcf6f4ff7 +index 000000000..59bbcf6f4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_as_fault_debugfs.h @@ -0,0 +1,48 @@ @@ -179567,7 +179568,7 @@ index 000000000000..59bbcf6f4ff7 +#endif /*_KBASE_AS_FAULT_DEBUG_FS_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_bits.h b/drivers/gpu/arm/bifrost/mali_kbase_bits.h new file mode 100644 -index 000000000000..a085fd86c488 +index 000000000..a085fd86c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_bits.h @@ -0,0 +1,31 @@ @@ -179604,7 +179605,7 @@ index 000000000000..a085fd86c488 +#endif /* _KBASE_BITS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c new file mode 100644 -index 000000000000..4675025baaf8 +index 000000000..4675025ba --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.c @@ -0,0 +1,64 @@ @@ -179674,7 +179675,7 @@ index 000000000000..4675025baaf8 +KBASE_EXPORT_TEST_API(kbase_sync_single_for_cpu); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h new file mode 100644 -index 000000000000..598d245383fd +index 000000000..598d24538 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_cache_policy.h @@ -0,0 +1,47 @@ @@ -179727,7 +179728,7 @@ index 000000000000..598d245383fd +#endif /* _KBASE_CACHE_POLICY_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_caps.h b/drivers/gpu/arm/bifrost/mali_kbase_caps.h new file mode 100644 -index 000000000000..a92569d31f06 +index 000000000..a92569d31 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_caps.h @@ -0,0 +1,70 @@ @@ -179803,7 +179804,7 @@ index 000000000000..a92569d31f06 +#endif /* __KBASE_CAPS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c new file mode 100644 -index 000000000000..6a1e7e4c5ff5 +index 000000000..6a1e7e4c5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.c @@ -0,0 +1,100 @@ @@ -179909,7 +179910,7 @@ index 000000000000..6a1e7e4c5ff5 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h new file mode 100644 -index 000000000000..f7fcf7780b35 +index 000000000..f7fcf7780 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ccswe.h @@ -0,0 +1,95 @@ @@ -180010,7 +180011,7 @@ index 000000000000..f7fcf7780b35 +#endif /* _KBASE_CCSWE_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_config.c b/drivers/gpu/arm/bifrost/mali_kbase_config.c new file mode 100644 -index 000000000000..37dbca129f86 +index 000000000..37dbca129 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_config.c @@ -0,0 +1,104 @@ @@ -180120,7 +180121,7 @@ index 000000000000..37dbca129f86 +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_config.h b/drivers/gpu/arm/bifrost/mali_kbase_config.h new file mode 100644 -index 000000000000..ecfdb2876618 +index 000000000..ecfdb2876 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_config.h @@ -0,0 +1,583 @@ @@ -180709,7 +180710,7 @@ index 000000000000..ecfdb2876618 +#endif /* _KBASE_CONFIG_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h b/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h new file mode 100644 -index 000000000000..14493a77e1ea +index 000000000..14493a77e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_config_defaults.h @@ -0,0 +1,278 @@ @@ -180993,7 +180994,7 @@ index 000000000000..14493a77e1ea +#endif /* _KBASE_CONFIG_DEFAULTS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c b/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c new file mode 100644 -index 000000000000..68e4305afad1 +index 000000000..68e4305af --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_core_linux.c @@ -0,0 +1,5856 @@ @@ -186855,7 +186856,7 @@ index 000000000000..68e4305afad1 +#endif /* CONFIG_MALI_BIFROST_GATOR_SUPPORT */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h b/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h new file mode 100644 -index 000000000000..7e885ca46ce9 +index 000000000..7e885ca46 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_cs_experimental.h @@ -0,0 +1,40 @@ @@ -186901,7 +186902,7 @@ index 000000000000..7e885ca46ce9 + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c new file mode 100644 -index 000000000000..dc6feb95a391 +index 000000000..dc6feb95a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.c @@ -0,0 +1,433 @@ @@ -187340,7 +187341,7 @@ index 000000000000..dc6feb95a391 +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h new file mode 100644 -index 000000000000..5a8d17547b7b +index 000000000..5a8d17547 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_ctx_sched.h @@ -0,0 +1,247 @@ @@ -187593,7 +187594,7 @@ index 000000000000..5a8d17547b7b +#endif /* _KBASE_CTX_SCHED_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug.c b/drivers/gpu/arm/bifrost/mali_kbase_debug.c new file mode 100644 -index 000000000000..6d3b1093b442 +index 000000000..6d3b1093b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug.c @@ -0,0 +1,41 @@ @@ -187640,7 +187641,7 @@ index 000000000000..6d3b1093b442 + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug.h b/drivers/gpu/arm/bifrost/mali_kbase_debug.h new file mode 100644 -index 000000000000..9d6ff73aa4e0 +index 000000000..9d6ff73aa --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug.h @@ -0,0 +1,166 @@ @@ -187812,7 +187813,7 @@ index 000000000000..9d6ff73aa4e0 +#endif /* _KBASE_DEBUG_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c new file mode 100644 -index 000000000000..d6518b476115 +index 000000000..d6518b476 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.c @@ -0,0 +1,573 @@ @@ -188391,7 +188392,7 @@ index 000000000000..d6518b476115 +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h new file mode 100644 -index 000000000000..059d9c4553bb +index 000000000..059d9c455 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_job_fault.h @@ -0,0 +1,121 @@ @@ -188518,7 +188519,7 @@ index 000000000000..059d9c4553bb +#endif /*_KBASE_DEBUG_JOB_FAULT_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.c b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.c new file mode 100644 -index 000000000000..418bb19086bb +index 000000000..418bb1908 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.c @@ -0,0 +1,138 @@ @@ -188662,7 +188663,7 @@ index 000000000000..418bb19086bb +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.h b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.h new file mode 100644 -index 000000000000..8cf69c2cbaf9 +index 000000000..8cf69c2cb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_allocs.h @@ -0,0 +1,39 @@ @@ -188707,7 +188708,7 @@ index 000000000000..8cf69c2cbaf9 +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c new file mode 100644 -index 000000000000..ce87a0070b72 +index 000000000..ce87a0070 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.c @@ -0,0 +1,410 @@ @@ -189123,7 +189124,7 @@ index 000000000000..ce87a0070b72 +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h new file mode 100644 -index 000000000000..cb8050d9b32c +index 000000000..cb8050d9b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_view.h @@ -0,0 +1,39 @@ @@ -189168,7 +189169,7 @@ index 000000000000..cb8050d9b32c +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.c b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.c new file mode 100644 -index 000000000000..1f8db32aa16f +index 000000000..1f8db32aa --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.c @@ -0,0 +1,116 @@ @@ -189290,7 +189291,7 @@ index 000000000000..1f8db32aa16f +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.h b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.h new file mode 100644 -index 000000000000..acf349b608d5 +index 000000000..acf349b60 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debug_mem_zones.h @@ -0,0 +1,39 @@ @@ -189335,7 +189336,7 @@ index 000000000000..acf349b608d5 +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c new file mode 100644 -index 000000000000..c846491e78fb +index 000000000..c846491e7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.c @@ -0,0 +1,248 @@ @@ -189589,7 +189590,7 @@ index 000000000000..c846491e78fb +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h new file mode 100644 -index 000000000000..cbb24d6e0acf +index 000000000..cbb24d6e0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_debugfs_helper.h @@ -0,0 +1,162 @@ @@ -189757,7 +189758,7 @@ index 000000000000..cbb24d6e0acf + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_defs.h new file mode 100644 -index 000000000000..809e73000c4d +index 000000000..809e73000 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_defs.h @@ -0,0 +1,2105 @@ @@ -191868,7 +191869,7 @@ index 000000000000..809e73000c4d +#endif /* _KBASE_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c b/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c new file mode 100644 -index 000000000000..7d6e475585ae +index 000000000..7d6e47558 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_disjoint_events.c @@ -0,0 +1,80 @@ @@ -191954,7 +191955,7 @@ index 000000000000..7d6e475585ae +KBASE_EXPORT_TEST_API(kbase_disjoint_event_get); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c new file mode 100644 -index 000000000000..4e2713511857 +index 000000000..4e2713511 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.c @@ -0,0 +1,452 @@ @@ -192412,7 +192413,7 @@ index 000000000000..4e2713511857 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h new file mode 100644 -index 000000000000..8713ba1eaa6f +index 000000000..8713ba1ea --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dummy_job_wa.h @@ -0,0 +1,73 @@ @@ -192491,7 +192492,7 @@ index 000000000000..8713ba1eaa6f +#endif /* _KBASE_DUMMY_JOB_WORKAROUND_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.c new file mode 100644 -index 000000000000..e4cb71632aee +index 000000000..e4cb71632 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.c @@ -0,0 +1,94 @@ @@ -192591,7 +192592,7 @@ index 000000000000..e4cb71632aee +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.h new file mode 100644 -index 000000000000..8334db7cc1ed +index 000000000..8334db7cc --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_dvfs_debugfs.h @@ -0,0 +1,35 @@ @@ -192632,7 +192633,7 @@ index 000000000000..8334db7cc1ed +#endif /* _KBASE_DVFS_DEBUGFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_event.c b/drivers/gpu/arm/bifrost/mali_kbase_event.c new file mode 100644 -index 000000000000..910c51170ae8 +index 000000000..910c51170 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_event.c @@ -0,0 +1,272 @@ @@ -192910,7 +192911,7 @@ index 000000000000..910c51170ae8 +KBASE_EXPORT_TEST_API(kbase_event_cleanup); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence.c b/drivers/gpu/arm/bifrost/mali_kbase_fence.c new file mode 100644 -index 000000000000..b16b27659e61 +index 000000000..b16b27659 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence.c @@ -0,0 +1,61 @@ @@ -192977,7 +192978,7 @@ index 000000000000..b16b27659e61 + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence.h b/drivers/gpu/arm/bifrost/mali_kbase_fence.h new file mode 100644 -index 000000000000..f4507ac4309b +index 000000000..f4507ac43 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence.h @@ -0,0 +1,259 @@ @@ -193242,7 +193243,7 @@ index 000000000000..f4507ac4309b +#endif /* _KBASE_FENCE_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h new file mode 100644 -index 000000000000..7a150bdf2947 +index 000000000..7a150bdf2 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence_defs.h @@ -0,0 +1,63 @@ @@ -193311,7 +193312,7 @@ index 000000000000..7a150bdf2947 +#endif /* _KBASE_FENCE_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c b/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c new file mode 100644 -index 000000000000..25b4c9c03b53 +index 000000000..25b4c9c03 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_fence_ops.c @@ -0,0 +1,111 @@ @@ -193428,7 +193429,7 @@ index 000000000000..25b4c9c03b53 +KBASE_EXPORT_TEST_API(kbase_fence_ops); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gator.h b/drivers/gpu/arm/bifrost/mali_kbase_gator.h new file mode 100644 -index 000000000000..dd7df874640a +index 000000000..dd7df8746 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gator.h @@ -0,0 +1,52 @@ @@ -193486,7 +193487,7 @@ index 000000000000..dd7df874640a +#endif /* _KBASE_GATOR_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c new file mode 100644 -index 000000000000..bf5f259a0bb6 +index 000000000..bf5f259a0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.c @@ -0,0 +1,112 @@ @@ -193604,7 +193605,7 @@ index 000000000000..bf5f259a0bb6 +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h new file mode 100644 -index 000000000000..6d5423f379d4 +index 000000000..6d5423f37 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpu_memory_debugfs.h @@ -0,0 +1,50 @@ @@ -193660,7 +193661,7 @@ index 000000000000..6d5423f379d4 +#endif /*_KBASE_GPU_MEMORY_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c new file mode 100644 -index 000000000000..7a7d17ea5f26 +index 000000000..7a7d17ea5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.c @@ -0,0 +1,888 @@ @@ -194554,7 +194555,7 @@ index 000000000000..7a7d17ea5f26 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h new file mode 100644 -index 000000000000..f0a97312c0dd +index 000000000..f0a97312c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops.h @@ -0,0 +1,154 @@ @@ -194714,7 +194715,7 @@ index 000000000000..f0a97312c0dd +#endif /* _KBASE_GPUPROPS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h new file mode 100644 -index 000000000000..45cb603fab82 +index 000000000..45cb603fa --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gpuprops_types.h @@ -0,0 +1,170 @@ @@ -194890,7 +194891,7 @@ index 000000000000..45cb603fab82 +#endif /* _KBASE_GPUPROPS_TYPES_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gwt.c b/drivers/gpu/arm/bifrost/mali_kbase_gwt.c new file mode 100644 -index 000000000000..0eba889e5b19 +index 000000000..0eba889e5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gwt.c @@ -0,0 +1,275 @@ @@ -195171,7 +195172,7 @@ index 000000000000..0eba889e5b19 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_gwt.h b/drivers/gpu/arm/bifrost/mali_kbase_gwt.h new file mode 100644 -index 000000000000..9fdd68d62fb8 +index 000000000..9fdd68d62 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_gwt.h @@ -0,0 +1,54 @@ @@ -195231,7 +195232,7 @@ index 000000000000..9fdd68d62fb8 +#endif /* _KBASE_GWT_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hw.c b/drivers/gpu/arm/bifrost/mali_kbase_hw.c new file mode 100644 -index 000000000000..b07327a55c0a +index 000000000..b07327a55 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hw.c @@ -0,0 +1,437 @@ @@ -195674,7 +195675,7 @@ index 000000000000..b07327a55c0a +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hw.h b/drivers/gpu/arm/bifrost/mali_kbase_hw.h new file mode 100644 -index 000000000000..ddcddaaa429d +index 000000000..ddcddaaa4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hw.h @@ -0,0 +1,71 @@ @@ -195751,7 +195752,7 @@ index 000000000000..ddcddaaa429d +#endif /* _KBASE_HW_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h new file mode 100644 -index 000000000000..0da4eb258a24 +index 000000000..0da4eb258 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_backend.h @@ -0,0 +1,43 @@ @@ -195800,7 +195801,7 @@ index 000000000000..0da4eb258a24 +#endif /* _KBASE_HWACCESS_BACKEND_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h new file mode 100644 -index 000000000000..62a6ec51b17f +index 000000000..62a6ec51b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_defs.h @@ -0,0 +1,50 @@ @@ -195856,7 +195857,7 @@ index 000000000000..62a6ec51b17f +#endif /* _KBASE_HWACCESS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h new file mode 100644 -index 000000000000..f537b7f0ac90 +index 000000000..f537b7f0a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_gpuprops.h @@ -0,0 +1,88 @@ @@ -195950,7 +195951,7 @@ index 000000000000..f537b7f0ac90 +#endif /* _KBASE_HWACCESS_GPUPROPS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h new file mode 100644 -index 000000000000..37663101a346 +index 000000000..37663101a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_instr.h @@ -0,0 +1,170 @@ @@ -196126,7 +196127,7 @@ index 000000000000..37663101a346 +#endif /* _KBASE_HWACCESS_INSTR_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h new file mode 100644 -index 000000000000..ca77c192deea +index 000000000..ca77c192d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_jm.h @@ -0,0 +1,318 @@ @@ -196450,7 +196451,7 @@ index 000000000000..ca77c192deea +#endif /* _KBASE_HWACCESS_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h new file mode 100644 -index 000000000000..effb2ffeb349 +index 000000000..effb2ffeb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_pm.h @@ -0,0 +1,229 @@ @@ -196685,7 +196686,7 @@ index 000000000000..effb2ffeb349 +#endif /* _KBASE_HWACCESS_PM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h new file mode 100644 -index 000000000000..ac2a26d28d89 +index 000000000..ac2a26d28 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_hwaccess_time.h @@ -0,0 +1,126 @@ @@ -196817,7 +196818,7 @@ index 000000000000..ac2a26d28d89 +#endif /* _KBASE_BACKEND_TIME_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jd.c b/drivers/gpu/arm/bifrost/mali_kbase_jd.c new file mode 100644 -index 000000000000..f44426a736ca +index 000000000..f44426a73 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd.c @@ -0,0 +1,1660 @@ @@ -198483,7 +198484,7 @@ index 000000000000..f44426a736ca +KBASE_EXPORT_TEST_API(kbase_jd_exit); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.c new file mode 100644 -index 000000000000..6196c0985c7e +index 000000000..6196c0985 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.c @@ -0,0 +1,199 @@ @@ -198688,7 +198689,7 @@ index 000000000000..6196c0985c7e +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.h new file mode 100644 -index 000000000000..8e6140c43538 +index 000000000..8e6140c43 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jd_debugfs.h @@ -0,0 +1,43 @@ @@ -198737,7 +198738,7 @@ index 000000000000..8e6140c43538 +#endif /*_KBASE_JD_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jm.c b/drivers/gpu/arm/bifrost/mali_kbase_jm.c new file mode 100644 -index 000000000000..1ac5cd3eafff +index 000000000..1ac5cd3ea --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jm.c @@ -0,0 +1,153 @@ @@ -198896,7 +198897,7 @@ index 000000000000..1ac5cd3eafff +#endif /* !MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_jm.h b/drivers/gpu/arm/bifrost/mali_kbase_jm.h new file mode 100644 -index 000000000000..eeafcb6b1a77 +index 000000000..eeafcb6b1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_jm.h @@ -0,0 +1,117 @@ @@ -199019,7 +199020,7 @@ index 000000000000..eeafcb6b1a77 +#endif /* _KBASE_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js.c b/drivers/gpu/arm/bifrost/mali_kbase_js.c new file mode 100644 -index 000000000000..8ce09212a57e +index 000000000..8ce09212a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js.c @@ -0,0 +1,4007 @@ @@ -203032,7 +203033,7 @@ index 000000000000..8ce09212a57e +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js.h b/drivers/gpu/arm/bifrost/mali_kbase_js.h new file mode 100644 -index 000000000000..89c3b45c735b +index 000000000..89c3b45c7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js.h @@ -0,0 +1,36 @@ @@ -203074,7 +203075,7 @@ index 000000000000..89c3b45c735b +#endif /* _KBASE_JS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.c b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.c new file mode 100644 -index 000000000000..04ea06b2f381 +index 000000000..04ea06b2f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.c @@ -0,0 +1,298 @@ @@ -203378,7 +203379,7 @@ index 000000000000..04ea06b2f381 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.h b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.h new file mode 100644 -index 000000000000..2dc640d5ab82 +index 000000000..2dc640d5a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_js_ctx_attr.h @@ -0,0 +1,147 @@ @@ -203531,7 +203532,7 @@ index 000000000000..2dc640d5ab82 +#endif /* _KBASE_JS_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.c b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.c new file mode 100644 -index 000000000000..14a730dc5a12 +index 000000000..14a730dc5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.c @@ -0,0 +1,896 @@ @@ -204433,7 +204434,7 @@ index 000000000000..14a730dc5a12 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.h b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.h new file mode 100644 -index 000000000000..9451d4cd943d +index 000000000..9451d4cd9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_jm.h @@ -0,0 +1,273 @@ @@ -204712,7 +204713,7 @@ index 000000000000..9451d4cd943d +#endif /* _KBASE_KINSTR_JM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.c b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.c new file mode 100644 -index 000000000000..823f9156e19e +index 000000000..823f9156e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.c @@ -0,0 +1,2021 @@ @@ -206739,7 +206740,7 @@ index 000000000000..823f9156e19e +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.h b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.h new file mode 100644 -index 000000000000..bbe33796e62f +index 000000000..bbe33796e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_kinstr_prfcnt.h @@ -0,0 +1,189 @@ @@ -206934,7 +206935,7 @@ index 000000000000..bbe33796e62f +#endif /* _KBASE_KINSTR_PRFCNT_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_linux.h b/drivers/gpu/arm/bifrost/mali_kbase_linux.h new file mode 100644 -index 000000000000..e5c6f7a0b217 +index 000000000..e5c6f7a0b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_linux.h @@ -0,0 +1,44 @@ @@ -206984,7 +206985,7 @@ index 000000000000..e5c6f7a0b217 +#endif /* _KBASE_LINUX_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem.c b/drivers/gpu/arm/bifrost/mali_kbase_mem.c new file mode 100644 -index 000000000000..800a4199d1df +index 000000000..800a4199d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem.c @@ -0,0 +1,5533 @@ @@ -212523,7 +212524,7 @@ index 000000000000..800a4199d1df +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem.h b/drivers/gpu/arm/bifrost/mali_kbase_mem.h new file mode 100644 -index 000000000000..1118b96fceb3 +index 000000000..1118b96fc --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem.h @@ -0,0 +1,2560 @@ @@ -215089,7 +215090,7 @@ index 000000000000..1118b96fceb3 +#endif /* _KBASE_MEM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.c new file mode 100644 -index 000000000000..ad0c17b63f7d +index 000000000..ad0c17b63 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.c @@ -0,0 +1,3818 @@ @@ -218913,7 +218914,7 @@ index 000000000000..ad0c17b63f7d +#endif /* MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.h new file mode 100644 -index 000000000000..6dda44b9f128 +index 000000000..6dda44b9f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_linux.h @@ -0,0 +1,533 @@ @@ -219452,7 +219453,7 @@ index 000000000000..6dda44b9f128 +#endif /* _KBASE_MEM_LINUX_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_lowlevel.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_lowlevel.h new file mode 100644 -index 000000000000..5a1bb16cca01 +index 000000000..5a1bb16cc --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_lowlevel.h @@ -0,0 +1,179 @@ @@ -219637,7 +219638,7 @@ index 000000000000..5a1bb16cca01 +#endif /* _KBASE_LOWLEVEL_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.c new file mode 100644 -index 000000000000..737f7da5595d +index 000000000..737f7da55 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.c @@ -0,0 +1,641 @@ @@ -220284,7 +220285,7 @@ index 000000000000..737f7da5595d +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.h new file mode 100644 -index 000000000000..76bbc999e110 +index 000000000..76bbc999e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_migrate.h @@ -0,0 +1,108 @@ @@ -220398,7 +220399,7 @@ index 000000000000..76bbc999e110 +void kbase_mem_migrate_term(struct kbase_device *kbdev); diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool.c new file mode 100644 -index 000000000000..fa8f34d86c24 +index 000000000..fa8f34d86 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool.c @@ -0,0 +1,1029 @@ @@ -221433,7 +221434,7 @@ index 000000000000..fa8f34d86c24 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.c new file mode 100644 -index 000000000000..3b1b2bae15c8 +index 000000000..3b1b2bae1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.c @@ -0,0 +1,184 @@ @@ -221623,7 +221624,7 @@ index 000000000000..3b1b2bae15c8 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.h new file mode 100644 -index 000000000000..207b58536a58 +index 000000000..207b58536 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_debugfs.h @@ -0,0 +1,122 @@ @@ -221751,7 +221752,7 @@ index 000000000000..207b58536a58 + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.c new file mode 100644 -index 000000000000..49c4b041e13a +index 000000000..49c4b041e --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.c @@ -0,0 +1,107 @@ @@ -221864,7 +221865,7 @@ index 000000000000..49c4b041e13a +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.h new file mode 100644 -index 000000000000..fe8ce775258f +index 000000000..fe8ce7752 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_pool_group.h @@ -0,0 +1,114 @@ @@ -221984,7 +221985,7 @@ index 000000000000..fe8ce775258f +#endif /* _KBASE_MEM_POOL_GROUP_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.c new file mode 100644 -index 000000000000..9317023b71bb +index 000000000..9317023b7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.c @@ -0,0 +1,131 @@ @@ -222121,7 +222122,7 @@ index 000000000000..9317023b71bb +#endif /* CONFIG_DEBUG_FS */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.h new file mode 100644 -index 000000000000..c30fca6652dc +index 000000000..c30fca665 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs.h @@ -0,0 +1,64 @@ @@ -222191,7 +222192,7 @@ index 000000000000..c30fca6652dc + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mipe_gen_header.h b/drivers/gpu/arm/bifrost/mali_kbase_mipe_gen_header.h new file mode 100644 -index 000000000000..951079d11ab6 +index 000000000..951079d11 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mipe_gen_header.h @@ -0,0 +1,229 @@ @@ -222426,7 +222427,7 @@ index 000000000000..951079d11ab6 +/* clang-format on */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_mipe_proto.h b/drivers/gpu/arm/bifrost/mali_kbase_mipe_proto.h new file mode 100644 -index 000000000000..c35ee61ce5aa +index 000000000..c35ee61ce --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_mipe_proto.h @@ -0,0 +1,126 @@ @@ -222558,7 +222559,7 @@ index 000000000000..c35ee61ce5aa +/* clang-format on */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.c b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.c new file mode 100644 -index 000000000000..10a7f506b1a4 +index 000000000..10a7f506b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.c @@ -0,0 +1,177 @@ @@ -222741,7 +222742,7 @@ index 000000000000..10a7f506b1a4 +}; diff --git a/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.h b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.h new file mode 100644 -index 000000000000..1eae2fcf98b6 +index 000000000..1eae2fcf9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_native_mgm.h @@ -0,0 +1,38 @@ @@ -222785,7 +222786,7 @@ index 000000000000..1eae2fcf98b6 +#endif /* _KBASE_NATIVE_MGM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pbha.c b/drivers/gpu/arm/bifrost/mali_kbase_pbha.c new file mode 100644 -index 000000000000..b65f9e7b5162 +index 000000000..b65f9e7b5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha.c @@ -0,0 +1,306 @@ @@ -223097,7 +223098,7 @@ index 000000000000..b65f9e7b5162 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pbha.h b/drivers/gpu/arm/bifrost/mali_kbase_pbha.h new file mode 100644 -index 000000000000..79632194cabe +index 000000000..79632194c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha.h @@ -0,0 +1,77 @@ @@ -223180,7 +223181,7 @@ index 000000000000..79632194cabe +#endif /* _KBASE_PBHA_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.c new file mode 100644 -index 000000000000..1cc29c700e5a +index 000000000..1cc29c700 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.c @@ -0,0 +1,227 @@ @@ -223413,7 +223414,7 @@ index 000000000000..1cc29c700e5a +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.h new file mode 100644 -index 000000000000..508ecdff9162 +index 000000000..508ecdff9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pbha_debugfs.h @@ -0,0 +1,34 @@ @@ -223453,7 +223454,7 @@ index 000000000000..508ecdff9162 +#endif /* _KBASE_PBHA_DEBUGFS_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_platform_fake.c b/drivers/gpu/arm/bifrost/mali_kbase_platform_fake.c new file mode 100644 -index 000000000000..265c676f13fa +index 000000000..265c676f1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_platform_fake.c @@ -0,0 +1,119 @@ @@ -223578,7 +223579,7 @@ index 000000000000..265c676f13fa +#endif /* CONFIG_OF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pm.c b/drivers/gpu/arm/bifrost/mali_kbase_pm.c new file mode 100644 -index 000000000000..62a132816a42 +index 000000000..62a132816 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pm.c @@ -0,0 +1,311 @@ @@ -223895,7 +223896,7 @@ index 000000000000..62a132816a42 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_pm.h b/drivers/gpu/arm/bifrost/mali_kbase_pm.h new file mode 100644 -index 000000000000..4bb90a4f6542 +index 000000000..4bb90a4f6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_pm.h @@ -0,0 +1,257 @@ @@ -224158,7 +224159,7 @@ index 000000000000..4bb90a4f6542 +#endif /* _KBASE_PM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_refcount_defs.h b/drivers/gpu/arm/bifrost/mali_kbase_refcount_defs.h new file mode 100644 -index 000000000000..c517a2d2ab83 +index 000000000..c517a2d2a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_refcount_defs.h @@ -0,0 +1,57 @@ @@ -224221,7 +224222,7 @@ index 000000000000..c517a2d2ab83 +#endif /* _KBASE_REFCOUNT_DEFS_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.c b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.c new file mode 100644 -index 000000000000..147082c15fed +index 000000000..147082c15 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.c @@ -0,0 +1,239 @@ @@ -224466,7 +224467,7 @@ index 000000000000..147082c15fed +#endif /* defined(CONFIG_DEBUG_FS) && !IS_ENABLED(CONFIG_MALI_BIFROST_NO_MALI) */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.h b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.h new file mode 100644 -index 000000000000..ae327dd799a4 +index 000000000..ae327dd79 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_regs_history_debugfs.h @@ -0,0 +1,84 @@ @@ -224556,7 +224557,7 @@ index 000000000000..ae327dd799a4 +#endif /*_KBASE_REGS_HISTORY_DEBUGFS_H*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_reset_gpu.h b/drivers/gpu/arm/bifrost/mali_kbase_reset_gpu.h new file mode 100644 -index 000000000000..48ea9954b17c +index 000000000..48ea9954b --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_reset_gpu.h @@ -0,0 +1,277 @@ @@ -224839,7 +224840,7 @@ index 000000000000..48ea9954b17c +#endif diff --git a/drivers/gpu/arm/bifrost/mali_kbase_smc.c b/drivers/gpu/arm/bifrost/mali_kbase_smc.c new file mode 100644 -index 000000000000..abbe8d56d082 +index 000000000..abbe8d56d --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_smc.c @@ -0,0 +1,90 @@ @@ -224935,7 +224936,7 @@ index 000000000000..abbe8d56d082 + diff --git a/drivers/gpu/arm/bifrost/mali_kbase_smc.h b/drivers/gpu/arm/bifrost/mali_kbase_smc.h new file mode 100644 -index 000000000000..40a348388598 +index 000000000..40a348388 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_smc.h @@ -0,0 +1,69 @@ @@ -225010,7 +225011,7 @@ index 000000000000..40a348388598 +#endif /* _KBASE_SMC_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_softjobs.c b/drivers/gpu/arm/bifrost/mali_kbase_softjobs.c new file mode 100644 -index 000000000000..a9312a0c433e +index 000000000..a9312a0c4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_softjobs.c @@ -0,0 +1,1770 @@ @@ -226786,7 +226787,7 @@ index 000000000000..a9312a0c433e +#endif /* !MALI_USE_CSF */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_strings.c b/drivers/gpu/arm/bifrost/mali_kbase_strings.c new file mode 100644 -index 000000000000..84784be6f244 +index 000000000..84784be6f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_strings.c @@ -0,0 +1,28 @@ @@ -226820,7 +226821,7 @@ index 000000000000..84784be6f244 +const char kbase_timeline_name[] = KBASE_TIMELINE_NAME; diff --git a/drivers/gpu/arm/bifrost/mali_kbase_strings.h b/drivers/gpu/arm/bifrost/mali_kbase_strings.h new file mode 100644 -index 000000000000..c3f94f9267d5 +index 000000000..c3f94f926 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_strings.h @@ -0,0 +1,23 @@ @@ -226849,7 +226850,7 @@ index 000000000000..c3f94f9267d5 +extern const char kbase_timeline_name[]; diff --git a/drivers/gpu/arm/bifrost/mali_kbase_sync.h b/drivers/gpu/arm/bifrost/mali_kbase_sync.h new file mode 100644 -index 000000000000..3d2053bee08e +index 000000000..3d2053bee --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync.h @@ -0,0 +1,216 @@ @@ -227071,7 +227072,7 @@ index 000000000000..3d2053bee08e +#endif /* MALI_KBASE_SYNC_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_sync_common.c b/drivers/gpu/arm/bifrost/mali_kbase_sync_common.c new file mode 100644 -index 000000000000..5ee7fc3ce72b +index 000000000..5ee7fc3ce --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync_common.c @@ -0,0 +1,50 @@ @@ -227127,7 +227128,7 @@ index 000000000000..5ee7fc3ce72b +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_sync_file.c b/drivers/gpu/arm/bifrost/mali_kbase_sync_file.c new file mode 100644 -index 000000000000..9360324cfee6 +index 000000000..9360324cf --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_sync_file.c @@ -0,0 +1,409 @@ @@ -227542,7 +227543,7 @@ index 000000000000..9360324cfee6 +#endif /* !MALI_USE_CSF*/ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.c b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.c new file mode 100644 -index 000000000000..7df7d79b6bc5 +index 000000000..7df7d79b6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.c @@ -0,0 +1,225 @@ @@ -227773,7 +227774,7 @@ index 000000000000..7df7d79b6bc5 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.h b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.h new file mode 100644 -index 000000000000..fd871fcb352a +index 000000000..fd871fcb3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_trace_gpu_mem.h @@ -0,0 +1,100 @@ @@ -227879,7 +227880,7 @@ index 000000000000..fd871fcb352a +#endif /* _KBASE_TRACE_GPU_MEM_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_utility.h b/drivers/gpu/arm/bifrost/mali_kbase_utility.h new file mode 100644 -index 000000000000..bd66f716720c +index 000000000..bd66f7167 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_utility.h @@ -0,0 +1,41 @@ @@ -227926,7 +227927,7 @@ index 000000000000..bd66f716720c +#endif /* _KBASE_UTILITY_H */ diff --git a/drivers/gpu/arm/bifrost/mali_kbase_vinstr.c b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.c new file mode 100644 -index 000000000000..d770913e9da5 +index 000000000..d770913e9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.c @@ -0,0 +1,1132 @@ @@ -229064,7 +229065,7 @@ index 000000000000..d770913e9da5 +} diff --git a/drivers/gpu/arm/bifrost/mali_kbase_vinstr.h b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.h new file mode 100644 -index 000000000000..6747ec70a406 +index 000000000..6747ec70a --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_kbase_vinstr.h @@ -0,0 +1,90 @@ @@ -229160,7 +229161,7 @@ index 000000000000..6747ec70a406 +#endif /* _KBASE_VINSTR_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_linux_trace.h b/drivers/gpu/arm/bifrost/mali_linux_trace.h new file mode 100644 -index 000000000000..52f17390c853 +index 000000000..52f17390c --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_linux_trace.h @@ -0,0 +1,547 @@ @@ -229713,7 +229714,7 @@ index 000000000000..52f17390c853 +#include diff --git a/drivers/gpu/arm/bifrost/mali_malisw.h b/drivers/gpu/arm/bifrost/mali_malisw.h new file mode 100644 -index 000000000000..d9db189e8684 +index 000000000..d9db189e8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_malisw.h @@ -0,0 +1,108 @@ @@ -229827,7 +229828,7 @@ index 000000000000..d9db189e8684 +#endif /* _MALISW_H_ */ diff --git a/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.c b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.c new file mode 100644 -index 000000000000..1db3abe2f9f6 +index 000000000..1db3abe2f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.c @@ -0,0 +1,26 @@ @@ -229859,7 +229860,7 @@ index 000000000000..1db3abe2f9f6 +#endif diff --git a/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.h b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.h new file mode 100644 -index 000000000000..f156650a40a3 +index 000000000..f156650a4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mali_power_gpu_frequency_trace.h @@ -0,0 +1,68 @@ @@ -229933,7 +229934,7 @@ index 000000000000..f156650a40a3 +#include diff --git a/drivers/gpu/arm/bifrost/mmu/Kbuild b/drivers/gpu/arm/bifrost/mmu/Kbuild new file mode 100755 -index 000000000000..416432397b5c +index 000000000..416432397 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/Kbuild @@ -0,0 +1,30 @@ @@ -229969,7 +229970,7 @@ index 000000000000..416432397b5c +endif diff --git a/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_csf.c b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_csf.c new file mode 100644 -index 000000000000..4cac7876f5f7 +index 000000000..4cac7876f --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_csf.c @@ -0,0 +1,572 @@ @@ -230547,7 +230548,7 @@ index 000000000000..4cac7876f5f7 +} diff --git a/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_jm.c b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_jm.c new file mode 100644 -index 000000000000..d716ce0068fd +index 000000000..d716ce006 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/backend/mali_kbase_mmu_jm.c @@ -0,0 +1,442 @@ @@ -230995,7 +230996,7 @@ index 000000000000..d716ce0068fd +} diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.c b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.c new file mode 100644 -index 000000000000..d6d3fcdee6e7 +index 000000000..d6d3fcdee --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.c @@ -0,0 +1,3889 @@ @@ -234890,7 +234891,7 @@ index 000000000000..d6d3fcdee6e7 +} diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.h b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.h new file mode 100644 -index 000000000000..699b1f340482 +index 000000000..699b1f340 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu.h @@ -0,0 +1,341 @@ @@ -235237,7 +235238,7 @@ index 000000000000..699b1f340482 +#endif /* _KBASE_MMU_H_ */ diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw.h b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw.h new file mode 100644 -index 000000000000..50d2ea5d07c8 +index 000000000..50d2ea5d0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw.h @@ -0,0 +1,214 @@ @@ -235457,7 +235458,7 @@ index 000000000000..50d2ea5d07c8 +#endif /* _KBASE_MMU_HW_H_ */ diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw_direct.c b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw_direct.c new file mode 100644 -index 000000000000..3f6da35d80f2 +index 000000000..3f6da35d8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_hw_direct.c @@ -0,0 +1,699 @@ @@ -236162,7 +236163,7 @@ index 000000000000..3f6da35d80f2 +} diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_internal.h b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_internal.h new file mode 100644 -index 000000000000..9d7ce48568e4 +index 000000000..9d7ce4856 --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_internal.h @@ -0,0 +1,72 @@ @@ -236240,7 +236241,7 @@ index 000000000000..9d7ce48568e4 +#endif /* _KBASE_MMU_INTERNAL_H_ */ diff --git a/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_aarch64.c b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_aarch64.c new file mode 100644 -index 000000000000..1464320cbe44 +index 000000000..1464320cb --- /dev/null +++ b/drivers/gpu/arm/bifrost/mmu/mali_kbase_mmu_mode_aarch64.c @@ -0,0 +1,209 @@ @@ -236455,7 +236456,7 @@ index 000000000000..1464320cbe44 +} diff --git a/drivers/gpu/arm/bifrost/platform/Kconfig b/drivers/gpu/arm/bifrost/platform/Kconfig new file mode 100644 -index 000000000000..3e1bd235b842 +index 000000000..3e1bd235b --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/Kconfig @@ -0,0 +1,26 @@ @@ -236487,7 +236488,7 @@ index 000000000000..3e1bd235b842 +# diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild b/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild new file mode 100755 -index 000000000000..60a52d80fa8e +index 000000000..60a52d80f --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/Kbuild @@ -0,0 +1,24 @@ @@ -236517,7 +236518,7 @@ index 000000000000..60a52d80fa8e + platform/$(MALI_PLATFORM_DIR)/mali_kbase_clk_rate_trace.o diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_clk_rate_trace.c b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_clk_rate_trace.c new file mode 100644 -index 000000000000..4bcd5854d3a3 +index 000000000..4bcd5854d --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_clk_rate_trace.c @@ -0,0 +1,105 @@ @@ -236628,7 +236629,7 @@ index 000000000000..4bcd5854d3a3 +}; diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_devicetree.c b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_devicetree.c new file mode 100644 -index 000000000000..a0b4a434e2a7 +index 000000000..a0b4a434e --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_devicetree.c @@ -0,0 +1,53 @@ @@ -236687,7 +236688,7 @@ index 000000000000..a0b4a434e2a7 +#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_platform.h new file mode 100644 -index 000000000000..584a7217d300 +index 000000000..584a7217d --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_config_platform.h @@ -0,0 +1,47 @@ @@ -236740,7 +236741,7 @@ index 000000000000..584a7217d300 +#define AUTO_SUSPEND_DELAY (100) diff --git a/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_runtime_pm.c b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_runtime_pm.c new file mode 100644 -index 000000000000..2687bee96ec9 +index 000000000..2687bee96 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/devicetree/mali_kbase_runtime_pm.c @@ -0,0 +1,298 @@ @@ -237044,7 +237045,7 @@ index 000000000000..2687bee96ec9 +}; diff --git a/drivers/gpu/arm/bifrost/platform/meson/Kbuild b/drivers/gpu/arm/bifrost/platform/meson/Kbuild new file mode 100755 -index 000000000000..9b3de96bace8 +index 000000000..9b3de96ba --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/meson/Kbuild @@ -0,0 +1,23 @@ @@ -237073,7 +237074,7 @@ index 000000000000..9b3de96bace8 + platform/$(MALI_PLATFORM_DIR)/mali_kbase_runtime_pm.o diff --git a/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_meson.c b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_meson.c new file mode 100644 -index 000000000000..7b896b602e96 +index 000000000..7b896b602 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_meson.c @@ -0,0 +1,53 @@ @@ -237132,7 +237133,7 @@ index 000000000000..7b896b602e96 +#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_platform.h new file mode 100644 -index 000000000000..06279e2f62ca +index 000000000..06279e2f6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_config_platform.h @@ -0,0 +1,45 @@ @@ -237183,7 +237184,7 @@ index 000000000000..06279e2f62ca +#define AUTO_SUSPEND_DELAY (100) diff --git a/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_runtime_pm.c b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_runtime_pm.c new file mode 100644 -index 000000000000..910d4b4fd3e1 +index 000000000..910d4b4fd --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/meson/mali_kbase_runtime_pm.c @@ -0,0 +1,265 @@ @@ -237454,7 +237455,7 @@ index 000000000000..910d4b4fd3e1 +}; diff --git a/drivers/gpu/arm/bifrost/platform/rk/Kbuild b/drivers/gpu/arm/bifrost/platform/rk/Kbuild new file mode 100755 -index 000000000000..a1e78cfc4ae7 +index 000000000..a1e78cfc4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/Kbuild @@ -0,0 +1,16 @@ @@ -237476,7 +237477,7 @@ index 000000000000..a1e78cfc4ae7 + platform/$(MALI_PLATFORM_DIR)/mali_kbase_config_rk.o diff --git a/drivers/gpu/arm/bifrost/platform/rk/custom_log.h b/drivers/gpu/arm/bifrost/platform/rk/custom_log.h new file mode 100644 -index 000000000000..5de70ee13d25 +index 000000000..5de70ee13 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/custom_log.h @@ -0,0 +1,192 @@ @@ -237674,7 +237675,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 100644 -index 000000000000..ea01d502c98e +index 000000000..ea01d502c --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_platform.h @@ -0,0 +1,94 @@ @@ -237774,7 +237775,7 @@ index 000000000000..ea01d502c98e +int kbase_platform_rk_enable_regulator(struct kbase_device *kbdev); diff --git a/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c new file mode 100644 -index 000000000000..3ac4aef79719 +index 000000000..3ac4aef79 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c @@ -0,0 +1,724 @@ @@ -238504,7 +238505,7 @@ index 000000000000..3ac4aef79719 +}; diff --git a/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_rk.h b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_rk.h new file mode 100644 -index 000000000000..0a42559df2bf +index 000000000..0a42559df --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/rk/mali_kbase_rk.h @@ -0,0 +1,67 @@ @@ -238577,7 +238578,7 @@ index 000000000000..0a42559df2bf + diff --git a/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild b/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild new file mode 100755 -index 000000000000..e1398fde3976 +index 000000000..e1398fde3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/Kbuild @@ -0,0 +1,23 @@ @@ -238606,7 +238607,7 @@ index 000000000000..e1398fde3976 + mali_kbase_platform_fake.o diff --git a/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_platform.h new file mode 100644 -index 000000000000..28f453161358 +index 000000000..28f453161 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_platform.h @@ -0,0 +1,38 @@ @@ -238650,7 +238651,7 @@ index 000000000000..28f453161358 +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_vexpress.c new file mode 100644 -index 000000000000..8add708d0f8a +index 000000000..8add708d0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress/mali_kbase_config_vexpress.c @@ -0,0 +1,79 @@ @@ -238735,7 +238736,7 @@ index 000000000000..8add708d0f8a +#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/Kbuild b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/Kbuild new file mode 100755 -index 000000000000..e1398fde3976 +index 000000000..e1398fde3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/Kbuild @@ -0,0 +1,23 @@ @@ -238764,7 +238765,7 @@ index 000000000000..e1398fde3976 + mali_kbase_platform_fake.o diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h new file mode 100644 -index 000000000000..28f453161358 +index 000000000..28f453161 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_platform.h @@ -0,0 +1,38 @@ @@ -238808,7 +238809,7 @@ index 000000000000..28f453161358 +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c new file mode 100644 -index 000000000000..835b7587cfbf +index 000000000..835b7587c --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c @@ -0,0 +1,77 @@ @@ -238891,7 +238892,7 @@ index 000000000000..835b7587cfbf +#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/Kbuild b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/Kbuild new file mode 100755 -index 000000000000..10f7dc8cf22c +index 000000000..10f7dc8cf --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/Kbuild @@ -0,0 +1,24 @@ @@ -238921,7 +238922,7 @@ index 000000000000..10f7dc8cf22c + mali_kbase_platform_fake.o diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h new file mode 100644 -index 000000000000..28f453161358 +index 000000000..28f453161 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_platform.h @@ -0,0 +1,38 @@ @@ -238965,7 +238966,7 @@ index 000000000000..28f453161358 +extern struct kbase_pm_callback_conf pm_callbacks; diff --git a/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c new file mode 100644 -index 000000000000..8be30fb25bba +index 000000000..8be30fb25 --- /dev/null +++ b/drivers/gpu/arm/bifrost/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c @@ -0,0 +1,77 @@ @@ -239048,7 +239049,7 @@ index 000000000000..8be30fb25bba +#endif /* CONFIG_MALI_BIFROST_DVFS */ diff --git a/drivers/gpu/arm/bifrost/protected_mode_switcher.h b/drivers/gpu/arm/bifrost/protected_mode_switcher.h new file mode 100644 -index 000000000000..9dd9253c7e95 +index 000000000..9dd9253c7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/protected_mode_switcher.h @@ -0,0 +1,56 @@ @@ -239110,7 +239111,7 @@ index 000000000000..9dd9253c7e95 +#endif /* _PROTECTED_MODE_SWITCH_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/Kbuild b/drivers/gpu/arm/bifrost/tests/Kbuild new file mode 100755 -index 000000000000..38e4dd4d712a +index 000000000..38e4dd4d7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/Kbuild @@ -0,0 +1,31 @@ @@ -239147,7 +239148,7 @@ index 000000000000..38e4dd4d712a + diff --git a/drivers/gpu/arm/bifrost/tests/Kconfig b/drivers/gpu/arm/bifrost/tests/Kconfig new file mode 100644 -index 000000000000..e9fe22771416 +index 000000000..e9fe22771 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/Kconfig @@ -0,0 +1,69 @@ @@ -239222,7 +239223,7 @@ index 000000000000..e9fe22771416 + depends on MALI_BIFROST && !MALI_BIFROST_DEBUG && MALI_KUTF diff --git a/drivers/gpu/arm/bifrost/tests/build.bp b/drivers/gpu/arm/bifrost/tests/build.bp new file mode 100755 -index 000000000000..5581ba934cd3 +index 000000000..5581ba934 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/build.bp @@ -0,0 +1,46 @@ @@ -239274,7 +239275,7 @@ index 000000000000..5581ba934cd3 +} diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers.h new file mode 100644 -index 000000000000..3f68efa4257d +index 000000000..3f68efa42 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers.h @@ -0,0 +1,109 @@ @@ -239389,7 +239390,7 @@ index 000000000000..3f68efa4257d +#endif /* _KERNEL_UTF_HELPERS_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers_user.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers_user.h new file mode 100644 -index 000000000000..e147cbb90154 +index 000000000..e147cbb90 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_helpers_user.h @@ -0,0 +1,184 @@ @@ -239579,7 +239580,7 @@ index 000000000000..e147cbb90154 +#endif /* _KERNEL_UTF_HELPERS_USER_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_mem.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_mem.h new file mode 100644 -index 000000000000..5d4d96ef39b1 +index 000000000..5d4d96ef3 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_mem.h @@ -0,0 +1,72 @@ @@ -239657,7 +239658,7 @@ index 000000000000..5d4d96ef39b1 +#endif /* _KERNEL_UTF_MEM_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_resultset.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_resultset.h new file mode 100644 -index 000000000000..2fb1a47a59b4 +index 000000000..2fb1a47a5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_resultset.h @@ -0,0 +1,180 @@ @@ -239843,7 +239844,7 @@ index 000000000000..2fb1a47a59b4 +#endif /* _KERNEL_UTF_RESULTSET_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_suite.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_suite.h new file mode 100644 -index 000000000000..9e459c556013 +index 000000000..9e459c556 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_suite.h @@ -0,0 +1,571 @@ @@ -240420,7 +240421,7 @@ index 000000000000..9e459c556013 +#endif /* _KERNEL_UTF_SUITE_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_utils.h b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_utils.h new file mode 100644 -index 000000000000..f6e758b80d98 +index 000000000..f6e758b80 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/include/kutf/kutf_utils.h @@ -0,0 +1,60 @@ @@ -240486,7 +240487,7 @@ index 000000000000..f6e758b80d98 +#endif /* _KERNEL_UTF_UTILS_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/kutf/Kbuild b/drivers/gpu/arm/bifrost/tests/kutf/Kbuild new file mode 100755 -index 000000000000..c4790bc66c23 +index 000000000..c4790bc66 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/Kbuild @@ -0,0 +1,31 @@ @@ -240523,7 +240524,7 @@ index 000000000000..c4790bc66c23 +endif diff --git a/drivers/gpu/arm/bifrost/tests/kutf/build.bp b/drivers/gpu/arm/bifrost/tests/kutf/build.bp new file mode 100755 -index 000000000000..89edae9c5e6f +index 000000000..89edae9c5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/build.bp @@ -0,0 +1,42 @@ @@ -240571,7 +240572,7 @@ index 000000000000..89edae9c5e6f +} diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers.c new file mode 100644 -index 000000000000..42736195e071 +index 000000000..42736195e --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers.c @@ -0,0 +1,141 @@ @@ -240718,7 +240719,7 @@ index 000000000000..42736195e071 +EXPORT_SYMBOL(kutf_helper_stop_ignoring_dmesg); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers_user.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers_user.c new file mode 100644 -index 000000000000..c4e294325262 +index 000000000..c4e294325 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_helpers_user.c @@ -0,0 +1,474 @@ @@ -241198,7 +241199,7 @@ index 000000000000..c4e294325262 +EXPORT_SYMBOL(kutf_helper_output_named_val); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_mem.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_mem.c new file mode 100644 -index 000000000000..716970abb8c4 +index 000000000..716970abb --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_mem.c @@ -0,0 +1,107 @@ @@ -241311,7 +241312,7 @@ index 000000000000..716970abb8c4 +EXPORT_SYMBOL(kutf_mempool_alloc); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_resultset.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_resultset.c new file mode 100644 -index 000000000000..3a7ade2831b3 +index 000000000..3a7ade283 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_resultset.c @@ -0,0 +1,163 @@ @@ -241480,7 +241481,7 @@ index 000000000000..3a7ade2831b3 +} diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_suite.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_suite.c new file mode 100644 -index 000000000000..4468066f1b27 +index 000000000..4468066f1 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_suite.c @@ -0,0 +1,1216 @@ @@ -242702,7 +242703,7 @@ index 000000000000..4468066f1b27 +module_exit(exit_kutf_core); diff --git a/drivers/gpu/arm/bifrost/tests/kutf/kutf_utils.c b/drivers/gpu/arm/bifrost/tests/kutf/kutf_utils.c new file mode 100644 -index 000000000000..21f5fadcc5f6 +index 000000000..21f5fadcc --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/kutf/kutf_utils.c @@ -0,0 +1,75 @@ @@ -242783,7 +242784,7 @@ index 000000000000..21f5fadcc5f6 +EXPORT_SYMBOL(kutf_dsprintf); diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kbuild b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kbuild new file mode 100755 -index 000000000000..027bc27c9d3c +index 000000000..027bc27c9 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/Kbuild @@ -0,0 +1,25 @@ @@ -242814,7 +242815,7 @@ index 000000000000..027bc27c9d3c +endif diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/build.bp b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/build.bp new file mode 100755 -index 000000000000..225ad69c5042 +index 000000000..225ad69c5 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/build.bp @@ -0,0 +1,43 @@ @@ -242863,7 +242864,7 @@ index 000000000000..225ad69c5042 +} diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c new file mode 100644 -index 000000000000..a6f54b61d4ad +index 000000000..a6f54b61d --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c @@ -0,0 +1,965 @@ @@ -243834,7 +243835,7 @@ index 000000000000..a6f54b61d4ad +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h new file mode 100644 -index 000000000000..a716b9f70135 +index 000000000..a716b9f70 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h @@ -0,0 +1,154 @@ @@ -243994,7 +243995,7 @@ index 000000000000..a716b9f70135 +#endif /* _KUTF_CLK_RATE_TRACE_TEST_H_ */ diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kbuild b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kbuild new file mode 100755 -index 000000000000..213d6d5ea317 +index 000000000..213d6d5ea --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/Kbuild @@ -0,0 +1,25 @@ @@ -244025,7 +244026,7 @@ index 000000000000..213d6d5ea317 +endif diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/build.bp b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/build.bp new file mode 100755 -index 000000000000..155875b9d5cc +index 000000000..155875b9d --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/build.bp @@ -0,0 +1,42 @@ @@ -244073,7 +244074,7 @@ index 000000000000..155875b9d5cc +} diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c new file mode 100644 -index 000000000000..f2a014d9b5ca +index 000000000..f2a014d9b --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c @@ -0,0 +1,283 @@ @@ -244362,7 +244363,7 @@ index 000000000000..f2a014d9b5ca +MODULE_VERSION("1.0"); diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/Kbuild b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/Kbuild new file mode 100755 -index 000000000000..e9bff98b88b6 +index 000000000..e9bff98b8 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/Kbuild @@ -0,0 +1,25 @@ @@ -244393,7 +244394,7 @@ index 000000000000..e9bff98b88b6 +endif diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/build.bp b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/build.bp new file mode 100755 -index 000000000000..8b995f8a0a07 +index 000000000..8b995f8a0 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/build.bp @@ -0,0 +1,41 @@ @@ -244440,7 +244441,7 @@ index 000000000000..8b995f8a0a07 +} diff --git a/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/mali_kutf_mgm_integration_test_main.c b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/mali_kutf_mgm_integration_test_main.c new file mode 100644 -index 000000000000..5a42bd675c2a +index 000000000..5a42bd675 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tests/mali_kutf_mgm_integration_test/mali_kutf_mgm_integration_test_main.c @@ -0,0 +1,210 @@ @@ -244656,7 +244657,7 @@ index 000000000000..5a42bd675c2a +MODULE_VERSION("1.0"); diff --git a/drivers/gpu/arm/bifrost/thirdparty/Kbuild b/drivers/gpu/arm/bifrost/thirdparty/Kbuild new file mode 100755 -index 000000000000..558be077d483 +index 000000000..558be077d --- /dev/null +++ b/drivers/gpu/arm/bifrost/thirdparty/Kbuild @@ -0,0 +1,21 @@ @@ -244683,7 +244684,7 @@ index 000000000000..558be077d483 +bifrost_kbase-y += thirdparty/mali_kbase_mmap.o diff --git a/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c b/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c new file mode 100644 -index 000000000000..1e636b9a7759 +index 000000000..1e636b9a7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/thirdparty/mali_kbase_mmap.c @@ -0,0 +1,420 @@ @@ -245109,7 +245110,7 @@ index 000000000000..1e636b9a7759 +} diff --git a/drivers/gpu/arm/bifrost/tl/Kbuild b/drivers/gpu/arm/bifrost/tl/Kbuild new file mode 100755 -index 000000000000..1c684d489d6f +index 000000000..1c684d489 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/Kbuild @@ -0,0 +1,32 @@ @@ -245147,7 +245148,7 @@ index 000000000000..1c684d489d6f +endif diff --git a/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_csf.c b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_csf.c new file mode 100644 -index 000000000000..a6062f170ff9 +index 000000000..a6062f170 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_csf.c @@ -0,0 +1,190 @@ @@ -245343,7 +245344,7 @@ index 000000000000..a6062f170ff9 +} diff --git a/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_jm.c b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_jm.c new file mode 100644 -index 000000000000..9ba89f59f03b +index 000000000..9ba89f59f --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/backend/mali_kbase_timeline_jm.c @@ -0,0 +1,96 @@ @@ -245445,7 +245446,7 @@ index 000000000000..9ba89f59f03b +} diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.c new file mode 100644 -index 000000000000..930decf8fc27 +index 000000000..930decf8f --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.c @@ -0,0 +1,413 @@ @@ -245864,7 +245865,7 @@ index 000000000000..930decf8fc27 +#endif /* MALI_UNIT_TEST */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.h new file mode 100644 -index 000000000000..62be6c64c850 +index 000000000..62be6c64c --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline.h @@ -0,0 +1,128 @@ @@ -245998,7 +245999,7 @@ index 000000000000..62be6c64c850 +#endif /* _KBASE_TIMELINE_H */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_io.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_io.c new file mode 100644 -index 000000000000..ae570064e7d0 +index 000000000..ae570064e --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_io.c @@ -0,0 +1,465 @@ @@ -246469,7 +246470,7 @@ index 000000000000..ae570064e7d0 +} diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_priv.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_priv.h new file mode 100644 -index 000000000000..de30bccc7cca +index 000000000..de30bccc7 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_timeline_priv.h @@ -0,0 +1,103 @@ @@ -246578,7 +246579,7 @@ index 000000000000..de30bccc7cca +#endif /* _KBASE_TIMELINE_PRIV_H */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tl_serialize.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_tl_serialize.h new file mode 100644 -index 000000000000..b6aaadedc6b9 +index 000000000..b6aaadedc --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tl_serialize.h @@ -0,0 +1,123 @@ @@ -246707,7 +246708,7 @@ index 000000000000..b6aaadedc6b9 +#endif /* _KBASE_TL_SERIALIZE_H */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.c new file mode 100644 -index 000000000000..47059deb4da2 +index 000000000..47059deb4 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.c @@ -0,0 +1,313 @@ @@ -247026,7 +247027,7 @@ index 000000000000..47059deb4da2 +} diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.h new file mode 100644 -index 000000000000..c1428495b11c +index 000000000..c1428495b --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tlstream.h @@ -0,0 +1,168 @@ @@ -247200,7 +247201,7 @@ index 000000000000..c1428495b11c +#endif /* _KBASE_TLSTREAM_H */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.c b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.c new file mode 100644 -index 000000000000..f62c75583566 +index 000000000..f62c75583 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.c @@ -0,0 +1,4223 @@ @@ -251429,7 +251430,7 @@ index 000000000000..f62c75583566 +/* clang-format on */ diff --git a/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.h b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.h new file mode 100644 -index 000000000000..06e4ca4a6bc2 +index 000000000..06e4ca4a6 --- /dev/null +++ b/drivers/gpu/arm/bifrost/tl/mali_kbase_tracepoints.h @@ -0,0 +1,4382 @@ @@ -255817,14 +255818,14 @@ index 000000000000..06e4ca4a6bc2 +#endif 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 @@ @@ -255832,14 +255833,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 @@ @@ -256099,7 +256100,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 100644 -index 000000000000..082919d91825 +index 000000000..082919d91 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/Kconfig @@ -0,0 +1,119 @@ @@ -256224,7 +256225,7 @@ index 000000000000..082919d91825 + If unsure, say N. diff --git a/drivers/gpu/arm/mali400/mali/Makefile b/drivers/gpu/arm/mali400/mali/Makefile new file mode 100644 -index 000000000000..0b91321a5af1 +index 000000000..0b91321a5 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/Makefile @@ -0,0 +1,206 @@ @@ -256436,7 +256437,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 100644 -index 000000000000..79a418c36ccb +index 000000000..79a418c36 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.c @@ -0,0 +1,142 @@ @@ -256584,7 +256585,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 100644 -index 000000000000..0475b7171d8d +index 000000000..0475b7171 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_broadcast.h @@ -0,0 +1,57 @@ @@ -256647,7 +256648,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 100644 -index 000000000000..5bed27a8c5c9 +index 000000000..5bed27a8c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c @@ -0,0 +1,139 @@ @@ -256792,7 +256793,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 100644 -index 000000000000..c9e6e058ea8e +index 000000000..c9e6e058e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_control_timer.h @@ -0,0 +1,30 @@ @@ -256828,7 +256829,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 100644 -index 000000000000..99b7f360768b +index 000000000..99b7f3607 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.c @@ -0,0 +1,213 @@ @@ -257047,7 +257048,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 100644 -index 000000000000..a7ecf41471d8 +index 000000000..a7ecf4147 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dlbu.h @@ -0,0 +1,45 @@ @@ -257098,7 +257099,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 100644 -index 000000000000..55b21a410754 +index 000000000..55b21a410 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.c @@ -0,0 +1,308 @@ @@ -257412,7 +257413,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 100644 -index 000000000000..662348c4e6ac +index 000000000..662348c4e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_dvfs_policy.h @@ -0,0 +1,34 @@ @@ -257452,7 +257453,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 100644 -index 000000000000..0cf1ec0b0d02 +index 000000000..0cf1ec0b0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_executor.c @@ -0,0 +1,2707 @@ @@ -260165,7 +260166,7 @@ index 000000000000..0cf1ec0b0d02 +} diff --git a/drivers/gpu/arm/mali400/mali/common/mali_executor.h b/drivers/gpu/arm/mali400/mali/common/mali_executor.h new file mode 100644 -index 000000000000..4224d6a6cdc4 +index 000000000..4224d6a6c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_executor.h @@ -0,0 +1,102 @@ @@ -260273,7 +260274,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 100644 -index 000000000000..7d3d4aff7c3f +index 000000000..7d3d4aff7 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp.c @@ -0,0 +1,357 @@ @@ -260636,7 +260637,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 100644 -index 000000000000..3156310f21c7 +index 000000000..3156310f2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp.h @@ -0,0 +1,127 @@ @@ -260769,7 +260770,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 100644 -index 000000000000..5d4d9f2530d3 +index 000000000..5d4d9f253 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.c @@ -0,0 +1,306 @@ @@ -261081,7 +261082,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 100644 -index 000000000000..b84333f9f810 +index 000000000..b84333f9f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_gp_job.h @@ -0,0 +1,324 @@ @@ -261411,7 +261412,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 100644 -index 000000000000..47979a2f1a35 +index 000000000..47979a2f1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_group.c @@ -0,0 +1,1875 @@ @@ -263292,7 +263293,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 100644 -index 000000000000..32481e4a6748 +index 000000000..32481e4a6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_group.h @@ -0,0 +1,460 @@ @@ -263758,7 +263759,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 100644 -index 000000000000..a813816e998d +index 000000000..a813816e9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.c @@ -0,0 +1,47 @@ @@ -263811,7 +263812,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 100644 -index 000000000000..38d96e240a20 +index 000000000..38d96e240 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_hw_core.h @@ -0,0 +1,111 @@ @@ -263928,7 +263929,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 100644 -index 000000000000..6a8f0f0116a4 +index 000000000..6a8f0f011 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_common.h @@ -0,0 +1,181 @@ @@ -264115,7 +264116,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 100644 -index 000000000000..87f97b710257 +index 000000000..87f97b710 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.c @@ -0,0 +1,1349 @@ @@ -265470,7 +265471,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 100644 -index 000000000000..c471fc955107 +index 000000000..c471fc955 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_core.h @@ -0,0 +1,57 @@ @@ -265533,7 +265534,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 100644 -index 000000000000..d1b8dc3b0b0e +index 000000000..d1b8dc3b0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.c @@ -0,0 +1,440 @@ @@ -265979,7 +265980,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 100644 -index 000000000000..06f585dcb238 +index 000000000..06f585dcb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_utilization.h @@ -0,0 +1,72 @@ @@ -266057,7 +266058,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 100644 -index 000000000000..dd44e5e7fa03 +index 000000000..dd44e5e7f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_kernel_vsync.c @@ -0,0 +1,45 @@ @@ -266108,7 +266109,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 100644 -index 000000000000..fe33f561b2aa +index 000000000..fe33f561b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.c @@ -0,0 +1,534 @@ @@ -266648,7 +266649,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 100644 -index 000000000000..c48a8844075f +index 000000000..c48a88440 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_l2_cache.h @@ -0,0 +1,124 @@ @@ -266778,7 +266779,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 100644 -index 000000000000..eb95998f1469 +index 000000000..eb95998f1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.c @@ -0,0 +1,68 @@ @@ -266852,7 +266853,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 100644 -index 000000000000..05013f46f901 +index 000000000..05013f46f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mem_validation.h @@ -0,0 +1,19 @@ @@ -266877,7 +266878,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 100644 -index 000000000000..b82486fa66c0 +index 000000000..b82486fa6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu.c @@ -0,0 +1,433 @@ @@ -267316,7 +267317,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 100644 -index 000000000000..6ed48585f3d2 +index 000000000..6ed48585f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu.h @@ -0,0 +1,124 @@ @@ -267446,7 +267447,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 100644 -index 000000000000..9ad3e8970b7d +index 000000000..9ad3e8970 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.c @@ -0,0 +1,495 @@ @@ -267947,7 +267948,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 100644 -index 000000000000..3fdf07210259 +index 000000000..3fdf07210 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_mmu_page_directory.h @@ -0,0 +1,110 @@ @@ -268063,7 +268064,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 100644 -index 000000000000..9ade362d6b28 +index 000000000..9ade362d6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk.h @@ -0,0 +1,1389 @@ @@ -269458,7 +269459,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 100644 -index 000000000000..bb1831753a40 +index 000000000..bb1831753 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_bitops.h @@ -0,0 +1,162 @@ @@ -269626,7 +269627,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 100644 -index 000000000000..9af2d7d4d621 +index 000000000..9af2d7d4d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_list.h @@ -0,0 +1,273 @@ @@ -269905,7 +269906,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 100644 -index 000000000000..ebcc277fa393 +index 000000000..ebcc277fa --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_mali.h @@ -0,0 +1,157 @@ @@ -270068,7 +270069,7 @@ index 000000000000..ebcc277fa393 +#endif /* __MALI_OSK_MALI_H__ */ diff --git a/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h b/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h new file mode 100644 -index 000000000000..6e4583db1c80 +index 000000000..6e4583db1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_profiling.h @@ -0,0 +1,146 @@ @@ -270220,7 +270221,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 100644 -index 000000000000..b6fa94ce16b3 +index 000000000..b6fa94ce1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_osk_types.h @@ -0,0 +1,471 @@ @@ -270697,7 +270698,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 100644 -index 000000000000..3989a33aeaef +index 000000000..3989a33ae --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm.c @@ -0,0 +1,1362 @@ @@ -272065,7 +272066,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 100644 -index 000000000000..dac69958e034 +index 000000000..dac69958e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm.h @@ -0,0 +1,91 @@ @@ -272162,7 +272163,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 100644 -index 000000000000..8290f7d88f6a +index 000000000..8290f7d88 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.c @@ -0,0 +1,209 @@ @@ -272377,7 +272378,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 100644 -index 000000000000..5776abe39f3d +index 000000000..5776abe39 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_domain.h @@ -0,0 +1,104 @@ @@ -272487,7 +272488,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 100644 -index 000000000000..cf74823230f7 +index 000000000..cf7482323 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.c @@ -0,0 +1,255 @@ @@ -272748,7 +272749,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 100644 -index 000000000000..2b136b0de4e3 +index 000000000..2b136b0de --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pm_metrics.h @@ -0,0 +1,74 @@ @@ -272828,7 +272829,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 100644 -index 000000000000..6f0af59f6fd4 +index 000000000..6f0af59f6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pmu.c @@ -0,0 +1,270 @@ @@ -273104,7 +273105,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 100644 -index 000000000000..5b856240fdac +index 000000000..5b856240f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pmu.h @@ -0,0 +1,123 @@ @@ -273233,7 +273234,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 100644 -index 000000000000..2dd8b8766f8e +index 000000000..2dd8b8766 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp.c @@ -0,0 +1,502 @@ @@ -273741,7 +273742,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 100644 -index 000000000000..f98b29866ffa +index 000000000..f98b29866 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp.h @@ -0,0 +1,138 @@ @@ -273885,7 +273886,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 100644 -index 000000000000..b0216d4c1ac8 +index 000000000..b0216d4c1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.c @@ -0,0 +1,316 @@ @@ -274207,7 +274208,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 100644 -index 000000000000..d0331f398ff9 +index 000000000..d0331f398 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_pp_job.h @@ -0,0 +1,594 @@ @@ -274807,7 +274808,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 100644 -index 000000000000..b5e6cfddbb0e +index 000000000..b5e6cfddb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.c @@ -0,0 +1,1548 @@ @@ -276361,7 +276362,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 100644 -index 000000000000..de81a421ea9a +index 000000000..de81a421e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler.h @@ -0,0 +1,131 @@ @@ -276498,7 +276499,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 100644 -index 000000000000..ba1d71d01d46 +index 000000000..ba1d71d01 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_scheduler_types.h @@ -0,0 +1,29 @@ @@ -276533,7 +276534,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 100644 -index 000000000000..7504fb108779 +index 000000000..7504fb108 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_session.c @@ -0,0 +1,155 @@ @@ -276694,7 +276695,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 100644 -index 000000000000..da8b9927ee60 +index 000000000..da8b9927e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_session.h @@ -0,0 +1,136 @@ @@ -276836,7 +276837,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 100644 -index 000000000000..35cd830bc83a +index 000000000..35cd830bc --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.c @@ -0,0 +1,438 @@ @@ -277280,7 +277281,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 100644 -index 000000000000..018ef4c527d9 +index 000000000..018ef4c52 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_soft_job.h @@ -0,0 +1,190 @@ @@ -277476,7 +277477,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 100644 -index 000000000000..f829e99f02ab +index 000000000..f829e99f0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.c @@ -0,0 +1,77 @@ @@ -277559,7 +277560,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 100644 -index 000000000000..4d788ec1bbe4 +index 000000000..4d788ec1b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_spinlock_reentrant.h @@ -0,0 +1,70 @@ @@ -277635,7 +277636,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 100644 -index 000000000000..ffffee9306ce +index 000000000..ffffee930 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline.c @@ -0,0 +1,1964 @@ @@ -279605,7 +279606,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 100644 -index 000000000000..3e8bfc8fb733 +index 000000000..3e8bfc8fb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline.h @@ -0,0 +1,587 @@ @@ -280198,7 +280199,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 100644 -index 000000000000..1ab13f50997f +index 000000000..1ab13f509 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.c @@ -0,0 +1,218 @@ @@ -280422,7 +280423,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 100644 -index 000000000000..9da12baeef1a +index 000000000..9da12baee --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_fence_wait.h @@ -0,0 +1,67 @@ @@ -280495,7 +280496,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 100644 -index 000000000000..bb7f6a04e8bd +index 000000000..bb7f6a04e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.c @@ -0,0 +1,179 @@ @@ -280680,7 +280681,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 100644 -index 000000000000..65e368ae7c9e +index 000000000..65e368ae7 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_timeline_sync_fence.h @@ -0,0 +1,51 @@ @@ -280737,7 +280738,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 100644 -index 000000000000..55a05c50436a +index 000000000..55a05c504 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_ukk.h @@ -0,0 +1,551 @@ @@ -281294,7 +281295,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 100644 -index 000000000000..1911eff87a72 +index 000000000..1911eff87 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.c @@ -0,0 +1,147 @@ @@ -281447,7 +281448,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 100644 -index 000000000000..da9c0630e371 +index 000000000..da9c0630e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/common/mali_user_settings_db.h @@ -0,0 +1,39 @@ @@ -281492,7 +281493,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 100644 -index 000000000000..7df55c951d6f +index 000000000..7df55c951 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/include/linux/mali/mali_utgard.h @@ -0,0 +1,526 @@ @@ -282024,7 +282025,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 100644 -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 @@ @@ -282127,7 +282128,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 100644 -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 @@ @@ -282323,7 +282324,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 100644 -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 @@ @@ -282634,7 +282635,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 100644 -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 @@ @@ -283748,7 +283749,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 100644 -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 @@ @@ -283784,7 +283785,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 100644 -index 000000000000..7abd1532a29d +index 000000000..7abd1532a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.c @@ -0,0 +1,368 @@ @@ -284158,7 +284159,7 @@ index 000000000000..7abd1532a29d +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h new file mode 100644 -index 000000000000..ba7c017d88dc +index 000000000..ba7c017d8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_devfreq.h @@ -0,0 +1,17 @@ @@ -284181,7 +284182,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 100644 -index 000000000000..95c3ea12d645 +index 000000000..95c3ea12d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_device_pause_resume.c @@ -0,0 +1,36 @@ @@ -284223,7 +284224,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 100644 -index 000000000000..e026e11e4bc5 +index 000000000..e026e11e4 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.c @@ -0,0 +1,439 @@ @@ -284668,7 +284669,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 100644 -index 000000000000..d44f6d1a8926 +index 000000000..d44f6d1a8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_dma_fence.h @@ -0,0 +1,124 @@ @@ -284798,7 +284799,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 100644 -index 000000000000..e13cbad3e513 +index 000000000..e13cbad3e --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.c @@ -0,0 +1,783 @@ @@ -285587,7 +285588,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 100644 -index 000000000000..dbb29222ba98 +index 000000000..dbb29222b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_internal_sync.h @@ -0,0 +1,191 @@ @@ -285784,7 +285785,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 100644 -index 000000000000..10ee220285ff +index 000000000..10ee22028 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c @@ -0,0 +1,1168 @@ @@ -286958,7 +286959,7 @@ index 000000000000..10ee220285ff +MODULE_VERSION(SVN_REV_STRING); diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h new file mode 100644 -index 000000000000..be754cb15646 +index 000000000..be754cb15 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.h @@ -0,0 +1,36 @@ @@ -287000,7 +287001,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 100644 -index 000000000000..7bda438fef50 +index 000000000..7bda438fe --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.c @@ -0,0 +1,1410 @@ @@ -288416,7 +288417,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 100644 -index 000000000000..91580a87c1e1 +index 000000000..91580a87c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_kernel_sysfs.h @@ -0,0 +1,29 @@ @@ -288451,7 +288452,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 100644 -index 000000000000..222260823c81 +index 000000000..222260823 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_linux_trace.h @@ -0,0 +1,161 @@ @@ -288618,7 +288619,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 100644 -index 000000000000..cf3851490d07 +index 000000000..cf3851490 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory.c @@ -0,0 +1,528 @@ @@ -289152,7 +289153,7 @@ index 000000000000..cf3851490d07 + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory.h new file mode 100644 -index 000000000000..efebbef235d8 +index 000000000..efebbef23 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory.h @@ -0,0 +1,143 @@ @@ -289301,7 +289302,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 100644 -index 000000000000..bccef3576914 +index 000000000..bccef3576 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.c @@ -0,0 +1,362 @@ @@ -289669,7 +289670,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 100644 -index 000000000000..70fd9ec25f50 +index 000000000..70fd9ec25 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_block_alloc.h @@ -0,0 +1,58 @@ @@ -289733,7 +289734,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 100644 -index 000000000000..cd9b6d2f7b67 +index 000000000..cd9b6d2f7 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c @@ -0,0 +1,776 @@ @@ -290515,7 +290516,7 @@ index 000000000000..cd9b6d2f7b67 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h new file mode 100644 -index 000000000000..5f83a37fc8f8 +index 000000000..5f83a37fc --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.h @@ -0,0 +1,48 @@ @@ -290569,7 +290570,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 100644 -index 000000000000..a9db577cb851 +index 000000000..a9db577cb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.c @@ -0,0 +1,262 @@ @@ -290837,7 +290838,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 100644 -index 000000000000..defa08d52a46 +index 000000000..defa08d52 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_defer_bind.h @@ -0,0 +1,64 @@ @@ -290907,7 +290908,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 100644 -index 000000000000..1f4565127a6b +index 000000000..1f4565127 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.c @@ -0,0 +1,369 @@ @@ -291282,7 +291283,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 100644 -index 000000000000..a9b2870389ff +index 000000000..a9b287038 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_dma_buf.h @@ -0,0 +1,53 @@ @@ -291341,7 +291342,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 100644 -index 000000000000..76018b7ab90b +index 000000000..76018b7ab --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.c @@ -0,0 +1,89 @@ @@ -291436,7 +291437,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 100644 -index 000000000000..2db178d96233 +index 000000000..2db178d96 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_external.h @@ -0,0 +1,29 @@ @@ -291471,7 +291472,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 100644 -index 000000000000..6c0a2e9a8a14 +index 000000000..6c0a2e9a8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.c @@ -0,0 +1,992 @@ @@ -292469,7 +292470,7 @@ index 000000000000..6c0a2e9a8a14 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h new file mode 100644 -index 000000000000..23d8cde753a1 +index 000000000..23d8cde75 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_manager.h @@ -0,0 +1,51 @@ @@ -292526,7 +292527,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 100644 -index 000000000000..277534fc1b49 +index 000000000..277534fc1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c @@ -0,0 +1,810 @@ @@ -293342,7 +293343,7 @@ index 000000000000..277534fc1b49 +} diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h new file mode 100644 -index 000000000000..8c9b35d0b230 +index 000000000..8c9b35d0b --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.h @@ -0,0 +1,54 @@ @@ -293402,7 +293403,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 100644 -index 000000000000..63506bfbe9fe +index 000000000..63506bfbe --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.c @@ -0,0 +1,170 @@ @@ -293578,7 +293579,7 @@ index 000000000000..63506bfbe9fe + diff --git a/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h new file mode 100644 -index 000000000000..48691d4790fe +index 000000000..48691d479 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_secure.h @@ -0,0 +1,30 @@ @@ -293614,7 +293615,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 100644 -index 000000000000..d682785b9673 +index 000000000..d682785b9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.c @@ -0,0 +1,943 @@ @@ -294563,7 +294564,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 100644 -index 000000000000..5810960e204a +index 000000000..5810960e2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_swap_alloc.h @@ -0,0 +1,121 @@ @@ -294690,7 +294691,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 100644 -index 000000000000..33db40929642 +index 000000000..33db40929 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_types.h @@ -0,0 +1,219 @@ @@ -294915,7 +294916,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 100644 -index 000000000000..666d4b0fb1cd +index 000000000..666d4b0fb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.c @@ -0,0 +1,154 @@ @@ -295075,7 +295076,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 100644 -index 000000000000..c314c8dcbf1c +index 000000000..c314c8dcb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_ump.h @@ -0,0 +1,29 @@ @@ -295110,7 +295111,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 100644 -index 000000000000..8e13e923c3fb +index 000000000..8e13e923c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.c @@ -0,0 +1,158 @@ @@ -295274,7 +295275,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 100644 -index 000000000000..33ac99509740 +index 000000000..33ac99509 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_util.h @@ -0,0 +1,20 @@ @@ -295300,7 +295301,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 100644 -index 000000000000..0b31e3a23432 +index 000000000..0b31e3a23 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.c @@ -0,0 +1,127 @@ @@ -295433,7 +295434,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 100644 -index 000000000000..fd03ed9f2bbb +index 000000000..fd03ed9f2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_memory_virtual.h @@ -0,0 +1,35 @@ @@ -295474,7 +295475,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 100644 -index 000000000000..5bc0e52ebe23 +index 000000000..5bc0e52eb --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_atomics.c @@ -0,0 +1,59 @@ @@ -295539,7 +295540,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 100644 -index 000000000000..fb9ccd2ad1e2 +index 000000000..fb9ccd2ad --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_bitmap.c @@ -0,0 +1,152 @@ @@ -295697,7 +295698,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 100644 -index 000000000000..5c8b9ceab9ab +index 000000000..5c8b9ceab --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_irq.c @@ -0,0 +1,200 @@ @@ -295903,7 +295904,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 100644 -index 000000000000..ed5f0b0da7cb +index 000000000..ed5f0b0da --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.c @@ -0,0 +1,287 @@ @@ -296196,7 +296197,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 100644 -index 000000000000..6fd5af95285b +index 000000000..6fd5af952 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_locks.h @@ -0,0 +1,326 @@ @@ -296528,7 +296529,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 100644 -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 @@ @@ -296680,7 +296681,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 100644 -index 000000000000..a729d0499869 +index 000000000..a729d0499 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_mali.c @@ -0,0 +1,505 @@ @@ -297191,7 +297192,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 100644 -index 000000000000..0b2d00762771 +index 000000000..0b2d00762 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_math.c @@ -0,0 +1,27 @@ @@ -297224,7 +297225,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 100644 -index 000000000000..174616b566c4 +index 000000000..174616b56 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_memory.c @@ -0,0 +1,61 @@ @@ -297291,7 +297292,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 100644 -index 000000000000..9845187f8122 +index 000000000..9845187f8 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_misc.c @@ -0,0 +1,81 @@ @@ -297378,7 +297379,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 100644 -index 000000000000..a05f8f066964 +index 000000000..a05f8f066 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_notification.c @@ -0,0 +1,182 @@ @@ -297566,7 +297567,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 100644 -index 000000000000..e28e2eb21fe2 +index 000000000..e28e2eb21 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_pm.c @@ -0,0 +1,83 @@ @@ -297655,7 +297656,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 100644 -index 000000000000..9e977ea4d0ff +index 000000000..9e977ea4d --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_profiling.c @@ -0,0 +1,1282 @@ @@ -298943,7 +298944,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 100644 -index 000000000000..af51161f9da1 +index 000000000..af51161f9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_specific.h @@ -0,0 +1,74 @@ @@ -299023,7 +299024,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 100644 -index 000000000000..d295e712ac7a +index 000000000..d295e712a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_time.c @@ -0,0 +1,59 @@ @@ -299088,7 +299089,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 100644 -index 000000000000..d01c1148272a +index 000000000..d01c11482 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_timers.c @@ -0,0 +1,76 @@ @@ -299170,7 +299171,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 100644 -index 000000000000..fa12abd3f5dc +index 000000000..fa12abd3f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wait_queue.c @@ -0,0 +1,78 @@ @@ -299254,7 +299255,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 100644 -index 000000000000..d5e258a83a29 +index 000000000..d5e258a83 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_osk_wq.c @@ -0,0 +1,240 @@ @@ -299500,7 +299501,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 100644 -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 @@ @@ -299529,7 +299530,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 100644 -index 000000000000..4661cac42b3f +index 000000000..4661cac42 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_events.h @@ -0,0 +1,17 @@ @@ -299552,7 +299553,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 100644 -index 000000000000..6fdaa427c4cf +index 000000000..6fdaa427c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_gator_api.h @@ -0,0 +1,17 @@ @@ -299575,7 +299576,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 100644 -index 000000000000..c3a526f0ad90 +index 000000000..c3a526f0a --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.c @@ -0,0 +1,275 @@ @@ -299856,7 +299857,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 100644 -index 000000000000..f17b4583307a +index 000000000..f17b45833 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_profiling_internal.h @@ -0,0 +1,35 @@ @@ -299897,7 +299898,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 100644 -index 000000000000..0d98b518f1ac +index 000000000..0d98b518f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_sync.c @@ -0,0 +1,665 @@ @@ -300568,7 +300569,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 100644 -index 000000000000..91be8b9cf314 +index 000000000..91be8b9cf --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_sync.h @@ -0,0 +1,169 @@ @@ -300743,7 +300744,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 100644 -index 000000000000..68b27b8be067 +index 000000000..68b27b8be --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_uk_types.h @@ -0,0 +1,17 @@ @@ -300766,7 +300767,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 100644 -index 000000000000..0bd1cddb10c6 +index 000000000..0bd1cddb1 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_core.c @@ -0,0 +1,171 @@ @@ -300943,7 +300944,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 100644 -index 000000000000..68fcd971938a +index 000000000..68fcd9719 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_gp.c @@ -0,0 +1,91 @@ @@ -301040,7 +301041,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 100644 -index 000000000000..baea4c688db9 +index 000000000..baea4c688 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_mem.c @@ -0,0 +1,333 @@ @@ -301379,7 +301380,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 100644 -index 000000000000..a9b0958c06aa +index 000000000..a9b0958c0 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_pp.c @@ -0,0 +1,105 @@ @@ -301490,7 +301491,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 100644 -index 000000000000..8b49ebc50b95 +index 000000000..8b49ebc50 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_profiling.c @@ -0,0 +1,183 @@ @@ -301679,7 +301680,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 100644 -index 000000000000..1dd4a7c6fb1e +index 000000000..1dd4a7c6f --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_soft_job.c @@ -0,0 +1,90 @@ @@ -301775,7 +301776,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 100644 -index 000000000000..ff0c909393a4 +index 000000000..ff0c90939 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_timeline.c @@ -0,0 +1,88 @@ @@ -301869,7 +301870,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 100644 -index 000000000000..52519d1f96e0 +index 000000000..52519d1f9 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_vsync.c @@ -0,0 +1,39 @@ @@ -301914,7 +301915,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 100644 -index 000000000000..1add628fe323 +index 000000000..1add628fe --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/linux/mali_ukk_wrappers.h @@ -0,0 +1,82 @@ @@ -302002,7 +302003,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 100644 -index 000000000000..fc7017bbfe08 +index 000000000..fc7017bbf --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm.c @@ -0,0 +1,629 @@ @@ -302637,7 +302638,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 100644 -index 000000000000..7a2fc8107b4f +index 000000000..7a2fc8107 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.c @@ -0,0 +1,122 @@ @@ -302765,7 +302766,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 100644 -index 000000000000..8e0101830749 +index 000000000..8e0101830 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/arm_core_scaling.h @@ -0,0 +1,44 @@ @@ -302815,7 +302816,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 100644 -index 000000000000..e4e7ab8b2c2e +index 000000000..e4e7ab8b2 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/arm/juno_opp.c @@ -0,0 +1,127 @@ @@ -302948,7 +302949,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 100644 -index 000000000000..fe5e1224149e +index 000000000..fe5e12241 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/rk/custom_log.h @@ -0,0 +1,209 @@ @@ -303163,7 +303164,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 100644 -index 000000000000..c937e4678ddf +index 000000000..c937e4678 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/rk/rk.c @@ -0,0 +1,726 @@ @@ -303895,7 +303896,7 @@ index 000000000000..c937e4678ddf +} diff --git a/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h b/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h new file mode 100644 -index 000000000000..bd939350c425 +index 000000000..bd939350c --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/platform/rk/rk_ext.h @@ -0,0 +1,37 @@ @@ -303938,7 +303939,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 @@ @@ -303972,7 +303973,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 100644 -index 000000000000..0345fb169a95 +index 000000000..0345fb169 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/regs/mali_200_regs.h @@ -0,0 +1,131 @@ @@ -304109,7 +304110,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 100644 -index 000000000000..7f8b58fd6c49 +index 000000000..7f8b58fd6 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/regs/mali_gp_regs.h @@ -0,0 +1,172 @@ @@ -304287,7 +304288,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 100644 -index 000000000000..7df934c12122 +index 000000000..7df934c12 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.c @@ -0,0 +1,13 @@ @@ -304306,7 +304307,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 100644 -index 000000000000..f52097c1901b +index 000000000..f52097c19 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-arm11-cc/mali_timestamp.h @@ -0,0 +1,48 @@ @@ -304360,7 +304361,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 100644 -index 000000000000..7df934c12122 +index 000000000..7df934c12 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.c @@ -0,0 +1,13 @@ @@ -304379,7 +304380,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 100644 -index 000000000000..709a16a82f31 +index 000000000..709a16a82 --- /dev/null +++ b/drivers/gpu/arm/mali400/mali/timestamp-default/mali_timestamp.h @@ -0,0 +1,26 @@ @@ -304411,7 +304412,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 @@ @@ -304428,7 +304429,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 @@ @@ -304526,7 +304527,7 @@ index 000000000000..a3067ba72459 + diff --git a/drivers/gpu/arm/mali400/ump/Kconfig b/drivers/gpu/arm/mali400/ump/Kconfig new file mode 100644 -index 000000000000..ec3509057732 +index 000000000..ec3509057 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Kconfig @@ -0,0 +1,17 @@ @@ -304549,7 +304550,7 @@ index 000000000000..ec3509057732 + diff --git a/drivers/gpu/arm/mali400/ump/Makefile b/drivers/gpu/arm/mali400/ump/Makefile new file mode 100644 -index 000000000000..88b02a22fce5 +index 000000000..88b02a22f --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/Makefile @@ -0,0 +1,67 @@ @@ -304622,7 +304623,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 @@ @@ -304648,7 +304649,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 100644 -index 000000000000..d4aef9dd09c7 +index 000000000..d4aef9dd0 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/arch-default/config.h @@ -0,0 +1,24 @@ @@ -304678,7 +304679,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 100644 -index 000000000000..182e90c1d64f +index 000000000..182e90c1d --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/arch-pb-virtex5/config.h @@ -0,0 +1,18 @@ @@ -304702,7 +304703,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 100644 -index 000000000000..d4aef9dd09c7 +index 000000000..d4aef9dd0 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/arch/config.h @@ -0,0 +1,24 @@ @@ -304732,7 +304733,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 100644 -index 000000000000..36adb2f5383e +index 000000000..36adb2f53 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_api.c @@ -0,0 +1,455 @@ @@ -305193,7 +305194,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 100644 -index 000000000000..73aa9e4c49f9 +index 000000000..73aa9e4c4 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.c @@ -0,0 +1,358 @@ @@ -305557,7 +305558,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 100644 -index 000000000000..aa65f1cb6c88 +index 000000000..aa65f1cb6 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_common.h @@ -0,0 +1,125 @@ @@ -305688,7 +305689,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 100644 -index 000000000000..e4642f0394c2 +index 000000000..e4642f039 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.c @@ -0,0 +1,155 @@ @@ -305849,7 +305850,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 100644 -index 000000000000..a888ba833fbb +index 000000000..a888ba833 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_descriptor_mapping.h @@ -0,0 +1,89 @@ @@ -305944,7 +305945,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 100644 -index 000000000000..2b69f68e87ac +index 000000000..2b69f68e8 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_memory_backend.h @@ -0,0 +1,48 @@ @@ -305998,7 +305999,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 100644 -index 000000000000..0b6434bee00f +index 000000000..0b6434bee --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_ref_drv.c @@ -0,0 +1,181 @@ @@ -306185,7 +306186,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 100644 -index 000000000000..32f32ccbe9fc +index 000000000..32f32ccbe --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_kernel_types.h @@ -0,0 +1,58 @@ @@ -306249,7 +306250,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 100644 -index 000000000000..9adc4d3df3f5 +index 000000000..9adc4d3df --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_osk.h @@ -0,0 +1,48 @@ @@ -306303,7 +306304,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 100644 -index 000000000000..db842cdcbeff +index 000000000..db842cdcb --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_uk_types.h @@ -0,0 +1,202 @@ @@ -306511,7 +306512,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 100644 -index 000000000000..f2906768c37f +index 000000000..f2906768c --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/common/ump_ukk.h @@ -0,0 +1,60 @@ @@ -306577,7 +306578,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 100644 -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 @@ @@ -306613,7 +306614,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 100644 -index 000000000000..bfb4e8d64885 +index 000000000..bfb4e8d64 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ioctl.h @@ -0,0 +1,54 @@ @@ -306673,7 +306674,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 100644 -index 000000000000..71b30830c308 +index 000000000..71b30830c --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.c @@ -0,0 +1,449 @@ @@ -307128,7 +307129,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 100644 -index 000000000000..8d32ddbb5449 +index 000000000..8d32ddbb5 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_linux.h @@ -0,0 +1,18 @@ @@ -307152,7 +307153,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 100644 -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 @@ @@ -307429,7 +307430,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 100644 -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 @@ @@ -307458,7 +307459,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 100644 -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 @@ @@ -307699,7 +307700,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 100644 -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 @@ @@ -307728,7 +307729,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 100644 -index 000000000000..6be0f86440de +index 000000000..6be0f8644 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.c @@ -0,0 +1,222 @@ @@ -307956,7 +307957,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 100644 -index 000000000000..2cea6cedc380 +index 000000000..2cea6cedc --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_kernel_random_mapping.h @@ -0,0 +1,84 @@ @@ -308046,7 +308047,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 100644 -index 000000000000..e41931e1ea75 +index 000000000..e41931e1e --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_memory_backend.c @@ -0,0 +1,65 @@ @@ -308117,7 +308118,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 100644 -index 000000000000..2b634ba79c6e +index 000000000..2b634ba79 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_atomics.c @@ -0,0 +1,27 @@ @@ -308150,7 +308151,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 100644 -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 @@ @@ -308470,7 +308471,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 100644 -index 000000000000..58c9f1bf27b8 +index 000000000..58c9f1bf2 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_osk_misc.c @@ -0,0 +1,36 @@ @@ -308512,7 +308513,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 100644 -index 000000000000..56a787ff64dc +index 000000000..56a787ff6 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.c @@ -0,0 +1,230 @@ @@ -308748,7 +308749,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 100644 -index 000000000000..61a7095a6920 +index 000000000..61a7095a6 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_ref_wrappers.h @@ -0,0 +1,36 @@ @@ -308790,7 +308791,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 100644 -index 000000000000..4d6b69608fd4 +index 000000000..4d6b69608 --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.c @@ -0,0 +1,280 @@ @@ -309076,7 +309077,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 100644 -index 000000000000..5f8fc683c8f5 +index 000000000..5f8fc683c --- /dev/null +++ b/drivers/gpu/arm/mali400/ump/linux/ump_ukk_wrappers.h @@ -0,0 +1,46 @@ @@ -309128,7 +309129,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 @@ @@ -309162,7 +309163,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 100644 -index 000000000000..e5549a33f91d +index 000000000..e5549a33f --- /dev/null +++ b/drivers/gpu/arm/mali400/umplock/Makefile @@ -0,0 +1,69 @@ @@ -309237,7 +309238,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 100644 -index 000000000000..173f4d9bb5c7 +index 000000000..173f4d9bb --- /dev/null +++ b/drivers/gpu/arm/mali400/umplock/umplock_driver.c @@ -0,0 +1,618 @@ @@ -309861,7 +309862,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 100644 -index 000000000000..8afdaad7000f +index 000000000..8afdaad70 --- /dev/null +++ b/drivers/gpu/arm/mali400/umplock/umplock_ioctl.h @@ -0,0 +1,66 @@ @@ -309933,7 +309934,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 @@ @@ -310160,7 +310161,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 100644 -index 000000000000..043bfc0021cc +index 000000000..043bfc002 --- /dev/null +++ b/drivers/gpu/arm/midgard/Kconfig @@ -0,0 +1,249 @@ @@ -310415,7 +310416,7 @@ index 000000000000..043bfc0021cc +source "drivers/gpu/arm/midgard/tests/Kconfig" diff --git a/drivers/gpu/arm/midgard/Makefile b/drivers/gpu/arm/midgard/Makefile new file mode 100644 -index 000000000000..9aa242c4f8c4 +index 000000000..9aa242c4f --- /dev/null +++ b/drivers/gpu/arm/midgard/Makefile @@ -0,0 +1,42 @@ @@ -310463,7 +310464,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 @@ @@ -310486,7 +310487,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 @@ @@ -310552,7 +310553,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 100644 -index 000000000000..c8ae87eb84a2 +index 000000000..c8ae87eb8 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_backend_config.h @@ -0,0 +1,29 @@ @@ -310587,7 +310588,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 100644 -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 @@ @@ -310622,7 +310623,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 100644 -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 @@ @@ -310662,7 +310663,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 100644 -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 @@ @@ -310825,7 +310826,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 100644 -index 000000000000..4e8e56e9baf2 +index 000000000..4e8e56e9b --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c @@ -0,0 +1,474 @@ @@ -311305,7 +311306,7 @@ index 000000000000..4e8e56e9baf2 +} diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h new file mode 100644 -index 000000000000..c0bf8b15b3bc +index 000000000..c0bf8b15b --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.h @@ -0,0 +1,24 @@ @@ -311335,7 +311336,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 100644 -index 000000000000..dcdf15cdc3e8 +index 000000000..dcdf15cdc --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_hw.c @@ -0,0 +1,255 @@ @@ -311596,7 +311597,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 100644 -index 000000000000..5b20445932fb +index 000000000..5b2044593 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_device_internal.h @@ -0,0 +1,67 @@ @@ -311669,7 +311670,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 100644 -index 000000000000..d578fd78e825 +index 000000000..d578fd78e --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c @@ -0,0 +1,123 @@ @@ -311798,7 +311799,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 100644 -index 000000000000..b395325b556b +index 000000000..b395325b5 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpuprops_backend.c @@ -0,0 +1,110 @@ @@ -311914,7 +311915,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 100644 -index 000000000000..7ad309e8d7f4 +index 000000000..7ad309e8d --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_backend.c @@ -0,0 +1,492 @@ @@ -312412,7 +312413,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 100644 -index 000000000000..4794672da8f0 +index 000000000..4794672da --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_defs.h @@ -0,0 +1,58 @@ @@ -312476,7 +312477,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 100644 -index 000000000000..e96aeae786e1 +index 000000000..e96aeae78 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_instr_internal.h @@ -0,0 +1,45 @@ @@ -312527,7 +312528,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 100644 -index 000000000000..8781561e73d0 +index 000000000..8781561e7 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_internal.h @@ -0,0 +1,39 @@ @@ -312572,7 +312573,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 100644 -index 000000000000..8416b80e8b77 +index 000000000..8416b80e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_irq_linux.c @@ -0,0 +1,469 @@ @@ -313047,7 +313048,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 100644 -index 000000000000..92358f2bf298 +index 000000000..92358f2bf --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_as.c @@ -0,0 +1,237 @@ @@ -313290,7 +313291,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 100644 -index 000000000000..08a7400e66d5 +index 000000000..08a7400e6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_defs.h @@ -0,0 +1,123 @@ @@ -313419,7 +313420,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 100644 -index 000000000000..a6fb097b94f9 +index 000000000..a6fb097b9 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c @@ -0,0 +1,1518 @@ @@ -314943,7 +314944,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 100644 -index 000000000000..1f382b3c1af4 +index 000000000..1f382b3c1 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_internal.h @@ -0,0 +1,164 @@ @@ -315113,7 +315114,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 100644 -index 000000000000..4b4541660ec4 +index 000000000..4b4541660 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.c @@ -0,0 +1,1952 @@ @@ -317071,7 +317072,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 100644 -index 000000000000..1e0e05ad3ea4 +index 000000000..1e0e05ad3 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_rb.h @@ -0,0 +1,76 @@ @@ -317153,7 +317154,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 100644 -index 000000000000..54d8ddd80097 +index 000000000..54d8ddd80 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c @@ -0,0 +1,303 @@ @@ -317462,7 +317463,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 100644 -index 000000000000..35d9781ae092 +index 000000000..35d9781ae --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.h @@ -0,0 +1,129 @@ @@ -317597,7 +317598,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 100644 -index 000000000000..a8c1af23a369 +index 000000000..a8c1af23a --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_backend.c @@ -0,0 +1,356 @@ @@ -317959,7 +317960,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 100644 -index 000000000000..3f53779c6747 +index 000000000..3f53779c6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_internal.h @@ -0,0 +1,69 @@ @@ -318034,7 +318035,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 100644 -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 @@ @@ -318447,7 +318448,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 100644 -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 @@ @@ -318495,7 +318496,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 100644 -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 @@ @@ -318564,7 +318565,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 100644 -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 @@ @@ -318647,7 +318648,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 100644 -index 000000000000..146fd48bab92 +index 000000000..146fd48ba --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_backend.c @@ -0,0 +1,482 @@ @@ -319135,7 +319136,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 100644 -index 000000000000..85890f1e85f5 +index 000000000..85890f1e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.c @@ -0,0 +1,182 @@ @@ -319323,7 +319324,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 100644 -index 000000000000..ee9e751f2d79 +index 000000000..ee9e751f2 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_ca.h @@ -0,0 +1,92 @@ @@ -319421,7 +319422,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 100644 -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 @@ @@ -319556,7 +319557,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 100644 -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 @@ @@ -319617,7 +319618,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 100644 -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 @@ @@ -319688,7 +319689,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 100644 -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 @@ @@ -319734,7 +319735,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 100644 -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 @@ @@ -319810,7 +319811,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 100644 -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 @@ @@ -319880,7 +319881,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 100644 -index 000000000000..352744ee6d73 +index 000000000..352744ee6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_defs.h @@ -0,0 +1,519 @@ @@ -320405,7 +320406,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 100644 -index 000000000000..81322fd0dd17 +index 000000000..81322fd0d --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c @@ -0,0 +1,73 @@ @@ -320484,7 +320485,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 100644 -index 000000000000..c0c84b6e9189 +index 000000000..c0c84b6e9 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.h @@ -0,0 +1,64 @@ @@ -320554,7 +320555,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 100644 -index 000000000000..82727937c545 +index 000000000..82727937c --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_driver.c @@ -0,0 +1,1713 @@ @@ -322273,7 +322274,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 100644 -index 000000000000..6804f45ac27b +index 000000000..6804f45ac --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_internal.h @@ -0,0 +1,548 @@ @@ -322827,7 +322828,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 100644 -index 000000000000..024248ca7123 +index 000000000..024248ca7 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_metrics.c @@ -0,0 +1,401 @@ @@ -323234,7 +323235,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 100644 -index 000000000000..075f020c66e6 +index 000000000..075f020c6 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.c @@ -0,0 +1,973 @@ @@ -324213,7 +324214,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 100644 -index 000000000000..611a90e66e65 +index 000000000..611a90e66 --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_policy.h @@ -0,0 +1,227 @@ @@ -324446,7 +324447,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 100644 -index 000000000000..d08c628dd433 +index 000000000..d08c628dd --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.c @@ -0,0 +1,103 @@ @@ -324555,7 +324556,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 100644 -index 000000000000..433aa4b9cb5e +index 000000000..433aa4b9c --- /dev/null +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_time.h @@ -0,0 +1,52 @@ @@ -324613,7 +324614,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 @@ @@ -324745,7 +324746,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 @@ @@ -324863,7 +324864,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 @@ @@ -324932,7 +324933,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 @@ @@ -324962,7 +324963,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 100644 -index 000000000000..0c91117008a5 +index 000000000..0c9111700 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.c @@ -0,0 +1,589 @@ @@ -325557,7 +325558,7 @@ index 000000000000..0c91117008a5 +KBASE_EXPORT_TEST_API(kbase_ipa_power_model_ops); diff --git a/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h new file mode 100644 -index 000000000000..b2d3db149579 +index 000000000..b2d3db149 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa.h @@ -0,0 +1,148 @@ @@ -325711,7 +325712,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 100644 -index 000000000000..eafc14009ddc +index 000000000..eafc14009 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.c @@ -0,0 +1,219 @@ @@ -325936,7 +325937,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 100644 -index 000000000000..ec06e2096f94 +index 000000000..ec06e2096 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_debugfs.h @@ -0,0 +1,49 @@ @@ -325991,7 +325992,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 100644 -index 000000000000..da0a4d4a0e7e +index 000000000..da0a4d4a0 --- /dev/null +++ b/drivers/gpu/arm/midgard/ipa/mali_kbase_ipa_simple.c @@ -0,0 +1,222 @@ @@ -326219,7 +326220,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 100644 -index 000000000000..6be0a334f99f +index 000000000..6be0a334f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_hwconfig_features.h @@ -0,0 +1,311 @@ @@ -326536,7 +326537,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 100644 -index 000000000000..6d7e5c57e6a4 +index 000000000..6d7e5c57e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_hwconfig_issues.h @@ -0,0 +1,1098 @@ @@ -327640,7 +327641,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 100644 -index 000000000000..ea5e473caef6 +index 000000000..ea5e473ca --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_kernel.h @@ -0,0 +1,1858 @@ @@ -329504,7 +329505,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 100644 -index 000000000000..4a98a72cc37a +index 000000000..4a98a72cc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_mem_priv.h @@ -0,0 +1,52 @@ @@ -329562,7 +329563,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 100644 -index 000000000000..be454a216a39 +index 000000000..be454a216 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_base_vendor_specific_func.h @@ -0,0 +1,24 @@ @@ -329592,7 +329593,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 100644 -index 000000000000..0d9bf23dc685 +index 000000000..0d9bf23dc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase.h @@ -0,0 +1,612 @@ @@ -330210,7 +330211,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 100644 -index 000000000000..fde0f8ff8582 +index 000000000..fde0f8ff8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.c @@ -0,0 +1,209 @@ @@ -330425,7 +330426,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 100644 -index 000000000000..099a29861672 +index 000000000..099a29861 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_10969_workaround.h @@ -0,0 +1,23 @@ @@ -330454,7 +330455,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 100644 -index 000000000000..f910fe970feb +index 000000000..f910fe970 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.c @@ -0,0 +1,102 @@ @@ -330562,7 +330563,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 100644 -index 000000000000..3ed2248897fc +index 000000000..3ed224889 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_as_fault_debugfs.h @@ -0,0 +1,45 @@ @@ -330613,7 +330614,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 100644 -index 000000000000..c67b3e97f1af +index 000000000..c67b3e97f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.c @@ -0,0 +1,64 @@ @@ -330683,7 +330684,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 100644 -index 000000000000..0c18bdb357b0 +index 000000000..0c18bdb35 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_cache_policy.h @@ -0,0 +1,45 @@ @@ -330734,7 +330735,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 100644 -index 000000000000..fb615ae02ead +index 000000000..fb615ae02 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_config.c @@ -0,0 +1,51 @@ @@ -330791,7 +330792,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 100644 -index 000000000000..356d52bcd774 +index 000000000..356d52bcd --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_config.h @@ -0,0 +1,345 @@ @@ -331142,7 +331143,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 100644 -index 000000000000..1cf44b3500cf +index 000000000..1cf44b350 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_config_defaults.h @@ -0,0 +1,227 @@ @@ -331375,7 +331376,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 100644 -index 000000000000..6338a7e221ed +index 000000000..6338a7e22 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_context.c @@ -0,0 +1,342 @@ @@ -331723,7 +331724,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 100644 -index 000000000000..a3f5bb0ce0da +index 000000000..a3f5bb0ce --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_context.h @@ -0,0 +1,90 @@ @@ -331819,7 +331820,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 100644 -index 000000000000..738766f8813f +index 000000000..738766f88 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c @@ -0,0 +1,5023 @@ @@ -336848,7 +336849,7 @@ index 000000000000..738766f8813f +#endif diff --git a/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.c b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.c new file mode 100644 -index 000000000000..ce004841403f +index 000000000..ce0048414 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.c @@ -0,0 +1,208 @@ @@ -337062,7 +337063,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 100644 -index 000000000000..47474fecc2a9 +index 000000000..47474fecc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_ctx_sched.h @@ -0,0 +1,134 @@ @@ -337202,7 +337203,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 100644 -index 000000000000..fb57ac2e31ad +index 000000000..fb57ac2e3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug.c @@ -0,0 +1,39 @@ @@ -337247,7 +337248,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 100644 -index 000000000000..5fff2892bb55 +index 000000000..5fff2892b --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug.h @@ -0,0 +1,164 @@ @@ -337417,7 +337418,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 100644 -index 000000000000..f29430ddf8f9 +index 000000000..f29430ddf --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.c @@ -0,0 +1,499 @@ @@ -337922,7 +337923,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 100644 -index 000000000000..a2bf8983c37c +index 000000000..a2bf8983c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_job_fault.h @@ -0,0 +1,96 @@ @@ -338024,7 +338025,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 100644 -index 000000000000..6f2cbdf571cb +index 000000000..6f2cbdf57 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.c @@ -0,0 +1,306 @@ @@ -338336,7 +338337,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 100644 -index 000000000000..20ab51a776c6 +index 000000000..20ab51a77 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_debug_mem_view.h @@ -0,0 +1,25 @@ @@ -338367,7 +338368,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 100644 -index 000000000000..f8a6f33df2da +index 000000000..f8a6f33df --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_defs.h @@ -0,0 +1,1602 @@ @@ -339975,7 +339976,7 @@ index 000000000000..f8a6f33df2da +#endif /* _KBASE_DEFS_H_ */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_device.c b/drivers/gpu/arm/midgard/mali_kbase_device.c new file mode 100644 -index 000000000000..b0eb67da8644 +index 000000000..b0eb67da8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_device.c @@ -0,0 +1,674 @@ @@ -340655,7 +340656,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 100644 -index 000000000000..f70bcccf4050 +index 000000000..f70bcccf4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_disjoint_events.c @@ -0,0 +1,76 @@ @@ -340737,7 +340738,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 100644 -index 000000000000..9197743c81d4 +index 000000000..9197743c8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.c @@ -0,0 +1,449 @@ @@ -341192,7 +341193,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 100644 -index 000000000000..c9ab40350422 +index 000000000..c9ab40350 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_dma_fence.h @@ -0,0 +1,131 @@ @@ -341329,7 +341330,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 100644 -index 000000000000..188148645f37 +index 000000000..188148645 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_event.c @@ -0,0 +1,259 @@ @@ -341594,7 +341595,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 100644 -index 000000000000..3bcfb38c31c2 +index 000000000..3bcfb38c3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_fence.c @@ -0,0 +1,200 @@ @@ -341800,7 +341801,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 100644 -index 000000000000..639cc2ef4348 +index 000000000..639cc2ef4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_fence.h @@ -0,0 +1,275 @@ @@ -342081,7 +342082,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 100644 -index 000000000000..fa2c6dfe999e +index 000000000..fa2c6dfe9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h @@ -0,0 +1,51 @@ @@ -342138,7 +342139,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 100644 -index 000000000000..ce65b5562a2b +index 000000000..ce65b5562 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator.h @@ -0,0 +1,45 @@ @@ -342189,7 +342190,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 100644 -index 000000000000..860e10159fb3 +index 000000000..860e10159 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_api.c @@ -0,0 +1,334 @@ @@ -342529,7 +342530,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 100644 -index 000000000000..ef9ac0f7b633 +index 000000000..ef9ac0f7b --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_api.h @@ -0,0 +1,219 @@ @@ -342754,7 +342755,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 100644 -index 000000000000..cad19b66200d +index 000000000..cad19b662 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names.h @@ -0,0 +1,2170 @@ @@ -344930,7 +344931,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 100644 -index 000000000000..bcceef4fc9bc +index 000000000..bcceef4fc --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_thex.h @@ -0,0 +1,291 @@ @@ -345227,7 +345228,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 100644 -index 000000000000..5ea06770fdb2 +index 000000000..5ea06770f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tmix.h @@ -0,0 +1,291 @@ @@ -345524,7 +345525,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 100644 -index 000000000000..be09c4556735 +index 000000000..be09c4556 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gator_hwcnt_names_tsix.h @@ -0,0 +1,291 @@ @@ -345821,7 +345822,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 100644 -index 000000000000..42f0111c474f +index 000000000..42f0111c4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_id.h @@ -0,0 +1,123 @@ @@ -345950,7 +345951,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 100644 -index 000000000000..6df0a1cb1264 +index 000000000..6df0a1cb1 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.c @@ -0,0 +1,97 @@ @@ -346053,7 +346054,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 100644 -index 000000000000..7045693eb910 +index 000000000..7045693eb --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpu_memory_debugfs.h @@ -0,0 +1,37 @@ @@ -346096,7 +346097,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 100644 -index 000000000000..a947a2e03a2f +index 000000000..a947a2e03 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.c @@ -0,0 +1,510 @@ @@ -346612,7 +346613,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 100644 -index 000000000000..57b3eaf9cd53 +index 000000000..57b3eaf9c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops.h @@ -0,0 +1,84 @@ @@ -346702,7 +346703,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 100644 -index 000000000000..10794fc27318 +index 000000000..10794fc27 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_gpuprops_types.h @@ -0,0 +1,92 @@ @@ -346800,7 +346801,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 100644 -index 000000000000..9a390d233939 +index 000000000..9a390d233 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hw.c @@ -0,0 +1,453 @@ @@ -347259,7 +347260,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 100644 -index 000000000000..754250ce968d +index 000000000..754250ce9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hw.h @@ -0,0 +1,65 @@ @@ -347330,7 +347331,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 100644 -index 000000000000..b09be99e6b4e +index 000000000..b09be99e6 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_backend.h @@ -0,0 +1,54 @@ @@ -347390,7 +347391,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 100644 -index 000000000000..0acf297192fd +index 000000000..0acf29719 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_defs.h @@ -0,0 +1,36 @@ @@ -347432,7 +347433,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 100644 -index 000000000000..cf8a8131c22e +index 000000000..cf8a8131c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_gpuprops.h @@ -0,0 +1,47 @@ @@ -347485,7 +347486,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 100644 -index 000000000000..5de2b7535bb4 +index 000000000..5de2b7535 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_instr.h @@ -0,0 +1,116 @@ @@ -347607,7 +347608,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 100644 -index 000000000000..750fda2cd81d +index 000000000..750fda2cd --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_jm.h @@ -0,0 +1,381 @@ @@ -347994,7 +347995,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 100644 -index 000000000000..71c7d495c40a +index 000000000..71c7d495c --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_pm.h @@ -0,0 +1,209 @@ @@ -348209,7 +348210,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 100644 -index 000000000000..10b65798e6cf +index 000000000..10b65798e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwaccess_time.h @@ -0,0 +1,53 @@ @@ -348268,7 +348269,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 100644 -index 000000000000..cf7bf1b35dc5 +index 000000000..cf7bf1b35 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_hwcnt_reader.h @@ -0,0 +1,66 @@ @@ -348340,7 +348341,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 100644 -index 000000000000..dcbed9c774d6 +index 000000000..dcbed9c77 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_ioctl.h @@ -0,0 +1,656 @@ @@ -349002,7 +349003,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 100644 -index 000000000000..d9d8658d31dc +index 000000000..d9d8658d3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jd.c @@ -0,0 +1,1903 @@ @@ -350911,7 +350912,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 100644 -index 000000000000..44643abf85aa +index 000000000..44643abf8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c @@ -0,0 +1,233 @@ @@ -351150,7 +351151,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 100644 -index 000000000000..0935f1db7296 +index 000000000..0935f1db7 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.h @@ -0,0 +1,39 @@ @@ -351195,7 +351196,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 100644 -index 000000000000..0c5c6a6f78cb +index 000000000..0c5c6a6f7 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jm.c @@ -0,0 +1,131 @@ @@ -351332,7 +351333,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 100644 -index 000000000000..a74ee24c8058 +index 000000000..a74ee24c8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_jm.h @@ -0,0 +1,110 @@ @@ -351448,7 +351449,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 100644 -index 000000000000..10a1d5909bbe +index 000000000..10a1d5909 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js.c @@ -0,0 +1,2834 @@ @@ -354288,7 +354289,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 100644 -index 000000000000..ddada8e468a1 +index 000000000..ddada8e46 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js.h @@ -0,0 +1,925 @@ @@ -355219,7 +355220,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 100644 -index 000000000000..321506ada835 +index 000000000..321506ada --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.c @@ -0,0 +1,301 @@ @@ -355526,7 +355527,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 100644 -index 000000000000..ce9183326a57 +index 000000000..ce9183326 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js_ctx_attr.h @@ -0,0 +1,158 @@ @@ -355690,7 +355691,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 100644 -index 000000000000..ba8b6441549b +index 000000000..ba8b64415 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_js_defs.h @@ -0,0 +1,386 @@ @@ -356082,7 +356083,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 100644 -index 000000000000..6d1e61fd41e0 +index 000000000..6d1e61fd4 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_linux.h @@ -0,0 +1,43 @@ @@ -356131,7 +356132,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 100644 -index 000000000000..f372e02efd81 +index 000000000..f372e02ef --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem.c @@ -0,0 +1,2657 @@ @@ -358794,7 +358795,7 @@ index 000000000000..f372e02efd81 +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem.h b/drivers/gpu/arm/midgard/mali_kbase_mem.h new file mode 100644 -index 000000000000..3f3eaa3fda98 +index 000000000..3f3eaa3fd --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem.h @@ -0,0 +1,1068 @@ @@ -359868,7 +359869,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 100644 -index 000000000000..de12cdf76cdf +index 000000000..de12cdf76 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c @@ -0,0 +1,2574 @@ @@ -362448,7 +362449,7 @@ index 000000000000..de12cdf76cdf + diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.h b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.h new file mode 100644 -index 000000000000..33b3554f9d82 +index 000000000..33b3554f9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.h @@ -0,0 +1,231 @@ @@ -362685,7 +362686,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 100644 -index 000000000000..9725fd3f05df +index 000000000..9725fd3f0 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_lowlevel.h @@ -0,0 +1,45 @@ @@ -362736,7 +362737,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 100644 -index 000000000000..0cafb64eee2d +index 000000000..0cafb64ee --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool.c @@ -0,0 +1,573 @@ @@ -363315,7 +363316,7 @@ index 000000000000..0cafb64eee2d +} diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.c new file mode 100644 -index 000000000000..585fba036c9e +index 000000000..585fba036 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.c @@ -0,0 +1,81 @@ @@ -363402,7 +363403,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 100644 -index 000000000000..1442854e8956 +index 000000000..1442854e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_pool_debugfs.h @@ -0,0 +1,36 @@ @@ -363444,7 +363445,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 100644 -index 000000000000..d58fd8d62fde +index 000000000..d58fd8d62 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c @@ -0,0 +1,121 @@ @@ -363571,7 +363572,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 100644 -index 000000000000..a1dc2e0b165b +index 000000000..a1dc2e0b1 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.h @@ -0,0 +1,59 @@ @@ -363636,7 +363637,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 100644 -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 @@ @@ -363675,7 +363676,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 100644 -index 000000000000..26144850a588 +index 000000000..26144850a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu.c @@ -0,0 +1,2088 @@ @@ -365769,7 +365770,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 100644 -index 000000000000..986e959e9a0c +index 000000000..986e959e9 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_hw.h @@ -0,0 +1,123 @@ @@ -365898,7 +365899,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 100644 -index 000000000000..b487c00426ae +index 000000000..b487c0042 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode.h @@ -0,0 +1,47 @@ @@ -365951,7 +365952,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 100644 -index 000000000000..60df171164ff +index 000000000..60df17116 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_aarch64.c @@ -0,0 +1,200 @@ @@ -366157,7 +366158,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 100644 -index 000000000000..53fbbc73af91 +index 000000000..53fbbc73a --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_mmu_mode_lpae.c @@ -0,0 +1,198 @@ @@ -366361,7 +366362,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 100644 -index 000000000000..1a44957fe44a +index 000000000..1a44957fe --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_platform_fake.c @@ -0,0 +1,124 @@ @@ -366491,7 +366492,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 100644 -index 000000000000..97d543464c28 +index 000000000..97d543464 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_pm.c @@ -0,0 +1,205 @@ @@ -366702,7 +366703,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 100644 -index 000000000000..37fa2479df74 +index 000000000..37fa2479d --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_pm.h @@ -0,0 +1,171 @@ @@ -366879,7 +366880,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 100644 -index 000000000000..7fb674eded37 +index 000000000..7fb674ede --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_profiling_gator_api.h @@ -0,0 +1,40 @@ @@ -366925,7 +366926,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 100644 -index 000000000000..c970650069cd +index 000000000..c97065006 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.c @@ -0,0 +1,130 @@ @@ -367061,7 +367062,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 100644 -index 000000000000..f10837002330 +index 000000000..f10837002 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.h @@ -0,0 +1,50 @@ @@ -367117,7 +367118,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 100644 -index 000000000000..84aa3316e435 +index 000000000..84aa3316e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_replay.c @@ -0,0 +1,1166 @@ @@ -368289,7 +368290,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 100644 -index 000000000000..6c8cf73ae58c +index 000000000..6c8cf73ae --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_smc.c @@ -0,0 +1,86 @@ @@ -368381,7 +368382,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 100644 -index 000000000000..9bff3d2e8b4d +index 000000000..9bff3d2e8 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_smc.h @@ -0,0 +1,67 @@ @@ -368454,7 +368455,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 100644 -index 000000000000..396953e780a8 +index 000000000..396953e78 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_softjobs.c @@ -0,0 +1,1549 @@ @@ -370009,7 +370010,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 100644 -index 000000000000..c98762cec244 +index 000000000..c98762cec --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_strings.c @@ -0,0 +1,23 @@ @@ -370038,7 +370039,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 100644 -index 000000000000..41b8fdbec6a4 +index 000000000..41b8fdbec --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_strings.h @@ -0,0 +1,19 @@ @@ -370063,7 +370064,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 100644 -index 000000000000..2cb8c182051e +index 000000000..2cb8c1820 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync.h @@ -0,0 +1,204 @@ @@ -370273,7 +370274,7 @@ index 000000000000..2cb8c182051e +#endif /* MALI_KBASE_SYNC_H */ diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync_android.c b/drivers/gpu/arm/midgard/mali_kbase_sync_android.c new file mode 100644 -index 000000000000..d7349dcae69a +index 000000000..d7349dcae --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync_android.c @@ -0,0 +1,537 @@ @@ -370816,7 +370817,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 100644 -index 000000000000..457def296684 +index 000000000..457def296 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync_common.c @@ -0,0 +1,43 @@ @@ -370865,7 +370866,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 100644 -index 000000000000..60b5d74db33e +index 000000000..60b5d74db --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_sync_file.c @@ -0,0 +1,359 @@ @@ -371230,7 +371231,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 100644 -index 000000000000..c8310c45f143 +index 000000000..c8310c45f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_tlstream.c @@ -0,0 +1,2572 @@ @@ -373808,7 +373809,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 100644 -index 000000000000..c0a1117d5f25 +index 000000000..c0a1117d5 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_tlstream.h @@ -0,0 +1,623 @@ @@ -374437,7 +374438,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 100644 -index 000000000000..e2e0544208ce +index 000000000..e2e054420 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_defs.h @@ -0,0 +1,264 @@ @@ -374707,7 +374708,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 100644 -index 000000000000..5830e87f0818 +index 000000000..5830e87f0 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c @@ -0,0 +1,236 @@ @@ -374949,7 +374950,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 100644 -index 000000000000..a04f7c1420e0 +index 000000000..a04f7c142 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.h @@ -0,0 +1,363 @@ @@ -375318,7 +375319,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 100644 -index 000000000000..156a95a67f4a +index 000000000..156a95a67 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline_defs.h @@ -0,0 +1,140 @@ @@ -375464,7 +375465,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 100644 -index 000000000000..c22a59324248 +index 000000000..c22a59324 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_uku.h @@ -0,0 +1,545 @@ @@ -376015,7 +376016,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 100644 -index 000000000000..be474ff87401 +index 000000000..be474ff87 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_utility.c @@ -0,0 +1,33 @@ @@ -376054,7 +376055,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 100644 -index 000000000000..fd7252dab0de +index 000000000..fd7252dab --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_utility.h @@ -0,0 +1,37 @@ @@ -376097,7 +376098,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 100644 -index 000000000000..8395568d0efa +index 000000000..8395568d0 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_vinstr.c @@ -0,0 +1,2070 @@ @@ -378173,7 +378174,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 100644 -index 000000000000..6207d25aef06 +index 000000000..6207d25ae --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_kbase_vinstr.h @@ -0,0 +1,155 @@ @@ -378334,7 +378335,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 100644 -index 000000000000..5d6b4021d626 +index 000000000..5d6b4021d --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_linux_kbase_trace.h @@ -0,0 +1,201 @@ @@ -378541,7 +378542,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 100644 -index 000000000000..2be06a552768 +index 000000000..2be06a552 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_linux_trace.h @@ -0,0 +1,189 @@ @@ -378736,7 +378737,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 100644 -index 000000000000..99452933eab4 +index 000000000..99452933e --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_malisw.h @@ -0,0 +1,131 @@ @@ -378873,7 +378874,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 100644 -index 000000000000..a509cbd5f175 +index 000000000..a509cbd5f --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_midg_coherency.h @@ -0,0 +1,26 @@ @@ -378905,7 +378906,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 100644 -index 000000000000..7d7b7bcd3cc3 +index 000000000..7d7b7bcd3 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_midg_regmap.h @@ -0,0 +1,611 @@ @@ -379522,7 +379523,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 100644 -index 000000000000..bd5f6614b6bb +index 000000000..bd5f6614b --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_timeline.h @@ -0,0 +1,396 @@ @@ -379924,7 +379925,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 100644 -index 000000000000..841d03fb5873 +index 000000000..841d03fb5 --- /dev/null +++ b/drivers/gpu/arm/midgard/mali_uk.h @@ -0,0 +1,141 @@ @@ -380071,7 +380072,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 100644 -index 000000000000..8fb4e917c4fa +index 000000000..8fb4e917c --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/Kconfig @@ -0,0 +1,24 @@ @@ -380101,7 +380102,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 @@ @@ -380125,7 +380126,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 100644 -index 000000000000..b2a7c93f12a9 +index 000000000..b2a7c93f1 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_devicetree.c @@ -0,0 +1,31 @@ @@ -380162,7 +380163,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 100644 -index 000000000000..49e107f98000 +index 000000000..49e107f98 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_config_platform.h @@ -0,0 +1,73 @@ @@ -380241,7 +380242,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 100644 -index 000000000000..aa4376afd3ba +index 000000000..aa4376afd --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/devicetree/mali_kbase_runtime_pm.c @@ -0,0 +1,100 @@ @@ -380347,7 +380348,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 100644 -index 000000000000..c11085af5f24 +index 000000000..c11085af5 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_common.h @@ -0,0 +1,28 @@ @@ -380381,7 +380382,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 100644 -index 000000000000..01f9dfce93cc +index 000000000..01f9dfce9 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/mali_kbase_platform_fake.h @@ -0,0 +1,38 @@ @@ -380425,7 +380426,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 @@ @@ -380448,7 +380449,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 100644 -index 000000000000..fe5e1224149e +index 000000000..fe5e12241 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/custom_log.h @@ -0,0 +1,209 @@ @@ -380663,7 +380664,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 100644 -index 000000000000..07c5b6f8a760 +index 000000000..07c5b6f8a --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_platform.h @@ -0,0 +1,88 @@ @@ -380757,7 +380758,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 100644 -index 000000000000..8ad910c1256f +index 000000000..8ad910c12 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c @@ -0,0 +1,492 @@ @@ -381255,7 +381256,7 @@ index 000000000000..8ad910c1256f +} diff --git a/drivers/gpu/arm/midgard/platform/rk/mali_kbase_rk.h b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_rk.h new file mode 100644 -index 000000000000..6eab25014d21 +index 000000000..6eab25014 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/rk/mali_kbase_rk.h @@ -0,0 +1,62 @@ @@ -381323,7 +381324,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 @@ @@ -381347,7 +381348,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 100644 -index 000000000000..02835f129aa3 +index 000000000..02835f129 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_platform.h @@ -0,0 +1,75 @@ @@ -381428,7 +381429,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 100644 -index 000000000000..15ce2bc5eea5 +index 000000000..15ce2bc5e --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_config_vexpress.c @@ -0,0 +1,85 @@ @@ -381519,7 +381520,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 100644 -index 000000000000..4665f98cbbe4 +index 000000000..4665f98cb --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.c @@ -0,0 +1,279 @@ @@ -381804,7 +381805,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 100644 -index 000000000000..da865698133a +index 000000000..da8656981 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform/vexpress/mali_kbase_cpu_vexpress.h @@ -0,0 +1,38 @@ @@ -381848,7 +381849,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 @@ @@ -381870,7 +381871,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 100644 -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 @@ @@ -381949,7 +381950,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 100644 -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 @@ @@ -382034,7 +382035,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 @@ @@ -382058,7 +382059,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 100644 -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 @@ @@ -382139,7 +382140,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 100644 -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 @@ @@ -382228,7 +382229,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 100644 -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 @@ @@ -382305,7 +382306,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 100644 -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 @@ @@ -382339,7 +382340,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 100644 -index 000000000000..5fa9b39c4bc0 +index 000000000..5fa9b39c4 --- /dev/null +++ b/drivers/gpu/arm/midgard/platform_dummy/mali_ukk_os.h @@ -0,0 +1,53 @@ @@ -382398,7 +382399,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 100644 -index 000000000000..5dc2f3ba8cf6 +index 000000000..5dc2f3ba8 --- /dev/null +++ b/drivers/gpu/arm/midgard/protected_mode_switcher.h @@ -0,0 +1,64 @@ @@ -382468,7 +382469,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 100644 -index 000000000000..8218666183ea +index 000000000..821866618 --- /dev/null +++ b/drivers/gpu/arm/midgard/rename.h @@ -0,0 +1,426 @@ @@ -382900,7 +382901,7 @@ index 000000000000..8218666183ea +#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 @@ @@ -382998,7 +382999,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 @@ @@ -383021,7 +383022,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 100644 -index 000000000000..da0515c065de +index 000000000..da0515c06 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/Kconfig @@ -0,0 +1,17 @@ @@ -383044,7 +383045,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 100644 -index 000000000000..0d145e42a0ca +index 000000000..0d145e42a --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_mem.h @@ -0,0 +1,65 @@ @@ -383115,7 +383116,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 100644 -index 000000000000..1cc85f1b7a46 +index 000000000..1cc85f1b7 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_resultset.h @@ -0,0 +1,121 @@ @@ -383242,7 +383243,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 100644 -index 000000000000..754c3adb1cca +index 000000000..754c3adb1 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_suite.h @@ -0,0 +1,508 @@ @@ -383756,7 +383757,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 100644 -index 000000000000..c458c1f73802 +index 000000000..c458c1f73 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/include/kutf/kutf_utils.h @@ -0,0 +1,55 @@ @@ -383817,7 +383818,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 @@ @@ -383843,7 +383844,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 100644 -index 000000000000..84364716afe3 +index 000000000..84364716a --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/Kconfig @@ -0,0 +1,22 @@ @@ -383871,7 +383872,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 100644 -index 000000000000..010c92ca39b9 +index 000000000..010c92ca3 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/Makefile @@ -0,0 +1,29 @@ @@ -383906,7 +383907,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 100644 -index 000000000000..5408e57d469a +index 000000000..5408e57d4 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_mem.c @@ -0,0 +1,94 @@ @@ -384006,7 +384007,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 100644 -index 000000000000..5bd04969fd55 +index 000000000..5bd04969f --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_resultset.c @@ -0,0 +1,95 @@ @@ -384107,7 +384108,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 100644 -index 000000000000..a7cfd3be9c46 +index 000000000..a7cfd3be9 --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_suite.c @@ -0,0 +1,1041 @@ @@ -385154,7 +385155,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 100644 -index 000000000000..a429a2dbf788 +index 000000000..a429a2dbf --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/kutf/kutf_utils.c @@ -0,0 +1,71 @@ @@ -385231,7 +385232,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 @@ @@ -385258,7 +385259,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 @@ @@ -385284,7 +385285,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 100644 -index 000000000000..16f68d15c46e +index 000000000..16f68d15c --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Kconfig @@ -0,0 +1,23 @@ @@ -385313,7 +385314,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 100644 -index 000000000000..4e948767a4ac +index 000000000..4e948767a --- /dev/null +++ b/drivers/gpu/arm/midgard/tests/mali_kutf_irq_test/Makefile @@ -0,0 +1,51 @@ @@ -385370,7 +385371,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 100644 -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 @@ @@ -385633,7 +385634,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 @@ @@ -385669,7 +385670,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 @@ @@ -385712,7 +385713,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 @@ @@ -385742,7 +385743,7 @@ index 000000000000..a06092bd5bf0 + +SConscript('midgard/sconscript') diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig -index 3caa020391c7..25f4aab7e71a 100644 +index 3caa02039..25f4aab7e 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -35,6 +35,18 @@ config DRM_MIPI_DBI @@ -385765,7 +385766,7 @@ index 3caa020391c7..25f4aab7e71a 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 df9370e0ff23..1b701b1133cb 100644 +index df9370e0f..1b701b113 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -8,11 +8,13 @@ @@ -387868,7 +387869,7 @@ index df9370e0ff23..1b701b1133cb 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 433f2d7efa0c..87c9cefbce1b 100644 +index 433f2d7ef..87c9cefbc 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h @@ -11,6 +11,7 @@ @@ -388034,7 +388035,7 @@ index 433f2d7efa0c..87c9cefbce1b 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 6a4f20fccf84..e756d7cd3d41 100644 +index 6a4f20fcc..e756d7cd3 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c @@ -11,30 +11,44 @@ @@ -389645,7 +389646,7 @@ index 6a4f20fccf84..e756d7cd3d41 100644 + analogix_dp_init_aux(dp); +} diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h -index e284ee8da58b..0a368b1722ec 100644 +index e284ee8da..0a368b172 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h @@ -15,9 +15,27 @@ @@ -389837,7 +389838,7 @@ index e284ee8da58b..0a368b1722ec 100644 + #endif /* _ANALOGIX_DP_REG_H */ diff --git a/drivers/gpu/drm/bridge/display-connector.c b/drivers/gpu/drm/bridge/display-connector.c -index 08bd5695ddae..38bc694a6b34 100644 +index 08bd5695d..38bc694a6 100644 --- a/drivers/gpu/drm/bridge/display-connector.c +++ b/drivers/gpu/drm/bridge/display-connector.c @@ -190,18 +190,6 @@ static irqreturn_t display_connector_hpd_irq(int irq, void *arg) @@ -389937,7 +389938,7 @@ index 08bd5695ddae..38bc694a6b34 100644 conn->bridge.funcs = &display_connector_bridge_funcs; diff --git a/drivers/gpu/drm/bridge/synopsys/Makefile b/drivers/gpu/drm/bridge/synopsys/Makefile -index ce715562e9e5..f4c6cf6289d8 100644 +index ce715562e..f4c6cf628 100644 --- a/drivers/gpu/drm/bridge/synopsys/Makefile +++ b/drivers/gpu/drm/bridge/synopsys/Makefile @@ -1,8 +1,9 @@ @@ -389954,7 +389955,7 @@ index ce715562e9e5..f4c6cf6289d8 100644 obj-$(CONFIG_DRM_DW_MIPI_DSI) += dw-mipi-dsi.o diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h -index f72d27208ebe..966d297ef41d 100644 +index f72d27208..966d297ef 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h @@ -17,6 +17,7 @@ struct dw_hdmi_i2s_audio_data { @@ -389966,7 +389967,7 @@ index f72d27208ebe..966d297ef41d 100644 }; diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c -index be21c11de1f2..414d601bf216 100644 +index be21c11de..414d601bf 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c @@ -4,14 +4,17 @@ @@ -390394,7 +390395,7 @@ index be21c11de1f2..414d601bf216 100644 }; module_platform_driver(dw_hdmi_cec_driver); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h -index cf4dc121a2c4..ec10660a7e53 100644 +index cf4dc121a..ec10660a7 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h @@ -3,17 +3,24 @@ @@ -390424,7 +390425,7 @@ index cf4dc121a2c4..ec10660a7e53 100644 #endif diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.c new file mode 100644 -index 000000000000..5906b7cac3b4 +index 000000000..5906b7cac --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.c @@ -0,0 +1,748 @@ @@ -391178,7 +391179,7 @@ index 000000000000..5906b7cac3b4 +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h new file mode 100644 -index 000000000000..d138f91f3422 +index 000000000..d138f91f3 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-hdcp.h @@ -0,0 +1,54 @@ @@ -391237,7 +391238,7 @@ index 000000000000..d138f91f3422 + +#endif diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c -index 26c187d20d97..194c96faa6c3 100644 +index 26c187d20..194c96faa 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c @@ -34,6 +34,14 @@ static inline u8 hdmi_read(struct dw_hdmi_i2s_audio_data *audio, int offset) @@ -391334,7 +391335,7 @@ index 26c187d20d97..194c96faa6c3 100644 pdata.max_i2s_channels = 8; diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-audio.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-audio.h new file mode 100644 -index 000000000000..93f1a42954e7 +index 000000000..93f1a4295 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-audio.h @@ -0,0 +1,29 @@ @@ -391369,7 +391370,7 @@ index 000000000000..93f1a42954e7 +#endif diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.c new file mode 100644 -index 000000000000..2d2320ed0769 +index 000000000..2d2320ed0 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.c @@ -0,0 +1,336 @@ @@ -391711,7 +391712,7 @@ index 000000000000..2d2320ed0769 +MODULE_ALIAS(PLATFORM_MODULE_PREFIX "dw-hdmi-qp-cec"); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.h new file mode 100644 -index 000000000000..c0977c612e34 +index 000000000..c0977c612 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-cec.h @@ -0,0 +1,25 @@ @@ -391742,7 +391743,7 @@ index 000000000000..c0977c612e34 +#endif diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.c new file mode 100644 -index 000000000000..388890d60c46 +index 000000000..388890d60 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.c @@ -0,0 +1,650 @@ @@ -392398,7 +392399,7 @@ index 000000000000..388890d60c46 +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.h new file mode 100644 -index 000000000000..48c3a4843ac0 +index 000000000..48c3a4843 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-hdcp.h @@ -0,0 +1,55 @@ @@ -392459,7 +392460,7 @@ index 000000000000..48c3a4843ac0 +#endif diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c new file mode 100644 -index 000000000000..e07c2b4237a2 +index 000000000..e07c2b423 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c @@ -0,0 +1,188 @@ @@ -392653,7 +392654,7 @@ index 000000000000..e07c2b4237a2 +MODULE_ALIAS("platform:" DRIVER_NAME); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c new file mode 100644 -index 000000000000..f6803bc2aec3 +index 000000000..f6803bc2a --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c @@ -0,0 +1,4121 @@ @@ -396780,7 +396781,7 @@ index 000000000000..f6803bc2aec3 +MODULE_ALIAS("platform:dw-hdmi-qp"); diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h new file mode 100644 -index 000000000000..e9b5e19a3be5 +index 000000000..e9b5e19a3 --- /dev/null +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h @@ -0,0 +1,850 @@ @@ -397635,7 +397636,7 @@ index 000000000000..e9b5e19a3be5 + +#endif /* __DW_HDMI_QP_H__ */ diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c -index 6c1d79474505..70d35c683633 100644 +index 6c1d79474..70d35c683 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -9,16 +9,19 @@ @@ -400709,7 +400710,7 @@ index 6c1d79474505..70d35c683633 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 af43a0414b78..5432d0246257 100644 +index af43a0414..5432d0246 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h @@ -518,6 +518,51 @@ @@ -400832,7 +400833,7 @@ index af43a0414b78..5432d0246257 100644 /* diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c -index 04d4a1a10698..bd99f785e86c 100644 +index 04d4a1a10..bd99f785e 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c @@ -14,6 +14,7 @@ @@ -401459,7 +401460,7 @@ index 04d4a1a10698..bd99f785e86c 100644 MODULE_AUTHOR("Philippe Cornu "); MODULE_DESCRIPTION("DW MIPI DSI host controller driver"); diff --git a/drivers/gpu/drm/display/Kconfig b/drivers/gpu/drm/display/Kconfig -index 09712b88a5b8..6f10a437bf66 100644 +index 09712b88a..6f10a437b 100644 --- a/drivers/gpu/drm/display/Kconfig +++ b/drivers/gpu/drm/display/Kconfig @@ -1,5 +1,14 @@ @@ -401478,7 +401479,7 @@ index 09712b88a5b8..6f10a437bf66 100644 tristate depends on DRM diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c -index 77590b0f38fa..0dc2a587c93f 100644 +index 77590b0f3..0dc2a587c 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -245,7 +245,8 @@ static int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_ @@ -401521,7 +401522,7 @@ index 77590b0f38fa..0dc2a587c93f 100644 DRM_IOCTL_DEF(DRM_IOCTL_MODE_OBJ_SETPROPERTY, drm_mode_obj_set_property_ioctl, DRM_MASTER), DRM_IOCTL_DEF(DRM_IOCTL_MODE_CURSOR2, drm_mode_cursor2_ioctl, DRM_MASTER), diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c -index 51f838befb32..06d5c91db45a 100644 +index 51f838bef..06d5c91db 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -21,6 +21,7 @@ @@ -402494,7 +402495,7 @@ index 51f838befb32..06d5c91db45a 100644 module_exit(panel_simple_exit); diff --git a/drivers/gpu/drm/panel/panel-simple.h b/drivers/gpu/drm/panel/panel-simple.h new file mode 100644 -index 000000000000..7349c35e3cb2 +index 000000000..7349c35e3 --- /dev/null +++ b/drivers/gpu/drm/panel/panel-simple.h @@ -0,0 +1,19 @@ @@ -402518,7 +402519,7 @@ index 000000000000..7349c35e3cb2 +#endif +#endif diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig -index 1bf3e2829cd0..95550a983898 100644 +index 1bf3e2829..95550a983 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -1,7 +1,7 @@ @@ -402663,7 +402664,7 @@ index 1bf3e2829cd0..95550a983898 100644 + endif diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile -index 3ff7b21c0414..7aa90fa2002c 100644 +index 3ff7b21c0..7aa90fa20 100644 --- a/drivers/gpu/drm/rockchip/Makefile +++ b/drivers/gpu/drm/rockchip/Makefile @@ -4,17 +4,31 @@ @@ -402703,7 +402704,7 @@ index 3ff7b21c0414..7aa90fa2002c 100644 +obj-$(CONFIG_DRM_ROCKCHIP_RK618) += rk618/ +obj-$(CONFIG_DRM_ROCKCHIP_RK628) += rk628/ diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c -index 84aa811ca1e9..dc10a0ced204 100644 +index 84aa811ca..dc10a0ced 100644 --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c @@ -10,13 +10,13 @@ @@ -403517,7 +403518,7 @@ index 84aa811ca1e9..dc10a0ced204 100644 .name = "rockchip-dp", .pm = &rockchip_dp_pm_ops, diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c -index 3793863c210e..4d8c81447013 100644 +index 3793863c2..4d8c81447 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c @@ -6,7 +6,6 @@ @@ -403955,7 +403956,7 @@ index 3793863c210e..4d8c81447013 100644 .driver = { .name = "cdn-dp", diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.h b/drivers/gpu/drm/rockchip/cdn-dp-core.h -index 5b2fed1f5f55..b4c9e4b60013 100644 +index 5b2fed1f5..b4c9e4b60 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.h +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.h @@ -54,8 +54,6 @@ struct cdn_firmware_header { @@ -403994,7 +403995,7 @@ index 5b2fed1f5f55..b4c9e4b60013 100644 bool sink_has_audio; diff --git a/drivers/gpu/drm/rockchip/cdn-dp-link-training.c b/drivers/gpu/drm/rockchip/cdn-dp-link-training.c new file mode 100644 -index 000000000000..85e1182e1657 +index 000000000..85e1182e1 --- /dev/null +++ b/drivers/gpu/drm/rockchip/cdn-dp-link-training.c @@ -0,0 +1,447 @@ @@ -404446,7 +404447,7 @@ index 000000000000..85e1182e1657 + return ret; +} diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/rockchip/cdn-dp-reg.c -index 33fb4d05c506..2a544869e8de 100644 +index 33fb4d05c..2a544869e 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-reg.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.c @@ -181,7 +181,7 @@ static int cdn_dp_mailbox_send(struct cdn_dp_device *dp, u8 module_id, @@ -404619,7 +404620,7 @@ index 33fb4d05c506..2a544869e8de 100644 ret = cdn_dp_reg_write(dp, BND_HSYNC2VSYNC, VIF_BYPASS_INTERLACE); if (ret) diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.h b/drivers/gpu/drm/rockchip/cdn-dp-reg.h -index 441248b7a79e..656ec69be66d 100644 +index 441248b7a..656ec69be 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-reg.h +++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.h @@ -8,6 +8,7 @@ @@ -404717,7 +404718,7 @@ index 441248b7a79e..656ec69be66d 100644 #endif /* _CDN_DP_REG_H */ diff --git a/drivers/gpu/drm/rockchip/dw-dp.c b/drivers/gpu/drm/rockchip/dw-dp.c new file mode 100644 -index 000000000000..30da373959fd +index 000000000..30da37395 --- /dev/null +++ b/drivers/gpu/drm/rockchip/dw-dp.c @@ -0,0 +1,4247 @@ @@ -408969,7 +408970,7 @@ index 000000000000..30da373959fd + }, +}; diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c -index 0100162a73b2..40ac5d894e08 100644 +index 0100162a7..40ac5d894 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c @@ -12,14 +12,12 @@ @@ -410455,7 +410456,7 @@ index 0100162a73b2..40ac5d894e08 100644 .pm = &dw_mipi_dsi_rockchip_pm_ops, diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c new file mode 100644 -index 000000000000..b1816c4f147e +index 000000000..b1816c4f1 --- /dev/null +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c @@ -0,0 +1,1867 @@ @@ -412328,7 +412329,7 @@ index 000000000000..b1816c4f147e +}; diff --git a/drivers/gpu/drm/rockchip/dw_hdcp2.c b/drivers/gpu/drm/rockchip/dw_hdcp2.c new file mode 100644 -index 000000000000..f8362ddea171 +index 000000000..f8362ddea --- /dev/null +++ b/drivers/gpu/drm/rockchip/dw_hdcp2.c @@ -0,0 +1,642 @@ @@ -412975,7 +412976,7 @@ index 000000000000..f8362ddea171 +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Rockchip HDCP Host Library Driver"); diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c -index 341550199111..f4909102db1f 100644 +index 341550199..f4909102d 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -4,22 +4,35 @@ @@ -417162,7 +417163,7 @@ index 341550199111..f4909102db1f 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 100644 -index 000000000000..949c8e4b7b57 +index 000000000..949c8e4b7 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/Kconfig @@ -0,0 +1,14 @@ @@ -417182,7 +417183,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 100644 -index 000000000000..848ac22fd0b2 +index 000000000..848ac22fd --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/Makefile @@ -0,0 +1,9 @@ @@ -417197,7 +417198,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 100644 -index 000000000000..a63ef49dea04 +index 000000000..a63ef49de --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/Makefile @@ -0,0 +1,3 @@ @@ -417206,7 +417207,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 100644 -index 000000000000..90f350110b70 +index 000000000..90f350110 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.c @@ -0,0 +1,171 @@ @@ -417383,7 +417384,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 100644 -index 000000000000..eaf504560fb8 +index 000000000..eaf504560 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_list.h @@ -0,0 +1,95 @@ @@ -417484,7 +417485,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 100644 -index 000000000000..a2e47b45c148 +index 000000000..a2e47b45c --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.c @@ -0,0 +1,327 @@ @@ -417817,7 +417818,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 100644 -index 000000000000..745cdbf9cfde +index 000000000..745cdbf9c --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/bufmanage/buf_manage.h @@ -0,0 +1,49 @@ @@ -417872,7 +417873,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 100644 -index 000000000000..5fc2fecd22cb +index 000000000..5fc2fecd2 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_dev.h @@ -0,0 +1,114 @@ @@ -417992,7 +417993,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 @@ @@ -473300,7 +473301,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 100644 -index 000000000000..dc0a72b11b21 +index 000000000..dc0a72b11 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_panel.h @@ -0,0 +1,50 @@ @@ -473356,7 +473357,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 100644 -index 000000000000..8ecccb7f6403 +index 000000000..8ecccb7f6 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/ebc_public.c @@ -0,0 +1,36 @@ @@ -473398,7 +473399,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 100644 -index 000000000000..6b99702b7a6f +index 000000000..6b99702b7 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/Makefile @@ -0,0 +1,5 @@ @@ -473409,7 +473410,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 100644 -index 000000000000..8871b37d52cc +index 000000000..8871b37d5 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.c @@ -0,0 +1,72 @@ @@ -473487,7 +473488,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 100644 -index 000000000000..8d2210603a29 +index 000000000..8d2210603 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/epdlut/epd_lut.h @@ -0,0 +1,66 @@ @@ -473559,7 +473560,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 @@ @@ -492221,7 +492222,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 @@ @@ -511584,7 +511585,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 100644 -index 000000000000..a05717f1ce98 +index 000000000..a05717f1c --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/Makefile @@ -0,0 +1,4 @@ @@ -511594,7 +511595,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 100644 -index 000000000000..c24db23dc47d +index 000000000..c24db23dc --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.c @@ -0,0 +1,70 @@ @@ -511670,7 +511671,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 100644 -index 000000000000..f95192094ba7 +index 000000000..f95192094 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/ebc_pmic.h @@ -0,0 +1,60 @@ @@ -511736,7 +511737,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 100644 -index 000000000000..e46d9b08fc16 +index 000000000..e46d9b08f --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/pmic/tps65185.c @@ -0,0 +1,671 @@ @@ -512413,7 +512414,7 @@ index 000000000000..e46d9b08fc16 +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/rockchip/ebc-dev/tcon/Makefile b/drivers/gpu/drm/rockchip/ebc-dev/tcon/Makefile new file mode 100644 -index 000000000000..913d4813773b +index 000000000..913d48137 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/Makefile @@ -0,0 +1,3 @@ @@ -512422,7 +512423,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 100644 -index 000000000000..23c82751bb1b +index 000000000..23c82751b --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.c @@ -0,0 +1,416 @@ @@ -512844,7 +512845,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 100644 -index 000000000000..9a9ea56f3cdb +index 000000000..9a9ea56f3 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/ebc_tcon.h @@ -0,0 +1,119 @@ @@ -512969,7 +512970,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 100644 -index 000000000000..01b2b9629c35 +index 000000000..01b2b9629 --- /dev/null +++ b/drivers/gpu/drm/rockchip/ebc-dev/tcon/eink_tcon.c @@ -0,0 +1,301 @@ @@ -513275,7 +513276,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 6e5b922a121e..1cd82e1f2d8a 100644 +index 6e5b922a1..1cd82e1f2 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -11,10 +11,9 @@ @@ -513866,7 +513867,7 @@ index 6e5b922a121e..1cd82e1f2d8a 100644 .name = "innohdmi-rockchip", .of_match_table = inno_hdmi_dt_ids, diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.h b/drivers/gpu/drm/rockchip/inno_hdmi.h -index 93245b55f967..b722afc4e41f 100644 +index 93245b55f..b722afc4e 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.h +++ b/drivers/gpu/drm/rockchip/inno_hdmi.h @@ -96,11 +96,13 @@ enum { @@ -513885,7 +513886,7 @@ index 93245b55f967..b722afc4e41f 100644 #define HDMI_VIDEO_TIMING_CTL 0x08 diff --git a/drivers/gpu/drm/rockchip/kernel_logo_img.h b/drivers/gpu/drm/rockchip/kernel_logo_img.h new file mode 100644 -index 000000000000..98c4443ec1bd +index 000000000..98c4443ec --- /dev/null +++ b/drivers/gpu/drm/rockchip/kernel_logo_img.h @@ -0,0 +1,21855 @@ @@ -535745,7 +535746,7 @@ index 000000000000..98c4443ec1bd + 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; diff --git a/drivers/gpu/drm/rockchip/rk3066_hdmi.c b/drivers/gpu/drm/rockchip/rk3066_hdmi.c -index fa6e592e0276..0d42dd8091eb 100644 +index fa6e592e0..0d42dd809 100644 --- a/drivers/gpu/drm/rockchip/rk3066_hdmi.c +++ b/drivers/gpu/drm/rockchip/rk3066_hdmi.c @@ -553,7 +553,7 @@ rk3066_hdmi_register(struct drm_device *drm, struct rk3066_hdmi *hdmi) @@ -535790,7 +535791,7 @@ index fa6e592e0276..0d42dd8091eb 100644 .of_match_table = rk3066_hdmi_dt_ids, diff --git a/drivers/gpu/drm/rockchip/rk618/Kconfig b/drivers/gpu/drm/rockchip/rk618/Kconfig new file mode 100644 -index 000000000000..03ae305a93c1 +index 000000000..03ae305a9 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/Kconfig @@ -0,0 +1,10 @@ @@ -535806,7 +535807,7 @@ index 000000000000..03ae305a93c1 + Rockchip rk618 display bridge chips driver. diff --git a/drivers/gpu/drm/rockchip/rk618/Makefile b/drivers/gpu/drm/rockchip/rk618/Makefile new file mode 100644 -index 000000000000..ad3ac27b36ad +index 000000000..ad3ac27b3 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/Makefile @@ -0,0 +1,12 @@ @@ -535824,7 +535825,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 100644 -index 000000000000..a9bc0c37c2d6 +index 000000000..a9bc0c37c --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dither.c @@ -0,0 +1,53 @@ @@ -535883,7 +535884,7 @@ index 000000000000..a9bc0c37c2d6 +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_dither.h b/drivers/gpu/drm/rockchip/rk618/rk618_dither.h new file mode 100644 -index 000000000000..c74bb95f0ce4 +index 000000000..c74bb95f0 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dither.h @@ -0,0 +1,17 @@ @@ -535906,7 +535907,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 100644 -index 000000000000..1fe20e9dc3c8 +index 000000000..1fe20e9dc --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dsi.c @@ -0,0 +1,1195 @@ @@ -537107,7 +537108,7 @@ index 000000000000..1fe20e9dc3c8 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c b/drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c new file mode 100644 -index 000000000000..d8ce7b621488 +index 000000000..d8ce7b621 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c @@ -0,0 +1,1608 @@ @@ -538721,7 +538722,7 @@ index 000000000000..d8ce7b621488 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c b/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c new file mode 100644 -index 000000000000..b652e19a6a34 +index 000000000..b652e19a6 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c @@ -0,0 +1,303 @@ @@ -539030,7 +539031,7 @@ index 000000000000..b652e19a6a34 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c b/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c new file mode 100644 -index 000000000000..76efc25aa216 +index 000000000..76efc25aa --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_rgb.c @@ -0,0 +1,301 @@ @@ -539337,7 +539338,7 @@ index 000000000000..76efc25aa216 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_scaler.c b/drivers/gpu/drm/rockchip/rk618/rk618_scaler.c new file mode 100644 -index 000000000000..2c3a67664699 +index 000000000..2c3a67664 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_scaler.c @@ -0,0 +1,425 @@ @@ -539768,7 +539769,7 @@ index 000000000000..2c3a67664699 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_vif.c b/drivers/gpu/drm/rockchip/rk618/rk618_vif.c new file mode 100644 -index 000000000000..9dc9e10e2d3a +index 000000000..9dc9e10e2 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk618/rk618_vif.c @@ -0,0 +1,261 @@ @@ -540035,7 +540036,7 @@ index 000000000000..9dc9e10e2d3a +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/Kconfig b/drivers/gpu/drm/rockchip/rk628/Kconfig new file mode 100644 -index 000000000000..41e1fbbe1e61 +index 000000000..41e1fbbe1 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/Kconfig @@ -0,0 +1,8 @@ @@ -540049,7 +540050,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 100644 -index 000000000000..76d768d29776 +index 000000000..76d768d29 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/Makefile @@ -0,0 +1,14 @@ @@ -540069,7 +540070,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 100644 -index 000000000000..a83eeeaf935f +index 000000000..a83eeeaf9 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_combrxphy.c @@ -0,0 +1,1030 @@ @@ -541105,7 +541106,7 @@ index 000000000000..a83eeeaf935f +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c new file mode 100644 -index 000000000000..cbe7923139b7 +index 000000000..cbe792313 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.c @@ -0,0 +1,520 @@ @@ -541631,7 +541632,7 @@ index 000000000000..cbe7923139b7 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.h b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.h new file mode 100644 -index 000000000000..40d785eecd67 +index 000000000..40d785eec --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_combtxphy.h @@ -0,0 +1,13 @@ @@ -541650,7 +541651,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 100644 -index 000000000000..766f156efb98 +index 000000000..766f156ef --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_dsi.c @@ -0,0 +1,1395 @@ @@ -543051,7 +543052,7 @@ index 000000000000..766f156efb98 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_gvi.c b/drivers/gpu/drm/rockchip/rk628/rk628_gvi.c new file mode 100644 -index 000000000000..9065e30a5774 +index 000000000..9065e30a5 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_gvi.c @@ -0,0 +1,666 @@ @@ -543723,7 +543724,7 @@ index 000000000000..9065e30a5774 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_hdmi.c b/drivers/gpu/drm/rockchip/rk628/rk628_hdmi.c new file mode 100644 -index 000000000000..4a8ce4f1a3b8 +index 000000000..4a8ce4f1a --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_hdmi.c @@ -0,0 +1,1623 @@ @@ -545352,7 +545353,7 @@ index 000000000000..4a8ce4f1a3b8 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c b/drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c new file mode 100644 -index 000000000000..b74ea238dc00 +index 000000000..b74ea238d --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c @@ -0,0 +1,980 @@ @@ -546338,7 +546339,7 @@ index 000000000000..b74ea238dc00 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c b/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c new file mode 100644 -index 000000000000..57496ff9dec7 +index 000000000..57496ff9d --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c @@ -0,0 +1,320 @@ @@ -546664,7 +546665,7 @@ index 000000000000..57496ff9dec7 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_post_process.c b/drivers/gpu/drm/rockchip/rk628/rk628_post_process.c new file mode 100644 -index 000000000000..80fd257a6471 +index 000000000..80fd257a6 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_post_process.c @@ -0,0 +1,495 @@ @@ -547165,7 +547166,7 @@ index 000000000000..80fd257a6471 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_rgb.c b/drivers/gpu/drm/rockchip/rk628/rk628_rgb.c new file mode 100644 -index 000000000000..df8cc3cee860 +index 000000000..df8cc3cee --- /dev/null +++ b/drivers/gpu/drm/rockchip/rk628/rk628_rgb.c @@ -0,0 +1,378 @@ @@ -547549,7 +547550,7 @@ index 000000000000..df8cc3cee860 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.c b/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.c new file mode 100644 -index 000000000000..adbc11679f53 +index 000000000..adbc11679 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.c @@ -0,0 +1,1403 @@ @@ -548958,7 +548959,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 100644 -index 000000000000..a4330df85b33 +index 000000000..a4330df85 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip-mipi-csi-tx.h @@ -0,0 +1,289 @@ @@ -549253,7 +549254,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 100644 -index 000000000000..2f0a98749683 +index 000000000..2f0a98749 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.c @@ -0,0 +1,514 @@ @@ -549773,7 +549774,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 100644 -index 000000000000..4c8dc6348354 +index 000000000..4c8dc6348 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_backlight.h @@ -0,0 +1,64 @@ @@ -549843,7 +549844,7 @@ index 000000000000..4c8dc6348354 +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_clk.c b/drivers/gpu/drm/rockchip/rockchip_drm_clk.c new file mode 100644 -index 000000000000..f606377aeb07 +index 000000000..f606377ae --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_clk.c @@ -0,0 +1,284 @@ @@ -550133,7 +550134,7 @@ index 000000000000..f606377aeb07 +} diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.c b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.c new file mode 100644 -index 000000000000..cd7b08f704d3 +index 000000000..cd7b08f70 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.c @@ -0,0 +1,283 @@ @@ -550422,7 +550423,7 @@ index 000000000000..cd7b08f704d3 +} diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.h b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.h new file mode 100644 -index 000000000000..5bb39c0447f0 +index 000000000..5bb39c044 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_debugfs.h @@ -0,0 +1,79 @@ @@ -550507,7 +550508,7 @@ index 000000000000..5bb39c0447f0 +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_direct_show.c b/drivers/gpu/drm/rockchip/rockchip_drm_direct_show.c new file mode 100644 -index 000000000000..007d21f79f40 +index 000000000..007d21f79 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_direct_show.c @@ -0,0 +1,333 @@ @@ -550846,7 +550847,7 @@ index 000000000000..007d21f79f40 + diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_direct_show.h b/drivers/gpu/drm/rockchip/rockchip_drm_direct_show.h new file mode 100644 -index 000000000000..fcdee49564e8 +index 000000000..fcdee4956 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_direct_show.h @@ -0,0 +1,67 @@ @@ -550919,7 +550920,7 @@ index 000000000000..fcdee49564e8 +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_display_pattern.c b/drivers/gpu/drm/rockchip/rockchip_drm_display_pattern.c new file mode 100644 -index 000000000000..58a907b6c816 +index 000000000..58a907b6c --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_display_pattern.c @@ -0,0 +1,419 @@ @@ -551344,7 +551345,7 @@ index 000000000000..58a907b6c816 +} diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_display_pattern.h b/drivers/gpu/drm/rockchip/rockchip_drm_display_pattern.h new file mode 100644 -index 000000000000..4368f3397dbe +index 000000000..4368f3397 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_display_pattern.h @@ -0,0 +1,51 @@ @@ -551400,7 +551401,7 @@ index 000000000000..4368f3397dbe + +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c -index ab55d7132550..4184bb8a0dd4 100644 +index ab55d7132..4184bb8a0 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -6,18 +6,26 @@ @@ -553426,7 +553427,7 @@ index ab55d7132550..4184bb8a0dd4 100644 MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(DMA_BUF); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h -index aeb03a57240f..0854b965671f 100644 +index aeb03a572..0854b9656 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h @@ -10,34 +10,472 @@ @@ -554047,7 +554048,7 @@ index aeb03a57240f..0854b965671f 100644 static inline struct rockchip_encoder *to_rockchip_encoder(struct drm_encoder *encoder) { diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c -index cfe8b793d344..d99eef43fa42 100644 +index cfe8b793d..d99eef43f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -5,27 +5,277 @@ @@ -554400,7 +554401,7 @@ index cfe8b793d344..d99eef43fa42 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 bae4e079dfb1..6c4294d78a83 100644 +index bae4e079d..6c4294d78 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.h @@ -7,5 +7,29 @@ @@ -554434,7 +554435,7 @@ index bae4e079dfb1..6c4294d78a83 100644 + #endif /* _ROCKCHIP_DRM_FB_H */ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c -index 93ed841f5dce..a9dd8939e98f 100644 +index 93ed841f5..a9dd8939e 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c @@ -4,20 +4,35 @@ @@ -555308,7 +555309,7 @@ index 93ed841f5dce..a9dd8939e98f 100644 + return 0; +} diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.h b/drivers/gpu/drm/rockchip/rockchip_drm_gem.h -index 72f59ac6d258..3d015fed67e6 100644 +index 72f59ac6d..3d015fed6 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.h @@ -7,14 +7,24 @@ @@ -555384,7 +555385,7 @@ index 72f59ac6d258..3d015fed67e6 100644 #endif /* _ROCKCHIP_DRM_GEM_H */ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_logo.c b/drivers/gpu/drm/rockchip/rockchip_drm_logo.c new file mode 100644 -index 000000000000..5ee412da6fb5 +index 000000000..5ee412da6 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_logo.c @@ -0,0 +1,1234 @@ @@ -556624,7 +556625,7 @@ index 000000000000..5ee412da6fb5 +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_logo.h b/drivers/gpu/drm/rockchip/rockchip_drm_logo.h new file mode 100644 -index 000000000000..7e1b1d2dfdf4 +index 000000000..7e1b1d2df --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_logo.h @@ -0,0 +1,46 @@ @@ -556676,7 +556677,7 @@ index 000000000000..7e1b1d2dfdf4 +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_self_test.c b/drivers/gpu/drm/rockchip/rockchip_drm_self_test.c new file mode 100644 -index 000000000000..7c764fca154d +index 000000000..7c764fca1 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_self_test.c @@ -0,0 +1,269 @@ @@ -556951,7 +556952,7 @@ index 000000000000..7c764fca154d +subsys_initcall_sync(rockchip_drm_self_test); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_tve.c b/drivers/gpu/drm/rockchip/rockchip_drm_tve.c new file mode 100644 -index 000000000000..6fbd17c1b003 +index 000000000..6fbd17c1b --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_tve.c @@ -0,0 +1,1067 @@ @@ -558024,7 +558025,7 @@ index 000000000000..6fbd17c1b003 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_tve.h b/drivers/gpu/drm/rockchip/rockchip_drm_tve.h new file mode 100644 -index 000000000000..376b2ff0f422 +index 000000000..376b2ff0f --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_tve.h @@ -0,0 +1,285 @@ @@ -558315,7 +558316,7 @@ index 000000000000..376b2ff0f422 +#endif /* _ROCKCHIP_DRM_TVE_ */ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vconn.c b/drivers/gpu/drm/rockchip/rockchip_drm_vconn.c new file mode 100644 -index 000000000000..f0fab09d386b +index 000000000..f0fab09d3 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vconn.c @@ -0,0 +1,587 @@ @@ -558907,7 +558908,7 @@ index 000000000000..f0fab09d386b + }, +}; diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c -index 4b338cb89d32..9dcd7c6b285c 100644 +index 4b338cb89..9dcd7c6b2 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -6,22 +6,30 @@ @@ -564603,7 +564604,7 @@ index 4b338cb89d32..9dcd7c6b285c 100644 const struct component_ops vop_component_ops = { diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h -index 5f56e0597df8..ff646fe0fc5a 100644 +index 5f56e0597..ff646fe0f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -7,52 +7,218 @@ @@ -566147,7 +566148,7 @@ index 5f56e0597df8..ff646fe0fc5a 100644 +extern const struct component_ops vop2_component_ops; #endif /* _ROCKCHIP_DRM_VOP_H */ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c -index c306806aa3de..44cc35be1198 100644 +index c306806aa..44cc35be1 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -3,71 +3,170 @@ @@ -580525,7 +580526,7 @@ index c306806aa3de..44cc35be1198 100644 const struct component_ops vop2_component_ops = { diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h -index f1234a151130..c727093a06d6 100644 +index f1234a151..c727093a0 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h @@ -27,6 +27,11 @@ enum win_dly_mode { @@ -580542,7 +580543,7 @@ index f1234a151130..c727093a06d6 100644 VOP2_SCALE_UP_BIL, diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c new file mode 100644 -index 000000000000..3f4432ad596c +index 000000000..3f4432ad5 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c @@ -0,0 +1,679 @@ @@ -581226,7 +581227,7 @@ index 000000000000..3f4432ad596c +MODULE_AUTHOR("Andy Yan "); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c -index 582859387792..805027ab6c60 100644 +index 582859387..805027ab6 100644 --- a/drivers/gpu/drm/rockchip/rockchip_lvds.c +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c @@ -6,105 +6,252 @@ @@ -582560,7 +582561,7 @@ index 582859387792..805027ab6c60 100644 .of_match_table = of_match_ptr(rockchip_lvds_dt_ids), diff --git a/drivers/gpu/drm/rockchip/rockchip_post_csc.c b/drivers/gpu/drm/rockchip/rockchip_post_csc.c new file mode 100644 -index 000000000000..212a4b4b89e6 +index 000000000..212a4b4b8 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_post_csc.c @@ -0,0 +1,1573 @@ @@ -584139,7 +584140,7 @@ index 000000000000..212a4b4b89e6 +} diff --git a/drivers/gpu/drm/rockchip/rockchip_post_csc.h b/drivers/gpu/drm/rockchip/rockchip_post_csc.h new file mode 100644 -index 000000000000..1215a5cd1c87 +index 000000000..1215a5cd1 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_post_csc.h @@ -0,0 +1,18 @@ @@ -584162,7 +584163,7 @@ index 000000000000..1215a5cd1c87 + +#endif diff --git a/drivers/gpu/drm/rockchip/rockchip_rgb.c b/drivers/gpu/drm/rockchip/rockchip_rgb.c -index c677b71ae516..67b53a0b9f1a 100644 +index c677b71ae..67b53a0b9 100644 --- a/drivers/gpu/drm/rockchip/rockchip_rgb.c +++ b/drivers/gpu/drm/rockchip/rockchip_rgb.c @@ -6,31 +6,256 @@ @@ -585395,7 +585396,7 @@ index c677b71ae516..67b53a0b9f1a 100644 + }, +}; diff --git a/drivers/gpu/drm/rockchip/rockchip_rgb.h b/drivers/gpu/drm/rockchip/rockchip_rgb.h -index 1bd4e20e91eb..8973232e0caa 100644 +index 1bd4e20e9..8973232e0 100644 --- a/drivers/gpu/drm/rockchip/rockchip_rgb.h +++ b/drivers/gpu/drm/rockchip/rockchip_rgb.h @@ -9,13 +9,13 @@ @@ -585416,7 +585417,7 @@ index 1bd4e20e91eb..8973232e0caa 100644 } diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_clk.c b/drivers/gpu/drm/rockchip/rockchip_vop2_clk.c new file mode 100644 -index 000000000000..b670e3d38a64 +index 000000000..b670e3d38 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_clk.c @@ -0,0 +1,332 @@ @@ -585753,7 +585754,7 @@ index 000000000000..b670e3d38a64 + return 0; +} diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c -index 62b573f282a7..9854a23f545b 100644 +index 62b573f28..9854a23f5 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c @@ -6,16 +6,35 @@ @@ -589894,7 +589895,7 @@ index 62b573f282a7..9854a23f545b 100644 .name = "rockchip-vop2", .of_match_table = of_match_ptr(vop2_dt_match), diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c -index 7b2805006776..a4ca0737fb1b 100644 +index 7b2805006..a4ca0737f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -5,36 +5,36 @@ @@ -592823,7 +592824,7 @@ index 7b2805006776..a4ca0737fb1b 100644 }, }; diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h -index 406e981c75bd..a33f6fcecb78 100644 +index 406e981c7..a33f6fcec 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h @@ -113,6 +113,11 @@ @@ -593845,7 +593846,7 @@ index 406e981c75bd..a33f6fcecb78 100644 #endif /* _ROCKCHIP_VOP_REG_H */ diff --git a/drivers/hck/Kconfig b/drivers/hck/Kconfig new file mode 100644 -index 000000000000..1028c52a3840 +index 000000000..1028c52a3 --- /dev/null +++ b/drivers/hck/Kconfig @@ -0,0 +1,21 @@ @@ -593872,7 +593873,7 @@ index 000000000000..1028c52a3840 +endmenu diff --git a/drivers/hck/Makefile b/drivers/hck/Makefile new file mode 100644 -index 000000000000..93dc6acc727a +index 000000000..93dc6acc7 --- /dev/null +++ b/drivers/hck/Makefile @@ -0,0 +1,4 @@ @@ -593883,7 +593884,7 @@ index 000000000000..93dc6acc727a \ No newline at end of file diff --git a/drivers/hck/vendor_hooks.c b/drivers/hck/vendor_hooks.c new file mode 100644 -index 000000000000..6dce54016ef6 +index 000000000..6dce54016 --- /dev/null +++ b/drivers/hck/vendor_hooks.c @@ -0,0 +1,17 @@ @@ -593905,7 +593906,7 @@ index 000000000000..6dce54016ef6 +#include +#include diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c -index 257dd73e37bf..4e26a40b3369 100644 +index 257dd73e3..4e26a40b3 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -1189,6 +1189,9 @@ static int usbhid_start(struct hid_device *hid) @@ -593920,7 +593921,7 @@ index 257dd73e37bf..4e26a40b3369 100644 diff --git a/drivers/hooks/Kconfig b/drivers/hooks/Kconfig new file mode 100644 -index 000000000000..bff298adaf8e +index 000000000..bff298ada --- /dev/null +++ b/drivers/hooks/Kconfig @@ -0,0 +1,16 @@ @@ -593942,7 +593943,7 @@ index 000000000000..bff298adaf8e +endmenu diff --git a/drivers/hooks/Makefile b/drivers/hooks/Makefile new file mode 100644 -index 000000000000..533f270e0920 +index 000000000..533f270e0 --- /dev/null +++ b/drivers/hooks/Makefile @@ -0,0 +1,5 @@ @@ -593953,7 +593954,7 @@ index 000000000000..533f270e0920 +obj-$(CONFIG_VENDOR_HOOKS) += vendor_hooks.o diff --git a/drivers/hooks/vendor_hooks.c b/drivers/hooks/vendor_hooks.c new file mode 100644 -index 000000000000..939146da879c +index 000000000..939146da8 --- /dev/null +++ b/drivers/hooks/vendor_hooks.c @@ -0,0 +1,23 @@ @@ -593981,7 +593982,7 @@ index 000000000000..939146da879c +EXPORT_TRACEPOINT_SYMBOL_GPL(vendor_do_mmap); +EXPORT_TRACEPOINT_SYMBOL_GPL(vendor_do_mprotect_pkey); diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c -index 6e4516c2ab89..8a2df84e7e27 100644 +index 6e4516c2a..8a2df84e7 100644 --- a/drivers/hwmon/pwm-fan.c +++ b/drivers/hwmon/pwm-fan.c @@ -18,6 +18,7 @@ @@ -594126,7 +594127,7 @@ index 6e4516c2ab89..8a2df84e7e27 100644 cdev = devm_thermal_of_cooling_device_register(dev, dev->of_node, "pwm-fan", ctx, &pwm_fan_cooling_ops); diff --git a/drivers/hwspinlock/Kconfig b/drivers/hwspinlock/Kconfig -index 3874d15b0e9b..1c8c8e5a7574 100644 +index 3874d15b0..1c8c8e5a7 100644 --- a/drivers/hwspinlock/Kconfig +++ b/drivers/hwspinlock/Kconfig @@ -28,6 +28,16 @@ config HWSPINLOCK_QCOM @@ -594147,7 +594148,7 @@ index 3874d15b0e9b..1c8c8e5a7574 100644 tristate "SPRD Hardware Spinlock device" depends on ARCH_SPRD || COMPILE_TEST diff --git a/drivers/hwspinlock/Makefile b/drivers/hwspinlock/Makefile -index a0f16c9aaa82..8e47f5f69347 100644 +index a0f16c9aa..8e47f5f69 100644 --- a/drivers/hwspinlock/Makefile +++ b/drivers/hwspinlock/Makefile @@ -6,6 +6,7 @@ @@ -594160,7 +594161,7 @@ index a0f16c9aaa82..8e47f5f69347 100644 obj-$(CONFIG_HWSPINLOCK_SUN6I) += sun6i_hwspinlock.o diff --git a/drivers/hwspinlock/rockchip_hwspinlock.c b/drivers/hwspinlock/rockchip_hwspinlock.c new file mode 100644 -index 000000000000..26ba8ec31f01 +index 000000000..26ba8ec31 --- /dev/null +++ b/drivers/hwspinlock/rockchip_hwspinlock.c @@ -0,0 +1,111 @@ @@ -594276,7 +594277,7 @@ index 000000000000..26ba8ec31f01 +MODULE_DESCRIPTION("Rockchip Hardware spinlock driver"); +MODULE_AUTHOR("Frank Wang "); diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c -index 086fdf262e7b..8357f8e30ca0 100644 +index 086fdf262..8357f8e30 100644 --- a/drivers/i2c/busses/i2c-rk3x.c +++ b/drivers/i2c/busses/i2c-rk3x.c @@ -6,6 +6,7 @@ @@ -595364,7 +595365,7 @@ index 086fdf262e7b..8357f8e30ca0 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 7f30bcceebae..b8ca8441fa8c 100644 +index 7f30bccee..b8ca8441f 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -62,6 +62,7 @@ @@ -595497,7 +595498,7 @@ index 7f30bcceebae..b8ca8441fa8c 100644 unsigned cmd; void *arg; diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig -index 3bdbd34314b3..d61c9262b861 100644 +index 3bdbd3431..d61c9262b 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig @@ -200,6 +200,8 @@ source "drivers/input/tablet/Kconfig" @@ -595510,7 +595511,7 @@ index 3bdbd34314b3..d61c9262b861 100644 source "drivers/input/rmi4/Kconfig" diff --git a/drivers/input/Makefile b/drivers/input/Makefile -index c78753274921..7b79653e9353 100644 +index c78753274..7b79653e9 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -25,6 +25,7 @@ obj-$(CONFIG_INPUT_MOUSE) += mouse/ @@ -595522,7 +595523,7 @@ index c78753274921..7b79653e9353 100644 obj-$(CONFIG_INPUT_KUNIT_TEST) += tests/ diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig -index 6ba984d7f0b1..6e91298143a8 100644 +index 6ba984d7f..6e9129814 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -609,7 +609,7 @@ config INPUT_PWM_VIBRA @@ -595536,7 +595537,7 @@ index 6ba984d7f0b1..6e91298143a8 100644 diff --git a/drivers/input/remotectl/Kconfig b/drivers/input/remotectl/Kconfig new file mode 100644 -index 000000000000..67558b48869e +index 000000000..67558b488 --- /dev/null +++ b/drivers/input/remotectl/Kconfig @@ -0,0 +1,19 @@ @@ -595561,7 +595562,7 @@ index 000000000000..67558b48869e +endif diff --git a/drivers/input/remotectl/Makefile b/drivers/input/remotectl/Makefile new file mode 100644 -index 000000000000..209472b4a356 +index 000000000..209472b4a --- /dev/null +++ b/drivers/input/remotectl/Makefile @@ -0,0 +1,8 @@ @@ -595575,7 +595576,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 100644 -index 000000000000..889e0d58e733 +index 000000000..889e0d58e --- /dev/null +++ b/drivers/input/remotectl/rockchip_pwm_remotectl.c @@ -0,0 +1,898 @@ @@ -596479,7 +596480,7 @@ index 000000000000..889e0d58e733 +MODULE_LICENSE("GPL"); diff --git a/drivers/input/remotectl/rockchip_pwm_remotectl.h b/drivers/input/remotectl/rockchip_pwm_remotectl.h new file mode 100644 -index 000000000000..5126a3edb5d5 +index 000000000..5126a3edb --- /dev/null +++ b/drivers/input/remotectl/rockchip_pwm_remotectl.h @@ -0,0 +1,160 @@ @@ -596644,7 +596645,7 @@ index 000000000000..5126a3edb5d5 + +#endif diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig -index 2b12b583ef4b..3bbdf4e46917 100644 +index 2b12b583e..3bbdf4e46 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -216,7 +216,8 @@ config OMAP_IOMMU_DEBUG @@ -596658,7 +596659,7 @@ index 2b12b583ef4b..3bbdf4e46917 100644 select IOMMU_API select ARM_DMA_USE_IOMMU diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile -index 769e43d780ce..2a6c2dce557a 100644 +index 769e43d78..2a6c2dce5 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -18,7 +18,9 @@ obj-$(CONFIG_MTK_IOMMU) += mtk_iommu.o @@ -596673,7 +596674,7 @@ index 769e43d780ce..2a6c2dce557a 100644 obj-$(CONFIG_TEGRA_IOMMU_GART) += tegra-gart.o obj-$(CONFIG_TEGRA_IOMMU_SMMU) += tegra-smmu.o diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index 3a67e636287a..b859d5220ff1 100644 +index 3a67e6362..b859d5220 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -2075,7 +2075,9 @@ int iommu_attach_device(struct iommu_domain *domain, struct device *dev) @@ -596689,7 +596690,7 @@ index 3a67e636287a..b859d5220ff1 100644 ret = __iommu_attach_group(domain, group); diff --git a/drivers/iommu/rockchip-iommu-av1d.c b/drivers/iommu/rockchip-iommu-av1d.c new file mode 100644 -index 000000000000..6286e2cac08d +index 000000000..6286e2cac --- /dev/null +++ b/drivers/iommu/rockchip-iommu-av1d.c @@ -0,0 +1,795 @@ @@ -597489,7 +597490,7 @@ index 000000000000..6286e2cac08d + return &av1d_iommu_ops; +} diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c -index 8ff69fbf9f65..ea18c63da9a5 100644 +index 8ff69fbf9..ea18c63da 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -18,6 +18,7 @@ @@ -598763,7 +598764,7 @@ index 8ff69fbf9f65..ea18c63da9a5 100644 +MODULE_ALIAS("platform:rockchip-iommu"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/irqchip/irq-gic-common.c b/drivers/irqchip/irq-gic-common.c -index afd6a1841715..6d8d96b84293 100644 +index afd6a1841..6d8d96b84 100644 --- a/drivers/irqchip/irq-gic-common.c +++ b/drivers/irqchip/irq-gic-common.c @@ -10,6 +10,10 @@ @@ -598804,7 +598805,7 @@ index afd6a1841715..6d8d96b84293 100644 /* * Deactivate and disable all SPIs. Leave the PPI and SGIs diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c -index 676c9250d3f2..b702d4db3642 100644 +index 676c9250d..b702d4db3 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -163,6 +163,7 @@ struct its_device { @@ -599037,7 +599038,7 @@ index 676c9250d3f2..b702d4db3642 100644 if ((tmp ^ baser) & GITS_CBASER_SHAREABILITY_MASK) { diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c -index 412196a7dad5..988494e279de 100644 +index 412196a7d..988494e27 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -49,6 +49,10 @@ @@ -599181,7 +599182,7 @@ index 412196a7dad5..988494e279de 100644 ret = gic_cpu_init(gic); if (ret) diff --git a/drivers/mailbox/Makefile b/drivers/mailbox/Makefile -index fc9376117111..5bbdb5478d97 100644 +index fc9376117..5bbdb5478 100644 --- a/drivers/mailbox/Makefile +++ b/drivers/mailbox/Makefile @@ -21,6 +21,8 @@ obj-$(CONFIG_OMAP2PLUS_MBOX) += omap-mailbox.o @@ -599194,7 +599195,7 @@ index fc9376117111..5bbdb5478d97 100644 obj-$(CONFIG_ALTERA_MBOX) += mailbox-altera.o diff --git a/drivers/mailbox/rockchip-mailbox.c b/drivers/mailbox/rockchip-mailbox.c -index 8ffad059e898..66ebea280092 100644 +index 8ffad059e..66ebea280 100644 --- a/drivers/mailbox/rockchip-mailbox.c +++ b/drivers/mailbox/rockchip-mailbox.c @@ -8,9 +8,11 @@ @@ -599558,7 +599559,7 @@ index 8ffad059e898..66ebea280092 100644 MODULE_AUTHOR("Caesar Wang "); diff --git a/drivers/mailbox/rockchip-mbox-demo.c b/drivers/mailbox/rockchip-mbox-demo.c new file mode 100644 -index 000000000000..17a313b7e0ab +index 000000000..17a313b7e --- /dev/null +++ b/drivers/mailbox/rockchip-mbox-demo.c @@ -0,0 +1,138 @@ @@ -599701,7 +599702,7 @@ index 000000000000..17a313b7e0ab +MODULE_DESCRIPTION("Rockchip MBOX Demo"); +MODULE_AUTHOR("Jiahang Zheng "); diff --git a/drivers/media/common/videobuf2/Kconfig b/drivers/media/common/videobuf2/Kconfig -index d2223a12c95f..0484c469cd22 100644 +index d2223a12c..0484c469c 100644 --- a/drivers/media/common/videobuf2/Kconfig +++ b/drivers/media/common/videobuf2/Kconfig @@ -10,20 +10,29 @@ config VIDEOBUF2_V4L2 @@ -599735,7 +599736,7 @@ index d2223a12c95f..0484c469cd22 100644 select VIDEOBUF2_MEMOPS diff --git a/drivers/media/common/videobuf2/Makefile b/drivers/media/common/videobuf2/Makefile -index a6fe3f304685..3c3f25eaee35 100644 +index a6fe3f304..3c3f25eae 100644 --- a/drivers/media/common/videobuf2/Makefile +++ b/drivers/media/common/videobuf2/Makefile @@ -9,6 +9,7 @@ endif @@ -599748,7 +599749,7 @@ index a6fe3f304685..3c3f25eaee35 100644 obj-$(CONFIG_VIDEOBUF2_DVB) += videobuf2-dvb.o diff --git a/drivers/media/common/videobuf2/videobuf2-cma-sg.c b/drivers/media/common/videobuf2/videobuf2-cma-sg.c new file mode 100644 -index 000000000000..9c8847ecbfd8 +index 000000000..9c8847ecb --- /dev/null +++ b/drivers/media/common/videobuf2/videobuf2-cma-sg.c @@ -0,0 +1,726 @@ @@ -600479,7 +600480,7 @@ index 000000000000..9c8847ecbfd8 +MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(DMA_BUF); diff --git a/drivers/media/common/videobuf2/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c -index 6975a71d740f..50ff34243bc5 100644 +index 6975a71d7..50ff34243 100644 --- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c +++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c @@ -311,7 +311,7 @@ static void *vb2_dma_sg_vaddr(struct vb2_buffer *vb, void *buf_priv) @@ -600549,7 +600550,7 @@ index 6975a71d740f..50ff34243bc5 100644 buf->dma_sgt = NULL; } diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c -index c7a54d82a55e..8b4eaa74f4cd 100644 +index c7a54d82a..8b4eaa74f 100644 --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c @@ -295,6 +295,12 @@ static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b @@ -600566,7 +600567,7 @@ index c7a54d82a55e..8b4eaa74f4cd 100644 if (b->bytesused == 0) vb2_warn_zero_bytesused(vb); diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index 53b443be5a59..200071c6f8ec 100644 +index 53b443be5..200071c6f 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -50,6 +50,19 @@ config VIDEO_AR0521 @@ -600590,7 +600591,7 @@ index 53b443be5a59..200071c6f8ec 100644 tristate "Hynix Hi-556 sensor support" help diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile -index 80b00d39b48f..dc1506e6eec9 100644 +index 80b00d39b..dc1506e6e 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -36,6 +36,7 @@ obj-$(CONFIG_VIDEO_DW9719) += dw9719.o @@ -600603,7 +600604,7 @@ index 80b00d39b48f..dc1506e6eec9 100644 obj-$(CONFIG_VIDEO_HI847) += hi847.o diff --git a/drivers/media/i2c/gc8034.c b/drivers/media/i2c/gc8034.c new file mode 100644 -index 000000000000..afc8fa23ea5b +index 000000000..afc8fa23e --- /dev/null +++ b/drivers/media/i2c/gc8034.c @@ -0,0 +1,2817 @@ @@ -603425,7 +603426,7 @@ index 000000000000..afc8fa23ea5b +MODULE_DESCRIPTION("GalaxyCore gc8034 sensor driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/Kconfig b/drivers/media/platform/rockchip/Kconfig -index b41d3960c1b4..817b4cb2dc9e 100644 +index b41d3960c..817b4cb2d 100644 --- a/drivers/media/platform/rockchip/Kconfig +++ b/drivers/media/platform/rockchip/Kconfig @@ -2,5 +2,10 @@ @@ -603440,7 +603441,7 @@ index b41d3960c1b4..817b4cb2dc9e 100644 source "drivers/media/platform/rockchip/rga/Kconfig" source "drivers/media/platform/rockchip/rkisp1/Kconfig" diff --git a/drivers/media/platform/rockchip/Makefile b/drivers/media/platform/rockchip/Makefile -index 4f782b876ac9..fe41a2e2fde0 100644 +index 4f782b876..fe41a2e2f 100644 --- a/drivers/media/platform/rockchip/Makefile +++ b/drivers/media/platform/rockchip/Makefile @@ -1,3 +1,8 @@ @@ -603454,7 +603455,7 @@ index 4f782b876ac9..fe41a2e2fde0 100644 obj-y += rkisp1/ diff --git a/drivers/media/platform/rockchip/cif/Kconfig b/drivers/media/platform/rockchip/cif/Kconfig new file mode 100644 -index 000000000000..78a46df4f338 +index 000000000..78a46df4f --- /dev/null +++ b/drivers/media/platform/rockchip/cif/Kconfig @@ -0,0 +1,80 @@ @@ -603540,7 +603541,7 @@ index 000000000000..78a46df4f338 + diff --git a/drivers/media/platform/rockchip/cif/Makefile b/drivers/media/platform/rockchip/cif/Makefile new file mode 100644 -index 000000000000..d43cad36a272 +index 000000000..d43cad36a --- /dev/null +++ b/drivers/media/platform/rockchip/cif/Makefile @@ -0,0 +1,13 @@ @@ -603559,7 +603560,7 @@ index 000000000000..d43cad36a272 + cif-rockit.o diff --git a/drivers/media/platform/rockchip/cif/capture.c b/drivers/media/platform/rockchip/cif/capture.c new file mode 100644 -index 000000000000..442ee5a86df5 +index 000000000..442ee5a86 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/capture.c @@ -0,0 +1,11718 @@ @@ -615283,7 +615284,7 @@ index 000000000000..442ee5a86df5 +EXPORT_SYMBOL(rkcif_sditf_disconnect); diff --git a/drivers/media/platform/rockchip/cif/cif-luma.c b/drivers/media/platform/rockchip/cif/cif-luma.c new file mode 100644 -index 000000000000..5a3c228cf76c +index 000000000..5a3c228cf --- /dev/null +++ b/drivers/media/platform/rockchip/cif/cif-luma.c @@ -0,0 +1,520 @@ @@ -615809,7 +615810,7 @@ index 000000000000..5a3c228cf76c +} diff --git a/drivers/media/platform/rockchip/cif/cif-luma.h b/drivers/media/platform/rockchip/cif/cif-luma.h new file mode 100644 -index 000000000000..40a5787e1d0e +index 000000000..40a5787e1 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/cif-luma.h @@ -0,0 +1,83 @@ @@ -615898,7 +615899,7 @@ index 000000000000..40a5787e1d0e +#endif /* _RKCIF_LUMA_H */ diff --git a/drivers/media/platform/rockchip/cif/cif-rockit.c b/drivers/media/platform/rockchip/cif/cif-rockit.c new file mode 100644 -index 000000000000..adeeab707296 +index 000000000..adeeab707 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/cif-rockit.c @@ -0,0 +1,420 @@ @@ -616324,7 +616325,7 @@ index 000000000000..adeeab707296 +EXPORT_SYMBOL(rkcif_rockit_get_cifdev); diff --git a/drivers/media/platform/rockchip/cif/cif-scale.c b/drivers/media/platform/rockchip/cif/cif-scale.c new file mode 100644 -index 000000000000..a9b97a6e21ad +index 000000000..a9b97a6e2 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/cif-scale.c @@ -0,0 +1,1194 @@ @@ -617524,7 +617525,7 @@ index 000000000000..a9b97a6e21ad + diff --git a/drivers/media/platform/rockchip/cif/cif-tools.c b/drivers/media/platform/rockchip/cif/cif-tools.c new file mode 100644 -index 000000000000..60103bf71402 +index 000000000..60103bf71 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/cif-tools.c @@ -0,0 +1,926 @@ @@ -618456,7 +618457,7 @@ index 000000000000..60103bf71402 +} diff --git a/drivers/media/platform/rockchip/cif/common.c b/drivers/media/platform/rockchip/cif/common.c new file mode 100644 -index 000000000000..27f2c1425b19 +index 000000000..27f2c1425 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/common.c @@ -0,0 +1,405 @@ @@ -618867,7 +618868,7 @@ index 000000000000..27f2c1425b19 + diff --git a/drivers/media/platform/rockchip/cif/common.h b/drivers/media/platform/rockchip/cif/common.h new file mode 100644 -index 000000000000..7bdfe4f40223 +index 000000000..7bdfe4f40 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/common.h @@ -0,0 +1,30 @@ @@ -618903,7 +618904,7 @@ index 000000000000..7bdfe4f40223 + diff --git a/drivers/media/platform/rockchip/cif/dev.c b/drivers/media/platform/rockchip/cif/dev.c new file mode 100644 -index 000000000000..e5c731ab037a +index 000000000..e5c731ab0 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/dev.c @@ -0,0 +1,2334 @@ @@ -621243,7 +621244,7 @@ index 000000000000..e5c731ab037a +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/cif/dev.h b/drivers/media/platform/rockchip/cif/dev.h new file mode 100644 -index 000000000000..31316c003a16 +index 000000000..31316c003 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/dev.h @@ -0,0 +1,1035 @@ @@ -622284,7 +622285,7 @@ index 000000000000..31316c003a16 +#endif diff --git a/drivers/media/platform/rockchip/cif/hw.c b/drivers/media/platform/rockchip/cif/hw.c new file mode 100644 -index 000000000000..2acf45a7d104 +index 000000000..2acf45a7d --- /dev/null +++ b/drivers/media/platform/rockchip/cif/hw.c @@ -0,0 +1,1628 @@ @@ -623918,7 +623919,7 @@ index 000000000000..2acf45a7d104 +MODULE_IMPORT_NS(DMA_BUF); diff --git a/drivers/media/platform/rockchip/cif/hw.h b/drivers/media/platform/rockchip/cif/hw.h new file mode 100644 -index 000000000000..06ca088c4ce5 +index 000000000..06ca088c4 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/hw.h @@ -0,0 +1,163 @@ @@ -624087,7 +624088,7 @@ index 000000000000..06ca088c4ce5 +#endif diff --git a/drivers/media/platform/rockchip/cif/mipi-csi2.c b/drivers/media/platform/rockchip/cif/mipi-csi2.c new file mode 100644 -index 000000000000..ac5224bd7b2a +index 000000000..ac5224bd7 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/mipi-csi2.c @@ -0,0 +1,1354 @@ @@ -625447,7 +625448,7 @@ index 000000000000..ac5224bd7b2a +MODULE_LICENSE("GPL"); diff --git a/drivers/media/platform/rockchip/cif/mipi-csi2.h b/drivers/media/platform/rockchip/cif/mipi-csi2.h new file mode 100644 -index 000000000000..3306c53d1336 +index 000000000..3306c53d1 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/mipi-csi2.h @@ -0,0 +1,205 @@ @@ -625658,7 +625659,7 @@ index 000000000000..3306c53d1336 +#endif diff --git a/drivers/media/platform/rockchip/cif/procfs.c b/drivers/media/platform/rockchip/cif/procfs.c new file mode 100644 -index 000000000000..ef229fa2a3a4 +index 000000000..ef229fa2a --- /dev/null +++ b/drivers/media/platform/rockchip/cif/procfs.c @@ -0,0 +1,426 @@ @@ -626090,7 +626091,7 @@ index 000000000000..ef229fa2a3a4 +#endif diff --git a/drivers/media/platform/rockchip/cif/procfs.h b/drivers/media/platform/rockchip/cif/procfs.h new file mode 100644 -index 000000000000..798533849cd9 +index 000000000..798533849 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/procfs.h @@ -0,0 +1,25 @@ @@ -626121,7 +626122,7 @@ index 000000000000..798533849cd9 +#endif diff --git a/drivers/media/platform/rockchip/cif/regs.h b/drivers/media/platform/rockchip/cif/regs.h new file mode 100644 -index 000000000000..68bc6ef30a79 +index 000000000..68bc6ef30 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/regs.h @@ -0,0 +1,1075 @@ @@ -627202,7 +627203,7 @@ index 000000000000..68bc6ef30a79 +#endif diff --git a/drivers/media/platform/rockchip/cif/rkcif-externel.h b/drivers/media/platform/rockchip/cif/rkcif-externel.h new file mode 100644 -index 000000000000..fe21f5f27fb4 +index 000000000..fe21f5f27 --- /dev/null +++ b/drivers/media/platform/rockchip/cif/rkcif-externel.h @@ -0,0 +1,13 @@ @@ -627221,7 +627222,7 @@ index 000000000000..fe21f5f27fb4 +#endif diff --git a/drivers/media/platform/rockchip/cif/subdev-itf.c b/drivers/media/platform/rockchip/cif/subdev-itf.c new file mode 100644 -index 000000000000..12387515c060 +index 000000000..12387515c --- /dev/null +++ b/drivers/media/platform/rockchip/cif/subdev-itf.c @@ -0,0 +1,1304 @@ @@ -628531,7 +628532,7 @@ index 000000000000..12387515c060 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/cif/subdev-itf.h b/drivers/media/platform/rockchip/cif/subdev-itf.h new file mode 100644 -index 000000000000..58c63094a3c8 +index 000000000..58c63094a --- /dev/null +++ b/drivers/media/platform/rockchip/cif/subdev-itf.h @@ -0,0 +1,89 @@ @@ -628626,7 +628627,7 @@ index 000000000000..58c63094a3c8 +#endif diff --git a/drivers/media/platform/rockchip/cif/version.h b/drivers/media/platform/rockchip/cif/version.h new file mode 100644 -index 000000000000..dbebed0ca0ef +index 000000000..dbebed0ca --- /dev/null +++ b/drivers/media/platform/rockchip/cif/version.h @@ -0,0 +1,76 @@ @@ -628708,7 +628709,7 @@ index 000000000000..dbebed0ca0ef +#endif diff --git a/drivers/media/platform/rockchip/hdmirx/Kconfig b/drivers/media/platform/rockchip/hdmirx/Kconfig new file mode 100644 -index 000000000000..94037575b145 +index 000000000..94037575b --- /dev/null +++ b/drivers/media/platform/rockchip/hdmirx/Kconfig @@ -0,0 +1,30 @@ @@ -628744,7 +628745,7 @@ index 000000000000..94037575b145 + will be called rockchip_hdmirx. diff --git a/drivers/media/platform/rockchip/hdmirx/Makefile b/drivers/media/platform/rockchip/hdmirx/Makefile new file mode 100644 -index 000000000000..9e7fb30d1880 +index 000000000..9e7fb30d1 --- /dev/null +++ b/drivers/media/platform/rockchip/hdmirx/Makefile @@ -0,0 +1,6 @@ @@ -628756,7 +628757,7 @@ index 000000000000..9e7fb30d1880 +obj-$(CONFIG_VIDEO_ROCKCHIP_HDMIRX) += rockchip-hdmirx.o diff --git a/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.c b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.c new file mode 100644 -index 000000000000..d3c54ba16e9f +index 000000000..d3c54ba16 --- /dev/null +++ b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.c @@ -0,0 +1,4921 @@ @@ -633683,7 +633684,7 @@ index 000000000000..d3c54ba16e9f +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.h b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.h new file mode 100644 -index 000000000000..d49f7c4fe266 +index 000000000..d49f7c4fe --- /dev/null +++ b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.h @@ -0,0 +1,465 @@ @@ -634154,7 +634155,7 @@ index 000000000000..d49f7c4fe266 +#endif diff --git a/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_cec.c b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_cec.c new file mode 100644 -index 000000000000..70f1ff66d9f7 +index 000000000..70f1ff66d --- /dev/null +++ b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_cec.c @@ -0,0 +1,289 @@ @@ -634449,7 +634450,7 @@ index 000000000000..70f1ff66d9f7 +} diff --git a/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_cec.h b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_cec.h new file mode 100644 -index 000000000000..ce6331a09d5d +index 000000000..ce6331a09 --- /dev/null +++ b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_cec.h @@ -0,0 +1,46 @@ @@ -634501,7 +634502,7 @@ index 000000000000..ce6331a09d5d +#endif /* __DW_HDMI_RX_CEC_H__ */ diff --git a/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_class.c b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_class.c new file mode 100644 -index 000000000000..1aa66d3c080c +index 000000000..1aa66d3c0 --- /dev/null +++ b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_class.c @@ -0,0 +1,37 @@ @@ -634544,7 +634545,7 @@ index 000000000000..1aa66d3c080c +MODULE_LICENSE("GPL"); diff --git a/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_hdcp.c b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_hdcp.c new file mode 100644 -index 000000000000..7cda8d87fb2c +index 000000000..7cda8d87f --- /dev/null +++ b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_hdcp.c @@ -0,0 +1,447 @@ @@ -634997,7 +634998,7 @@ index 000000000000..7cda8d87fb2c +} diff --git a/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_hdcp.h b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_hdcp.h new file mode 100644 -index 000000000000..32fb102cc488 +index 000000000..32fb102cc --- /dev/null +++ b/drivers/media/platform/rockchip/hdmirx/rk_hdmirx_hdcp.h @@ -0,0 +1,68 @@ @@ -635071,7 +635072,7 @@ index 000000000000..32fb102cc488 +#endif /* __RK_HDMIRX_HDCP_H__ */ diff --git a/drivers/media/platform/rockchip/isp/Kconfig b/drivers/media/platform/rockchip/isp/Kconfig new file mode 100644 -index 000000000000..77e29d5c0500 +index 000000000..77e29d5c0 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/Kconfig @@ -0,0 +1,44 @@ @@ -635121,7 +635122,7 @@ index 000000000000..77e29d5c0500 +endif diff --git a/drivers/media/platform/rockchip/isp/Makefile b/drivers/media/platform/rockchip/isp/Makefile new file mode 100644 -index 000000000000..d168ffde50d1 +index 000000000..d168ffde5 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/Makefile @@ -0,0 +1,50 @@ @@ -635177,7 +635178,7 @@ index 000000000000..d168ffde50d1 +video_rkisp-$(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) += rkisp_tb_helper.o diff --git a/drivers/media/platform/rockchip/isp/bridge.c b/drivers/media/platform/rockchip/isp/bridge.c new file mode 100644 -index 000000000000..c3d975cd1bb7 +index 000000000..c3d975cd1 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge.c @@ -0,0 +1,624 @@ @@ -635807,7 +635808,7 @@ index 000000000000..c3d975cd1bb7 +EXPORT_SYMBOL(rkisp_get_bridge_sd); diff --git a/drivers/media/platform/rockchip/isp/bridge.h b/drivers/media/platform/rockchip/isp/bridge.h new file mode 100644 -index 000000000000..cc1a7e936f62 +index 000000000..cc1a7e936 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge.h @@ -0,0 +1,105 @@ @@ -635918,7 +635919,7 @@ index 000000000000..cc1a7e936f62 +#endif diff --git a/drivers/media/platform/rockchip/isp/bridge_v20.c b/drivers/media/platform/rockchip/isp/bridge_v20.c new file mode 100644 -index 000000000000..6128d66b04ff +index 000000000..6128d66b0 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge_v20.c @@ -0,0 +1,1102 @@ @@ -637026,7 +637027,7 @@ index 000000000000..6128d66b04ff +} diff --git a/drivers/media/platform/rockchip/isp/bridge_v30.c b/drivers/media/platform/rockchip/isp/bridge_v30.c new file mode 100644 -index 000000000000..d5191273fd02 +index 000000000..d5191273f --- /dev/null +++ b/drivers/media/platform/rockchip/isp/bridge_v30.c @@ -0,0 +1,235 @@ @@ -637267,7 +637268,7 @@ index 000000000000..d5191273fd02 +} diff --git a/drivers/media/platform/rockchip/isp/capture.c b/drivers/media/platform/rockchip/isp/capture.c new file mode 100644 -index 000000000000..a43e6e4f9963 +index 000000000..a43e6e4f9 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture.c @@ -0,0 +1,1794 @@ @@ -639067,7 +639068,7 @@ index 000000000000..a43e6e4f9963 +} diff --git a/drivers/media/platform/rockchip/isp/capture.h b/drivers/media/platform/rockchip/isp/capture.h new file mode 100644 -index 000000000000..bbdcf1e6df6e +index 000000000..bbdcf1e6d --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture.h @@ -0,0 +1,345 @@ @@ -639418,7 +639419,7 @@ index 000000000000..bbdcf1e6df6e +#endif /* _RKISP_PATH_VIDEO_H */ diff --git a/drivers/media/platform/rockchip/isp/capture_v1x.c b/drivers/media/platform/rockchip/isp/capture_v1x.c new file mode 100644 -index 000000000000..45d1881548af +index 000000000..45d188154 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v1x.c @@ -0,0 +1,1268 @@ @@ -640692,7 +640693,7 @@ index 000000000000..45d1881548af +} diff --git a/drivers/media/platform/rockchip/isp/capture_v1x.h b/drivers/media/platform/rockchip/isp/capture_v1x.h new file mode 100644 -index 000000000000..f26f1bde0010 +index 000000000..f26f1bde0 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v1x.h @@ -0,0 +1,17 @@ @@ -640715,7 +640716,7 @@ index 000000000000..f26f1bde0010 +#endif diff --git a/drivers/media/platform/rockchip/isp/capture_v20.c b/drivers/media/platform/rockchip/isp/capture_v20.c new file mode 100644 -index 000000000000..9cf3ee746d64 +index 000000000..9cf3ee746 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v20.c @@ -0,0 +1,2316 @@ @@ -643037,7 +643038,7 @@ index 000000000000..9cf3ee746d64 +} diff --git a/drivers/media/platform/rockchip/isp/capture_v21.c b/drivers/media/platform/rockchip/isp/capture_v21.c new file mode 100644 -index 000000000000..9ca0e2956e3c +index 000000000..9ca0e2956 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v21.c @@ -0,0 +1,2211 @@ @@ -645254,7 +645255,7 @@ index 000000000000..9ca0e2956e3c +} diff --git a/drivers/media/platform/rockchip/isp/capture_v2x.h b/drivers/media/platform/rockchip/isp/capture_v2x.h new file mode 100644 -index 000000000000..8ec036998a4a +index 000000000..8ec036998 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v2x.h @@ -0,0 +1,48 @@ @@ -645308,7 +645309,7 @@ index 000000000000..8ec036998a4a +#endif diff --git a/drivers/media/platform/rockchip/isp/capture_v30.c b/drivers/media/platform/rockchip/isp/capture_v30.c new file mode 100644 -index 000000000000..4f24f65a56d0 +index 000000000..4f24f65a5 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v30.c @@ -0,0 +1,1772 @@ @@ -647086,7 +647087,7 @@ index 000000000000..4f24f65a56d0 +} diff --git a/drivers/media/platform/rockchip/isp/capture_v32.c b/drivers/media/platform/rockchip/isp/capture_v32.c new file mode 100644 -index 000000000000..0d701bdb36d8 +index 000000000..0d701bdb3 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v32.c @@ -0,0 +1,2367 @@ @@ -649459,7 +649460,7 @@ index 000000000000..0d701bdb36d8 +} diff --git a/drivers/media/platform/rockchip/isp/capture_v3x.h b/drivers/media/platform/rockchip/isp/capture_v3x.h new file mode 100644 -index 000000000000..746290312de2 +index 000000000..746290312 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/capture_v3x.h @@ -0,0 +1,65 @@ @@ -649530,7 +649531,7 @@ index 000000000000..746290312de2 +#endif diff --git a/drivers/media/platform/rockchip/isp/common.c b/drivers/media/platform/rockchip/isp/common.c new file mode 100644 -index 000000000000..4feef3d3d96e +index 000000000..4feef3d3d --- /dev/null +++ b/drivers/media/platform/rockchip/isp/common.c @@ -0,0 +1,481 @@ @@ -650017,7 +650018,7 @@ index 000000000000..4feef3d3d96e +} diff --git a/drivers/media/platform/rockchip/isp/common.h b/drivers/media/platform/rockchip/isp/common.h new file mode 100644 -index 000000000000..c6568715a733 +index 000000000..c6568715a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/common.h @@ -0,0 +1,202 @@ @@ -650225,7 +650226,7 @@ index 000000000000..c6568715a733 +#endif /* _RKISP_COMMON_H */ diff --git a/drivers/media/platform/rockchip/isp/csi.c b/drivers/media/platform/rockchip/isp/csi.c new file mode 100644 -index 000000000000..bd469c40604f +index 000000000..bd469c406 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/csi.c @@ -0,0 +1,747 @@ @@ -650978,7 +650979,7 @@ index 000000000000..bd469c40604f +} diff --git a/drivers/media/platform/rockchip/isp/csi.h b/drivers/media/platform/rockchip/isp/csi.h new file mode 100644 -index 000000000000..9fbdc35b4405 +index 000000000..9fbdc35b4 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/csi.h @@ -0,0 +1,85 @@ @@ -651069,7 +651070,7 @@ index 000000000000..9fbdc35b4405 +#endif diff --git a/drivers/media/platform/rockchip/isp/dev.c b/drivers/media/platform/rockchip/isp/dev.c new file mode 100644 -index 000000000000..244fe7016d62 +index 000000000..244fe7016 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dev.c @@ -0,0 +1,1216 @@ @@ -652291,7 +652292,7 @@ index 000000000000..244fe7016d62 +MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver); diff --git a/drivers/media/platform/rockchip/isp/dev.h b/drivers/media/platform/rockchip/isp/dev.h new file mode 100644 -index 000000000000..1c726a63cad3 +index 000000000..1c726a63c --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dev.h @@ -0,0 +1,321 @@ @@ -652618,7 +652619,7 @@ index 000000000000..1c726a63cad3 +#endif diff --git a/drivers/media/platform/rockchip/isp/dmarx.c b/drivers/media/platform/rockchip/isp/dmarx.c new file mode 100644 -index 000000000000..e610f19351bc +index 000000000..e610f1935 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dmarx.c @@ -0,0 +1,1245 @@ @@ -653869,7 +653870,7 @@ index 000000000000..e610f19351bc +} diff --git a/drivers/media/platform/rockchip/isp/dmarx.h b/drivers/media/platform/rockchip/isp/dmarx.h new file mode 100644 -index 000000000000..f8d8f230268b +index 000000000..f8d8f2302 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/dmarx.h @@ -0,0 +1,75 @@ @@ -653950,7 +653951,7 @@ index 000000000000..f8d8f230268b +#endif /* _RKISP_DMARX_H */ diff --git a/drivers/media/platform/rockchip/isp/hw.c b/drivers/media/platform/rockchip/isp/hw.c new file mode 100644 -index 000000000000..ebf538ada150 +index 000000000..ebf538ada --- /dev/null +++ b/drivers/media/platform/rockchip/isp/hw.c @@ -0,0 +1,1343 @@ @@ -655299,7 +655300,7 @@ index 000000000000..ebf538ada150 +module_exit(rkisp_hw_drv_exit); diff --git a/drivers/media/platform/rockchip/isp/hw.h b/drivers/media/platform/rockchip/isp/hw.h new file mode 100644 -index 000000000000..657c77c0f937 +index 000000000..657c77c0f --- /dev/null +++ b/drivers/media/platform/rockchip/isp/hw.h @@ -0,0 +1,115 @@ @@ -655420,7 +655421,7 @@ index 000000000000..657c77c0f937 +#endif diff --git a/drivers/media/platform/rockchip/isp/isp_dvbm.c b/drivers/media/platform/rockchip/isp/isp_dvbm.c new file mode 100644 -index 000000000000..fe597add1f64 +index 000000000..fe597add1 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_dvbm.c @@ -0,0 +1,93 @@ @@ -655519,7 +655520,7 @@ index 000000000000..fe597add1f64 +} diff --git a/drivers/media/platform/rockchip/isp/isp_external.h b/drivers/media/platform/rockchip/isp/isp_external.h new file mode 100644 -index 000000000000..6d4907483830 +index 000000000..6d4907483 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_external.h @@ -0,0 +1,72 @@ @@ -655597,7 +655598,7 @@ index 000000000000..6d4907483830 +#endif diff --git a/drivers/media/platform/rockchip/isp/isp_ispp.h b/drivers/media/platform/rockchip/isp/isp_ispp.h new file mode 100644 -index 000000000000..16f106c396a8 +index 000000000..16f106c39 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_ispp.h @@ -0,0 +1,137 @@ @@ -655740,7 +655741,7 @@ index 000000000000..16f106c396a8 +#endif diff --git a/drivers/media/platform/rockchip/isp/isp_mipi_luma.c b/drivers/media/platform/rockchip/isp/isp_mipi_luma.c new file mode 100644 -index 000000000000..1e2039e01dce +index 000000000..1e2039e01 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_mipi_luma.c @@ -0,0 +1,527 @@ @@ -656273,7 +656274,7 @@ index 000000000000..1e2039e01dce +} diff --git a/drivers/media/platform/rockchip/isp/isp_mipi_luma.h b/drivers/media/platform/rockchip/isp/isp_mipi_luma.h new file mode 100644 -index 000000000000..681a8b6ac0c6 +index 000000000..681a8b6ac --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_mipi_luma.h @@ -0,0 +1,79 @@ @@ -656358,7 +656359,7 @@ index 000000000000..681a8b6ac0c6 +#endif /* _RKISP_ISP_LUMA_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params.c b/drivers/media/platform/rockchip/isp/isp_params.c new file mode 100644 -index 000000000000..03fd7fce0d7e +index 000000000..03fd7fce0 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params.c @@ -0,0 +1,563 @@ @@ -656927,7 +656928,7 @@ index 000000000000..03fd7fce0d7e + diff --git a/drivers/media/platform/rockchip/isp/isp_params.h b/drivers/media/platform/rockchip/isp/isp_params.h new file mode 100644 -index 000000000000..2d58aba98d16 +index 000000000..2d58aba98 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params.h @@ -0,0 +1,150 @@ @@ -657083,7 +657084,7 @@ index 000000000000..2d58aba98d16 +#endif /* _RKISP_ISP_PARAM_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params_v1x.c b/drivers/media/platform/rockchip/isp/isp_params_v1x.c new file mode 100644 -index 000000000000..4ca6c6dbbd2c +index 000000000..4ca6c6dbb --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v1x.c @@ -0,0 +1,2352 @@ @@ -659441,7 +659442,7 @@ index 000000000000..4ca6c6dbbd2c + diff --git a/drivers/media/platform/rockchip/isp/isp_params_v1x.h b/drivers/media/platform/rockchip/isp/isp_params_v1x.h new file mode 100644 -index 000000000000..b6e4a2c6a9bc +index 000000000..b6e4a2c6a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v1x.h @@ -0,0 +1,87 @@ @@ -659534,7 +659535,7 @@ index 000000000000..b6e4a2c6a9bc +#endif /* _RKISP_ISP_PARAM_V1X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params_v21.c b/drivers/media/platform/rockchip/isp/isp_params_v21.c new file mode 100644 -index 000000000000..e13e97ca53d0 +index 000000000..e13e97ca5 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v21.c @@ -0,0 +1,4410 @@ @@ -663950,7 +663951,7 @@ index 000000000000..e13e97ca53d0 + diff --git a/drivers/media/platform/rockchip/isp/isp_params_v21.h b/drivers/media/platform/rockchip/isp/isp_params_v21.h new file mode 100644 -index 000000000000..7b374e2020a7 +index 000000000..7b374e202 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v21.h @@ -0,0 +1,172 @@ @@ -664128,7 +664129,7 @@ index 000000000000..7b374e2020a7 +#endif /* _RKISP_ISP_PARAM_V21_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params_v2x.c b/drivers/media/platform/rockchip/isp/isp_params_v2x.c new file mode 100644 -index 000000000000..c1497a92ffd1 +index 000000000..c1497a92f --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v2x.c @@ -0,0 +1,4497 @@ @@ -668631,7 +668632,7 @@ index 000000000000..c1497a92ffd1 + diff --git a/drivers/media/platform/rockchip/isp/isp_params_v2x.h b/drivers/media/platform/rockchip/isp/isp_params_v2x.h new file mode 100644 -index 000000000000..dd2a1d33f370 +index 000000000..dd2a1d33f --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v2x.h @@ -0,0 +1,359 @@ @@ -668996,7 +668997,7 @@ index 000000000000..dd2a1d33f370 +#endif /* _RKISP_ISP_PARAM_V2X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params_v32.c b/drivers/media/platform/rockchip/isp/isp_params_v32.c new file mode 100644 -index 000000000000..23072b4628de +index 000000000..23072b462 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v32.c @@ -0,0 +1,5576 @@ @@ -674578,7 +674579,7 @@ index 000000000000..23072b4628de +} diff --git a/drivers/media/platform/rockchip/isp/isp_params_v32.h b/drivers/media/platform/rockchip/isp/isp_params_v32.h new file mode 100644 -index 000000000000..e1d91488d177 +index 000000000..e1d91488d --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v32.h @@ -0,0 +1,225 @@ @@ -674809,7 +674810,7 @@ index 000000000000..e1d91488d177 +#endif /* _RKISP_ISP_PARAM_V32_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_params_v3x.c b/drivers/media/platform/rockchip/isp/isp_params_v3x.c new file mode 100644 -index 000000000000..0491cc9bd8ba +index 000000000..0491cc9bd --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v3x.c @@ -0,0 +1,4905 @@ @@ -679720,7 +679721,7 @@ index 000000000000..0491cc9bd8ba +} diff --git a/drivers/media/platform/rockchip/isp/isp_params_v3x.h b/drivers/media/platform/rockchip/isp/isp_params_v3x.h new file mode 100644 -index 000000000000..0d5041ddf6f4 +index 000000000..0d5041ddf --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_params_v3x.h @@ -0,0 +1,206 @@ @@ -679932,7 +679933,7 @@ index 000000000000..0d5041ddf6f4 +#endif /* _RKISP_ISP_PARAM_V3X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_rockit.c b/drivers/media/platform/rockchip/isp/isp_rockit.c new file mode 100644 -index 000000000000..7914ea12cad0 +index 000000000..7914ea12c --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_rockit.c @@ -0,0 +1,744 @@ @@ -680682,7 +680683,7 @@ index 000000000000..7914ea12cad0 +EXPORT_SYMBOL(rkisp_rockit_get_isp_mode); diff --git a/drivers/media/platform/rockchip/isp/isp_stats.c b/drivers/media/platform/rockchip/isp/isp_stats.c new file mode 100644 -index 000000000000..d95315ee6d6d +index 000000000..d95315ee6 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats.c @@ -0,0 +1,429 @@ @@ -681117,7 +681118,7 @@ index 000000000000..d95315ee6d6d + diff --git a/drivers/media/platform/rockchip/isp/isp_stats.h b/drivers/media/platform/rockchip/isp/isp_stats.h new file mode 100644 -index 000000000000..5e10d8f3d545 +index 000000000..5e10d8f3d --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats.h @@ -0,0 +1,95 @@ @@ -681218,7 +681219,7 @@ index 000000000000..5e10d8f3d545 +#endif /* _RKISP_ISP_STATS_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v1x.c b/drivers/media/platform/rockchip/isp/isp_stats_v1x.c new file mode 100644 -index 000000000000..dce904b5f7c5 +index 000000000..dce904b5f --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v1x.c @@ -0,0 +1,420 @@ @@ -681644,7 +681645,7 @@ index 000000000000..dce904b5f7c5 + diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v1x.h b/drivers/media/platform/rockchip/isp/isp_stats_v1x.h new file mode 100644 -index 000000000000..6dc2790c58d5 +index 000000000..6dc2790c5 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v1x.h @@ -0,0 +1,42 @@ @@ -681692,7 +681693,7 @@ index 000000000000..6dc2790c58d5 +#endif /* _RKISP_ISP_STATS_V1X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v21.c b/drivers/media/platform/rockchip/isp/isp_stats_v21.c new file mode 100644 -index 000000000000..c6308645ac53 +index 000000000..c6308645a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v21.c @@ -0,0 +1,1177 @@ @@ -682875,7 +682876,7 @@ index 000000000000..c6308645ac53 + diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v21.h b/drivers/media/platform/rockchip/isp/isp_stats_v21.h new file mode 100644 -index 000000000000..6fccd014db2b +index 000000000..6fccd014d --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v21.h @@ -0,0 +1,52 @@ @@ -682933,7 +682934,7 @@ index 000000000000..6fccd014db2b +#endif /* _RKISP_ISP_STATS_V21_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v2x.c b/drivers/media/platform/rockchip/isp/isp_stats_v2x.c new file mode 100644 -index 000000000000..b69b48f770b5 +index 000000000..b69b48f77 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v2x.c @@ -0,0 +1,1526 @@ @@ -684465,7 +684466,7 @@ index 000000000000..b69b48f770b5 + diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v2x.h b/drivers/media/platform/rockchip/isp/isp_stats_v2x.h new file mode 100644 -index 000000000000..37d7988f7013 +index 000000000..37d7988f7 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v2x.h @@ -0,0 +1,70 @@ @@ -684541,7 +684542,7 @@ index 000000000000..37d7988f7013 +#endif /* _RKISP_ISP_STATS_V2X_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v32.c b/drivers/media/platform/rockchip/isp/isp_stats_v32.c new file mode 100644 -index 000000000000..6e73379ab154 +index 000000000..6e73379ab --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v32.c @@ -0,0 +1,1131 @@ @@ -685678,7 +685679,7 @@ index 000000000000..6e73379ab154 +} diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v32.h b/drivers/media/platform/rockchip/isp/isp_stats_v32.h new file mode 100644 -index 000000000000..b598c8734478 +index 000000000..b598c8734 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v32.h @@ -0,0 +1,54 @@ @@ -685738,7 +685739,7 @@ index 000000000000..b598c8734478 +#endif /* _RKISP_ISP_STATS_V32_H */ diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v3x.c b/drivers/media/platform/rockchip/isp/isp_stats_v3x.c new file mode 100644 -index 000000000000..b74736d721ce +index 000000000..b74736d72 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v3x.c @@ -0,0 +1,1236 @@ @@ -686980,7 +686981,7 @@ index 000000000000..b74736d721ce +} diff --git a/drivers/media/platform/rockchip/isp/isp_stats_v3x.h b/drivers/media/platform/rockchip/isp/isp_stats_v3x.h new file mode 100644 -index 000000000000..042f11c70a36 +index 000000000..042f11c70 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/isp_stats_v3x.h @@ -0,0 +1,52 @@ @@ -687038,7 +687039,7 @@ index 000000000000..042f11c70a36 +#endif /* _RKISP_ISP_STATS_V3X_H */ diff --git a/drivers/media/platform/rockchip/isp/procfs.c b/drivers/media/platform/rockchip/isp/procfs.c new file mode 100644 -index 000000000000..d35a7c705106 +index 000000000..d35a7c705 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/procfs.c @@ -0,0 +1,1157 @@ @@ -688201,7 +688202,7 @@ index 000000000000..d35a7c705106 +#endif /* CONFIG_PROC_FS */ diff --git a/drivers/media/platform/rockchip/isp/procfs.h b/drivers/media/platform/rockchip/isp/procfs.h new file mode 100644 -index 000000000000..38b1f666664d +index 000000000..38b1f6666 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/procfs.h @@ -0,0 +1,38 @@ @@ -688245,7 +688246,7 @@ index 000000000000..38b1f666664d +#endif diff --git a/drivers/media/platform/rockchip/isp/regs.c b/drivers/media/platform/rockchip/isp/regs.c new file mode 100644 -index 000000000000..17af5ef7349b +index 000000000..17af5ef73 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs.c @@ -0,0 +1,411 @@ @@ -688662,7 +688663,7 @@ index 000000000000..17af5ef7349b +} diff --git a/drivers/media/platform/rockchip/isp/regs.h b/drivers/media/platform/rockchip/isp/regs.h new file mode 100644 -index 000000000000..d263a640a154 +index 000000000..d263a640a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs.h @@ -0,0 +1,2050 @@ @@ -690718,7 +690719,7 @@ index 000000000000..d263a640a154 +#endif /* _RKISP_REGS_H */ diff --git a/drivers/media/platform/rockchip/isp/regs_v2x.h b/drivers/media/platform/rockchip/isp/regs_v2x.h new file mode 100644 -index 000000000000..2f3c1009ae4e +index 000000000..2f3c1009a --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs_v2x.h @@ -0,0 +1,2717 @@ @@ -693441,7 +693442,7 @@ index 000000000000..2f3c1009ae4e +#endif /* _RKISP_REGS_V2X_H */ diff --git a/drivers/media/platform/rockchip/isp/regs_v3x.h b/drivers/media/platform/rockchip/isp/regs_v3x.h new file mode 100644 -index 000000000000..5e4c85710ee1 +index 000000000..5e4c85710 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/regs_v3x.h @@ -0,0 +1,2304 @@ @@ -695751,7 +695752,7 @@ index 000000000000..5e4c85710ee1 +#endif /* _RKISP_REGS_V3X_H */ diff --git a/drivers/media/platform/rockchip/isp/rkisp.c b/drivers/media/platform/rockchip/isp/rkisp.c new file mode 100644 -index 000000000000..d1233cfc0f09 +index 000000000..d1233cfc0 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp.c @@ -0,0 +1,4338 @@ @@ -700095,7 +700096,7 @@ index 000000000000..d1233cfc0f09 + diff --git a/drivers/media/platform/rockchip/isp/rkisp.h b/drivers/media/platform/rockchip/isp/rkisp.h new file mode 100644 -index 000000000000..76f8ce05e424 +index 000000000..76f8ce05e --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp.h @@ -0,0 +1,208 @@ @@ -700309,7 +700310,7 @@ index 000000000000..76f8ce05e424 +#endif /* _RKISP_H */ diff --git a/drivers/media/platform/rockchip/isp/rkisp_tb_helper.c b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.c new file mode 100644 -index 000000000000..c78493f0144c +index 000000000..c78493f01 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.c @@ -0,0 +1,306 @@ @@ -700621,7 +700622,7 @@ index 000000000000..c78493f0144c +EXPORT_SYMBOL(rkisp_tb_get_state); diff --git a/drivers/media/platform/rockchip/isp/rkisp_tb_helper.h b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.h new file mode 100644 -index 000000000000..a4b4a59bc7f7 +index 000000000..a4b4a59bc --- /dev/null +++ b/drivers/media/platform/rockchip/isp/rkisp_tb_helper.h @@ -0,0 +1,33 @@ @@ -700660,7 +700661,7 @@ index 000000000000..a4b4a59bc7f7 +#endif diff --git a/drivers/media/platform/rockchip/isp/version.h b/drivers/media/platform/rockchip/isp/version.h new file mode 100644 -index 000000000000..8981e4709131 +index 000000000..8981e4709 --- /dev/null +++ b/drivers/media/platform/rockchip/isp/version.h @@ -0,0 +1,490 @@ @@ -701156,7 +701157,7 @@ index 000000000000..8981e4709131 +#endif diff --git a/drivers/media/platform/rockchip/isp1/Kconfig b/drivers/media/platform/rockchip/isp1/Kconfig new file mode 100644 -index 000000000000..67ba21852bf7 +index 000000000..67ba21852 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/Kconfig @@ -0,0 +1,15 @@ @@ -701177,7 +701178,7 @@ index 000000000000..67ba21852bf7 + Support for ISP1 on the rockchip SoC. diff --git a/drivers/media/platform/rockchip/isp1/Makefile b/drivers/media/platform/rockchip/isp1/Makefile new file mode 100644 -index 000000000000..3c9283f98a42 +index 000000000..3c9283f98 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/Makefile @@ -0,0 +1,10 @@ @@ -701193,7 +701194,7 @@ index 000000000000..3c9283f98a42 + dmarx.o diff --git a/drivers/media/platform/rockchip/isp1/capture.c b/drivers/media/platform/rockchip/isp1/capture.c new file mode 100644 -index 000000000000..c6ab5453c4b8 +index 000000000..c6ab5453c --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/capture.c @@ -0,0 +1,2313 @@ @@ -703512,7 +703513,7 @@ index 000000000000..c6ab5453c4b8 +} diff --git a/drivers/media/platform/rockchip/isp1/capture.h b/drivers/media/platform/rockchip/isp1/capture.h new file mode 100644 -index 000000000000..8613618352e9 +index 000000000..861361835 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/capture.h @@ -0,0 +1,219 @@ @@ -703737,7 +703738,7 @@ index 000000000000..8613618352e9 +#endif /* _RKISP1_PATH_VIDEO_H */ diff --git a/drivers/media/platform/rockchip/isp1/common.h b/drivers/media/platform/rockchip/isp1/common.h new file mode 100644 -index 000000000000..de2885d45c68 +index 000000000..de2885d45 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/common.h @@ -0,0 +1,134 @@ @@ -703877,7 +703878,7 @@ index 000000000000..de2885d45c68 +#endif /* _RKISP1_COMMON_H */ diff --git a/drivers/media/platform/rockchip/isp1/dev.c b/drivers/media/platform/rockchip/isp1/dev.c new file mode 100644 -index 000000000000..8bdee0a75dc3 +index 000000000..8bdee0a75 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dev.c @@ -0,0 +1,1174 @@ @@ -705057,7 +705058,7 @@ index 000000000000..8bdee0a75dc3 +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/media/platform/rockchip/isp1/dev.h b/drivers/media/platform/rockchip/isp1/dev.h new file mode 100644 -index 000000000000..0d0d6fd52fc6 +index 000000000..0d0d6fd52 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dev.h @@ -0,0 +1,173 @@ @@ -705236,7 +705237,7 @@ index 000000000000..0d0d6fd52fc6 +#endif diff --git a/drivers/media/platform/rockchip/isp1/dmarx.c b/drivers/media/platform/rockchip/isp1/dmarx.c new file mode 100644 -index 000000000000..b94d500241cc +index 000000000..b94d50024 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dmarx.c @@ -0,0 +1,686 @@ @@ -705928,7 +705929,7 @@ index 000000000000..b94d500241cc +} diff --git a/drivers/media/platform/rockchip/isp1/dmarx.h b/drivers/media/platform/rockchip/isp1/dmarx.h new file mode 100644 -index 000000000000..abc3b39aa0b5 +index 000000000..abc3b39aa --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/dmarx.h @@ -0,0 +1,29 @@ @@ -705963,7 +705964,7 @@ index 000000000000..abc3b39aa0b5 +#endif /* _RKISP1_DMARX_H */ diff --git a/drivers/media/platform/rockchip/isp1/isp_params.c b/drivers/media/platform/rockchip/isp1/isp_params.c new file mode 100644 -index 000000000000..02e6de0969e5 +index 000000000..02e6de096 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_params.c @@ -0,0 +1,2655 @@ @@ -708624,7 +708625,7 @@ index 000000000000..02e6de0969e5 +} diff --git a/drivers/media/platform/rockchip/isp1/isp_params.h b/drivers/media/platform/rockchip/isp1/isp_params.h new file mode 100644 -index 000000000000..fe7065dcfe41 +index 000000000..fe7065dcf --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_params.h @@ -0,0 +1,151 @@ @@ -708781,7 +708782,7 @@ index 000000000000..fe7065dcfe41 +#endif /* _RKISP1_ISP_H */ diff --git a/drivers/media/platform/rockchip/isp1/isp_stats.c b/drivers/media/platform/rockchip/isp1/isp_stats.c new file mode 100644 -index 000000000000..4f74071836e3 +index 000000000..4f7407183 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_stats.c @@ -0,0 +1,684 @@ @@ -709471,7 +709472,7 @@ index 000000000000..4f74071836e3 +} diff --git a/drivers/media/platform/rockchip/isp1/isp_stats.h b/drivers/media/platform/rockchip/isp1/isp_stats.h new file mode 100644 -index 000000000000..183b48e6c098 +index 000000000..183b48e6c --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/isp_stats.h @@ -0,0 +1,112 @@ @@ -709589,7 +709590,7 @@ index 000000000000..183b48e6c098 +#endif /* _RKISP1_ISP_STATS_H */ diff --git a/drivers/media/platform/rockchip/isp1/regs.c b/drivers/media/platform/rockchip/isp1/regs.c new file mode 100644 -index 000000000000..82f6cd92475e +index 000000000..82f6cd924 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/regs.c @@ -0,0 +1,244 @@ @@ -709839,7 +709840,7 @@ index 000000000000..82f6cd92475e +} diff --git a/drivers/media/platform/rockchip/isp1/regs.h b/drivers/media/platform/rockchip/isp1/regs.h new file mode 100644 -index 000000000000..d31ef1b127f5 +index 000000000..d31ef1b12 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/regs.h @@ -0,0 +1,1994 @@ @@ -711839,7 +711840,7 @@ index 000000000000..d31ef1b127f5 +#endif /* _RKISP1_REGS_H */ diff --git a/drivers/media/platform/rockchip/isp1/rkisp1.c b/drivers/media/platform/rockchip/isp1/rkisp1.c new file mode 100644 -index 000000000000..273c6b5a987e +index 000000000..273c6b5a9 --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/rkisp1.c @@ -0,0 +1,1863 @@ @@ -713708,7 +713709,7 @@ index 000000000000..273c6b5a987e + diff --git a/drivers/media/platform/rockchip/isp1/rkisp1.h b/drivers/media/platform/rockchip/isp1/rkisp1.h new file mode 100644 -index 000000000000..afafc2c0f78f +index 000000000..afafc2c0f --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/rkisp1.h @@ -0,0 +1,163 @@ @@ -713877,7 +713878,7 @@ index 000000000000..afafc2c0f78f +#endif /* _RKISP1_H */ diff --git a/drivers/media/platform/rockchip/isp1/version.h b/drivers/media/platform/rockchip/isp1/version.h new file mode 100644 -index 000000000000..3bfb0c98fd6e +index 000000000..3bfb0c98f --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/version.h @@ -0,0 +1,61 @@ @@ -713944,7 +713945,7 @@ index 000000000000..3bfb0c98fd6e +#endif diff --git a/drivers/media/platform/rockchip/ispp/Kconfig b/drivers/media/platform/rockchip/ispp/Kconfig new file mode 100644 -index 000000000000..b97843042129 +index 000000000..b97843042 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/Kconfig @@ -0,0 +1,31 @@ @@ -713981,7 +713982,7 @@ index 000000000000..b97843042129 +endif diff --git a/drivers/media/platform/rockchip/ispp/Makefile b/drivers/media/platform/rockchip/ispp/Makefile new file mode 100644 -index 000000000000..6148f70ff50a +index 000000000..6148f70ff --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/Makefile @@ -0,0 +1,23 @@ @@ -714010,7 +714011,7 @@ index 000000000000..6148f70ff50a +endif diff --git a/drivers/media/platform/rockchip/ispp/common.c b/drivers/media/platform/rockchip/ispp/common.c new file mode 100644 -index 000000000000..3ae45edf49f1 +index 000000000..3ae45edf4 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/common.c @@ -0,0 +1,614 @@ @@ -714630,7 +714631,7 @@ index 000000000000..3ae45edf49f1 +} diff --git a/drivers/media/platform/rockchip/ispp/common.h b/drivers/media/platform/rockchip/ispp/common.h new file mode 100644 -index 000000000000..fb36a4e0b514 +index 000000000..fb36a4e0b --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/common.h @@ -0,0 +1,148 @@ @@ -714784,7 +714785,7 @@ index 000000000000..fb36a4e0b514 +#endif diff --git a/drivers/media/platform/rockchip/ispp/dev.c b/drivers/media/platform/rockchip/ispp/dev.c new file mode 100644 -index 000000000000..776d2f6bf86b +index 000000000..776d2f6bf --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/dev.c @@ -0,0 +1,399 @@ @@ -715189,7 +715190,7 @@ index 000000000000..776d2f6bf86b +MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver); diff --git a/drivers/media/platform/rockchip/ispp/dev.h b/drivers/media/platform/rockchip/ispp/dev.h new file mode 100644 -index 000000000000..065ce848435e +index 000000000..065ce8484 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/dev.h @@ -0,0 +1,60 @@ @@ -715255,7 +715256,7 @@ index 000000000000..065ce848435e +#endif diff --git a/drivers/media/platform/rockchip/ispp/fec.c b/drivers/media/platform/rockchip/ispp/fec.c new file mode 100644 -index 000000000000..bb16d557e5e6 +index 000000000..bb16d557e --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/fec.c @@ -0,0 +1,459 @@ @@ -715720,7 +715721,7 @@ index 000000000000..bb16d557e5e6 +} diff --git a/drivers/media/platform/rockchip/ispp/fec.h b/drivers/media/platform/rockchip/ispp/fec.h new file mode 100644 -index 000000000000..d7bb4196dd25 +index 000000000..d7bb4196d --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/fec.h @@ -0,0 +1,28 @@ @@ -715754,7 +715755,7 @@ index 000000000000..d7bb4196dd25 +#endif diff --git a/drivers/media/platform/rockchip/ispp/hw.c b/drivers/media/platform/rockchip/ispp/hw.c new file mode 100644 -index 000000000000..e132610936ad +index 000000000..e13261093 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/hw.c @@ -0,0 +1,501 @@ @@ -716261,7 +716262,7 @@ index 000000000000..e132610936ad +#endif diff --git a/drivers/media/platform/rockchip/ispp/hw.h b/drivers/media/platform/rockchip/ispp/hw.h new file mode 100644 -index 000000000000..8eb2585ecb71 +index 000000000..8eb2585ec --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/hw.h @@ -0,0 +1,67 @@ @@ -716334,7 +716335,7 @@ index 000000000000..8eb2585ecb71 +#endif diff --git a/drivers/media/platform/rockchip/ispp/ispp.c b/drivers/media/platform/rockchip/ispp/ispp.c new file mode 100644 -index 000000000000..f3f17ebb2e4b +index 000000000..f3f17ebb2 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/ispp.c @@ -0,0 +1,500 @@ @@ -716840,7 +716841,7 @@ index 000000000000..f3f17ebb2e4b +} diff --git a/drivers/media/platform/rockchip/ispp/ispp.h b/drivers/media/platform/rockchip/ispp/ispp.h new file mode 100644 -index 000000000000..baa07a09352c +index 000000000..baa07a093 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/ispp.h @@ -0,0 +1,50 @@ @@ -716896,7 +716897,7 @@ index 000000000000..baa07a09352c +#endif diff --git a/drivers/media/platform/rockchip/ispp/params.c b/drivers/media/platform/rockchip/ispp/params.c new file mode 100644 -index 000000000000..af5fdddb2fad +index 000000000..af5fdddb2 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params.c @@ -0,0 +1,496 @@ @@ -717398,7 +717399,7 @@ index 000000000000..af5fdddb2fad +} diff --git a/drivers/media/platform/rockchip/ispp/params.h b/drivers/media/platform/rockchip/ispp/params.h new file mode 100644 -index 000000000000..912e20159efd +index 000000000..912e20159 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params.h @@ -0,0 +1,75 @@ @@ -717479,7 +717480,7 @@ index 000000000000..912e20159efd +#endif diff --git a/drivers/media/platform/rockchip/ispp/params_v10.c b/drivers/media/platform/rockchip/ispp/params_v10.c new file mode 100644 -index 000000000000..5778acd20988 +index 000000000..5778acd20 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params_v10.c @@ -0,0 +1,768 @@ @@ -718253,7 +718254,7 @@ index 000000000000..5778acd20988 +} diff --git a/drivers/media/platform/rockchip/ispp/params_v20.c b/drivers/media/platform/rockchip/ispp/params_v20.c new file mode 100644 -index 000000000000..03c944c8af0d +index 000000000..03c944c8a --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/params_v20.c @@ -0,0 +1,209 @@ @@ -718468,7 +718469,7 @@ index 000000000000..03c944c8af0d +} diff --git a/drivers/media/platform/rockchip/ispp/procfs.c b/drivers/media/platform/rockchip/ispp/procfs.c new file mode 100644 -index 000000000000..8d4d11f1b1e0 +index 000000000..8d4d11f1b --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/procfs.c @@ -0,0 +1,143 @@ @@ -718617,7 +718618,7 @@ index 000000000000..8d4d11f1b1e0 +#endif /* CONFIG_PROC_FS */ diff --git a/drivers/media/platform/rockchip/ispp/procfs.h b/drivers/media/platform/rockchip/ispp/procfs.h new file mode 100644 -index 000000000000..21ea0c471b58 +index 000000000..21ea0c471 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/procfs.h @@ -0,0 +1,21 @@ @@ -718644,7 +718645,7 @@ index 000000000000..21ea0c471b58 +#endif diff --git a/drivers/media/platform/rockchip/ispp/regs.h b/drivers/media/platform/rockchip/ispp/regs.h new file mode 100644 -index 000000000000..b9afecd67d13 +index 000000000..b9afecd67 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/regs.h @@ -0,0 +1,524 @@ @@ -719174,7 +719175,7 @@ index 000000000000..b9afecd67d13 +#endif /* _RKISPP_REGS_H */ diff --git a/drivers/media/platform/rockchip/ispp/stats.c b/drivers/media/platform/rockchip/ispp/stats.c new file mode 100644 -index 000000000000..94e14deb3cdc +index 000000000..94e14deb3 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stats.c @@ -0,0 +1,452 @@ @@ -719632,7 +719633,7 @@ index 000000000000..94e14deb3cdc +} diff --git a/drivers/media/platform/rockchip/ispp/stats.h b/drivers/media/platform/rockchip/ispp/stats.h new file mode 100644 -index 000000000000..8ca1bd540f5c +index 000000000..8ca1bd540 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stats.h @@ -0,0 +1,60 @@ @@ -719698,7 +719699,7 @@ index 000000000000..8ca1bd540f5c +#endif /* _RKISPP_STATS_H */ diff --git a/drivers/media/platform/rockchip/ispp/stream.c b/drivers/media/platform/rockchip/ispp/stream.c new file mode 100644 -index 000000000000..ab029f00e306 +index 000000000..ab029f00e --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream.c @@ -0,0 +1,2040 @@ @@ -721744,7 +721745,7 @@ index 000000000000..ab029f00e306 +} diff --git a/drivers/media/platform/rockchip/ispp/stream.h b/drivers/media/platform/rockchip/ispp/stream.h new file mode 100644 -index 000000000000..d0269e8c5b21 +index 000000000..d0269e8c5 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream.h @@ -0,0 +1,282 @@ @@ -722032,7 +722033,7 @@ index 000000000000..d0269e8c5b21 +#endif diff --git a/drivers/media/platform/rockchip/ispp/stream_v10.c b/drivers/media/platform/rockchip/ispp/stream_v10.c new file mode 100644 -index 000000000000..5567fe6c92d9 +index 000000000..5567fe6c9 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream_v10.c @@ -0,0 +1,1753 @@ @@ -723791,7 +723792,7 @@ index 000000000000..5567fe6c92d9 +} diff --git a/drivers/media/platform/rockchip/ispp/stream_v20.c b/drivers/media/platform/rockchip/ispp/stream_v20.c new file mode 100644 -index 000000000000..a7f37d7d571e +index 000000000..a7f37d7d5 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/stream_v20.c @@ -0,0 +1,462 @@ @@ -724259,7 +724260,7 @@ index 000000000000..a7f37d7d571e +} diff --git a/drivers/media/platform/rockchip/ispp/version.h b/drivers/media/platform/rockchip/ispp/version.h new file mode 100644 -index 000000000000..398f500a22ac +index 000000000..398f500a2 --- /dev/null +++ b/drivers/media/platform/rockchip/ispp/version.h @@ -0,0 +1,138 @@ @@ -724402,7 +724403,7 @@ index 000000000000..398f500a22ac + +#endif diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c -index 25f5b5eebf13..67dcf22e5ba3 100644 +index 25f5b5eeb..67dcf22e5 100644 --- a/drivers/media/platform/rockchip/rga/rga.c +++ b/drivers/media/platform/rockchip/rga/rga.c @@ -76,7 +76,10 @@ static irqreturn_t rga_isr(int irq, void *prv) @@ -724469,7 +724470,7 @@ index 25f5b5eebf13..67dcf22e5ba3 100644 } diff --git a/drivers/media/platform/rockchip/tsp/Kconfig b/drivers/media/platform/rockchip/tsp/Kconfig new file mode 100644 -index 000000000000..5394bfa7c63c +index 000000000..5394bfa7c --- /dev/null +++ b/drivers/media/platform/rockchip/tsp/Kconfig @@ -0,0 +1,12 @@ @@ -724487,7 +724488,7 @@ index 000000000000..5394bfa7c63c + diff --git a/drivers/media/platform/rockchip/tsp/Makefile b/drivers/media/platform/rockchip/tsp/Makefile new file mode 100644 -index 000000000000..ca555d0ef9e9 +index 000000000..ca555d0ef --- /dev/null +++ b/drivers/media/platform/rockchip/tsp/Makefile @@ -0,0 +1,6 @@ @@ -724499,7 +724500,7 @@ index 000000000000..ca555d0ef9e9 +obj-$(CONFIG_ROCKCHIP_TSP) += rockchip_tsp.o diff --git a/drivers/media/platform/rockchip/tsp/rockchip_tsp.c b/drivers/media/platform/rockchip/tsp/rockchip_tsp.c new file mode 100644 -index 000000000000..830147909eeb +index 000000000..830147909 --- /dev/null +++ b/drivers/media/platform/rockchip/tsp/rockchip_tsp.c @@ -0,0 +1,1182 @@ @@ -725687,7 +725688,7 @@ index 000000000000..830147909eeb +MODULE_ALIAS("platform:" MODE_NAME); diff --git a/drivers/media/platform/rockchip/tsp/rockchip_tsp.h b/drivers/media/platform/rockchip/tsp/rockchip_tsp.h new file mode 100644 -index 000000000000..bafe641cdf9f +index 000000000..bafe641cd --- /dev/null +++ b/drivers/media/platform/rockchip/tsp/rockchip_tsp.h @@ -0,0 +1,230 @@ @@ -725922,7 +725923,7 @@ index 000000000000..bafe641cdf9f + +#endif diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c -index bbd90123a4e7..ed06e7fcde1f 100644 +index bbd90123a..ed06e7fcd 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -14,6 +14,7 @@ @@ -725947,7 +725948,7 @@ index bbd90123a4e7..ed06e7fcde1f 100644 error: diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c -index 28dde08ec6c5..59c07eb34e0b 100644 +index 28dde08ec..59c07eb34 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -23,6 +23,7 @@ @@ -725982,7 +725983,7 @@ index 28dde08ec6c5..59c07eb34e0b 100644 + rockchip_clear_system_status(SYS_STATUS_PERFORMANCE); } diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c -index 8cfd593d293d..8223769b7ecc 100644 +index 8cfd593d2..8223769b7 100644 --- a/drivers/media/v4l2-core/v4l2-async.c +++ b/drivers/media/v4l2-core/v4l2-async.c @@ -616,6 +616,58 @@ static int __v4l2_async_nf_register(struct v4l2_async_notifier *notifier) @@ -726142,7 +726143,7 @@ index 8cfd593d293d..8223769b7ecc 100644 v4l2_async_connection_unique(struct v4l2_subdev *sd) { diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig -index 68d71b4b55bd..2da458bd3c55 100644 +index 68d71b4b5..2da458bd3 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -1220,6 +1220,99 @@ config MFD_RC5T583 @@ -726246,7 +726247,7 @@ index 68d71b4b55bd..2da458bd3c55 100644 tristate select MFD_CORE diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile -index c66f07edcd0e..9f76f965ab13 100644 +index c66f07edc..9f76f965a 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -221,6 +221,16 @@ obj-$(CONFIG_MFD_PALMAS) += palmas.o @@ -726268,7 +726269,7 @@ index c66f07edcd0e..9f76f965ab13 100644 obj-$(CONFIG_MFD_RK8XX_SPI) += rk8xx-spi.o diff --git a/drivers/mfd/rk1000-core.c b/drivers/mfd/rk1000-core.c new file mode 100644 -index 000000000000..987b9f2b51e0 +index 000000000..987b9f2b5 --- /dev/null +++ b/drivers/mfd/rk1000-core.c @@ -0,0 +1,175 @@ @@ -726449,7 +726450,7 @@ index 000000000000..987b9f2b51e0 +MODULE_LICENSE("GPL"); diff --git a/drivers/mfd/rk618.c b/drivers/mfd/rk618.c new file mode 100644 -index 000000000000..ac7d5d38a097 +index 000000000..ac7d5d38a --- /dev/null +++ b/drivers/mfd/rk618.c @@ -0,0 +1,232 @@ @@ -726687,7 +726688,7 @@ index 000000000000..ac7d5d38a097 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/mfd/rk628.c b/drivers/mfd/rk628.c new file mode 100644 -index 000000000000..733442fd286a +index 000000000..733442fd2 --- /dev/null +++ b/drivers/mfd/rk628.c @@ -0,0 +1,482 @@ @@ -727175,7 +727176,7 @@ index 000000000000..733442fd286a +MODULE_LICENSE("GPL v2"); diff --git a/drivers/mfd/rk630-i2c.c b/drivers/mfd/rk630-i2c.c new file mode 100644 -index 000000000000..9636458e137a +index 000000000..9636458e1 --- /dev/null +++ b/drivers/mfd/rk630-i2c.c @@ -0,0 +1,88 @@ @@ -727269,7 +727270,7 @@ index 000000000000..9636458e137a +MODULE_LICENSE("GPL v2"); diff --git a/drivers/mfd/rk630-spi.c b/drivers/mfd/rk630-spi.c new file mode 100644 -index 000000000000..b12843c583de +index 000000000..b12843c58 --- /dev/null +++ b/drivers/mfd/rk630-spi.c @@ -0,0 +1,259 @@ @@ -727534,7 +727535,7 @@ index 000000000000..b12843c583de +MODULE_LICENSE("GPL v2"); diff --git a/drivers/mfd/rk630.c b/drivers/mfd/rk630.c new file mode 100644 -index 000000000000..b8b853826d53 +index 000000000..b8b853826 --- /dev/null +++ b/drivers/mfd/rk630.c @@ -0,0 +1,292 @@ @@ -727832,7 +727833,7 @@ index 000000000000..b8b853826d53 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/mfd/rk806-core.c b/drivers/mfd/rk806-core.c new file mode 100644 -index 000000000000..1ab83fbf397c +index 000000000..1ab83fbf3 --- /dev/null +++ b/drivers/mfd/rk806-core.c @@ -0,0 +1,836 @@ @@ -728674,7 +728675,7 @@ index 000000000000..1ab83fbf397c +MODULE_LICENSE("GPL v2"); diff --git a/drivers/mfd/rk806-i2c.c b/drivers/mfd/rk806-i2c.c new file mode 100644 -index 000000000000..3627af87a4eb +index 000000000..3627af87a --- /dev/null +++ b/drivers/mfd/rk806-i2c.c @@ -0,0 +1,60 @@ @@ -728740,7 +728741,7 @@ index 000000000000..3627af87a4eb +MODULE_LICENSE("GPL"); diff --git a/drivers/mfd/rk806-spi.c b/drivers/mfd/rk806-spi.c new file mode 100644 -index 000000000000..c1053078558a +index 000000000..c10530785 --- /dev/null +++ b/drivers/mfd/rk806-spi.c @@ -0,0 +1,134 @@ @@ -728880,7 +728881,7 @@ index 000000000000..c1053078558a +MODULE_LICENSE("GPL v2"); diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c new file mode 100644 -index 000000000000..cbeb67a08d15 +index 000000000..cbeb67a08 --- /dev/null +++ b/drivers/mfd/rk808.c @@ -0,0 +1,1629 @@ @@ -730514,7 +730515,7 @@ index 000000000000..cbeb67a08d15 +MODULE_AUTHOR("Wadim Egorov "); +MODULE_DESCRIPTION("RK808/RK818 PMIC driver"); diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c -index 32d49100dff5..50b41a23e5a2 100644 +index 32d49100d..50b41a23e 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -3002,6 +3002,9 @@ static void mmc_blk_remove_debugfs(struct mmc_card *card, @@ -730553,7 +730554,7 @@ index 32d49100dff5..50b41a23e5a2 100644 pm_runtime_get_sync(&card->dev); if (md->part_curr != md->part_type) { diff --git a/drivers/mmc/core/block.h b/drivers/mmc/core/block.h -index 31153f656f41..0ce5d97d49d9 100644 +index 31153f656..0ce5d97d4 100644 --- a/drivers/mmc/core/block.h +++ b/drivers/mmc/core/block.h @@ -17,4 +17,6 @@ struct work_struct; @@ -730564,7 +730565,7 @@ index 31153f656f41..0ce5d97d49d9 100644 + #endif diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile -index a693fa3d3f1c..d16a6e7b5ad3 100644 +index a693fa3d3..d16a6e7b5 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -55,6 +55,7 @@ obj-$(CONFIG_MMC_DW_K3) += dw_mmc-k3.o @@ -730577,7 +730578,7 @@ index a693fa3d3f1c..d16a6e7b5ad3 100644 obj-$(CONFIG_MMC_VUB300) += vub300.o diff --git a/drivers/mmc/host/rk_sdmmc.h b/drivers/mmc/host/rk_sdmmc.h new file mode 100644 -index 000000000000..cad989246002 +index 000000000..cad989246 --- /dev/null +++ b/drivers/mmc/host/rk_sdmmc.h @@ -0,0 +1,387 @@ @@ -730970,7 +730971,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 100644 -index 000000000000..d0ef613ae60e +index 000000000..d0ef613ae --- /dev/null +++ b/drivers/mmc/host/rk_sdmmc_ops.c @@ -0,0 +1,208 @@ @@ -731184,7 +731185,7 @@ index 000000000000..d0ef613ae60e +MODULE_LICENSE("GPL"); diff --git a/drivers/mmc/host/rk_sdmmc_ops.h b/drivers/mmc/host/rk_sdmmc_ops.h new file mode 100644 -index 000000000000..81890ab6a94e +index 000000000..81890ab6a --- /dev/null +++ b/drivers/mmc/host/rk_sdmmc_ops.h @@ -0,0 +1,11 @@ @@ -731201,7 +731202,7 @@ index 000000000000..81890ab6a94e +#endif diff --git a/drivers/mtd/rknand/Kconfig b/drivers/mtd/rknand/Kconfig new file mode 100644 -index 000000000000..0abd524a6feb +index 000000000..0abd524a6 --- /dev/null +++ b/drivers/mtd/rknand/Kconfig @@ -0,0 +1,47 @@ @@ -731254,7 +731255,7 @@ index 000000000000..0abd524a6feb + diff --git a/drivers/mtd/rknand/Makefile b/drivers/mtd/rknand/Makefile new file mode 100644 -index 000000000000..5ddcdf1a7c28 +index 000000000..5ddcdf1a7 --- /dev/null +++ b/drivers/mtd/rknand/Makefile @@ -0,0 +1,9 @@ @@ -731269,7 +731270,7 @@ index 000000000000..5ddcdf1a7c28 + diff --git a/drivers/mtd/rknand/api_flash.h b/drivers/mtd/rknand/api_flash.h new file mode 100644 -index 000000000000..3ca267b1146e +index 000000000..3ca267b11 --- /dev/null +++ b/drivers/mtd/rknand/api_flash.h @@ -0,0 +1,203 @@ @@ -731478,7 +731479,7 @@ index 000000000000..3ca267b1146e +#endif diff --git a/drivers/mtd/rknand/rknand_base.h b/drivers/mtd/rknand/rknand_base.h new file mode 100644 -index 000000000000..6460e9eace46 +index 000000000..6460e9eac --- /dev/null +++ b/drivers/mtd/rknand/rknand_base.h @@ -0,0 +1,93 @@ @@ -731577,7 +731578,7 @@ index 000000000000..6460e9eace46 +#endif diff --git a/drivers/mtd/rknand/rknand_base_ko.c b/drivers/mtd/rknand/rknand_base_ko.c new file mode 100644 -index 000000000000..5a462b76dc42 +index 000000000..5a462b76d --- /dev/null +++ b/drivers/mtd/rknand/rknand_base_ko.c @@ -0,0 +1,699 @@ @@ -732281,7 +732282,7 @@ index 000000000000..5a462b76dc42 + + diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig -index f8cde9f9f554..5d7ace2e5883 100644 +index f8cde9f9f..5d7ace2e5 100644 --- a/drivers/net/can/Kconfig +++ b/drivers/net/can/Kconfig @@ -222,6 +222,7 @@ source "drivers/net/can/m_can/Kconfig" @@ -732293,7 +732294,7 @@ index f8cde9f9f554..5d7ace2e5883 100644 source "drivers/net/can/softing/Kconfig" source "drivers/net/can/spi/Kconfig" diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile -index ff8f76295d13..5140da19fc95 100644 +index ff8f76295..5140da19f 100644 --- a/drivers/net/can/Makefile +++ b/drivers/net/can/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_CAN_SLCAN) += slcan/ @@ -732306,7 +732307,7 @@ index ff8f76295d13..5140da19fc95 100644 obj-y += softing/ diff --git a/drivers/net/can/rockchip/Kconfig b/drivers/net/can/rockchip/Kconfig new file mode 100644 -index 000000000000..97d9bec19cf1 +index 000000000..97d9bec19 --- /dev/null +++ b/drivers/net/can/rockchip/Kconfig @@ -0,0 +1,18 @@ @@ -732330,7 +732331,7 @@ index 000000000000..97d9bec19cf1 + be called rockchip_canfd. diff --git a/drivers/net/can/rockchip/Makefile b/drivers/net/can/rockchip/Makefile new file mode 100644 -index 000000000000..08c3ba52e603 +index 000000000..08c3ba52e --- /dev/null +++ b/drivers/net/can/rockchip/Makefile @@ -0,0 +1,7 @@ @@ -732343,7 +732344,7 @@ index 000000000000..08c3ba52e603 +obj-$(CONFIG_CANFD_ROCKCHIP) += rockchip_canfd.o diff --git a/drivers/net/can/rockchip/rockchip_can.c b/drivers/net/can/rockchip/rockchip_can.c new file mode 100644 -index 000000000000..29b5fbedf994 +index 000000000..29b5fbedf --- /dev/null +++ b/drivers/net/can/rockchip/rockchip_can.c @@ -0,0 +1,813 @@ @@ -733162,7 +733163,7 @@ index 000000000000..29b5fbedf994 +MODULE_DESCRIPTION("Rockchip CAN Drivers"); diff --git a/drivers/net/can/rockchip/rockchip_canfd.c b/drivers/net/can/rockchip/rockchip_canfd.c new file mode 100644 -index 000000000000..dba7f14c45f3 +index 000000000..dba7f14c4 --- /dev/null +++ b/drivers/net/can/rockchip/rockchip_canfd.c @@ -0,0 +1,1226 @@ @@ -734393,7 +734394,7 @@ index 000000000000..dba7f14c45f3 +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Rockchip CANFD Drivers"); diff --git a/drivers/net/ethernet/arc/emac.h b/drivers/net/ethernet/arc/emac.h -index 0e244f0e25fd..d820ae03a966 100644 +index 0e244f0e2..d820ae03a 100644 --- a/drivers/net/ethernet/arc/emac.h +++ b/drivers/net/ethernet/arc/emac.h @@ -220,6 +220,6 @@ static inline void arc_reg_clr(struct arc_emac_priv *priv, int reg, int mask) @@ -734405,7 +734406,7 @@ index 0e244f0e25fd..d820ae03a966 100644 #endif /* ARC_EMAC_H */ diff --git a/drivers/net/ethernet/arc/emac_arc.c b/drivers/net/ethernet/arc/emac_arc.c -index ce3147e886a1..800620b8f10d 100644 +index ce3147e88..800620b8f 100644 --- a/drivers/net/ethernet/arc/emac_arc.c +++ b/drivers/net/ethernet/arc/emac_arc.c @@ -61,11 +61,11 @@ static int emac_arc_probe(struct platform_device *pdev) @@ -734424,7 +734425,7 @@ index ce3147e886a1..800620b8f10d 100644 static const struct of_device_id emac_arc_dt_ids[] = { diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c -index 31ee477dd131..b8e503e34a1a 100644 +index 31ee477dd..b8e503e34 100644 --- a/drivers/net/ethernet/arc/emac_main.c +++ b/drivers/net/ethernet/arc/emac_main.c @@ -20,6 +20,7 @@ @@ -734581,7 +734582,7 @@ index 31ee477dd131..b8e503e34a1a 100644 EXPORT_SYMBOL_GPL(arc_emac_remove); diff --git a/drivers/net/ethernet/arc/emac_rockchip.c b/drivers/net/ethernet/arc/emac_rockchip.c -index 509101112279..1c9ca3bcb871 100644 +index 509101112..1c9ca3bcb 100644 --- a/drivers/net/ethernet/arc/emac_rockchip.c +++ b/drivers/net/ethernet/arc/emac_rockchip.c @@ -248,8 +248,9 @@ static int emac_rockchip_remove(struct platform_device *pdev) @@ -734605,7 +734606,7 @@ index 509101112279..1c9ca3bcb871 100644 static struct platform_driver emac_rockchip_driver = { diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig -index 25f2d42de406..791e32f8c52d 100644 +index 25f2d42de..791e32f8c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig @@ -25,6 +25,26 @@ config STMMAC_SELFTESTS @@ -734653,7 +734654,7 @@ index 25f2d42de406..791e32f8c52d 100644 tristate "SOCFPGA dwmac support" default ARCH_INTEL_SOCFPGA diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile -index 5b57aee19267..3a4fe1cd914a 100644 +index 5b57aee19..3a4fe1cd9 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Makefile +++ b/drivers/net/ethernet/stmicro/stmmac/Makefile @@ -1,15 +1,19 @@ @@ -734694,7 +734695,7 @@ index 5b57aee19267..3a4fe1cd914a 100644 obj-$(CONFIG_DWMAC_STARFIVE) += dwmac-starfive.o obj-$(CONFIG_DWMAC_STI) += dwmac-sti.o diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h -index b0dd8adce356..9695e94213b9 100644 +index b0dd8adce..9695e9421 100644 --- a/drivers/net/ethernet/stmicro/stmmac/common.h +++ b/drivers/net/ethernet/stmicro/stmmac/common.h @@ -50,10 +50,18 @@ @@ -734718,7 +734719,7 @@ index b0dd8adce356..9695e94213b9 100644 #undef FRAME_FILTER_DEBUG diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.c new file mode 100644 -index 000000000000..bf6281438af8 +index 000000000..bf6281438 --- /dev/null +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.c @@ -0,0 +1,1606 @@ @@ -736330,7 +736331,7 @@ index 000000000000..bf6281438af8 +} diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.h b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.h new file mode 100644 -index 000000000000..5b87c27af62c +index 000000000..5b87c27af --- /dev/null +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk-tool.h @@ -0,0 +1,37 @@ @@ -736372,7 +736373,7 @@ index 000000000000..5b87c27af62c +#endif /* __DWMAC_RK_TOOL_H__ */ + diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c -index d920a50dd16c..f121c1b18cc2 100644 +index d920a50dd..f121c1b18 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -11,52 +11,42 @@ @@ -738492,7 +738493,7 @@ index d920a50dd16c..f121c1b18cc2 100644 }; MODULE_DEVICE_TABLE(of, rk_gmac_dwmac_match); diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c -index c6ff1fa0e04d..4493d23ea693 100644 +index c6ff1fa0e..4493d23ea 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c @@ -1134,6 +1134,7 @@ static int dwmac4_config_l4_filter(struct mac_device_info *hw, u32 filter_no, @@ -738550,7 +738551,7 @@ index c6ff1fa0e04d..4493d23ea693 100644 static u32 dwmac4_get_num_vlan(void __iomem *ioaddr) { diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.c b/drivers/net/ethernet/stmicro/stmmac/hwif.c -index b8ba8f2d8041..44f55e65b18a 100644 +index b8ba8f2d8..44f55e65b 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.c +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.c @@ -35,6 +35,7 @@ static u32 stmmac_get_dev_id(struct stmmac_priv *priv, u32 id_reg) @@ -738614,7 +738615,7 @@ index b8ba8f2d8041..44f55e65b18a 100644 int stmmac_hwif_init(struct stmmac_priv *priv) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h -index b8c93b881a65..a80dcb7ca93f 100644 +index b8c93b881..a80dcb7ca 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -345,7 +345,14 @@ int stmmac_mdio_unregister(struct net_device *ndev); @@ -738633,7 +738634,7 @@ index b8c93b881a65..a80dcb7ca93f 100644 int stmmac_init_tstamp_counter(struct stmmac_priv *priv, u32 systime_flags); void stmmac_ptp_register(struct stmmac_priv *priv); diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c -index 521b1b5ffebb..c2829dbf4ae5 100644 +index 521b1b5ff..c2829dbf4 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c @@ -412,6 +412,11 @@ stmmac_ethtool_set_link_ksettings(struct net_device *dev, @@ -738649,7 +738650,7 @@ index 521b1b5ffebb..c2829dbf4ae5 100644 } diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -index d1adb102a1d4..556f29f05f65 100644 +index d1adb102a..556f29f05 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -147,6 +147,14 @@ static void stmmac_exit_fs(struct net_device *dev); @@ -738946,7 +738947,7 @@ index d1adb102a1d4..556f29f05f65 100644 if (!(priv->plat->flags & STMMAC_FLAG_SERDES_UP_AFTER_PHY_LINKUP) && diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c -index 30d5e635190e..ff2061b57247 100644 +index 30d5e6351..ff2061b57 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -464,6 +464,9 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) @@ -738979,7 +738980,7 @@ index 30d5e635190e..ff2061b57247 100644 ret = plat->pclk; goto error_pclk_get; diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c -index 7b3739b29c8f..94c612da7943 100644 +index 7b3739b29..94c612da7 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c @@ -663,8 +663,10 @@ static const struct usb_device_id products [] = { @@ -738994,7 +738995,7 @@ index 7b3739b29c8f..94c612da7943 100644 /* Novatel Verizon USB730L */ USB_INTERFACE_INFO(USB_CLASS_MISC, 4, 1), diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig -index 7555af5195ec..c7d58118b7d7 100644 +index 7555af519..c7d58118b 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -31,6 +31,7 @@ source "drivers/net/wireless/microchip/Kconfig" @@ -739006,7 +739007,7 @@ index 7555af5195ec..c7d58118b7d7 100644 source "drivers/net/wireless/silabs/Kconfig" source "drivers/net/wireless/st/Kconfig" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile -index 4d7374d567d1..f578d32a7cea 100644 +index 4d7374d56..f578d32a7 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -23,5 +23,6 @@ obj-$(CONFIG_WLAN_VENDOR_ST) += st/ @@ -739018,7 +739019,7 @@ index 4d7374d567d1..f578d32a7cea 100644 obj-$(CONFIG_WLAN) += virtual/ diff --git a/drivers/net/wireless/rockchip_wlan/Kconfig b/drivers/net/wireless/rockchip_wlan/Kconfig new file mode 100644 -index 000000000000..d77741df5cc0 +index 000000000..d77741df5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/Kconfig @@ -0,0 +1,39 @@ @@ -739063,7 +739064,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 100644 -index 000000000000..8279a393719f +index 000000000..8279a3937 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/Makefile @@ -0,0 +1,3 @@ @@ -739072,7 +739073,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 100644 -index 000000000000..edd10241a09a +index 000000000..edd10241a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/Kconfig @@ -0,0 +1,32 @@ @@ -739110,7 +739111,7 @@ index 000000000000..edd10241a09a + default to add wlan1 interface diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/Makefile b/drivers/net/wireless/rockchip_wlan/rkwifi/Makefile new file mode 100644 -index 000000000000..e4e2c6964a6b +index 000000000..e4e2c6964 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/Makefile @@ -0,0 +1,10 @@ @@ -739126,7 +739127,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..cb1fe701533a +index 000000000..cb1fe7015 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Kconfig @@ -0,0 +1,82 @@ @@ -739214,7 +739215,7 @@ index 000000000000..cb1fe701533a +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..328afa7aefa2 +index 000000000..328afa7ae --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/Makefile @@ -0,0 +1,501 @@ @@ -739721,7 +739722,7 @@ index 000000000000..328afa7aefa2 + Module.symvers modules.order .tmp_versions modules.builtin diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/aiutils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/aiutils.c new file mode 100755 -index 000000000000..c3cb8bc2c062 +index 000000000..c3cb8bc2c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/aiutils.c @@ -0,0 +1,2607 @@ @@ -742334,7 +742335,7 @@ index 000000000000..c3cb8bc2c062 +#endif /* DONGLEBUILD */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcm_app_utils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcm_app_utils.c new file mode 100755 -index 000000000000..7f8d553b9988 +index 000000000..7f8d553b9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcm_app_utils.c @@ -0,0 +1,1252 @@ @@ -743592,7 +743593,7 @@ index 000000000000..7f8d553b9988 +} 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..a062531413b9 +index 000000000..a06253141 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmbloom.c @@ -0,0 +1,232 @@ @@ -743830,7 +743831,7 @@ index 000000000000..a062531413b9 +} 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..25054456f58e +index 000000000..25054456f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmevent.c @@ -0,0 +1,449 @@ @@ -744285,7 +744286,7 @@ index 000000000000..25054456f58e +} 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..f22350c030c2 +index 000000000..f22350c03 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh.c @@ -0,0 +1,946 @@ @@ -745237,7 +745238,7 @@ index 000000000000..f22350c030c2 +#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..88bf3469a547 +index 000000000..88bf3469a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_linux.c @@ -0,0 +1,579 @@ @@ -745822,7 +745823,7 @@ index 000000000000..88bf3469a547 +#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..7f7362c97bf1 +index 000000000..7f7362c97 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc.c @@ -0,0 +1,2079 @@ @@ -747907,7 +747908,7 @@ index 000000000000..7f7362c97bf1 +} 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..a386b836cc57 +index 000000000..a386b836c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdh_sdmmc_linux.c @@ -0,0 +1,396 @@ @@ -748309,7 +748310,7 @@ index 000000000000..a386b836cc57 +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdstd.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdstd.c new file mode 100755 -index 000000000000..7783751d7ad5 +index 000000000..7783751d7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdstd.c @@ -0,0 +1,5308 @@ @@ -753623,7 +753624,7 @@ index 000000000000..7783751d7ad5 +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdstd.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdstd.h new file mode 100755 -index 000000000000..de742ed544a9 +index 000000000..de742ed54 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdstd.h @@ -0,0 +1,298 @@ @@ -753927,7 +753928,7 @@ index 000000000000..de742ed544a9 +#endif /* _BCM_SD_STD_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdstd_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdstd_linux.c new file mode 100755 -index 000000000000..11d3f09f37d6 +index 000000000..11d3f09f3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmsdstd_linux.c @@ -0,0 +1,697 @@ @@ -754630,7 +754631,7 @@ index 000000000000..11d3f09f37d6 +} 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..5a21d7c2f0fc +index 000000000..5a21d7c2f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmstdlib_s.c @@ -0,0 +1,305 @@ @@ -754941,7 +754942,7 @@ index 000000000000..5a21d7c2f0fc +} 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..6231b4b8f1f3 +index 000000000..6231b4b8f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmutils.c @@ -0,0 +1,6509 @@ @@ -761456,7 +761457,7 @@ index 000000000000..6231b4b8f1f3 +} 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..9333915ea703 +index 000000000..9333915ea --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_channels.c @@ -0,0 +1,3333 @@ @@ -764795,7 +764796,7 @@ index 000000000000..9333915ea703 +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_radiotap.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_radiotap.c new file mode 100755 -index 000000000000..acdb551fc046 +index 000000000..acdb551fc --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmwifi_radiotap.c @@ -0,0 +1,1035 @@ @@ -765836,7 +765837,7 @@ index 000000000000..acdb551fc046 +} 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..33d02ae6a3c8 +index 000000000..33d02ae6a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/bcmxtlv.c @@ -0,0 +1,644 @@ @@ -766486,7 +766487,7 @@ index 000000000000..33d02ae6a3c8 +} 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..9b65c3c04ab8 +index 000000000..9b65c3c04 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus.c @@ -0,0 +1,3516 @@ @@ -770008,7 +770009,7 @@ index 000000000000..9b65c3c04ab8 +#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..28cf3f092f1c +index 000000000..28cf3f092 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb.c @@ -0,0 +1,1088 @@ @@ -771102,7 +771103,7 @@ index 000000000000..28cf3f092f1c +#endif /* BCM_DNGL_EMBEDIMAGE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb_linux.c new file mode 100755 -index 000000000000..f113d5b8d6c5 +index 000000000..f113d5b8d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dbus_usb_linux.c @@ -0,0 +1,4807 @@ @@ -775915,7 +775916,7 @@ index 000000000000..f113d5b8d6c5 +#endif /* LINUX */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd.h new file mode 100755 -index 000000000000..923697417e42 +index 000000000..923697417 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd.h @@ -0,0 +1,4772 @@ @@ -780693,7 +780694,7 @@ index 000000000000..923697417e42 +#endif /* _dhd_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bitpack.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bitpack.h new file mode 100755 -index 000000000000..8332fb790a78 +index 000000000..8332fb790 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bitpack.h @@ -0,0 +1,33 @@ @@ -780732,7 +780733,7 @@ index 000000000000..8332fb790a78 +#endif /* __BITPACK_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bus.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bus.h new file mode 100755 -index 000000000000..e5067ea47a13 +index 000000000..e5067ea47 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_bus.h @@ -0,0 +1,432 @@ @@ -781170,7 +781171,7 @@ index 000000000000..e5067ea47a13 +#endif /* _dhd_bus_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ccode.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ccode.c new file mode 100755 -index 000000000000..90d6deaf9986 +index 000000000..90d6deaf9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ccode.c @@ -0,0 +1,276 @@ @@ -781452,7 +781453,7 @@ index 000000000000..90d6deaf9986 +#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..668d11389e56 +index 000000000..668d11389 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cdc.c @@ -0,0 +1,994 @@ @@ -782452,7 +782453,7 @@ index 000000000000..668d11389e56 +} 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..370510189ffe +index 000000000..370510189 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.c @@ -0,0 +1,615 @@ @@ -783073,7 +783074,7 @@ index 000000000000..370510189ffe +#endif /* RPM_FAST_TRIGGER */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.h new file mode 100755 -index 000000000000..ae24bce5503c +index 000000000..ae24bce55 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_cfg80211.h @@ -0,0 +1,53 @@ @@ -783132,7 +783133,7 @@ index 000000000000..ae24bce5503c +#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..ed4c32cd3ef8 +index 000000000..ed4c32cd3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_common.c @@ -0,0 +1,12014 @@ @@ -795152,7 +795153,7 @@ index 000000000000..ed4c32cd3ef8 +} 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..c1b93fac5f8e +index 000000000..c1b93fac5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.c @@ -0,0 +1,5653 @@ @@ -800811,7 +800812,7 @@ index 000000000000..c1b93fac5f8e +} 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..a6412a818bd3 +index 000000000..a6412a818 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_config.h @@ -0,0 +1,466 @@ @@ -801283,7 +801284,7 @@ index 000000000000..a6412a818bd3 +#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..aa243a3c2aa5 +index 000000000..aa243a3c2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.c @@ -0,0 +1,827 @@ @@ -802116,7 +802117,7 @@ index 000000000000..aa243a3c2aa5 +#endif /* CSI_SUPPORT */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.h new file mode 100755 -index 000000000000..02ee564f6572 +index 000000000..02ee564f6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_csi.h @@ -0,0 +1,466 @@ @@ -802588,7 +802589,7 @@ index 000000000000..02ee564f6572 +#endif /* __DHD_CSI_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_gpio.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_gpio.c new file mode 100755 -index 000000000000..21edfc12a9cb +index 000000000..21edfc12a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_gpio.c @@ -0,0 +1,490 @@ @@ -803084,7 +803085,7 @@ index 000000000000..21edfc12a9cb +} 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..070fc5695932 +index 000000000..070fc5695 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_hikey.c @@ -0,0 +1,342 @@ @@ -803432,7 +803433,7 @@ index 000000000000..070fc5695932 +#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..fac72fe11be3 +index 000000000..fac72fe11 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_custom_memprealloc.c @@ -0,0 +1,476 @@ @@ -803914,7 +803915,7 @@ index 000000000000..fac72fe11be3 +#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..cac6787a0066 +index 000000000..cac6787a0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg.h @@ -0,0 +1,573 @@ @@ -804493,7 +804494,7 @@ index 000000000000..cac6787a0066 +#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..b1c3d85c89fe +index 000000000..b1c3d85c8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.c @@ -0,0 +1,561 @@ @@ -805060,7 +805061,7 @@ index 000000000000..b1c3d85c89fe +} 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..cce8f15c64fc +index 000000000..cce8f15c6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_dbg_ring.h @@ -0,0 +1,158 @@ @@ -805224,7 +805225,7 @@ index 000000000000..cce8f15c64fc +#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..b99a6c5bf60f +index 000000000..b99a6c5bf --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.c @@ -0,0 +1,3666 @@ @@ -808896,7 +808897,7 @@ index 000000000000..b99a6c5bf60f +#endif /* DHD_DEBUGABILITY_LOG_DUMP_RING */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.h new file mode 100755 -index 000000000000..6631c9830950 +index 000000000..6631c9830 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug.h @@ -0,0 +1,943 @@ @@ -809845,7 +809846,7 @@ index 000000000000..6631c9830950 +#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..8f2f21a26815 +index 000000000..8f2f21a26 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_debug_linux.c @@ -0,0 +1,630 @@ @@ -810481,7 +810482,7 @@ index 000000000000..8f2f21a26815 +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_event_log_filter.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_event_log_filter.c new file mode 100755 -index 000000000000..b5417aece43d +index 000000000..b5417aece --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_event_log_filter.c @@ -0,0 +1,3258 @@ @@ -813745,7 +813746,7 @@ index 000000000000..b5417aece43d +#endif /* WLADPS_ENERGY_GAIN */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_event_log_filter.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_event_log_filter.h new file mode 100755 -index 000000000000..37612db18fe2 +index 000000000..37612db18 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_event_log_filter.h @@ -0,0 +1,56 @@ @@ -813807,7 +813808,7 @@ index 000000000000..37612db18fe2 +#endif /* !dhd_event_log_filter_h */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.c new file mode 100755 -index 000000000000..1b3b20c34f57 +index 000000000..1b3b20c34 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.c @@ -0,0 +1,1511 @@ @@ -815324,7 +815325,7 @@ index 000000000000..1b3b20c34f57 +} 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..1b1d1d0d20b9 +index 000000000..1b1d1d0d2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_flowring.h @@ -0,0 +1,310 @@ @@ -815640,7 +815641,7 @@ index 000000000000..1b1d1d0d20b9 +#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..05984a978a69 +index 000000000..05984a978 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_gpio.c @@ -0,0 +1,449 @@ @@ -816095,7 +816096,7 @@ index 000000000000..05984a978a69 +} 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..751a5c7b7220 +index 000000000..751a5c7b7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.c @@ -0,0 +1,1436 @@ @@ -817537,7 +817538,7 @@ index 000000000000..751a5c7b7220 +#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..efbf2d3f62a6 +index 000000000..efbf2d3f6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_ip.h @@ -0,0 +1,96 @@ @@ -817639,7 +817640,7 @@ index 000000000000..efbf2d3f62a6 +#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..639af0deb8fb +index 000000000..639af0deb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.c @@ -0,0 +1,24144 @@ @@ -841789,7 +841790,7 @@ index 000000000000..639af0deb8fb +#endif /* WLDWDS && FOURADDR_AUTO_BRG */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.h new file mode 100755 -index 000000000000..364aa8216201 +index 000000000..364aa8216 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux.h @@ -0,0 +1,609 @@ @@ -842404,7 +842405,7 @@ index 000000000000..364aa8216201 +#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..adc0efd6c2c2 +index 000000000..adc0efd6c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_exportfs.c @@ -0,0 +1,3290 @@ @@ -845700,7 +845701,7 @@ index 000000000000..adc0efd6c2c2 +#endif /* DHD_SUPPORT_HDM */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_lb.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_lb.c new file mode 100755 -index 000000000000..dfb5ab6edb89 +index 000000000..dfb5ab6ed --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_lb.c @@ -0,0 +1,1526 @@ @@ -847232,7 +847233,7 @@ index 000000000000..dfb5ab6edb89 +#endif /* SET_PCIE_IRQ_CPU_CORE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.c new file mode 100755 -index 000000000000..6a521cab9f94 +index 000000000..6a521cab9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.c @@ -0,0 +1,2006 @@ @@ -849244,7 +849245,7 @@ index 000000000000..6a521cab9f94 +#endif /* BCMPCIE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.h new file mode 100755 -index 000000000000..53a856f04f4c +index 000000000..53a856f04 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_pktdump.h @@ -0,0 +1,156 @@ @@ -849406,7 +849407,7 @@ index 000000000000..53a856f04f4c +#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..72a4f66877e2 +index 000000000..72a4f6687 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_platdev.c @@ -0,0 +1,1293 @@ @@ -850705,7 +850706,7 @@ index 000000000000..72a4f66877e2 +} 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..029217a885f4 +index 000000000..029217a88 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_priv.h @@ -0,0 +1,550 @@ @@ -851261,7 +851262,7 @@ index 000000000000..029217a885f4 +#endif /* __DHD_LINUX_PRIV_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_rx.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_rx.c new file mode 100755 -index 000000000000..7b5fda9e8d4c +index 000000000..7b5fda9e8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_rx.c @@ -0,0 +1,1691 @@ @@ -852958,7 +852959,7 @@ index 000000000000..7b5fda9e8d4c +#endif /* RX_PKT_POOL */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sched.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sched.c new file mode 100755 -index 000000000000..4735c4bda897 +index 000000000..4735c4bda --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sched.c @@ -0,0 +1,60 @@ @@ -853024,7 +853025,7 @@ index 000000000000..4735c4bda897 +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sock_qos.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sock_qos.h new file mode 100755 -index 000000000000..f6745d80c1c1 +index 000000000..f6745d80c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_sock_qos.h @@ -0,0 +1,76 @@ @@ -853106,7 +853107,7 @@ index 000000000000..f6745d80c1c1 +#endif /* _DHD_LINUX_TPA_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_tx.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_tx.c new file mode 100755 -index 000000000000..fc3b2e64bb07 +index 000000000..fc3b2e64b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_tx.c @@ -0,0 +1,1290 @@ @@ -854402,7 +854403,7 @@ index 000000000000..fc3b2e64bb07 +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_tx.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_tx.h new file mode 100755 -index 000000000000..1484f7b5c31b +index 000000000..1484f7b5c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_tx.h @@ -0,0 +1,49 @@ @@ -854457,7 +854458,7 @@ index 000000000000..1484f7b5c31b +#endif /* _dhd_linux_tx_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.c new file mode 100755 -index 000000000000..c642853ff081 +index 000000000..c642853ff --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.c @@ -0,0 +1,413 @@ @@ -854876,7 +854877,7 @@ index 000000000000..c642853ff081 +} 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..2c097e6c5753 +index 000000000..2c097e6c5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_linux_wq.h @@ -0,0 +1,88 @@ @@ -854970,7 +854971,7 @@ index 000000000000..2c097e6c5753 +#endif /* _dhd_linux_wq_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_log_dump.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_log_dump.c new file mode 100755 -index 000000000000..cb8fd58838df +index 000000000..cb8fd5883 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_log_dump.c @@ -0,0 +1,2480 @@ @@ -857456,7 +857457,7 @@ index 000000000000..cb8fd58838df +#endif /* DHD_LOG_DUMP */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_log_dump.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_log_dump.h new file mode 100755 -index 000000000000..8c42d3f4e010 +index 000000000..8c42d3f4e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_log_dump.h @@ -0,0 +1,402 @@ @@ -857864,7 +857865,7 @@ index 000000000000..8c42d3f4e010 +#endif /* !__DHD_LOG_DUMP_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.c new file mode 100755 -index 000000000000..167fa19e08fc +index 000000000..167fa19e0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.c @@ -0,0 +1,796 @@ @@ -858666,7 +858667,7 @@ index 000000000000..167fa19e08fc +#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..533b4ebd5119 +index 000000000..533b4ebd5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_mschdbg.h @@ -0,0 +1,36 @@ @@ -858708,7 +858709,7 @@ index 000000000000..533b4ebd5119 +#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..55773b2c9e13 +index 000000000..55773b2c9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_msgbuf.c @@ -0,0 +1,14788 @@ @@ -873502,7 +873503,7 @@ index 000000000000..55773b2c9e13 +#endif /* DHD_FLOW_RING_STATUS_TRACE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.c new file mode 100755 -index 000000000000..b6dbf528d27d +index 000000000..b6dbf528d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.c @@ -0,0 +1,18309 @@ @@ -891817,7 +891818,7 @@ index 000000000000..b6dbf528d27d +} 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..68a100912960 +index 000000000..68a100912 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie.h @@ -0,0 +1,940 @@ @@ -892763,7 +892764,7 @@ index 000000000000..68a100912960 +#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..db604d27462d +index 000000000..db604d274 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pcie_linux.c @@ -0,0 +1,3114 @@ @@ -895883,7 +895884,7 @@ index 000000000000..db604d27462d +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pktlog.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pktlog.c new file mode 100755 -index 000000000000..f6d240d9884f +index 000000000..f6d240d98 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pktlog.c @@ -0,0 +1,2047 @@ @@ -897936,7 +897937,7 @@ index 000000000000..f6d240d9884f +#endif /* DHD_PKT_LOGGING */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pktlog.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pktlog.h new file mode 100755 -index 000000000000..f4f9f26681f6 +index 000000000..f4f9f2668 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pktlog.h @@ -0,0 +1,325 @@ @@ -898267,7 +898268,7 @@ index 000000000000..f4f9f26681f6 +#endif /* __DHD_PKTLOG_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_plat.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_plat.h new file mode 100755 -index 000000000000..ec19a28efc78 +index 000000000..ec19a28ef --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_plat.h @@ -0,0 +1,103 @@ @@ -898376,7 +898377,7 @@ index 000000000000..ec19a28efc78 +#endif /* __DHD_PLAT_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.c new file mode 100755 -index 000000000000..cfd7e4e01b2a +index 000000000..cfd7e4e01 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.c @@ -0,0 +1,4905 @@ @@ -903287,7 +903288,7 @@ index 000000000000..cfd7e4e01b2a +#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..bec41c3ea325 +index 000000000..bec41c3ea --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_pno.h @@ -0,0 +1,581 @@ @@ -903874,7 +903875,7 @@ index 000000000000..bec41c3ea325 +#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..6241da7dc067 +index 000000000..6241da7dc --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_proto.h @@ -0,0 +1,272 @@ @@ -904152,7 +904153,7 @@ index 000000000000..6241da7dc067 +#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..d3bcbdf3fe58 +index 000000000..d3bcbdf3f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.c @@ -0,0 +1,5560 @@ @@ -909718,7 +909719,7 @@ index 000000000000..d3bcbdf3fe58 +} 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..6fb3500771d7 +index 000000000..6fb350077 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_rtt.h @@ -0,0 +1,563 @@ @@ -910287,7 +910288,7 @@ index 000000000000..6fb3500771d7 +#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..b0fd358e7b04 +index 000000000..b0fd358e7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_sdio.c @@ -0,0 +1,12428 @@ @@ -922721,7 +922722,7 @@ index 000000000000..b0fd358e7b04 +} 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..edb2a4a92fa6 +index 000000000..edb2a4a92 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_static_buf.c @@ -0,0 +1,654 @@ @@ -923381,7 +923382,7 @@ index 000000000000..edb2a4a92fa6 +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_statlog.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_statlog.c new file mode 100755 -index 000000000000..396cbcd0edf6 +index 000000000..396cbcd0e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_statlog.c @@ -0,0 +1,1081 @@ @@ -924468,7 +924469,7 @@ index 000000000000..396cbcd0edf6 +#endif /* DHD_STATUS_LOGGING */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_statlog.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_statlog.h new file mode 100755 -index 000000000000..04e7340fef8f +index 000000000..04e7340fe --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_statlog.h @@ -0,0 +1,221 @@ @@ -924695,7 +924696,7 @@ index 000000000000..04e7340fef8f +#endif /* __DHD_STATLOG_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.c new file mode 100755 -index 000000000000..a27156026ff1 +index 000000000..a27156026 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.c @@ -0,0 +1,4783 @@ @@ -929484,7 +929485,7 @@ index 000000000000..a27156026ff1 +#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..aac58fe89e03 +index 000000000..aac58fe89 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/dhd_wlfc.h @@ -0,0 +1,585 @@ @@ -930075,7 +930076,7 @@ index 000000000000..aac58fe89e03 +#endif /* __wlfc_host_driver_definitions_h__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.c new file mode 100755 -index 000000000000..e11b78a27d16 +index 000000000..e11b78a27 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/frag.c @@ -0,0 +1,183 @@ @@ -930264,7 +930265,7 @@ index 000000000000..e11b78a27d16 +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/fwpkg_utils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/fwpkg_utils.c new file mode 100755 -index 000000000000..0855780562c5 +index 000000000..085578056 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/fwpkg_utils.c @@ -0,0 +1,391 @@ @@ -930661,7 +930662,7 @@ index 000000000000..0855780562c5 +} 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..57a330d735ec +index 000000000..57a330d73 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktpool.c @@ -0,0 +1,2341 @@ @@ -933008,7 +933009,7 @@ index 000000000000..57a330d735ec +#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..2248c57c74fa +index 000000000..2248c57c7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hnd_pktq.c @@ -0,0 +1,1650 @@ @@ -934664,7 +934665,7 @@ index 000000000000..2248c57c74fa +#endif /* HND_PKTQ_THREAD_SAFE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndpmu.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndpmu.c new file mode 100755 -index 000000000000..d8b0c954a91e +index 000000000..d8b0c954a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/hndpmu.c @@ -0,0 +1,9955 @@ @@ -944625,7 +944626,7 @@ index 000000000000..d8b0c954a91e +} 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..3404aac0a397 +index 000000000..3404aac0a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11.h @@ -0,0 +1,2489 @@ @@ -947120,7 +947121,7 @@ index 000000000000..3404aac0a397 +#endif /* _802_11_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11ac.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11ac.h new file mode 100755 -index 000000000000..8d40684ace42 +index 000000000..8d40684ac --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11ac.h @@ -0,0 +1,487 @@ @@ -947613,7 +947614,7 @@ index 000000000000..8d40684ace42 +#endif /* _802_11ac_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11ah.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11ah.h new file mode 100755 -index 000000000000..6e30f3a21218 +index 000000000..6e30f3a21 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11ah.h @@ -0,0 +1,281 @@ @@ -947900,7 +947901,7 @@ index 000000000000..6e30f3a21218 +#endif /* _802_11ah_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11ax.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11ax.h new file mode 100755 -index 000000000000..15672ade9e34 +index 000000000..15672ade9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11ax.h @@ -0,0 +1,1201 @@ @@ -949107,7 +949108,7 @@ index 000000000000..15672ade9e34 +#endif /* _802_11ax_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11az.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11az.h new file mode 100755 -index 000000000000..d9fdf0e3ab61 +index 000000000..d9fdf0e3a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11az.h @@ -0,0 +1,637 @@ @@ -949750,7 +949751,7 @@ index 000000000000..d9fdf0e3ab61 +#endif /* _802_11az_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11brcm.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11brcm.h new file mode 100755 -index 000000000000..040d1c25a1d0 +index 000000000..040d1c25a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11brcm.h @@ -0,0 +1,348 @@ @@ -950104,7 +950105,7 @@ index 000000000000..040d1c25a1d0 +#endif /* _802_11brcm_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11cust.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11cust.h new file mode 100755 -index 000000000000..7cbe2fc4f6ba +index 000000000..7cbe2fc4f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11cust.h @@ -0,0 +1,76 @@ @@ -950186,7 +950187,7 @@ index 000000000000..7cbe2fc4f6ba +#endif /* _802_11cust_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11k.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11k.h new file mode 100755 -index 000000000000..7439c8206dca +index 000000000..7439c8206 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11k.h @@ -0,0 +1,928 @@ @@ -951120,7 +951121,7 @@ index 000000000000..7439c8206dca +#endif /* _802_11k_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11n.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11n.h new file mode 100755 -index 000000000000..e86dd0f644e1 +index 000000000..e86dd0f64 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11n.h @@ -0,0 +1,384 @@ @@ -951510,7 +951511,7 @@ index 000000000000..e86dd0f644e1 +#endif /* _802_11n_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11owe.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11owe.h new file mode 100755 -index 000000000000..2af77fbef570 +index 000000000..2af77fbef --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11owe.h @@ -0,0 +1,62 @@ @@ -951578,7 +951579,7 @@ index 000000000000..2af77fbef570 +#endif /* _802_11owe_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11s.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11s.h new file mode 100755 -index 000000000000..6ddbde466a66 +index 000000000..6ddbde466 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11s.h @@ -0,0 +1,316 @@ @@ -951900,7 +951901,7 @@ index 000000000000..6ddbde466a66 +#endif /* #ifndef _802_11s_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11u.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11u.h new file mode 100755 -index 000000000000..11852217d6ad +index 000000000..11852217d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11u.h @@ -0,0 +1,200 @@ @@ -952106,7 +952107,7 @@ index 000000000000..11852217d6ad +#endif /* _802_11u_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11v.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11v.h new file mode 100755 -index 000000000000..88b407fdb3fa +index 000000000..88b407fdb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11v.h @@ -0,0 +1,794 @@ @@ -952906,7 +952907,7 @@ index 000000000000..88b407fdb3fa +#endif /* _802_11v_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11w.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11w.h new file mode 100755 -index 000000000000..1d46d71b7d9e +index 000000000..1d46d71b7 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11w.h @@ -0,0 +1,50 @@ @@ -952962,7 +952963,7 @@ index 000000000000..1d46d71b7d9e +#endif /* _802_11w_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11wapi.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11wapi.h new file mode 100755 -index 000000000000..4f0899078619 +index 000000000..4f0899078 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11wapi.h @@ -0,0 +1,70 @@ @@ -953038,7 +953039,7 @@ index 000000000000..4f0899078619 +#endif /* _802_11wapi_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11wfa.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11wfa.h new file mode 100755 -index 000000000000..39d91e610963 +index 000000000..39d91e610 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11wfa.h @@ -0,0 +1,245 @@ @@ -953289,7 +953290,7 @@ index 000000000000..39d91e610963 +#endif /* _802_11wfa_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11z.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11z.h new file mode 100755 -index 000000000000..125f4ccd1810 +index 000000000..125f4ccd1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.11z.h @@ -0,0 +1,142 @@ @@ -953437,7 +953438,7 @@ index 000000000000..125f4ccd1810 +#endif /* _802_11z_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.1d.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.1d.h new file mode 100755 -index 000000000000..45a94c0f98a8 +index 000000000..45a94c0f9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.1d.h @@ -0,0 +1,47 @@ @@ -953490,7 +953491,7 @@ index 000000000000..45a94c0f98a8 +#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..263e9e793f9c +index 000000000..263e9e793 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/802.3.h @@ -0,0 +1,49 @@ @@ -953545,7 +953546,7 @@ index 000000000000..263e9e793f9c +#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..d76c8881e8e1 +index 000000000..d76c8881e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/aidmp.h @@ -0,0 +1,438 @@ @@ -953989,7 +953990,7 @@ index 000000000000..d76c8881e8e1 +#endif /* _AIDMP_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_mpool_pub.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_mpool_pub.h new file mode 100755 -index 000000000000..a19fc20052f0 +index 000000000..a19fc2005 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_mpool_pub.h @@ -0,0 +1,344 @@ @@ -954339,7 +954340,7 @@ index 000000000000..a19fc20052f0 +#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..fc45bf48f3b2 +index 000000000..fc45bf48f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcm_ring.h @@ -0,0 +1,585 @@ @@ -954930,7 +954931,7 @@ index 000000000000..fc45bf48f3b2 +#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..21f5e2463ec4 +index 000000000..21f5e2463 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmarp.h @@ -0,0 +1,84 @@ @@ -955020,7 +955021,7 @@ index 000000000000..21f5e2463ec4 +#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..a978d4d45d01 +index 000000000..a978d4d45 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmbloom.h @@ -0,0 +1,73 @@ @@ -955099,7 +955100,7 @@ index 000000000000..a978d4d45d01 +#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..ed029055f990 +index 000000000..ed029055f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmcdc.h @@ -0,0 +1,115 @@ @@ -955220,7 +955221,7 @@ index 000000000000..ed029055f990 +#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..19b907f44225 +index 000000000..19b907f44 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdefs.h @@ -0,0 +1,1063 @@ @@ -956289,7 +956290,7 @@ index 000000000000..19b907f44225 +#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..8dddde5024ae +index 000000000..8dddde502 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdevs.h @@ -0,0 +1,660 @@ @@ -956955,7 +956956,7 @@ index 000000000000..8dddde5024ae +#endif /* _BCMDEVS_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdevs_legacy.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdevs_legacy.h new file mode 100755 -index 000000000000..11632968fb51 +index 000000000..11632968f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdevs_legacy.h @@ -0,0 +1,164 @@ @@ -957125,7 +957126,7 @@ index 000000000000..11632968fb51 +#endif /* _bcmdevs_legacy_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdhcp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdhcp.h new file mode 100755 -index 000000000000..6f89292fab6d +index 000000000..6f89292fa --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmdhcp.h @@ -0,0 +1,88 @@ @@ -957219,7 +957220,7 @@ index 000000000000..6f89292fab6d +#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..82968b4592c2 +index 000000000..82968b459 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmendian.h @@ -0,0 +1,451 @@ @@ -957676,7 +957677,7 @@ index 000000000000..82968b4592c2 +#endif /* !_BCMENDIAN_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmerror.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmerror.h new file mode 100755 -index 000000000000..836e6ce59730 +index 000000000..836e6ce59 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmerror.h @@ -0,0 +1,911 @@ @@ -958593,7 +958594,7 @@ index 000000000000..836e6ce59730 +#endif /* _bcmerror_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmeth.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmeth.h new file mode 100755 -index 000000000000..814691053572 +index 000000000..814691053 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmeth.h @@ -0,0 +1,109 @@ @@ -958708,7 +958709,7 @@ index 000000000000..814691053572 +#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..6ff269d01ac0 +index 000000000..6ff269d01 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmevent.h @@ -0,0 +1,1794 @@ @@ -960508,7 +960509,7 @@ index 000000000000..6ff269d01ac0 +#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..3a58a850617a +index 000000000..3a58a8506 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmicmp.h @@ -0,0 +1,83 @@ @@ -960597,7 +960598,7 @@ index 000000000000..3a58a850617a +#endif /* #ifndef _bcmicmp_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmigmp.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmigmp.h new file mode 100755 -index 000000000000..559c964b86cb +index 000000000..559c964b8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmigmp.h @@ -0,0 +1,74 @@ @@ -960677,7 +960678,7 @@ index 000000000000..559c964b86cb +#endif /* #ifndef _bcmigmp_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmiov.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmiov.h new file mode 100755 -index 000000000000..3e5a6fa2ad6f +index 000000000..3e5a6fa2a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmiov.h @@ -0,0 +1,439 @@ @@ -961122,7 +961123,7 @@ index 000000000000..3e5a6fa2ad6f +#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..7eb5736f5ab2 +index 000000000..7eb5736f5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmip.h @@ -0,0 +1,299 @@ @@ -961427,7 +961428,7 @@ index 000000000000..7eb5736f5ab2 +#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..fbeb8ce3c369 +index 000000000..fbeb8ce3c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmipv6.h @@ -0,0 +1,160 @@ @@ -961593,7 +961594,7 @@ index 000000000000..fbeb8ce3c369 +#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..884d79506a41 +index 000000000..884d79506 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmmsgbuf.h @@ -0,0 +1,1705 @@ @@ -963304,7 +963305,7 @@ index 000000000000..884d79506a41 +#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..0ad290aa6c0b +index 000000000..0ad290aa6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmnvram.h @@ -0,0 +1,162 @@ @@ -963472,7 +963473,7 @@ index 000000000000..0ad290aa6c0b +#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..b0796d96a042 +index 000000000..b0796d96a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmpcie.h @@ -0,0 +1,614 @@ @@ -964092,7 +964093,7 @@ index 000000000000..b0796d96a042 +#endif /* _bcmpcie_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmperf.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmperf.h new file mode 100755 -index 000000000000..8bc2d0ebbbe7 +index 000000000..8bc2d0ebb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmperf.h @@ -0,0 +1,33 @@ @@ -964131,7 +964132,7 @@ index 000000000000..8bc2d0ebbbe7 +#endif /* _BCMPERF_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmproto.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmproto.h new file mode 100755 -index 000000000000..afc4616a30da +index 000000000..afc4616a3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmproto.h @@ -0,0 +1,275 @@ @@ -964412,7 +964413,7 @@ index 000000000000..afc4616a30da +#endif /* _bcmproto_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmrand.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmrand.h new file mode 100755 -index 000000000000..b2fdf820ff64 +index 000000000..b2fdf820f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmrand.h @@ -0,0 +1,65 @@ @@ -964483,7 +964484,7 @@ index 000000000000..b2fdf820ff64 +#endif /* _bcmrand_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdbus.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdbus.h new file mode 100755 -index 000000000000..6f265a8f1c1d +index 000000000..6f265a8f1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdbus.h @@ -0,0 +1,187 @@ @@ -964676,7 +964677,7 @@ index 000000000000..6f265a8f1c1d +#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..27417dcb1b0b +index 000000000..27417dcb1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh.h @@ -0,0 +1,298 @@ @@ -964980,7 +964981,7 @@ index 000000000000..27417dcb1b0b +#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..989e0a4eda5b +index 000000000..989e0a4ed --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdh_sdmmc.h @@ -0,0 +1,135 @@ @@ -965121,7 +965122,7 @@ index 000000000000..989e0a4eda5b +#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..173e100a2b3d +index 000000000..173e100a2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsdpcm.h @@ -0,0 +1,304 @@ @@ -965431,7 +965432,7 @@ index 000000000000..173e100a2b3d +#endif /* _bcmsdpcm_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_fmt.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_fmt.h new file mode 100755 -index 000000000000..a9fd1695efdc +index 000000000..a9fd1695e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmsrom_fmt.h @@ -0,0 +1,1028 @@ @@ -966465,7 +966466,7 @@ index 000000000000..a9fd1695efdc +#endif /* _bcmsrom_fmt_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmstdlib_s.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmstdlib_s.h new file mode 100755 -index 000000000000..c70493353a9c +index 000000000..c70493353 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmstdlib_s.h @@ -0,0 +1,54 @@ @@ -966525,7 +966526,7 @@ index 000000000000..c70493353a9c +#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..804026bd14f6 +index 000000000..804026bd1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtcp.h @@ -0,0 +1,86 @@ @@ -966617,7 +966618,7 @@ index 000000000000..804026bd14f6 +#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..7a9fbab17ae4 +index 000000000..7a9fbab17 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmtlv.h @@ -0,0 +1,382 @@ @@ -967005,7 +967006,7 @@ index 000000000000..7a9fbab17ae4 +#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..8e4405afa85d +index 000000000..8e4405afa --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmudp.h @@ -0,0 +1,54 @@ @@ -967065,7 +967066,7 @@ index 000000000000..8e4405afa85d +#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..558345d57f09 +index 000000000..558345d57 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmutils.h @@ -0,0 +1,1613 @@ @@ -968684,7 +968685,7 @@ index 000000000000..558345d57f09 +#endif /* _bcmutils_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_channels.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_channels.h new file mode 100755 -index 000000000000..ccbe138e93c7 +index 000000000..ccbe138e9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_channels.h @@ -0,0 +1,906 @@ @@ -969596,7 +969597,7 @@ index 000000000000..ccbe138e93c7 +#endif /* _bcmwifi_channels_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_radiotap.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_radiotap.h new file mode 100755 -index 000000000000..d90b5af7ec77 +index 000000000..d90b5af7e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_radiotap.h @@ -0,0 +1,382 @@ @@ -969984,7 +969985,7 @@ index 000000000000..d90b5af7ec77 +#endif /* _BCMWIFI_RADIOTAP_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_rates.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_rates.h new file mode 100755 -index 000000000000..36b6e72b8a47 +index 000000000..36b6e72b8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_rates.h @@ -0,0 +1,1262 @@ @@ -971252,7 +971253,7 @@ index 000000000000..36b6e72b8a47 +#endif /* _bcmwifi_rates_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_rspec.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_rspec.h new file mode 100755 -index 000000000000..7ab1f093ca48 +index 000000000..7ab1f093c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bcmwifi_rspec.h @@ -0,0 +1,286 @@ @@ -971544,7 +971545,7 @@ index 000000000000..7ab1f093ca48 +#endif /* _bcmwifi_rspec_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bootrommem.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bootrommem.h new file mode 100755 -index 000000000000..ebebdab93651 +index 000000000..ebebdab93 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/bootrommem.h @@ -0,0 +1,97 @@ @@ -971647,7 +971648,7 @@ index 000000000000..ebebdab93651 +#endif /* _BOOTROMMEM_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/brcm_nl80211.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/brcm_nl80211.h new file mode 100755 -index 000000000000..fb61d4596eb0 +index 000000000..fb61d4596 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/brcm_nl80211.h @@ -0,0 +1,79 @@ @@ -971732,7 +971733,7 @@ index 000000000000..fb61d4596eb0 +#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..64f0636b0960 +index 000000000..64f0636b0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dbus.h @@ -0,0 +1,640 @@ @@ -972378,7 +972379,7 @@ index 000000000000..64f0636b0960 +#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..f71d02907540 +index 000000000..f71d02907 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhd_daemon.h @@ -0,0 +1,55 @@ @@ -972439,7 +972440,7 @@ index 000000000000..f71d02907540 +#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..dc558e21d4b9 +index 000000000..dc558e21d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dhdioctl.h @@ -0,0 +1,450 @@ @@ -972895,7 +972896,7 @@ index 000000000000..dc558e21d4b9 +#endif /* _dhdioctl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dngl_rtlv.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dngl_rtlv.h new file mode 100755 -index 000000000000..a1a14add605e +index 000000000..a1a14add6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dngl_rtlv.h @@ -0,0 +1,83 @@ @@ -972984,7 +972985,7 @@ index 000000000000..a1a14add605e +#endif /* _dngl_rtlv_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dngl_stats.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dngl_stats.h new file mode 100755 -index 000000000000..0d38086b0f36 +index 000000000..0d38086b0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dngl_stats.h @@ -0,0 +1,43 @@ @@ -973033,7 +973034,7 @@ index 000000000000..0d38086b0f36 +#endif /* _dngl_stats_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglevent.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglevent.h new file mode 100755 -index 000000000000..5cff81d5cba4 +index 000000000..5cff81d5c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglevent.h @@ -0,0 +1,188 @@ @@ -973227,7 +973228,7 @@ index 000000000000..5cff81d5cba4 +#endif /* _DNGLEVENT_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglioctl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglioctl.h new file mode 100755 -index 000000000000..4a9769a62085 +index 000000000..4a9769a62 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/dnglioctl.h @@ -0,0 +1,177 @@ @@ -973410,7 +973411,7 @@ index 000000000000..4a9769a62085 +#endif /* _dngl_ioctl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/eapol.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/eapol.h new file mode 100755 -index 000000000000..e170a338c817 +index 000000000..e170a338c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/eapol.h @@ -0,0 +1,345 @@ @@ -973761,7 +973762,7 @@ index 000000000000..e170a338c817 +#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..b7f91141cc90 +index 000000000..b7f91141c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/epivers.h @@ -0,0 +1,55 @@ @@ -973822,7 +973823,7 @@ index 000000000000..b7f91141cc90 +#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..9c97574ef71c +index 000000000..9c97574ef --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/etd.h @@ -0,0 +1,701 @@ @@ -974529,7 +974530,7 @@ index 000000000000..9c97574ef71c +#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..a8e13bc084e0 +index 000000000..a8e13bc08 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/ethernet.h @@ -0,0 +1,265 @@ @@ -974800,7 +974801,7 @@ index 000000000000..a8e13bc084e0 +#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..c2b0ee25a49e +index 000000000..c2b0ee25a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log.h @@ -0,0 +1,761 @@ @@ -975567,7 +975568,7 @@ index 000000000000..c2b0ee25a49e +#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..9c17e079841f +index 000000000..9c17e0798 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_payload.h @@ -0,0 +1,1545 @@ @@ -977118,7 +977119,7 @@ index 000000000000..9c17e079841f +#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..08f048cbd259 +index 000000000..08f048cbd --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_set.h @@ -0,0 +1,409 @@ @@ -977533,7 +977534,7 @@ index 000000000000..08f048cbd259 +#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..6490a12ba483 +index 000000000..6490a12ba --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_log_tag.h @@ -0,0 +1,667 @@ @@ -978206,7 +978207,7 @@ index 000000000000..6490a12ba483 +#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..e760301763ea +index 000000000..e76030176 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/event_trace.h @@ -0,0 +1,187 @@ @@ -978399,7 +978400,7 @@ index 000000000000..e760301763ea +#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..935cd30f218b +index 000000000..935cd30f2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/fils.h @@ -0,0 +1,466 @@ @@ -978871,7 +978872,7 @@ index 000000000000..935cd30f218b +#endif /* __FILSAUTH_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/frag.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/frag.h new file mode 100755 -index 000000000000..f2f8abda89ec +index 000000000..f2f8abda8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/frag.h @@ -0,0 +1,46 @@ @@ -978923,7 +978924,7 @@ index 000000000000..f2f8abda89ec +#endif /* __FRAG_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/fwpkg_utils.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/fwpkg_utils.h new file mode 100755 -index 000000000000..899b4fa09c19 +index 000000000..899b4fa09 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/fwpkg_utils.h @@ -0,0 +1,80 @@ @@ -979009,7 +979010,7 @@ index 000000000000..899b4fa09c19 +#endif /* _fwpkg_utils_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_armtrap.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_armtrap.h new file mode 100755 -index 000000000000..370ded15ed0a +index 000000000..370ded15e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_armtrap.h @@ -0,0 +1,86 @@ @@ -979101,7 +979102,7 @@ index 000000000000..370ded15ed0a +#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..5482c27cb0e6 +index 000000000..5482c27cb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_cons.h @@ -0,0 +1,98 @@ @@ -979205,7 +979206,7 @@ index 000000000000..5482c27cb0e6 +#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..141fc31654da +index 000000000..141fc3165 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_debug.h @@ -0,0 +1,253 @@ @@ -979464,7 +979465,7 @@ index 000000000000..141fc31654da +#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..dcaeb648b9c4 +index 000000000..dcaeb648b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktpool.h @@ -0,0 +1,329 @@ @@ -979799,7 +979800,7 @@ index 000000000000..dcaeb648b9c4 +#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..cea32415c030 +index 000000000..cea32415c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_pktq.h @@ -0,0 +1,335 @@ @@ -980140,7 +980141,7 @@ index 000000000000..cea32415c030 +#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..47d6e8515702 +index 000000000..47d6e8515 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hnd_trap.h @@ -0,0 +1,33 @@ @@ -980179,7 +980180,7 @@ index 000000000000..47d6e8515702 +#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..38664c9d9e37 +index 000000000..38664c9d9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndchipc.h @@ -0,0 +1,47 @@ @@ -980232,7 +980233,7 @@ index 000000000000..38664c9d9e37 +#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..558aee07ce8c +index 000000000..558aee07c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndlhl.h @@ -0,0 +1,94 @@ @@ -980332,7 +980333,7 @@ index 000000000000..558aee07ce8c +#endif /* _hndlhl_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndoobr.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndoobr.h new file mode 100755 -index 000000000000..1fbb87421462 +index 000000000..1fbb87421 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndoobr.h @@ -0,0 +1,96 @@ @@ -980434,7 +980435,7 @@ index 000000000000..1fbb87421462 +#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..2901ba1dc708 +index 000000000..2901ba1dc --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndpmu.h @@ -0,0 +1,349 @@ @@ -980789,7 +980790,7 @@ index 000000000000..2901ba1dc708 +#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..f2d9f59587a5 +index 000000000..f2d9f5958 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/hndsoc.h @@ -0,0 +1,353 @@ @@ -981148,7 +981149,7 @@ index 000000000000..f2d9f59587a5 +#endif /* _HNDSOC_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/ieee80211_radiotap.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/ieee80211_radiotap.h new file mode 100755 -index 000000000000..89e2021291c1 +index 000000000..89e202129 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/ieee80211_radiotap.h @@ -0,0 +1,415 @@ @@ -981569,7 +981570,7 @@ index 000000000000..89e2021291c1 +#endif /* !_NET80211_IEEE80211_RADIOTAP_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_osl.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_osl.h new file mode 100755 -index 000000000000..6f7afd539414 +index 000000000..6f7afd539 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_osl.h @@ -0,0 +1,994 @@ @@ -982569,7 +982570,7 @@ index 000000000000..6f7afd539414 +#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..fb4da88589c6 +index 000000000..fb4da8858 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linux_pkt.h @@ -0,0 +1,443 @@ @@ -983018,7 +983019,7 @@ index 000000000000..fb4da88589c6 +#endif /* _linux_pkt_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxerrmap.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxerrmap.h new file mode 100755 -index 000000000000..3cc5a012c36a +index 000000000..3cc5a012c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxerrmap.h @@ -0,0 +1,28 @@ @@ -983052,7 +983053,7 @@ index 000000000000..3cc5a012c36a +#endif /* _linuxerrmap_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxver.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxver.h new file mode 100755 -index 000000000000..d5bf94b41295 +index 000000000..d5bf94b41 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/linuxver.h @@ -0,0 +1,1068 @@ @@ -984126,7 +984127,7 @@ index 000000000000..d5bf94b41295 +#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..6ff882a14c19 +index 000000000..6ff882a14 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/lpflags.h @@ -0,0 +1,39 @@ @@ -984171,7 +984172,7 @@ index 000000000000..6ff882a14c19 +#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..c9130a910d78 +index 000000000..c9130a910 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/mbo.h @@ -0,0 +1,281 @@ @@ -984458,7 +984459,7 @@ index 000000000000..c9130a910d78 +#endif /* __MBO_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msgtrace.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msgtrace.h new file mode 100755 -index 000000000000..46df878f9d8f +index 000000000..46df878f9 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/msgtrace.h @@ -0,0 +1,59 @@ @@ -984523,7 +984524,7 @@ index 000000000000..46df878f9d8f +#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..3ced5eb92c7d +index 000000000..3ced5eb92 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/nan.h @@ -0,0 +1,1913 @@ @@ -986442,7 +986443,7 @@ index 000000000000..3ced5eb92c7d +#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..175a4ea621a8 +index 000000000..175a4ea62 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl.h @@ -0,0 +1,530 @@ @@ -986978,7 +986979,7 @@ index 000000000000..175a4ea621a8 +#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..898fb0f9ca41 +index 000000000..898fb0f9c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_decl.h @@ -0,0 +1,31 @@ @@ -987015,7 +987016,7 @@ index 000000000000..898fb0f9ca41 +#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..33084e3df4f4 +index 000000000..33084e3df --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/osl_ext.h @@ -0,0 +1,759 @@ @@ -987780,7 +987781,7 @@ index 000000000000..33084e3df4f4 +#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..87d9057db402 +index 000000000..87d9057db --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/p2p.h @@ -0,0 +1,696 @@ @@ -988482,7 +988483,7 @@ index 000000000000..87d9057db402 +#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..566b15c71124 +index 000000000..566b15c71 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_end.h @@ -0,0 +1,62 @@ @@ -988550,7 +988551,7 @@ index 000000000000..566b15c71124 +#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..1cda56d8ebec +index 000000000..1cda56d8e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/packed_section_start.h @@ -0,0 +1,117 @@ @@ -988673,7 +988674,7 @@ index 000000000000..1cda56d8ebec +#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..ac082a7fb39d +index 000000000..ac082a7fb --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcicfg.h @@ -0,0 +1,737 @@ @@ -989416,7 +989417,7 @@ index 000000000000..ac082a7fb39d +#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..d1d3cf49d2eb +index 000000000..d1d3cf49d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/pcie_core.h @@ -0,0 +1,1513 @@ @@ -990935,7 +990936,7 @@ index 000000000000..d1d3cf49d2eb +#endif /* _PCIE_CORE_H */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/phy_event_log_payload.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/phy_event_log_payload.h new file mode 100755 -index 000000000000..336fdea42324 +index 000000000..336fdea42 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/phy_event_log_payload.h @@ -0,0 +1,3430 @@ @@ -994371,7 +994372,7 @@ index 000000000000..336fdea42324 +#endif /* _PHY_EVENT_LOG_PAYLOAD_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbchipc.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbchipc.h new file mode 100755 -index 000000000000..558f940283c9 +index 000000000..558f94028 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbchipc.h @@ -0,0 +1,5370 @@ @@ -999747,7 +999748,7 @@ index 000000000000..558f940283c9 +#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..424a3621cce3 +index 000000000..424a3621c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbconfig.h @@ -0,0 +1,279 @@ @@ -1000032,7 +1000033,7 @@ index 000000000000..424a3621cce3 +#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..55afc79d30bb +index 000000000..55afc79d3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbgci.h @@ -0,0 +1,424 @@ @@ -1000462,7 +1000463,7 @@ index 000000000000..55afc79d30bb +#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..92660123db22 +index 000000000..92660123d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhndarm.h @@ -0,0 +1,414 @@ @@ -1000882,7 +1000883,7 @@ index 000000000000..92660123db22 +#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..86422ebc65c2 +index 000000000..86422ebc6 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhnddma.h @@ -0,0 +1,481 @@ @@ -1001369,7 +1001370,7 @@ index 000000000000..86422ebc65c2 +#endif /* _sbhnddma_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhndpio.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhndpio.h new file mode 100755 -index 000000000000..289a40b5e7f9 +index 000000000..289a40b5e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbhndpio.h @@ -0,0 +1,60 @@ @@ -1001435,7 +1001436,7 @@ index 000000000000..289a40b5e7f9 +#endif /* _sbhndpio_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbpcmcia.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbpcmcia.h new file mode 100755 -index 000000000000..297898f2a68f +index 000000000..297898f2a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbpcmcia.h @@ -0,0 +1,415 @@ @@ -1001856,7 +1001857,7 @@ index 000000000000..297898f2a68f +#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..18ba61233618 +index 000000000..18ba61233 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdio.h @@ -0,0 +1,185 @@ @@ -1002047,7 +1002048,7 @@ index 000000000000..18ba61233618 +#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..91e04882acd8 +index 000000000..91e04882a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsdpcmdev.h @@ -0,0 +1,307 @@ @@ -1002360,7 +1002361,7 @@ index 000000000000..91e04882acd8 +#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..a8802bf60427 +index 000000000..a8802bf60 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsocram.h @@ -0,0 +1,198 @@ @@ -1002564,7 +1002565,7 @@ index 000000000000..a8802bf60427 +#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..dc7f8a783e12 +index 000000000..dc7f8a783 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sbsysmem.h @@ -0,0 +1,191 @@ @@ -1002761,7 +1002762,7 @@ index 000000000000..dc7f8a783e12 +#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..70721f1bced3 +index 000000000..70721f1bc --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdio.h @@ -0,0 +1,644 @@ @@ -1003411,7 +1003412,7 @@ index 000000000000..70721f1bced3 +#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..20200c131fdc +index 000000000..20200c131 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdioh.h @@ -0,0 +1,459 @@ @@ -1003876,7 +1003877,7 @@ index 000000000000..20200c131fdc +#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..cd10d991eac3 +index 000000000..cd10d991e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/sdiovar.h @@ -0,0 +1,124 @@ @@ -1004006,7 +1004007,7 @@ index 000000000000..cd10d991eac3 +#endif /* _sdiovar_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/siutils.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/siutils.h new file mode 100755 -index 000000000000..52b326612dea +index 000000000..52b326612 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/siutils.h @@ -0,0 +1,1052 @@ @@ -1005064,7 +1005065,7 @@ index 000000000000..52b326612dea +#endif /* _siutils_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/trxhdr.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/trxhdr.h new file mode 100755 -index 000000000000..e87ce64e10d7 +index 000000000..e87ce64e1 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/trxhdr.h @@ -0,0 +1,93 @@ @@ -1005163,7 +1005164,7 @@ index 000000000000..e87ce64e10d7 +#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..df09e00be80d +index 000000000..df09e00be --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/typedefs.h @@ -0,0 +1,424 @@ @@ -1005593,7 +1005594,7 @@ index 000000000000..df09e00be80d +#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..91bdd07ab3af +index 000000000..91bdd07ab --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/usbrdl.h @@ -0,0 +1,221 @@ @@ -1005820,7 +1005821,7 @@ index 000000000000..91bdd07ab3af +#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..e22e1900e411 +index 000000000..e22e1900e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/vlan.h @@ -0,0 +1,91 @@ @@ -1005917,7 +1005918,7 @@ index 000000000000..e22e1900e411 +#endif /* _vlan_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wl_bam.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wl_bam.h new file mode 100755 -index 000000000000..c816b6ade818 +index 000000000..c816b6ade --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wl_bam.h @@ -0,0 +1,65 @@ @@ -1005988,7 +1005989,7 @@ index 000000000000..c816b6ade818 +#endif /* _WL_BAM_H_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wldev_common.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wldev_common.h new file mode 100755 -index 000000000000..bfd998c84191 +index 000000000..bfd998c84 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wldev_common.h @@ -0,0 +1,143 @@ @@ -1006137,7 +1006138,7 @@ index 000000000000..bfd998c84191 +#endif /* __WLDEV_COMMON_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlfc_proto.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlfc_proto.h new file mode 100755 -index 000000000000..bf5d3972cae1 +index 000000000..bf5d3972c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlfc_proto.h @@ -0,0 +1,520 @@ @@ -1006663,7 +1006664,7 @@ index 000000000000..bf5d3972cae1 +#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..65edb4b10d86 +index 000000000..65edb4b10 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl.h @@ -0,0 +1,31196 @@ @@ -1037865,7 +1037866,7 @@ index 000000000000..65edb4b10d86 +#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..55ede5bc4f28 +index 000000000..55ede5bc4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_defs.h @@ -0,0 +1,2556 @@ @@ -1040427,7 +1040428,7 @@ index 000000000000..55ede5bc4f28 +#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..9558938684bd +index 000000000..955893868 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wlioctl_utils.h @@ -0,0 +1,60 @@ @@ -1040493,7 +1040494,7 @@ index 000000000000..9558938684bd +#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..da403ee53db8 +index 000000000..da403ee53 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include/wpa.h @@ -0,0 +1,280 @@ @@ -1040779,7 +1040780,7 @@ index 000000000000..da403ee53db8 +#endif /* _proto_wpa_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl.c new file mode 100755 -index 000000000000..fe9b9511cc65 +index 000000000..fe9b9511c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl.c @@ -0,0 +1,2307 @@ @@ -1043092,7 +1043093,7 @@ index 000000000000..fe9b9511cc65 +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl_priv.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl_priv.h new file mode 100755 -index 000000000000..51530815e935 +index 000000000..51530815e --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_osl_priv.h @@ -0,0 +1,177 @@ @@ -1043275,7 +1043276,7 @@ index 000000000000..51530815e935 +#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..22e05a4d0cb1 +index 000000000..22e05a4d0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linux_pkt.c @@ -0,0 +1,909 @@ @@ -1044190,7 +1044191,7 @@ index 000000000000..22e05a4d0cb1 +#endif /* LINUX_VERSION >= 3.6.0 && TSQ_MULTIPLIER */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linuxerrmap.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linuxerrmap.c new file mode 100755 -index 000000000000..a182d4f8dd27 +index 000000000..a182d4f8d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/linuxerrmap.c @@ -0,0 +1,128 @@ @@ -1044324,7 +1044325,7 @@ index 000000000000..a182d4f8dd27 +} 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..bc3e4bebfc38 +index 000000000..bc3e4bebf --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/pcie_core.c @@ -0,0 +1,228 @@ @@ -1044558,7 +1044559,7 @@ index 000000000000..bc3e4bebfc38 +#endif /* BCMDRIVER */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/rk_dhd_pcie_linux.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/rk_dhd_pcie_linux.h new file mode 100755 -index 000000000000..80501a3cfd41 +index 000000000..80501a3cf --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/rk_dhd_pcie_linux.h @@ -0,0 +1,37 @@ @@ -1044601,7 +1044602,7 @@ index 000000000000..80501a3cfd41 +#endif /* __RK_DHD_PCIE_LINUX_H__ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/sbutils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/sbutils.c new file mode 100755 -index 000000000000..bb8b6a12fb1c +index 000000000..bb8b6a12f --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/sbutils.c @@ -0,0 +1,1110 @@ @@ -1045717,7 +1045718,7 @@ index 000000000000..bb8b6a12fb1c +#endif /* BCMDBG */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils.c new file mode 100755 -index 000000000000..1819a6c0cb9f +index 000000000..1819a6c0c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils.c @@ -0,0 +1,10248 @@ @@ -1055971,7 +1055972,7 @@ index 000000000000..1819a6c0cb9f +#endif /* USE_LHL_TIMER */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils_priv.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils_priv.h new file mode 100755 -index 000000000000..f57c41c4a993 +index 000000000..f57c41c4a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/siutils_priv.h @@ -0,0 +1,519 @@ @@ -1056496,7 +1056497,7 @@ index 000000000000..f57c41c4a993 +#endif /* _siutils_priv_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wb_regon_coordinator.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wb_regon_coordinator.c new file mode 100755 -index 000000000000..571d9728bcdb +index 000000000..571d9728b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wb_regon_coordinator.c @@ -0,0 +1,522 @@ @@ -1057024,7 +1057025,7 @@ index 000000000000..571d9728bcdb +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wifi_stats.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wifi_stats.h new file mode 100755 -index 000000000000..94a2136324c2 +index 000000000..94a213632 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wifi_stats.h @@ -0,0 +1,437 @@ @@ -1057467,7 +1057468,7 @@ index 000000000000..94a2136324c2 +#endif /* _wifi_stats_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.c new file mode 100755 -index 000000000000..f07c6cce0069 +index 000000000..f07c6cce0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.c @@ -0,0 +1,10263 @@ @@ -1067736,7 +1067737,7 @@ index 000000000000..f07c6cce0069 +#endif /* SUPPORT_AP_INIT_BWCONF */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.h new file mode 100755 -index 000000000000..d9b61ba02fcc +index 000000000..d9b61ba02 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android.h @@ -0,0 +1,270 @@ @@ -1068012,7 +1068013,7 @@ index 000000000000..d9b61ba02fcc +#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..9b0d4b4c279a +index 000000000..9b0d4b4c2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android_ext.c @@ -0,0 +1,4242 @@ @@ -1072260,7 +1072261,7 @@ index 000000000000..9b0d4b4c279a +#endif /* BSSCACHE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android_ext.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android_ext.h new file mode 100755 -index 000000000000..da605828db5a +index 000000000..da605828d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_android_ext.h @@ -0,0 +1,217 @@ @@ -1072483,7 +1072484,7 @@ index 000000000000..da605828db5a +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_bam.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_bam.c new file mode 100755 -index 000000000000..c568b04ab6d2 +index 000000000..c568b04ab --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_bam.c @@ -0,0 +1,314 @@ @@ -1072803,7 +1072804,7 @@ index 000000000000..c568b04ab6d2 +} 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..08df037c5eb9 +index 000000000..08df037c5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.c @@ -0,0 +1,28504 @@ @@ -1101313,7 +1101314,7 @@ index 000000000000..08df037c5eb9 +#endif /* WL_STATIC_IF */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.h new file mode 100755 -index 000000000000..65783e72b234 +index 000000000..65783e72b --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg80211.h @@ -0,0 +1,3845 @@ @@ -1105164,7 +1105165,7 @@ index 000000000000..65783e72b234 +#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..49a51285ce8a +index 000000000..49a51285c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfg_btcoex.c @@ -0,0 +1,934 @@ @@ -1106104,7 +1106105,7 @@ index 000000000000..49a51285ce8a +#endif /* defined(OEM_ANDROID) */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.c new file mode 100755 -index 000000000000..415f845b3892 +index 000000000..415f845b3 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.c @@ -0,0 +1,10459 @@ @@ -1116569,7 +1116570,7 @@ index 000000000000..415f845b3892 +#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..23d4f3d7c47e +index 000000000..23d4f3d7c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgnan.h @@ -0,0 +1,1023 @@ @@ -1117598,7 +1117599,7 @@ index 000000000000..23d4f3d7c47e +#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..7cdd8f7cddfc +index 000000000..7cdd8f7cd --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.c @@ -0,0 +1,3022 @@ @@ -1120626,7 +1120627,7 @@ index 000000000000..7cdd8f7cddfc +#endif /* BCMDBUS */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.h new file mode 100755 -index 000000000000..d1ecbba5c837 +index 000000000..d1ecbba5c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgp2p.h @@ -0,0 +1,484 @@ @@ -1121116,7 +1121117,7 @@ index 000000000000..d1ecbba5c837 +#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..b073244d5c19 +index 000000000..b073244d5 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.c @@ -0,0 +1,7461 @@ @@ -1128583,7 +1128584,7 @@ index 000000000000..b073244d5c19 +} 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..2c6429f0c4da +index 000000000..2c6429f0c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgscan.h @@ -0,0 +1,231 @@ @@ -1128820,7 +1128821,7 @@ index 000000000000..2c6429f0c4da +#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..9b19314c4e1f +index 000000000..9b19314c4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.c @@ -0,0 +1,14390 @@ @@ -1143216,7 +1143217,7 @@ index 000000000000..9b19314c4e1f +#endif /* WL_CFGVENDOR_CUST_ADVLOG */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.h new file mode 100755 -index 000000000000..b1fe71729f4e +index 000000000..b1fe71729 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvendor.h @@ -0,0 +1,1308 @@ @@ -1144530,7 +1144531,7 @@ index 000000000000..b1fe71729f4e +#endif /* _wl_cfgvendor_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvif.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvif.c new file mode 100755 -index 000000000000..604effd19905 +index 000000000..604effd19 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvif.c @@ -0,0 +1,7965 @@ @@ -1152501,7 +1152502,7 @@ index 000000000000..604effd19905 +#endif /* WL_STATIC_IF */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvif.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvif.h new file mode 100755 -index 000000000000..ea8bc76c07b2 +index 000000000..ea8bc76c0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_cfgvif.h @@ -0,0 +1,291 @@ @@ -1152798,7 +1152799,7 @@ index 000000000000..ea8bc76c07b2 +#endif /* _wl_cfgvif_h_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.c new file mode 100755 -index 000000000000..0a7aea9148ba +index 000000000..0a7aea914 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.c @@ -0,0 +1,1914 @@ @@ -1154718,7 +1154719,7 @@ index 000000000000..0a7aea9148ba +#endif /* WL_ESCAN */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.h new file mode 100755 -index 000000000000..5670681106bc +index 000000000..567068110 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_escan.h @@ -0,0 +1,86 @@ @@ -1154810,7 +1154811,7 @@ index 000000000000..5670681106bc +#endif /* _wl_escan_ */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_event.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_event.c new file mode 100755 -index 000000000000..2d2a999d84af +index 000000000..2d2a999d8 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_event.c @@ -0,0 +1,558 @@ @@ -1155374,7 +1155375,7 @@ index 000000000000..2d2a999d84af +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_event.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_event.h new file mode 100755 -index 000000000000..cae71544a05c +index 000000000..cae71544a --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_event.h @@ -0,0 +1,18 @@ @@ -1155398,7 +1155399,7 @@ index 000000000000..cae71544a05c +#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..815eb6de4d4e +index 000000000..815eb6de4 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_ext_genl.c @@ -0,0 +1,568 @@ @@ -1155972,7 +1155973,7 @@ index 000000000000..815eb6de4d4e +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iapsta.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iapsta.c new file mode 100755 -index 000000000000..06e67c5eac62 +index 000000000..06e67c5ea --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iapsta.c @@ -0,0 +1,7210 @@ @@ -1163188,7 +1163189,7 @@ index 000000000000..06e67c5eac62 +#endif /* WL_EXT_IAPSTA */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iapsta.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iapsta.h new file mode 100755 -index 000000000000..26eb7e7d0da8 +index 000000000..26eb7e7d0 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iapsta.h @@ -0,0 +1,108 @@ @@ -1163302,7 +1163303,7 @@ index 000000000000..26eb7e7d0da8 +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.c new file mode 100755 -index 000000000000..96d63cdf207f +index 000000000..96d63cdf2 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.c @@ -0,0 +1,4359 @@ @@ -1167667,7 +1167668,7 @@ index 000000000000..96d63cdf207f +#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..a16265501e25 +index 000000000..a16265501 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_iw.h @@ -0,0 +1,170 @@ @@ -1167843,7 +1167844,7 @@ index 000000000000..a16265501e25 +#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..42445271d581 +index 000000000..42445271d --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_linux_mon.c @@ -0,0 +1,412 @@ @@ -1168261,7 +1168262,7 @@ index 000000000000..42445271d581 +} 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..e061b342c51d +index 000000000..e061b342c --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_roam.c @@ -0,0 +1,608 @@ @@ -1168875,7 +1168876,7 @@ index 000000000000..e061b342c51d +#endif /* ESCAN_CHANNEL_CACHE */ diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_timer.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_timer.c new file mode 100755 -index 000000000000..0255acd55fbd +index 000000000..0255acd55 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_timer.c @@ -0,0 +1,611 @@ @@ -1169492,7 +1169493,7 @@ index 000000000000..0255acd55fbd +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_timer.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_timer.h new file mode 100755 -index 000000000000..6b43384682b7 +index 000000000..6b4338468 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wl_timer.h @@ -0,0 +1,8 @@ @@ -1169506,7 +1169507,7 @@ index 000000000000..6b43384682b7 +#endif diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.c new file mode 100755 -index 000000000000..5da6be126460 +index 000000000..5da6be126 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/wldev_common.c @@ -0,0 +1,596 @@ @@ -1170108,7 +1170109,7 @@ index 000000000000..5da6be126460 +} diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c b/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c new file mode 100644 -index 000000000000..82799df987e8 +index 000000000..82799df98 --- /dev/null +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c @@ -0,0 +1,30 @@ @@ -1170143,7 +1170144,7 @@ index 000000000000..82799df987e8 +EXPORT_SYMBOL(rkwifi_set_firmware); +MODULE_LICENSE("GPL"); diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig -index 5bc9c4874fe3..a6bdc92eed7b 100644 +index 5bc9c4874..a6bdc92ee 100644 --- a/drivers/nvmem/Kconfig +++ b/drivers/nvmem/Kconfig @@ -245,6 +245,18 @@ config NVMEM_RAVE_SP_EEPROM @@ -1170184,7 +1170185,7 @@ index 5bc9c4874fe3..a6bdc92eed7b 100644 tristate "Spreadtrum SC27XX eFuse Support" depends on MFD_SC27XX_PMIC || COMPILE_TEST diff --git a/drivers/nvmem/Makefile b/drivers/nvmem/Makefile -index 423baf089515..aaaf802b73b4 100644 +index 423baf089..aaaf802b7 100644 --- a/drivers/nvmem/Makefile +++ b/drivers/nvmem/Makefile @@ -50,12 +50,16 @@ obj-$(CONFIG_NVMEM_QCOM_SEC_QFPROM) += nvmem_sec_qfprom.o @@ -1170205,7 +1170206,7 @@ index 423baf089515..aaaf802b73b4 100644 nvmem-sc27xx-efuse-y := sc27xx-efuse.o obj-$(CONFIG_NVMEM_SNVS_LPGPR) += nvmem_snvs_lpgpr.o diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c -index 5b3955ad4053..831d8ce16022 100644 +index 5b3955ad4..831d8ce16 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -2140,7 +2140,11 @@ static void __exit nvmem_exit(void) @@ -1170222,7 +1170223,7 @@ index 5b3955ad4053..831d8ce16022 100644 MODULE_AUTHOR("Srinivas Kandagatla diff --git a/drivers/phy/rockchip/phy-rockchip-inno-combphy.c b/drivers/phy/rockchip/phy-rockchip-inno-combphy.c new file mode 100644 -index 000000000000..8b93016edce5 +index 000000000..8b93016ed --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-combphy.c @@ -0,0 +1,1024 @@ @@ -1182236,7 +1182237,7 @@ index 000000000000..8b93016edce5 +MODULE_DESCRIPTION("Rockchip USB3.0 and PCIE COMBPHY driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-inno-csidphy.c b/drivers/phy/rockchip/phy-rockchip-inno-csidphy.c -index 98c92d6c482f..75f948bdea6a 100644 +index 98c92d6c4..75f948bde 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-csidphy.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-csidphy.c @@ -459,11 +459,13 @@ static int rockchip_inno_csidphy_probe(struct platform_device *pdev) @@ -1182264,7 +1182265,7 @@ index 98c92d6c482f..75f948bdea6a 100644 module_platform_driver(rockchip_inno_csidphy_driver); diff --git a/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c b/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c -index 6405943a2676..a074bca21b4b 100644 +index 6405943a2..a074bca21 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c @@ -14,7 +14,7 @@ @@ -1182971,7 +1182972,7 @@ index 6405943a2676..a074bca21b4b 100644 diff --git a/drivers/phy/rockchip/phy-rockchip-inno-hdmi-phy.c b/drivers/phy/rockchip/phy-rockchip-inno-hdmi-phy.c new file mode 100644 -index 000000000000..23f1e5d87ea9 +index 000000000..23f1e5d87 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-hdmi-phy.c @@ -0,0 +1,1632 @@ @@ -1184608,7 +1184609,7 @@ index 000000000000..23f1e5d87ea9 +MODULE_DESCRIPTION("Innosilion HDMI 2.0 Transmitter PHY Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c -index 053bd62e31ba..80acca4e9e14 100644 +index 053bd62e3..80acca4e9 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c @@ -15,6 +15,7 @@ @@ -1184976,7 +1184977,7 @@ index 053bd62e31ba..80acca4e9e14 100644 .of_match_table = inno_hdmi_phy_of_match, diff --git a/drivers/phy/rockchip/phy-rockchip-inno-mipi-dphy.c b/drivers/phy/rockchip/phy-rockchip-inno-mipi-dphy.c new file mode 100644 -index 000000000000..b49b1aad2a09 +index 000000000..b49b1aad2 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-mipi-dphy.c @@ -0,0 +1,853 @@ @@ -1185834,7 +1185835,7 @@ index 000000000000..b49b1aad2a09 +MODULE_DESCRIPTION("Innosilicon MIPI D-PHY Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c -index b982c3f0d4b5..a28e933331dd 100644 +index b982c3f0d..a28e93333 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c @@ -22,16 +22,23 @@ @@ -1189850,7 +1189851,7 @@ index b982c3f0d4b5..a28e933331dd 100644 }; diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb3.c b/drivers/phy/rockchip/phy-rockchip-inno-usb3.c new file mode 100644 -index 000000000000..f345f23afbd1 +index 000000000..f345f23af --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb3.c @@ -0,0 +1,1114 @@ @@ -1190970,7 +1190971,7 @@ index 000000000000..f345f23afbd1 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-inno-video-combo-phy.c b/drivers/phy/rockchip/phy-rockchip-inno-video-combo-phy.c new file mode 100644 -index 000000000000..4166d4bacb42 +index 000000000..4166d4bac --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-video-combo-phy.c @@ -0,0 +1,874 @@ @@ -1191850,7 +1191851,7 @@ index 000000000000..4166d4bacb42 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-inno-video-phy.c b/drivers/phy/rockchip/phy-rockchip-inno-video-phy.c new file mode 100644 -index 000000000000..22d26f1413d9 +index 000000000..22d26f141 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-inno-video-phy.c @@ -0,0 +1,245 @@ @@ -1192101,7 +1192102,7 @@ index 000000000000..22d26f1413d9 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-mipi-rx.c b/drivers/phy/rockchip/phy-rockchip-mipi-rx.c new file mode 100644 -index 000000000000..617b9ed785d4 +index 000000000..617b9ed78 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-mipi-rx.c @@ -0,0 +1,1915 @@ @@ -1194021,7 +1194022,7 @@ index 000000000000..617b9ed785d4 +MODULE_DESCRIPTION("Rockchip MIPI RX DPHY driver"); +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c -index 5de5e2e97ffa..e9fcc9eb0961 100644 +index 5de5e2e97..e9fcc9eb0 100644 --- a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c +++ b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c @@ -5,85 +5,25 @@ @@ -1195368,7 +1195369,7 @@ index 5de5e2e97ffa..e9fcc9eb0961 100644 }; diff --git a/drivers/phy/rockchip/phy-rockchip-naneng-edp.c b/drivers/phy/rockchip/phy-rockchip-naneng-edp.c new file mode 100644 -index 000000000000..209ce9d0384a +index 000000000..209ce9d03 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-naneng-edp.c @@ -0,0 +1,478 @@ @@ -1195852,7 +1195853,7 @@ index 000000000000..209ce9d0384a +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-naneng-usb2.c b/drivers/phy/rockchip/phy-rockchip-naneng-usb2.c new file mode 100644 -index 000000000000..7cfbf260f325 +index 000000000..7cfbf260f --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-naneng-usb2.c @@ -0,0 +1,1942 @@ @@ -1197799,7 +1197800,7 @@ index 000000000000..7cfbf260f325 +MODULE_DESCRIPTION("Rockchip USB2.0 Naneng PHY driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c -index 8234b83fdd88..2f47a3e7fd88 100644 +index 8234b83fd..2f47a3e7f 100644 --- a/drivers/phy/rockchip/phy-rockchip-pcie.c +++ b/drivers/phy/rockchip/phy-rockchip-pcie.c @@ -119,6 +119,21 @@ static inline void phy_wr_cfg(struct rockchip_pcie_phy *rk_phy, @@ -1197852,7 +1197853,7 @@ index 8234b83fdd88..2f47a3e7fd88 100644 * so we make it large enough here. And we use loop-break diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c b/drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c new file mode 100644 -index 000000000000..f8fc5b7b5846 +index 000000000..f8fc5b7b5 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c @@ -0,0 +1,2463 @@ @@ -1200321,7 +1200322,7 @@ index 000000000000..f8fc5b7b5846 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-dcphy.h b/drivers/phy/rockchip/phy-rockchip-samsung-dcphy.h new file mode 100644 -index 000000000000..2c04aa3b6e05 +index 000000000..2c04aa3b6 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-samsung-dcphy.h @@ -0,0 +1,47 @@ @@ -1200374,7 +1200375,7 @@ index 000000000000..2c04aa3b6e05 +#endif diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx-hdmi.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx-hdmi.c new file mode 100644 -index 000000000000..15f361facdf3 +index 000000000..15f361fac --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx-hdmi.c @@ -0,0 +1,2358 @@ @@ -1202738,7 +1202739,7 @@ index 000000000000..15f361facdf3 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c new file mode 100644 -index 000000000000..2d142cf731d1 +index 000000000..2d142cf73 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c @@ -0,0 +1,1233 @@ @@ -1203976,7 +1203977,7 @@ index 000000000000..2d142cf731d1 +MODULE_DESCRIPTION("Rockchip HDMI/DP Combo PHY with Samsung IP block"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c b/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c -index 121e5961ce11..7eb8899e9b66 100644 +index 121e5961c..7eb8899e9 100644 --- a/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c +++ b/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c @@ -12,24 +12,21 @@ @@ -1204248,7 +1204249,7 @@ index 121e5961ce11..7eb8899e9b66 100644 if (priv->num_clks < 1) diff --git a/drivers/phy/rockchip/phy-rockchip-snps-pcie3.fw b/drivers/phy/rockchip/phy-rockchip-snps-pcie3.fw new file mode 100644 -index 000000000000..301c42837ad9 +index 000000000..301c42837 --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-snps-pcie3.fw @@ -0,0 +1,8192 @@ @@ -1212445,7 +1212446,7 @@ index 000000000000..301c42837ad9 +0x0000, +0x0000 diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c -index 4efcb78b0ab1..b8f644df1566 100644 +index 4efcb78b0..b8f644df1 100644 --- a/drivers/phy/rockchip/phy-rockchip-typec.c +++ b/drivers/phy/rockchip/phy-rockchip-typec.c @@ -51,9 +51,13 @@ @@ -1213739,7 +1213740,7 @@ index 4efcb78b0ab1..b8f644df1566 100644 .name = "rockchip-typec-phy", .of_match_table = rockchip_typec_phy_dt_ids, diff --git a/drivers/phy/rockchip/phy-rockchip-usb.c b/drivers/phy/rockchip/phy-rockchip-usb.c -index 8454285977eb..a891018fe72e 100644 +index 845428597..a891018fe 100644 --- a/drivers/phy/rockchip/phy-rockchip-usb.c +++ b/drivers/phy/rockchip/phy-rockchip-usb.c @@ -8,20 +8,26 @@ @@ -1214472,7 +1214473,7 @@ index 8454285977eb..a891018fe72e 100644 diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockchip/phy-rockchip-usbdp.c new file mode 100644 -index 000000000000..c6fc4a2aa558 +index 000000000..c6fc4a2aa --- /dev/null +++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c @@ -0,0 +1,1675 @@ @@ -1216152,7 +1216153,7 @@ index 000000000000..c6fc4a2aa558 +MODULE_DESCRIPTION("Rockchip USBDP Combo PHY driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig -index 7dfb7190580e..a78c73b214fe 100644 +index 7dfb71905..a78c73b21 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -394,15 +394,34 @@ config PINCTRL_PISTACHIO @@ -1216192,7 +1216193,7 @@ index 7dfb7190580e..a78c73b214fe 100644 tristate "Rockchip gpio and pinctrl driver" depends on ARCH_ROCKCHIP || COMPILE_TEST diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile -index dd6cda270294..dd94e17ea5ed 100644 +index dd6cda270..dd94e17ea 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@ -41,7 +41,9 @@ obj-$(CONFIG_PINCTRL_OCELOT) += pinctrl-ocelot.o @@ -1216207,7 +1216208,7 @@ index dd6cda270294..dd94e17ea5ed 100644 obj-$(CONFIG_PINCTRL_ST) += pinctrl-st.o diff --git a/drivers/pinctrl/pinctrl-rk628.c b/drivers/pinctrl/pinctrl-rk628.c new file mode 100644 -index 000000000000..6e07be50e6e2 +index 000000000..6e07be50e --- /dev/null +++ b/drivers/pinctrl/pinctrl-rk628.c @@ -0,0 +1,1696 @@ @@ -1217908,7 +1217909,7 @@ index 000000000000..6e07be50e6e2 +MODULE_AUTHOR("Weixin Zhou "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/pinctrl/pinctrl-rk805.c b/drivers/pinctrl/pinctrl-rk805.c -index 2639a9ee82cd..f4f8866612d3 100644 +index 2639a9ee8..f4f886661 100644 --- a/drivers/pinctrl/pinctrl-rk805.c +++ b/drivers/pinctrl/pinctrl-rk805.c @@ -337,6 +337,120 @@ static const struct gpio_chip rk805_gpio_chip = { @@ -1218160,7 +1218161,7 @@ index 2639a9ee82cd..f4f8866612d3 100644 MODULE_AUTHOR("Xu Shengfei "); diff --git a/drivers/pinctrl/pinctrl-rk806.c b/drivers/pinctrl/pinctrl-rk806.c new file mode 100644 -index 000000000000..09ddeb2034c1 +index 000000000..09ddeb203 --- /dev/null +++ b/drivers/pinctrl/pinctrl-rk806.c @@ -0,0 +1,572 @@ @@ -1218737,7 +1218738,7 @@ index 000000000000..09ddeb2034c1 +MODULE_AUTHOR("Xu Shengfei "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c -index 45e416f68e74..ca228e9b980e 100644 +index 45e416f68..ca228e9b9 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -21,8 +21,9 @@ @@ -1221147,7 +1221148,7 @@ index 45e416f68e74..ca228e9b980e 100644 MODULE_LICENSE("GPL"); MODULE_ALIAS("platform:pinctrl-rockchip"); diff --git a/drivers/pinctrl/pinctrl-rockchip.h b/drivers/pinctrl/pinctrl-rockchip.h -index 4759f336941e..80b5552fd8d0 100644 +index 4759f3369..80b5552fd 100644 --- a/drivers/pinctrl/pinctrl-rockchip.h +++ b/drivers/pinctrl/pinctrl-rockchip.h @@ -185,8 +185,10 @@ @@ -1221221,7 +1221222,7 @@ index 4759f336941e..80b5552fd8d0 100644 + #endif diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c -index 2a180a5d64a4..128c5e5afe2d 100644 +index 2a180a5d6..128c5e5af 100644 --- a/drivers/pinctrl/pinmux.c +++ b/drivers/pinctrl/pinmux.c @@ -677,6 +677,7 @@ void pinmux_show_setting(struct seq_file *s, @@ -1221266,7 +1221267,7 @@ index 2a180a5d64a4..128c5e5afe2d 100644 ret = pmxops->set_mux(pctldev, fsel, gsel); diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/pm-domains.c -index d5d3ecb38283..606e27363b58 100644 +index d5d3ecb38..606e27363 100644 --- a/drivers/pmdomain/rockchip/pm-domains.c +++ b/drivers/pmdomain/rockchip/pm-domains.c @@ -5,6 +5,7 @@ @@ -1222948,7 +1222949,7 @@ index d5d3ecb38283..606e27363b58 100644 +MODULE_LICENSE("GPL"); diff --git a/drivers/power/supply/rk816_battery.c b/drivers/power/supply/rk816_battery.c new file mode 100644 -index 000000000000..1e4f6cd8e54a +index 000000000..1e4f6cd8e --- /dev/null +++ b/drivers/power/supply/rk816_battery.c @@ -0,0 +1,5177 @@ @@ -1228131,7 +1228132,7 @@ index 000000000000..1e4f6cd8e54a +MODULE_AUTHOR("chenjh"); diff --git a/drivers/power/supply/rk816_battery.h b/drivers/power/supply/rk816_battery.h new file mode 100644 -index 000000000000..b8b467114c1f +index 000000000..b8b467114 --- /dev/null +++ b/drivers/power/supply/rk816_battery.h @@ -0,0 +1,286 @@ @@ -1228423,7 +1228424,7 @@ index 000000000000..b8b467114c1f +#endif diff --git a/drivers/power/supply/rk817_battery.c b/drivers/power/supply/rk817_battery.c new file mode 100644 -index 000000000000..f6d4345cc677 +index 000000000..f6d4345cc --- /dev/null +++ b/drivers/power/supply/rk817_battery.c @@ -0,0 +1,3427 @@ @@ -1231856,7 +1231857,7 @@ index 000000000000..f6d4345cc677 +MODULE_LICENSE("GPL"); diff --git a/drivers/power/supply/rk818_battery.c b/drivers/power/supply/rk818_battery.c new file mode 100644 -index 000000000000..a538407ba522 +index 000000000..a538407ba --- /dev/null +++ b/drivers/power/supply/rk818_battery.c @@ -0,0 +1,3627 @@ @@ -1235489,7 +1235490,7 @@ index 000000000000..a538407ba522 +MODULE_AUTHOR("chenjh"); diff --git a/drivers/power/supply/rk818_battery.h b/drivers/power/supply/rk818_battery.h new file mode 100644 -index 000000000000..66cbbe9dac4c +index 000000000..66cbbe9da --- /dev/null +++ b/drivers/power/supply/rk818_battery.h @@ -0,0 +1,168 @@ @@ -1235663,7 +1235664,7 @@ index 000000000000..66cbbe9dac4c +#endif diff --git a/drivers/power/supply/rk818_charger.c b/drivers/power/supply/rk818_charger.c new file mode 100644 -index 000000000000..56961effd13c +index 000000000..56961effd --- /dev/null +++ b/drivers/power/supply/rk818_charger.c @@ -0,0 +1,1889 @@ @@ -1237557,7 +1237558,7 @@ index 000000000000..56961effd13c +MODULE_ALIAS("platform:rk818-charger"); +MODULE_AUTHOR("chenjh"); diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig -index 8ebcddf91f7b..ce8e0d9d565e 100644 +index 8ebcddf91..ce8e0d9d5 100644 --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig @@ -217,6 +217,21 @@ config PWM_FSL_FTM @@ -1237596,7 +1237597,7 @@ index 8ebcddf91f7b..ce8e0d9d565e 100644 tristate "Samsung PWM support" depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile -index c822389c2a24..d45a4afc8957 100644 +index c822389c2..d45a4afc8 100644 --- a/drivers/pwm/Makefile +++ b/drivers/pwm/Makefile @@ -18,6 +18,7 @@ obj-$(CONFIG_PWM_CROS_EC) += pwm-cros-ec.o @@ -1237608,7 +1237609,7 @@ index c822389c2a24..d45a4afc8957 100644 obj-$(CONFIG_PWM_IMG) += pwm-img.o obj-$(CONFIG_PWM_IMX1) += pwm-imx1.o diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c -index 0c8c63239adb..297d8da3be05 100644 +index 0c8c63239..297d8da3b 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -10,6 +10,7 @@ @@ -1237732,7 +1237733,7 @@ index 0c8c63239adb..297d8da3be05 100644 state->usage_power == pwm->state.usage_power) return 0; diff --git a/drivers/pwm/pwm-clk.c b/drivers/pwm/pwm-clk.c -index 0ee4d2aee4df..666b9f48a25f 100644 +index 0ee4d2aee..666b9f48a 100644 --- a/drivers/pwm/pwm-clk.c +++ b/drivers/pwm/pwm-clk.c @@ -89,7 +89,7 @@ static int pwm_clk_probe(struct platform_device *pdev) @@ -1237773,7 +1237774,7 @@ index 0ee4d2aee4df..666b9f48a25f 100644 static const struct of_device_id pwm_clk_dt_ids[] = { diff --git a/drivers/pwm/pwm-gpio.c b/drivers/pwm/pwm-gpio.c new file mode 100644 -index 000000000000..7ac10bf24ebf +index 000000000..7ac10bf24 --- /dev/null +++ b/drivers/pwm/pwm-gpio.c @@ -0,0 +1,212 @@ @@ -1237991,7 +1237992,7 @@ index 000000000000..7ac10bf24ebf +MODULE_LICENSE("GPL"); diff --git a/drivers/pwm/pwm-rockchip-i2s.c b/drivers/pwm/pwm-rockchip-i2s.c new file mode 100644 -index 000000000000..0888f62ab60a +index 000000000..0888f62ab --- /dev/null +++ b/drivers/pwm/pwm-rockchip-i2s.c @@ -0,0 +1,506 @@ @@ -1238503,7 +1238504,7 @@ index 000000000000..0888f62ab60a +MODULE_LICENSE("GPL v2"); diff --git a/drivers/pwm/pwm-rockchip-irq-callbacks.h b/drivers/pwm/pwm-rockchip-irq-callbacks.h new file mode 100644 -index 000000000000..191c62e96821 +index 000000000..191c62e96 --- /dev/null +++ b/drivers/pwm/pwm-rockchip-irq-callbacks.h @@ -0,0 +1,64 @@ @@ -1238572,7 +1238573,7 @@ index 000000000000..191c62e96821 + +#endif diff --git a/drivers/pwm/pwm-rockchip.c b/drivers/pwm/pwm-rockchip.c -index 03ee18fb82d5..cd1fb02934e4 100644 +index 03ee18fb8..cd1fb0293 100644 --- a/drivers/pwm/pwm-rockchip.c +++ b/drivers/pwm/pwm-rockchip.c @@ -7,34 +7,235 @@ @@ -1240386,7 +1240387,7 @@ index 03ee18fb82d5..cd1fb02934e4 100644 MODULE_AUTHOR("Beniamino Galvani "); MODULE_DESCRIPTION("Rockchip SoC PWM driver"); diff --git a/drivers/pwm/sysfs.c b/drivers/pwm/sysfs.c -index 8d1254761e4d..b5d6aa7e6739 100644 +index 8d1254761..b5d6aa7e6 100644 --- a/drivers/pwm/sysfs.c +++ b/drivers/pwm/sysfs.c @@ -103,6 +103,113 @@ static ssize_t duty_cycle_store(struct device *child, @@ -1240528,7 +1240529,7 @@ index 8d1254761e4d..b5d6aa7e6739 100644 &dev_attr_polarity.attr, &dev_attr_capture.attr, diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig -index 965d4f0c18a6..4c1eca4e92a0 100644 +index 965d4f0c1..4c1eca4e9 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -1107,16 +1107,35 @@ config REGULATOR_RC5T583 @@ -1240571,7 +1240572,7 @@ index 965d4f0c18a6..4c1eca4e92a0 100644 tristate "Ricoh RN5T567/618 voltage regulators" depends on MFD_RN5T618 diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile -index 23074714a81a..3635dffe7c17 100644 +index 23074714a..3635dffe7 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -131,7 +131,9 @@ obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o @@ -1240585,7 +1240586,7 @@ index 23074714a81a..3635dffe7c17 100644 obj-$(CONFIG_REGULATOR_ROHM) += rohm-regulator.o obj-$(CONFIG_REGULATOR_RT4801) += rt4801-regulator.o diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c -index a7b3e548ea5a..25a390d9ce4c 100644 +index a7b3e548e..25a390d9c 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -40,6 +40,7 @@ static LIST_HEAD(regulator_map_list); @@ -1241151,7 +1241152,7 @@ index a7b3e548ea5a..25a390d9ce4c 100644 static int regulator_late_cleanup(struct device *dev, void *data) { diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c -index 48f312167e53..1960a2f0fd37 100644 +index 48f312167..1960a2f0f 100644 --- a/drivers/regulator/fan53555.c +++ b/drivers/regulator/fan53555.c @@ -652,6 +652,9 @@ static const struct of_device_id __maybe_unused fan53555_dt_ids[] = { @@ -1241165,7 +1241166,7 @@ index 48f312167e53..1960a2f0fd37 100644 { } }; diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c -index e33d10df7a76..96f403c1251c 100644 +index e33d10df7..96f403c12 100644 --- a/drivers/regulator/pwm-regulator.c +++ b/drivers/regulator/pwm-regulator.c @@ -41,6 +41,9 @@ struct pwm_regulator_data { @@ -1241228,7 +1241229,7 @@ index e33d10df7a76..96f403c1251c 100644 if (!init_data) diff --git a/drivers/regulator/rk806-regulator.c b/drivers/regulator/rk806-regulator.c new file mode 100644 -index 000000000000..3e33b3f585be +index 000000000..3e33b3f58 --- /dev/null +++ b/drivers/regulator/rk806-regulator.c @@ -0,0 +1,1229 @@ @@ -1242462,7 +1242463,7 @@ index 000000000000..3e33b3f585be +MODULE_DESCRIPTION("rk806 voltage regulator driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c -index 867a2cf243f6..784d9244f7c1 100644 +index 867a2cf24..784d9244f 100644 --- a/drivers/regulator/rk808-regulator.c +++ b/drivers/regulator/rk808-regulator.c @@ -3,11 +3,9 @@ @@ -1243864,7 +1243865,7 @@ index 867a2cf243f6..784d9244f7c1 100644 MODULE_ALIAS("platform:rk808-regulator"); diff --git a/drivers/regulator/rk860x-regulator.c b/drivers/regulator/rk860x-regulator.c new file mode 100644 -index 000000000000..4596761bdb40 +index 000000000..4596761bd --- /dev/null +++ b/drivers/regulator/rk860x-regulator.c @@ -0,0 +1,607 @@ @@ -1244477,7 +1244478,7 @@ index 000000000000..4596761bdb40 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/rk_nand/Kconfig b/drivers/rk_nand/Kconfig new file mode 100644 -index 000000000000..c49a1c28b702 +index 000000000..c49a1c28b --- /dev/null +++ b/drivers/rk_nand/Kconfig @@ -0,0 +1,10 @@ @@ -1244493,7 +1244494,7 @@ index 000000000000..c49a1c28b702 +endif diff --git a/drivers/rk_nand/Makefile b/drivers/rk_nand/Makefile new file mode 100644 -index 000000000000..dbd156f6e78b +index 000000000..dbd156f6e --- /dev/null +++ b/drivers/rk_nand/Makefile @@ -0,0 +1,9 @@ @@ -1244508,7 +1244509,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 100644 -index 000000000000..ebde01e3dbb6 +index 000000000..ebde01e3d --- /dev/null +++ b/drivers/rk_nand/rk_ftl_api.h @@ -0,0 +1,41 @@ @@ -1244555,7 +1244556,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..da6f8a9667e3 +index 000000000..da6f8a966 --- /dev/null +++ b/drivers/rk_nand/rk_ftl_arm_v7.S @@ -0,0 +1,30164 @@ @@ -1274725,7 +1274726,7 @@ index 000000000000..da6f8a9667e3 + .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..4cf752e4b834 +index 000000000..4cf752e4b --- /dev/null +++ b/drivers/rk_nand/rk_ftl_arm_v7_thumb.S @@ -0,0 +1,30191 @@ @@ -1304922,7 +1304923,7 @@ index 000000000000..4cf752e4b834 + .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 @@ @@ -1332896,7 +1332897,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..28d165342153 +index 000000000..28d165342 --- /dev/null +++ b/drivers/rk_nand/rk_ftlv5_arm32.S @@ -0,0 +1,27611 @@ @@ -1360513,7 +1360514,7 @@ index 000000000000..28d165342153 + .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 @@ @@ -1386151,7 +1386152,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 100644 -index 000000000000..9d5e2fb02baa +index 000000000..9d5e2fb02 --- /dev/null +++ b/drivers/rk_nand/rk_nand_base.c @@ -0,0 +1,456 @@ @@ -1386613,7 +1386614,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 100644 -index 000000000000..023e58d5fc5c +index 000000000..023e58d5f --- /dev/null +++ b/drivers/rk_nand/rk_nand_base.h @@ -0,0 +1,46 @@ @@ -1386665,7 +1386666,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 100644 -index 000000000000..d4c7f0d7cd14 +index 000000000..d4c7f0d7c --- /dev/null +++ b/drivers/rk_nand/rk_nand_blk.c @@ -0,0 +1,700 @@ @@ -1387371,7 +1387372,7 @@ index 000000000000..d4c7f0d7cd14 +} diff --git a/drivers/rk_nand/rk_nand_blk.h b/drivers/rk_nand/rk_nand_blk.h new file mode 100644 -index 000000000000..681c625f5081 +index 000000000..681c625f5 --- /dev/null +++ b/drivers/rk_nand/rk_nand_blk.h @@ -0,0 +1,67 @@ @@ -1387444,7 +1387445,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..4af2ab302d33 +index 000000000..4af2ab302 --- /dev/null +++ b/drivers/rk_nand/rk_zftl_arm32.S @@ -0,0 +1,37094 @@ @@ -1424544,7 +1424545,7 @@ index 000000000000..4af2ab302d33 + .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 @@ @@ -1459757,7 +1459758,7 @@ index 000000000000..943e37110677 + .string "\0013vendor storage %x,%x,%x\n" diff --git a/drivers/rkflash/Kconfig b/drivers/rkflash/Kconfig new file mode 100644 -index 000000000000..67527b25cc5f +index 000000000..67527b25c --- /dev/null +++ b/drivers/rkflash/Kconfig @@ -0,0 +1,89 @@ @@ -1459852,7 +1459853,7 @@ index 000000000000..67527b25cc5f +endif # ARCH_ROCKCHIP diff --git a/drivers/rkflash/Makefile b/drivers/rkflash/Makefile new file mode 100644 -index 000000000000..319656b66ef0 +index 000000000..319656b66 --- /dev/null +++ b/drivers/rkflash/Makefile @@ -0,0 +1,27 @@ @@ -1459885,7 +1459886,7 @@ index 000000000000..319656b66ef0 +endif diff --git a/drivers/rkflash/flash.c b/drivers/rkflash/flash.c new file mode 100644 -index 000000000000..276d18a08bd2 +index 000000000..276d18a08 --- /dev/null +++ b/drivers/rkflash/flash.c @@ -0,0 +1,510 @@ @@ -1460401,7 +1460402,7 @@ index 000000000000..276d18a08bd2 +} diff --git a/drivers/rkflash/flash.h b/drivers/rkflash/flash.h new file mode 100644 -index 000000000000..8f1284c9026a +index 000000000..8f1284c90 --- /dev/null +++ b/drivers/rkflash/flash.h @@ -0,0 +1,132 @@ @@ -1460539,7 +1460540,7 @@ index 000000000000..8f1284c9026a +#endif diff --git a/drivers/rkflash/flash_com.h b/drivers/rkflash/flash_com.h new file mode 100644 -index 000000000000..da6eb29968a1 +index 000000000..da6eb2996 --- /dev/null +++ b/drivers/rkflash/flash_com.h @@ -0,0 +1,77 @@ @@ -1460622,7 +1460623,7 @@ index 000000000000..da6eb29968a1 +#endif diff --git a/drivers/rkflash/nand_boot.c b/drivers/rkflash/nand_boot.c new file mode 100644 -index 000000000000..7db6ff9e7f48 +index 000000000..7db6ff9e7 --- /dev/null +++ b/drivers/rkflash/nand_boot.c @@ -0,0 +1,83 @@ @@ -1460711,7 +1460712,7 @@ index 000000000000..7db6ff9e7f48 + diff --git a/drivers/rkflash/nandc.c b/drivers/rkflash/nandc.c new file mode 100644 -index 000000000000..2ac3d69b1551 +index 000000000..2ac3d69b1 --- /dev/null +++ b/drivers/rkflash/nandc.c @@ -0,0 +1,472 @@ @@ -1461189,7 +1461190,7 @@ index 000000000000..2ac3d69b1551 +} diff --git a/drivers/rkflash/nandc.h b/drivers/rkflash/nandc.h new file mode 100644 -index 000000000000..e650493dbe4d +index 000000000..e650493db --- /dev/null +++ b/drivers/rkflash/nandc.h @@ -0,0 +1,346 @@ @@ -1461541,7 +1461542,7 @@ index 000000000000..e650493dbe4d +#endif diff --git a/drivers/rkflash/rk_sftl.h b/drivers/rkflash/rk_sftl.h new file mode 100644 -index 000000000000..378f83714b5d +index 000000000..378f83714 --- /dev/null +++ b/drivers/rkflash/rk_sftl.h @@ -0,0 +1,48 @@ @@ -1461595,7 +1461596,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..4fa6a0a457c8 +index 000000000..4fa6a0a45 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v7.S @@ -0,0 +1,15998 @@ @@ -1477599,7 +1477600,7 @@ index 000000000000..4fa6a0a457c8 + .section .note.GNU-stack,"",%progbits diff --git a/drivers/rkflash/rk_sftl_arm_v7_thumb.S b/drivers/rkflash/rk_sftl_arm_v7_thumb.S new file mode 100755 -index 000000000000..4d1177156efe +index 000000000..4d1177156 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v7_thumb.S @@ -0,0 +1,15535 @@ @@ -1493140,7 +1493141,7 @@ index 000000000000..4d1177156efe + .section .note.GNU-stack,"",%progbits diff --git a/drivers/rkflash/rk_sftl_arm_v8.S b/drivers/rkflash/rk_sftl_arm_v8.S new file mode 100755 -index 000000000000..6e550cfe702c +index 000000000..6e550cfe7 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v8.S @@ -0,0 +1,15782 @@ @@ -1508928,7 +1508929,7 @@ index 000000000000..6e550cfe702c + .align 3 diff --git a/drivers/rkflash/rk_sftl_arm_v8_clang.S b/drivers/rkflash/rk_sftl_arm_v8_clang.S new file mode 100755 -index 000000000000..864822c991c3 +index 000000000..864822c99 --- /dev/null +++ b/drivers/rkflash/rk_sftl_arm_v8_clang.S @@ -0,0 +1,22705 @@ @@ -1531639,7 +1531640,7 @@ index 000000000000..864822c991c3 + .addrsig_sym rk_sftl_vendor_storage_fops diff --git a/drivers/rkflash/rkflash_api.h b/drivers/rkflash/rkflash_api.h new file mode 100644 -index 000000000000..7ddc9eafe960 +index 000000000..7ddc9eafe --- /dev/null +++ b/drivers/rkflash/rkflash_api.h @@ -0,0 +1,58 @@ @@ -1531703,7 +1531704,7 @@ index 000000000000..7ddc9eafe960 +#endif diff --git a/drivers/rkflash/rkflash_blk.c b/drivers/rkflash/rkflash_blk.c new file mode 100644 -index 000000000000..4a45a014d3be +index 000000000..4a45a014d --- /dev/null +++ b/drivers/rkflash/rkflash_blk.c @@ -0,0 +1,846 @@ @@ -1532555,7 +1532556,7 @@ index 000000000000..4a45a014d3be +} diff --git a/drivers/rkflash/rkflash_blk.h b/drivers/rkflash/rkflash_blk.h new file mode 100644 -index 000000000000..4781632525dc +index 000000000..478163252 --- /dev/null +++ b/drivers/rkflash/rkflash_blk.h @@ -0,0 +1,117 @@ @@ -1532678,7 +1532679,7 @@ index 000000000000..4781632525dc +#endif diff --git a/drivers/rkflash/rkflash_debug.c b/drivers/rkflash/rkflash_debug.c new file mode 100644 -index 000000000000..ce742b0382ef +index 000000000..ce742b038 --- /dev/null +++ b/drivers/rkflash/rkflash_debug.c @@ -0,0 +1,116 @@ @@ -1532800,7 +1532801,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 100644 -index 000000000000..3fe4068322e7 +index 000000000..3fe406832 --- /dev/null +++ b/drivers/rkflash/rkflash_debug.h @@ -0,0 +1,42 @@ @@ -1532848,7 +1532849,7 @@ index 000000000000..3fe4068322e7 + diff --git a/drivers/rkflash/rknandc_base.c b/drivers/rkflash/rknandc_base.c new file mode 100644 -index 000000000000..d2e97883dec4 +index 000000000..d2e97883d --- /dev/null +++ b/drivers/rkflash/rknandc_base.c @@ -0,0 +1,192 @@ @@ -1533046,7 +1533047,7 @@ index 000000000000..d2e97883dec4 +MODULE_ALIAS("rknandc"); diff --git a/drivers/rkflash/rksfc_base.c b/drivers/rkflash/rksfc_base.c new file mode 100644 -index 000000000000..fb420b216f86 +index 000000000..fb420b216 --- /dev/null +++ b/drivers/rkflash/rksfc_base.c @@ -0,0 +1,301 @@ @@ -1533353,7 +1533354,7 @@ index 000000000000..fb420b216f86 +MODULE_ALIAS("rksfc"); diff --git a/drivers/rkflash/sfc.c b/drivers/rkflash/sfc.c new file mode 100644 -index 000000000000..19773a8ec0fc +index 000000000..19773a8ec --- /dev/null +++ b/drivers/rkflash/sfc.c @@ -0,0 +1,269 @@ @@ -1533628,7 +1533629,7 @@ index 000000000000..19773a8ec0fc +} diff --git a/drivers/rkflash/sfc.h b/drivers/rkflash/sfc.h new file mode 100644 -index 000000000000..918811a5cb3f +index 000000000..918811a5c --- /dev/null +++ b/drivers/rkflash/sfc.h @@ -0,0 +1,229 @@ @@ -1533863,7 +1533864,7 @@ index 000000000000..918811a5cb3f +#endif diff --git a/drivers/rkflash/sfc_nand.c b/drivers/rkflash/sfc_nand.c new file mode 100644 -index 000000000000..4accf3d791c6 +index 000000000..4accf3d79 --- /dev/null +++ b/drivers/rkflash/sfc_nand.c @@ -0,0 +1,1223 @@ @@ -1535092,7 +1535093,7 @@ index 000000000000..4accf3d791c6 +} diff --git a/drivers/rkflash/sfc_nand.h b/drivers/rkflash/sfc_nand.h new file mode 100644 -index 000000000000..43f4adf4508b +index 000000000..43f4adf45 --- /dev/null +++ b/drivers/rkflash/sfc_nand.h @@ -0,0 +1,133 @@ @@ -1535231,7 +1535232,7 @@ index 000000000000..43f4adf4508b +#endif diff --git a/drivers/rkflash/sfc_nand_boot.c b/drivers/rkflash/sfc_nand_boot.c new file mode 100644 -index 000000000000..d31628a4e612 +index 000000000..d31628a4e --- /dev/null +++ b/drivers/rkflash/sfc_nand_boot.c @@ -0,0 +1,105 @@ @@ -1535342,7 +1535343,7 @@ index 000000000000..d31628a4e612 +}; diff --git a/drivers/rkflash/sfc_nand_mtd.c b/drivers/rkflash/sfc_nand_mtd.c new file mode 100644 -index 000000000000..1b4d306050cf +index 000000000..1b4d30605 --- /dev/null +++ b/drivers/rkflash/sfc_nand_mtd.c @@ -0,0 +1,423 @@ @@ -1535771,7 +1535772,7 @@ index 000000000000..1b4d306050cf +#endif diff --git a/drivers/rkflash/sfc_nand_mtd.h b/drivers/rkflash/sfc_nand_mtd.h new file mode 100644 -index 000000000000..0d49c74654ab +index 000000000..0d49c7465 --- /dev/null +++ b/drivers/rkflash/sfc_nand_mtd.h @@ -0,0 +1,82 @@ @@ -1535859,7 +1535860,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 100644 -index 000000000000..0fce0b994654 +index 000000000..0fce0b994 --- /dev/null +++ b/drivers/rkflash/sfc_nand_mtd_bbt.c @@ -0,0 +1,615 @@ @@ -1536480,7 +1536481,7 @@ index 000000000000..0fce0b994654 +EXPORT_SYMBOL_GPL(snanddev_bbt_set_block_status); diff --git a/drivers/rkflash/sfc_nor.c b/drivers/rkflash/sfc_nor.c new file mode 100644 -index 000000000000..c38801b4fb0d +index 000000000..c38801b4f --- /dev/null +++ b/drivers/rkflash/sfc_nor.c @@ -0,0 +1,796 @@ @@ -1537282,7 +1537283,7 @@ index 000000000000..c38801b4fb0d + diff --git a/drivers/rkflash/sfc_nor.h b/drivers/rkflash/sfc_nor.h new file mode 100644 -index 000000000000..998121c1bd7a +index 000000000..998121c1b --- /dev/null +++ b/drivers/rkflash/sfc_nor.h @@ -0,0 +1,177 @@ @@ -1537465,7 +1537466,7 @@ index 000000000000..998121c1bd7a +#endif diff --git a/drivers/rkflash/sfc_nor_boot.c b/drivers/rkflash/sfc_nor_boot.c new file mode 100644 -index 000000000000..d6fa42b355bb +index 000000000..d6fa42b35 --- /dev/null +++ b/drivers/rkflash/sfc_nor_boot.c @@ -0,0 +1,181 @@ @@ -1537652,7 +1537653,7 @@ index 000000000000..d6fa42b355bb +}; diff --git a/drivers/rkflash/sfc_nor_mtd.c b/drivers/rkflash/sfc_nor_mtd.c new file mode 100644 -index 000000000000..8c9d69a581f2 +index 000000000..8c9d69a58 --- /dev/null +++ b/drivers/rkflash/sfc_nor_mtd.c @@ -0,0 +1,266 @@ @@ -1537924,7 +1537925,7 @@ index 000000000000..8c9d69a581f2 +} diff --git a/drivers/rkflash/typedef.h b/drivers/rkflash/typedef.h new file mode 100644 -index 000000000000..5808ec281fa2 +index 000000000..5808ec281 --- /dev/null +++ b/drivers/rkflash/typedef.h @@ -0,0 +1,30 @@ @@ -1537960,7 +1537961,7 @@ index 000000000000..5808ec281fa2 +#endif /*__TYPEDEF_H */ diff --git a/drivers/rknpu/Kconfig b/drivers/rknpu/Kconfig new file mode 100644 -index 000000000000..c3343eece9c6 +index 000000000..c3343eece --- /dev/null +++ b/drivers/rknpu/Kconfig @@ -0,0 +1,60 @@ @@ -1538026,7 +1538027,7 @@ index 000000000000..c3343eece9c6 +endmenu diff --git a/drivers/rknpu/Makefile b/drivers/rknpu/Makefile new file mode 100644 -index 000000000000..d73563dbaf7d +index 000000000..d73563dba --- /dev/null +++ b/drivers/rknpu/Makefile @@ -0,0 +1,17 @@ @@ -1538049,7 +1538050,7 @@ index 000000000000..d73563dbaf7d +rknpu-$(CONFIG_ROCKCHIP_RKNPU_DMA_HEAP) += rknpu_mem.o diff --git a/drivers/rknpu/include/rknpu_debugger.h b/drivers/rknpu/include/rknpu_debugger.h new file mode 100644 -index 000000000000..3f4420d443e1 +index 000000000..3f4420d44 --- /dev/null +++ b/drivers/rknpu/include/rknpu_debugger.h @@ -0,0 +1,88 @@ @@ -1538143,7 +1538144,7 @@ index 000000000000..3f4420d443e1 +#endif /* __LINUX_RKNPU_FENCE_H_ */ diff --git a/drivers/rknpu/include/rknpu_devfreq.h b/drivers/rknpu/include/rknpu_devfreq.h new file mode 100644 -index 000000000000..3edeb1fe4a6b +index 000000000..3edeb1fe4 --- /dev/null +++ b/drivers/rknpu/include/rknpu_devfreq.h @@ -0,0 +1,46 @@ @@ -1538195,7 +1538196,7 @@ index 000000000000..3edeb1fe4a6b +#endif /* __LINUX_RKNPU_DEVFREQ_H_ */ diff --git a/drivers/rknpu/include/rknpu_drv.h b/drivers/rknpu/include/rknpu_drv.h new file mode 100644 -index 000000000000..ffb902856260 +index 000000000..ffb902856 --- /dev/null +++ b/drivers/rknpu/include/rknpu_drv.h @@ -0,0 +1,176 @@ @@ -1538377,7 +1538378,7 @@ index 000000000000..ffb902856260 +#endif /* __LINUX_RKNPU_DRV_H_ */ diff --git a/drivers/rknpu/include/rknpu_fence.h b/drivers/rknpu/include/rknpu_fence.h new file mode 100644 -index 000000000000..164f6de4116b +index 000000000..164f6de41 --- /dev/null +++ b/drivers/rknpu/include/rknpu_fence.h @@ -0,0 +1,24 @@ @@ -1538407,7 +1538408,7 @@ index 000000000000..164f6de4116b +#endif /* __LINUX_RKNPU_FENCE_H_ */ diff --git a/drivers/rknpu/include/rknpu_gem.h b/drivers/rknpu/include/rknpu_gem.h new file mode 100644 -index 000000000000..aedcab89d241 +index 000000000..aedcab89d --- /dev/null +++ b/drivers/rknpu/include/rknpu_gem.h @@ -0,0 +1,213 @@ @@ -1538626,7 +1538627,7 @@ index 000000000000..aedcab89d241 +#endif diff --git a/drivers/rknpu/include/rknpu_ioctl.h b/drivers/rknpu/include/rknpu_ioctl.h new file mode 100644 -index 000000000000..803caf0c9247 +index 000000000..803caf0c9 --- /dev/null +++ b/drivers/rknpu/include/rknpu_ioctl.h @@ -0,0 +1,319 @@ @@ -1538951,7 +1538952,7 @@ index 000000000000..803caf0c9247 +#endif diff --git a/drivers/rknpu/include/rknpu_iommu.h b/drivers/rknpu/include/rknpu_iommu.h new file mode 100644 -index 000000000000..aa680c997614 +index 000000000..aa680c997 --- /dev/null +++ b/drivers/rknpu/include/rknpu_iommu.h @@ -0,0 +1,40 @@ @@ -1538997,7 +1538998,7 @@ index 000000000000..aa680c997614 +#endif diff --git a/drivers/rknpu/include/rknpu_job.h b/drivers/rknpu/include/rknpu_job.h new file mode 100644 -index 000000000000..cd0d1dfb8363 +index 000000000..cd0d1dfb8 --- /dev/null +++ b/drivers/rknpu/include/rknpu_job.h @@ -0,0 +1,80 @@ @@ -1539083,7 +1539084,7 @@ index 000000000000..cd0d1dfb8363 +#endif /* __LINUX_RKNPU_JOB_H_ */ diff --git a/drivers/rknpu/include/rknpu_mem.h b/drivers/rknpu/include/rknpu_mem.h new file mode 100644 -index 000000000000..69975408f434 +index 000000000..69975408f --- /dev/null +++ b/drivers/rknpu/include/rknpu_mem.h @@ -0,0 +1,46 @@ @@ -1539135,7 +1539136,7 @@ index 000000000000..69975408f434 +#endif diff --git a/drivers/rknpu/include/rknpu_mm.h b/drivers/rknpu/include/rknpu_mm.h new file mode 100644 -index 000000000000..73ae6d7cef98 +index 000000000..73ae6d7ce --- /dev/null +++ b/drivers/rknpu/include/rknpu_mm.h @@ -0,0 +1,42 @@ @@ -1539183,7 +1539184,7 @@ index 000000000000..73ae6d7cef98 +#endif diff --git a/drivers/rknpu/include/rknpu_reset.h b/drivers/rknpu/include/rknpu_reset.h new file mode 100644 -index 000000000000..b80e29b321b0 +index 000000000..b80e29b32 --- /dev/null +++ b/drivers/rknpu/include/rknpu_reset.h @@ -0,0 +1,18 @@ @@ -1539207,7 +1539208,7 @@ index 000000000000..b80e29b321b0 +#endif diff --git a/drivers/rknpu/rknpu_debugger.c b/drivers/rknpu/rknpu_debugger.c new file mode 100644 -index 000000000000..0cfec7fe7c19 +index 000000000..0cfec7fe7 --- /dev/null +++ b/drivers/rknpu/rknpu_debugger.c @@ -0,0 +1,605 @@ @@ -1539818,7 +1539819,7 @@ index 000000000000..0cfec7fe7c19 +} diff --git a/drivers/rknpu/rknpu_devfreq.c b/drivers/rknpu/rknpu_devfreq.c new file mode 100644 -index 000000000000..a2a83a9ccd9e +index 000000000..a2a83a9cc --- /dev/null +++ b/drivers/rknpu/rknpu_devfreq.c @@ -0,0 +1,765 @@ @@ -1540589,7 +1540590,7 @@ index 000000000000..a2a83a9ccd9e +EXPORT_SYMBOL(rknpu_devfreq_remove); diff --git a/drivers/rknpu/rknpu_drv.c b/drivers/rknpu/rknpu_drv.c new file mode 100644 -index 000000000000..c27ac34847a7 +index 000000000..c27ac3484 --- /dev/null +++ b/drivers/rknpu/rknpu_drv.c @@ -0,0 +1,1501 @@ @@ -1542096,7 +1542097,7 @@ index 000000000000..c27ac34847a7 +#endif diff --git a/drivers/rknpu/rknpu_fence.c b/drivers/rknpu/rknpu_fence.c new file mode 100644 -index 000000000000..dc22ea1c4e12 +index 000000000..dc22ea1c4 --- /dev/null +++ b/drivers/rknpu/rknpu_fence.c @@ -0,0 +1,80 @@ @@ -1542182,7 +1542183,7 @@ index 000000000000..dc22ea1c4e12 +} diff --git a/drivers/rknpu/rknpu_gem.c b/drivers/rknpu/rknpu_gem.c new file mode 100644 -index 000000000000..60ad44804a5e +index 000000000..60ad44804 --- /dev/null +++ b/drivers/rknpu/rknpu_gem.c @@ -0,0 +1,1506 @@ @@ -1543694,7 +1543695,7 @@ index 000000000000..60ad44804a5e +} diff --git a/drivers/rknpu/rknpu_iommu.c b/drivers/rknpu/rknpu_iommu.c new file mode 100644 -index 000000000000..01620d9c3056 +index 000000000..01620d9c3 --- /dev/null +++ b/drivers/rknpu/rknpu_iommu.c @@ -0,0 +1,61 @@ @@ -1543761,7 +1543762,7 @@ index 000000000000..01620d9c3056 +} diff --git a/drivers/rknpu/rknpu_job.c b/drivers/rknpu/rknpu_job.c new file mode 100644 -index 000000000000..e13488dfc6b3 +index 000000000..e13488dfc --- /dev/null +++ b/drivers/rknpu/rknpu_job.c @@ -0,0 +1,1044 @@ @@ -1544811,7 +1544812,7 @@ index 000000000000..e13488dfc6b3 +} diff --git a/drivers/rknpu/rknpu_mem.c b/drivers/rknpu/rknpu_mem.c new file mode 100644 -index 000000000000..858c21f484f5 +index 000000000..858c21f48 --- /dev/null +++ b/drivers/rknpu/rknpu_mem.c @@ -0,0 +1,347 @@ @@ -1545164,7 +1545165,7 @@ index 000000000000..858c21f484f5 +#endif diff --git a/drivers/rknpu/rknpu_mm.c b/drivers/rknpu/rknpu_mm.c new file mode 100644 -index 000000000000..a21bb6ded182 +index 000000000..a21bb6ded --- /dev/null +++ b/drivers/rknpu/rknpu_mm.c @@ -0,0 +1,238 @@ @@ -1545408,7 +1545409,7 @@ index 000000000000..a21bb6ded182 +} diff --git a/drivers/rknpu/rknpu_reset.c b/drivers/rknpu/rknpu_reset.c new file mode 100644 -index 000000000000..36657a7852fe +index 000000000..36657a785 --- /dev/null +++ b/drivers/rknpu/rknpu_reset.c @@ -0,0 +1,155 @@ @@ -1545568,7 +1545569,7 @@ index 000000000000..36657a7852fe + return 0; +} diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig -index d7502433c78a..406dfd983b2c 100644 +index d7502433c..406dfd983 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -393,16 +393,36 @@ config RTC_DRV_NCT3018Y @@ -1545612,7 +1545613,7 @@ index d7502433c78a..406dfd983b2c 100644 tristate "Ricoh R2025S/D, RS5C372A/B, RV5C386, RV5C387A" help diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile -index fd209883ee2e..d8e039f4fe9c 100644 +index fd209883e..d8e039f4f 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -137,7 +137,9 @@ obj-$(CONFIG_RTC_DRV_R7301) += rtc-r7301.o @@ -1545627,7 +1545628,7 @@ index fd209883ee2e..d8e039f4fe9c 100644 obj-$(CONFIG_RTC_DRV_RS5C348) += rtc-rs5c348.o diff --git a/drivers/rtc/rtc-fake.c b/drivers/rtc/rtc-fake.c new file mode 100644 -index 000000000000..0b2cf0e7fbfa +index 000000000..0b2cf0e7f --- /dev/null +++ b/drivers/rtc/rtc-fake.c @@ -0,0 +1,116 @@ @@ -1545748,7 +1545749,7 @@ index 000000000000..0b2cf0e7fbfa +MODULE_LICENSE("GPL"); + diff --git a/drivers/rtc/rtc-hym8563.c b/drivers/rtc/rtc-hym8563.c -index b018535c842b..955a3b7e5f4f 100644 +index b018535c8..955a3b7e5 100644 --- a/drivers/rtc/rtc-hym8563.c +++ b/drivers/rtc/rtc-hym8563.c @@ -97,12 +97,6 @@ static int hym8563_rtc_read_time(struct device *dev, struct rtc_time *tm) @@ -1545888,7 +1545889,7 @@ index b018535c842b..955a3b7e5f4f 100644 clear_bit(RTC_FEATURE_UPDATE_INTERRUPT, hym8563->rtc->features); diff --git a/drivers/rtc/rtc-rk-timer.c b/drivers/rtc/rtc-rk-timer.c new file mode 100644 -index 000000000000..aa88fd6de2a1 +index 000000000..aa88fd6de --- /dev/null +++ b/drivers/rtc/rtc-rk-timer.c @@ -0,0 +1,508 @@ @@ -1546402,7 +1546403,7 @@ index 000000000000..aa88fd6de2a1 +MODULE_ALIAS("platform:" DRV_NAME); diff --git a/drivers/rtc/rtc-rk630.c b/drivers/rtc/rtc-rk630.c new file mode 100644 -index 000000000000..c9c08914c135 +index 000000000..c9c08914c --- /dev/null +++ b/drivers/rtc/rtc-rk630.c @@ -0,0 +1,637 @@ @@ -1547044,7 +1547045,7 @@ index 000000000000..c9c08914c135 +MODULE_AUTHOR("Zhang Qing "); +MODULE_LICENSE("GPL"); diff --git a/drivers/rtc/rtc-rk808.c b/drivers/rtc/rtc-rk808.c -index 2d9bcb3ce1e3..40df3fac9c69 100644 +index 2d9bcb3ce..40df3fac9 100644 --- a/drivers/rtc/rtc-rk808.c +++ b/drivers/rtc/rtc-rk808.c @@ -14,6 +14,7 @@ @@ -1547353,7 +1547354,7 @@ index 2d9bcb3ce1e3..40df3fac9c69 100644 dev_err(&pdev->dev, diff --git a/drivers/rtc/rtc-rockchip.c b/drivers/rtc/rtc-rockchip.c new file mode 100644 -index 000000000000..5ea695c2f2f3 +index 000000000..5ea695c2f --- /dev/null +++ b/drivers/rtc/rtc-rockchip.c @@ -0,0 +1,810 @@ @@ -1548168,7 +1548169,7 @@ index 000000000000..5ea695c2f2f3 +MODULE_AUTHOR("Zhang Qing "); +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/Kconfig b/drivers/soc/rockchip/Kconfig -index aff2f7e95237..503d83beb494 100644 +index aff2f7e95..503d83beb 100644 --- a/drivers/soc/rockchip/Kconfig +++ b/drivers/soc/rockchip/Kconfig @@ -1,12 +1,65 @@ @@ -1548478,7 +1548479,7 @@ index aff2f7e95237..503d83beb494 100644 endif diff --git a/drivers/soc/rockchip/Kconfig.cpu b/drivers/soc/rockchip/Kconfig.cpu new file mode 100644 -index 000000000000..1ffc763434bf +index 000000000..1ffc76343 --- /dev/null +++ b/drivers/soc/rockchip/Kconfig.cpu @@ -0,0 +1,72 @@ @@ -1548555,7 +1548556,7 @@ index 000000000000..1ffc763434bf + +endmenu diff --git a/drivers/soc/rockchip/Makefile b/drivers/soc/rockchip/Makefile -index 23d414433c8c..8015b2c47bf2 100644 +index 23d414433..8015b2c47 100644 --- a/drivers/soc/rockchip/Makefile +++ b/drivers/soc/rockchip/Makefile @@ -2,6 +2,35 @@ @@ -1548596,7 +1548597,7 @@ index 23d414433c8c..8015b2c47bf2 100644 +obj-$(CONFIG_ROCKCHIP_MINIDUMP) += minidump/ diff --git a/drivers/soc/rockchip/fiq_debugger/Kconfig b/drivers/soc/rockchip/fiq_debugger/Kconfig new file mode 100644 -index 000000000000..4805100b127a +index 000000000..4805100b1 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/Kconfig @@ -0,0 +1,87 @@ @@ -1548689,7 +1548690,7 @@ index 000000000000..4805100b127a + Say y here to enable Rockchip FIQ Debugger platform driver. diff --git a/drivers/soc/rockchip/fiq_debugger/Makefile b/drivers/soc/rockchip/fiq_debugger/Makefile new file mode 100644 -index 000000000000..6ac2cd61bf8e +index 000000000..6ac2cd61b --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/Makefile @@ -0,0 +1,3 @@ @@ -1548698,7 +1548699,7 @@ index 000000000000..6ac2cd61bf8e +obj-$(CONFIG_ROCKCHIP_FIQ_DEBUGGER) += rk_fiq_debugger.o diff --git a/drivers/soc/rockchip/fiq_debugger/fiq_debugger.c b/drivers/soc/rockchip/fiq_debugger/fiq_debugger.c new file mode 100644 -index 000000000000..373efed6965c +index 000000000..373efed69 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger.c @@ -0,0 +1,1729 @@ @@ -1550433,7 +1550434,7 @@ index 000000000000..373efed6965c +MODULE_ALIAS("platform:fiq-debugger"); diff --git a/drivers/soc/rockchip/fiq_debugger/fiq_debugger.h b/drivers/soc/rockchip/fiq_debugger/fiq_debugger.h new file mode 100644 -index 000000000000..e2003e47904d +index 000000000..e2003e479 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger.h @@ -0,0 +1,81 @@ @@ -1550520,7 +1550521,7 @@ index 000000000000..e2003e47904d +#endif diff --git a/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm.c b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm.c new file mode 100644 -index 000000000000..d44287eba4bd +index 000000000..d44287eba --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm.c @@ -0,0 +1,270 @@ @@ -1550796,7 +1550797,7 @@ index 000000000000..d44287eba4bd +#endif diff --git a/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm64.c b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm64.c new file mode 100644 -index 000000000000..d77b1ebdcde7 +index 000000000..d77b1ebdc --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm64.c @@ -0,0 +1,204 @@ @@ -1551006,7 +1551007,7 @@ index 000000000000..d77b1ebdcde7 +#endif diff --git a/drivers/soc/rockchip/fiq_debugger/fiq_debugger_priv.h b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_priv.h new file mode 100644 -index 000000000000..915860a6b38a +index 000000000..915860a6b --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_priv.h @@ -0,0 +1,39 @@ @@ -1551051,7 +1551052,7 @@ index 000000000000..915860a6b38a +#endif diff --git a/drivers/soc/rockchip/fiq_debugger/fiq_debugger_ringbuf.h b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_ringbuf.h new file mode 100644 -index 000000000000..10c3c5d09098 +index 000000000..10c3c5d09 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_ringbuf.h @@ -0,0 +1,94 @@ @@ -1551151,7 +1551152,7 @@ index 000000000000..10c3c5d09098 +} diff --git a/drivers/soc/rockchip/fiq_debugger/fiq_watchdog.c b/drivers/soc/rockchip/fiq_debugger/fiq_watchdog.c new file mode 100644 -index 000000000000..194b54138417 +index 000000000..194b54138 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_watchdog.c @@ -0,0 +1,56 @@ @@ -1551213,7 +1551214,7 @@ index 000000000000..194b54138417 +} diff --git a/drivers/soc/rockchip/fiq_debugger/fiq_watchdog.h b/drivers/soc/rockchip/fiq_debugger/fiq_watchdog.h new file mode 100644 -index 000000000000..c6b507f8d976 +index 000000000..c6b507f8d --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/fiq_watchdog.h @@ -0,0 +1,20 @@ @@ -1551239,7 +1551240,7 @@ index 000000000000..c6b507f8d976 +#endif diff --git a/drivers/soc/rockchip/fiq_debugger/rk_fiq_debugger.c b/drivers/soc/rockchip/fiq_debugger/rk_fiq_debugger.c new file mode 100644 -index 000000000000..e5421e4515d2 +index 000000000..e5421e451 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/rk_fiq_debugger.c @@ -0,0 +1,1136 @@ @@ -1552381,7 +1552382,7 @@ index 000000000000..e5421e4515d2 +MODULE_ALIAS("platform:rk-fiq-debugger"); diff --git a/drivers/soc/rockchip/fiq_debugger/rk_fiq_debugger.h b/drivers/soc/rockchip/fiq_debugger/rk_fiq_debugger.h new file mode 100644 -index 000000000000..f5ec8d143b22 +index 000000000..f5ec8d143 --- /dev/null +++ b/drivers/soc/rockchip/fiq_debugger/rk_fiq_debugger.h @@ -0,0 +1,22 @@ @@ -1552409,7 +1552410,7 @@ index 000000000000..f5ec8d143b22 +#endif diff --git a/drivers/soc/rockchip/flash_vendor_storage.c b/drivers/soc/rockchip/flash_vendor_storage.c new file mode 100644 -index 000000000000..7c8cd338d286 +index 000000000..7c8cd338d --- /dev/null +++ b/drivers/soc/rockchip/flash_vendor_storage.c @@ -0,0 +1,342 @@ @@ -1552757,7 +1552758,7 @@ index 000000000000..7c8cd338d286 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/flash_vendor_storage.h b/drivers/soc/rockchip/flash_vendor_storage.h new file mode 100644 -index 000000000000..55ca52486de7 +index 000000000..55ca52486 --- /dev/null +++ b/drivers/soc/rockchip/flash_vendor_storage.h @@ -0,0 +1,16 @@ @@ -1552778,7 +1552779,7 @@ index 000000000000..55ca52486de7 +#endif + diff --git a/drivers/soc/rockchip/grf.c b/drivers/soc/rockchip/grf.c -index 5fd62046b28a..b68556f542dd 100644 +index 5fd62046b..b68556f54 100644 --- a/drivers/soc/rockchip/grf.c +++ b/drivers/soc/rockchip/grf.c @@ -5,12 +5,105 @@ @@ -1553031,7 +1553032,7 @@ index 5fd62046b28a..b68556f542dd 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 6619256c2d11..26ca59f43227 100644 +index 6619256c2..26ca59f43 100644 --- a/drivers/soc/rockchip/io-domain.c +++ b/drivers/soc/rockchip/io-domain.c @@ -14,6 +14,13 @@ @@ -1553362,7 +1553363,7 @@ index 6619256c2d11..26ca59f43227 100644 MODULE_AUTHOR("Heiko Stuebner "); diff --git a/drivers/soc/rockchip/iomux.c b/drivers/soc/rockchip/iomux.c new file mode 100644 -index 000000000000..110feb7f839d +index 000000000..110feb7f8 --- /dev/null +++ b/drivers/soc/rockchip/iomux.c @@ -0,0 +1,88 @@ @@ -1553456,7 +1553457,7 @@ index 000000000000..110feb7f839d +late_initcall(rk_iomux_device_create); diff --git a/drivers/soc/rockchip/minidump/Kconfig b/drivers/soc/rockchip/minidump/Kconfig new file mode 100644 -index 000000000000..64dc1465004b +index 000000000..64dc14650 --- /dev/null +++ b/drivers/soc/rockchip/minidump/Kconfig @@ -0,0 +1,40 @@ @@ -1553502,7 +1553503,7 @@ index 000000000000..64dc1465004b +endmenu diff --git a/drivers/soc/rockchip/minidump/Makefile b/drivers/soc/rockchip/minidump/Makefile new file mode 100644 -index 000000000000..7f799a034c01 +index 000000000..7f799a034 --- /dev/null +++ b/drivers/soc/rockchip/minidump/Makefile @@ -0,0 +1,3 @@ @@ -1553511,7 +1553512,7 @@ index 000000000000..7f799a034c01 +rockchip_minidump-y := rk_minidump.o minidump_log.o minidump_memory.o rk_minidump_asm.o diff --git a/drivers/soc/rockchip/minidump/elf.h b/drivers/soc/rockchip/minidump/elf.h new file mode 100644 -index 000000000000..dbccd0316008 +index 000000000..dbccd0316 --- /dev/null +++ b/drivers/soc/rockchip/minidump/elf.h @@ -0,0 +1,45 @@ @@ -1553562,7 +1553563,7 @@ index 000000000000..dbccd0316008 +#endif diff --git a/drivers/soc/rockchip/minidump/minidump_log.c b/drivers/soc/rockchip/minidump/minidump_log.c new file mode 100644 -index 000000000000..18b1934e9356 +index 000000000..18b1934e9 --- /dev/null +++ b/drivers/soc/rockchip/minidump/minidump_log.c @@ -0,0 +1,1508 @@ @@ -1555076,7 +1555077,7 @@ index 000000000000..18b1934e9356 +} diff --git a/drivers/soc/rockchip/minidump/minidump_memory.c b/drivers/soc/rockchip/minidump/minidump_memory.c new file mode 100644 -index 000000000000..d7f93e2f12b6 +index 000000000..d7f93e2f1 --- /dev/null +++ b/drivers/soc/rockchip/minidump/minidump_memory.c @@ -0,0 +1,1350 @@ @@ -1556432,7 +1556433,7 @@ index 000000000000..d7f93e2f12b6 +} diff --git a/drivers/soc/rockchip/minidump/minidump_memory.h b/drivers/soc/rockchip/minidump/minidump_memory.h new file mode 100644 -index 000000000000..086f1f89a090 +index 000000000..086f1f89a --- /dev/null +++ b/drivers/soc/rockchip/minidump/minidump_memory.h @@ -0,0 +1,51 @@ @@ -1556489,7 +1556490,7 @@ index 000000000000..086f1f89a090 +void md_debugfs_dmabufprocs(struct dentry *minidump_dir); diff --git a/drivers/soc/rockchip/minidump/minidump_private.h b/drivers/soc/rockchip/minidump/minidump_private.h new file mode 100644 -index 000000000000..f2dadce35bf0 +index 000000000..f2dadce35 --- /dev/null +++ b/drivers/soc/rockchip/minidump/minidump_private.h @@ -0,0 +1,90 @@ @@ -1556585,7 +1556586,7 @@ index 000000000000..f2dadce35bf0 +#endif diff --git a/drivers/soc/rockchip/minidump/rk_minidump.c b/drivers/soc/rockchip/minidump/rk_minidump.c new file mode 100644 -index 000000000000..d742b7e2eda6 +index 000000000..d742b7e2e --- /dev/null +++ b/drivers/soc/rockchip/minidump/rk_minidump.c @@ -0,0 +1,779 @@ @@ -1557370,7 +1557371,7 @@ index 000000000000..d742b7e2eda6 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/minidump/rk_minidump_asm.S b/drivers/soc/rockchip/minidump/rk_minidump_asm.S new file mode 100755 -index 000000000000..c8fa137be25e +index 000000000..c8fa137be --- /dev/null +++ b/drivers/soc/rockchip/minidump/rk_minidump_asm.S @@ -0,0 +1,23 @@ @@ -1557399,7 +1557400,7 @@ index 000000000000..c8fa137be25e +SYM_FUNC_END_PI(rk_md_flush_dcache_area) diff --git a/drivers/soc/rockchip/mtd_vendor_storage.c b/drivers/soc/rockchip/mtd_vendor_storage.c new file mode 100644 -index 000000000000..1f32930d906c +index 000000000..1f32930d9 --- /dev/null +++ b/drivers/soc/rockchip/mtd_vendor_storage.c @@ -0,0 +1,445 @@ @@ -1557850,7 +1557851,7 @@ index 000000000000..1f32930d906c +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/ram_vendor_storage.c b/drivers/soc/rockchip/ram_vendor_storage.c new file mode 100644 -index 000000000000..eb9768d88d3d +index 000000000..eb9768d88 --- /dev/null +++ b/drivers/soc/rockchip/ram_vendor_storage.c @@ -0,0 +1,214 @@ @@ -1558070,7 +1558071,7 @@ index 000000000000..eb9768d88d3d +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rk_camera_sensor_info.h b/drivers/soc/rockchip/rk_camera_sensor_info.h new file mode 100644 -index 000000000000..55823b3839b2 +index 000000000..55823b383 --- /dev/null +++ b/drivers/soc/rockchip/rk_camera_sensor_info.h @@ -0,0 +1,421 @@ @@ -1558497,7 +1558498,7 @@ index 000000000000..55823b3839b2 +#endif diff --git a/drivers/soc/rockchip/rk_cma_procfs.c b/drivers/soc/rockchip/rk_cma_procfs.c new file mode 100644 -index 000000000000..b2e48b5718c4 +index 000000000..b2e48b571 --- /dev/null +++ b/drivers/soc/rockchip/rk_cma_procfs.c @@ -0,0 +1,93 @@ @@ -1558596,7 +1558597,7 @@ index 000000000000..b2e48b5718c4 +MODULE_ALIAS("platform:rk-cma"); diff --git a/drivers/soc/rockchip/rk_dmabuf_procfs.c b/drivers/soc/rockchip/rk_dmabuf_procfs.c new file mode 100644 -index 000000000000..e389449a10ef +index 000000000..e389449a1 --- /dev/null +++ b/drivers/soc/rockchip/rk_dmabuf_procfs.c @@ -0,0 +1,206 @@ @@ -1558808,7 +1558809,7 @@ index 000000000000..e389449a10ef +MODULE_ALIAS("platform:rk-dmabuf"); diff --git a/drivers/soc/rockchip/rk_memblock_procfs.c b/drivers/soc/rockchip/rk_memblock_procfs.c new file mode 100644 -index 000000000000..f888c9c18738 +index 000000000..f888c9c18 --- /dev/null +++ b/drivers/soc/rockchip/rk_memblock_procfs.c @@ -0,0 +1,50 @@ @@ -1558864,7 +1558865,7 @@ index 000000000000..f888c9c18738 +late_initcall_sync(rk_memblock_procfs_init); diff --git a/drivers/soc/rockchip/rk_vendor_storage.c b/drivers/soc/rockchip/rk_vendor_storage.c new file mode 100644 -index 000000000000..a8a316e47ff9 +index 000000000..a8a316e47 --- /dev/null +++ b/drivers/soc/rockchip/rk_vendor_storage.c @@ -0,0 +1,50 @@ @@ -1558920,7 +1558921,7 @@ index 000000000000..a8a316e47ff9 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip-cpuinfo.c b/drivers/soc/rockchip/rockchip-cpuinfo.c new file mode 100644 -index 000000000000..02befb165d98 +index 000000000..02befb165 --- /dev/null +++ b/drivers/soc/rockchip/rockchip-cpuinfo.c @@ -0,0 +1,309 @@ @@ -1559235,7 +1559236,7 @@ index 000000000000..02befb165d98 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_amp.c b/drivers/soc/rockchip/rockchip_amp.c new file mode 100644 -index 000000000000..6f5bdc678756 +index 000000000..6f5bdc678 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_amp.c @@ -0,0 +1,660 @@ @@ -1559901,7 +1559902,7 @@ index 000000000000..6f5bdc678756 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_csu.c b/drivers/soc/rockchip/rockchip_csu.c new file mode 100644 -index 000000000000..04a6a5b39715 +index 000000000..04a6a5b39 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_csu.c @@ -0,0 +1,377 @@ @@ -1560284,7 +1560285,7 @@ index 000000000000..04a6a5b39715 +MODULE_DESCRIPTION("Rockchip clock subunit driver"); diff --git a/drivers/soc/rockchip/rockchip_debug.c b/drivers/soc/rockchip/rockchip_debug.c new file mode 100644 -index 000000000000..417781d3f8b0 +index 000000000..417781d3f --- /dev/null +++ b/drivers/soc/rockchip/rockchip_debug.c @@ -0,0 +1,680 @@ @@ -1560970,7 +1560971,7 @@ index 000000000000..417781d3f8b0 +MODULE_ALIAS("platform:rockchip-debugger"); diff --git a/drivers/soc/rockchip/rockchip_debug.h b/drivers/soc/rockchip/rockchip_debug.h new file mode 100644 -index 000000000000..82036d8ebf72 +index 000000000..82036d8eb --- /dev/null +++ b/drivers/soc/rockchip/rockchip_debug.h @@ -0,0 +1,14 @@ @@ -1560990,7 +1560991,7 @@ index 000000000000..82036d8ebf72 +#endif diff --git a/drivers/soc/rockchip/rockchip_decompress.c b/drivers/soc/rockchip/rockchip_decompress.c new file mode 100644 -index 000000000000..275a605cfccb +index 000000000..275a605cf --- /dev/null +++ b/drivers/soc/rockchip/rockchip_decompress.c @@ -0,0 +1,388 @@ @@ -1561384,7 +1561385,7 @@ index 000000000000..275a605cfccb +pure_initcall(rockchip_hw_decompress_init); diff --git a/drivers/soc/rockchip/rockchip_decompress_user.c b/drivers/soc/rockchip/rockchip_decompress_user.c new file mode 100644 -index 000000000000..4e47e810c48f +index 000000000..4e47e810c --- /dev/null +++ b/drivers/soc/rockchip/rockchip_decompress_user.c @@ -0,0 +1,287 @@ @@ -1561677,7 +1561678,7 @@ index 000000000000..4e47e810c48f +MODULE_DESCRIPTION("Rockchip decom driver"); diff --git a/drivers/soc/rockchip/rockchip_disable_unused.c b/drivers/soc/rockchip/rockchip_disable_unused.c new file mode 100644 -index 000000000000..5f9a9b3b9338 +index 000000000..5f9a9b3b9 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_disable_unused.c @@ -0,0 +1,24 @@ @@ -1561707,7 +1561708,7 @@ index 000000000000..5f9a9b3b9338 +#endif diff --git a/drivers/soc/rockchip/rockchip_ipa.c b/drivers/soc/rockchip/rockchip_ipa.c new file mode 100644 -index 000000000000..e8982b7defee +index 000000000..e8982b7de --- /dev/null +++ b/drivers/soc/rockchip/rockchip_ipa.c @@ -0,0 +1,232 @@ @@ -1561945,7 +1561946,7 @@ index 000000000000..e8982b7defee +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_npor_powergood.c b/drivers/soc/rockchip/rockchip_npor_powergood.c new file mode 100644 -index 000000000000..1c92541ce2ae +index 000000000..1c92541ce --- /dev/null +++ b/drivers/soc/rockchip/rockchip_npor_powergood.c @@ -0,0 +1,101 @@ @@ -1562052,7 +1562053,7 @@ index 000000000000..1c92541ce2ae +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_opp_select.c b/drivers/soc/rockchip/rockchip_opp_select.c new file mode 100644 -index 000000000000..9e3b93fa7920 +index 000000000..9e3b93fa7 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_opp_select.c @@ -0,0 +1,2490 @@ @@ -1564548,7 +1564549,7 @@ index 000000000000..9e3b93fa7920 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_performance.c b/drivers/soc/rockchip/rockchip_performance.c new file mode 100644 -index 000000000000..6b96ea060062 +index 000000000..6b96ea060 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_performance.c @@ -0,0 +1,185 @@ @@ -1564739,7 +1564740,7 @@ index 000000000000..6b96ea060062 +#endif /* CONFIG_SMP */ diff --git a/drivers/soc/rockchip/rockchip_pm_config.c b/drivers/soc/rockchip/rockchip_pm_config.c new file mode 100644 -index 000000000000..c805f686bd70 +index 000000000..c805f686b --- /dev/null +++ b/drivers/soc/rockchip/rockchip_pm_config.c @@ -0,0 +1,616 @@ @@ -1565361,7 +1565362,7 @@ index 000000000000..c805f686bd70 +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_pvtm.c b/drivers/soc/rockchip/rockchip_pvtm.c new file mode 100644 -index 000000000000..75006737f421 +index 000000000..75006737f --- /dev/null +++ b/drivers/soc/rockchip/rockchip_pvtm.c @@ -0,0 +1,1046 @@ @@ -1566413,7 +1566414,7 @@ index 000000000000..75006737f421 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/soc/rockchip/rockchip_ramdisk.c b/drivers/soc/rockchip/rockchip_ramdisk.c new file mode 100644 -index 000000000000..7ce0dfe15d1c +index 000000000..7ce0dfe15 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_ramdisk.c @@ -0,0 +1,354 @@ @@ -1566773,7 +1566774,7 @@ index 000000000000..7ce0dfe15d1c +MODULE_LICENSE("GPL"); diff --git a/drivers/soc/rockchip/rockchip_system_monitor.c b/drivers/soc/rockchip/rockchip_system_monitor.c new file mode 100644 -index 000000000000..5087e6192152 +index 000000000..5087e6192 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_system_monitor.c @@ -0,0 +1,1691 @@ @@ -1568470,7 +1568471,7 @@ index 000000000000..5087e6192152 +MODULE_DESCRIPTION("rockchip system monitor driver"); diff --git a/drivers/soc/rockchip/rockchip_thunderboot_crypto.c b/drivers/soc/rockchip/rockchip_thunderboot_crypto.c new file mode 100644 -index 000000000000..7a3c93a0304e +index 000000000..7a3c93a03 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_crypto.c @@ -0,0 +1,440 @@ @@ -1568916,7 +1568917,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 100644 -index 000000000000..10618811f0e9 +index 000000000..10618811f --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_mmc.c @@ -0,0 +1,165 @@ @@ -1569087,7 +1569088,7 @@ index 000000000000..10618811f0e9 +pure_initcall(rk_tb_mmc_init); diff --git a/drivers/soc/rockchip/rockchip_thunderboot_service.c b/drivers/soc/rockchip/rockchip_thunderboot_service.c new file mode 100644 -index 000000000000..6002d64c8b05 +index 000000000..6002d64c8 --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_service.c @@ -0,0 +1,192 @@ @@ -1569285,7 +1569286,7 @@ index 000000000000..6002d64c8b05 +arch_initcall(rk_tb_serv_init); diff --git a/drivers/soc/rockchip/rockchip_thunderboot_sfc.c b/drivers/soc/rockchip/rockchip_thunderboot_sfc.c new file mode 100644 -index 000000000000..d81ca755aa12 +index 000000000..d81ca755a --- /dev/null +++ b/drivers/soc/rockchip/rockchip_thunderboot_sfc.c @@ -0,0 +1,141 @@ @@ -1569432,7 +1569433,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 100644 -index 000000000000..ea1d9410b8eb +index 000000000..ea1d9410b --- /dev/null +++ b/drivers/soc/rockchip/sdmmc_vendor_storage.c @@ -0,0 +1,586 @@ @@ -1570023,7 +1570024,7 @@ index 000000000000..ea1d9410b8eb +module_exit(vendor_storage_deinit); +MODULE_LICENSE("GPL"); diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig -index 5dc634897b48..73ff1e155e94 100644 +index 5dc634897..73ff1e155 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -54,6 +54,8 @@ source "drivers/staging/nvec/Kconfig" @@ -1570045,7 +1570046,7 @@ index 5dc634897b48..73ff1e155e94 100644 +source "drivers/staging/ucollection/Kconfig" endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile -index aec6e94a3c69..30b7433e68bb 100644 +index aec6e94a3..30b7433e6 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -17,6 +17,7 @@ obj-$(CONFIG_IIO) += iio/ @@ -1570064,7 +1570065,7 @@ index aec6e94a3c69..30b7433e68bb 100644 +obj-$(CONFIG_UNIFIED_COLLECTION) += ucollection/ diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig new file mode 100644 -index 000000000000..8d8fd5c29349 +index 000000000..8d8fd5c29 --- /dev/null +++ b/drivers/staging/android/Kconfig @@ -0,0 +1,21 @@ @@ -1570091,7 +1570092,7 @@ index 000000000000..8d8fd5c29349 +endmenu diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile new file mode 100644 -index 000000000000..3b66cd0b0ec5 +index 000000000..3b66cd0b0 --- /dev/null +++ b/drivers/staging/android/Makefile @@ -0,0 +1,6 @@ @@ -1570103,7 +1570104,7 @@ index 000000000000..3b66cd0b0ec5 +obj-$(CONFIG_ASHMEM) += ashmem.o diff --git a/drivers/staging/android/TODO b/drivers/staging/android/TODO new file mode 100644 -index 000000000000..80eccfaf6db5 +index 000000000..80eccfaf6 --- /dev/null +++ b/drivers/staging/android/TODO @@ -0,0 +1,13 @@ @@ -1570122,7 +1570123,7 @@ index 000000000000..80eccfaf6db5 +Arve HjønnevÃ¥g and Riley Andrews diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c new file mode 100644 -index 000000000000..a1d11cc23ff5 +index 000000000..a1d11cc23 --- /dev/null +++ b/drivers/staging/android/ashmem.c @@ -0,0 +1,1192 @@ @@ -1571320,7 +1571321,7 @@ index 000000000000..a1d11cc23ff5 +device_initcall(ashmem_init); diff --git a/drivers/staging/android/ashmem.h b/drivers/staging/android/ashmem.h new file mode 100644 -index 000000000000..2f04163c67ed +index 000000000..2f04163c6 --- /dev/null +++ b/drivers/staging/android/ashmem.h @@ -0,0 +1,47 @@ @@ -1571373,7 +1571374,7 @@ index 000000000000..2f04163c67ed +#endif /* _LINUX_ASHMEM_H */ diff --git a/drivers/staging/android/ion/Kconfig b/drivers/staging/android/ion/Kconfig new file mode 100644 -index 000000000000..7b7da979991e +index 000000000..7b7da9799 --- /dev/null +++ b/drivers/staging/android/ion/Kconfig @@ -0,0 +1,14 @@ @@ -1571393,7 +1571394,7 @@ index 000000000000..7b7da979991e +source "drivers/staging/android/ion/heaps/Kconfig" diff --git a/drivers/staging/android/ion/Makefile b/drivers/staging/android/ion/Makefile new file mode 100644 -index 000000000000..7f8fd0f537b4 +index 000000000..7f8fd0f53 --- /dev/null +++ b/drivers/staging/android/ion/Makefile @@ -0,0 +1,4 @@ @@ -1571403,7 +1571404,7 @@ index 000000000000..7f8fd0f537b4 +obj-y += heaps/ diff --git a/drivers/staging/android/ion/heaps/Kconfig b/drivers/staging/android/ion/heaps/Kconfig new file mode 100644 -index 000000000000..5034c45a397d +index 000000000..5034c45a3 --- /dev/null +++ b/drivers/staging/android/ion/heaps/Kconfig @@ -0,0 +1,15 @@ @@ -1571424,7 +1571425,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 100644 -index 000000000000..82e36e89e978 +index 000000000..82e36e89e --- /dev/null +++ b/drivers/staging/android/ion/heaps/Makefile @@ -0,0 +1,5 @@ @@ -1571435,7 +1571436,7 @@ index 000000000000..82e36e89e978 +obj-$(CONFIG_ION_CMA_HEAP) += ion_cma_heap.o diff --git a/drivers/staging/android/ion/heaps/ion_cma_heap.c b/drivers/staging/android/ion/heaps/ion_cma_heap.c new file mode 100644 -index 000000000000..6ba7fd84c9ee +index 000000000..6ba7fd84c --- /dev/null +++ b/drivers/staging/android/ion/heaps/ion_cma_heap.c @@ -0,0 +1,151 @@ @@ -1571592,7 +1571593,7 @@ index 000000000000..6ba7fd84c9ee +MODULE_LICENSE("GPL v2"); diff --git a/drivers/staging/android/ion/heaps/ion_page_pool.c b/drivers/staging/android/ion/heaps/ion_page_pool.c new file mode 100644 -index 000000000000..efd6ce4cc0ad +index 000000000..efd6ce4cc --- /dev/null +++ b/drivers/staging/android/ion/heaps/ion_page_pool.c @@ -0,0 +1,172 @@ @@ -1571770,7 +1571771,7 @@ index 000000000000..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 100644 -index 000000000000..10c79090c7a0 +index 000000000..10c79090c --- /dev/null +++ b/drivers/staging/android/ion/heaps/ion_page_pool.h @@ -0,0 +1,67 @@ @@ -1571843,7 +1571844,7 @@ index 000000000000..10c79090c7a0 +#endif /* _ION_PAGE_POOL_H */ diff --git a/drivers/staging/android/ion/heaps/ion_system_heap.c b/drivers/staging/android/ion/heaps/ion_system_heap.c new file mode 100644 -index 000000000000..45d23bea3822 +index 000000000..45d23bea3 --- /dev/null +++ b/drivers/staging/android/ion/heaps/ion_system_heap.c @@ -0,0 +1,344 @@ @@ -1572193,7 +1572194,7 @@ index 000000000000..45d23bea3822 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c new file mode 100644 -index 000000000000..3d9ec5f1045c +index 000000000..3d9ec5f10 --- /dev/null +++ b/drivers/staging/android/ion/ion.c @@ -0,0 +1,518 @@ @@ -1572717,7 +1572718,7 @@ index 000000000000..3d9ec5f1045c +subsys_initcall(ion_device_create); diff --git a/drivers/staging/android/ion/ion_buffer.c b/drivers/staging/android/ion/ion_buffer.c new file mode 100644 -index 000000000000..9baca1a472b6 +index 000000000..9baca1a47 --- /dev/null +++ b/drivers/staging/android/ion/ion_buffer.c @@ -0,0 +1,278 @@ @@ -1573001,7 +1573002,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 100644 -index 000000000000..47ae54af5ccf +index 000000000..47ae54af5 --- /dev/null +++ b/drivers/staging/android/ion/ion_dma_buf.c @@ -0,0 +1,359 @@ @@ -1573366,7 +1573367,7 @@ index 000000000000..47ae54af5ccf +} diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c new file mode 100644 -index 000000000000..aa29a4ee48a3 +index 000000000..aa29a4ee4 --- /dev/null +++ b/drivers/staging/android/ion/ion_heap.c @@ -0,0 +1,291 @@ @@ -1573663,7 +1573664,7 @@ index 000000000000..aa29a4ee48a3 +} diff --git a/drivers/staging/android/ion/ion_private.h b/drivers/staging/android/ion/ion_private.h new file mode 100644 -index 000000000000..db4e90683f4c +index 000000000..db4e90683 --- /dev/null +++ b/drivers/staging/android/ion/ion_private.h @@ -0,0 +1,58 @@ @@ -1573727,7 +1573728,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 100644 -index 000000000000..c7f25373a744 +index 000000000..c7f25373a --- /dev/null +++ b/drivers/staging/android/ion/ion_protected_heap.c @@ -0,0 +1,526 @@ @@ -1574259,7 +1574260,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 100644 -index 000000000000..eacb47d4f135 +index 000000000..eacb47d4f --- /dev/null +++ b/drivers/staging/android/ion/ion_trace.h @@ -0,0 +1,55 @@ @@ -1574320,7 +1574321,7 @@ index 000000000000..eacb47d4f135 +#include diff --git a/drivers/staging/android/ion/rockchip/Makefile b/drivers/staging/android/ion/rockchip/Makefile new file mode 100644 -index 000000000000..89265fcbbe6f +index 000000000..89265fcbb --- /dev/null +++ b/drivers/staging/android/ion/rockchip/Makefile @@ -0,0 +1,3 @@ @@ -1574329,7 +1574330,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 100644 -index 000000000000..d3c3d06856ad +index 000000000..d3c3d0685 --- /dev/null +++ b/drivers/staging/android/ion/rockchip/rockchip_ion.c @@ -0,0 +1,224 @@ @@ -1574559,7 +1574560,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 100644 -index 000000000000..ab27d05319ae +index 000000000..ab27d0531 --- /dev/null +++ b/drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c @@ -0,0 +1,145 @@ @@ -1574710,7 +1574711,7 @@ index 000000000000..ab27d05319ae +postcore_initcall(rockchip_ion_snapshot_init); diff --git a/drivers/staging/android/uapi/ashmem.h b/drivers/staging/android/uapi/ashmem.h new file mode 100644 -index 000000000000..2d4673b609d6 +index 000000000..2d4673b60 --- /dev/null +++ b/drivers/staging/android/uapi/ashmem.h @@ -0,0 +1,54 @@ @@ -1574770,7 +1574771,7 @@ index 000000000000..2d4673b609d6 +#endif /* _UAPI_LINUX_ASHMEM_H */ diff --git a/drivers/staging/android/uapi/ion.h b/drivers/staging/android/uapi/ion.h new file mode 100644 -index 000000000000..46c93fcb46d6 +index 000000000..46c93fcb4 --- /dev/null +++ b/drivers/staging/android/uapi/ion.h @@ -0,0 +1,127 @@ @@ -1574902,7 +1574903,7 @@ index 000000000000..46c93fcb46d6 + +#endif /* _UAPI_LINUX_ION_H */ diff --git a/drivers/staging/blackbox/Kconfig b/drivers/staging/blackbox/Kconfig -index 0e985823c2e8..7f1eb0e16e2d 100644 +index 0e985823c..7f1eb0e16 100644 --- a/drivers/staging/blackbox/Kconfig +++ b/drivers/staging/blackbox/Kconfig @@ -106,3 +106,14 @@ config DEF_BLACKBOX_STORAGE @@ -1574921,7 +1574922,7 @@ index 0e985823c2e8..7f1eb0e16e2d 100644 + +endif diff --git a/drivers/staging/blackbox/Makefile b/drivers/staging/blackbox/Makefile -index 9befa81a176e..77c1a37e5102 100644 +index 9befa81a1..77c1a37e5 100644 --- a/drivers/staging/blackbox/Makefile +++ b/drivers/staging/blackbox/Makefile @@ -3,3 +3,5 @@ @@ -1574932,7 +1574933,7 @@ index 9befa81a176e..77c1a37e5102 100644 +obj-$(CONFIG_BLACKBOX_ROCKCHIP) += rockchip/ diff --git a/drivers/staging/blackbox/rockchip/Makefile b/drivers/staging/blackbox/rockchip/Makefile new file mode 100644 -index 000000000000..8bef3d7285ed +index 000000000..8bef3d728 --- /dev/null +++ b/drivers/staging/blackbox/rockchip/Makefile @@ -0,0 +1,4 @@ @@ -1574942,7 +1574943,7 @@ index 000000000000..8bef3d7285ed +obj-$(CONFIG_BLACKBOX_STORAGE_BY_MEMORY) += system_adapter_by_memory.o diff --git a/drivers/staging/blackbox/rockchip/system_adapter.c b/drivers/staging/blackbox/rockchip/system_adapter.c new file mode 100644 -index 000000000000..538f8fbd745d +index 000000000..538f8fbd7 --- /dev/null +++ b/drivers/staging/blackbox/rockchip/system_adapter.c @@ -0,0 +1,312 @@ @@ -1575260,7 +1575261,7 @@ index 000000000000..538f8fbd745d +MODULE_AUTHOR("OHOS"); diff --git a/drivers/staging/blackbox/rockchip/system_adapter_by_memory.c b/drivers/staging/blackbox/rockchip/system_adapter_by_memory.c new file mode 100644 -index 000000000000..30757db43e42 +index 000000000..30757db43 --- /dev/null +++ b/drivers/staging/blackbox/rockchip/system_adapter_by_memory.c @@ -0,0 +1,313 @@ @@ -1575578,7 +1575579,7 @@ index 000000000000..30757db43e42 +MODULE_DESCRIPTION("Blackbox for system"); +MODULE_AUTHOR("OHOS"); diff --git a/drivers/tee/optee/supp.c b/drivers/tee/optee/supp.c -index 322a543b8c27..2d556b79a67e 100644 +index 322a543b8..2d556b79a 100644 --- a/drivers/tee/optee/supp.c +++ b/drivers/tee/optee/supp.c @@ -82,6 +82,9 @@ u32 optee_supp_thrd_req(struct tee_context *ctx, u32 func, size_t num_params, @@ -1575626,7 +1575627,7 @@ index 322a543b8c27..2d556b79a67e 100644 mutex_unlock(&supp->mutex); diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h -index 1aa3e55c8b47..14a5cb64034a 100644 +index 1aa3e55c8..14a5cb640 100644 --- a/drivers/tty/serial/8250/8250.h +++ b/drivers/tty/serial/8250/8250.h @@ -51,6 +51,9 @@ struct uart_8250_dma { @@ -1575683,7 +1575684,7 @@ index 1aa3e55c8b47..14a5cb64034a 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 3449f8790e46..9853e356f795 100644 +index 3449f8790..9853e356f 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -569,6 +569,7 @@ static void __init serial8250_isa_init_ports(void) @@ -1575726,7 +1575727,7 @@ index 3449f8790e46..9853e356f795 100644 MODULE_LICENSE("GPL"); diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c -index 7fa66501792d..f48abcf669d6 100644 +index 7fa665017..f48abcf66 100644 --- a/drivers/tty/serial/8250/8250_dma.c +++ b/drivers/tty/serial/8250/8250_dma.c @@ -11,6 +11,13 @@ @@ -1576035,7 +1576036,7 @@ index 7fa66501792d..f48abcf669d6 100644 dev_dbg_ratelimited(p->port.dev, "dma channels released\n"); } diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c -index a1f2259cc9a9..73c78debb997 100644 +index a1f2259cc..73c78debb 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -30,11 +30,16 @@ @@ -1576289,7 +1576290,7 @@ index a1f2259cc9a9..73c78debb997 100644 }; MODULE_DEVICE_TABLE(acpi, dw8250_acpi_match); diff --git a/drivers/tty/serial/8250/8250_dwlib.c b/drivers/tty/serial/8250/8250_dwlib.c -index 84843e204a5e..9dd6c3bd2da2 100644 +index 84843e204..9dd6c3bd2 100644 --- a/drivers/tty/serial/8250/8250_dwlib.c +++ b/drivers/tty/serial/8250/8250_dwlib.c @@ -296,6 +296,9 @@ void dw8250_setup_port(struct uart_port *p) @@ -1576310,7 +1576311,7 @@ index 84843e204a5e..9dd6c3bd2da2 100644 EXPORT_SYMBOL_GPL(dw8250_setup_port); +#endif diff --git a/drivers/tty/serial/8250/8250_dwlib.h b/drivers/tty/serial/8250/8250_dwlib.h -index f13e91f2cace..13025a666e6e 100644 +index f13e91f2c..13025a666 100644 --- a/drivers/tty/serial/8250/8250_dwlib.h +++ b/drivers/tty/serial/8250/8250_dwlib.h @@ -43,6 +43,11 @@ struct dw8250_data { @@ -1576326,7 +1576327,7 @@ index f13e91f2cace..13025a666e6e 100644 unsigned int uart_16550_compatible:1; }; diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c -index 141627370aab..47d943b92782 100644 +index 141627370..47d943b92 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -55,6 +55,7 @@ @@ -1576605,7 +1576606,7 @@ index 141627370aab..47d943b92782 100644 serial8250_rpm_put(up); diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 71635dfa741d..07446b94b4e4 100644 +index 71635dfa7..07446b94b 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1850,7 +1850,8 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) @@ -1576619,7 +1576620,7 @@ index 71635dfa741d..07446b94b4e4 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 15e9bd180a1d..96c67eacacfe 100644 +index 15e9bd180..96c67eaca 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -322,6 +322,10 @@ static const struct usb_device_id usb_quirk_list[] = { @@ -1576656,7 +1576657,7 @@ index 15e9bd180a1d..96c67eacacfe 100644 { USB_DEVICE(0x2386, 0x3114), .driver_info = USB_QUIRK_NO_LPM }, diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig -index b694d7669d32..a772957233a5 100644 +index b694d7669..a77295723 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -40,6 +40,7 @@ source "drivers/gpu/host1x/Kconfig" @@ -1576679,7 +1576680,7 @@ index b694d7669d32..a772957233a5 100644 tristate default n diff --git a/drivers/video/Makefile b/drivers/video/Makefile -index 6bbc03950899..8e1b0f820829 100644 +index 6bbc03950..8e1b0f820 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_VT) += console/ @@ -1576692,7 +1576693,7 @@ index 6bbc03950899..8e1b0f820829 100644 diff --git a/drivers/video/hdmi-notifier.c b/drivers/video/hdmi-notifier.c new file mode 100644 -index 000000000000..a233359cacfa +index 000000000..a233359ca --- /dev/null +++ b/drivers/video/hdmi-notifier.c @@ -0,0 +1,61 @@ @@ -1576759,7 +1576760,7 @@ index 000000000000..a233359cacfa +EXPORT_SYMBOL_GPL(hdmi_event_new_eld); diff --git a/drivers/video/rockchip/Kconfig b/drivers/video/rockchip/Kconfig new file mode 100644 -index 000000000000..6548dd38b534 +index 000000000..6548dd38b --- /dev/null +++ b/drivers/video/rockchip/Kconfig @@ -0,0 +1,11 @@ @@ -1576776,7 +1576777,7 @@ index 000000000000..6548dd38b534 +source "drivers/video/rockchip/vtunnel/Kconfig" diff --git a/drivers/video/rockchip/Makefile b/drivers/video/rockchip/Makefile new file mode 100644 -index 000000000000..867ac56fe5b7 +index 000000000..867ac56fe --- /dev/null +++ b/drivers/video/rockchip/Makefile @@ -0,0 +1,11 @@ @@ -1576793,7 +1576794,7 @@ index 000000000000..867ac56fe5b7 +obj-$(CONFIG_ROCKCHIP_VIDEO_TUNNEL) += vtunnel/ diff --git a/drivers/video/rockchip/dvbm/Kconfig b/drivers/video/rockchip/dvbm/Kconfig new file mode 100644 -index 000000000000..bfbd396b2706 +index 000000000..bfbd396b2 --- /dev/null +++ b/drivers/video/rockchip/dvbm/Kconfig @@ -0,0 +1,18 @@ @@ -1576817,7 +1576818,7 @@ index 000000000000..bfbd396b2706 +endif diff --git a/drivers/video/rockchip/dvbm/Makefile b/drivers/video/rockchip/dvbm/Makefile new file mode 100644 -index 000000000000..9096c34720ec +index 000000000..9096c3472 --- /dev/null +++ b/drivers/video/rockchip/dvbm/Makefile @@ -0,0 +1,5 @@ @@ -1576828,7 +1576829,7 @@ index 000000000000..9096c34720ec +obj-$(CONFIG_ROCKCHIP_DVBM) += rk_dvbm.o diff --git a/drivers/video/rockchip/dvbm/rockchip_dvbm.c b/drivers/video/rockchip/dvbm/rockchip_dvbm.c new file mode 100644 -index 000000000000..abff28da714e +index 000000000..abff28da7 --- /dev/null +++ b/drivers/video/rockchip/dvbm/rockchip_dvbm.c @@ -0,0 +1,752 @@ @@ -1577586,7 +1577587,7 @@ index 000000000000..abff28da714e +MODULE_DESCRIPTION("Rockchip dvbm driver"); diff --git a/drivers/video/rockchip/dvbm/rockchip_dvbm.h b/drivers/video/rockchip/dvbm/rockchip_dvbm.h new file mode 100644 -index 000000000000..9f298b7dd47d +index 000000000..9f298b7dd --- /dev/null +++ b/drivers/video/rockchip/dvbm/rockchip_dvbm.h @@ -0,0 +1,214 @@ @@ -1577806,7 +1577807,7 @@ index 000000000000..9f298b7dd47d +#endif diff --git a/drivers/video/rockchip/iep/Kconfig b/drivers/video/rockchip/iep/Kconfig new file mode 100644 -index 000000000000..cd8ba653f9ea +index 000000000..cd8ba653f --- /dev/null +++ b/drivers/video/rockchip/iep/Kconfig @@ -0,0 +1,10 @@ @@ -1577822,7 +1577823,7 @@ index 000000000000..cd8ba653f9ea +endmenu diff --git a/drivers/video/rockchip/iep/Makefile b/drivers/video/rockchip/iep/Makefile new file mode 100644 -index 000000000000..f4dba6e9379a +index 000000000..f4dba6e93 --- /dev/null +++ b/drivers/video/rockchip/iep/Makefile @@ -0,0 +1,4 @@ @@ -1577832,7 +1577833,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 100644 -index 000000000000..1f4a0706233f +index 000000000..1f4a07062 --- /dev/null +++ b/drivers/video/rockchip/iep/hw_iep_config_addr.h @@ -0,0 +1,99 @@ @@ -1577937,7 +1577938,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 100644 -index 000000000000..331a50865045 +index 000000000..331a50865 --- /dev/null +++ b/drivers/video/rockchip/iep/hw_iep_reg.c @@ -0,0 +1,1530 @@ @@ -1579473,7 +1579474,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 100644 -index 000000000000..03d9fe92ca23 +index 000000000..03d9fe92c --- /dev/null +++ b/drivers/video/rockchip/iep/hw_iep_reg.h @@ -0,0 +1,525 @@ @@ -1580004,7 +1580005,7 @@ index 000000000000..03d9fe92ca23 +#endif diff --git a/drivers/video/rockchip/iep/iep.h b/drivers/video/rockchip/iep/iep.h new file mode 100644 -index 000000000000..94e372e6a471 +index 000000000..94e372e6a --- /dev/null +++ b/drivers/video/rockchip/iep/iep.h @@ -0,0 +1,276 @@ @@ -1580286,7 +1580287,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 100644 -index 000000000000..a7199c62dd04 +index 000000000..a7199c62d --- /dev/null +++ b/drivers/video/rockchip/iep/iep_drv.c @@ -0,0 +1,1321 @@ @@ -1581613,7 +1581614,7 @@ index 000000000000..a7199c62dd04 +#endif diff --git a/drivers/video/rockchip/iep/iep_drv.h b/drivers/video/rockchip/iep/iep_drv.h new file mode 100644 -index 000000000000..19160c6ffccd +index 000000000..19160c6ff --- /dev/null +++ b/drivers/video/rockchip/iep/iep_drv.h @@ -0,0 +1,159 @@ @@ -1581778,7 +1581779,7 @@ index 000000000000..19160c6ffccd + diff --git a/drivers/video/rockchip/iep/iep_iommu_drm.c b/drivers/video/rockchip/iep/iep_iommu_drm.c new file mode 100644 -index 000000000000..654459a908ff +index 000000000..654459a90 --- /dev/null +++ b/drivers/video/rockchip/iep/iep_iommu_drm.c @@ -0,0 +1,464 @@ @@ -1582248,7 +1582249,7 @@ index 000000000000..654459a908ff +} diff --git a/drivers/video/rockchip/iep/iep_iommu_ops.c b/drivers/video/rockchip/iep/iep_iommu_ops.c new file mode 100644 -index 000000000000..e84772237b89 +index 000000000..e84772237 --- /dev/null +++ b/drivers/video/rockchip/iep/iep_iommu_ops.c @@ -0,0 +1,244 @@ @@ -1582498,7 +1582499,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 100644 -index 000000000000..9b71d53a51eb +index 000000000..9b71d53a5 --- /dev/null +++ b/drivers/video/rockchip/iep/iep_iommu_ops.h @@ -0,0 +1,121 @@ @@ -1582625,7 +1582626,7 @@ index 000000000000..9b71d53a51eb +#endif diff --git a/drivers/video/rockchip/mpp/Kconfig b/drivers/video/rockchip/mpp/Kconfig new file mode 100644 -index 000000000000..53342703a6ee +index 000000000..53342703a --- /dev/null +++ b/drivers/video/rockchip/mpp/Kconfig @@ -0,0 +1,78 @@ @@ -1582709,7 +1582710,7 @@ index 000000000000..53342703a6ee +endif diff --git a/drivers/video/rockchip/mpp/Makefile b/drivers/video/rockchip/mpp/Makefile new file mode 100644 -index 000000000000..42ec696bc9d7 +index 000000000..42ec696bc --- /dev/null +++ b/drivers/video/rockchip/mpp/Makefile @@ -0,0 +1,30 @@ @@ -1582745,7 +1582746,7 @@ index 000000000000..42ec696bc9d7 +obj-$(CONFIG_ROCKCHIP_MPP_SERVICE) += rk_vcodec.o diff --git a/drivers/video/rockchip/mpp/hack/mpp_hack_px30.c b/drivers/video/rockchip/mpp/hack/mpp_hack_px30.c new file mode 100644 -index 000000000000..a8e1a457bf97 +index 000000000..a8e1a457b --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_hack_px30.c @@ -0,0 +1,245 @@ @@ -1582996,7 +1582997,7 @@ index 000000000000..a8e1a457bf97 +} diff --git a/drivers/video/rockchip/mpp/hack/mpp_hack_px30.h b/drivers/video/rockchip/mpp/hack/mpp_hack_px30.h new file mode 100644 -index 000000000000..c8402e30d810 +index 000000000..c8402e30d --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_hack_px30.h @@ -0,0 +1,27 @@ @@ -1583029,7 +1583030,7 @@ index 000000000000..c8402e30d810 +#endif diff --git a/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_hack_rk3568.c b/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_hack_rk3568.c new file mode 100644 -index 000000000000..c2bb2687fc3d +index 000000000..c2bb2687f --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_hack_rk3568.c @@ -0,0 +1,732 @@ @@ -1583767,7 +1583768,7 @@ index 000000000000..c2bb2687fc3d +} diff --git a/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_link_hack_rk3568.c b/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_link_hack_rk3568.c new file mode 100644 -index 000000000000..900b63a57673 +index 000000000..900b63a57 --- /dev/null +++ b/drivers/video/rockchip/mpp/hack/mpp_rkvdec2_link_hack_rk3568.c @@ -0,0 +1,213 @@ @@ -1583986,7 +1583987,7 @@ index 000000000000..900b63a57673 +} diff --git a/drivers/video/rockchip/mpp/mpp_av1dec.c b/drivers/video/rockchip/mpp/mpp_av1dec.c new file mode 100644 -index 000000000000..33e118ae6450 +index 000000000..33e118ae6 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_av1dec.c @@ -0,0 +1,1343 @@ @@ -1585335,7 +1585336,7 @@ index 000000000000..33e118ae6450 +}; diff --git a/drivers/video/rockchip/mpp/mpp_common.c b/drivers/video/rockchip/mpp/mpp_common.c new file mode 100644 -index 000000000000..f80087d11170 +index 000000000..f80087d11 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_common.c @@ -0,0 +1,2610 @@ @@ -1587951,7 +1587952,7 @@ index 000000000000..f80087d11170 +#endif diff --git a/drivers/video/rockchip/mpp/mpp_common.h b/drivers/video/rockchip/mpp/mpp_common.h new file mode 100644 -index 000000000000..8daeb0838170 +index 000000000..8daeb0838 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_common.h @@ -0,0 +1,853 @@ @@ -1588810,7 +1588811,7 @@ index 000000000000..8daeb0838170 +#endif diff --git a/drivers/video/rockchip/mpp/mpp_debug.h b/drivers/video/rockchip/mpp/mpp_debug.h new file mode 100644 -index 000000000000..4108c69da894 +index 000000000..4108c69da --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_debug.h @@ -0,0 +1,138 @@ @@ -1588954,7 +1588955,7 @@ index 000000000000..4108c69da894 +#endif diff --git a/drivers/video/rockchip/mpp/mpp_iep2.c b/drivers/video/rockchip/mpp/mpp_iep2.c new file mode 100644 -index 000000000000..8d1926957f69 +index 000000000..8d1926957 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iep2.c @@ -0,0 +1,1038 @@ @@ -1589998,7 +1589999,7 @@ index 000000000000..8d1926957f69 + diff --git a/drivers/video/rockchip/mpp/mpp_iommu.c b/drivers/video/rockchip/mpp/mpp_iommu.c new file mode 100644 -index 000000000000..2dbf1535904d +index 000000000..2dbf15359 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iommu.c @@ -0,0 +1,671 @@ @@ -1590675,7 +1590676,7 @@ index 000000000000..2dbf1535904d +} diff --git a/drivers/video/rockchip/mpp/mpp_iommu.h b/drivers/video/rockchip/mpp/mpp_iommu.h new file mode 100644 -index 000000000000..c4c0199f8558 +index 000000000..c4c0199f8 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iommu.h @@ -0,0 +1,184 @@ @@ -1590865,7 +1590866,7 @@ index 000000000000..c4c0199f8558 +#endif diff --git a/drivers/video/rockchip/mpp/mpp_iommu_av1d.c b/drivers/video/rockchip/mpp/mpp_iommu_av1d.c new file mode 100644 -index 000000000000..39ff16c21ee9 +index 000000000..39ff16c21 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_iommu_av1d.c @@ -0,0 +1,997 @@ @@ -1591868,7 +1591869,7 @@ index 000000000000..39ff16c21ee9 +}; diff --git a/drivers/video/rockchip/mpp/mpp_jpgdec.c b/drivers/video/rockchip/mpp/mpp_jpgdec.c new file mode 100644 -index 000000000000..753b061f22ea +index 000000000..753b061f2 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_jpgdec.c @@ -0,0 +1,643 @@ @@ -1592517,7 +1592518,7 @@ index 000000000000..753b061f22ea +EXPORT_SYMBOL(rockchip_jpgdec_driver); diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec.c b/drivers/video/rockchip/mpp/mpp_rkvdec.c new file mode 100644 -index 000000000000..32b08a14734c +index 000000000..32b08a147 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec.c @@ -0,0 +1,1925 @@ @@ -1594448,7 +1594449,7 @@ index 000000000000..32b08a14734c +EXPORT_SYMBOL(rockchip_rkvdec_driver); diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2.c b/drivers/video/rockchip/mpp/mpp_rkvdec2.c new file mode 100644 -index 000000000000..7a5fcda6cce2 +index 000000000..7a5fcda6c --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2.c @@ -0,0 +1,1760 @@ @@ -1596214,7 +1596215,7 @@ index 000000000000..7a5fcda6cce2 +EXPORT_SYMBOL(rockchip_rkvdec2_driver); diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2.h b/drivers/video/rockchip/mpp/mpp_rkvdec2.h new file mode 100644 -index 000000000000..3a1ac035abb0 +index 000000000..3a1ac035a --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2.h @@ -0,0 +1,241 @@ @@ -1596461,7 +1596462,7 @@ index 000000000000..3a1ac035abb0 +#endif diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c new file mode 100644 -index 000000000000..7c5a58df1865 +index 000000000..7c5a58df1 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c @@ -0,0 +1,2511 @@ @@ -1598978,7 +1598979,7 @@ index 000000000000..7c5a58df1865 +} diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2_link.h b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.h new file mode 100644 -index 000000000000..518927e9481e +index 000000000..518927e94 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.h @@ -0,0 +1,238 @@ @@ -1599222,7 +1599223,7 @@ index 000000000000..518927e9481e +#endif diff --git a/drivers/video/rockchip/mpp/mpp_rkvenc.c b/drivers/video/rockchip/mpp/mpp_rkvenc.c new file mode 100644 -index 000000000000..c30f74d8124c +index 000000000..c30f74d81 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvenc.c @@ -0,0 +1,1464 @@ @@ -1600692,7 +1600693,7 @@ index 000000000000..c30f74d8124c +}; diff --git a/drivers/video/rockchip/mpp/mpp_rkvenc2.c b/drivers/video/rockchip/mpp/mpp_rkvenc2.c new file mode 100644 -index 000000000000..c7b9e9d98881 +index 000000000..c7b9e9d98 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_rkvenc2.c @@ -0,0 +1,2658 @@ @@ -1603356,7 +1603357,7 @@ index 000000000000..c7b9e9d98881 +}; diff --git a/drivers/video/rockchip/mpp/mpp_service.c b/drivers/video/rockchip/mpp/mpp_service.c new file mode 100644 -index 000000000000..29792d9cd8a2 +index 000000000..29792d9cd --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_service.c @@ -0,0 +1,500 @@ @@ -1603862,7 +1603863,7 @@ index 000000000000..29792d9cd8a2 +MODULE_DESCRIPTION("Rockchip mpp service driver"); diff --git a/drivers/video/rockchip/mpp/mpp_vdpp.c b/drivers/video/rockchip/mpp/mpp_vdpp.c new file mode 100644 -index 000000000000..c0dc382a1872 +index 000000000..c0dc382a1 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vdpp.c @@ -0,0 +1,784 @@ @@ -1604652,7 +1604653,7 @@ index 000000000000..c0dc382a1872 +EXPORT_SYMBOL(rockchip_vdpp_driver); diff --git a/drivers/video/rockchip/mpp/mpp_vdpu1.c b/drivers/video/rockchip/mpp/mpp_vdpu1.c new file mode 100644 -index 000000000000..6ddf5dae73f3 +index 000000000..6ddf5dae7 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vdpu1.c @@ -0,0 +1,972 @@ @@ -1605630,7 +1605631,7 @@ index 000000000000..6ddf5dae73f3 +EXPORT_SYMBOL(rockchip_vdpu1_driver); diff --git a/drivers/video/rockchip/mpp/mpp_vdpu2.c b/drivers/video/rockchip/mpp/mpp_vdpu2.c new file mode 100644 -index 000000000000..d5a6a3017208 +index 000000000..d5a6a3017 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vdpu2.c @@ -0,0 +1,808 @@ @@ -1606444,7 +1606445,7 @@ index 000000000000..d5a6a3017208 +EXPORT_SYMBOL(rockchip_vdpu2_driver); diff --git a/drivers/video/rockchip/mpp/mpp_vepu1.c b/drivers/video/rockchip/mpp/mpp_vepu1.c new file mode 100644 -index 000000000000..18f685a2e948 +index 000000000..18f685a2e --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vepu1.c @@ -0,0 +1,795 @@ @@ -1607245,7 +1607246,7 @@ index 000000000000..18f685a2e948 +EXPORT_SYMBOL(rockchip_vepu1_driver); diff --git a/drivers/video/rockchip/mpp/mpp_vepu2.c b/drivers/video/rockchip/mpp/mpp_vepu2.c new file mode 100644 -index 000000000000..fb5f5e5c28e3 +index 000000000..fb5f5e5c2 --- /dev/null +++ b/drivers/video/rockchip/mpp/mpp_vepu2.c @@ -0,0 +1,1278 @@ @@ -1608529,7 +1608530,7 @@ index 000000000000..fb5f5e5c28e3 +EXPORT_SYMBOL(rockchip_vepu2_driver); diff --git a/drivers/video/rockchip/mpp/rockchip_iep2_regs.h b/drivers/video/rockchip/mpp/rockchip_iep2_regs.h new file mode 100644 -index 000000000000..d85a30dfb84f +index 000000000..d85a30dfb --- /dev/null +++ b/drivers/video/rockchip/mpp/rockchip_iep2_regs.h @@ -0,0 +1,183 @@ @@ -1608718,7 +1608719,7 @@ index 000000000000..d85a30dfb84f + diff --git a/drivers/video/rockchip/mpp_osal/Kconfig b/drivers/video/rockchip/mpp_osal/Kconfig new file mode 100644 -index 000000000000..75cd7028615f +index 000000000..75cd70286 --- /dev/null +++ b/drivers/video/rockchip/mpp_osal/Kconfig @@ -0,0 +1,8 @@ @@ -1608732,7 +1608733,7 @@ index 000000000000..75cd7028615f + rockchip mpp osal adapt for kmpp diff --git a/drivers/video/rockchip/mpp_osal/Makefile b/drivers/video/rockchip/mpp_osal/Makefile new file mode 100644 -index 000000000000..f4ca9643fff2 +index 000000000..f4ca9643f --- /dev/null +++ b/drivers/video/rockchip/mpp_osal/Makefile @@ -0,0 +1,2 @@ @@ -1608740,7 +1608741,7 @@ index 000000000000..f4ca9643fff2 +obj-$(CONFIG_ROCKCHIP_MPP_OSAL) += mpp_osal.o diff --git a/drivers/video/rockchip/mpp_osal/mpp_osal.c b/drivers/video/rockchip/mpp_osal/mpp_osal.c new file mode 100644 -index 000000000000..a778b1904044 +index 000000000..a778b1904 --- /dev/null +++ b/drivers/video/rockchip/mpp_osal/mpp_osal.c @@ -0,0 +1,30 @@ @@ -1608776,7 +1608777,7 @@ index 000000000000..a778b1904044 +EXPORT_SYMBOL(mpp_device_init_wakeup); diff --git a/drivers/video/rockchip/mpp_osal/mpp_osal.h b/drivers/video/rockchip/mpp_osal/mpp_osal.h new file mode 100644 -index 000000000000..d798dfd0c293 +index 000000000..d798dfd0c --- /dev/null +++ b/drivers/video/rockchip/mpp_osal/mpp_osal.h @@ -0,0 +1,18 @@ @@ -1608800,7 +1608801,7 @@ index 000000000000..d798dfd0c293 +#endif diff --git a/drivers/video/rockchip/rga/Kconfig b/drivers/video/rockchip/rga/Kconfig new file mode 100644 -index 000000000000..6023b2eb23a7 +index 000000000..6023b2eb2 --- /dev/null +++ b/drivers/video/rockchip/rga/Kconfig @@ -0,0 +1,10 @@ @@ -1608816,7 +1608817,7 @@ index 000000000000..6023b2eb23a7 +endmenu diff --git a/drivers/video/rockchip/rga/Makefile b/drivers/video/rockchip/rga/Makefile new file mode 100644 -index 000000000000..58dd4c6a3e42 +index 000000000..58dd4c6a3 --- /dev/null +++ b/drivers/video/rockchip/rga/Makefile @@ -0,0 +1,4 @@ @@ -1608826,7 +1608827,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 100644 -index 000000000000..947a9b925f60 +index 000000000..947a9b925 --- /dev/null +++ b/drivers/video/rockchip/rga/RGA_API.c @@ -0,0 +1,201 @@ @@ -1609033,7 +1609034,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 100644 -index 000000000000..ade17d03e85c +index 000000000..ade17d03e --- /dev/null +++ b/drivers/video/rockchip/rga/RGA_API.h @@ -0,0 +1,40 @@ @@ -1609079,7 +1609080,7 @@ index 000000000000..ade17d03e85c +#endif diff --git a/drivers/video/rockchip/rga/rga.h b/drivers/video/rockchip/rga/rga.h new file mode 100644 -index 000000000000..59da2042af0e +index 000000000..59da2042a --- /dev/null +++ b/drivers/video/rockchip/rga/rga.h @@ -0,0 +1,507 @@ @@ -1609592,7 +1609593,7 @@ index 000000000000..59da2042af0e +#endif /*_RK29_IPP_DRIVER_H_*/ diff --git a/drivers/video/rockchip/rga/rga_drv.c b/drivers/video/rockchip/rga/rga_drv.c new file mode 100644 -index 000000000000..c5d3672c54fa +index 000000000..c5d3672c5 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_drv.c @@ -0,0 +1,2574 @@ @@ -1612172,7 +1612173,7 @@ index 000000000000..c5d3672c54fa +MODULE_LICENSE("GPL"); diff --git a/drivers/video/rockchip/rga/rga_mmu_info.c b/drivers/video/rockchip/rga/rga_mmu_info.c new file mode 100644 -index 000000000000..32a99d53bb73 +index 000000000..32a99d53b --- /dev/null +++ b/drivers/video/rockchip/rga/rga_mmu_info.c @@ -0,0 +1,1325 @@ @@ -1613503,7 +1613504,7 @@ index 000000000000..32a99d53bb73 + diff --git a/drivers/video/rockchip/rga/rga_mmu_info.h b/drivers/video/rockchip/rga/rga_mmu_info.h new file mode 100644 -index 000000000000..d4226cc16329 +index 000000000..d4226cc16 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_mmu_info.h @@ -0,0 +1,24 @@ @@ -1613533,7 +1613534,7 @@ index 000000000000..d4226cc16329 + diff --git a/drivers/video/rockchip/rga/rga_reg_info.c b/drivers/video/rockchip/rga/rga_reg_info.c new file mode 100644 -index 000000000000..94a6305b870b +index 000000000..94a6305b8 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_reg_info.c @@ -0,0 +1,1587 @@ @@ -1615126,7 +1615127,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 100644 -index 000000000000..565e8f72d7f0 +index 000000000..565e8f72d --- /dev/null +++ b/drivers/video/rockchip/rga/rga_reg_info.h @@ -0,0 +1,467 @@ @@ -1615599,7 +1615600,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 100644 -index 000000000000..ed9758711022 +index 000000000..ed9758711 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_rop.h @@ -0,0 +1,56 @@ @@ -1615661,7 +1615662,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 100644 -index 000000000000..ce3610ab9b67 +index 000000000..ce3610ab9 --- /dev/null +++ b/drivers/video/rockchip/rga/rga_type.h @@ -0,0 +1,49 @@ @@ -1615716,7 +1615717,7 @@ index 000000000000..ce3610ab9b67 + diff --git a/drivers/video/rockchip/rga2/Kconfig b/drivers/video/rockchip/rga2/Kconfig new file mode 100644 -index 000000000000..49a0f62b99a0 +index 000000000..49a0f62b9 --- /dev/null +++ b/drivers/video/rockchip/rga2/Kconfig @@ -0,0 +1,30 @@ @@ -1615752,7 +1615753,7 @@ index 000000000000..49a0f62b99a0 +endif diff --git a/drivers/video/rockchip/rga2/Makefile b/drivers/video/rockchip/rga2/Makefile new file mode 100644 -index 000000000000..60181fffa4c8 +index 000000000..60181fffa --- /dev/null +++ b/drivers/video/rockchip/rga2/Makefile @@ -0,0 +1,5 @@ @@ -1615763,7 +1615764,7 @@ index 000000000000..60181fffa4c8 +obj-$(CONFIG_ROCKCHIP_RGA2) += rga2.o diff --git a/drivers/video/rockchip/rga2/RGA2_API.c b/drivers/video/rockchip/rga2/RGA2_API.c new file mode 100644 -index 000000000000..0be2c1ae64b6 +index 000000000..0be2c1ae6 --- /dev/null +++ b/drivers/video/rockchip/rga2/RGA2_API.c @@ -0,0 +1,23 @@ @@ -1615792,7 +1615793,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 100644 -index 000000000000..1fa38ed6cffe +index 000000000..1fa38ed6c --- /dev/null +++ b/drivers/video/rockchip/rga2/RGA2_API.h @@ -0,0 +1,59 @@ @@ -1615857,7 +1615858,7 @@ index 000000000000..1fa38ed6cffe +#endif diff --git a/drivers/video/rockchip/rga2/rga2.h b/drivers/video/rockchip/rga2/rga2.h new file mode 100644 -index 000000000000..335970c44ed6 +index 000000000..335970c44 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2.h @@ -0,0 +1,792 @@ @@ -1616655,7 +1616656,7 @@ index 000000000000..335970c44ed6 +#endif /*_RK29_IPP_DRIVER_H_*/ diff --git a/drivers/video/rockchip/rga2/rga2_debugger.c b/drivers/video/rockchip/rga2/rga2_debugger.c new file mode 100644 -index 000000000000..66ba484df9a9 +index 000000000..66ba484df --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_debugger.c @@ -0,0 +1,395 @@ @@ -1617056,7 +1617057,7 @@ index 000000000000..66ba484df9a9 +#endif /* #ifdef CONFIG_ROCKCHIP_RGA2_PROC_FS */ diff --git a/drivers/video/rockchip/rga2/rga2_debugger.h b/drivers/video/rockchip/rga2/rga2_debugger.h new file mode 100644 -index 000000000000..33b2f43e9f8a +index 000000000..33b2f43e9 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_debugger.h @@ -0,0 +1,120 @@ @@ -1617182,7 +1617183,7 @@ index 000000000000..33b2f43e9f8a + diff --git a/drivers/video/rockchip/rga2/rga2_drv.c b/drivers/video/rockchip/rga2/rga2_drv.c new file mode 100644 -index 000000000000..ca5218f3e09f +index 000000000..ca5218f3e --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_drv.c @@ -0,0 +1,2273 @@ @@ -1619461,7 +1619462,7 @@ index 000000000000..ca5218f3e09f +MODULE_LICENSE("GPL"); diff --git a/drivers/video/rockchip/rga2/rga2_mmu_info.c b/drivers/video/rockchip/rga2/rga2_mmu_info.c new file mode 100644 -index 000000000000..1095522c59b0 +index 000000000..1095522c5 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_mmu_info.c @@ -0,0 +1,1843 @@ @@ -1621310,7 +1621311,7 @@ index 000000000000..1095522c59b0 + diff --git a/drivers/video/rockchip/rga2/rga2_mmu_info.h b/drivers/video/rockchip/rga2/rga2_mmu_info.h new file mode 100644 -index 000000000000..a823f2fe7c3a +index 000000000..a823f2fe7 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_mmu_info.h @@ -0,0 +1,35 @@ @@ -1621351,7 +1621352,7 @@ index 000000000000..a823f2fe7c3a + diff --git a/drivers/video/rockchip/rga2/rga2_reg_info.c b/drivers/video/rockchip/rga2/rga2_reg_info.c new file mode 100644 -index 000000000000..a6c154989dd1 +index 000000000..a6c154989 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_reg_info.c @@ -0,0 +1,1689 @@ @@ -1623046,7 +1623047,7 @@ index 000000000000..a6c154989dd1 +} diff --git a/drivers/video/rockchip/rga2/rga2_reg_info.h b/drivers/video/rockchip/rga2/rga2_reg_info.h new file mode 100644 -index 000000000000..7aaac7d3502b +index 000000000..7aaac7d35 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_reg_info.h @@ -0,0 +1,331 @@ @@ -1623383,7 +1623384,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 100644 -index 000000000000..dc2a343f4c5c +index 000000000..dc2a343f4 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_rop.h @@ -0,0 +1,56 @@ @@ -1623445,7 +1623446,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 100644 -index 000000000000..30f5df2f38e5 +index 000000000..30f5df2f3 --- /dev/null +++ b/drivers/video/rockchip/rga2/rga2_type.h @@ -0,0 +1,49 @@ @@ -1623500,7 +1623501,7 @@ index 000000000000..30f5df2f38e5 + diff --git a/drivers/video/rockchip/rga3/Kconfig b/drivers/video/rockchip/rga3/Kconfig new file mode 100644 -index 000000000000..c8c96b2d67ff +index 000000000..c8c96b2d6 --- /dev/null +++ b/drivers/video/rockchip/rga3/Kconfig @@ -0,0 +1,37 @@ @@ -1623543,7 +1623544,7 @@ index 000000000000..c8c96b2d67ff +endif diff --git a/drivers/video/rockchip/rga3/Makefile b/drivers/video/rockchip/rga3/Makefile new file mode 100644 -index 000000000000..11f401de2ae0 +index 000000000..11f401de2 --- /dev/null +++ b/drivers/video/rockchip/rga3/Makefile @@ -0,0 +1,9 @@ @@ -1623558,7 +1623559,7 @@ index 000000000000..11f401de2ae0 +obj-$(CONFIG_ROCKCHIP_MULTI_RGA) += rga3.o diff --git a/drivers/video/rockchip/rga3/include/rga.h b/drivers/video/rockchip/rga3/include/rga.h new file mode 100644 -index 000000000000..2a60a1ae72db +index 000000000..2a60a1ae7 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga.h @@ -0,0 +1,944 @@ @@ -1624508,7 +1624509,7 @@ index 000000000000..2a60a1ae72db +#endif /*_RGA_DRIVER_H_*/ diff --git a/drivers/video/rockchip/rga3/include/rga2_reg_info.h b/drivers/video/rockchip/rga3/include/rga2_reg_info.h new file mode 100644 -index 000000000000..add2f41bda78 +index 000000000..add2f41bd --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga2_reg_info.h @@ -0,0 +1,477 @@ @@ -1624991,7 +1624992,7 @@ index 000000000000..add2f41bda78 + diff --git a/drivers/video/rockchip/rga3/include/rga3_reg_info.h b/drivers/video/rockchip/rga3/include/rga3_reg_info.h new file mode 100644 -index 000000000000..4db80cfb09ee +index 000000000..4db80cfb0 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga3_reg_info.h @@ -0,0 +1,521 @@ @@ -1625518,7 +1625519,7 @@ index 000000000000..4db80cfb09ee + diff --git a/drivers/video/rockchip/rga3/include/rga_common.h b/drivers/video/rockchip/rga3/include/rga_common.h new file mode 100644 -index 000000000000..32e83cc9c9f9 +index 000000000..32e83cc9c --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_common.h @@ -0,0 +1,49 @@ @@ -1625573,7 +1625574,7 @@ index 000000000000..32e83cc9c9f9 +#endif diff --git a/drivers/video/rockchip/rga3/include/rga_debugger.h b/drivers/video/rockchip/rga3/include/rga_debugger.h new file mode 100644 -index 000000000000..c274fe87f070 +index 000000000..c274fe87f --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_debugger.h @@ -0,0 +1,145 @@ @@ -1625724,7 +1625725,7 @@ index 000000000000..c274fe87f070 + diff --git a/drivers/video/rockchip/rga3/include/rga_dma_buf.h b/drivers/video/rockchip/rga3/include/rga_dma_buf.h new file mode 100644 -index 000000000000..2ff0857a66a9 +index 000000000..2ff0857a6 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_dma_buf.h @@ -0,0 +1,46 @@ @@ -1625776,7 +1625777,7 @@ index 000000000000..2ff0857a66a9 + diff --git a/drivers/video/rockchip/rga3/include/rga_drv.h b/drivers/video/rockchip/rga3/include/rga_drv.h new file mode 100644 -index 000000000000..e9743a40327b +index 000000000..e9743a403 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_drv.h @@ -0,0 +1,463 @@ @@ -1626245,7 +1626246,7 @@ index 000000000000..e9743a40327b +#endif /* __LINUX_RGA_FENCE_H_ */ diff --git a/drivers/video/rockchip/rga3/include/rga_fence.h b/drivers/video/rockchip/rga3/include/rga_fence.h new file mode 100644 -index 000000000000..7e3bbeebbc3a +index 000000000..7e3bbeebb --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_fence.h @@ -0,0 +1,101 @@ @@ -1626352,7 +1626353,7 @@ index 000000000000..7e3bbeebbc3a +#endif /* __LINUX_RGA_FENCE_H_ */ diff --git a/drivers/video/rockchip/rga3/include/rga_hw_config.h b/drivers/video/rockchip/rga3/include/rga_hw_config.h new file mode 100644 -index 000000000000..46f7531aa88f +index 000000000..46f7531aa --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_hw_config.h @@ -0,0 +1,81 @@ @@ -1626439,7 +1626440,7 @@ index 000000000000..46f7531aa88f +#endif /* __LINUX_RGA_HW_CONFIG_H_ */ diff --git a/drivers/video/rockchip/rga3/include/rga_iommu.h b/drivers/video/rockchip/rga3/include/rga_iommu.h new file mode 100644 -index 000000000000..b80a1f48bb25 +index 000000000..b80a1f48b --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_iommu.h @@ -0,0 +1,79 @@ @@ -1626524,7 +1626525,7 @@ index 000000000000..b80a1f48bb25 + diff --git a/drivers/video/rockchip/rga3/include/rga_job.h b/drivers/video/rockchip/rga3/include/rga_job.h new file mode 100644 -index 000000000000..0fc776173f16 +index 000000000..0fc776173 --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_job.h @@ -0,0 +1,53 @@ @@ -1626583,7 +1626584,7 @@ index 000000000000..0fc776173f16 +#endif /* __LINUX_RKRGA_JOB_H_ */ diff --git a/drivers/video/rockchip/rga3/include/rga_mm.h b/drivers/video/rockchip/rga3/include/rga_mm.h new file mode 100644 -index 000000000000..d68fd75dcb45 +index 000000000..d68fd75dc --- /dev/null +++ b/drivers/video/rockchip/rga3/include/rga_mm.h @@ -0,0 +1,67 @@ @@ -1626656,7 +1626657,7 @@ index 000000000000..d68fd75dcb45 +#endif diff --git a/drivers/video/rockchip/rga3/rga2_reg_info.c b/drivers/video/rockchip/rga3/rga2_reg_info.c new file mode 100644 -index 000000000000..d2e379fa9264 +index 000000000..d2e379fa9 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga2_reg_info.c @@ -0,0 +1,2744 @@ @@ -1629406,7 +1629407,7 @@ index 000000000000..d2e379fa9264 +}; diff --git a/drivers/video/rockchip/rga3/rga3_reg_info.c b/drivers/video/rockchip/rga3/rga3_reg_info.c new file mode 100644 -index 000000000000..4091892e0f57 +index 000000000..4091892e0 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga3_reg_info.c @@ -0,0 +1,2191 @@ @@ -1631603,7 +1631604,7 @@ index 000000000000..4091892e0f57 +}; diff --git a/drivers/video/rockchip/rga3/rga_common.c b/drivers/video/rockchip/rga3/rga_common.c new file mode 100644 -index 000000000000..80d4821fb321 +index 000000000..80d4821fb --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_common.c @@ -0,0 +1,772 @@ @@ -1632381,7 +1632382,7 @@ index 000000000000..80d4821fb321 +} diff --git a/drivers/video/rockchip/rga3/rga_debugger.c b/drivers/video/rockchip/rga3/rga_debugger.c new file mode 100644 -index 000000000000..fe2103147845 +index 000000000..fe2103147 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_debugger.c @@ -0,0 +1,970 @@ @@ -1633357,7 +1633358,7 @@ index 000000000000..fe2103147845 +#endif /* #ifdef CONFIG_NO_GKI */ diff --git a/drivers/video/rockchip/rga3/rga_dma_buf.c b/drivers/video/rockchip/rga3/rga_dma_buf.c new file mode 100644 -index 000000000000..753348a00f4a +index 000000000..753348a00 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_dma_buf.c @@ -0,0 +1,546 @@ @@ -1633909,7 +1633910,7 @@ index 000000000000..753348a00f4a +} diff --git a/drivers/video/rockchip/rga3/rga_drv.c b/drivers/video/rockchip/rga3/rga_drv.c new file mode 100644 -index 000000000000..2d80c8089440 +index 000000000..2d80c8089 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_drv.c @@ -0,0 +1,1615 @@ @@ -1635530,7 +1635531,7 @@ index 000000000000..2d80c8089440 +#endif diff --git a/drivers/video/rockchip/rga3/rga_fence.c b/drivers/video/rockchip/rga3/rga_fence.c new file mode 100644 -index 000000000000..7d831d55d15d +index 000000000..7d831d55d --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_fence.c @@ -0,0 +1,146 @@ @@ -1635682,7 +1635683,7 @@ index 000000000000..7d831d55d15d +} diff --git a/drivers/video/rockchip/rga3/rga_hw_config.c b/drivers/video/rockchip/rga3/rga_hw_config.c new file mode 100644 -index 000000000000..0cf2599b931e +index 000000000..0cf2599b9 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_hw_config.c @@ -0,0 +1,352 @@ @@ -1636040,7 +1636041,7 @@ index 000000000000..0cf2599b931e +}; diff --git a/drivers/video/rockchip/rga3/rga_iommu.c b/drivers/video/rockchip/rga3/rga_iommu.c new file mode 100644 -index 000000000000..6ef9cbc0d5d2 +index 000000000..6ef9cbc0d --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_iommu.c @@ -0,0 +1,425 @@ @@ -1636471,7 +1636472,7 @@ index 000000000000..6ef9cbc0d5d2 +} diff --git a/drivers/video/rockchip/rga3/rga_job.c b/drivers/video/rockchip/rga3/rga_job.c new file mode 100644 -index 000000000000..fae613bbf716 +index 000000000..fae613bbf --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_job.c @@ -0,0 +1,1423 @@ @@ -1637900,7 +1637901,7 @@ index 000000000000..fae613bbf716 +} diff --git a/drivers/video/rockchip/rga3/rga_mm.c b/drivers/video/rockchip/rga3/rga_mm.c new file mode 100644 -index 000000000000..de7e9a6fd7fa +index 000000000..de7e9a6fd --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_mm.c @@ -0,0 +1,2229 @@ @@ -1640135,7 +1640136,7 @@ index 000000000000..de7e9a6fd7fa +} diff --git a/drivers/video/rockchip/rga3/rga_policy.c b/drivers/video/rockchip/rga3/rga_policy.c new file mode 100644 -index 000000000000..c87ce1881cff +index 000000000..c87ce1881 --- /dev/null +++ b/drivers/video/rockchip/rga3/rga_policy.c @@ -0,0 +1,426 @@ @@ -1640567,7 +1640568,7 @@ index 000000000000..c87ce1881cff +} diff --git a/drivers/video/rockchip/rve/Kconfig b/drivers/video/rockchip/rve/Kconfig new file mode 100644 -index 000000000000..d28b9d0599cf +index 000000000..d28b9d059 --- /dev/null +++ b/drivers/video/rockchip/rve/Kconfig @@ -0,0 +1,29 @@ @@ -1640602,7 +1640603,7 @@ index 000000000000..d28b9d0599cf +endif diff --git a/drivers/video/rockchip/rve/Makefile b/drivers/video/rockchip/rve/Makefile new file mode 100644 -index 000000000000..e475b7717510 +index 000000000..e475b7717 --- /dev/null +++ b/drivers/video/rockchip/rve/Makefile @@ -0,0 +1,9 @@ @@ -1640617,7 +1640618,7 @@ index 000000000000..e475b7717510 +obj-$(CONFIG_ROCKCHIP_RVE) += rve.o diff --git a/drivers/video/rockchip/rve/include/rve.h b/drivers/video/rockchip/rve/include/rve.h new file mode 100644 -index 000000000000..922e9e3bfb47 +index 000000000..922e9e3bf --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve.h @@ -0,0 +1,72 @@ @@ -1640695,7 +1640696,7 @@ index 000000000000..922e9e3bfb47 +#endif /*_RVE_DRIVER_H_*/ diff --git a/drivers/video/rockchip/rve/include/rve_debugger.h b/drivers/video/rockchip/rve/include/rve_debugger.h new file mode 100644 -index 000000000000..8dbb46850532 +index 000000000..8dbb46850 --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_debugger.h @@ -0,0 +1,132 @@ @@ -1640833,7 +1640834,7 @@ index 000000000000..8dbb46850532 + diff --git a/drivers/video/rockchip/rve/include/rve_drv.h b/drivers/video/rockchip/rve/include/rve_drv.h new file mode 100644 -index 000000000000..9220b9724772 +index 000000000..9220b9724 --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_drv.h @@ -0,0 +1,332 @@ @@ -1641171,7 +1641172,7 @@ index 000000000000..9220b9724772 +#endif /* __LINUX_RVE_FENCE_H_ */ diff --git a/drivers/video/rockchip/rve/include/rve_fence.h b/drivers/video/rockchip/rve/include/rve_fence.h new file mode 100644 -index 000000000000..e70b6ac0442b +index 000000000..e70b6ac04 --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_fence.h @@ -0,0 +1,32 @@ @@ -1641209,7 +1641210,7 @@ index 000000000000..e70b6ac0442b +#endif /* __LINUX_RVE_FENCE_H_ */ diff --git a/drivers/video/rockchip/rve/include/rve_job.h b/drivers/video/rockchip/rve/include/rve_job.h new file mode 100644 -index 000000000000..b2a86f317e5f +index 000000000..b2a86f317 --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_job.h @@ -0,0 +1,53 @@ @@ -1641268,7 +1641269,7 @@ index 000000000000..b2a86f317e5f +#endif /* __LINUX_RKRVE_JOB_H_ */ diff --git a/drivers/video/rockchip/rve/include/rve_reg.h b/drivers/video/rockchip/rve/include/rve_reg.h new file mode 100644 -index 000000000000..05df28037a83 +index 000000000..05df28037 --- /dev/null +++ b/drivers/video/rockchip/rve/include/rve_reg.h @@ -0,0 +1,88 @@ @@ -1641362,7 +1641363,7 @@ index 000000000000..05df28037a83 + diff --git a/drivers/video/rockchip/rve/rve_debugger.c b/drivers/video/rockchip/rve/rve_debugger.c new file mode 100644 -index 000000000000..f156435405cf +index 000000000..f15643540 --- /dev/null +++ b/drivers/video/rockchip/rve/rve_debugger.c @@ -0,0 +1,566 @@ @@ -1641934,7 +1641935,7 @@ index 000000000000..f156435405cf + diff --git a/drivers/video/rockchip/rve/rve_drv.c b/drivers/video/rockchip/rve/rve_drv.c new file mode 100644 -index 000000000000..b4b460437b65 +index 000000000..b4b460437 --- /dev/null +++ b/drivers/video/rockchip/rve/rve_drv.c @@ -0,0 +1,897 @@ @@ -1642837,7 +1642838,7 @@ index 000000000000..b4b460437b65 +MODULE_LICENSE("GPL"); diff --git a/drivers/video/rockchip/rve/rve_fence.c b/drivers/video/rockchip/rve/rve_fence.c new file mode 100644 -index 000000000000..8d48f8033fa7 +index 000000000..8d48f8033 --- /dev/null +++ b/drivers/video/rockchip/rve/rve_fence.c @@ -0,0 +1,136 @@ @@ -1642979,7 +1642980,7 @@ index 000000000000..8d48f8033fa7 +} diff --git a/drivers/video/rockchip/rve/rve_job.c b/drivers/video/rockchip/rve/rve_job.c new file mode 100644 -index 000000000000..f31bba66175a +index 000000000..f31bba661 --- /dev/null +++ b/drivers/video/rockchip/rve/rve_job.c @@ -0,0 +1,1028 @@ @@ -1644013,7 +1644014,7 @@ index 000000000000..f31bba66175a +} diff --git a/drivers/video/rockchip/rve/rve_reg.c b/drivers/video/rockchip/rve/rve_reg.c new file mode 100644 -index 000000000000..44b305cce0db +index 000000000..44b305cce --- /dev/null +++ b/drivers/video/rockchip/rve/rve_reg.c @@ -0,0 +1,277 @@ @@ -1644296,7 +1644297,7 @@ index 000000000000..44b305cce0db +} diff --git a/drivers/video/rockchip/vehicle/Kconfig b/drivers/video/rockchip/vehicle/Kconfig new file mode 100644 -index 000000000000..e61c864842f2 +index 000000000..e61c86484 --- /dev/null +++ b/drivers/video/rockchip/vehicle/Kconfig @@ -0,0 +1,41 @@ @@ -1644343,7 +1644344,7 @@ index 000000000000..e61c864842f2 +endif diff --git a/drivers/video/rockchip/vehicle/Makefile b/drivers/video/rockchip/vehicle/Makefile new file mode 100644 -index 000000000000..7da28b30548a +index 000000000..7da28b305 --- /dev/null +++ b/drivers/video/rockchip/vehicle/Makefile @@ -0,0 +1,26 @@ @@ -1644375,7 +1644376,7 @@ index 000000000000..7da28b30548a + vehicle_ad_7181.o diff --git a/drivers/video/rockchip/vehicle/vehicle-csi2-dphy-common.h b/drivers/video/rockchip/vehicle/vehicle-csi2-dphy-common.h new file mode 100644 -index 000000000000..8f7ac2429bef +index 000000000..8f7ac2429 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle-csi2-dphy-common.h @@ -0,0 +1,381 @@ @@ -1644762,7 +1644763,7 @@ index 000000000000..8f7ac2429bef +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_ad.h b/drivers/video/rockchip/vehicle/vehicle_ad.h new file mode 100644 -index 000000000000..a83233b791e0 +index 000000000..a83233b79 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad.h @@ -0,0 +1,83 @@ @@ -1644851,7 +1644852,7 @@ index 000000000000..a83233b791e0 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_7181.c b/drivers/video/rockchip/vehicle/vehicle_ad_7181.c new file mode 100644 -index 000000000000..9547e887031a +index 000000000..9547e8870 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_7181.c @@ -0,0 +1,608 @@ @@ -1645465,7 +1645466,7 @@ index 000000000000..9547e887031a + diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_7181.h b/drivers/video/rockchip/vehicle/vehicle_ad_7181.h new file mode 100644 -index 000000000000..b4e572ed0ef8 +index 000000000..b4e572ed0 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_7181.h @@ -0,0 +1,19 @@ @@ -1645490,7 +1645491,7 @@ index 000000000000..b4e572ed0ef8 + diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_gc2145.c b/drivers/video/rockchip/vehicle/vehicle_ad_gc2145.c new file mode 100644 -index 000000000000..a015f0d7a204 +index 000000000..a015f0d7a --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_gc2145.c @@ -0,0 +1,1149 @@ @@ -1646645,7 +1646646,7 @@ index 000000000000..a015f0d7a204 + diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_gc2145.h b/drivers/video/rockchip/vehicle/vehicle_ad_gc2145.h new file mode 100644 -index 000000000000..1934bc2172ad +index 000000000..1934bc217 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_gc2145.h @@ -0,0 +1,18 @@ @@ -1646669,7 +1646670,7 @@ index 000000000000..1934bc2172ad +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_max96714.c b/drivers/video/rockchip/vehicle/vehicle_ad_max96714.c new file mode 100644 -index 000000000000..607484ce732c +index 000000000..607484ce7 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_max96714.c @@ -0,0 +1,538 @@ @@ -1647213,7 +1647214,7 @@ index 000000000000..607484ce732c +} diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_max96714.h b/drivers/video/rockchip/vehicle/vehicle_ad_max96714.h new file mode 100644 -index 000000000000..5f1ce6fcda6a +index 000000000..5f1ce6fcd --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_max96714.h @@ -0,0 +1,18 @@ @@ -1647237,7 +1647238,7 @@ index 000000000000..5f1ce6fcda6a +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_nvp6188.c b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6188.c new file mode 100644 -index 000000000000..3c67848320d8 +index 000000000..3c6784832 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6188.c @@ -0,0 +1,1206 @@ @@ -1648449,7 +1648450,7 @@ index 000000000000..3c67848320d8 +} diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_nvp6188.h b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6188.h new file mode 100644 -index 000000000000..4e9c6a61ed61 +index 000000000..4e9c6a61e --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6188.h @@ -0,0 +1,18 @@ @@ -1648473,7 +1648474,7 @@ index 000000000000..4e9c6a61ed61 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_nvp6324.c b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6324.c new file mode 100644 -index 000000000000..af9274dd35e7 +index 000000000..af9274dd3 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6324.c @@ -0,0 +1,2238 @@ @@ -1650717,7 +1650718,7 @@ index 000000000000..af9274dd35e7 +} diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_nvp6324.h b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6324.h new file mode 100644 -index 000000000000..b28780737969 +index 000000000..b28780737 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_nvp6324.h @@ -0,0 +1,18 @@ @@ -1650741,7 +1650742,7 @@ index 000000000000..b28780737969 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_tp2825.c b/drivers/video/rockchip/vehicle/vehicle_ad_tp2825.c new file mode 100644 -index 000000000000..08888dbe6c1b +index 000000000..08888dbe6 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_tp2825.c @@ -0,0 +1,1039 @@ @@ -1651786,7 +1651787,7 @@ index 000000000000..08888dbe6c1b + diff --git a/drivers/video/rockchip/vehicle/vehicle_ad_tp2825.h b/drivers/video/rockchip/vehicle/vehicle_ad_tp2825.h new file mode 100644 -index 000000000000..451912580de8 +index 000000000..451912580 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_ad_tp2825.h @@ -0,0 +1,18 @@ @@ -1651810,7 +1651811,7 @@ index 000000000000..451912580de8 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_cfg.h b/drivers/video/rockchip/vehicle/vehicle_cfg.h new file mode 100644 -index 000000000000..96241b7b5128 +index 000000000..96241b7b5 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_cfg.h @@ -0,0 +1,145 @@ @@ -1651961,7 +1651962,7 @@ index 000000000000..96241b7b5128 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_cif.c b/drivers/video/rockchip/vehicle/vehicle_cif.c new file mode 100644 -index 000000000000..96c2bfb95785 +index 000000000..96c2bfb95 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_cif.c @@ -0,0 +1,5332 @@ @@ -1657299,7 +1657300,7 @@ index 000000000000..96c2bfb95785 +} diff --git a/drivers/video/rockchip/vehicle/vehicle_cif.h b/drivers/video/rockchip/vehicle/vehicle_cif.h new file mode 100644 -index 000000000000..3c75694acd89 +index 000000000..3c75694ac --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_cif.h @@ -0,0 +1,189 @@ @@ -1657494,7 +1657495,7 @@ index 000000000000..3c75694acd89 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_cif_regs.h b/drivers/video/rockchip/vehicle/vehicle_cif_regs.h new file mode 100644 -index 000000000000..08e1b1f892d2 +index 000000000..08e1b1f89 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_cif_regs.h @@ -0,0 +1,19 @@ @@ -1657519,7 +1657520,7 @@ index 000000000000..08e1b1f892d2 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_dev.c b/drivers/video/rockchip/vehicle/vehicle_dev.c new file mode 100644 -index 000000000000..29c0f67111ed +index 000000000..29c0f6711 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_dev.c @@ -0,0 +1,116 @@ @@ -1657641,7 +1657642,7 @@ index 000000000000..29c0f67111ed +MODULE_LICENSE("GPL"); diff --git a/drivers/video/rockchip/vehicle/vehicle_flinger.c b/drivers/video/rockchip/vehicle/vehicle_flinger.c new file mode 100644 -index 000000000000..e2c0e676ba85 +index 000000000..e2c0e676b --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_flinger.c @@ -0,0 +1,1552 @@ @@ -1659199,7 +1659200,7 @@ index 000000000000..e2c0e676ba85 +} diff --git a/drivers/video/rockchip/vehicle/vehicle_flinger.h b/drivers/video/rockchip/vehicle/vehicle_flinger.h new file mode 100644 -index 000000000000..4b6cf8f3d5b2 +index 000000000..4b6cf8f3d --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_flinger.h @@ -0,0 +1,115 @@ @@ -1659320,7 +1659321,7 @@ index 000000000000..4b6cf8f3d5b2 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_generic_sensor.c b/drivers/video/rockchip/vehicle/vehicle_generic_sensor.c new file mode 100644 -index 000000000000..ccb45fd01051 +index 000000000..ccb45fd01 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_generic_sensor.c @@ -0,0 +1,441 @@ @@ -1659767,7 +1659768,7 @@ index 000000000000..ccb45fd01051 +} diff --git a/drivers/video/rockchip/vehicle/vehicle_gpio.c b/drivers/video/rockchip/vehicle/vehicle_gpio.c new file mode 100644 -index 000000000000..baab6aa28e34 +index 000000000..baab6aa28 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_gpio.c @@ -0,0 +1,178 @@ @@ -1659951,7 +1659952,7 @@ index 000000000000..baab6aa28e34 +} diff --git a/drivers/video/rockchip/vehicle/vehicle_gpio.h b/drivers/video/rockchip/vehicle/vehicle_gpio.h new file mode 100644 -index 000000000000..6c36392cd6b7 +index 000000000..6c36392cd --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_gpio.h @@ -0,0 +1,33 @@ @@ -1659990,7 +1659991,7 @@ index 000000000000..6c36392cd6b7 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_main.c b/drivers/video/rockchip/vehicle/vehicle_main.c new file mode 100644 -index 000000000000..fe07b9a42a58 +index 000000000..fe07b9a42 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_main.c @@ -0,0 +1,501 @@ @@ -1660497,7 +1660498,7 @@ index 000000000000..fe07b9a42a58 +subsys_initcall_sync(vehicle_system_start); diff --git a/drivers/video/rockchip/vehicle/vehicle_main.h b/drivers/video/rockchip/vehicle/vehicle_main.h new file mode 100644 -index 000000000000..4d66db14a978 +index 000000000..4d66db14a --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_main.h @@ -0,0 +1,19 @@ @@ -1660522,7 +1660523,7 @@ index 000000000000..4d66db14a978 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_samsung_dcphy_common.h b/drivers/video/rockchip/vehicle/vehicle_samsung_dcphy_common.h new file mode 100644 -index 000000000000..65189b720a02 +index 000000000..65189b720 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_samsung_dcphy_common.h @@ -0,0 +1,246 @@ @@ -1660774,7 +1660775,7 @@ index 000000000000..65189b720a02 +#endif diff --git a/drivers/video/rockchip/vehicle/vehicle_version.h b/drivers/video/rockchip/vehicle/vehicle_version.h new file mode 100644 -index 000000000000..9e5da4de3c75 +index 000000000..9e5da4de3 --- /dev/null +++ b/drivers/video/rockchip/vehicle/vehicle_version.h @@ -0,0 +1,78 @@ @@ -1660858,7 +1660859,7 @@ index 000000000000..9e5da4de3c75 +#endif diff --git a/drivers/video/rockchip/vtunnel/Kconfig b/drivers/video/rockchip/vtunnel/Kconfig new file mode 100644 -index 000000000000..49ad2a592bb0 +index 000000000..49ad2a592 --- /dev/null +++ b/drivers/video/rockchip/vtunnel/Kconfig @@ -0,0 +1,12 @@ @@ -1660876,7 +1660877,7 @@ index 000000000000..49ad2a592bb0 +endmenu diff --git a/drivers/video/rockchip/vtunnel/Makefile b/drivers/video/rockchip/vtunnel/Makefile new file mode 100644 -index 000000000000..fdfd79a1c0a2 +index 000000000..fdfd79a1c --- /dev/null +++ b/drivers/video/rockchip/vtunnel/Makefile @@ -0,0 +1,3 @@ @@ -1660885,7 +1660886,7 @@ index 000000000000..fdfd79a1c0a2 +obj-$(CONFIG_ROCKCHIP_VIDEO_TUNNEL) += rkvtunnel.o diff --git a/drivers/video/rockchip/vtunnel/rkvtunnel.c b/drivers/video/rockchip/vtunnel/rkvtunnel.c new file mode 100644 -index 000000000000..2a879ab5f83d +index 000000000..2a879ab5f --- /dev/null +++ b/drivers/video/rockchip/vtunnel/rkvtunnel.c @@ -0,0 +1,1527 @@ @@ -1662418,7 +1662419,7 @@ index 000000000000..2a879ab5f83d +MODULE_DESCRIPTION("ROCKCHIP videotunnel driver"); diff --git a/drivers/video/rockchip/vtunnel/rkvtunnel.h b/drivers/video/rockchip/vtunnel/rkvtunnel.h new file mode 100644 -index 000000000000..1781aa785bc0 +index 000000000..1781aa785 --- /dev/null +++ b/drivers/video/rockchip/vtunnel/rkvtunnel.h @@ -0,0 +1,81 @@ @@ -1662504,7 +1662505,7 @@ index 000000000000..1781aa785bc0 + +#endif diff --git a/fs/stat.c b/fs/stat.c -index 5375be5f97cc..3250e427e1aa 100644 +index 5375be5f9..3250e427e 100644 --- a/fs/stat.c +++ b/fs/stat.c @@ -167,9 +167,6 @@ int vfs_getattr(const struct path *path, struct kstat *stat, @@ -1662518,7 +1662519,7 @@ index 5375be5f97cc..3250e427e1aa 100644 if (retval) return retval; diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h -index bae0fe4d499b..89e44ecd32a1 100644 +index bae0fe4d4..89e44ecd3 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -902,6 +902,7 @@ @@ -1662530,7 +1662531,7 @@ index bae0fe4d499b..89e44ecd32a1 100644 #define INIT_CALLS \ diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h -index b0dcc07334a1..09f0dfeff6e8 100644 +index b0dcc0733..09f0dfeff 100644 --- a/include/drm/bridge/analogix_dp.h +++ b/include/drm/bridge/analogix_dp.h @@ -8,6 +8,7 @@ @@ -1662616,7 +1662617,7 @@ index b0dcc07334a1..09f0dfeff6e8 100644 + #endif /* _ANALOGIX_DP_H_ */ diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h -index 6a46baa0737c..4378295b8213 100644 +index 6a46baa07..4378295b8 100644 --- a/include/drm/bridge/dw_hdmi.h +++ b/include/drm/bridge/dw_hdmi.h @@ -6,12 +6,16 @@ @@ -1662856,7 +1662857,7 @@ index 6a46baa0737c..4378295b8213 100644 #endif /* __IMX_HDMI_H__ */ diff --git a/include/drm/bridge/dw_mipi_dsi.h b/include/drm/bridge/dw_mipi_dsi.h -index 5286a53a1875..4844b7d01177 100644 +index 5286a53a1..4844b7d01 100644 --- a/include/drm/bridge/dw_mipi_dsi.h +++ b/include/drm/bridge/dw_mipi_dsi.h @@ -57,6 +57,7 @@ struct dw_mipi_dsi_plat_data { @@ -1662875,7 +1662876,7 @@ index 5286a53a1875..4844b7d01177 100644 #endif /* __DW_MIPI_DSI__ */ diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h -index d300fde6c1a4..4a1e26591ec1 100644 +index d300fde6c..4a1e26591 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -2018,8 +2018,17 @@ int drm_mode_create_suggested_offset_properties(struct drm_device *dev); @@ -1662897,7 +1662898,7 @@ index d300fde6c1a4..4a1e26591ec1 100644 uint64_t link_status); void drm_connector_set_vrr_capable_property( diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h -index 48e93f909ef6..9049a687dd03 100644 +index 48e93f909..9049a687d 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -392,6 +392,7 @@ int __drm_set_edid_firmware_path(const char *path); @@ -1663150,7 +1663151,7 @@ index 48e93f909ef6..9049a687dd03 100644 #endif /* __DRM_EDID_H__ */ diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h -index c0aec0d4d664..cb6decf31669 100644 +index c0aec0d4d..cb6decf31 100644 --- a/include/drm/drm_mipi_dsi.h +++ b/include/drm/drm_mipi_dsi.h @@ -19,6 +19,10 @@ struct drm_dsc_picture_parameter_set; @@ -1663182,7 +1663183,7 @@ index c0aec0d4d664..cb6decf31669 100644 enum mipi_dsi_pixel_format { MIPI_DSI_FMT_RGB888, diff --git a/include/dt-bindings/clock/px30-cru.h b/include/dt-bindings/clock/px30-cru.h -index 5b1416fcde6f..7ddb0602d97e 100644 +index 5b1416fcd..7ddb0602d 100644 --- a/include/dt-bindings/clock/px30-cru.h +++ b/include/dt-bindings/clock/px30-cru.h @@ -87,6 +87,8 @@ @@ -1663204,7 +1663205,7 @@ index 5b1416fcde6f..7ddb0602d97e 100644 #endif diff --git a/include/dt-bindings/clock/rk1808-cru.h b/include/dt-bindings/clock/rk1808-cru.h new file mode 100644 -index 000000000000..c2153802a461 +index 000000000..c2153802a --- /dev/null +++ b/include/dt-bindings/clock/rk1808-cru.h @@ -0,0 +1,473 @@ @@ -1663682,7 +1663683,7 @@ index 000000000000..c2153802a461 + +#endif diff --git a/include/dt-bindings/clock/rk3399-cru.h b/include/dt-bindings/clock/rk3399-cru.h -index 39169d94a44e..b541bdce1c9e 100644 +index 39169d94a..b541bdce1 100644 --- a/include/dt-bindings/clock/rk3399-cru.h +++ b/include/dt-bindings/clock/rk3399-cru.h @@ -7,6 +7,8 @@ @@ -1663791,7 +1663792,7 @@ index 39169d94a44e..b541bdce1c9e 100644 #define SRST_P_TIMER_0 9 #define SRST_P_TIMER_1 10 diff --git a/include/dt-bindings/clock/rk3568-cru.h b/include/dt-bindings/clock/rk3568-cru.h -index d29890865150..251445cf7632 100644 +index d29890865..251445cf7 100644 --- a/include/dt-bindings/clock/rk3568-cru.h +++ b/include/dt-bindings/clock/rk3568-cru.h @@ -479,6 +479,12 @@ @@ -1663809,7 +1663810,7 @@ index d29890865150..251445cf7632 100644 diff --git a/include/dt-bindings/clock/rk3588-cru.h b/include/dt-bindings/clock/rk3588-cru.h new file mode 100644 -index 000000000000..33b0f08c8370 +index 000000000..33b0f08c8 --- /dev/null +++ b/include/dt-bindings/clock/rk3588-cru.h @@ -0,0 +1,1497 @@ @@ -1665312,7 +1665313,7 @@ index 000000000000..33b0f08c8370 +#endif diff --git a/include/dt-bindings/clock/rk618-cru.h b/include/dt-bindings/clock/rk618-cru.h new file mode 100644 -index 000000000000..72ae0aef1378 +index 000000000..72ae0aef1 --- /dev/null +++ b/include/dt-bindings/clock/rk618-cru.h @@ -0,0 +1,38 @@ @@ -1665356,7 +1665357,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 100644 -index 000000000000..bc2dd772c47d +index 000000000..bc2dd772c --- /dev/null +++ b/include/dt-bindings/clock/rk628-cgu.h @@ -0,0 +1,51 @@ @@ -1665413,7 +1665414,7 @@ index 000000000000..bc2dd772c47d +#endif diff --git a/include/dt-bindings/clock/rockchip-ddr.h b/include/dt-bindings/clock/rockchip-ddr.h new file mode 100644 -index 000000000000..b065432e7793 +index 000000000..b065432e7 --- /dev/null +++ b/include/dt-bindings/clock/rockchip-ddr.h @@ -0,0 +1,63 @@ @@ -1665482,7 +1665483,7 @@ index 000000000000..b065432e7793 +#endif diff --git a/include/dt-bindings/clock/rockchip.h b/include/dt-bindings/clock/rockchip.h new file mode 100644 -index 000000000000..b438f7bd4083 +index 000000000..b438f7bd4 --- /dev/null +++ b/include/dt-bindings/clock/rockchip.h @@ -0,0 +1,101 @@ @@ -1665589,7 +1665590,7 @@ index 000000000000..b438f7bd4083 +#endif /* _DT_BINDINGS_CLOCK_ROCKCHIP_H */ diff --git a/include/dt-bindings/clock/rv1106-cru.h b/include/dt-bindings/clock/rv1106-cru.h new file mode 100644 -index 000000000000..95d3652fa9d8 +index 000000000..95d3652fa --- /dev/null +++ b/include/dt-bindings/clock/rv1106-cru.h @@ -0,0 +1,571 @@ @@ -1666166,7 +1666167,7 @@ index 000000000000..95d3652fa9d8 +#endif diff --git a/include/dt-bindings/display/drm_mipi_dsi.h b/include/dt-bindings/display/drm_mipi_dsi.h new file mode 100644 -index 000000000000..c13d3f955453 +index 000000000..c13d3f955 --- /dev/null +++ b/include/dt-bindings/display/drm_mipi_dsi.h @@ -0,0 +1,53 @@ @@ -1666225,7 +1666226,7 @@ index 000000000000..c13d3f955453 +#endif /* __DRM_MIPI_DSI__ */ diff --git a/include/dt-bindings/display/media-bus-format.h b/include/dt-bindings/display/media-bus-format.h new file mode 100644 -index 000000000000..8d1f8733b8d5 +index 000000000..8d1f8733b --- /dev/null +++ b/include/dt-bindings/display/media-bus-format.h @@ -0,0 +1,2 @@ @@ -1666233,7 +1666234,7 @@ index 000000000000..8d1f8733b8d5 +#include "../../uapi/linux/media-bus-format.h" diff --git a/include/dt-bindings/display/mipi_dsi.h b/include/dt-bindings/display/mipi_dsi.h new file mode 100644 -index 000000000000..38aeee0ed51d +index 000000000..38aeee0ed --- /dev/null +++ b/include/dt-bindings/display/mipi_dsi.h @@ -0,0 +1,106 @@ @@ -1666345,7 +1666346,7 @@ index 000000000000..38aeee0ed51d +#endif /* end of MIPI_DSI_H_ */ diff --git a/include/dt-bindings/display/rockchip-tve.h b/include/dt-bindings/display/rockchip-tve.h new file mode 100644 -index 000000000000..d72d69287bce +index 000000000..d72d69287 --- /dev/null +++ b/include/dt-bindings/display/rockchip-tve.h @@ -0,0 +1,15 @@ @@ -1666366,7 +1666367,7 @@ index 000000000000..d72d69287bce +#endif 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 @@ @@ -1666393,7 +1666394,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 100644 -index 000000000000..1ab3317d700e +index 000000000..1ab3317d7 --- /dev/null +++ b/include/dt-bindings/dram/rockchip,rk322x.h @@ -0,0 +1,90 @@ @@ -1666489,7 +1666490,7 @@ index 000000000000..1ab3317d700e +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_RK322X_H */ diff --git a/include/dt-bindings/input/rk-input.h b/include/dt-bindings/input/rk-input.h new file mode 100644 -index 000000000000..00b412927890 +index 000000000..00b412927 --- /dev/null +++ b/include/dt-bindings/input/rk-input.h @@ -0,0 +1,814 @@ @@ -1667309,7 +1667310,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 100644 -index 000000000000..4a07a5175d29 +index 000000000..4a07a5175 --- /dev/null +++ b/include/dt-bindings/memory/px30-dram.h @@ -0,0 +1,140 @@ @@ -1667455,7 +1667456,7 @@ index 000000000000..4a07a5175d29 +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_PX30_H*/ diff --git a/include/dt-bindings/memory/rk1808-dram.h b/include/dt-bindings/memory/rk1808-dram.h new file mode 100644 -index 000000000000..522bd75a4a55 +index 000000000..522bd75a4 --- /dev/null +++ b/include/dt-bindings/memory/rk1808-dram.h @@ -0,0 +1,180 @@ @@ -1667641,7 +1667642,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 100644 -index 000000000000..2598ac98e525 +index 000000000..2598ac98e --- /dev/null +++ b/include/dt-bindings/memory/rk3128-dram.h @@ -0,0 +1,95 @@ @@ -1667742,7 +1667743,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 100644 -index 000000000000..1c531dca755c +index 000000000..1c531dca7 --- /dev/null +++ b/include/dt-bindings/memory/rk3288-dram.h @@ -0,0 +1,127 @@ @@ -1667875,7 +1667876,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 100644 -index 000000000000..171f41c256d3 +index 000000000..171f41c25 --- /dev/null +++ b/include/dt-bindings/memory/rk3328-dram.h @@ -0,0 +1,159 @@ @@ -1668040,7 +1668041,7 @@ index 000000000000..171f41c256d3 +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK3328_H*/ diff --git a/include/dt-bindings/memory/rk3399-dram.h b/include/dt-bindings/memory/rk3399-dram.h new file mode 100644 -index 000000000000..44abb0aafb05 +index 000000000..44abb0aaf --- /dev/null +++ b/include/dt-bindings/memory/rk3399-dram.h @@ -0,0 +1,107 @@ @@ -1668153,7 +1668154,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 100644 -index 000000000000..c05eae7fe32e +index 000000000..c05eae7fe --- /dev/null +++ b/include/dt-bindings/memory/rk3568-dram.h @@ -0,0 +1,111 @@ @@ -1668270,7 +1668271,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 100644 -index 000000000000..21ed3975211f +index 000000000..21ed39752 --- /dev/null +++ b/include/dt-bindings/memory/rockchip-dram.h @@ -0,0 +1,102 @@ @@ -1668378,7 +1668379,7 @@ index 000000000000..21ed3975211f +#endif /* _DT_BINDINGS_DRAM_ROCKCHIP_H */ diff --git a/include/dt-bindings/memory/rv1126-dram.h b/include/dt-bindings/memory/rv1126-dram.h new file mode 100644 -index 000000000000..208227825044 +index 000000000..208227825 --- /dev/null +++ b/include/dt-bindings/memory/rv1126-dram.h @@ -0,0 +1,161 @@ @@ -1668545,7 +1668546,7 @@ index 000000000000..208227825044 +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RV1126_H*/ diff --git a/include/dt-bindings/mfd/rockchip-serdes.h b/include/dt-bindings/mfd/rockchip-serdes.h new file mode 100644 -index 000000000000..610a1e3f5be8 +index 000000000..610a1e3f5 --- /dev/null +++ b/include/dt-bindings/mfd/rockchip-serdes.h @@ -0,0 +1,151 @@ @@ -1668702,7 +1668703,7 @@ index 000000000000..610a1e3f5be8 +#endif /* __DT_BINDINGS_MFD_ROCKCHIP_SERDES_H */ diff --git a/include/dt-bindings/phy/phy-snps-pcie3.h b/include/dt-bindings/phy/phy-snps-pcie3.h new file mode 100644 -index 000000000000..5006947f2285 +index 000000000..5006947f2 --- /dev/null +++ b/include/dt-bindings/phy/phy-snps-pcie3.h @@ -0,0 +1,21 @@ @@ -1668729,7 +1668730,7 @@ index 000000000000..5006947f2285 +#endif /* _DT_BINDINGS_PHY_SNPS_PCIE3 */ diff --git a/include/dt-bindings/power/rk1808-power.h b/include/dt-bindings/power/rk1808-power.h new file mode 100644 -index 000000000000..2ab9d9901161 +index 000000000..2ab9d9901 --- /dev/null +++ b/include/dt-bindings/power/rk1808-power.h @@ -0,0 +1,20 @@ @@ -1668755,7 +1668756,7 @@ index 000000000000..2ab9d9901161 +#endif diff --git a/include/dt-bindings/power/rk3528-power.h b/include/dt-bindings/power/rk3528-power.h new file mode 100644 -index 000000000000..4f7c978651b5 +index 000000000..4f7c97865 --- /dev/null +++ b/include/dt-bindings/power/rk3528-power.h @@ -0,0 +1,18 @@ @@ -1668779,7 +1668780,7 @@ index 000000000000..4f7c978651b5 +#endif diff --git a/include/dt-bindings/power/rk3562-power.h b/include/dt-bindings/power/rk3562-power.h new file mode 100644 -index 000000000000..94b26b5bea5f +index 000000000..94b26b5be --- /dev/null +++ b/include/dt-bindings/power/rk3562-power.h @@ -0,0 +1,32 @@ @@ -1668817,7 +1668818,7 @@ index 000000000000..94b26b5bea5f +#endif diff --git a/include/dt-bindings/sensor-dev.h b/include/dt-bindings/sensor-dev.h new file mode 100644 -index 000000000000..e03f0027d325 +index 000000000..e03f0027d --- /dev/null +++ b/include/dt-bindings/sensor-dev.h @@ -0,0 +1,18 @@ @@ -1668840,7 +1668841,7 @@ index 000000000000..e03f0027d325 + +#endif diff --git a/include/dt-bindings/soc/rockchip,boot-mode.h b/include/dt-bindings/soc/rockchip,boot-mode.h -index 4b0914c0989d..a0f63a040613 100644 +index 4b0914c09..a0f63a040 100644 --- a/include/dt-bindings/soc/rockchip,boot-mode.h +++ b/include/dt-bindings/soc/rockchip,boot-mode.h @@ -10,7 +10,19 @@ @@ -1668865,7 +1668866,7 @@ index 4b0914c0989d..a0f63a040613 100644 #endif diff --git a/include/dt-bindings/soc/rockchip,vop2.h b/include/dt-bindings/soc/rockchip,vop2.h -index 6e66a802b96a..668f199df9f0 100644 +index 6e66a802b..668f199df 100644 --- a/include/dt-bindings/soc/rockchip,vop2.h +++ b/include/dt-bindings/soc/rockchip,vop2.h @@ -10,5 +10,9 @@ @@ -1668880,7 +1668881,7 @@ index 6e66a802b96a..668f199df9f0 100644 #endif /* __DT_BINDINGS_ROCKCHIP_VOP2_H */ diff --git a/include/dt-bindings/soc/rockchip-amp.h b/include/dt-bindings/soc/rockchip-amp.h new file mode 100644 -index 000000000000..0681e92ef4da +index 000000000..0681e92ef --- /dev/null +++ b/include/dt-bindings/soc/rockchip-amp.h @@ -0,0 +1,7 @@ @@ -1668893,7 +1668894,7 @@ index 000000000000..0681e92ef4da +#endif diff --git a/include/dt-bindings/soc/rockchip-csu.h b/include/dt-bindings/soc/rockchip-csu.h new file mode 100644 -index 000000000000..8b0442533c3f +index 000000000..8b0442533 --- /dev/null +++ b/include/dt-bindings/soc/rockchip-csu.h @@ -0,0 +1,15 @@ @@ -1668914,7 +1668915,7 @@ index 000000000000..8b0442533c3f +#endif diff --git a/include/dt-bindings/soc/rockchip-system-status.h b/include/dt-bindings/soc/rockchip-system-status.h new file mode 100644 -index 000000000000..6a0d198a2e6e +index 000000000..6a0d198a2 --- /dev/null +++ b/include/dt-bindings/soc/rockchip-system-status.h @@ -0,0 +1,59 @@ @@ -1668979,7 +1668980,7 @@ index 000000000000..6a0d198a2e6e +#endif diff --git a/include/dt-bindings/suspend/rockchip-px30.h b/include/dt-bindings/suspend/rockchip-px30.h new file mode 100644 -index 000000000000..4362028f677c +index 000000000..4362028f6 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-px30.h @@ -0,0 +1,53 @@ @@ -1669038,7 +1669039,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 100644 -index 000000000000..3d565faabf4d +index 000000000..3d565faab --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk1808.h @@ -0,0 +1,46 @@ @@ -1669090,7 +1669091,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 100644 -index 000000000000..882ae053fa22 +index 000000000..882ae053f --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk322x.h @@ -0,0 +1,57 @@ @@ -1669153,7 +1669154,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 100644 -index 000000000000..d07cced43877 +index 000000000..d07cced43 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3288.h @@ -0,0 +1,59 @@ @@ -1669218,7 +1669219,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 100644 -index 000000000000..78a8cc128b5d +index 000000000..78a8cc128 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3308.h @@ -0,0 +1,105 @@ @@ -1669329,7 +1669330,7 @@ index 000000000000..78a8cc128b5d +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3328.h b/include/dt-bindings/suspend/rockchip-rk3328.h new file mode 100644 -index 000000000000..972f8bb5e281 +index 000000000..972f8bb5e --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3328.h @@ -0,0 +1,19 @@ @@ -1669354,7 +1669355,7 @@ index 000000000000..972f8bb5e281 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3399.h b/include/dt-bindings/suspend/rockchip-rk3399.h new file mode 100644 -index 000000000000..176c7cfcd989 +index 000000000..176c7cfcd --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3399.h @@ -0,0 +1,61 @@ @@ -1669421,7 +1669422,7 @@ index 000000000000..176c7cfcd989 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3528.h b/include/dt-bindings/suspend/rockchip-rk3528.h new file mode 100644 -index 000000000000..5f16a4682963 +index 000000000..5f16a4682 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3528.h @@ -0,0 +1,67 @@ @@ -1669494,7 +1669495,7 @@ index 000000000000..5f16a4682963 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3562.h b/include/dt-bindings/suspend/rockchip-rk3562.h new file mode 100644 -index 000000000000..499f423de636 +index 000000000..499f423de --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3562.h @@ -0,0 +1,47 @@ @@ -1669547,7 +1669548,7 @@ index 000000000000..499f423de636 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3568.h b/include/dt-bindings/suspend/rockchip-rk3568.h new file mode 100644 -index 000000000000..91e89f64a067 +index 000000000..91e89f64a --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3568.h @@ -0,0 +1,57 @@ @@ -1669610,7 +1669611,7 @@ index 000000000000..91e89f64a067 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rk3588.h b/include/dt-bindings/suspend/rockchip-rk3588.h new file mode 100644 -index 000000000000..936febd57cce +index 000000000..936febd57 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rk3588.h @@ -0,0 +1,65 @@ @@ -1669681,7 +1669682,7 @@ index 000000000000..936febd57cce +#endif diff --git a/include/dt-bindings/suspend/rockchip-rv1106.h b/include/dt-bindings/suspend/rockchip-rv1106.h new file mode 100644 -index 000000000000..3e3e6ce6bf02 +index 000000000..3e3e6ce6b --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rv1106.h @@ -0,0 +1,81 @@ @@ -1669768,7 +1669769,7 @@ index 000000000000..3e3e6ce6bf02 +#endif diff --git a/include/dt-bindings/suspend/rockchip-rv1126.h b/include/dt-bindings/suspend/rockchip-rv1126.h new file mode 100644 -index 000000000000..7c28c2bd7619 +index 000000000..7c28c2bd7 --- /dev/null +++ b/include/dt-bindings/suspend/rockchip-rv1126.h @@ -0,0 +1,46 @@ @@ -1669819,7 +1669820,7 @@ index 000000000000..7c28c2bd7619 +#define RKPM_TIME_OUT_WKUP_EN BIT(10) +#endif diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h -index 1293c38ddb7f..6b78750bac21 100644 +index 1293c38dd..6b78750ba 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -1155,8 +1155,10 @@ struct clk_fractional_divider { @@ -1669843,7 +1669844,7 @@ index 1293c38ddb7f..6b78750bac21 100644 const char *name, const char *parent_name, unsigned long flags, diff --git a/include/linux/clk/rockchip.h b/include/linux/clk/rockchip.h new file mode 100644 -index 000000000000..07c563a42c60 +index 000000000..07c563a42 --- /dev/null +++ b/include/linux/clk/rockchip.h @@ -0,0 +1,18 @@ @@ -1669867,7 +1669868,7 @@ index 000000000000..07c563a42c60 +#endif /* __LINUX_CLK_ROCKCHIP_H_ */ diff --git a/include/linux/dma-buf-cache.h b/include/linux/dma-buf-cache.h new file mode 100644 -index 000000000000..d97545560990 +index 000000000..d97545560 --- /dev/null +++ b/include/linux/dma-buf-cache.h @@ -0,0 +1,32 @@ @@ -1669904,7 +1669905,7 @@ index 000000000000..d97545560990 + +#endif /* _LINUX_DMA_BUF_CACHE_H */ diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h -index 3f31baa3293f..762ff7f221ce 100644 +index 3f31baa32..762ff7f22 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -287,6 +287,20 @@ struct dma_buf_ops { @@ -1670013,7 +1670014,7 @@ index 3f31baa3293f..762ff7f221ce 100644 + #endif /* __DMA_BUF_H__ */ diff --git a/include/linux/dma-heap.h b/include/linux/dma-heap.h -index 0c05561cad6e..a96c42dcba82 100644 +index 0c05561ca..a96c42dcb 100644 --- a/include/linux/dma-heap.h +++ b/include/linux/dma-heap.h @@ -11,6 +11,7 @@ @@ -1670035,7 +1670036,7 @@ index 0c05561cad6e..a96c42dcba82 100644 /** diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h -index cff3dba65820..e3ae61d519b3 100644 +index cff3dba65..e3ae61d51 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -445,6 +445,7 @@ struct dma_slave_config { @@ -1670047,7 +1670048,7 @@ index cff3dba65820..e3ae61d519b3 100644 size_t peripheral_size; }; diff --git a/include/linux/extcon.h b/include/linux/extcon.h -index e596a0abcb27..1ba671fb92bd 100644 +index e596a0abc..1ba671fb9 100644 --- a/include/linux/extcon.h +++ b/include/linux/extcon.h @@ -37,6 +37,7 @@ @@ -1670077,7 +1670078,7 @@ index e596a0abcb27..1ba671fb92bd 100644 #endif /* __LINUX_EXTCON_H__ */ diff --git a/include/linux/hck/lite_hck_ced.h b/include/linux/hck/lite_hck_ced.h new file mode 100644 -index 000000000000..9d1ffb7ccef3 +index 000000000..9d1ffb7cc --- /dev/null +++ b/include/linux/hck/lite_hck_ced.h @@ -0,0 +1,50 @@ @@ -1670133,7 +1670134,7 @@ index 000000000000..9d1ffb7ccef3 +#endif /* _LITE_HCK_CED_H */ diff --git a/include/linux/hck/lite_hck_code_sign.h b/include/linux/hck/lite_hck_code_sign.h new file mode 100644 -index 000000000000..d479babbf5cb +index 000000000..d479babbf --- /dev/null +++ b/include/linux/hck/lite_hck_code_sign.h @@ -0,0 +1,38 @@ @@ -1670177,7 +1670178,7 @@ index 000000000000..d479babbf5cb +#endif /* LITE_HCK_CODE_SIGN_H */ diff --git a/include/linux/hck/lite_hck_hideaddr.h b/include/linux/hck/lite_hck_hideaddr.h new file mode 100644 -index 000000000000..e7dbf9695b55 +index 000000000..e7dbf9695 --- /dev/null +++ b/include/linux/hck/lite_hck_hideaddr.h @@ -0,0 +1,25 @@ @@ -1670208,7 +1670209,7 @@ index 000000000000..e7dbf9695b55 +#endif /* _LITE_HCK_HIDEADDR_H */ diff --git a/include/linux/hck/lite_hck_inet.h b/include/linux/hck/lite_hck_inet.h new file mode 100644 -index 000000000000..5dd1ecd837fe +index 000000000..5dd1ecd83 --- /dev/null +++ b/include/linux/hck/lite_hck_inet.h @@ -0,0 +1,26 @@ @@ -1670240,7 +1670241,7 @@ index 000000000000..5dd1ecd837fe +#endif /* LITE_HCK_INET_H */ diff --git a/include/linux/hck/lite_hck_jit_memory.h b/include/linux/hck/lite_hck_jit_memory.h new file mode 100644 -index 000000000000..dbce24a4379b +index 000000000..dbce24a43 --- /dev/null +++ b/include/linux/hck/lite_hck_jit_memory.h @@ -0,0 +1,41 @@ @@ -1670287,7 +1670288,7 @@ index 000000000000..dbce24a4379b +#endif /* LITE_HCK_JIT_MEMORY_H */ diff --git a/include/linux/hck/lite_hck_sample.h b/include/linux/hck/lite_hck_sample.h new file mode 100644 -index 000000000000..f29dec41a626 +index 000000000..f29dec41a --- /dev/null +++ b/include/linux/hck/lite_hck_sample.h @@ -0,0 +1,36 @@ @@ -1670329,7 +1670330,7 @@ index 000000000000..f29dec41a626 +#endif /* LITE_HCK_SAMPLE_H */ diff --git a/include/linux/hck/lite_hck_xpm.h b/include/linux/hck/lite_hck_xpm.h new file mode 100644 -index 000000000000..0ec0063d3400 +index 000000000..0ec0063d3 --- /dev/null +++ b/include/linux/hck/lite_hck_xpm.h @@ -0,0 +1,55 @@ @@ -1670390,7 +1670391,7 @@ index 000000000000..0ec0063d3400 +#endif /* _LITE_HCK_XPM_H */ diff --git a/include/linux/hck/lite_vendor_hooks.h b/include/linux/hck/lite_vendor_hooks.h new file mode 100644 -index 000000000000..4b0f30f6c493 +index 000000000..4b0f30f6c --- /dev/null +++ b/include/linux/hck/lite_vendor_hooks.h @@ -0,0 +1,126 @@ @@ -1670522,7 +1670523,7 @@ index 000000000000..4b0f30f6c493 +#endif // CREATE_LITE_VENDOR_HOOK diff --git a/include/linux/hdmi-notifier.h b/include/linux/hdmi-notifier.h new file mode 100644 -index 000000000000..b75b0da280c9 +index 000000000..b75b0da28 --- /dev/null +++ b/include/linux/hdmi-notifier.h @@ -0,0 +1,45 @@ @@ -1670573,7 +1670574,7 @@ index 000000000000..b75b0da280c9 +#endif diff --git a/include/linux/hyperhold_inf.h b/include/linux/hyperhold_inf.h new file mode 100644 -index 000000000000..7d2bd1e88c1c +index 000000000..7d2bd1e88 --- /dev/null +++ b/include/linux/hyperhold_inf.h @@ -0,0 +1,23 @@ @@ -1670602,7 +1670603,7 @@ index 000000000000..7d2bd1e88c1c +#endif diff --git a/include/linux/initramfs.h b/include/linux/initramfs.h new file mode 100644 -index 000000000000..26953171620f +index 000000000..269531716 --- /dev/null +++ b/include/linux/initramfs.h @@ -0,0 +1,40 @@ @@ -1670647,7 +1670648,7 @@ index 000000000000..26953171620f + +#endif /* _LINUX_INITRAMFS_H */ diff --git a/include/linux/iommu.h b/include/linux/iommu.h -index 0225cf7445de..ef9b2836098a 100644 +index 0225cf744..ef9b28360 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -331,6 +331,7 @@ struct iommu_ops { @@ -1670659,7 +1670660,7 @@ index 0225cf7445de..ef9b2836098a 100644 ioasid_t pasid); diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h -index 2223f95079ce..6a10a0f81001 100644 +index 2223f9507..6a10a0f81 100644 --- a/include/linux/irqchip/arm-gic.h +++ b/include/linux/irqchip/arm-gic.h @@ -15,6 +15,7 @@ @@ -1670684,7 +1670685,7 @@ index 2223f95079ce..6a10a0f81001 100644 int gic_get_cpu_id(unsigned int cpu); void gic_migrate_target(unsigned int new_cpu_id); diff --git a/include/linux/kthread.h b/include/linux/kthread.h -index 2c30ade43bc8..aada59cb2866 100644 +index 2c30ade43..aada59cb2 100644 --- a/include/linux/kthread.h +++ b/include/linux/kthread.h @@ -141,6 +141,12 @@ struct kthread_delayed_work { @@ -1670742,7 +1670743,7 @@ index 2c30ade43bc8..aada59cb2866 100644 #endif /* _LINUX_KTHREAD_H */ diff --git a/include/linux/lowmem_dbg.h b/include/linux/lowmem_dbg.h new file mode 100644 -index 000000000000..be459bd18603 +index 000000000..be459bd18 --- /dev/null +++ b/include/linux/lowmem_dbg.h @@ -0,0 +1,16 @@ @@ -1670764,7 +1670765,7 @@ index 000000000000..be459bd18603 + diff --git a/include/linux/memcg_policy.h b/include/linux/memcg_policy.h new file mode 100644 -index 000000000000..4aec2a1bb3ec +index 000000000..4aec2a1bb --- /dev/null +++ b/include/linux/memcg_policy.h @@ -0,0 +1,47 @@ @@ -1670817,7 +1670818,7 @@ index 000000000000..4aec2a1bb3ec +#endif /* _LINUX_MEMCG_POLICY_H */ diff --git a/include/linux/memcheck.h b/include/linux/memcheck.h new file mode 100644 -index 000000000000..087cd760ece4 +index 000000000..087cd760e --- /dev/null +++ b/include/linux/memcheck.h @@ -0,0 +1,22 @@ @@ -1670845,7 +1670846,7 @@ index 000000000000..087cd760ece4 + diff --git a/include/linux/memory_group_manager.h b/include/linux/memory_group_manager.h new file mode 100644 -index 000000000000..786e3b995f29 +index 000000000..786e3b995 --- /dev/null +++ b/include/linux/memory_group_manager.h @@ -0,0 +1,223 @@ @@ -1671074,7 +1671075,7 @@ index 000000000000..786e3b995f29 +#endif /* _MEMORY_GROUP_MANAGER_H_ */ diff --git a/include/linux/mfd/rk618.h b/include/linux/mfd/rk618.h new file mode 100644 -index 000000000000..94525e1cb137 +index 000000000..94525e1cb --- /dev/null +++ b/include/linux/mfd/rk618.h @@ -0,0 +1,125 @@ @@ -1671205,7 +1671206,7 @@ index 000000000000..94525e1cb137 +#endif diff --git a/include/linux/mfd/rk628.h b/include/linux/mfd/rk628.h new file mode 100644 -index 000000000000..52ff63e0c601 +index 000000000..52ff63e0c --- /dev/null +++ b/include/linux/mfd/rk628.h @@ -0,0 +1,272 @@ @@ -1671483,7 +1671484,7 @@ index 000000000000..52ff63e0c601 +#endif diff --git a/include/linux/mfd/rk630.h b/include/linux/mfd/rk630.h new file mode 100644 -index 000000000000..53c67e846f7c +index 000000000..53c67e846 --- /dev/null +++ b/include/linux/mfd/rk630.h @@ -0,0 +1,242 @@ @@ -1671731,7 +1671732,7 @@ index 000000000000..53c67e846f7c +#endif diff --git a/include/linux/mfd/rk806.h b/include/linux/mfd/rk806.h new file mode 100644 -index 000000000000..7735121592c8 +index 000000000..773512159 --- /dev/null +++ b/include/linux/mfd/rk806.h @@ -0,0 +1,531 @@ @@ -1672267,7 +1672268,7 @@ index 000000000000..7735121592c8 + enum rk806_fields field_id); +#endif /* __LINUX_REGULATOR_RK806_H */ diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h -index 78e167a92483..92040136070c 100644 +index 78e167a92..920401360 100644 --- a/include/linux/mfd/rk808.h +++ b/include/linux/mfd/rk808.h @@ -113,6 +113,235 @@ enum rk808_reg { @@ -1673222,7 +1673223,7 @@ index 78e167a92483..92040136070c 100644 #endif /* __LINUX_REGULATOR_RK808_H */ diff --git a/include/linux/mm_purgeable.h b/include/linux/mm_purgeable.h new file mode 100644 -index 000000000000..04d027cb1548 +index 000000000..04d027cb1 --- /dev/null +++ b/include/linux/mm_purgeable.h @@ -0,0 +1,77 @@ @@ -1673304,7 +1673305,7 @@ index 000000000000..04d027cb1548 +#endif /* __MM_PURGEABLE_MEM_H */ + diff --git a/include/linux/of_gpio.h b/include/linux/of_gpio.h -index d0f66a5e1b2a..ca36529c1c40 100644 +index d0f66a5e1..ca36529c1 100644 --- a/include/linux/of_gpio.h +++ b/include/linux/of_gpio.h @@ -17,11 +17,28 @@ @@ -1673355,7 +1673356,7 @@ index d0f66a5e1b2a..ca36529c1c40 100644 #endif /* __LINUX_OF_GPIO_H */ diff --git a/include/linux/phy/phy-rockchip-usbdp.h b/include/linux/phy/phy-rockchip-usbdp.h new file mode 100644 -index 000000000000..6a65a1596521 +index 000000000..6a65a1596 --- /dev/null +++ b/include/linux/phy/phy-rockchip-usbdp.h @@ -0,0 +1,70 @@ @@ -1673431,7 +1673432,7 @@ index 000000000000..6a65a1596521 +#endif diff --git a/include/linux/power/rk_usbbc.h b/include/linux/power/rk_usbbc.h new file mode 100644 -index 000000000000..45f7128b3a69 +index 000000000..45f7128b3 --- /dev/null +++ b/include/linux/power/rk_usbbc.h @@ -0,0 +1,44 @@ @@ -1673481,7 +1673482,7 @@ index 000000000000..45f7128b3a69 +#endif diff --git a/include/linux/priority_control_manager.h b/include/linux/priority_control_manager.h new file mode 100644 -index 000000000000..9f28b1b8582a +index 000000000..9f28b1b85 --- /dev/null +++ b/include/linux/priority_control_manager.h @@ -0,0 +1,76 @@ @@ -1673562,7 +1673563,7 @@ index 000000000000..9f28b1b8582a + +#endif /* _PRIORITY_CONTROL_MANAGER_H_ */ diff --git a/include/linux/profile.h b/include/linux/profile.h -index 11db1ec516e2..61bb6d58b359 100644 +index 11db1ec51..61bb6d58b 100644 --- a/include/linux/profile.h +++ b/include/linux/profile.h @@ -31,6 +31,11 @@ static inline int create_proc_profile(void) @@ -1673635,7 +1673636,7 @@ index 11db1ec516e2..61bb6d58b359 100644 diff --git a/include/linux/protected_memory_allocator.h b/include/linux/protected_memory_allocator.h new file mode 100644 -index 000000000000..0c83845a35e0 +index 000000000..0c83845a3 --- /dev/null +++ b/include/linux/protected_memory_allocator.h @@ -0,0 +1,106 @@ @@ -1673747,7 +1673748,7 @@ index 000000000000..0c83845a35e0 +#endif /* _PROTECTED_MEMORY_ALLOCATOR_H_ */ diff --git a/include/linux/protected_mode_switcher.h b/include/linux/protected_mode_switcher.h new file mode 100644 -index 000000000000..5559b184c8bb +index 000000000..5559b184c --- /dev/null +++ b/include/linux/protected_mode_switcher.h @@ -0,0 +1,66 @@ @@ -1673819,7 +1673820,7 @@ index 000000000000..5559b184c8bb +#endif /* _PROTECTED_MODE_SWITCH_H_ */ diff --git a/include/linux/pwm-rockchip.h b/include/linux/pwm-rockchip.h new file mode 100644 -index 000000000000..60e42aaba7a1 +index 000000000..60e42aaba --- /dev/null +++ b/include/linux/pwm-rockchip.h @@ -0,0 +1,187 @@ @@ -1674011,7 +1674012,7 @@ index 000000000000..60e42aaba7a1 + +#endif /* _PWM_ROCKCHIP_H_ */ diff --git a/include/linux/pwm.h b/include/linux/pwm.h -index fe0f38ce1bde..14d52d94da44 100644 +index fe0f38ce1..14d52d94d 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h @@ -309,6 +309,8 @@ struct pwm_chip { @@ -1674043,7 +1674044,7 @@ index fe0f38ce1bde..14d52d94da44 100644 { diff --git a/include/linux/reclaim_acct.h b/include/linux/reclaim_acct.h new file mode 100644 -index 000000000000..5cf26f3267d1 +index 000000000..5cf26f326 --- /dev/null +++ b/include/linux/reclaim_acct.h @@ -0,0 +1,48 @@ @@ -1674097,7 +1674098,7 @@ index 000000000000..5cf26f3267d1 +#endif /* _RECLAIM_ACCT_H */ diff --git a/include/linux/rfkill-bt.h b/include/linux/rfkill-bt.h new file mode 100644 -index 000000000000..ed8da08ee0bd +index 000000000..ed8da08ee --- /dev/null +++ b/include/linux/rfkill-bt.h @@ -0,0 +1,74 @@ @@ -1674177,7 +1674178,7 @@ index 000000000000..ed8da08ee0bd + diff --git a/include/linux/rfkill-wlan.h b/include/linux/rfkill-wlan.h new file mode 100644 -index 000000000000..c1987c316794 +index 000000000..c1987c316 --- /dev/null +++ b/include/linux/rfkill-wlan.h @@ -0,0 +1,69 @@ @@ -1674252,7 +1674253,7 @@ index 000000000000..c1987c316794 +#endif diff --git a/include/linux/rk-dma-heap.h b/include/linux/rk-dma-heap.h new file mode 100644 -index 000000000000..e42bc227dd04 +index 000000000..e42bc227d --- /dev/null +++ b/include/linux/rk-dma-heap.h @@ -0,0 +1,137 @@ @@ -1674395,7 +1674396,7 @@ index 000000000000..e42bc227dd04 +#endif /* _DMA_HEAPS_H */ diff --git a/include/linux/rk_hdmirx_class.h b/include/linux/rk_hdmirx_class.h new file mode 100644 -index 000000000000..d3a3e434b030 +index 000000000..d3a3e434b --- /dev/null +++ b/include/linux/rk_hdmirx_class.h @@ -0,0 +1,13 @@ @@ -1674414,7 +1674415,7 @@ index 000000000000..d3a3e434b030 +#endif diff --git a/include/linux/rk_keys.h b/include/linux/rk_keys.h new file mode 100644 -index 000000000000..aee656daf2c8 +index 000000000..aee656daf --- /dev/null +++ b/include/linux/rk_keys.h @@ -0,0 +1,19 @@ @@ -1674439,7 +1674440,7 @@ index 000000000000..aee656daf2c8 +#endif diff --git a/include/linux/rockchip-iovmm.h b/include/linux/rockchip-iovmm.h new file mode 100644 -index 000000000000..3005c745e5b8 +index 000000000..3005c745e --- /dev/null +++ b/include/linux/rockchip-iovmm.h @@ -0,0 +1,91 @@ @@ -1674536,7 +1674537,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 100644 -index 000000000000..beaaf923f9ec +index 000000000..beaaf923f --- /dev/null +++ b/include/linux/rockchip/cpu.h @@ -0,0 +1,272 @@ @@ -1674814,7 +1674815,7 @@ index 000000000000..beaaf923f9ec +#endif diff --git a/include/linux/rockchip/grf.h b/include/linux/rockchip/grf.h new file mode 100644 -index 000000000000..fae51232297c +index 000000000..fae512322 --- /dev/null +++ b/include/linux/rockchip/grf.h @@ -0,0 +1,700 @@ @@ -1675520,7 +1675521,7 @@ index 000000000000..fae51232297c +#endif diff --git a/include/linux/rockchip/nvmem.h b/include/linux/rockchip/nvmem.h new file mode 100644 -index 000000000000..741887856e33 +index 000000000..741887856 --- /dev/null +++ b/include/linux/rockchip/nvmem.h @@ -0,0 +1,26 @@ @@ -1675552,7 +1675553,7 @@ index 000000000000..741887856e33 +#endif diff --git a/include/linux/rockchip/psci.h b/include/linux/rockchip/psci.h new file mode 100644 -index 000000000000..870da27edf65 +index 000000000..870da27ed --- /dev/null +++ b/include/linux/rockchip/psci.h @@ -0,0 +1,76 @@ @@ -1675634,7 +1675635,7 @@ index 000000000000..870da27edf65 +#endif /* __ROCKCHIP_PSCI_H */ diff --git a/include/linux/rockchip/rockchip_pm_config.h b/include/linux/rockchip/rockchip_pm_config.h new file mode 100644 -index 000000000000..2c95b04b092d +index 000000000..2c95b04b0 --- /dev/null +++ b/include/linux/rockchip/rockchip_pm_config.h @@ -0,0 +1,32 @@ @@ -1675672,7 +1675673,7 @@ index 000000000000..2c95b04b092d +#endif /* __ROCKCHIP_PM_CONFIG_H */ diff --git a/include/linux/rockchip/rockchip_sip.h b/include/linux/rockchip/rockchip_sip.h new file mode 100644 -index 000000000000..70b1493ef697 +index 000000000..70b1493ef --- /dev/null +++ b/include/linux/rockchip/rockchip_sip.h @@ -0,0 +1,549 @@ @@ -1676227,7 +1676228,7 @@ index 000000000000..70b1493ef697 +#endif diff --git a/include/linux/rockchip_ion.h b/include/linux/rockchip_ion.h new file mode 100644 -index 000000000000..39c497774fb0 +index 000000000..39c497774 --- /dev/null +++ b/include/linux/rockchip_ion.h @@ -0,0 +1,41 @@ @@ -1676273,7 +1676274,7 @@ index 000000000000..39c497774fb0 + +#endif diff --git a/include/linux/sched.h b/include/linux/sched.h -index d3198acc29af..b522879c7ae2 100644 +index d3198acc2..b522879c7 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -744,6 +744,20 @@ struct kmap_ctrl { @@ -1676309,7 +1676310,7 @@ index d3198acc29af..b522879c7ae2 100644 * New fields for task_struct should be added above here, so that * they are included in the randomized portion of task_struct. diff --git a/include/linux/sched/signal.h b/include/linux/sched/signal.h -index 0014d3adaf84..669e8cff40c7 100644 +index 0014d3ada..669e8cff4 100644 --- a/include/linux/sched/signal.h +++ b/include/linux/sched/signal.h @@ -649,9 +649,12 @@ extern void flush_itimer_signals(void); @@ -1676329,7 +1676330,7 @@ index 0014d3adaf84..669e8cff40c7 100644 diff --git a/include/linux/soc/rockchip/pvtm.h b/include/linux/soc/rockchip/pvtm.h new file mode 100644 -index 000000000000..3d2495cfd6e5 +index 000000000..3d2495cfd --- /dev/null +++ b/include/linux/soc/rockchip/pvtm.h @@ -0,0 +1,17 @@ @@ -1676352,7 +1676353,7 @@ index 000000000000..3d2495cfd6e5 +#endif /* __SOC_ROCKCHIP_PVTM_H */ diff --git a/include/linux/soc/rockchip/rk_sdmmc.h b/include/linux/soc/rockchip/rk_sdmmc.h new file mode 100644 -index 000000000000..14f70f72e383 +index 000000000..14f70f72e --- /dev/null +++ b/include/linux/soc/rockchip/rk_sdmmc.h @@ -0,0 +1,13 @@ @@ -1676371,7 +1676372,7 @@ index 000000000000..14f70f72e383 +#endif diff --git a/include/linux/soc/rockchip/rk_vendor_storage.h b/include/linux/soc/rockchip/rk_vendor_storage.h new file mode 100644 -index 000000000000..d30b775e6a5f +index 000000000..d30b775e6 --- /dev/null +++ b/include/linux/soc/rockchip/rk_vendor_storage.h @@ -0,0 +1,96 @@ @@ -1676473,7 +1676474,7 @@ index 000000000000..d30b775e6a5f +#endif diff --git a/include/linux/soc/rockchip/rockchip_decompress.h b/include/linux/soc/rockchip/rockchip_decompress.h new file mode 100644 -index 000000000000..120ae907c2aa +index 000000000..120ae907c --- /dev/null +++ b/include/linux/soc/rockchip/rockchip_decompress.h @@ -0,0 +1,42 @@ @@ -1676521,7 +1676522,7 @@ index 000000000000..120ae907c2aa +#endif diff --git a/include/linux/soc/rockchip/rockchip_thunderboot_crypto.h b/include/linux/soc/rockchip/rockchip_thunderboot_crypto.h new file mode 100644 -index 000000000000..2fe176649409 +index 000000000..2fe176649 --- /dev/null +++ b/include/linux/soc/rockchip/rockchip_thunderboot_crypto.h @@ -0,0 +1,9 @@ @@ -1676536,7 +1676537,7 @@ index 000000000000..2fe176649409 +#endif diff --git a/include/linux/soc/rockchip/rockchip_thunderboot_service.h b/include/linux/soc/rockchip/rockchip_thunderboot_service.h new file mode 100644 -index 000000000000..d0a08a07c21d +index 000000000..d0a08a07c --- /dev/null +++ b/include/linux/soc/rockchip/rockchip_thunderboot_service.h @@ -0,0 +1,37 @@ @@ -1676578,7 +1676579,7 @@ index 000000000000..d0a08a07c21d +#endif +#endif diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h -index 5acb77968902..b81871205c25 100644 +index 5acb77968..b81871205 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -264,6 +264,9 @@ struct plat_stmmacenet_data { @@ -1676603,7 +1676604,7 @@ index 5acb77968902..b81871205c25 100644 int (*clks_config)(void *priv, bool enabled); int (*crosststamp)(ktime_t *device, struct system_counterval_t *system, diff --git a/include/linux/usb/quirks.h b/include/linux/usb/quirks.h -index eeb7c2157c72..e3e543d04bd6 100644 +index eeb7c2157..e3e543d04 100644 --- a/include/linux/usb/quirks.h +++ b/include/linux/usb/quirks.h @@ -72,4 +72,7 @@ @@ -1676616,7 +1676617,7 @@ index eeb7c2157c72..e3e543d04bd6 100644 #endif /* __LINUX_USB_QUIRKS_H */ diff --git a/include/linux/version_compat_defs.h b/include/linux/version_compat_defs.h new file mode 100644 -index 000000000000..a83b8871598e +index 000000000..a83b88715 --- /dev/null +++ b/include/linux/version_compat_defs.h @@ -0,0 +1,289 @@ @@ -1676911,7 +1676912,7 @@ index 000000000000..a83b8871598e +#endif /* _VERSION_COMPAT_DEFS_H_ */ diff --git a/include/linux/wakelock.h b/include/linux/wakelock.h new file mode 100644 -index 000000000000..7b4825ba9521 +index 000000000..7b4825ba9 --- /dev/null +++ b/include/linux/wakelock.h @@ -0,0 +1,76 @@ @@ -1676993,7 +1676994,7 @@ index 000000000000..7b4825ba9521 +#endif diff --git a/include/linux/wakeup_reason.h b/include/linux/wakeup_reason.h new file mode 100644 -index 000000000000..54f5caaa5cde +index 000000000..54f5caaa5 --- /dev/null +++ b/include/linux/wakeup_reason.h @@ -0,0 +1,37 @@ @@ -1677036,7 +1677037,7 @@ index 000000000000..54f5caaa5cde +#endif /* _LINUX_WAKEUP_REASON_H */ diff --git a/include/linux/xpm.h b/include/linux/xpm.h new file mode 100644 -index 000000000000..2373d9c2321c +index 000000000..2373d9c23 --- /dev/null +++ b/include/linux/xpm.h @@ -0,0 +1,99 @@ @@ -1677141,7 +1677142,7 @@ index 000000000000..2373d9c2321c +#endif /* _XPM_H */ diff --git a/include/linux/xpm_types.h b/include/linux/xpm_types.h new file mode 100644 -index 000000000000..e8a0cec9845f +index 000000000..e8a0cec98 --- /dev/null +++ b/include/linux/xpm_types.h @@ -0,0 +1,21 @@ @@ -1677169,7 +1677170,7 @@ index 000000000000..e8a0cec9845f \ No newline at end of file diff --git a/include/linux/zswapd.h b/include/linux/zswapd.h new file mode 100644 -index 000000000000..3a9768a358a8 +index 000000000..3a9768a35 --- /dev/null +++ b/include/linux/zswapd.h @@ -0,0 +1,50 @@ @@ -1677224,7 +1677225,7 @@ index 000000000000..3a9768a358a8 + +#endif /* _LINUX_ZSWAPD_H */ diff --git a/include/media/mipi-csi2.h b/include/media/mipi-csi2.h -index c3d8f12234b1..40fc0264250d 100644 +index c3d8f1223..40fc02642 100644 --- a/include/media/mipi-csi2.h +++ b/include/media/mipi-csi2.h @@ -19,6 +19,7 @@ @@ -1677236,7 +1677237,7 @@ index c3d8f12234b1..40fc0264250d 100644 #define MIPI_CSI2_DT_YUV420_10B 0x19 #define MIPI_CSI2_DT_YUV420_8B_LEGACY 0x1a diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h -index 9bd326d31181..246cde0a993b 100644 +index 9bd326d31..246cde0a9 100644 --- a/include/media/v4l2-async.h +++ b/include/media/v4l2-async.h @@ -17,6 +17,7 @@ struct device_node; @@ -1677363,7 +1677364,7 @@ index 9bd326d31181..246cde0a993b 100644 * diff --git a/include/media/v4l2-controls_rockchip.h b/include/media/v4l2-controls_rockchip.h new file mode 100644 -index 000000000000..fc14dc8513e4 +index 000000000..fc14dc851 --- /dev/null +++ b/include/media/v4l2-controls_rockchip.h @@ -0,0 +1,27 @@ @@ -1677396,7 +1677397,7 @@ index 000000000000..fc14dc8513e4 +#endif diff --git a/include/media/v4l2-uvc.h b/include/media/v4l2-uvc.h new file mode 100644 -index 000000000000..b010a36fc1d9 +index 000000000..b010a36fc --- /dev/null +++ b/include/media/v4l2-uvc.h @@ -0,0 +1,367 @@ @@ -1677769,7 +1677770,7 @@ index 000000000000..b010a36fc1d9 +#endif /* __LINUX_V4L2_UVC_H */ diff --git a/include/media/videobuf2-cma-sg.h b/include/media/videobuf2-cma-sg.h new file mode 100644 -index 000000000000..021a80a2f10b +index 000000000..021a80a2f --- /dev/null +++ b/include/media/videobuf2-cma-sg.h @@ -0,0 +1,10 @@ @@ -1677784,7 +1677785,7 @@ index 000000000000..021a80a2f10b + +#endif diff --git a/include/soc/rockchip/pm_domains.h b/include/soc/rockchip/pm_domains.h -index 7dbd941fc937..670459c6a0a1 100644 +index 7dbd941fc..670459c6a 100644 --- a/include/soc/rockchip/pm_domains.h +++ b/include/soc/rockchip/pm_domains.h @@ -6,10 +6,21 @@ @@ -1677860,7 +1677861,7 @@ index 7dbd941fc937..670459c6a0a1 100644 + #endif /* __SOC_ROCKCHIP_PM_DOMAINS_H__ */ diff --git a/include/soc/rockchip/rk3399_grf.h b/include/soc/rockchip/rk3399_grf.h -index 3eebabcb2812..39cd44cec982 100644 +index 3eebabcb2..39cd44cec 100644 --- a/include/soc/rockchip/rk3399_grf.h +++ b/include/soc/rockchip/rk3399_grf.h @@ -11,11 +11,8 @@ @@ -1677880,7 +1677881,7 @@ index 3eebabcb2812..39cd44cec982 100644 #endif diff --git a/include/soc/rockchip/rk3568_grf.h b/include/soc/rockchip/rk3568_grf.h new file mode 100644 -index 000000000000..52853efd6720 +index 000000000..52853efd6 --- /dev/null +++ b/include/soc/rockchip/rk3568_grf.h @@ -0,0 +1,13 @@ @@ -1677899,7 +1677900,7 @@ index 000000000000..52853efd6720 +#endif /* __SOC_RK3568_GRF_H */ diff --git a/include/soc/rockchip/rk3588_grf.h b/include/soc/rockchip/rk3588_grf.h new file mode 100644 -index 000000000000..630b35a55064 +index 000000000..630b35a55 --- /dev/null +++ b/include/soc/rockchip/rk3588_grf.h @@ -0,0 +1,18 @@ @@ -1677923,7 +1677924,7 @@ index 000000000000..630b35a55064 +#endif /* __SOC_RK3588_GRF_H */ diff --git a/include/soc/rockchip/rk_minidump.h b/include/soc/rockchip/rk_minidump.h new file mode 100644 -index 000000000000..c9e9efd2222b +index 000000000..c9e9efd22 --- /dev/null +++ b/include/soc/rockchip/rk_minidump.h @@ -0,0 +1,75 @@ @@ -1678004,7 +1678005,7 @@ index 000000000000..c9e9efd2222b +#endif /* __RK_MINIDUMP_H */ diff --git a/include/soc/rockchip/rkfb_dmc.h b/include/soc/rockchip/rkfb_dmc.h new file mode 100644 -index 000000000000..5e82b3194dd3 +index 000000000..5e82b3194 --- /dev/null +++ b/include/soc/rockchip/rkfb_dmc.h @@ -0,0 +1,11 @@ @@ -1678021,7 +1678022,7 @@ index 000000000000..5e82b3194dd3 +#endif diff --git a/include/soc/rockchip/rockchip-mailbox.h b/include/soc/rockchip/rockchip-mailbox.h new file mode 100644 -index 000000000000..e3698b9e10fe +index 000000000..e3698b9e1 --- /dev/null +++ b/include/soc/rockchip/rockchip-mailbox.h @@ -0,0 +1,30 @@ @@ -1678057,7 +1678058,7 @@ index 000000000000..e3698b9e10fe +#endif /* __SOC_ROCKCHIP_MAILBOX_H__ */ diff --git a/include/soc/rockchip/rockchip-system-status.h b/include/soc/rockchip/rockchip-system-status.h new file mode 100644 -index 000000000000..5eb53ff2f3f3 +index 000000000..5eb53ff2f --- /dev/null +++ b/include/soc/rockchip/rockchip-system-status.h @@ -0,0 +1,55 @@ @@ -1678118,7 +1678119,7 @@ index 000000000000..5eb53ff2f3f3 +#endif diff --git a/include/soc/rockchip/rockchip_amp.h b/include/soc/rockchip/rockchip_amp.h new file mode 100644 -index 000000000000..851c0f47d54a +index 000000000..851c0f47d --- /dev/null +++ b/include/soc/rockchip/rockchip_amp.h @@ -0,0 +1,48 @@ @@ -1678172,7 +1678173,7 @@ index 000000000000..851c0f47d54a +#endif /* _ROCKCHIP_AMP */ diff --git a/include/soc/rockchip/rockchip_csu.h b/include/soc/rockchip/rockchip_csu.h new file mode 100644 -index 000000000000..4338d68359f7 +index 000000000..4338d6835 --- /dev/null +++ b/include/soc/rockchip/rockchip_csu.h @@ -0,0 +1,46 @@ @@ -1678224,7 +1678225,7 @@ index 000000000000..4338d68359f7 +#endif diff --git a/include/soc/rockchip/rockchip_dmc.h b/include/soc/rockchip/rockchip_dmc.h new file mode 100644 -index 000000000000..f115cdcec291 +index 000000000..f115cdcec --- /dev/null +++ b/include/soc/rockchip/rockchip_dmc.h @@ -0,0 +1,131 @@ @@ -1678361,7 +1678362,7 @@ index 000000000000..f115cdcec291 +#endif diff --git a/include/soc/rockchip/rockchip_dvbm.h b/include/soc/rockchip/rockchip_dvbm.h new file mode 100644 -index 000000000000..19596f1bd4c6 +index 000000000..19596f1bd --- /dev/null +++ b/include/soc/rockchip/rockchip_dvbm.h @@ -0,0 +1,161 @@ @@ -1678528,7 +1678529,7 @@ index 000000000000..19596f1bd4c6 +#endif diff --git a/include/soc/rockchip/rockchip_grf.h b/include/soc/rockchip/rockchip_grf.h new file mode 100644 -index 000000000000..e46fd72aea8d +index 000000000..e46fd72ae --- /dev/null +++ b/include/soc/rockchip/rockchip_grf.h @@ -0,0 +1,18 @@ @@ -1678552,7 +1678553,7 @@ index 000000000000..e46fd72aea8d +#endif /* __SOC_ROCKCHIP_GRF_H */ diff --git a/include/soc/rockchip/rockchip_iommu.h b/include/soc/rockchip/rockchip_iommu.h new file mode 100644 -index 000000000000..b3086c0f0617 +index 000000000..b3086c0f0 --- /dev/null +++ b/include/soc/rockchip/rockchip_iommu.h @@ -0,0 +1,89 @@ @@ -1678647,7 +1678648,7 @@ index 000000000000..b3086c0f0617 +#endif diff --git a/include/soc/rockchip/rockchip_ipa.h b/include/soc/rockchip/rockchip_ipa.h new file mode 100644 -index 000000000000..cb333f463c7b +index 000000000..cb333f463 --- /dev/null +++ b/include/soc/rockchip/rockchip_ipa.h @@ -0,0 +1,40 @@ @@ -1678693,7 +1678694,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 100644 -index 000000000000..f241978549f5 +index 000000000..f24197854 --- /dev/null +++ b/include/soc/rockchip/rockchip_opp_select.h @@ -0,0 +1,291 @@ @@ -1678990,7 +1678991,7 @@ index 000000000000..f241978549f5 +#endif diff --git a/include/soc/rockchip/rockchip_performance.h b/include/soc/rockchip/rockchip_performance.h new file mode 100644 -index 000000000000..c080fb65c7a5 +index 000000000..c080fb65c --- /dev/null +++ b/include/soc/rockchip/rockchip_performance.h @@ -0,0 +1,33 @@ @@ -1679029,7 +1679030,7 @@ index 000000000000..c080fb65c7a5 +#endif diff --git a/include/soc/rockchip/rockchip_rockit.h b/include/soc/rockchip/rockchip_rockit.h new file mode 100644 -index 000000000000..760a864d24bc +index 000000000..760a864d2 --- /dev/null +++ b/include/soc/rockchip/rockchip_rockit.h @@ -0,0 +1,187 @@ @@ -1679221,7 +1679222,7 @@ index 000000000000..760a864d24bc + +#endif diff --git a/include/soc/rockchip/rockchip_sip.h b/include/soc/rockchip/rockchip_sip.h -index c46a9ae2a2ab..23daaddcacb5 100644 +index c46a9ae2a..23daaddca 100644 --- a/include/soc/rockchip/rockchip_sip.h +++ b/include/soc/rockchip/rockchip_sip.h @@ -16,5 +16,14 @@ @@ -1679241,7 +1679242,7 @@ index c46a9ae2a2ab..23daaddcacb5 100644 #endif diff --git a/include/soc/rockchip/rockchip_system_monitor.h b/include/soc/rockchip/rockchip_system_monitor.h new file mode 100644 -index 000000000000..4df62aa371e9 +index 000000000..4df62aa37 --- /dev/null +++ b/include/soc/rockchip/rockchip_system_monitor.h @@ -0,0 +1,215 @@ @@ -1679462,7 +1679463,7 @@ index 000000000000..4df62aa371e9 +#endif diff --git a/include/trace/events/platform_trace_event.h b/include/trace/events/platform_trace_event.h new file mode 100644 -index 000000000000..899a583fd124 +index 000000000..899a583fd --- /dev/null +++ b/include/trace/events/platform_trace_event.h @@ -0,0 +1,30 @@ @@ -1679499,7 +1679500,7 @@ index 000000000000..899a583fd124 \ No newline at end of file diff --git a/include/trace/events/sync.h b/include/trace/events/sync.h new file mode 100644 -index 000000000000..a1c58d1c25e9 +index 000000000..a1c58d1c2 --- /dev/null +++ b/include/trace/events/sync.h @@ -0,0 +1,83 @@ @@ -1679588,7 +1679589,7 @@ index 000000000000..a1c58d1c25e9 +#include diff --git a/include/trace/events/thermal.h b/include/trace/events/thermal.h new file mode 100644 -index 000000000000..e58bf3072f32 +index 000000000..e58bf3072 --- /dev/null +++ b/include/trace/events/thermal.h @@ -0,0 +1,199 @@ @@ -1679793,7 +1679794,7 @@ index 000000000000..e58bf3072f32 +#include diff --git a/include/trace/events/thermal_ipa_power.h b/include/trace/events/thermal_ipa_power.h new file mode 100644 -index 000000000000..a3a932c75d6a +index 000000000..a3a932c75 --- /dev/null +++ b/include/trace/events/thermal_ipa_power.h @@ -0,0 +1,47 @@ @@ -1679846,7 +1679847,7 @@ index 000000000000..a3a932c75d6a +#include diff --git a/include/trace/events/thermal_power_allocator.h b/include/trace/events/thermal_power_allocator.h new file mode 100644 -index 000000000000..1c8fb95544f9 +index 000000000..1c8fb9554 --- /dev/null +++ b/include/trace/events/thermal_power_allocator.h @@ -0,0 +1,88 @@ @@ -1679940,7 +1679941,7 @@ index 000000000000..1c8fb95544f9 +#include diff --git a/include/trace/hooks/mm.h b/include/trace/hooks/mm.h new file mode 100644 -index 000000000000..dbe41923041b +index 000000000..dbe419230 --- /dev/null +++ b/include/trace/hooks/mm.h @@ -0,0 +1,25 @@ @@ -1679971,7 +1679972,7 @@ index 000000000000..dbe41923041b +#include diff --git a/include/trace/hooks/vendor_hooks.h b/include/trace/hooks/vendor_hooks.h new file mode 100644 -index 000000000000..21bafd638874 +index 000000000..21bafd638 --- /dev/null +++ b/include/trace/hooks/vendor_hooks.h @@ -0,0 +1,13 @@ @@ -1679989,7 +1679990,7 @@ index 000000000000..21bafd638874 + +#endif diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h -index 8db7fd3f743e..e0f47498ca77 100644 +index 8db7fd3f7..e0f47498c 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -323,6 +323,8 @@ extern "C" { @@ -1680056,7 +1680057,7 @@ index 8db7fd3f743e..e0f47498ca77 100644 #endif diff --git a/include/uapi/drm/rockchip_drm.h b/include/uapi/drm/rockchip_drm.h new file mode 100644 -index 000000000000..2ac71b43dba0 +index 000000000..2ac71b43d --- /dev/null +++ b/include/uapi/drm/rockchip_drm.h @@ -0,0 +1,139 @@ @@ -1680201,7 +1680202,7 @@ index 000000000000..2ac71b43dba0 +#endif /* _UAPI_ROCKCHIP_DRM_H */ diff --git a/include/uapi/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.h b/include/uapi/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.h new file mode 100644 -index 000000000000..a44da7beb041 +index 000000000..a44da7beb --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/backend/gpu/mali_kbase_model_dummy.h @@ -0,0 +1,77 @@ @@ -1680284,7 +1680285,7 @@ index 000000000000..a44da7beb041 +#endif /* _UAPI_KBASE_MODEL_DUMMY_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.h b/include/uapi/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.h new file mode 100644 -index 000000000000..c83cedd6a775 +index 000000000..c83cedd6a --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/backend/gpu/mali_kbase_model_linux.h @@ -0,0 +1,36 @@ @@ -1680326,7 +1680327,7 @@ index 000000000000..c83cedd6a775 +#endif /* _UAPI_KBASE_MODEL_LINUX_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/csf/mali_base_csf_kernel.h b/include/uapi/gpu/arm/bifrost/csf/mali_base_csf_kernel.h new file mode 100644 -index 000000000000..c18c6fc8a7ae +index 000000000..c18c6fc8a --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/csf/mali_base_csf_kernel.h @@ -0,0 +1,613 @@ @@ -1680945,7 +1680946,7 @@ index 000000000000..c18c6fc8a7ae +#endif /* _UAPI_BASE_CSF_KERNEL_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/csf/mali_kbase_csf_errors_dumpfault.h b/include/uapi/gpu/arm/bifrost/csf/mali_kbase_csf_errors_dumpfault.h new file mode 100644 -index 000000000000..f49ab0036fc3 +index 000000000..f49ab0036 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/csf/mali_kbase_csf_errors_dumpfault.h @@ -0,0 +1,81 @@ @@ -1681032,7 +1681033,7 @@ index 000000000000..f49ab0036fc3 +#endif /* _UAPI_KBASE_CSF_ERRORS_DUMPFAULT_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/csf/mali_kbase_csf_ioctl.h b/include/uapi/gpu/arm/bifrost/csf/mali_kbase_csf_ioctl.h new file mode 100644 -index 000000000000..7c37cfc077f8 +index 000000000..7c37cfc07 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/csf/mali_kbase_csf_ioctl.h @@ -0,0 +1,614 @@ @@ -1681652,7 +1681653,7 @@ index 000000000000..7c37cfc077f8 +#endif /* _UAPI_KBASE_CSF_IOCTL_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h b/include/uapi/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h new file mode 100644 -index 000000000000..0ca5d902f174 +index 000000000..0ca5d902f --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_csf.h @@ -0,0 +1,41 @@ @@ -1681699,7 +1681700,7 @@ index 000000000000..0ca5d902f174 +#endif /* _UAPI_KBASE_GPU_REGMAP_CSF_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h b/include/uapi/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h new file mode 100644 -index 000000000000..9bfd6d2fc529 +index 000000000..9bfd6d2fc --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/backend/mali_kbase_gpu_regmap_jm.h @@ -0,0 +1,50 @@ @@ -1681755,7 +1681756,7 @@ index 000000000000..9bfd6d2fc529 +#endif /* _UAPI_KBASE_GPU_REGMAP_JM_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_coherency.h b/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_coherency.h new file mode 100644 -index 000000000000..83d84137a034 +index 000000000..83d84137a --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_coherency.h @@ -0,0 +1,30 @@ @@ -1681791,7 +1681792,7 @@ index 000000000000..83d84137a034 +#endif /* _UAPI_KBASE_GPU_COHERENCY_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_id.h b/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_id.h new file mode 100644 -index 000000000000..784e09a7edc2 +index 000000000..784e09a7e --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_id.h @@ -0,0 +1,145 @@ @@ -1681942,7 +1681943,7 @@ index 000000000000..784e09a7edc2 +#endif /* _UAPI_KBASE_GPU_ID_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h b/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h new file mode 100644 -index 000000000000..1f331671b6b4 +index 000000000..1f331671b --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/gpu/mali_kbase_gpu_regmap.h @@ -0,0 +1,98 @@ @@ -1682046,7 +1682047,7 @@ index 000000000000..1f331671b6b4 +#endif /* _UAPI_KBASE_GPU_REGMAP_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/jm/mali_base_jm_kernel.h b/include/uapi/gpu/arm/bifrost/jm/mali_base_jm_kernel.h new file mode 100644 -index 000000000000..1a3098d6cad8 +index 000000000..1a3098d6c --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/jm/mali_base_jm_kernel.h @@ -0,0 +1,1055 @@ @@ -1683107,7 +1683108,7 @@ index 000000000000..1a3098d6cad8 +#endif /* _UAPI_BASE_JM_KERNEL_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/jm/mali_kbase_jm_ioctl.h b/include/uapi/gpu/arm/bifrost/jm/mali_kbase_jm_ioctl.h new file mode 100644 -index 000000000000..ac6affe8c76c +index 000000000..ac6affe8c --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/jm/mali_kbase_jm_ioctl.h @@ -0,0 +1,247 @@ @@ -1683360,7 +1683361,7 @@ index 000000000000..ac6affe8c76c +#endif /* _UAPI_KBASE_JM_IOCTL_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/mali_base_common_kernel.h b/include/uapi/gpu/arm/bifrost/mali_base_common_kernel.h new file mode 100644 -index 000000000000..f8378146aceb +index 000000000..f8378146a --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_base_common_kernel.h @@ -0,0 +1,231 @@ @@ -1683597,7 +1683598,7 @@ index 000000000000..f8378146aceb +#endif /* _UAPI_BASE_COMMON_KERNEL_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/mali_base_kernel.h b/include/uapi/gpu/arm/bifrost/mali_base_kernel.h new file mode 100644 -index 000000000000..e6cac0eb2a1a +index 000000000..e6cac0eb2 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_base_kernel.h @@ -0,0 +1,643 @@ @@ -1684246,7 +1684247,7 @@ index 000000000000..e6cac0eb2a1a +#endif /* _UAPI_BASE_KERNEL_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/mali_base_mem_priv.h b/include/uapi/gpu/arm/bifrost/mali_base_mem_priv.h new file mode 100644 -index 000000000000..70f5b0977520 +index 000000000..70f5b0977 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_base_mem_priv.h @@ -0,0 +1,57 @@ @@ -1684309,7 +1684310,7 @@ index 000000000000..70f5b0977520 +#endif /* _UAPI_BASE_MEM_PRIV_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/mali_kbase_hwcnt_reader.h b/include/uapi/gpu/arm/bifrost/mali_kbase_hwcnt_reader.h new file mode 100644 -index 000000000000..5089bf249528 +index 000000000..5089bf249 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_kbase_hwcnt_reader.h @@ -0,0 +1,503 @@ @@ -1684818,7 +1684819,7 @@ index 000000000000..5089bf249528 +#endif /* _UAPI_KBASE_HWCNT_READER_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/mali_kbase_ioctl.h b/include/uapi/gpu/arm/bifrost/mali_kbase_ioctl.h new file mode 100644 -index 000000000000..c8a54f91165e +index 000000000..c8a54f911 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_kbase_ioctl.h @@ -0,0 +1,789 @@ @@ -1685613,7 +1685614,7 @@ index 000000000000..c8a54f91165e +#endif /* _UAPI_KBASE_IOCTL_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/mali_kbase_kinstr_jm_reader.h b/include/uapi/gpu/arm/bifrost/mali_kbase_kinstr_jm_reader.h new file mode 100644 -index 000000000000..72e1b9dbf245 +index 000000000..72e1b9dbf --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_kbase_kinstr_jm_reader.h @@ -0,0 +1,69 @@ @@ -1685688,7 +1685689,7 @@ index 000000000000..72e1b9dbf245 +#endif /* _UAPI_KBASE_KINSTR_JM_READER_H_ */ diff --git a/include/uapi/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs_buf_size.h b/include/uapi/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs_buf_size.h new file mode 100644 -index 000000000000..329845005341 +index 000000000..329845005 --- /dev/null +++ b/include/uapi/gpu/arm/bifrost/mali_kbase_mem_profile_debugfs_buf_size.h @@ -0,0 +1,35 @@ @@ -1685728,7 +1685729,7 @@ index 000000000000..329845005341 + +#endif /*_UAPI_KBASE_MEM_PROFILE_DEBUGFS_BUF_SIZE_H_*/ diff --git a/include/uapi/linux/cec.h b/include/uapi/linux/cec.h -index b8e071abaea5..9ea79869c17b 100644 +index b8e071aba..9ea79869c 100644 --- a/include/uapi/linux/cec.h +++ b/include/uapi/linux/cec.h @@ -537,6 +537,12 @@ struct cec_event { @@ -1685746,7 +1685747,7 @@ index b8e071abaea5..9ea79869c17b 100644 * The format matters since it the cec-ctl utility parses it to generate diff --git a/include/uapi/linux/cryptodev.h b/include/uapi/linux/cryptodev.h new file mode 100644 -index 000000000000..0b81c3c2dd13 +index 000000000..0b81c3c2d --- /dev/null +++ b/include/uapi/linux/cryptodev.h @@ -0,0 +1,369 @@ @@ -1686120,7 +1686121,7 @@ index 000000000000..0b81c3c2dd13 + +#endif /* L_CRYPTODEV_H */ diff --git a/include/uapi/linux/dma-heap.h b/include/uapi/linux/dma-heap.h -index 6f84fa08e074..a69bdf05d801 100644 +index 6f84fa08e..a69bdf05d 100644 --- a/include/uapi/linux/dma-heap.h +++ b/include/uapi/linux/dma-heap.h @@ -39,6 +39,11 @@ struct dma_heap_allocation_data { @@ -1686145,7 +1686146,7 @@ index 6f84fa08e074..a69bdf05d801 100644 #endif /* _UAPI_LINUX_DMABUF_POOL_H */ diff --git a/include/uapi/linux/fec-config.h b/include/uapi/linux/fec-config.h new file mode 100644 -index 000000000000..16c4dadb58a1 +index 000000000..16c4dadb5 --- /dev/null +++ b/include/uapi/linux/fec-config.h @@ -0,0 +1,33 @@ @@ -1686183,7 +1686184,7 @@ index 000000000000..16c4dadb58a1 + +#endif diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h -index a03c543cb072..7be27ff71178 100644 +index a03c543cb..7be27ff71 100644 --- a/include/uapi/linux/media-bus-format.h +++ b/include/uapi/linux/media-bus-format.h @@ -71,6 +71,11 @@ @@ -1686200,7 +1686201,7 @@ index a03c543cb072..7be27ff71178 100644 #define MEDIA_BUS_FMT_Y8_1X8 0x2001 diff --git a/include/uapi/linux/rk-camera-module.h b/include/uapi/linux/rk-camera-module.h new file mode 100644 -index 000000000000..d25977d3b878 +index 000000000..d25977d3b --- /dev/null +++ b/include/uapi/linux/rk-camera-module.h @@ -0,0 +1,816 @@ @@ -1687022,7 +1687023,7 @@ index 000000000000..d25977d3b878 +#endif /* _UAPI_RKMODULE_CAMERA_H */ diff --git a/include/uapi/linux/rk-decom.h b/include/uapi/linux/rk-decom.h new file mode 100644 -index 000000000000..b7a7fd1ddb3b +index 000000000..b7a7fd1dd --- /dev/null +++ b/include/uapi/linux/rk-decom.h @@ -0,0 +1,34 @@ @@ -1687062,7 +1687063,7 @@ index 000000000000..b7a7fd1ddb3b +#endif diff --git a/include/uapi/linux/rk-dma-heap.h b/include/uapi/linux/rk-dma-heap.h new file mode 100644 -index 000000000000..4e83d71811ce +index 000000000..4e83d7181 --- /dev/null +++ b/include/uapi/linux/rk-dma-heap.h @@ -0,0 +1,55 @@ @@ -1687123,7 +1687124,7 @@ index 000000000000..4e83d71811ce +#endif /* _UAPI_LINUX_DMABUF_POOL_H */ diff --git a/include/uapi/linux/rk-iomux.h b/include/uapi/linux/rk-iomux.h new file mode 100644 -index 000000000000..58da85c9cb2e +index 000000000..58da85c9c --- /dev/null +++ b/include/uapi/linux/rk-iomux.h @@ -0,0 +1,20 @@ @@ -1687149,7 +1687150,7 @@ index 000000000000..58da85c9cb2e +#endif diff --git a/include/uapi/linux/rk-isp1-config.h b/include/uapi/linux/rk-isp1-config.h new file mode 100644 -index 000000000000..72b8755dd707 +index 000000000..72b8755dd --- /dev/null +++ b/include/uapi/linux/rk-isp1-config.h @@ -0,0 +1,872 @@ @@ -1688027,7 +1688028,7 @@ index 000000000000..72b8755dd707 +#endif /* _UAPI_RK_ISP1_CONFIG_H */ diff --git a/include/uapi/linux/rk-isp2-config.h b/include/uapi/linux/rk-isp2-config.h new file mode 100644 -index 000000000000..50949e0752bc +index 000000000..50949e075 --- /dev/null +++ b/include/uapi/linux/rk-isp2-config.h @@ -0,0 +1,2018 @@ @@ -1690051,7 +1690052,7 @@ index 000000000000..50949e0752bc +#endif /* _UAPI_RK_ISP2_CONFIG_H */ diff --git a/include/uapi/linux/rk-isp21-config.h b/include/uapi/linux/rk-isp21-config.h new file mode 100644 -index 000000000000..aad8fbad705c +index 000000000..aad8fbad7 --- /dev/null +++ b/include/uapi/linux/rk-isp21-config.h @@ -0,0 +1,813 @@ @@ -1690870,7 +1690871,7 @@ index 000000000000..aad8fbad705c +#endif /* _UAPI_RK_ISP21_CONFIG_H */ diff --git a/include/uapi/linux/rk-isp3-config.h b/include/uapi/linux/rk-isp3-config.h new file mode 100644 -index 000000000000..e14492674b3e +index 000000000..e14492674 --- /dev/null +++ b/include/uapi/linux/rk-isp3-config.h @@ -0,0 +1,1077 @@ @@ -1691953,7 +1691954,7 @@ index 000000000000..e14492674b3e +#endif /* _UAPI_RK_ISP3_CONFIG_H */ diff --git a/include/uapi/linux/rk-isp32-config.h b/include/uapi/linux/rk-isp32-config.h new file mode 100644 -index 000000000000..ecd4eaef2cd3 +index 000000000..ecd4eaef2 --- /dev/null +++ b/include/uapi/linux/rk-isp32-config.h @@ -0,0 +1,1528 @@ @@ -1693487,7 +1693488,7 @@ index 000000000000..ecd4eaef2cd3 +#endif /* _UAPI_RK_ISP32_CONFIG_H */ diff --git a/include/uapi/linux/rk-ispp-config.h b/include/uapi/linux/rk-ispp-config.h new file mode 100644 -index 000000000000..616ddff9ed64 +index 000000000..616ddff9e --- /dev/null +++ b/include/uapi/linux/rk-ispp-config.h @@ -0,0 +1,422 @@ @@ -1693915,7 +1693916,7 @@ index 000000000000..616ddff9ed64 +#endif diff --git a/include/uapi/linux/rk-led-flash.h b/include/uapi/linux/rk-led-flash.h new file mode 100644 -index 000000000000..c679cb9eb39a +index 000000000..c679cb9eb --- /dev/null +++ b/include/uapi/linux/rk-led-flash.h @@ -0,0 +1,9 @@ @@ -1693930,7 +1693931,7 @@ index 000000000000..c679cb9eb39a +#endif diff --git a/include/uapi/linux/rk-mpp.h b/include/uapi/linux/rk-mpp.h new file mode 100644 -index 000000000000..9a24407001ec +index 000000000..9a2440700 --- /dev/null +++ b/include/uapi/linux/rk-mpp.h @@ -0,0 +1,82 @@ @@ -1694018,7 +1694019,7 @@ index 000000000000..9a24407001ec +#endif /* _UAPI_RK_MPP_H */ diff --git a/include/uapi/linux/rk-pcie-dma.h b/include/uapi/linux/rk-pcie-dma.h new file mode 100644 -index 000000000000..bf4a96b5eea7 +index 000000000..bf4a96b5e --- /dev/null +++ b/include/uapi/linux/rk-pcie-dma.h @@ -0,0 +1,57 @@ @@ -1694081,7 +1694082,7 @@ index 000000000000..bf4a96b5eea7 +#endif diff --git a/include/uapi/linux/rk-pcie-ep.h b/include/uapi/linux/rk-pcie-ep.h new file mode 100644 -index 000000000000..d89748eed925 +index 000000000..d89748eed --- /dev/null +++ b/include/uapi/linux/rk-pcie-ep.h @@ -0,0 +1,122 @@ @@ -1694209,7 +1694210,7 @@ index 000000000000..d89748eed925 +#endif diff --git a/include/uapi/linux/rk-preisp.h b/include/uapi/linux/rk-preisp.h new file mode 100644 -index 000000000000..4cd51a84ada8 +index 000000000..4cd51a84a --- /dev/null +++ b/include/uapi/linux/rk-preisp.h @@ -0,0 +1,118 @@ @@ -1694333,7 +1694334,7 @@ index 000000000000..4cd51a84ada8 +#endif /* _UAPI_RKPREISP_H */ diff --git a/include/uapi/linux/rk-video-format.h b/include/uapi/linux/rk-video-format.h new file mode 100644 -index 000000000000..938d5adff737 +index 000000000..938d5adff --- /dev/null +++ b/include/uapi/linux/rk-video-format.h @@ -0,0 +1,37 @@ @@ -1694376,7 +1694377,7 @@ index 000000000000..938d5adff737 +#endif /* _UAPI_RK_VIDEO_FORMAT_H */ diff --git a/include/uapi/linux/rk803.h b/include/uapi/linux/rk803.h new file mode 100644 -index 000000000000..448468da9e8d +index 000000000..448468da9 --- /dev/null +++ b/include/uapi/linux/rk803.h @@ -0,0 +1,16 @@ @@ -1694398,7 +1694399,7 @@ index 000000000000..448468da9e8d +#endif /* _UAPI_RK803_H */ diff --git a/include/uapi/linux/rk_cryptodev.h b/include/uapi/linux/rk_cryptodev.h new file mode 100644 -index 000000000000..571488235471 +index 000000000..571488235 --- /dev/null +++ b/include/uapi/linux/rk_cryptodev.h @@ -0,0 +1,85 @@ @@ -1694489,7 +1694490,7 @@ index 000000000000..571488235471 +#endif diff --git a/include/uapi/linux/rk_hdmirx_config.h b/include/uapi/linux/rk_hdmirx_config.h new file mode 100644 -index 000000000000..26dcea790013 +index 000000000..26dcea790 --- /dev/null +++ b/include/uapi/linux/rk_hdmirx_config.h @@ -0,0 +1,88 @@ @@ -1694583,7 +1694584,7 @@ index 000000000000..26dcea790013 +#endif /* _UAPI_RK_HDMIRX_CONFIG_H */ diff --git a/include/uapi/linux/rk_vcm_head.h b/include/uapi/linux/rk_vcm_head.h new file mode 100644 -index 000000000000..4e663ae260d8 +index 000000000..4e663ae26 --- /dev/null +++ b/include/uapi/linux/rk_vcm_head.h @@ -0,0 +1,137 @@ @@ -1694726,7 +1694727,7 @@ index 000000000000..4e663ae260d8 + diff --git a/include/uapi/linux/rkcif-config.h b/include/uapi/linux/rkcif-config.h new file mode 100644 -index 000000000000..c9b9bbf0d301 +index 000000000..c9b9bbf0d --- /dev/null +++ b/include/uapi/linux/rkcif-config.h @@ -0,0 +1,91 @@ @@ -1694822,7 +1694823,7 @@ index 000000000000..c9b9bbf0d301 + +#endif diff --git a/include/uapi/linux/rkisp1-config.h b/include/uapi/linux/rkisp1-config.h -index 730673ecc63d..c26d4bb69261 100644 +index 730673ecc..c26d4bb69 100644 --- a/include/uapi/linux/rkisp1-config.h +++ b/include/uapi/linux/rkisp1-config.h @@ -1,6 +1,6 @@ @@ -1696397,7 +1696398,7 @@ index 730673ecc63d..c26d4bb69261 100644 #endif /* _UAPI_RKISP1_CONFIG_H */ diff --git a/include/uapi/linux/rkisp2-config.h b/include/uapi/linux/rkisp2-config.h new file mode 100644 -index 000000000000..9d41f9e8a097 +index 000000000..9d41f9e8a --- /dev/null +++ b/include/uapi/linux/rkisp2-config.h @@ -0,0 +1,1853 @@ @@ -1698256,7 +1698257,7 @@ index 000000000000..9d41f9e8a097 +#endif /* _UAPI_RKISP2_CONFIG_H */ diff --git a/include/uapi/linux/rkisp21-config.h b/include/uapi/linux/rkisp21-config.h new file mode 100644 -index 000000000000..203022b62361 +index 000000000..203022b62 --- /dev/null +++ b/include/uapi/linux/rkisp21-config.h @@ -0,0 +1,804 @@ @@ -1699066,7 +1699067,7 @@ index 000000000000..203022b62361 +#endif /* _UAPI_RKISP21_CONFIG_H */ diff --git a/include/uapi/linux/rkisp3-config.h b/include/uapi/linux/rkisp3-config.h new file mode 100644 -index 000000000000..25bbe1a9a146 +index 000000000..25bbe1a9a --- /dev/null +++ b/include/uapi/linux/rkisp3-config.h @@ -0,0 +1,1072 @@ @@ -1700144,7 +1700145,7 @@ index 000000000000..25bbe1a9a146 +#endif /* _UAPI_RKISP3_CONFIG_H */ diff --git a/include/uapi/linux/rkispp-config.h b/include/uapi/linux/rkispp-config.h new file mode 100644 -index 000000000000..b4a27f74f9c9 +index 000000000..b4a27f74f --- /dev/null +++ b/include/uapi/linux/rkispp-config.h @@ -0,0 +1,370 @@ @@ -1700519,7 +1700520,7 @@ index 000000000000..b4a27f74f9c9 + +#endif diff --git a/include/uapi/linux/serial_reg.h b/include/uapi/linux/serial_reg.h -index 08b3527e1b93..68c0ec727aca 100644 +index 08b3527e1..68c0ec727 100644 --- a/include/uapi/linux/serial_reg.h +++ b/include/uapi/linux/serial_reg.h @@ -30,6 +30,7 @@ @@ -1700532,7 +1700533,7 @@ index 08b3527e1b93..68c0ec727aca 100644 #define UART_IIR_NO_INT 0x01 /* No interrupts pending */ diff --git a/include/uapi/misc/dw_hdcp2.h b/include/uapi/misc/dw_hdcp2.h new file mode 100644 -index 000000000000..43d4af3d80d6 +index 000000000..43d4af3d8 --- /dev/null +++ b/include/uapi/misc/dw_hdcp2.h @@ -0,0 +1,130 @@ @@ -1700668,7 +1700669,7 @@ index 000000000000..43d4af3d80d6 +#endif /* _DW_HDCP_HOST_LIB_DRIVER_LINUX_IF_H_ */ diff --git a/include/uapi/misc/rkflash_vendor_storage.h b/include/uapi/misc/rkflash_vendor_storage.h new file mode 100644 -index 000000000000..c217380d1713 +index 000000000..c217380d1 --- /dev/null +++ b/include/uapi/misc/rkflash_vendor_storage.h @@ -0,0 +1,22 @@ @@ -1700695,7 +1700696,7 @@ index 000000000000..c217380d1713 + +#endif diff --git a/init/Kconfig b/init/Kconfig -index 879f6dc1cb27..1f58de359e67 100644 +index 879f6dc1c..1f58de359 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1317,6 +1317,12 @@ if BLK_DEV_INITRD @@ -1700712,7 +1700713,7 @@ index 879f6dc1cb27..1f58de359e67 100644 config BOOT_CONFIG diff --git a/init/initramfs.c b/init/initramfs.c -index 8d0fd946cdd2..e6fc7d3a2442 100644 +index 8d0fd946c..e6fc7d3a2 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -15,6 +15,7 @@ @@ -1700734,7 +1700735,7 @@ index 8d0fd946cdd2..e6fc7d3a2442 100644 loff_t saved_offset = this_header; if (*buf == '0' && !(this_header & 3)) { diff --git a/init/main.c b/init/main.c -index e24b0780fdff..ad605d35bc17 100644 +index e24b0780f..ad605d35b 100644 --- a/init/main.c +++ b/init/main.c @@ -1544,6 +1544,10 @@ static noinline void __init kernel_init_freeable(void) @@ -1700749,7 +1700750,7 @@ index e24b0780fdff..ad605d35bc17 100644 padata_init(); page_alloc_init_late(); diff --git a/kernel/profile.c b/kernel/profile.c -index 8a77769bc4b4..b2846f07295b 100644 +index 8a77769bc..b2846f072 100644 --- a/kernel/profile.c +++ b/kernel/profile.c @@ -136,6 +136,79 @@ int __ref profile_init(void) @@ -1700833,7 +1700834,7 @@ index 8a77769bc4b4..b2846f07295b 100644 /* * Each cpu has a pair of open-addressed hashtables for pending diff --git a/kernel/rcu/tree_stall.h b/kernel/rcu/tree_stall.h -index e09f4f624261..1fcb9d414e32 100644 +index e09f4f624..1fcb9d414 100644 --- a/kernel/rcu/tree_stall.h +++ b/kernel/rcu/tree_stall.h @@ -16,6 +16,7 @@ @@ -1700855,7 +1700856,7 @@ index e09f4f624261..1fcb9d414e32 100644 rcu_force_quiescent_state(); /* Kick them all. */ diff --git a/make-boot.sh b/make-boot.sh new file mode 100755 -index 000000000000..5fb7c561750e +index 000000000..5fb7c5617 --- /dev/null +++ b/make-boot.sh @@ -0,0 +1,31 @@ @@ -1700892,7 +1700893,7 @@ index 000000000000..5fb7c561750e +cp ${BOOT_LINUX}/boot_linux.img ${OUT_IMAGE} diff --git a/make-ohos.sh b/make-ohos.sh new file mode 100755 -index 000000000000..6777ff0af531 +index 000000000..6777ff0af --- /dev/null +++ b/make-ohos.sh @@ -0,0 +1,142 @@ @@ -1701039,7 +1701040,7 @@ index 000000000000..6777ff0af531 + fi +done 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 @@ -1701056,7 +1701057,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 @@ -1701067,7 +1701068,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 100644 -index 000000000000..8c82c8080f8b +index 000000000..8c82c8080 --- /dev/null +++ b/net/rfkill/rfkill-bt.c @@ -0,0 +1,830 @@ @@ -1701903,7 +1701904,7 @@ index 000000000000..8c82c8080f8b +MODULE_LICENSE("GPL"); diff --git a/net/rfkill/rfkill-wlan.c b/net/rfkill/rfkill-wlan.c new file mode 100644 -index 000000000000..7ac4324e2966 +index 000000000..7ac4324e2 --- /dev/null +++ b/net/rfkill/rfkill-wlan.c @@ -0,0 +1,982 @@ @@ -1702890,7 +1702891,7 @@ index 000000000000..7ac4324e2966 +MODULE_AUTHOR("gwl@rock-chips.com"); +MODULE_LICENSE("GPL"); diff --git a/scripts/Makefile b/scripts/Makefile -index 576cf64be667..5f095b61bf1f 100644 +index 576cf64be..5f095b61b 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -5,6 +5,7 @@ @@ -1702902,7 +1702903,7 @@ index 576cf64be667..5f095b61bf1f 100644 hostprogs-always-$(CONFIG_ASN1) += asn1_compiler hostprogs-always-$(CONFIG_MODULE_SIG_FORMAT) += sign-file diff --git a/scripts/Makefile.clang b/scripts/Makefile.clang -index 6c23c6af797f..355b10611972 100644 +index 6c23c6af7..355b10611 100644 --- a/scripts/Makefile.clang +++ b/scripts/Makefile.clang @@ -34,6 +34,6 @@ endif @@ -1702914,7 +1702915,7 @@ index 6c23c6af797f..355b10611972 100644 KBUILD_CPPFLAGS += $(CLANG_FLAGS) export CLANG_FLAGS diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn -index 2fe6f2828d37..79705d880d8d 100644 +index 2fe6f2828..79705d880 100644 --- a/scripts/Makefile.extrawarn +++ b/scripts/Makefile.extrawarn @@ -143,6 +143,9 @@ KBUILD_CFLAGS += $(call cc-disable-warning, pointer-to-enum-cast) @@ -1702928,7 +1702929,7 @@ index 2fe6f2828d37..79705d880d8d 100644 endif diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 68d0134bdbf9..35554da89015 100644 +index 68d0134bd..35554da89 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -389,8 +389,9 @@ $(obj)/%.dtbo.S: $(obj)/%.dtbo FORCE @@ -1702944,7 +1702945,7 @@ index 68d0134bdbf9..35554da89015 100644 -d $(depfile).dtc.tmp $(dtc-tmp) ; \ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c -index 9f31d2607182..187cc491bb94 100644 +index 9f31d2607..187cc491b 100644 --- a/scripts/dtc/checks.c +++ b/scripts/dtc/checks.c @@ -672,6 +672,24 @@ static void fixup_omit_unused_nodes(struct check *c, struct dt_info *dti, @@ -1702974,7 +1702975,7 @@ index 9f31d2607182..187cc491bb94 100644 diff --git a/scripts/gen_autoksyms.sh b/scripts/gen_autoksyms.sh new file mode 100755 -index 000000000000..da320151e7c3 +index 000000000..da320151e --- /dev/null +++ b/scripts/gen_autoksyms.sh @@ -0,0 +1,72 @@ @@ -1703052,7 +1703053,7 @@ index 000000000000..da320151e7c3 +sed -e 's/\(.*\)/#define __KSYM_\1 1/' >> "$output_file" 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 @@ @@ -1703292,7 +1703293,7 @@ index 000000000000..63e3da6f402c + make_boot_img; +fi diff --git a/scripts/mod/Makefile b/scripts/mod/Makefile -index c9e38ad937fd..3c54125eb373 100644 +index c9e38ad93..3c54125eb 100644 --- a/scripts/mod/Makefile +++ b/scripts/mod/Makefile @@ -5,7 +5,7 @@ CFLAGS_REMOVE_empty.o += $(CC_FLAGS_LTO) @@ -1703314,7 +1703315,7 @@ index c9e38ad937fd..3c54125eb373 100644 quiet_cmd_elfconfig = MKELF $@ diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 5191fdbd3fa2..cb6406f485a9 100644 +index 5191fdbd3..cb6406f48 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -22,7 +22,6 @@ @@ -1703641,7 +1703642,7 @@ index 5191fdbd3fa2..cb6406f485a9 100644 } diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h -index 5f94c2c9f2d9..69baf014da4f 100644 +index 5f94c2c9f..69baf014d 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h @@ -1,4 +1,5 @@ @@ -1703731,7 +1703732,7 @@ index 5f94c2c9f2d9..69baf014da4f 100644 Elf_Sym *sym, const char *symname); diff --git a/scripts/mod/symsearch.c b/scripts/mod/symsearch.c new file mode 100644 -index 000000000000..aa4ed51f9960 +index 000000000..aa4ed51f9 --- /dev/null +++ b/scripts/mod/symsearch.c @@ -0,0 +1,199 @@ @@ -1703936,7 +1703937,7 @@ index 000000000000..aa4ed51f9960 +} diff --git a/scripts/ohos-check-dir.sh b/scripts/ohos-check-dir.sh new file mode 100755 -index 000000000000..2833618f9304 +index 000000000..2833618f9 --- /dev/null +++ b/scripts/ohos-check-dir.sh @@ -0,0 +1,8 @@ @@ -1703950,7 +1703951,7 @@ index 000000000000..2833618f9304 +exit 1 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 @@ @@ -1704109,7 +1704110,7 @@ index 000000000000..69065d28e0ea +--output $output diff --git a/scripts/resource_tool.c b/scripts/resource_tool.c new file mode 100644 -index 000000000000..8465c578b2d7 +index 000000000..8465c578b --- /dev/null +++ b/scripts/resource_tool.c @@ -0,0 +1,1575 @@ @@ -1705689,7 +1705690,7 @@ index 000000000000..8465c578b2d7 + +/************pack code end****************/ diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig -index f98a2fa85edd..e1b10483ae6f 100644 +index f98a2fa85..e1b10483a 100644 --- a/sound/soc/rockchip/Kconfig +++ b/sound/soc/rockchip/Kconfig @@ -7,13 +7,24 @@ config SND_SOC_ROCKCHIP @@ -1705815,7 +1705816,7 @@ index f98a2fa85edd..e1b10483ae6f 100644 tristate "ASoC support multiple codecs for Rockchip RK3288 boards" depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && HAVE_CLK diff --git a/sound/soc/rockchip/Makefile b/sound/soc/rockchip/Makefile -index 30c57c0d7660..ca8dfb54841c 100644 +index 30c57c0d7..ca8dfb548 100644 --- a/sound/soc/rockchip/Makefile +++ b/sound/soc/rockchip/Makefile @@ -1,21 +1,45 @@ @@ -1705866,7 +1705867,7 @@ index 30c57c0d7660..ca8dfb54841c 100644 obj-$(CONFIG_SND_SOC_RK3288_HDMI_ANALOG) += snd-soc-rk3288-hdmi-analog.o obj-$(CONFIG_SND_SOC_RK3399_GRU_SOUND) += snd-soc-rk3399-gru-sound.o diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c -index 0f704d22d21b..2540b9ba37c8 100644 +index 0f704d22d..2540b9ba3 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -21,6 +21,7 @@ @@ -1705915,7 +1705916,7 @@ index 0f704d22d21b..2540b9ba37c8 100644 } diff --git a/sound/soc/rockchip/rockchip_audio_pwm.c b/sound/soc/rockchip/rockchip_audio_pwm.c new file mode 100644 -index 000000000000..44ca66f1ed95 +index 000000000..44ca66f1e --- /dev/null +++ b/sound/soc/rockchip/rockchip_audio_pwm.c @@ -0,0 +1,372 @@ @@ -1706293,7 +1706294,7 @@ index 000000000000..44ca66f1ed95 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/rockchip/rockchip_audio_pwm.h b/sound/soc/rockchip/rockchip_audio_pwm.h new file mode 100644 -index 000000000000..ad68660437c2 +index 000000000..ad6866043 --- /dev/null +++ b/sound/soc/rockchip/rockchip_audio_pwm.h @@ -0,0 +1,48 @@ @@ -1706347,7 +1706348,7 @@ index 000000000000..ad68660437c2 +#endif /* _ROCKCHIP_AUDIO_PWM_H */ diff --git a/sound/soc/rockchip/rockchip_cdndp.c b/sound/soc/rockchip/rockchip_cdndp.c new file mode 100644 -index 000000000000..aafeab5b41c7 +index 000000000..aafeab5b4 --- /dev/null +++ b/sound/soc/rockchip/rockchip_cdndp.c @@ -0,0 +1,166 @@ @@ -1706519,7 +1706520,7 @@ index 000000000000..aafeab5b41c7 +MODULE_DEVICE_TABLE(of, rockchip_sound_of_match); diff --git a/sound/soc/rockchip/rockchip_da7219.c b/sound/soc/rockchip/rockchip_da7219.c new file mode 100644 -index 000000000000..bf675defb884 +index 000000000..bf675defb --- /dev/null +++ b/sound/soc/rockchip/rockchip_da7219.c @@ -0,0 +1,235 @@ @@ -1706760,7 +1706761,7 @@ index 000000000000..bf675defb884 +MODULE_DEVICE_TABLE(of, rockchip_da7219_of_match); diff --git a/sound/soc/rockchip/rockchip_dlp.c b/sound/soc/rockchip/rockchip_dlp.c new file mode 100644 -index 000000000000..f0d1f4136704 +index 000000000..f0d1f4136 --- /dev/null +++ b/sound/soc/rockchip/rockchip_dlp.c @@ -0,0 +1,1064 @@ @@ -1707830,7 +1707831,7 @@ index 000000000000..f0d1f4136704 +MODULE_LICENSE("GPL"); diff --git a/sound/soc/rockchip/rockchip_dlp.h b/sound/soc/rockchip/rockchip_dlp.h new file mode 100644 -index 000000000000..e3c6d24e6503 +index 000000000..e3c6d24e6 --- /dev/null +++ b/sound/soc/rockchip/rockchip_dlp.h @@ -0,0 +1,134 @@ @@ -1707970,7 +1707971,7 @@ index 000000000000..e3c6d24e6503 +#endif diff --git a/sound/soc/rockchip/rockchip_dlp_pcm.c b/sound/soc/rockchip/rockchip_dlp_pcm.c new file mode 100644 -index 000000000000..06fad00c23a4 +index 000000000..06fad00c2 --- /dev/null +++ b/sound/soc/rockchip/rockchip_dlp_pcm.c @@ -0,0 +1,516 @@ @@ -1708492,7 +1708493,7 @@ index 000000000000..06fad00c23a4 +MODULE_LICENSE("GPL"); diff --git a/sound/soc/rockchip/rockchip_dlp_pcm.h b/sound/soc/rockchip/rockchip_dlp_pcm.h new file mode 100644 -index 000000000000..3fa80bae8f46 +index 000000000..3fa80bae8 --- /dev/null +++ b/sound/soc/rockchip/rockchip_dlp_pcm.h @@ -0,0 +1,28 @@ @@ -1708526,7 +1708527,7 @@ index 000000000000..3fa80bae8f46 +#endif diff --git a/sound/soc/rockchip/rockchip_hdmi.c b/sound/soc/rockchip/rockchip_hdmi.c new file mode 100644 -index 000000000000..f52bdc337d14 +index 000000000..f52bdc337 --- /dev/null +++ b/sound/soc/rockchip/rockchip_hdmi.c @@ -0,0 +1,315 @@ @@ -1708847,7 +1708848,7 @@ index 000000000000..f52bdc337d14 +MODULE_ALIAS("platform:" DRV_NAME); diff --git a/sound/soc/rockchip/rockchip_hdmi_analog.c b/sound/soc/rockchip/rockchip_hdmi_analog.c new file mode 100644 -index 000000000000..02a282e8f60a +index 000000000..02a282e8f --- /dev/null +++ b/sound/soc/rockchip/rockchip_hdmi_analog.c @@ -0,0 +1,222 @@ @@ -1709075,7 +1709076,7 @@ index 000000000000..02a282e8f60a +MODULE_ALIAS("platform:" DRV_NAME); diff --git a/sound/soc/rockchip/rockchip_hdmi_dp.c b/sound/soc/rockchip/rockchip_hdmi_dp.c new file mode 100644 -index 000000000000..4db9fb7b7dae +index 000000000..4db9fb7b7 --- /dev/null +++ b/sound/soc/rockchip/rockchip_hdmi_dp.c @@ -0,0 +1,193 @@ @@ -1709273,7 +1709274,7 @@ index 000000000000..4db9fb7b7dae +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c -index 834fbb5cf810..876fc83ad264 100644 +index 834fbb5cf..876fc83ad 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -13,6 +13,7 @@ @@ -1710207,7 +1710208,7 @@ index 834fbb5cf810..876fc83ad264 100644 .name = DRV_NAME, .of_match_table = of_match_ptr(rockchip_i2s_match), diff --git a/sound/soc/rockchip/rockchip_i2s.h b/sound/soc/rockchip/rockchip_i2s.h -index 251851bf4f2c..748cf7bf68ad 100644 +index 251851bf4..748cf7bf6 100644 --- a/sound/soc/rockchip/rockchip_i2s.h +++ b/sound/soc/rockchip/rockchip_i2s.h @@ -18,8 +18,9 @@ @@ -1710281,7 +1710282,7 @@ index 251851bf4f2c..748cf7bf68ad 100644 + #endif /* _ROCKCHIP_IIS_H */ diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c -index d3700f3c98e6..6e5cfe729ddc 100644 +index d3700f3c9..6e5cfe729 100644 --- a/sound/soc/rockchip/rockchip_i2s_tdm.c +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c @@ -13,6 +13,8 @@ @@ -1712798,7 +1712799,7 @@ index d3700f3c98e6..6e5cfe729ddc 100644 .name = DRV_NAME, .of_match_table = of_match_ptr(rockchip_i2s_tdm_match), diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.h b/sound/soc/rockchip/rockchip_i2s_tdm.h -index 0aa1c6da1e2c..9b9f5fa390ee 100644 +index 0aa1c6da1..9b9f5fa39 100644 --- a/sound/soc/rockchip/rockchip_i2s_tdm.h +++ b/sound/soc/rockchip/rockchip_i2s_tdm.h @@ -20,8 +20,9 @@ @@ -1712925,7 +1712926,7 @@ index 0aa1c6da1e2c..9b9f5fa390ee 100644 #define RV1126_I2S0_MCLK_OUT_SRC_FROM_RX HIWORD_UPDATE(1, 9, 9) diff --git a/sound/soc/rockchip/rockchip_multi_dais.c b/sound/soc/rockchip/rockchip_multi_dais.c new file mode 100644 -index 000000000000..4b9bb3430878 +index 000000000..4b9bb3430 --- /dev/null +++ b/sound/soc/rockchip/rockchip_multi_dais.c @@ -0,0 +1,676 @@ @@ -1713607,7 +1713608,7 @@ index 000000000000..4b9bb3430878 +MODULE_DEVICE_TABLE(of, rockchip_mdais_match); diff --git a/sound/soc/rockchip/rockchip_multi_dais.h b/sound/soc/rockchip/rockchip_multi_dais.h new file mode 100644 -index 000000000000..5d9a076afb78 +index 000000000..5d9a076af --- /dev/null +++ b/sound/soc/rockchip/rockchip_multi_dais.h @@ -0,0 +1,33 @@ @@ -1713646,7 +1713647,7 @@ index 000000000000..5d9a076afb78 +#endif diff --git a/sound/soc/rockchip/rockchip_multi_dais_pcm.c b/sound/soc/rockchip/rockchip_multi_dais_pcm.c new file mode 100644 -index 000000000000..d0173bfd54aa +index 000000000..d0173bfd5 --- /dev/null +++ b/sound/soc/rockchip/rockchip_multi_dais_pcm.c @@ -0,0 +1,988 @@ @@ -1714640,7 +1714641,7 @@ index 000000000000..d0173bfd54aa +MODULE_LICENSE("GPL"); diff --git a/sound/soc/rockchip/rockchip_multicodecs.c b/sound/soc/rockchip/rockchip_multicodecs.c new file mode 100644 -index 000000000000..aeb7a84cb6a5 +index 000000000..aeb7a84cb --- /dev/null +++ b/sound/soc/rockchip/rockchip_multicodecs.c @@ -0,0 +1,842 @@ @@ -1715487,7 +1715488,7 @@ index 000000000000..aeb7a84cb6a5 +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 4756cfc23218..ecae4d2ff25e 100644 +index 4756cfc23..ecae4d2ff 100644 --- a/sound/soc/rockchip/rockchip_pdm.c +++ b/sound/soc/rockchip/rockchip_pdm.c @@ -7,8 +7,10 @@ @@ -1716278,7 +1716279,7 @@ index 4756cfc23218..ecae4d2ff25e 100644 .name = "rockchip-pdm", .of_match_table = of_match_ptr(rockchip_pdm_match), diff --git a/sound/soc/rockchip/rockchip_pdm.h b/sound/soc/rockchip/rockchip_pdm.h -index cab977272ee6..180b50b95d43 100644 +index cab977272..180b50b95 100644 --- a/sound/soc/rockchip/rockchip_pdm.h +++ b/sound/soc/rockchip/rockchip_pdm.h @@ -82,6 +82,9 @@ @@ -1716292,7 +1716293,7 @@ index cab977272ee6..180b50b95d43 100644 #define PDM_DMA_RD_MSK BIT(8) #define PDM_DMA_RD_EN BIT(8) diff --git a/sound/soc/rockchip/rockchip_rt5645.c b/sound/soc/rockchip/rockchip_rt5645.c -index ef9fdf0386cb..d07cc5c813f2 100644 +index ef9fdf038..d07cc5c81 100644 --- a/sound/soc/rockchip/rockchip_rt5645.c +++ b/sound/soc/rockchip/rockchip_rt5645.c @@ -22,16 +22,6 @@ @@ -1716358,7 +1716359,7 @@ index ef9fdf0386cb..d07cc5c813f2 100644 .pm = &snd_soc_pm_ops, diff --git a/sound/soc/rockchip/rockchip_rt5651.c b/sound/soc/rockchip/rockchip_rt5651.c new file mode 100644 -index 000000000000..4dc91c2a1e75 +index 000000000..4dc91c2a1 --- /dev/null +++ b/sound/soc/rockchip/rockchip_rt5651.c @@ -0,0 +1,245 @@ @@ -1716609,7 +1716610,7 @@ index 000000000000..4dc91c2a1e75 +MODULE_DEVICE_TABLE(of, rockchip_sound_of_match); diff --git a/sound/soc/rockchip/rockchip_sai.c b/sound/soc/rockchip/rockchip_sai.c new file mode 100644 -index 000000000000..77499246ee59 +index 000000000..77499246e --- /dev/null +++ b/sound/soc/rockchip/rockchip_sai.c @@ -0,0 +1,1531 @@ @@ -1718146,7 +1718147,7 @@ index 000000000000..77499246ee59 +MODULE_DEVICE_TABLE(of, rockchip_sai_match); diff --git a/sound/soc/rockchip/rockchip_sai.h b/sound/soc/rockchip/rockchip_sai.h new file mode 100644 -index 000000000000..58e3aa58e1c1 +index 000000000..58e3aa58e --- /dev/null +++ b/sound/soc/rockchip/rockchip_sai.h @@ -0,0 +1,165 @@ @@ -1718316,7 +1718317,7 @@ index 000000000000..58e3aa58e1c1 + +#endif /* _ROCKCHIP_SAI_H */ diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c -index 1a24b78e9e02..18460851c53e 100644 +index 1a24b78e9..18460851c 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -17,6 +17,7 @@ @@ -1718534,7 +1718535,7 @@ index 1a24b78e9e02..18460851c53e 100644 .name = "rockchip-spdif", .of_match_table = of_match_ptr(rk_spdif_match), diff --git a/sound/soc/rockchip/rockchip_spdif.h b/sound/soc/rockchip/rockchip_spdif.h -index d8be9aae5b19..5c656bd8fd18 100644 +index d8be9aae5..5c656bd8f 100644 --- a/sound/soc/rockchip/rockchip_spdif.h +++ b/sound/soc/rockchip/rockchip_spdif.h @@ -15,7 +15,19 @@ @@ -1718570,7 +1718571,7 @@ index d8be9aae5b19..5c656bd8fd18 100644 #endif /* _ROCKCHIP_SPDIF_H */ diff --git a/sound/soc/rockchip/rockchip_spdifrx.c b/sound/soc/rockchip/rockchip_spdifrx.c new file mode 100644 -index 000000000000..0e457232116d +index 000000000..0e4572321 --- /dev/null +++ b/sound/soc/rockchip/rockchip_spdifrx.c @@ -0,0 +1,415 @@ @@ -1718991,7 +1718992,7 @@ index 000000000000..0e457232116d +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/rockchip/rockchip_spdifrx.h b/sound/soc/rockchip/rockchip_spdifrx.h new file mode 100644 -index 000000000000..e75b2d5afd04 +index 000000000..e75b2d5af --- /dev/null +++ b/sound/soc/rockchip/rockchip_spdifrx.h @@ -0,0 +1,113 @@ @@ -1719110,7 +1719111,7 @@ index 000000000000..e75b2d5afd04 +#endif /* _ROCKCHIP_SPDIFRX_H */ diff --git a/sound/soc/rockchip/rockchip_utils.c b/sound/soc/rockchip/rockchip_utils.c new file mode 100644 -index 000000000000..6e81dab35091 +index 000000000..6e81dab35 --- /dev/null +++ b/sound/soc/rockchip/rockchip_utils.c @@ -0,0 +1,150 @@ @@ -1719266,7 +1719267,7 @@ index 000000000000..6e81dab35091 +MODULE_LICENSE("GPL"); diff --git a/sound/soc/rockchip/rockchip_utils.h b/sound/soc/rockchip/rockchip_utils.h new file mode 100644 -index 000000000000..24280b2fd156 +index 000000000..24280b2fd --- /dev/null +++ b/sound/soc/rockchip/rockchip_utils.h @@ -0,0 +1,18 @@ @@ -1719290,7 +1719291,7 @@ index 000000000000..24280b2fd156 +#endif /* _ROCKCHIP_UTILS_H */ diff --git a/sound/soc/rockchip/rockchip_vad.c b/sound/soc/rockchip/rockchip_vad.c new file mode 100644 -index 000000000000..cae1be76c201 +index 000000000..cae1be76c --- /dev/null +++ b/sound/soc/rockchip/rockchip_vad.c @@ -0,0 +1,1324 @@ @@ -1720620,7 +1720621,7 @@ index 000000000000..cae1be76c201 +MODULE_DEVICE_TABLE(of, rockchip_vad_match); diff --git a/sound/soc/rockchip/rockchip_vad.h b/sound/soc/rockchip/rockchip_vad.h new file mode 100644 -index 000000000000..1121e71490e0 +index 000000000..1121e7149 --- /dev/null +++ b/sound/soc/rockchip/rockchip_vad.h @@ -0,0 +1,231 @@ @@ -1720857,7 +1720858,7 @@ index 000000000000..1121e71490e0 +#endif diff --git a/sound/soc/rockchip/vad_preprocess.h b/sound/soc/rockchip/vad_preprocess.h new file mode 100644 -index 000000000000..85e4d1022984 +index 000000000..85e4d1022 --- /dev/null +++ b/sound/soc/rockchip/vad_preprocess.h @@ -0,0 +1,29 @@ @@ -1720892,7 +1720893,7 @@ index 000000000000..85e4d1022984 +#endif diff --git a/sound/soc/rockchip/vad_preprocess_arm.S b/sound/soc/rockchip/vad_preprocess_arm.S new file mode 100644 -index 000000000000..a0d3eabf2ba0 +index 000000000..a0d3eabf2 --- /dev/null +++ b/sound/soc/rockchip/vad_preprocess_arm.S @@ -0,0 +1,348 @@ @@ -1721246,7 +1721247,7 @@ index 000000000000..a0d3eabf2ba0 + .section .note.GNU-stack,"",%progbits diff --git a/sound/soc/rockchip/vad_preprocess_arm64.S b/sound/soc/rockchip/vad_preprocess_arm64.S new file mode 100644 -index 000000000000..823757c1718f +index 000000000..823757c17 --- /dev/null +++ b/sound/soc/rockchip/vad_preprocess_arm64.S @@ -0,0 +1,273 @@ @@ -1721525,7 +1721526,7 @@ index 000000000000..823757c1718f + .section .note.GNU-stack,"",@progbits diff --git a/sound/soc/rockchip/vad_preprocess_thumb.S b/sound/soc/rockchip/vad_preprocess_thumb.S new file mode 100644 -index 000000000000..a105634e60d0 +index 000000000..a105634e6 --- /dev/null +++ b/sound/soc/rockchip/vad_preprocess_thumb.S @@ -0,0 +1,360 @@