diff options
| author | Ming Wong <miwong@nvidia.com> | 2014-12-02 15:20:25 -0800 |
|---|---|---|
| committer | Matthew Pedro <mapedro@nvidia.com> | 2015-01-05 13:16:44 -0800 |
| commit | 0ba9943195898205134749a6b2b023569ecbe067 (patch) | |
| tree | 86de93892dad2110593c0804f386cbd5d6b0981d | |
| parent | 5409510f2e8de7f747f2b626a7f840eab7a01766 (diff) | |
Kernel: ar0330: add 960p resolution
Bug 1552628
Change-Id: I90fdbb99bcfb2c20ed1fa0125af6a999bad7b4fc
Signed-off-by: Ming Wong <miwong@nvidia.com>
Reviewed-on: http://git-master/r/658630
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Kamal Balagopalan <kbalagopalan@nvidia.com>
Tested-by: Kamal Balagopalan <kbalagopalan@nvidia.com>
| -rw-r--r-- | drivers/media/platform/tegra/ar0330.c | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/drivers/media/platform/tegra/ar0330.c b/drivers/media/platform/tegra/ar0330.c index dd612d08bc87..b4d4f13693ab 100644 --- a/drivers/media/platform/tegra/ar0330.c +++ b/drivers/media/platform/tegra/ar0330.c @@ -725,14 +725,65 @@ static struct ar0330_reg mode_1280x720[] = { {AR0330_TABLE_END, 0x00} }; +static struct ar0330_reg mode_1280x960[] = { + {0x3052, 0xa114}, + {0x304A, 0x0070}, + {AR0330_TABLE_WAIT_MS, AR0330_WAIT_MS}, + {0x301A, 0x0058}, + {0x302A, 0x0005}, + {0x302C, 0x0004}, + {0x302E, 0x0003}, + {0x3030, 0x005F}, + {0x3036, 0x000A}, + {0x3038, 0x0001}, + {0x31AC, 0x0A0A}, + {0x31AE, 0x0201}, + {0x31B0, 0x003D}, + {0x31B2, 0x0018}, + {0x31B4, 0x4F56}, + {0x31B6, 0x4214}, + {0x31B8, 0x308B}, + {0x31BA, 0x028A}, + {0x31BC, 0x8008}, + {0x3002, 0x0126}, + {0x3004, 0x0206}, + {0x3006, 0x04E5}, + {0x3008, 0x0705}, + {0x300A, 0x0449}, + {0x300C, 0x0482}, + {0x3012, 0x0448}, + {0x3014, 0x0000}, + {0x30A2, 0x0001}, + {0x30A6, 0x0001}, + {0x3040, 0x0000}, + {0x3042, 0x0000}, + {0x30BA, 0x006C}, + {0x31E0, 0x0303}, + {0x3064, 0x1802}, + {0x3ED2, 0x0146}, + {0x3ED4, 0x8F6C}, + {0x3ED6, 0x66CC}, + {0x3ED8, 0x8C42}, + {0x3EDA, 0x88BC}, + {0x3EDC, 0xAA63}, + {0x305E, 0x00A0}, + {0x3088, 0x80BA}, + {0x3086, 0x0253}, + {0x30CE, 0x0010}, + {0x301A, 0x035C}, + {AR0330_TABLE_END, 0x00} +}; + enum { AR0330_MODE_2304X1536, AR0330_MODE_1280X720, + AR0330_MODE_1280X960, }; static struct ar0330_reg *mode_table[] = { [AR0330_MODE_2304X1536] = mode_2304x1536, [AR0330_MODE_1280X720] = mode_1280x720, + [AR0330_MODE_1280X960] = mode_1280x960, }; static inline void @@ -863,6 +914,8 @@ ar0330_set_mode(struct ar0330_info *info, struct ar0330_mode *mode) sensor_mode = AR0330_MODE_2304X1536; } else if (mode->xres == 1280 && mode->yres == 720) { sensor_mode = AR0330_MODE_1280X720; + } else if (mode->xres == 1280 && mode->yres == 960) { + sensor_mode = AR0330_MODE_1280X960; } else { pr_err("%s: invalid resolution supplied to set mode %d %d\n", __func__, mode->xres, mode->yres); |