A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: vidc: make video driver as module"

Browse source
This commit is contained in:
qctecmdr 2020-01-13 11:10:34 -08:00 • committed by Gerrit - the friendly Code Review server
commit a263740664
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/konavid.conf
View file

@ -1,3 +1,5 @@
ifeq ($(CONFIG_QGKI),y)
export CONFIG_MSM_VIDC_V4L2=y
else
export CONFIG_MSM_VIDC_V4L2=m
endif

1
msm/vidc/msm_v4l2_vidc.c
View file

@ -733,4 +733,5 @@ static void __exit msm_vidc_exit(void)
module_init(msm_vidc_init);
module_exit(msm_vidc_exit);
MODULE_SOFTDEP("pre: subsys-pil-tz");
MODULE_LICENSE("GPL v2");

1
msm/vidc/msm_vidc_debug.c
View file

@ -8,7 +8,6 @@
#define MAX_DEBUG_LEVEL_STRING_LEN 15
#include "msm_vidc_debug.h"
#include "vidc_hfi_api.h"
#include <linux/of_fdt.h>
int msm_vidc_debug = VIDC_ERR | VIDC_PRINTK |
FW_ERROR | FW_FATAL | FW_FTRACE;

7
msm/vidc/msm_vidc_platform.c
View file

@ -6,7 +6,6 @@
#include <linux/module.h>
#include <linux/of_platform.h>
#include <linux/io.h>
#include <linux/of_fdt.h>
#include "msm_vidc_internal.h"
#include "msm_vidc_debug.h"
@ -594,7 +593,7 @@ static struct msm_vidc_platform_data bengal_data = {
.codec_caps_count = ARRAY_SIZE(bengal_capabilities_v0),
};
static const struct of_device_id msm_vidc_dt_match[] = {
static const struct of_device_id msm_vidc_dt_device[] = {
{
.compatible = "qcom,lahaina-vidc",
.data = &lahaina_data,
@ -606,7 +605,7 @@ static const struct of_device_id msm_vidc_dt_match[] = {
{},
};
MODULE_DEVICE_TABLE(of, msm_vidc_dt_match);
MODULE_DEVICE_TABLE(of, msm_vidc_dt_device);
static int msm_vidc_read_rank(
struct msm_vidc_platform_data *data, struct device *dev)
@ -635,7 +634,7 @@ void *vidc_get_drv_data(struct device *dev)
goto exit;
}
match = of_match_node(msm_vidc_dt_match, dev->of_node);
match = of_match_node(msm_vidc_dt_device, dev->of_node);
if (match)
driver_data = (struct msm_vidc_platform_data *)match->data;