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

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@localhostSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2648298a 62a8ccf3
...@@ -47,6 +47,9 @@ properties: ...@@ -47,6 +47,9 @@ properties:
$ref: /schemas/types.yaml#/definitions/phandle-array $ref: /schemas/types.yaml#/definitions/phandle-array
description: Phandle to the device SRAM description: Phandle to the device SRAM
iommus:
maxItems: 1
memory-region: memory-region:
description: description:
CMA pool to use for buffers allocation instead of the default CMA pool to use for buffers allocation instead of the default
......
...@@ -198,7 +198,7 @@ reserved-memory { ...@@ -198,7 +198,7 @@ reserved-memory {
default-pool { default-pool {
compatible = "shared-dma-pool"; compatible = "shared-dma-pool";
size = <0x6000000>; size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>; alloc-ranges = <0x40000000 0x10000000>;
reusable; reusable;
linux,cma-default; linux,cma-default;
}; };
......
...@@ -117,7 +117,7 @@ reserved-memory { ...@@ -117,7 +117,7 @@ reserved-memory {
default-pool { default-pool {
compatible = "shared-dma-pool"; compatible = "shared-dma-pool";
size = <0x6000000>; size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>; alloc-ranges = <0x40000000 0x10000000>;
reusable; reusable;
linux,cma-default; linux,cma-default;
}; };
......
...@@ -181,7 +181,7 @@ reserved-memory { ...@@ -181,7 +181,7 @@ reserved-memory {
default-pool { default-pool {
compatible = "shared-dma-pool"; compatible = "shared-dma-pool";
size = <0x6000000>; size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>; alloc-ranges = <0x40000000 0x10000000>;
reusable; reusable;
linux,cma-default; linux,cma-default;
}; };
......
...@@ -161,6 +161,7 @@ video-codec@1c0e000 { ...@@ -161,6 +161,7 @@ video-codec@1c0e000 {
resets = <&ccu RST_BUS_VE>; resets = <&ccu RST_BUS_VE>;
interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
allwinner,sram = <&ve_sram 1>; allwinner,sram = <&ve_sram 1>;
iommus = <&iommu 3>;
}; };
gpu: gpu@1800000 { gpu: gpu@1800000 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment