shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-24 19:40:21 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I94147f5517a0bb83c677b5d9005c590e14d58762
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
This commit is contained in:
Tao Huang
2017-11-17 14:55:40 +08:00
parent 6df2642ed7
commit f5fe2b71a5
10 changed files with 1 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/mailbox/scpi_protocol.c
View File

@@ -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;

1
drivers/media/video/rk_camsys/camsys_marvin.c
View File

@@ -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>

1
drivers/staging/imgtec/rogue/rk3368/rk_init_v2.c
View File

@@ -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"

2
drivers/thermal/rk3368_thermal.c
View File

@@ -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)

1
drivers/video/rockchip/lcdc/rk322x_lcdc.c
View File

@@ -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>

1
drivers/video/rockchip/lcdc/rk3368_lcdc.c
View File

@@ -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"

1
drivers/video/rockchip/lcdc/rk_vop_lite.c
View File

@@ -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"

95
include/linux/rockchip/common.h
View File

@@ -1,95 +0,0 @@
#ifndef __MACH_ROCKCHIP_COMMON_H
#define __MACH_ROCKCHIP_COMMON_H
#include <linux/notifier.h>
#define RK_DEVICE(VIRT, PHYS, SIZE) \
{ \
.virtual = (unsigned long)(VIRT), \
.pfn = __phys_to_pfn(PHYS), \
.length = SIZE, \
.type = MT_DEVICE, \
}
extern bool rockchip_jtag_enabled;
extern unsigned long rockchip_boot_fn;
extern struct smp_operations rockchip_smp_ops;
struct ddr_bw_info {
u32 ddr_wr;
u32 ddr_rd;
u32 ddr_act;
u32 ddr_time;
u32 ddr_total;
u32 ddr_percent;
u32 cpum;
u32 gpu;
u32 peri;
u32 video;
u32 vio0;
u32 vio1;
u32 vio2;
};
extern void (*ddr_bandwidth_get)(struct ddr_bw_info *ddr_bw_ch0,
struct ddr_bw_info *ddr_bw_ch1);
extern int (*ddr_change_freq)(uint32_t mhz);
extern long (*ddr_round_rate)(uint32_t mhz);
extern void (*ddr_set_auto_self_refresh)(bool en);
extern int (*ddr_recalc_rate)(void);
int rockchip_cpu_kill(unsigned int cpu);
void rockchip_cpu_die(unsigned int cpu);
int rockchip_cpu_disable(unsigned int cpu);
#define BOOT_MODE_NORMAL 0
#define BOOT_MODE_FACTORY2 1
#define BOOT_MODE_RECOVERY 2
#define BOOT_MODE_CHARGE 3
#define BOOT_MODE_POWER_TEST 4
#define BOOT_MODE_OFFMODE_CHARGING 5
#define BOOT_MODE_REBOOT 6
#define BOOT_MODE_PANIC 7
#define BOOT_MODE_WATCHDOG 8
#define BOOT_MODE_TSADC 9
int rockchip_boot_mode(void);
void __init rockchip_boot_mode_init(u32 flag, u32 mode);
void rockchip_restart_get_boot_mode(const char *cmd, u32 *flag, u32 *mode);
void __init rockchip_efuse_init(void);
void __init rockchip_suspend_init(void);
void __init rockchip_ion_reserve(void);
void __init rockchip_uboot_mem_reserve(void);
enum rockchip_pm_policy {
ROCKCHIP_PM_POLICY_PERFORMANCE = 0,
ROCKCHIP_PM_POLICY_NORMAL,
ROCKCHIP_PM_POLICY_POWERSAVE,
ROCKCHIP_PM_NR_POLICYS,
};
enum rockchip_pm_policy rockchip_pm_get_policy(void);
int rockchip_pm_set_policy(enum rockchip_pm_policy policy);
int rockchip_pm_policy_register_notifier(struct notifier_block *nb);
int rockchip_pm_policy_unregister_notifier(struct notifier_block *nb);
u32 pvtm_get_value(u32 ch, u32 time_us);
#define INVALID_TEMP INT_MAX
#if IS_ENABLED(CONFIG_ROCKCHIP_THERMAL)
int rockchip_tsadc_get_temp(int chn, int voltage);
#else
#if IS_ENABLED(CONFIG_SENSORS_ROCKCHIP_TSADC)
int rockchip_tsadc_get_temp(int chn);
#else
static inline int rockchip_tsadc_get_temp(int chn) { return INVALID_TEMP; }
#endif
#endif
#ifdef CONFIG_RK_LAST_LOG
void rk_last_log_text(char *text, size_t size);
#else
static inline void rk_last_log_text(char *text, size_t size) {}
#endif
#endif

10
include/soc/rockchip/scpi.h
View File

@@ -14,8 +14,6 @@
#ifndef __SOC_ROCKCHIP_SCPI_H
#define __SOC_ROCKCHIP_SCPI_H
#include <linux/rockchip/common.h>
#ifdef CONFIG_RK3368_SCPI_PROTOCOL
struct scpi_opp_entry {
u32 freq_hz;
@@ -46,8 +44,6 @@ int scpi_ddr_set_clk_rate(u32 rate, u32 lcdc_type);
int scpi_ddr_send_timing(u32 *p, u32 size);
int scpi_ddr_round_rate(u32 m_hz);
int scpi_ddr_set_auto_self_refresh(u32 en);
int scpi_ddr_bandwidth_get(struct ddr_bw_info *ddr_bw_ch0,
struct ddr_bw_info *ddr_bw_ch1);
int scpi_ddr_get_clk_rate(void);
int scpi_thermal_get_temperature(void);
int scpi_thermal_set_clk_cycle(u32 cycle);
@@ -133,12 +129,6 @@ static inline int scpi_ddr_set_auto_self_refresh(u32 en)
return -EPERM;
}
static inline int scpi_ddr_bandwidth_get(struct ddr_bw_info *ddr_bw_ch0,
struct ddr_bw_info *ddr_bw_ch1)
{
return -EPERM;
}
static inline int scpi_ddr_get_clk_rate(void)
{
return -EPERM;

1
net/rfkill/rfkill-wlan.c
View File

@@ -35,7 +35,6 @@
#include <linux/skbuff.h>
#include <linux/fb.h>
#include <linux/rockchip/grf.h>
#include <linux/rockchip/common.h>
#include <linux/regmap.h>
#include <linux/mfd/syscon.h>
#include <linux/mmc/host.h>