| Message ID | 20221125123638.823261-1-bryan.odonoghue@linaro.org |
|---|---|
| Headers | show |
| Series | mdss-dsi-ctrl binding and dts fixes | expand |
On 25/11/2022 14:36, Bryan O'Donoghue wrote: > We will add in a number of compat strings to dsi-controller-main.yaml in > the format "qcom,socname-dsi-ctrl" convert the currently unused > qcom,dsi-ctrl-6g-qcm2290 to qcom,qcm2290-dsi-ctrl. > > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> I'd say, as you are going to introduce new bindings using two compat strings, just leave this binding as is, marking it as deprecated. > --- > .../devicetree/bindings/display/msm/dsi-controller-main.yaml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > index cf782c5f5bdb0..67d08dc338925 100644 > --- a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > +++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > @@ -16,7 +16,7 @@ properties: > compatible: > enum: > - qcom,mdss-dsi-ctrl > - - qcom,dsi-ctrl-6g-qcm2290 > + - qcom,qcm2290-dsi-ctrl > > reg: > maxItems: 1
On 25/11/2022 14:36, Bryan O'Donoghue wrote: > There's a typo in describing the core clock as an 'escape' clock. The > accurate description is 'core'. > > Fixes: 4dbe55c97741 ("dt-bindings: msm: dsi: add yaml schemas for DSI bindings") > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> In the next spin please move this patch after first two fixes, so all three of them can be picked into -fixes. > --- > .../devicetree/bindings/display/msm/dsi-controller-main.yaml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > index 88aac7d33555c..0c09b9230b7f5 100644 > --- a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > +++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml > @@ -40,7 +40,7 @@ properties: > - description: Display byte clock > - description: Display byte interface clock > - description: Display pixel clock > - - description: Display escape clock > + - description: Display core clock > - description: Display AHB clock > - description: Display AXI clock >
On 25/11/2022 14:36, Bryan O'Donoghue wrote: > Add silicon specific compatible qcom,msm8996-dsi-ctrl to the > mdss-dsi-ctrl block. This allows us to differentiate the specific bindings > for msm8996 against the yaml documentation. > > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > --- > arch/arm64/boot/dts/qcom/msm8996.dtsi | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
On 25/11/2022 14:36, Bryan O'Donoghue wrote: > Add silicon specific compatible qcom,sdm630-dsi-ctrl to the > mdss-dsi-ctrl block. This allows us to differentiate the specific bindings > for sdm630 against the yaml documentation. > > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > --- > arch/arm64/boot/dts/qcom/sdm630.dtsi | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
On 25/11/2022 14:36, Bryan O'Donoghue wrote: > Add silicon specific compatible qcom,sdm660-dsi-ctrl to the > mdss-dsi-ctrl block. This allows us to differentiate the specific bindings > for sdm660 against the yaml documentation. > > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > --- > arch/arm64/boot/dts/qcom/sdm660.dtsi | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/qcom/sdm660.dtsi b/arch/arm64/boot/dts/qcom/sdm660.dtsi > index 10bf1c45cf6ec..f8ec728e67f3d 100644 > --- a/arch/arm64/boot/dts/qcom/sdm660.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm660.dtsi > @@ -154,7 +154,8 @@ mdp5_intf2_out: endpoint { > > &mdss { > dsi1: dsi@c996000 { > - compatible = "qcom,mdss-dsi-ctrl"; > + compatible = "qcom,sdm660-dsi-ctrl", > + "qcom,mdss-dsi-ctrl"; So, we'd end up with two identical DSI hosts, but one has compatible 'qcom,sdm660-dsi-ctrl' and another one 'qcom,sdm630-dsi-ctrl'. I think, use sdm660 for both of them (for both sdm630 and sdm660) > reg = <0x0c996000 0x400>; > reg-names = "dsi_ctrl"; >
On 25/11/2022 14:36, Bryan O'Donoghue wrote: > Add silicon specific compatible qcom,sdm845-dsi-ctrl to the > mdss-dsi-ctrl block. This allows us to differentiate the specific bindings > for sdm845 against the yaml documentation. > > Reviewed-by: Douglas Anderson <dianders@chromium.org> > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > --- > arch/arm64/boot/dts/qcom/sdm845.dtsi | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
On Sat, Nov 26, 2022 at 08:54:11PM +0200, Dmitry Baryshkov wrote: > On 25/11/2022 14:36, Bryan O'Donoghue wrote: > > We will add in a number of compat strings to dsi-controller-main.yaml in > > the format "qcom,socname-dsi-ctrl" convert the currently unused > > qcom,dsi-ctrl-6g-qcm2290 to qcom,qcm2290-dsi-ctrl. > > > > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > > I'd say, as you are going to introduce new bindings using two compat > strings, just leave this binding as is, marking it as deprecated. But if it was unused, then it's okay to just change it. Rob
V4: - Moves the update of the example from patch #5 to patch #4 V3: - Moves declaration of mdss-dsi-ctrl into compat string declaration patch - Krzysztof, Dmitry - Renames qcm-2290 compat string to agreed compat "qcom,socname-dsi-ctrl" Dmirty, Krzysztof - Adds empty line after if clause in yaml control flow section - Dmirty - Adds Rb/Ack - Krzysztof, Dmitry, Doug, David - vdd* Looking into this some more, I don't believe vdd, vdda, vddio ought to be required properties. Its up to the PCB manufacturer and the panel in-use how that panel is powered. Powering the panel is not something that even necessarily needs to be done from the dsi-ctrl driver. Originally marking vdd* as required in the .txt was an error, its not a SoC level dtsi requirement. - clock-names Rather than replicate the clock-name in each if block I listed them with a specific description from a similar reference in usb/qcom,dwc3.yaml. https://lore.kernel.org/linux-arm-msm/eb80681f-2e0b-605f-0444-ec65562f74b8@linaro.org/ V2: https://www.spinics.net/lists/linux-arm-msm/msg116326.html - Moves the DSI PHY changes to a different later series. There are enough dsi-controller-main changes to justify its own standalone series. - The original phy-name binding change given discussion with Rob and Krzysztof became its own standalone series that has since been merged. https://www.mail-archive.com/dri-devel@lists.freedesktop.org/msg403214.html - Retains the drop of power-domain from yaml as a required property. I dug into the available dtsi. The apq8064 doesn't appear to have any GDSC which can be attached as a power-domain, which means the power-domain requirement is not universal across the various silicon versions. - Adds Dmitry's RB to power-domain drop - For the clock declarations I've * I noticed that the simple change I had worked for msm8939 but subsquently broke other dtsi which drove a bigger change to document the clocks on a per compatible basis. * Added compat strings in yaml. * Moved the allOf down later in the file to acomodate the if/then. * Number of clocks validated on a per compatible basis * The driver code which doesn't care about the number of clocks can still operate on the mdss-dsi-ctrl compat but the dts checks will validate against the compat string and yaml. - vdd descriptions Took the previous text I missed from the .txt file - Krzysztof, Dmitry Adds vdd, vdda and vddio to the required list. This exposes warnings in existing dtsi but the previous .txt declared these regulators as required. - Krzysztof V1: This series fixes up a number of dtbs checks which are being flagged adding in the msm8939 dtsi. When converting from .txt to .yaml a number of the parameters for the older msm8916 silicon were not transmitted into the yaml. Adding in the msm8939 which is a near 1:1 copy of the msm8916 in terms of dtsi triggers a rake of dtbs checks as a result. https://www.mail-archive.com/dri-devel@lists.freedesktop.org/msg403211.html Bryan O'Donoghue (18): dt-bindings: msm: dsi-controller-main: Fix operating-points-v2 constraint dt-bindings: msm: dsi-controller-main: Fix power-domain constraint dt-bindings: msm: dsi-controller-main: Rename qcom,dsi-ctrl-6g-qcm2290 to qcom,qcm2290-dsi-ctrl dt-bindings: msm: dsi-controller-main: Add compatible strings for every current SoC dt-bindings: msm: dsi-controller-main: Document clocks on a per compatible basis dt-bindings: msm: dsi-controller-main: Fix description of core clock dt-bindings: msm: dsi-controller-main: Fix clock declarations dt-bindings: msm: dsi-controller-main: Add vdd* descriptions back in ARM: dts: qcom: apq8064: add compat qcom,apq8064-dsi-ctrl ARM: dts: qcom: msm8974: Add compat qcom,msm8974-dsi-ctrl arm64: dts: qcom: msm8916: Add compat qcom,msm8916-dsi-ctrl arm64: dts: qcom: msm8996: Add compat qcom,msm8996-dsi-ctrl arm64: dts: qcom: sc7180: Add compat qcom,sc7180-dsi-ctrl arm64: dts: qcom: sc7280: Add compat qcom,sc7280-dsi-ctrl arm64: dts: qcom: sdm630: Add compat qcom,sdm630-dsi-ctrl arm64: dts: qcom: sdm660: Add compat qcom,sdm660-dsi-ctrl arm64: dts: qcom: sdm845: Add compat qcom,sdm845-dsi-ctrl arm64: dts: qcom: sm8250: Add compat qcom,sm8250-dsi-ctrl .../display/msm/dsi-controller-main.yaml | 205 ++++++++++++++++-- arch/arm/boot/dts/qcom-apq8064.dtsi | 3 +- arch/arm/boot/dts/qcom-msm8974.dtsi | 3 +- arch/arm64/boot/dts/qcom/msm8916.dtsi | 3 +- arch/arm64/boot/dts/qcom/msm8996.dtsi | 6 +- arch/arm64/boot/dts/qcom/sc7180.dtsi | 3 +- arch/arm64/boot/dts/qcom/sc7280.dtsi | 3 +- arch/arm64/boot/dts/qcom/sdm630.dtsi | 3 +- arch/arm64/boot/dts/qcom/sdm660.dtsi | 3 +- arch/arm64/boot/dts/qcom/sdm845.dtsi | 6 +- arch/arm64/boot/dts/qcom/sm8250.dtsi | 6 +- 11 files changed, 208 insertions(+), 36 deletions(-)