Commit 19ced2ae authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Bjorn Andersson
Browse files

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: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Acked-by: default avatarGeorgi Djakov <djakov@kernel.org>
Link: https://lore.kernel.org/r/20230526-topic-smd_icc-v7-8-09c78c175546@linaro.org


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent 40cdeed6

drivers/interconnect/qcom/icc-rpm.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/regmap.h>

#include <linux/slab.h>



#include "smd-rpm.h"

#include "icc-common.h"

#include "icc-rpm.h"

drivers/interconnect/qcom/icc-rpm.h

+5 −0
Original line number Diff line number Diff line
@@ -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

drivers/interconnect/qcom/msm8916.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


#include <dt-bindings/interconnect/qcom,msm8916.h>



#include "smd-rpm.h"

#include "icc-rpm.h"



enum {

drivers/interconnect/qcom/msm8939.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 


#include <dt-bindings/interconnect/qcom,msm8939.h>



#include "smd-rpm.h"

#include "icc-rpm.h"



enum {

drivers/interconnect/qcom/msm8974.c

+1 −1
Original line number Diff line number Diff line
@@ -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,