From: Lee Jones <lee@kernel.org>
To: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Cc: Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Konrad Dybcio <konrad.dybcio@somainline.org>,
Ohad Ben-Cohen <ohad@wizery.com>,
Baolin Wang <baolin.wang@linux.alibaba.com>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Vinod Koul <vkoul@kernel.org>,
linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [RFT PATCH v2 02/17] dt-bindings: mfd: qcom,tcsr: add QCS404
Date: Thu, 8 Sep 2022 08:50:14 +0100 [thread overview]
Message-ID: <YxmetuNRIgDhutKv@google.com> (raw)
In-Reply-To: <20220817145901.865977-3-krzysztof.kozlowski@linaro.org>
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 [李琼斯]
next prev parent reply other threads:[~2022-09-08 7:50 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-17 14:58 [RFT PATCH v2 00/17] ARM/hwlock: qcom: switch TCSR mutex to MMIO Krzysztof Kozlowski
2022-08-17 14:58 ` [RFT PATCH v2 01/17] dt-bindings: mfd: qcom,tcsr: drop simple-mfd from IPQ6018 Krzysztof Kozlowski
2022-09-08 7:49 ` Lee Jones
2022-08-17 14:58 ` [RFT PATCH v2 02/17] dt-bindings: mfd: qcom,tcsr: add QCS404 Krzysztof Kozlowski
2022-09-08 7:50 ` Lee Jones [this message]
2022-09-08 8:15 ` Krzysztof Kozlowski
2022-09-08 15:35 ` Krzysztof Kozlowski
2022-09-09 7:19 ` Lee Jones
2022-09-09 7:17 ` Lee Jones
2022-08-17 14:58 ` [RFT PATCH v2 03/17] dt-bindings: hwlock: qcom-hwspinlock: add support for MMIO on older SoCs Krzysztof Kozlowski
2022-08-17 14:58 ` [RFT PATCH v2 04/17] dt-bindings: hwlock: qcom-hwspinlock: correct example indentation Krzysztof Kozlowski
2022-08-17 14:58 ` [RFT PATCH v2 05/17] hwspinlock: qcom: correct MMIO max register for newer SoCs Krzysztof Kozlowski
2022-08-17 14:58 ` [RFT PATCH v2 06/17] hwspinlock: qcom: add support for MMIO on older SoCs Krzysztof Kozlowski
2022-08-17 14:58 ` [RFT PATCH v2 07/17] arm64: dts: qcom: ipq6018: add missing TCSR syscon compatible Krzysztof Kozlowski
2022-08-17 14:58 ` [RFT PATCH v2 08/17] arm64: dts: qcom: msm8953: " Krzysztof Kozlowski
2022-08-17 14:58 ` [RFT PATCH v2 09/17] arm64: dts: qcom: qcs404: " Krzysztof Kozlowski
2022-08-17 14:58 ` [RFT PATCH v2 10/17] arm64: dts: qcom: msm8996: " Krzysztof Kozlowski
2022-08-17 14:58 ` [RFT PATCH v2 11/17] ARM: dts: qcom: msm8974: " Krzysztof Kozlowski
2022-08-17 14:58 ` [RFT PATCH v2 12/17] ARM: dts: qcom: msm8974: split TCSR halt regs out of mutex Krzysztof Kozlowski
2022-08-17 14:58 ` [RFT PATCH v2 13/17] arm64: dts: qcom: ipq6018: switch TCSR mutex to MMIO Krzysztof Kozlowski
2022-08-17 14:58 ` [RFT PATCH v2 14/17] arm64: dts: qcom: msm8994: " Krzysztof Kozlowski
2022-08-17 14:58 ` [RFT PATCH v2 15/17] ARM: dts: qcom: msm8974: " Krzysztof Kozlowski
2022-08-17 14:59 ` [RFT PATCH v2 16/17] ARM: dts: qcom: apq8084: " Krzysztof Kozlowski
2022-08-17 14:59 ` [RFT PATCH v2 17/17] ARM: dts: qcom: msm8226: " Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YxmetuNRIgDhutKv@google.com \
--to=lee@kernel.org \
--cc=agross@kernel.org \
--cc=baolin.wang@linux.alibaba.com \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=konrad.dybcio@somainline.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=ohad@wizery.com \
--cc=robh+dt@kernel.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox