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

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

Merge changes Ibe5ade1a,I0f150e4e into msm-4.14 

* changes:
  soc: qcom: socinfo: Add soc information for QCS405
  dma: fix arguments when calling dma APIs
parents 0713e23e ceb8546f

arch/arm/mm/dma-mapping.c

+2 −2
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ __dma_alloc_remap(struct page *page, size_t size, gfp_t gfp, pgprot_t prot, 
static void __dma_free_remap(void *cpu_addr, size_t size)

{

	dma_common_free_remap(cpu_addr, size,

			VM_ARM_DMA_CONSISTENT | VM_USERMAP);

			VM_ARM_DMA_CONSISTENT | VM_USERMAP, false);

}



#define DEFAULT_DMA_COHERENT_POOL_SIZE	SZ_256K
@@ -1666,7 +1666,7 @@ void __arm_iommu_free_attrs(struct device *dev, size_t size, void *cpu_addr, 


	if ((attrs & DMA_ATTR_NO_KERNEL_MAPPING) == 0) {

		dma_common_free_remap(cpu_addr, size,

			VM_ARM_DMA_CONSISTENT | VM_USERMAP);

			VM_ARM_DMA_CONSISTENT | VM_USERMAP, true);

	}



	__iommu_remove_mapping(dev, handle, size);

drivers/soc/qcom/socinfo.c

+7 −0
Original line number Diff line number Diff line
@@ -313,6 +313,9 @@ static struct msm_soc_info cpu_of_id[] = { 
	/* sdm640 ID */

	[355] = {MSM_CPU_SDM640, "SDM640"},



	/* qcs405 ID */

	[352] = {MSM_CPU_QCS405, "QCS405"},



	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.
@@ -1176,6 +1179,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 355;

		strlcpy(dummy_socinfo.build_id, "sdm640 - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_qcs405()) {

		dummy_socinfo.id = 352;

		strlcpy(dummy_socinfo.build_id, "qcs405 - ",

		sizeof(dummy_socinfo.build_id));

	} else

		strlcat(dummy_socinfo.build_id, "Dummy socinfo",

			sizeof(dummy_socinfo.build_id));

include/soc/qcom/socinfo.h

+4 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdmshrike")

#define early_machine_is_sdm640()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm640")

#define early_machine_is_qcs405()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,qcs405")

#else

#define of_board_is_sim()		0

#define of_board_is_rumi()		0
@@ -84,6 +86,7 @@ 
#define early_machine_is_sdm855()	0

#define early_machine_is_sdmshrike()	0

#define early_machine_is_sdm640()	0

#define early_machine_is_qcs405()	0

#endif



#define PLATFORM_SUBTYPE_MDM	1
@@ -107,6 +110,7 @@ enum msm_cpu { 
	MSM_CPU_SDM855,

	MSM_CPU_SDMSHRIKE,

	MSM_CPU_SDM640,

	MSM_CPU_QCS405,

};



struct msm_soc_info {