From 2bb5d9069999a2c2195a05f4aa3da7f14ea3102d Mon Sep 17 00:00:00 2001 From: Bjorn Andersson Date: Mon, 30 Jan 2017 03:20:27 -0800 Subject: [PATCH] remoteproc: qcom: q6v5: Remove mss supply from 8916 The Q6V5 in MSM8916 doesn't have a mss supply, so remove this and update the code to support cases without proxy or active supplies. Signed-off-by: Bjorn Andersson --- drivers/remoteproc/qcom_q6v5_pil.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c index 8d60ad2a2851..b9ce66e28f8b 100644 --- a/drivers/remoteproc/qcom_q6v5_pil.c +++ b/drivers/remoteproc/qcom_q6v5_pil.c @@ -160,6 +160,9 @@ static int q6v5_regulator_init(struct device *dev, struct reg_info *regs, int rc; int i; + if (!reg_res) + return 0; + for (i = 0; reg_res[i].supply; i++) { regs[i].reg = devm_regulator_get(dev, reg_res[i].supply); if (IS_ERR(regs[i].reg)) { @@ -1036,14 +1039,6 @@ static const struct rproc_hexagon_res msm8916_mss = { }, {} }, - .active_supply = (struct qcom_mss_reg_res[]) { - { - .supply = "mss", - .uV = 1050000, - .uA = 100000, - }, - {} - }, .proxy_clk_names = (char*[]){ "xo", NULL