| Message ID | 20250127-msm8226-modem-v3-6-67e968787eef@lucaweiss.eu (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Modem support for MSM8226 | expand |
On Mon, Jan 27, 2025 at 11:45:38PM +0100, Luca Weiss wrote: > While MSM8926 being 'just' an LTE-capable variant of MSM8226 it appears > the modem setup has changed significantly, by requiring mss-supply and > not using the ext-bhs-reg. > > Add a new compatible and new struct to support that. > > Signed-off-by: Luca Weiss <luca@lucaweiss.eu> I wonder if you could reuse &msm8974_mss here. Anyway, I suppose it's better to not allow the fallback_proxy_supply that MSM8974 has. I think it's fine as-is. :-) Reviewed-by: Stephan Gerhold <stephan.gerhold@linaro.org> > --- > drivers/remoteproc/qcom_q6v5_mss.c | 48 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 48 insertions(+) > > diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c > index 32f35fe89416f167fe49be7ca02a24af842e0073..cd7ea7bb345f558636f9414c43460b29b3be6f5c 100644 > --- a/drivers/remoteproc/qcom_q6v5_mss.c > +++ b/drivers/remoteproc/qcom_q6v5_mss.c > @@ -257,6 +257,7 @@ enum { > MSS_MSM8226, > MSS_MSM8909, > MSS_MSM8916, > + MSS_MSM8926, > MSS_MSM8953, > MSS_MSM8974, > MSS_MSM8996, > @@ -2621,11 +2622,58 @@ static const struct rproc_hexagon_res msm8226_mss = { > .version = MSS_MSM8226, > }; > > +static const struct rproc_hexagon_res msm8926_mss = { > + .hexagon_mba_image = "mba.b00", > + .proxy_supply = (struct qcom_mss_reg_res[]) { > + { > + .supply = "pll", > + .uA = 100000, > + }, > + { > + .supply = "mx", > + .uV = 1050000, > + }, > + {} > + }, > + .active_supply = (struct qcom_mss_reg_res[]) { > + { > + .supply = "mss", > + .uV = 1050000, > + .uA = 100000, > + }, > + {} > + }, > + .proxy_clk_names = (char*[]){ > + "xo", > + NULL > + }, > + .active_clk_names = (char*[]){ > + "iface", > + "bus", > + "mem", > + NULL > + }, > + .proxy_pd_names = (char*[]){ > + "cx", > + NULL > + }, > + .need_mem_protection = false, > + .has_alt_reset = false, > + .has_mba_logs = false, > + .has_spare_reg = false, > + .has_qaccept_regs = false, > + .has_ext_bhs_reg = false, > + .has_ext_cntl_regs = false, > + .has_vq6 = false, > + .version = MSS_MSM8926, > +}; > + > static const struct of_device_id q6v5_of_match[] = { > { .compatible = "qcom,q6v5-pil", .data = &msm8916_mss}, > { .compatible = "qcom,msm8226-mss-pil", .data = &msm8226_mss}, > { .compatible = "qcom,msm8909-mss-pil", .data = &msm8909_mss}, > { .compatible = "qcom,msm8916-mss-pil", .data = &msm8916_mss}, > + { .compatible = "qcom,msm8926-mss-pil", .data = &msm8926_mss}, > { .compatible = "qcom,msm8953-mss-pil", .data = &msm8953_mss}, > { .compatible = "qcom,msm8974-mss-pil", .data = &msm8974_mss}, > { .compatible = "qcom,msm8996-mss-pil", .data = &msm8996_mss}, > > -- > 2.48.1 >
diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index 32f35fe89416f167fe49be7ca02a24af842e0073..cd7ea7bb345f558636f9414c43460b29b3be6f5c 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -257,6 +257,7 @@ enum { MSS_MSM8226, MSS_MSM8909, MSS_MSM8916, + MSS_MSM8926, MSS_MSM8953, MSS_MSM8974, MSS_MSM8996, @@ -2621,11 +2622,58 @@ static const struct rproc_hexagon_res msm8226_mss = { .version = MSS_MSM8226, }; +static const struct rproc_hexagon_res msm8926_mss = { + .hexagon_mba_image = "mba.b00", + .proxy_supply = (struct qcom_mss_reg_res[]) { + { + .supply = "pll", + .uA = 100000, + }, + { + .supply = "mx", + .uV = 1050000, + }, + {} + }, + .active_supply = (struct qcom_mss_reg_res[]) { + { + .supply = "mss", + .uV = 1050000, + .uA = 100000, + }, + {} + }, + .proxy_clk_names = (char*[]){ + "xo", + NULL + }, + .active_clk_names = (char*[]){ + "iface", + "bus", + "mem", + NULL + }, + .proxy_pd_names = (char*[]){ + "cx", + NULL + }, + .need_mem_protection = false, + .has_alt_reset = false, + .has_mba_logs = false, + .has_spare_reg = false, + .has_qaccept_regs = false, + .has_ext_bhs_reg = false, + .has_ext_cntl_regs = false, + .has_vq6 = false, + .version = MSS_MSM8926, +}; + static const struct of_device_id q6v5_of_match[] = { { .compatible = "qcom,q6v5-pil", .data = &msm8916_mss}, { .compatible = "qcom,msm8226-mss-pil", .data = &msm8226_mss}, { .compatible = "qcom,msm8909-mss-pil", .data = &msm8909_mss}, { .compatible = "qcom,msm8916-mss-pil", .data = &msm8916_mss}, + { .compatible = "qcom,msm8926-mss-pil", .data = &msm8926_mss}, { .compatible = "qcom,msm8953-mss-pil", .data = &msm8953_mss}, { .compatible = "qcom,msm8974-mss-pil", .data = &msm8974_mss}, { .compatible = "qcom,msm8996-mss-pil", .data = &msm8996_mss},
While MSM8926 being 'just' an LTE-capable variant of MSM8226 it appears the modem setup has changed significantly, by requiring mss-supply and not using the ext-bhs-reg. Add a new compatible and new struct to support that. Signed-off-by: Luca Weiss <luca@lucaweiss.eu> --- drivers/remoteproc/qcom_q6v5_mss.c | 48 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+)