Re: [RFT PATCH v2 02/17] dt-bindings: mfd: qcom,tcsr: add QCS404

Lee Jones
2022-09-08T07:50:27Z

On Wed, 17 Aug 2022, Krzysztof Kozlowski wrote:

> Document new QCS404 TCSR compatible.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
> Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml | 1 +
> 1 file changed, 1 insertion(+)

Merge conflict. Please rebase.

> diff --git a/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml b/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
> index 5d7f4ac21a8d..87b173ad9710 100644
> --- a/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
> +++ b/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
> @@ -18,6 +18,7 @@ properties:
> items:
> - enum:
> - qcom,msm8998-tcsr
> + - qcom,qcs404-tcsr
> - qcom,sc7180-tcsr
> - qcom,sc7280-tcsr
> - qcom,sdm845-tcsr

--
Lee Jones [李琼斯]