mirror
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

interconnect: qcom: Fold smd-rpm.h into icc-rpm.h 

smd-rpm.h is not very useful as-is and both files are always included
anyway.. Combine them.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Acked-by: Georgi Djakov <djakov@kernel.org>
Link: https://lore.kernel.org/r/20230526-topic-smd_icc-v7-8-09c78c175546@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
This commit is contained in:
Konrad Dybcio 2023-06-19 15:04:33 +02:00 committed by Bjorn Andersson
parent 40cdeed669
commit 19ced2aec6
11 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/interconnect/qcom/icc-rpm.c
View File

@ -13,7 +13,6 @@
#include <linux/regmap.h>
#include <linux/slab.h>
#include "smd-rpm.h"
#include "icc-common.h"
#include "icc-rpm.h"

5
drivers/interconnect/qcom/icc-rpm.h
View File

@ -6,6 +6,8 @@
#ifndef __DRIVERS_INTERCONNECT_QCOM_ICC_RPM_H
#define __DRIVERS_INTERCONNECT_QCOM_ICC_RPM_H
#include <linux/soc/qcom/smd-rpm.h>
#include <dt-bindings/interconnect/qcom,icc.h>
#include <linux/clk.h>
#include <linux/interconnect-provider.h>
@ -124,4 +126,7 @@ enum qos_mode {
int qnoc_probe(struct platform_device *pdev);
int qnoc_remove(struct platform_device *pdev);
bool qcom_icc_rpm_smd_available(void);
int qcom_icc_rpm_smd_send(int ctx, int rsc_type, int id, u32 val);
#endif

1
drivers/interconnect/qcom/msm8916.c
View File

@ -14,7 +14,6 @@
#include <dt-bindings/interconnect/qcom,msm8916.h>
#include "smd-rpm.h"
#include "icc-rpm.h"
enum {

1
drivers/interconnect/qcom/msm8939.c
View File

@ -15,7 +15,6 @@
#include <dt-bindings/interconnect/qcom,msm8939.h>
#include "smd-rpm.h"
#include "icc-rpm.h"
enum {

2
drivers/interconnect/qcom/msm8974.c
View File

@ -38,7 +38,7 @@
#include <linux/platform_device.h>
#include <linux/slab.h>
#include "smd-rpm.h"
#include "icc-rpm.h"
enum {
MSM8974_BIMC_MAS_AMPSS_M0 = 1,

1
drivers/interconnect/qcom/msm8996.c
View File

@ -17,7 +17,6 @@
#include <dt-bindings/interconnect/qcom,msm8996.h>
#include "icc-rpm.h"
#include "smd-rpm.h"
#include "msm8996.h"
static const char * const mm_intf_clocks[] = {

1
drivers/interconnect/qcom/qcm2290.c
View File

@ -18,7 +18,6 @@
#include <linux/slab.h>
#include "icc-rpm.h"
#include "smd-rpm.h"
enum {
QCM2290_MASTER_APPSS_PROC = 1,

1
drivers/interconnect/qcom/qcs404.c
View File

@ -12,7 +12,6 @@
#include <linux/of_device.h>
#include "smd-rpm.h"
#include "icc-rpm.h"
enum {

1
drivers/interconnect/qcom/sdm660.c
View File

@ -16,7 +16,6 @@
#include <linux/slab.h>
#include "icc-rpm.h"
#include "smd-rpm.h"
enum {
SDM660_MASTER_IPA = 1,

2
drivers/interconnect/qcom/smd-rpm.c
View File

@ -13,7 +13,7 @@
#include <linux/platform_device.h>
#include <linux/soc/qcom/smd-rpm.h>
#include "smd-rpm.h"
#include "icc-rpm.h"
#define RPM_KEY_BW 0x00007762

15
drivers/interconnect/qcom/smd-rpm.h
View File

@ -1,15 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2019, Linaro Ltd.
* Author: Georgi Djakov <georgi.djakov@linaro.org>
*/
#ifndef __DRIVERS_INTERCONNECT_QCOM_SMD_RPM_H
#define __DRIVERS_INTERCONNECT_QCOM_SMD_RPM_H
#include <linux/soc/qcom/smd-rpm.h>
bool qcom_icc_rpm_smd_available(void);
int qcom_icc_rpm_smd_send(int ctx, int rsc_type, int id, u32 val);
#endif