Commit 21a59e0b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-fixes-for-5.8-1' of... 

Merge tag 'sunxi-fixes-for-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes

Two fixes for the Allwinner SoCs, one to relax the CMA allocation ranges that
were failing on older SoCs and one to fix Cedrus on the H6.

* tag 'sunxi-fixes-for-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: dts: allwinner: h6: Fix Cedrus IOMMU usage
  ARM: dts sunxi: Relax a bit the CMA pool allocation range

Link: https://lore.kernel.org/r/e24f0608-6a4f-4163-b99e-a5f48e796184.lettre@localhost


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2648298a 62a8ccf3

Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/phandle-array

    description: Phandle to the device SRAM



  iommus:

    maxItems: 1



  memory-region:

    description:

      CMA pool to use for buffers allocation instead of the default

arch/arm/boot/dts/sun4i-a10.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ 
		default-pool {

			compatible = "shared-dma-pool";

			size = <0x6000000>;

			alloc-ranges = <0x4a000000 0x6000000>;

			alloc-ranges = <0x40000000 0x10000000>;

			reusable;

			linux,cma-default;

		};

arch/arm/boot/dts/sun5i.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 
		default-pool {

			compatible = "shared-dma-pool";

			size = <0x6000000>;

			alloc-ranges = <0x4a000000 0x6000000>;

			alloc-ranges = <0x40000000 0x10000000>;

			reusable;

			linux,cma-default;

		};

arch/arm/boot/dts/sun7i-a20.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ 
		default-pool {

			compatible = "shared-dma-pool";

			size = <0x6000000>;

			alloc-ranges = <0x4a000000 0x6000000>;

			alloc-ranges = <0x40000000 0x10000000>;

			reusable;

			linux,cma-default;

		};

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ 
			resets = <&ccu RST_BUS_VE>;

			interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;

			allwinner,sram = <&ve_sram 1>;

			iommus = <&iommu 3>;

		};



		gpu: gpu@1800000 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE