From 62192d322efdabed31ef5b3004d0ae2ff1ca9975 Mon Sep 17 00:00:00 2001
From: Tao Huang <huangtao@rock-chips.com>
Date: Mon, 7 May 2018 19:16:30 +0800
Subject: [PATCH] rk: rm include/linux/rockchip/pmu.h

Change-Id: I4825dd50a5a69555da4cb6f0762f192c8df57885
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
---
 .../video/rockchip/vcodec/vcodec_service.c    |   9 +-
 drivers/video/rockchip/vpu/mpp_dev_common.c   |   2 -
 drivers/video/rockchip/vpu/mpp_dev_h265e.c    |   1 -
 drivers/video/rockchip/vpu/mpp_dev_rkvenc.c   |   1 -
 drivers/video/rockchip/vpu/mpp_dev_vepu.c     |   1 -
 include/linux/rockchip/pmu.h                  | 143 ------------------
 6 files changed, 1 insertion(+), 156 deletions(-)
 delete mode 100644 include/linux/rockchip/pmu.h

diff --git a/drivers/video/rockchip/vcodec/vcodec_service.c b/drivers/video/rockchip/vcodec/vcodec_service.c
index 452daf9efd73..abb522ac4ad8 100644
--- a/drivers/video/rockchip/vcodec/vcodec_service.c
+++ b/drivers/video/rockchip/vcodec/vcodec_service.c
@@ -45,7 +45,6 @@
 #include <linux/iopoll.h>
 
 #include <linux/regulator/consumer.h>
-#include <linux/rockchip/pmu.h>
 #include <linux/rockchip/grf.h>
 #include <linux/rockchip/rockchip_sip.h>
 #include <linux/thermal.h>
@@ -54,6 +53,7 @@
 #include <linux/dma-buf.h>
 #include <linux/rockchip-iovmm.h>
 #include <video/rk_vpu_service.h>
+#include <soc/rockchip/pm_domains.h>
 #include <soc/rockchip/rockchip_opp_select.h>
 
 #include "vcodec_hw_info.h"
