Merge tag 'tegra-l4t-r21.6' into toradex_tk1_l4t_r21.6

Merge NVIDIA's latest Linux for Tegra aka L4T R21.6 Linux kernel changes
from git://nv-tegra.nvidia.com/linux-3.10.git commit:

b271e8fa67a6d9c4600274a25636cfe00fdd1b68

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Dominik Sliwa <dominik.sliwa@toradex.com>

4 files changed, 17 insertions, 11 deletions

diff --git a/include/linux/mm.h b/include/linux/mm.h
index a23bb6b1f449..03a60a38ec45 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1714,6 +1714,7 @@ static inline struct page *follow_page(struct vm_area_struct *vma,
 #define FOLL_NUMA	0x200	/* force NUMA hinting page fault */
 #define FOLL_MIGRATION	0x400	/* wait for page to replace migration entry */
 #define FOLL_DURABLE	0x800	/* get the page reference for a long time */
+#define FOLL_COW	0x4000	/* internal GUP flag */
 
 typedef int (*pte_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr,
 			void *data);
diff --git a/include/linux/nvhost_ioctl.h b/include/linux/nvhost_ioctl.h
index b060864ff1d1..a1011e5a1daf 100644
--- a/include/linux/nvhost_ioctl.h
+++ b/include/linux/nvhost_ioctl.h
@@ -3,7 +3,7 @@
  *
  * Tegra graphics host driver
  *
- * Copyright (c) 2009-2014, NVIDIA Corporation.  All rights reserved.
+ * Copyright (c) 2009-2017, 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
@@ -118,10 +118,6 @@ struct nvhost_alloc_obj_ctx_args {
 	__u64 obj_id;    /* output, used to free later       */
 };
 
-struct nvhost_free_obj_ctx_args {
-	__u64 obj_id; /* obj ctx to free */
-};
-
 struct nvhost_alloc_gpfifo_args {
 	__u32 num_entries;
 #define NVHOST_ALLOC_GPFIFO_FLAGS_VPR_ENABLED	(1 << 0) /* set owner channel of this gpfifo as a vpr channel */
@@ -390,8 +386,6 @@ struct nvhost_set_ctxswitch_args {
 	_IOWR(NVHOST_IOCTL_MAGIC, 107, struct nvhost_submit_gpfifo_args)
 #define NVHOST_IOCTL_CHANNEL_ALLOC_OBJ_CTX	\
 	_IOWR(NVHOST_IOCTL_MAGIC, 108, struct nvhost_alloc_obj_ctx_args)
-#define NVHOST_IOCTL_CHANNEL_FREE_OBJ_CTX	\
-	_IOR(NVHOST_IOCTL_MAGIC,  109, struct nvhost_free_obj_ctx_args)
 #define NVHOST_IOCTL_CHANNEL_ZCULL_BIND		\
 	_IOWR(NVHOST_IOCTL_MAGIC, 110, struct nvhost_zcull_bind_args)
 #define NVHOST_IOCTL_CHANNEL_SET_ERROR_NOTIFIER  \
diff --git a/include/linux/spi/spi-tegra.h b/include/linux/spi/spi-tegra.h
index 4b9385d2c93d..3e0203c2a671 100644
--- a/include/linux/spi/spi-tegra.h
+++ b/include/linux/spi/spi-tegra.h
@@ -1,7 +1,7 @@
 /*
  * spi-tegra.h: SPI interface for Nvidia Tegra20 SLINK controller.
  *
- * Copyright (C) 2011 NVIDIA Corporation
+ * Copyright (c) 2011-2016, 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
@@ -25,6 +25,8 @@ struct tegra_spi_platform_data {
 	int dma_req_sel;
 	unsigned int spi_max_frequency;
 	bool is_clkon_always;
+	bool is_polling_mode;
+	bool boost_reg_access;
 };
 
 /*
diff --git a/include/media/camera.h b/include/media/camera.h
index 5cbac56de269..22f097ee3db2 100644
--- a/include/media/camera.h
+++ b/include/media/camera.h
@@ -117,6 +117,9 @@
 #define CAMERA_DT_ARRAY_U16	22
 #define CAMERA_DT_ARRAY_U32	23
 
+#define MAX_PARAM_SIZE_OF_VALUE 1024
+#define MAX_PARAM_VARIANT 4096
+
 enum {
 	CAMERA_SEQ_EXEC,
 	CAMERA_SEQ_REGISTER_EXEC,
@@ -337,7 +340,7 @@ struct camera_chip {
 	int	(*power_off)(struct camera_device *cdev);
 	int	(*shutdown)(struct camera_device *cdev);
 	int	(*update)(struct camera_device *cdev,
-			struct cam_update *upd, int num);
+			struct cam_update *upd, u32 num);
 };
 
 struct camera_sync_dev {
@@ -386,8 +389,14 @@ struct camera_platform_info {
 };
 
 /* common functions */
-int camera_get_params(
-	struct camera_info *, unsigned long, int, struct nvc_param *, void **);
+int __camera_get_params(
+	struct camera_info *, unsigned long, int, struct nvc_param *, void **,
+	bool);
+static inline int camera_get_params(struct camera_info *cam, unsigned long arg,
+		int u_size, struct nvc_param *prm, void **data)
+{
+	return __camera_get_params(cam, arg, u_size, prm, data, false);
+}
 int camera_copy_user_params(unsigned long, struct nvc_param *);
 
 int virtual_device_add(struct device *, unsigned long);