Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79955d20 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I772afd35,I98c30d40 into msm-next 

* changes:
  defconfig: sdm855: disable MSM_ION and QCOM_LAZY_MAPPING
  Revert "ion: msm: set dma ops for ion devices"
parents b5ebeb3e 81c5c94f

arch/arm64/configs/sdm855-perf_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -314,8 +314,6 @@ CONFIG_DMADEVICES=y 
CONFIG_UIO=y

CONFIG_STAGING=y

CONFIG_ASHMEM=y

CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_MSM_GCC_SDM855=y

CONFIG_MSM_NPUCC_SDM855=y

CONFIG_MSM_VIDEOCC_SDM855=y
@@ -328,7 +326,6 @@ CONFIG_MAILBOX=y 
CONFIG_QCOM_APCS_IPC=y

CONFIG_IOMMU_IO_PGTABLE_FAST=y

CONFIG_ARM_SMMU=y

CONFIG_QCOM_LAZY_MAPPING=y

CONFIG_IOMMU_DEBUG=y

CONFIG_IOMMU_DEBUG_TRACKING=y

CONFIG_IOMMU_TESTS=y

arch/arm64/configs/sdm855_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -324,8 +324,6 @@ CONFIG_DMADEVICES=y 
CONFIG_UIO=y

CONFIG_STAGING=y

CONFIG_ASHMEM=y

CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_MSM_GCC_SDM855=y

CONFIG_MSM_NPUCC_SDM855=y

CONFIG_MSM_VIDEOCC_SDM855=y
@@ -338,7 +336,6 @@ CONFIG_MAILBOX=y 
CONFIG_QCOM_APCS_IPC=y

CONFIG_IOMMU_IO_PGTABLE_FAST=y

CONFIG_ARM_SMMU=y

CONFIG_QCOM_LAZY_MAPPING=y

CONFIG_IOMMU_DEBUG=y

CONFIG_IOMMU_DEBUG_TRACKING=y

CONFIG_IOMMU_TESTS=y

drivers/staging/android/ion/msm/msm_ion.c

+0 −1
Original line number Diff line number Diff line
@@ -543,7 +543,6 @@ static struct ion_platform_data *msm_ion_parse_dt(struct platform_device *pdev) 
			pr_err("Failed to create device %s\n", node->name);

			goto free_heaps;

		}

		of_dma_configure(&new_dev->dev, node);



		pdata->heaps[idx].priv = &new_dev->dev;

		val = of_get_address(node, 0, NULL, NULL);