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

Commit 77d90b47 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Enable SMMU stage 1 for Slimbus driver on atoll"

parents 483be54e 7087aced

arch/arm64/boot/dts/qcom/atoll.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -3076,7 +3076,7 @@ 
		interrupt-names = "slimbus_irq", "slimbus_bam_irq";

		qcom,apps-ch-pipes = <0x700000>;

		qcom,ea-pc = <0x340>;

		qcom,iommu-s1-bypass;

		qcom,iommu-atomic-ctx;

		status = "ok";



		iommu_slim_aud_ctrl_cb: qcom,iommu_slim_ctrl_cb {

drivers/slimbus/slim-msm.c

+5 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2011-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -243,8 +243,11 @@ int msm_slim_sps_mem_alloc( 
void

msm_slim_sps_mem_free(struct msm_slim_ctrl *dev, struct sps_mem_buffer *mem)

{

	struct device *dma_dev = dev->iommu_desc.cb_dev ?

					dev->iommu_desc.cb_dev : dev->dev;



	if (mem->base && mem->phys_base)

		dma_free_coherent(dev->dev, mem->size, mem->base,

		dma_free_coherent(dma_dev, mem->size, mem->base,

							mem->phys_base);

	else

		dev_err(dev->dev, "cant dma free. they are NULL\n");