Commit 41c5bb76 authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Andy Gross

soc: qcom: rpmpd: Drop family A RPM dependency

The MFD_QCOM_RPM is the RPM in family A, but the rpmpd driver only implements
support for SMD based devices. Drop the dependency and remove includes of the
family A headers. No functional change.
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: default avatarRajendra Nayak <rnayak@codeaurora.org>
Signed-off-by: default avatarAndy Gross <andy.gross@linaro.org>
parent e31f941c
...@@ -109,7 +109,7 @@ config QCOM_RPMHPD ...@@ -109,7 +109,7 @@ config QCOM_RPMHPD
config QCOM_RPMPD config QCOM_RPMPD
bool "Qualcomm RPM Power domain driver" bool "Qualcomm RPM Power domain driver"
depends on MFD_QCOM_RPM && QCOM_SMD_RPM depends on QCOM_SMD_RPM
help help
QCOM RPM Power domain driver to support power-domains with QCOM RPM Power domain driver to support power-domains with
performance states. The driver communicates a performance state performance states. The driver communicates a performance state
......
...@@ -6,14 +6,12 @@ ...@@ -6,14 +6,12 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/pm_domain.h> #include <linux/pm_domain.h>
#include <linux/mfd/qcom_rpm.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm_opp.h> #include <linux/pm_opp.h>
#include <linux/soc/qcom/smd-rpm.h> #include <linux/soc/qcom/smd-rpm.h>
#include <dt-bindings/mfd/qcom-rpm.h>
#include <dt-bindings/power/qcom-rpmpd.h> #include <dt-bindings/power/qcom-rpmpd.h>
#define domain_to_rpmpd(domain) container_of(domain, struct rpmpd, pd) #define domain_to_rpmpd(domain) container_of(domain, struct rpmpd, pd)
...@@ -131,8 +129,8 @@ static int rpmpd_send_enable(struct rpmpd *pd, bool enable) ...@@ -131,8 +129,8 @@ static int rpmpd_send_enable(struct rpmpd *pd, bool enable)
.value = cpu_to_le32(enable), .value = cpu_to_le32(enable),
}; };
return qcom_rpm_smd_write(pd->rpm, QCOM_RPM_ACTIVE_STATE, pd->res_type, return qcom_rpm_smd_write(pd->rpm, QCOM_SMD_RPM_ACTIVE_STATE,
pd->res_id, &req, sizeof(req)); pd->res_type, pd->res_id, &req, sizeof(req));
} }
static int rpmpd_send_corner(struct rpmpd *pd, int state, unsigned int corner) static int rpmpd_send_corner(struct rpmpd *pd, int state, unsigned int corner)
...@@ -174,13 +172,13 @@ static int rpmpd_aggregate_corner(struct rpmpd *pd) ...@@ -174,13 +172,13 @@ static int rpmpd_aggregate_corner(struct rpmpd *pd)
active_corner = max(this_active_corner, peer_active_corner); active_corner = max(this_active_corner, peer_active_corner);
ret = rpmpd_send_corner(pd, QCOM_RPM_ACTIVE_STATE, active_corner); ret = rpmpd_send_corner(pd, QCOM_SMD_RPM_ACTIVE_STATE, active_corner);
if (ret) if (ret)
return ret; return ret;
sleep_corner = max(this_sleep_corner, peer_sleep_corner); sleep_corner = max(this_sleep_corner, peer_sleep_corner);
return rpmpd_send_corner(pd, QCOM_RPM_SLEEP_STATE, sleep_corner); return rpmpd_send_corner(pd, QCOM_SMD_RPM_SLEEP_STATE, sleep_corner);
} }
static int rpmpd_power_on(struct generic_pm_domain *domain) static int rpmpd_power_on(struct generic_pm_domain *domain)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment