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

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

Merge "defconfig: msm8937: Enable camera modules on 32 bit kernel"

parents bff72a5c d654f2ae

arch/arm/configs/msm8937_defconfig

+26 −2
Original line number Diff line number Diff line
@@ -342,6 +342,32 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y 
CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_PLATFORM=y

CONFIG_MSM_CAMERA=y

CONFIG_MSMB_CAMERA=y

CONFIG_MSMB_CAMERA_DEBUG=y

CONFIG_MSM_CAMERA_SENSOR=y

CONFIG_MSM_CPP=y

CONFIG_MSM_CCI=y

CONFIG_MSM_CSI20_HEADER=y

CONFIG_MSM_CSI22_HEADER=y

CONFIG_MSM_CSI30_HEADER=y

CONFIG_MSM_CSI31_HEADER=y

CONFIG_MSM_CSIPHY=y

CONFIG_MSM_CSID=y

CONFIG_MSM_EEPROM=y

CONFIG_MSM_ISPIF_V2=y

CONFIG_IMX134=y

CONFIG_IMX132=y

CONFIG_OV9724=y

CONFIG_OV5648=y

CONFIG_GC0339=y

CONFIG_OV8825=y

CONFIG_OV8865=y

CONFIG_s5k4e1=y

CONFIG_OV12830=y

CONFIG_MSM_V4L2_VIDEO_OVERLAY_DEVICE=y

CONFIG_MSMB_JPEG=y

CONFIG_MSM_FD=y

CONFIG_RADIO_SILABS=y

CONFIG_MSM_KGSL=y

CONFIG_FB=y
@@ -404,8 +430,6 @@ CONFIG_MMC_TEST=m 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QPNP=y

CONFIG_LEDS_QPNP_FLASH=y

CONFIG_LEDS_QPNP_WLED=y

drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c

+9 −6
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/dma-attrs.h>

#include <linux/of_platform.h>

#include <linux/iommu.h>

#include <linux/slab.h>

#include <linux/qcom_iommu.h>

#include <linux/dma-mapping.h>

#include <linux/msm_dma_iommu_mapping.h>
@@ -611,13 +612,14 @@ static struct cam_dma_buff_info *cam_smmu_find_mapping_by_virt_address(int idx, 
	list_for_each_entry(mapping, &iommu_cb_set.cb_info[idx].smmu_buf_list,

			list) {

		if (mapping->paddr == virt_addr) {

			CDBG("Found virtual address %llx\n", virt_addr);

			CDBG("Found virtual address %lx\n",

				 (unsigned long)virt_addr);

			return mapping;

		}

	}



	pr_err("Error: Cannot find virtual address %llx by index %d\n",

		virt_addr, idx);

	pr_err("Error: Cannot find virtual address %lx by index %d\n",

		(unsigned long)virt_addr, idx);

	return NULL;

}
@@ -662,8 +664,8 @@ static void cam_smmu_clean_buffer_list(int idx) 


		if (ret < 0) {

			pr_err("Buffer delete failed: idx = %d\n", idx);

			pr_err("Buffer delete failed: addr = %llx, fd = %d\n",

					mapping_info->paddr,

			pr_err("Buffer delete failed: addr = %lx, fd = %d\n",

					(unsigned long)mapping_info->paddr,

					mapping_info->ion_fd);

			/*

			 * Ignore this error and continue to delete other
@@ -998,7 +1000,8 @@ static int cam_smmu_alloc_scratch_buffer_add_to_list(int idx, 


	*virt_addr = (dma_addr_t)iova;



	CDBG("%s: mapped virtual address = %llX\n", __func__, *virt_addr);

	CDBG("%s: mapped virtual address = %lx\n", __func__,

		(unsigned long)*virt_addr);

	return 0;



err_mapping_info:

drivers/media/platform/msm/camera_v2/fd/msm_fd_dev.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ struct msm_fd_mem_pool { 
struct msm_fd_buf_handle {

	int fd;

	struct msm_fd_mem_pool *pool;

	unsigned long size;

	size_t size;

	ion_phys_addr_t addr;

};

drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ enum msm_isp_buf_mgr_state { 
};



struct msm_isp_buffer_mapped_info {

	unsigned long len;

	size_t len;

	dma_addr_t paddr;

	int buf_fd;

};

drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c

+1 −1
Original line number Diff line number Diff line
@@ -1481,7 +1481,7 @@ int msm_isp_print_ping_pong_address(struct vfe_device *vfe_dev, 
					pr_err("%s: buf NULL\n", __func__);

					continue;

				}

				pr_debug("%s: stream_id %x ping-pong %d	plane %d start_addr %lu	addr_offset %x len %lx stride %d scanline %d\n"

				pr_debug("%s: stream_id %x ping-pong %d	plane %d start_addr %lu	addr_offset %x len %zx stride %d scanline %d\n"

					, __func__, stream_info->stream_id,

					pingpong_bit, i, (unsigned long)

					buf->mapped_info[i].paddr,