diff mbox series

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

Message ID 20220817145901.865977-3-krzysztof.kozlowski@linaro.org
State New
Headers show
Series ARM/hwlock: qcom: switch TCSR mutex to MMIO | expand

Commit Message

Krzysztof Kozlowski Aug. 17, 2022, 2:58 p.m. UTC
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(+)

Comments

Krzysztof Kozlowski Sept. 8, 2022, 8:15 a.m. UTC | #1
On 08/09/2022 09:50, Lee Jones wrote:
> 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.

I will rebase. Can you check if you pushed your tree? I see updates 3
weeks ago here:
https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/


Best regards,
Krzysztof
Lee Jones Sept. 9, 2022, 7:17 a.m. UTC | #2
On Thu, 08 Sep 2022, Krzysztof Kozlowski wrote:

> On 08/09/2022 09:50, Lee Jones wrote:
> > 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.
> 
> I will rebase. Can you check if you pushed your tree? I see updates 3
> weeks ago here:
> https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/

This week's updates now pushed.
Lee Jones Sept. 9, 2022, 7:19 a.m. UTC | #3
On Thu, 08 Sep 2022, Krzysztof Kozlowski wrote:

> On 08/09/2022 10:15, Krzysztof Kozlowski wrote:
> > On 08/09/2022 09:50, Lee Jones wrote:
> >> 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.
> > 
> > I will rebase. Can you check if you pushed your tree? I see updates 3
> > weeks ago here:
> > https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/
> 
> It seems latest next also has your old tree from Aug 15, so on what
> exactly I should rebase?

That was my last day.

Only updates since Monday needed pushing - now complete.
diff mbox series

Patch

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