@@ -446,7 +446,6 @@ struct vcodec_hw_ops {
 struct vcodec_hw_var {
 	s32 device_type;
 	u8 *name;
-	enum pmu_idle_req pmu_type;
 	struct vcodec_hw_ops *ops;
 	int (*init)(struct vpu_service_info *pservice);
 	void (*config)(struct vpu_subdev_data *data);
@@ -2600,7 +2599,6 @@ static struct vcodec_hw_ops hw_ops_rk3328_rkvdec = {
 static struct vcodec_hw_var rk3328_rkvdec_var = {
 	.device_type = VCODEC_DEVICE_TYPE_RKVD,
 	.name = "rkvdec",
-	.pmu_type = -1,
 	.ops = &hw_ops_rk3328_rkvdec,
 	.init = vcodec_spec_init_rk3328,
 	.config = vcodec_spec_config_rk3328,
@@ -2609,7 +2607,6 @@ static struct vcodec_hw_var rk3328_rkvdec_var = {
 static struct vcodec_hw_var rk3328_vpucombo_var = {
 	.device_type = VCODEC_DEVICE_TYPE_VPUC,
 	.name = "vpu-combo",
-	.pmu_type = -1,
 	.ops = NULL,
 	.init = NULL,
 	.config = NULL,
@@ -2619,7 +2616,6 @@ static struct vcodec_hw_var rk3328_vpucombo_var = {
 static struct vcodec_hw_var vpu_device_info = {
 	.device_type = VCODEC_DEVICE_TYPE_VPUX,
 	.name = "vpu-service",
-	.pmu_type = -1,
 	.ops = NULL,
 	.init = NULL,
 	.config = NULL,
@@ -2628,7 +2624,6 @@ static struct vcodec_hw_var vpu_device_info = {
 static struct vcodec_hw_var vpu_combo_device_info = {
 	.device_type = VCODEC_DEVICE_TYPE_VPUC,
 	.name = "vpu-combo",
-	.pmu_type = -1,
 	.ops = NULL,
 	.init = NULL,
 	.config = NULL,
@@ -2637,7 +2632,6 @@ static struct vcodec_hw_var vpu_combo_device_info = {
 static struct vcodec_hw_var hevc_device_info = {
 	.device_type = VCODEC_DEVICE_TYPE_HEVC,
 	.name = "hevc-service",
-	.pmu_type = -1,
 	.ops = NULL,
 	.init = NULL,
 	.config = NULL,
@@ -2646,7 +2640,6 @@ static struct vcodec_hw_var hevc_device_info = {
 static struct vcodec_hw_var rkvd_device_info = {
 	.device_type = VCODEC_DEVICE_TYPE_RKVD,
 	.name = "rkvdec",
-	.pmu_type = -1,
 	.ops = NULL,
 	.init = NULL,
 	.config = NULL,
diff --git a/drivers/video/rockchip/vpu/mpp_dev_common.c b/drivers/video/rockchip/vpu/mpp_dev_common.c
index f322c811ebe4..2dfdb1a17aec 100644
--- a/drivers/video/rockchip/vpu/mpp_dev_common.c
+++ b/drivers/video/rockchip/vpu/mpp_dev_common.c
@@ -26,8 +26,6 @@
 #include <linux/slab.h>
 #include <linux/uaccess.h>
 
-#include <linux/rockchip/pmu.h>
-
 #include "vpu_iommu_ops.h"
 #include "mpp_dev_common.h"
 #include "mpp_service.h"
diff --git a/drivers/video/rockchip/vpu/mpp_dev_h265e.c b/drivers/video/rockchip/vpu/mpp_dev_h265e.c
index 4667de83ef87..f4d101006c7b 100644
--- a/drivers/video/rockchip/vpu/mpp_dev_h265e.c
+++ b/drivers/video/rockchip/vpu/mpp_dev_h265e.c
@@ -21,7 +21,6 @@
 #include <linux/regmap.h>
 #include <linux/reset.h>
 #include <linux/rk_fb.h>
-#include <linux/rockchip/pmu.h>
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/uaccess.h>
diff --git a/drivers/video/rockchip/vpu/mpp_dev_rkvenc.c b/drivers/video/rockchip/vpu/mpp_dev_rkvenc.c
index 3369aba736d2..bd8e9ab3def8 100644
--- a/drivers/video/rockchip/vpu/mpp_dev_rkvenc.c
+++ b/drivers/video/rockchip/vpu/mpp_dev_rkvenc.c
@@ -21,7 +21,6 @@
 #include <linux/types.h>
 #include <linux/uaccess.h>
 #include <linux/reset.h>
-#include <linux/rockchip/pmu.h>
 
 #include "vpu_iommu_ops.h"
 #include "mpp_service.h"
diff --git a/drivers/video/rockchip/vpu/mpp_dev_vepu.c b/drivers/video/rockchip/vpu/mpp_dev_vepu.c
index d8b3e9535f8b..18e470c46755 100644
--- a/drivers/video/rockchip/vpu/mpp_dev_vepu.c
+++ b/drivers/video/rockchip/vpu/mpp_dev_vepu.c
@@ -21,7 +21,6 @@
 #include <linux/regmap.h>
 #include <linux/reset.h>
 #include <linux/rockchip/grf.h>
-#include <linux/rockchip/pmu.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
 
diff --git a/include/linux/rockchip/pmu.h b/include/linux/rockchip/pmu.h
deleted file mode 100644
index 5346ec763b2b..000000000000
--- a/include/linux/rockchip/pmu.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __MACH_ROCKCHIP_PMU_H
-#define __MACH_ROCKCHIP_PMU_H
-
-#define RK3188_PMU_WAKEUP_CFG0          0x00
-#define RK3188_PMU_WAKEUP_CFG1          0x04
-#define RK3188_PMU_PWRDN_CON            0x08
-#define RK3188_PMU_PWRDN_ST             0x0c
-#define RK3188_PMU_INT_CON              0x10
-#define RK3188_PMU_INT_ST               0x14
-#define RK3188_PMU_MISC_CON             0x18
-#define RK3188_PMU_OSC_CNT              0x1c
-#define RK3188_PMU_PLL_CNT              0x20
-#define RK3188_PMU_PMU_CNT              0x24
-#define RK3188_PMU_DDRIO_PWRON_CNT      0x28
-#define RK3188_PMU_WAKEUP_RST_CLR_CNT   0x2c
-#define RK3188_PMU_SCU_PWRDWN_CNT       0x30
-#define RK3188_PMU_SCU_PWRUP_CNT        0x34
-#define RK3188_PMU_MISC_CON1            0x38
-#define RK3188_PMU_GPIO0_CON            0x3c
-#define RK3188_PMU_SYS_REG0             0x40
-#define RK3188_PMU_SYS_REG1             0x44
-#define RK3188_PMU_SYS_REG2             0x48
-#define RK3188_PMU_SYS_REG3             0x4c
-#define RK3188_PMU_STOP_INT_DLY         0x60
-#define RK3188_PMU_GPIO0A_PULL          0x64
-#define RK3188_PMU_GPIO0B_PULL          0x68
-
-#define RK3288_PMU_WAKEUP_CFG0          0x00
-#define RK3288_PMU_WAKEUP_CFG1          0x04
-#define RK3288_PMU_PWRDN_CON            0x08
-#define RK3288_PMU_PWRDN_ST             0x0c
-#define RK3288_PMU_IDLE_REQ             0x10
-#define RK3288_PMU_IDLE_ST              0x14
-#define RK3288_PMU_PWRMODE_CON          0x18
-#define RK3288_PMU_PWR_STATE            0x1c
-#define RK3288_PMU_OSC_CNT              0x20
-#define RK3288_PMU_PLL_CNT              0x24
-#define RK3288_PMU_STABL_CNT            0x28
-#define RK3288_PMU_DDR0IO_PWRON_CNT     0x2c
-#define RK3288_PMU_DDR1IO_PWRON_CNT     0x30
-#define RK3288_PMU_CORE_PWRDWN_CNT      0x34
-#define RK3288_PMU_CORE_PWRUP_CNT       0x38
-#define RK3288_PMU_GPU_PWRDWN_CNT       0x3c
-#define RK3288_PMU_GPU_PWRUP_CNT        0x40
-#define RK3288_PMU_WAKEUP_RST_CLR_CNT   0x44
-#define RK3288_PMU_SFT_CON              0x48
-#define RK3288_PMU_DDR_SREF_ST          0x4c
-#define RK3288_PMU_INT_CON              0x50
-#define RK3288_PMU_INT_ST               0x54
-#define RK3288_PMU_BOOT_ADDR_SEL        0x58
-#define RK3288_PMU_GRF_CON              0x5c
-#define RK3288_PMU_GPIO_SR              0x60
-#define RK3288_PMU_GPIO0_A_PULL         0x64
-#define RK3288_PMU_GPIO0_B_PULL         0x68
-#define RK3288_PMU_GPIO0_C_PULL         0x6c
-#define RK3288_PMU_GPIO0_A_DRV          0x70
-#define RK3288_PMU_GPIO0_B_DRV          0x74
-#define RK3288_PMU_GPIO0_C_DRV          0x78
-#define RK3288_PMU_GPIO_OP              0x7c
-#define RK3288_PMU_GPIO0_SEL18          0x80
-#define RK3288_PMU_GPIO0_A_IOMUX        0x84
-#define RK3288_PMU_GPIO0_B_IOMUX        0x88
-#define RK3288_PMU_GPIO0_C_IOMUX        0x8c
-#define RK3288_PMU_PWRMODE_CON1        0x90
-#define RK3288_PMU_SYS_REG0             0x94
-#define RK3288_PMU_SYS_REG1             0x98
-#define RK3288_PMU_SYS_REG2             0x9c
-#define RK3288_PMU_SYS_REG3             0xa0
-
-#define RK312X_PMU_WAKEUP_CFG		0x00
-#define RK312X_PMU_PWRDN_CON			0x04
-#define RK312X_PMU_PWRDN_ST			0x08
-#define RK312X_PMU_IDLE_REQ			0x0C
-#define RK312X_PMU_IDLE_ST				0x10
-#define RK312X_PMU_PWRMODE_CON		0x14
-#define RK312X_PMU_PWR_STATE			0x18
-#define RK312X_PMU_OSC_CNT			0x1C
-#define RK312X_PMU_CORE_PWRDWN_CNT	0x20
-#define RK312X_PMU_CORE_PWRUP_CNT	0x24
-#define RK312X_PMU_SFT_CON			0x28
-#define RK312X_PMU_DDR_SREF_ST		0x2C
-#define RK312X_PMU_INT_CON			0x30
-#define RK312X_PMU_INT_ST				0x34
-#define RK312X_PMU_SYS_REG0			0x38
-#define RK312X_PMU_SYS_REG1			0x3C
-#define RK312X_PMU_SYS_REG2			0x40
-#define RK312X_PMU_SYS_REG3			0x44
-
-#define RK3368_PMU_PWRDN_CON		0x0c
-#define RK3368_PMU_PWRDN_ST		0x10
-#define RK3368_PMU_IDLE_REQ		0x3c
-#define RK3368_PMU_IDLE_ST		0x40
-
-enum pmu_power_domain {
-	PD_BCPU,
-	PD_BDSP,
-	PD_BUS,
-	PD_CPU_0,
-	PD_CPU_1,
-	PD_CPU_2,
-	PD_CPU_3,
-	PD_CS,
-	PD_GPU,
-	PD_HEVC,
-	PD_PERI,
-	PD_SCU,
-	PD_VIDEO,
-	PD_VIO,
-	PD_GPU_0,
-	PD_GPU_1,
-};
-
-enum pmu_idle_req {
-	IDLE_REQ_ALIVE,
-	IDLE_REQ_AP2BP,
-	IDLE_REQ_BP2AP,
-	IDLE_REQ_BUS,
-	IDLE_REQ_CORE,
-	IDLE_REQ_CPUP,
-	IDLE_REQ_DMA,
-	IDLE_REQ_GPU,
-	IDLE_REQ_HEVC,
-	IDLE_REQ_PERI,
-	IDLE_REQ_VIDEO,
-	IDLE_REQ_VIO,
-	IDLE_REQ_SYS,
-	IDLE_REQ_MSCH,
-	IDLE_REQ_CRYPTO,
-};
-
-struct rockchip_pmu_operations {
-	int (*set_power_domain)(enum pmu_power_domain pd, bool on);
-	bool (*power_domain_is_on)(enum pmu_power_domain pd);
-	int (*set_idle_request)(enum pmu_idle_req req, bool idle);
-};
-
-int rockchip_pmu_idle_request(struct device *dev, bool idle);
-int rockchip_save_qos(struct device *dev);
-int rockchip_restore_qos(struct device *dev);
-extern struct rockchip_pmu_operations rockchip_pmu_ops;
-
-#endif