diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-01-16 03:15:03 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-01-16 10:42:08 +0100 |
| commit | 4e87f2dd9bc258c85b2f3bb1a100b49927fbe6f3 (patch) | |
| tree | 96c82edf20e2c28e8fc4d97438d00e3b18b8afe9 /include | |
| parent | fe4c58c4b96a24aba8e27956e8158b3002723b17 (diff) | |
| parent | c7460e0d6afd754ebf5555477129579bc83c47b9 (diff) | |
Merge remote-tracking branch 'remotes/nvidia/l4t/l4t-r16-r2' into tegra-next
(tegra-l4t-r16-16.5)
Conflicts:
drivers/media/video/tegra_v4l2_camera.c
drivers/mmc/host/sdhci.c
drivers/watchdog/tegra_wdt.c
include/media/tegra_v4l2_camera.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nvmap.h | 5 | ||||
| -rw-r--r-- | include/media/tegra_v4l2_camera.h | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/linux/nvmap.h b/include/linux/nvmap.h index 9cc978ec5a7f..c805f4c1dc07 100644 --- a/include/linux/nvmap.h +++ b/include/linux/nvmap.h @@ -3,7 +3,7 @@ * * structure declarations for nvmem and nvmap user-space ioctls * - * Copyright (c) 2009-2012, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2009-2014, NVIDIA CORPORATION. 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 as published by @@ -126,6 +126,9 @@ struct nvmap_handle_ref *nvmap_duplicate_handle_id(struct nvmap_client *client, int nvmap_mark_global(struct nvmap_client *client, struct nvmap_handle_ref *r); +unsigned long nvmap_validate_ref(struct nvmap_client *client, + struct nvmap_handle_ref *r); + struct nvmap_platform_carveout { const char *name; unsigned int usage_mask; diff --git a/include/media/tegra_v4l2_camera.h b/include/media/tegra_v4l2_camera.h index fef8a9bb5db0..9f04425d6a26 100644 --- a/include/media/tegra_v4l2_camera.h +++ b/include/media/tegra_v4l2_camera.h @@ -36,10 +36,12 @@ struct tegra_camera_platform_data { int lanes; /* For CSI port only */ bool continuous_clk; /* For CSI port only */ - bool internal_sync; /* VIP */ - u8 vip_h_active_start; /* VIP */ - u8 vip_v_active_start; /* VIP */ + bool internal_sync; /* VIP */ + u8 vip_h_active_start; /* VIP */ + u8 vip_v_active_start; /* VIP */ + bool continuous_capture; /* CSI only */ + int vi_freq; }; #endif /* _TEGRA_CAMERA_H_ */ |