Merge commit '0c8f2934ce385712a00f1f264ac2bfac6a071487'

* commit '0c8f2934ce385712a00f1f264ac2bfac6a071487':
  ARM: rv1106_defconfig: Enable CONFIG_ROCKCHIP_MPP_OSAL
  video: rockchip: mpp_osal: ROCKCHIP_MPP_OSAL remove chip id
  input: touchscreen: gsl_point_id: Add gsl_point_id.h
  drm/rockchip: drv: add more info about iommu_reserve_map
  Input: gt1x - Fix -Wmissing-prototypes warnings
  mtd: spi-nor: Make spi_nor_wait_till_ready_with_msleep() static

Change-Id: I6cf2b3ed6e87180c2e712edb61953c75b0c0b7e6

arch/arm/configs/rv1106_defconfig

@@ -153,6 +153,7 @@ CONFIG_VIDEO_ROCKCHIP_ISP=m
 CONFIG_VIDEO_RK_IRCUT=y
 CONFIG_ROCKCHIP_MULTI_RGA=m
 CONFIG_ROCKCHIP_RVE=m
+CONFIG_ROCKCHIP_MPP_OSAL=y
 CONFIG_ROCKCHIP_DVBM=m
 CONFIG_SOUND=y
 CONFIG_SND=y

drivers/gpu/drm/rockchip/rockchip_drm_drv.c

@@ -1467,13 +1467,18 @@ static int rockchip_drm_init_iommu(struct drm_device *drm_dev)
 		 */
 		ret = iommu_map(private->domain, 0, 0, (size_t)SZ_2G,
 				IOMMU_WRITE | IOMMU_READ | IOMMU_PRIV);
-		if (ret)
+		if (ret) {
 			dev_err(drm_dev->dev, "failed to create 0-2G pre mapping\n");
+			return 0;
+		}
 
 		ret = iommu_map(private->domain, SZ_2G, SZ_2G, (size_t)SZ_2G,
 				IOMMU_WRITE | IOMMU_READ | IOMMU_PRIV);
-		if (ret)
+		if (ret) {
 			dev_err(drm_dev->dev, "failed to create 2G-4G pre mapping\n");
+			return 0;
+		}
+		dev_info(drm_dev->dev, "Enable iommu reserve map\n");
 	}
 
 	return ret;

drivers/input/touchscreen/gsl3673.c

@@ -25,6 +25,7 @@
 #include <linux/input/mt.h>
 #include <linux/wakelock.h>
 
+#include "gsl_point_id.h"
 #include "tp_suspend.h"
 #include <linux/of_gpio.h>
 #define GSL_DEBUG 0

drivers/input/touchscreen/gsl3673.h

@@ -22,10 +22,6 @@ struct gsl_touch_info
 	int id[10];
 	int finger_num;
 };
