diff mbox series

[v2,01/10] dt-bindings: mfd: qcom,tcsr: Document msm8953 compatible

Message ID 20220220201909.445468-2-luca@z3ntu.xyz
State Accepted
Commit 2a6bacf79b3ae3616393e4b9a0fc623e269e506f
Headers show
Series Initial MSM8953 & Fairphone 3 support | expand

Commit Message

Luca Weiss Feb. 20, 2022, 8:18 p.m. UTC 
Document the compatible for tcsr found in msm8953.

Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
Acked-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Acked-by: Rob Herring <robh@kernel.org>
---
Changes in v2:
- no changes

 Documentation/devicetree/bindings/mfd/qcom,tcsr.txt | 1 +
 1 file changed, 1 insertion(+)

Comments

Lee Jones Feb. 21, 2022, 8:48 a.m. UTC | #1 
On Sun, 20 Feb 2022, Luca Weiss wrote:

> Document the compatible for tcsr found in msm8953.
> 
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> Acked-by: Konrad Dybcio <konrad.dybcio@somainline.org>
> Acked-by: Rob Herring <robh@kernel.org>
> ---
> Changes in v2:
> - no changes
> 
>  Documentation/devicetree/bindings/mfd/qcom,tcsr.txt | 1 +
>  1 file changed, 1 insertion(+)

This is already applied.
Luca Weiss Feb. 21, 2022, 9:01 p.m. UTC | #2 
Hi Lee,

On Montag, 21. Februar 2022 09:48:01 CET Lee Jones wrote:
> On Sun, 20 Feb 2022, Luca Weiss wrote:
> > Document the compatible for tcsr found in msm8953.
> > 
> > Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> > Acked-by: Konrad Dybcio <konrad.dybcio@somainline.org>
> > Acked-by: Rob Herring <robh@kernel.org>
> > ---
> > Changes in v2:
> > - no changes
> > 
> >  Documentation/devicetree/bindings/mfd/qcom,tcsr.txt | 1 +
> >  1 file changed, 1 insertion(+)
> 
> This is already applied.

Sorry, last week you wrote[0]

> Doesn't seem to apply.
>
> Could you please rebase.

and it wasn't part of linux-next as of yesterday.

I'll remember to drop it if I have to send a v3.

Regards
Luca

[0] https://lore.kernel.org/linux-arm-msm/YgujkzAezfFBNRDP@google.com/
Lee Jones Feb. 22, 2022, 7:53 a.m. UTC | #3 
On Mon, 21 Feb 2022, Luca Weiss wrote:

> Hi Lee,
> 
> On Montag, 21. Februar 2022 09:48:01 CET Lee Jones wrote:
> > On Sun, 20 Feb 2022, Luca Weiss wrote:
> > > Document the compatible for tcsr found in msm8953.
> > > 
> > > Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> > > Acked-by: Konrad Dybcio <konrad.dybcio@somainline.org>
> > > Acked-by: Rob Herring <robh@kernel.org>
> > > ---
> > > Changes in v2:
> > > - no changes
> > > 
> > >  Documentation/devicetree/bindings/mfd/qcom,tcsr.txt | 1 +
> > >  1 file changed, 1 insertion(+)
> > 
> > This is already applied.
> 
> Sorry, last week you wrote[0]
> 
> [0] https://lore.kernel.org/linux-arm-msm/YgujkzAezfFBNRDP@google.com/

Yes, that's strange.

I don't remember fixing that merge conflict.

Perhaps I did.  Must have been in a good mood. :)

> > Doesn't seem to apply.
> >
> > Could you please rebase.
> 
> and it wasn't part of linux-next as of yesterday.

Tree has been updated this morning.  Should be in -next tomorrow.
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/mfd/qcom,tcsr.txt b/Documentation/devicetree/bindings/mfd/qcom,tcsr.txt
index c5f4f0ddfcc3..add61bcc3c74 100644
--- a/Documentation/devicetree/bindings/mfd/qcom,tcsr.txt
+++ b/Documentation/devicetree/bindings/mfd/qcom,tcsr.txt
@@ -10,6 +10,7 @@  Required properties:
 		"qcom,tcsr-ipq8064", "syscon" for IPQ8064
 		"qcom,tcsr-apq8064", "syscon" for APQ8064
 		"qcom,tcsr-msm8660", "syscon" for MSM8660
+		"qcom,tcsr-msm8953", "syscon" for MSM8953
 		"qcom,tcsr-msm8960", "syscon" for MSM8960
 		"qcom,tcsr-msm8974", "syscon" for MSM8974
 		"qcom,tcsr-apq8084", "syscon" for APQ8084