lkml.org 
[lkml]   [2022]   [Sep]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [RFT PATCH v2 02/17] dt-bindings: mfd: qcom,tcsr: add QCS404
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 [李琼斯]

\
 
 \ /
  Last update: 2022-09-08 09:51    [W:0.118 / U:0.480 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site