| Message ID | 20220504125119.190526-1-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | spi: dt-bindings: qcom,spi-geni-qcom: allow three interconnects | expand |
On Wed, May 04, 2022 at 02:51:19PM +0200, Krzysztof Kozlowski wrote: > Recent Qualcomm Geni SPI nodes, e.g. on SM8450, come with three > interconnects. This fixes dtbs_check warnings like: This doesn't apply against current code, please check and resend.
On 04/05/2022 17:01, Mark Brown wrote: > On Wed, May 04, 2022 at 02:51:19PM +0200, Krzysztof Kozlowski wrote: >> Recent Qualcomm Geni SPI nodes, e.g. on SM8450, come with three >> interconnects. This fixes dtbs_check warnings like: > > This doesn't apply against current code, please check and resend. Thanks Mark, but as explained in commit below "---" - this is a fix for commit in Qualcomm/Bjorn tree. Could you ack it instead? Best regards, Krzysztof
On Wed, May 04, 2022 at 05:14:19PM +0200, Krzysztof Kozlowski wrote: > On 04/05/2022 17:01, Mark Brown wrote: > > On Wed, May 04, 2022 at 02:51:19PM +0200, Krzysztof Kozlowski wrote: > >> Recent Qualcomm Geni SPI nodes, e.g. on SM8450, come with three > >> interconnects. This fixes dtbs_check warnings like: > > This doesn't apply against current code, please check and resend. > Thanks Mark, but as explained in commit below "---" - this is a fix for > commit in Qualcomm/Bjorn tree. Could you ack it instead? I was expecting this to be a fix for some change in the DTs in the Qualcomm tree. Why is there a change to the SPI bindings in there? I don't seem to have reviewed it...
On Wed, May 04, 2022 at 02:51:19PM +0200, Krzysztof Kozlowski wrote: > Recent Qualcomm Geni SPI nodes, e.g. on SM8450, come with three > interconnects. This fixes dtbs_check warnings like: > > sm8450-qrd.dtb: geniqup@8c0000: spi@880000:interconnect-names: ['qup-core', 'qup-config'] is too short I'm confused. A length of 2 was already allowed before this change. > > Fixes: 5bdcae1fe1c5 ("spi: dt-bindings: qcom,spi-geni-qcom: convert to dtschema") > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > --- > > Fix for a commit in MSM/Bjorn's tree. > --- > .../devicetree/bindings/spi/qcom,spi-geni-qcom.yaml | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.yaml b/Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.yaml > index e2c7b934c50d..47e1b3ee8b1b 100644 > --- a/Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.yaml > +++ b/Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.yaml > @@ -45,12 +45,15 @@ properties: > - const: rx > > interconnects: > - maxItems: 2 > + minItems: 2 > + maxItems: 3 > > interconnect-names: > + minItems: 2 > items: > - const: qup-core > - const: qup-config > + - const: qup-memory > > interrupts: > maxItems: 1 > -- > 2.32.0 > >
On 04/05/2022 17:37, Rob Herring wrote: > On Wed, May 04, 2022 at 02:51:19PM +0200, Krzysztof Kozlowski wrote: >> Recent Qualcomm Geni SPI nodes, e.g. on SM8450, come with three >> interconnects. This fixes dtbs_check warnings like: >> >> sm8450-qrd.dtb: geniqup@8c0000: spi@880000:interconnect-names: ['qup-core', 'qup-config'] is too short > > I'm confused. A length of 2 was already allowed before this change. Me too... I think I copied that message not from original code, but from intermediary fix setting it to three elements. This was also wrong because some of nodes have two some three interconnects. The actual error is: arch/arm64/boot/dts/qcom/sm8450-qrd.dtb: spi@a98000: interconnects: [[46, 1, 0, 46, 4, 0], [47, 2, 0, 48, 12, 0], [49, 1, 0, 50, 1, 0]] is too long From schema: Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.yaml arch/arm64/boot/dts/qcom/sm8450-qrd.dtb: spi@a98000: interconnect-names: ['qup-core', 'qup-config', 'qup-memory'] is too long From schema: Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.yaml I will send a v2. Best regards, Krzysztof
On 04/05/2022 17:20, Mark Brown wrote: >> Thanks Mark, but as explained in commit below "---" - this is a fix for >> commit in Qualcomm/Bjorn tree. Could you ack it instead? > > I was expecting this to be a fix for some change in the DTs in the > Qualcomm tree. Why is there a change to the SPI bindings in there? I > don't seem to have reviewed it... I don't know, Mark. The confusion was not intended. The second patch in the set depended on SPI patch, so probably after three weeks Bjorn just took entire set. https://lore.kernel.org/all/20220404064017.68634-1-krzysztof.kozlowski@linaro.org/ Best regards, Krzysztof
On Thu, May 05, 2022 at 11:00:26AM +0200, Krzysztof Kozlowski wrote: > I don't know, Mark. The confusion was not intended. The second patch in > the set depended on SPI patch, so probably after three weeks Bjorn just > took entire set. > https://lore.kernel.org/all/20220404064017.68634-1-krzysztof.kozlowski@linaro.org/ Ah, so this was part of the pile where I was waiting for Bjorn to say if he was OK with adding him as a maintainer. Bjorn, please don't just apply patches without some sort of handshake when people are clearly around and replying to mail - it causes confusion like this :(
diff --git a/Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.yaml b/Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.yaml index e2c7b934c50d..47e1b3ee8b1b 100644 --- a/Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.yaml +++ b/Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.yaml @@ -45,12 +45,15 @@ properties: - const: rx interconnects: - maxItems: 2 + minItems: 2 + maxItems: 3 interconnect-names: + minItems: 2 items: - const: qup-core - const: qup-config + - const: qup-memory interrupts: maxItems: 1
Recent Qualcomm Geni SPI nodes, e.g. on SM8450, come with three interconnects. This fixes dtbs_check warnings like: sm8450-qrd.dtb: geniqup@8c0000: spi@880000:interconnect-names: ['qup-core', 'qup-config'] is too short Fixes: 5bdcae1fe1c5 ("spi: dt-bindings: qcom,spi-geni-qcom: convert to dtschema") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- Fix for a commit in MSM/Bjorn's tree. --- .../devicetree/bindings/spi/qcom,spi-geni-qcom.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)