| Message ID | 20230120210101.2146852-1-konrad.dybcio@linaro.org |
|---|---|
| State | Accepted |
| Commit | 1ae654ded7c5a19dc13f57a4fe4434fef879b6f9 |
| Headers | show |
| Series | [1/8] drm/msm/dsi: Allow 2 CTRLs on v2.5.0 | expand |
On 20/01/2023 23:00, Konrad Dybcio wrote: > v2.5.0 support was originally added for SC7280, but this hw is also > present on SM8350, which has one more DSI host. Bump up the dsi count > and fill in the register of the secondary host to allow it to probe. > > This should not have any adverse effects on SC7280, as the secondary > CTRL will only be touched if it's defined, anyway. > > Fixes: 65c391b31994 ("drm/msm/dsi: Add DSI support for SC7280") > Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> > --- > drivers/gpu/drm/msm/dsi/dsi_cfg.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
On Fri, 20 Jan 2023 22:00:53 +0100, Konrad Dybcio wrote: > v2.5.0 support was originally added for SC7280, but this hw is also > present on SM8350, which has one more DSI host. Bump up the dsi count > and fill in the register of the secondary host to allow it to probe. > > This should not have any adverse effects on SC7280, as the secondary > CTRL will only be touched if it's defined, anyway. > > [...] Applied, thanks! [2/8] arm64: dts: qcom: sm8350: Add missing #address/size-cells to DSIn commit: 6636818ecf0f1d448360835017473cf94a0ee967 [3/8] arm64: dts: qcom: sm8350: Fix DSI1 interrupt commit: 1eed7995d9da0489e5a46c13bd888ffa987ead98 [4/8] arm64: dts: qcom: sm8350: Feed DSI1 PHY clocks to DISPCC commit: 0af6a4012b3815ebca7b8080a286edc01e4a89e1 [5/8] arm64: dts: qcom: sm8350: Fix DSI PHY compatibles commit: 45cd807de14388010a279765486c13f8ac540dfa [6/8] arm64: dts: qcom: sm8350: Fix DSI PLL size commit: e3e654ced376060d64ede8e2dfde0b1bac0f9086 [7/8] arm64: dts: qcom: sm8350: Add mdss_ prefix to DSIn out labels commit: 2a07efb8c08619888428cc8fd47643c438111f29 [8/8] arm64: dts: qcom: sm8350: Hook up DSI1 to MDP commit: b904227a4b693fbb9d5eabc9d7100dc01d9eb973 Best regards,
diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c index 33884ebd2f86..6d21f0b33411 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c @@ -223,8 +223,8 @@ static const struct msm_dsi_config sc7280_dsi_cfg = { .num_regulators = ARRAY_SIZE(sc7280_dsi_regulators), .bus_clk_names = dsi_sc7280_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sc7280_bus_clk_names), - .io_start = { 0xae94000 }, - .num_dsi = 1, + .io_start = { 0xae94000, 0xae96000 }, + .num_dsi = 2, }; static const char * const dsi_qcm2290_bus_clk_names[] = {
v2.5.0 support was originally added for SC7280, but this hw is also present on SM8350, which has one more DSI host. Bump up the dsi count and fill in the register of the secondary host to allow it to probe. This should not have any adverse effects on SC7280, as the secondary CTRL will only be touched if it's defined, anyway. Fixes: 65c391b31994 ("drm/msm/dsi: Add DSI support for SC7280") Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> --- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)