-extern unsigned int gsl_mask_tiaoping(void);
-extern unsigned int gsl_version_id(void);
-extern void gsl_alg_id_main(struct gsl_touch_info *cinfo);
-extern void gsl_DataInit(int *ret);
 unsigned int gsl_config_data_id_3673[] =
 {
 	0x80348e,

drivers/input/touchscreen/gsl3673_800x1280.c

@@ -25,6 +25,7 @@
 #include <linux/input/mt.h>
 #include <linux/wakelock.h>
 
+#include "gsl_point_id.h"
 #include "tp_suspend.h"
 #include <linux/of_gpio.h>
 #define GSL_DEBUG 0

drivers/input/touchscreen/gsl3673_800x1280.h

@@ -21,10 +21,6 @@ struct gsl_touch_info {
 	int id[10];
 	int finger_num;
 };
-extern unsigned int gsl_mask_tiaoping(void);
-extern unsigned int gsl_version_id(void);
-extern void gsl_alg_id_main(struct gsl_touch_info *cinfo);
-extern void gsl_DataInit(int *ret);
 static unsigned int gsl_config_data_id_3673[] = {
 	0x94ed81,
 	0x200,

drivers/input/touchscreen/gsl3676/rk3368_th863c_10.h

@@ -27,11 +27,6 @@ struct gsl_touch_info {
 	int id[10];
 	int finger_num;
 };
-extern unsigned int gsl_mask_tiaoping(void);
-extern unsigned int gsl_version_id(void);
-extern void gsl_alg_id_main(struct gsl_touch_info *cinfo);
-extern void gsl_DataInit(int *ret);
-
 
 static unsigned int gsl_config_data_id[512] =
 {

drivers/input/touchscreen/gsl_point_id.c

@@ -9,6 +9,7 @@
  *  published by the Free Software Foundation.
  */
 
+#include "gsl_point_id.h"
 //#include "linux/module.h"
 //#include <wdm.h>
 /*
@@ -350,26 +351,27 @@ typedef struct
 static int  gesture_num,gesture_num_last;//gesture_num
 static int  gesture_dis_min;
 static int  gesture_deal;
-static int  gesture_last;
+//static int  gesture_last;
 static int  gesture_threshold[2];
 static  int x_scale;
 static  int y_scale;
 static int double_down,double_up;
-static const GESTURE_MODEL_TYPE * model_extern = NULL;
-static int  model_extern_len = 0;
+//static const GESTURE_MODEL_TYPE * model_extern = NULL;
+//static int  model_extern_len = 0;
 static int  GestureSqrt(int d);
 static int  GestureDistance(GESTURE_POINT_TYPE* d1,GESTURE_POINT_TYPE* d2,int sqrt_able);
 static int  GesturePush(GESTURE_POINT_TYPE* data);
-static int  GestureStretch(void);
-static int  GestureLength(void);
-static int  GestureDeal(void);
-static int  GestureModel(const GESTURE_MODEL_TYPE * model,int len,int threshold,int *out);
+//static int  GestureStretch(void);
+//static int  GestureLength(void);
+//static int  GestureDeal(void);
+//static int  GestureModel(const GESTURE_MODEL_TYPE * model,int len,int threshold,int *out);
 static int  GestureMain(unsigned int data[],unsigned int pn);
-static void GestureStandard(void);
+//static void GestureStandard(void);
 static void GestureInit(void);
-static void ChangeXY(void);
-static int  GestureLRUD(void);
+//static void ChangeXY(void);
+//static int  GestureLRUD(void);
 static void GestureSet(unsigned int conf[]);
+#if 0
 static const GESTURE_MODEL_TYPE model_default[]
 ={
 	{0x10,'3',{
@@ -528,6 +530,7 @@ static const GESTURE_MODEL_TYPE model_default[]
 	0x010bfced,0x2513ffff,0x4937fdff,0x6d5bf9fa,0x9280f4f7,0xb6a4f0f1,0xdac8eeef,0xffececed,}},
 };
 #endif
+#endif
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++
 static void SortBubble(int t[],int size)
 {
@@ -546,11 +549,13 @@ static void SortBubble(int t[],int size)
 		}
 	}
 }
-int abs(int i){
+#if 0
+static int abs(int i){
  	if(i<0)
 		return ~(--i);
 	return i;
 }
+#endif
 static int Sqrt(int d)
 {
 	int ret = 0;
@@ -2184,7 +2189,8 @@ static void PointPressure(void)
 	}
 }
 
-void gsl_ReportPressure(unsigned int *p)
+#if 0
+static void gsl_ReportPressure(unsigned int *p)
 {
 	int i;
 	for(i=0;i<POINT_MAX;i++)
@@ -2206,11 +2212,12 @@ void gsl_ReportPressure(unsigned int *p)
 }
 //EXPORT_SYMBOL(gsl_ReportPressure);
 
-int  gsl_TouchNear(void)
+static int  gsl_TouchNear(void)
 {
 		return 0;
 }
 //EXPORT_SYMBOL(gsl_TouchNear);
+#endif
 
 static void DoubleClick(void)
 {
@@ -2694,11 +2701,13 @@ void gsl_alg_id_main(struct gsl_touch_info *cinfo)
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #ifdef GESTURE_LICH
 
-int gsl_obtain_gesture(void)
+#if 0
+static int gsl_obtain_gesture(void)
 {
 	return GestureDeal();
 }
 //EXPORT_SYMBOL(gsl_obtain_gesture);
+#endif
 
 static int GestureMain(unsigned int data_coor[],unsigned int num)
 {
@@ -2784,6 +2793,7 @@ static void GestureInit(void)
 		gesture_dis_min = 2;
 }
 
+#if 0
 static int GestureStretch(void)
 {
 	unsigned int x_max=0,x_min=0xffff,y_max=0,y_min=0xffff;
@@ -2923,6 +2933,7 @@ static void ChangeXY(void)
 		gesture_buf[i].all = ((gesture_buf[i].all & 0xfff) << 16) +
 		((gesture_buf[i].all>>16) & 0xffff);
 }
+#endif
 
 static void GestureSet(unsigned int conf[])
 {
@@ -2952,6 +2963,7 @@ static void GestureSet(unsigned int conf[])
 	}
 }
 
+#if 0
 static int GestureDeal(void)
 {
 	int i;
@@ -2998,7 +3010,7 @@ static int GestureDeal(void)
 	return gesture_last;
 }
 
-void gsl_GestureExtern(const GESTURE_MODEL_TYPE *model,int len)
+static void gsl_GestureExtern(const GESTURE_MODEL_TYPE *model,int len)
 {
 	model_extern = model;
 	model_extern_len = len;
@@ -3073,7 +3085,7 @@ static int GestureLRUD(void)
 	return FALSE;
 }
 
-unsigned int gsl_GestureBuffer(unsigned int **buf)
+static unsigned int gsl_GestureBuffer(unsigned int **buf)
 {
 	int i;
 	if(gesture_num_last >= GESTURE_BUF_SIZE)
@@ -3087,6 +3099,7 @@ unsigned int gsl_GestureBuffer(unsigned int **buf)
 }
 //EXPORT_SYMBOL(gsl_GestureBuffer);
 #endif
+#endif
 /*
 // The DLL must have an entry point, but it is never called.
 //

drivers/input/touchscreen/gsl_point_id.h

@@ -0,0 +1,22 @@
+/*
+ *  drivers/input/touchscreen/gsl_point_id.h
+ *
+ *  Copyright (c) 2012 Shanghai Basewin
+ *  Guan Yuwei<guanyuwei@basewin.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#ifndef _GSL_POINT_ID_H
+#define _GSL_POINT_ID_H
+
+struct gsl_touch_info;
+
+unsigned int gsl_mask_tiaoping(void);
+unsigned int gsl_version_id(void);
+void gsl_alg_id_main(struct gsl_touch_info *cinfo);
+void gsl_DataInit(unsigned int * conf_in);
+
+#endif /* _GSL_POINT_ID_H */

drivers/input/touchscreen/gslx680.h

@@ -40,10 +40,6 @@ struct gsl_touch_info
 	int id[10];
 	int finger_num;
 };
-extern unsigned int gsl_mask_tiaoping(void);
-extern unsigned int gsl_version_id(void);
-extern void gsl_alg_id_main(struct gsl_touch_info *cinfo);
-extern void gsl_DataInit(int *ret);
 
 /*
    unsigned int gsl_config_versions[]=

drivers/input/touchscreen/gslx6801.h

@@ -29,11 +29,6 @@ struct gsl_touch_info {
 	int finger_num;
 };
 
-extern unsigned int gsl_mask_tiaoping(void);
-extern unsigned int gsl_version_id(void);
-extern void gsl_alg_id_main(struct gsl_touch_info *cinfo);
-extern void gsl_DataInit(int *ret);
-
 static unsigned int gsl_config_data_id[] = {
 	0x9eca05,
 	0x200,

drivers/input/touchscreen/gslx680_d708/rockchip_gsl3670.h

@@ -21,11 +21,6 @@ struct gsl_touch_info {
 	int finger_num;
 };
 
-extern unsigned int gsl_mask_tiaoping(void);
-extern unsigned int gsl_version_id(void);
-extern void gsl_alg_id_main(struct gsl_touch_info *cinfo);
-extern void gsl_DataInit(int *ret);
-
 unsigned int gsl_config_data_id[] = {
 	0x79a1cc,
 	0x200,

drivers/input/touchscreen/gslx680_firefly.h

@@ -25,11 +25,6 @@ struct gsl_touch_info {
 	int finger_num;
 };
 
-unsigned int gsl_mask_tiaoping(void);
-unsigned int gsl_version_id(void);
-void gsl_alg_id_main(struct gsl_touch_info *cinfo);
-void gsl_DataInit(int *ret);
-
 unsigned int gsl_config_data_id_3680B[] = {
 	0x72d266,
 	0x200,

drivers/input/touchscreen/gslx680_pad.c

@@ -32,6 +32,7 @@
 #include "tp_suspend.h"
 
 #include "gslx680_pad.h"
+#include "gsl_point_id.h"
 #include <linux/wakelock.h>
 //#define GSL_DEBUG
 #define REPORT_DATA_ANDROID_4_0

drivers/input/touchscreen/gslx680_pad.h

@@ -44,11 +44,6 @@ struct gsl_touch_chip_info
 	unsigned long conf_in_len;
 };
 
-extern unsigned int gsl_mask_tiaoping(void);
-extern unsigned int gsl_version_id(void);
-extern void gsl_alg_id_main(struct gsl_touch_info *cinfo);
-extern void gsl_DataInit(int *ret);
-
 static unsigned int gsl_config_data_id[] =
 {
 	0x8a44e0,

drivers/input/touchscreen/gt1x/gt1x_tools.c

@@ -23,6 +23,7 @@
 #include <generated/utsrelease.h>
 #include "gt1x_generic.h"
 
+#if GTP_CREATE_WR_NODE
 static ssize_t gt1x_tool_read(struct file *filp, char __user *buffer, size_t count, loff_t *ppos);
 static ssize_t gt1x_tool_write(struct file *filp, const char *buffer, size_t count, loff_t *ppos);
 
@@ -431,3 +432,4 @@ static ssize_t gt1x_tool_read(struct file *filp, char __user *buffer, size_t cou
 	*ppos += cmd_head.data_len;
 	return cmd_head.data_len;
 }
+#endif

drivers/input/touchscreen/gt1x/gt1x_update.c

@@ -196,7 +196,7 @@ check_fs_fail:
 }
 #endif
 
-int gt1x_i2c_write_with_readback(u16 addr, u8 *buffer, int length)
+static int gt1x_i2c_write_with_readback(u16 addr, u8 *buffer, int length)
 {
 	u8 buf[100];
 	int ret = gt1x_i2c_write(addr, buffer, length);
@@ -213,9 +213,10 @@ int gt1x_i2c_write_with_readback(u16 addr, u8 *buffer, int length)
 	return 0;
 }
 
+#if 0
 #define getU32(a) ((u32)getUint((u8 *)(a), 4))
 #define getU16(a) ((u16)getUint((u8 *)(a), 2))
-u32 getUint(u8 *buffer, int len)
+static u32 getUint(u8 *buffer, int len)
 {
 	u32 num = 0;
 	int i;
@@ -225,6 +226,7 @@ u32 getUint(u8 *buffer, int len)
 	}
 	return num;
 }
+#endif
 
 int gt1x_auto_update_proc(void *data)
 {
@@ -747,7 +749,7 @@ _reset:
 	return 0;
 }
 
-int __gt1x_hold_ss51_dsp_20(void)
+static int __gt1x_hold_ss51_dsp_20(void)
 {
 	int ret = -1;
 	int retry = 0;

drivers/input/touchscreen/rochkchip_gslX680_8inch_800x1280_tg806_10.h

@@ -22,10 +22,6 @@ struct gsl_touch_info{
 	int id[10];
 	int finger_num;
 };
-extern unsigned int gsl_mask_tiaoping(void);
-extern unsigned int gsl_version_id(void);
-extern void gsl_alg_id_main(struct gsl_touch_info *cinfo);
-extern void gsl_DataInit(int *ret);
 
 static unsigned int gsl_config_data_id_3673[] = {
 	0xb976bc,

drivers/input/touchscreen/tp_gslx680_board.h

@@ -20,11 +20,6 @@ struct gsl_touch_info {
 	int finger_num;
 };
 
-extern unsigned int gsl_mask_tiaoping(void);
-extern unsigned int gsl_version_id(void);
-extern void gsl_alg_id_main(struct gsl_touch_info *cinfo);
-extern void gsl_DataInit(int *ret);
-
 static unsigned int gsl_config_data_id[] = {
 	0x9296dd,
 	0x200,

drivers/mtd/spi-nor/core.c

@@ -733,7 +733,7 @@ static int spi_nor_wait_till_ready_with_timeout_and_msleep(struct spi_nor *nor,
  *
  * Return: 0 on success, -errno otherwise.
  */
-int spi_nor_wait_till_ready_with_msleep(struct spi_nor *nor)
+static int spi_nor_wait_till_ready_with_msleep(struct spi_nor *nor)
 {
 	return spi_nor_wait_till_ready_with_timeout_and_msleep(nor,
 							       DEFAULT_READY_WAIT_JIFFIES);

drivers/video/rockchip/mpp_osal/Kconfig

@@ -2,7 +2,5 @@
 
 config ROCKCHIP_MPP_OSAL
 	bool "mpp osal"
-	depends on CPU_RV1103B || CPU_RV1106
-	default y
 	help
 	  rockchip mpp osal adapt for kmpp