rk: rm include/linux/rockchip/common.h

Change-Id: I94147f5517a0bb83c677b5d9005c590e14d58762
Signed-off-by: Tao Huang <huangtao@rock-chips.com>

7 files changed, 1 insertions, 34 deletions

diff --git a/drivers/mailbox/scpi_protocol.c b/drivers/mailbox/scpi_protocol.c
index 872823172ea2..fe2a5c89a48e 100644
--- a/drivers/mailbox/scpi_protocol.c
+++ b/drivers/mailbox/scpi_protocol.c
@@ -748,34 +748,6 @@ int scpi_ddr_set_auto_self_refresh(u32 en)
 }
 EXPORT_SYMBOL_GPL(scpi_ddr_set_auto_self_refresh);
 
-int scpi_ddr_bandwidth_get(struct ddr_bw_info *ddr_bw_ch0,
-			   struct ddr_bw_info *ddr_bw_ch1)
-{
-	struct scpi_data_buf sdata;
-	struct rk3368_mbox_msg mdata;
-	struct __packed1 {
-		u32 status;
-	} tx_buf;
-	struct __packed2 {
-		u32 status;
-		struct ddr_bw_info ddr_bw_ch0;
-		struct ddr_bw_info ddr_bw_ch1;
-	} rx_buf;
-
-	tx_buf.status = 0;
-
-	SCPI_SETUP_DBUF(sdata, mdata, SCPI_CL_DDR,
-			SCPI_DDR_BANDWIDTH_GET, tx_buf, rx_buf);
-	if (scpi_execute_cmd(&sdata))
-		return 0;
-
-	memcpy(ddr_bw_ch0, &(rx_buf.ddr_bw_ch0), sizeof(rx_buf.ddr_bw_ch0));
-	memcpy(ddr_bw_ch1, &(rx_buf.ddr_bw_ch1), sizeof(rx_buf.ddr_bw_ch1));
-
-	return 0;
-}
-EXPORT_SYMBOL_GPL(scpi_ddr_bandwidth_get);
-
 int scpi_ddr_get_clk_rate(void)
 {
 	struct scpi_data_buf sdata;
diff --git a/drivers/media/video/rk_camsys/camsys_marvin.c b/drivers/media/video/rk_camsys/camsys_marvin.c
index d2dd7092798c..0a617af797e2 100644
--- a/drivers/media/video/rk_camsys/camsys_marvin.c
+++ b/drivers/media/video/rk_camsys/camsys_marvin.c
@@ -2,7 +2,6 @@
 #include "camsys_soc_priv.h"
 #include "camsys_gpio.h"
 
-#include <linux/rockchip/common.h>
 #include <dt-bindings/soc/rockchip-system-status.h>
 #include <soc/rockchip/rockchip-system-status.h>
 #include <linux/rockchip_ion.h>
diff --git a/drivers/staging/imgtec/rogue/rk3368/rk_init_v2.c b/drivers/staging/imgtec/rogue/rk3368/rk_init_v2.c
index e5fac373765b..553d0c1377e5 100644
--- a/drivers/staging/imgtec/rogue/rk3368/rk_init_v2.c
+++ b/drivers/staging/imgtec/rogue/rk3368/rk_init_v2.c
@@ -60,7 +60,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0))
 #include <linux/rockchip/dvfs.h>
 #endif
-#include <linux/rockchip/common.h>
 #include "power.h"
 #include "rk_init_v2.h"
 #include "pvrsrv_device.h"
diff --git a/drivers/thermal/rk3368_thermal.c b/drivers/thermal/rk3368_thermal.c
index d47bd1f001f8..ec07b96fdb78 100644
--- a/drivers/thermal/rk3368_thermal.c
+++ b/drivers/thermal/rk3368_thermal.c
@@ -27,7 +27,6 @@
 #include <linux/regmap.h>
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
-#include <linux/rockchip/common.h>
 #include <linux/reboot.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
@@ -92,6 +91,7 @@ enum {
 
 #define MIN_TEMP (-40000)
 #define MAX_TEMP (125000)
+#define INVALID_TEMP INT_MAX
 
 #define BASE (1024)
 #define BASE_SHIFT (10)
diff --git a/drivers/video/rockchip/lcdc/rk322x_lcdc.c b/drivers/video/rockchip/lcdc/rk322x_lcdc.c
index 191064a4e9fc..7e52f5b799f5 100644
--- a/drivers/video/rockchip/lcdc/rk322x_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk322x_lcdc.c
@@ -33,7 +33,6 @@
 #include <asm/div64.h>
 #include <linux/uaccess.h>
 #include <linux/rockchip/grf.h>
-#include <linux/rockchip/common.h>
 #include <dt-bindings/clock/rk_system_status.h>
 #include <soc/rockchip/rkfb_dmc.h>
 #include <linux/of_gpio.h>
diff --git a/drivers/video/rockchip/lcdc/rk3368_lcdc.c b/drivers/video/rockchip/lcdc/rk3368_lcdc.c
index ba69798a877d..f9903f7fcf69 100644
--- a/drivers/video/rockchip/lcdc/rk3368_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk3368_lcdc.c
@@ -31,7 +31,6 @@
 #include <linux/uaccess.h>
 #include <linux/rockchip/cpu.h>
 #include <linux/rockchip/grf.h>
-#include <linux/rockchip/common.h>
 #include <dt-bindings/clock/rk_system_status.h>
 
 #include "rk3368_lcdc.h"
diff --git a/drivers/video/rockchip/lcdc/rk_vop_lite.c b/drivers/video/rockchip/lcdc/rk_vop_lite.c
index cf9d70562499..7c1521ef64fc 100644
--- a/drivers/video/rockchip/lcdc/rk_vop_lite.c
+++ b/drivers/video/rockchip/lcdc/rk_vop_lite.c
@@ -33,7 +33,6 @@
 #include <linux/uaccess.h>
 #include <linux/rockchip/cpu.h>
 #include <linux/rockchip/grf.h>
-#include <linux/rockchip/common.h>
 #include <dt-bindings/clock/rk_system_status.h>
 
 #include "rk_vop_lite.h"