TononixOS/ubports_kernel_google_msm
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msm: camera: Fix compilation for 7630

Browse Source 
Enable camera on 7630

Change-Id: I908edcb2801bca621e2f39aea2b4e09106876456
Signed-off-by: Kevin Chan <ktchan@codeaurora.org>
This commit is contained in:
Kevin Chan
2012-06-20 17:13:09 -07:00
committed by Stephen Boyd
parent d2374a0d02
commit a8a9bd9873
10 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/configs/msm7630-perf_defconfig
View File

@@ -261,6 +261,7 @@ CONFIG_VIDEO_DEV=y
# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
CONFIG_VIDEOBUF2_MSM_MEM=y
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_RADIO_TAVARUA=y
CONFIG_MSM_KGSL=y
CONFIG_VIDEO_OUTPUT_CONTROL=y

15
drivers/media/video/msm/msm_camera.c
View File

@@ -36,6 +36,7 @@
#include <linux/hrtimer.h>
#include <linux/ion.h>
#include <mach/cpuidle.h>
DEFINE_MUTEX(ctrl_cmd_lock);
#define CAMERA_STOP_VIDEO 58
@@ -3085,7 +3086,7 @@ static int __msm_release(struct msm_sync *sync)
msm_queue_drain(&sync->pict_q, list_pict);
msm_queue_drain(&sync->event_q, list_config);
wake_unlock(&sync->wake_lock);
pm_qos_update_request(&sync->idle_pm_qos, PM_QOS_DEFAULT_VALUE);
sync->apps_id = NULL;
sync->core_powered_on = 0;
}
@@ -3745,7 +3746,8 @@ static int __msm_open(struct msm_cam_device *pmsm, const char *const apps_id,
sync->apps_id = apps_id;
if (!sync->core_powered_on && !is_controlnode) {
wake_lock(&sync->wake_lock);
pm_qos_update_request(&sync->idle_pm_qos,
msm_cpuidle_get_deep_idle_latency());
msm_camvfe_fn_init(&sync->vfefn, sync);
if (sync->vfefn.vfe_init) {
@@ -3959,11 +3961,12 @@ static int msm_sync_init(struct msm_sync *sync,
msm_queue_init(&sync->pict_q, "pict");
msm_queue_init(&sync->vpe_q, "vpe");
wake_lock_init(&sync->wake_lock, WAKE_LOCK_SUSPEND, "msm_camera");
pm_qos_add_request(&sync->idle_pm_qos, PM_QOS_CPU_DMA_LATENCY,
PM_QOS_DEFAULT_VALUE);
rc = msm_camio_probe_on(pdev);
if (rc < 0) {
wake_lock_destroy(&sync->wake_lock);
pm_qos_remove_request(&sync->idle_pm_qos);
return rc;
}
rc = sensor_probe(sync->sdata, &sctrl);
@@ -3976,7 +3979,7 @@ static int msm_sync_init(struct msm_sync *sync,
pr_err("%s: failed to initialize %s\n",
__func__,
sync->sdata->sensor_name);
wake_lock_destroy(&sync->wake_lock);
pm_qos_remove_request(&sync->idle_pm_qos);
return rc;
}
@@ -3995,7 +3998,7 @@ static int msm_sync_init(struct msm_sync *sync,
static int msm_sync_destroy(struct msm_sync *sync)
{
wake_lock_destroy(&sync->wake_lock);
pm_qos_remove_request(&sync->idle_pm_qos);
return 0;
}

1
drivers/media/video/msm/msm_vpe1.c
View File

@@ -16,6 +16,7 @@
#include <mach/irqs.h>
#include <linux/io.h>
#include <linux/slab.h>
#include <linux/module.h>
#include "msm_vpe1.h"
#include <linux/pm_qos.h>
#include <linux/clk.h>

3
drivers/media/video/msm/mt9d112.c
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
/* Copyright (c) 2011-2012, Code Aurora Forum. 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
@@ -17,6 +17,7 @@
#include <linux/i2c.h>
#include <linux/uaccess.h>
#include <linux/miscdevice.h>
#include <linux/module.h>
#include <media/msm_camera.h>
#include <mach/gpio.h>
#include "mt9d112.h"

3
drivers/media/video/msm/mt9p012.h
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
/* Copyright (c) 2009-2012, Code Aurora Forum. 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
@@ -15,6 +15,7 @@
#define MT9T012_H
#include <linux/types.h>
#include <mach/board.h>
extern struct mt9p012_reg mt9p012_regs; /* from mt9p012_reg.c */

3
drivers/media/video/msm/mt9p012_km.h
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2009-2010, Code Aurora Forum. All rights reserved.
/* Copyright (c) 2009-2012, Code Aurora Forum. 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
@@ -15,6 +15,7 @@
#define MT9P012_KM_H
#include <linux/types.h>
#include <mach/board.h>
extern struct mt9p012_km_reg mt9p012_km_regs; /* from mt9p012_km_reg.c */

3
drivers/media/video/msm/mt9t013.c
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
/* Copyright (c) 2009-2012, Code Aurora Forum. 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
@@ -18,6 +18,7 @@
#include <linux/uaccess.h>
#include <linux/miscdevice.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <media/msm_camera.h>
#include <mach/gpio.h>
#include <mach/camera.h>

3
drivers/media/video/msm/mt9t013.h
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
/* Copyright (c) 2009-2012, Code Aurora Forum. 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
@@ -15,6 +15,7 @@
#define MT9T013_H
#include <linux/types.h>
#include <mach/board.h>
extern struct mt9t013_reg mt9t013_regs; /* from mt9t013_reg.c */

3
drivers/media/video/msm/sn12m0pz.c
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.
/* Copyright (c) 2010-2012, Code Aurora Forum. 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
@@ -17,6 +17,7 @@
#include <linux/uaccess.h>
#include <linux/miscdevice.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <media/msm_camera.h>
#include <mach/gpio.h>
#include <mach/camera.h>

3
drivers/media/video/msm/vx6953.c
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.
/* Copyright (c) 2010-2012, Code Aurora Forum. 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
@@ -16,6 +16,7 @@
#include <linux/i2c.h>
#include <linux/uaccess.h>
#include <linux/miscdevice.h>
#include <linux/module.h>
#include <media/msm_camera.h>
#include <mach/gpio.h>
#include <mach/camera.h>