]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
ARM: tegra12: loki: enable PCL auto detection
authorFrank Chen <frankc@nvidia.com>
Tue, 3 Dec 2013 19:59:38 +0000 (11:59 -0800)
committerBharat Nihalani <bnihalani@nvidia.com>
Thu, 19 Dec 2013 03:08:37 +0000 (19:08 -0800)
device supported: ov7695

Bug 1417635

Change-Id: I999349e2a17b931dc438aae0774964bac69d78e1
Signed-off-by: Frank Chen <frankc@nvidia.com>
Reviewed-on: http://git-master/r/338397
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
arch/arm/mach-tegra/board-loki-sensors.c

index 372b5832f2927322ae05e849900388886b71c921..4d7190a28e3ff695746dfd7a9486387077e3808c 100644 (file)
@@ -23,6 +23,7 @@
 #include <linux/err.h>
 #include <linux/nct1008.h>
 #include <linux/tegra-fuse.h>
+#include <media/camera.h>
 #include <media/mt9m114.h>
 #include <media/ov7695.h>
 #include <mach/gpio-tegra.h>
@@ -261,23 +262,37 @@ struct ov7695_platform_data loki_ov7695_pdata = {
        .power_off = loki_ov7695_power_off,
 };
 
-static struct i2c_board_info loki_i2c_board_info_e2548[] = {
-       {
-               I2C_BOARD_INFO("mt9m114", 0x48),
-               .platform_data = &loki_mt9m114_pdata,
-       },
+static struct i2c_board_info loki_i2c_board_info_ov7695 = {
+       I2C_BOARD_INFO("ov7695", 0x21),
+       .platform_data = &loki_ov7695_pdata,
+};
+
+static struct camera_module loki_camera_module_info[] = {
        {
-               I2C_BOARD_INFO("ov7695", 0x21),
-               .platform_data = &loki_ov7695_pdata,
+               /* front camera */
+               .sensor = &loki_i2c_board_info_ov7695,
        },
+
+       {}
+};
+
+static struct camera_platform_data loki_pcl_pdata = {
+       .cfg = 0xAA55AA55,
+       .modules = loki_camera_module_info,
+};
+
+static struct platform_device loki_camera_generic = {
+       .name = "pcl-generic",
+       .id = -1,
 };
 
 static int loki_camera_init(void)
 {
        pr_debug("%s: ++\n", __func__);
 
-       i2c_register_board_info(2, loki_i2c_board_info_e2548,
-                       ARRAY_SIZE(loki_i2c_board_info_e2548));
+       platform_device_add_data(&loki_camera_generic,
+               &loki_pcl_pdata, sizeof(loki_pcl_pdata));
+       platform_device_register(&loki_camera_generic);
        return 0;
 }