On some newer SoCs, the interconnect between IPA and SoC internal
memory (imem) is not used. Update the binding to indicate that
having just the memory and config interconnects is another allowed
configuration.
Signed-off-by: Alex Elder <[email protected]>
---
Rob, Bjorn, Andy:
This was posted as part of a small series once before, and accepted
into the net-next/master branch by David Miller:
https://lore.kernel.org/netdev/[email protected]/
That series got reverted yesterday:
https://lore.kernel.org/netdev/[email protected]/
Now I'm posting this patch again (by itself, and a little different
this time based on input from Rob) so that this patch can be taken
through the Qualcomm repository. I will be posting other updates to
DTS files in a separate series shortly.
I didn't copy networking addressees this time...
-Alex
.../devicetree/bindings/net/qcom,ipa.yaml | 24 ++++++++++++-------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/qcom,ipa.yaml b/Documentation/devicetree/bindings/net/qcom,ipa.yaml
index ed88ba4b94df5..b8a0b392b24ea 100644
--- a/Documentation/devicetree/bindings/net/qcom,ipa.yaml
+++ b/Documentation/devicetree/bindings/net/qcom,ipa.yaml
@@ -87,16 +87,24 @@ properties:
- const: ipa-setup-ready
interconnects:
- items:
- - description: Interconnect path between IPA and main memory
- - description: Interconnect path between IPA and internal memory
- - description: Interconnect path between IPA and the AP subsystem
+ oneOf:
+ - items:
+ - description: Path leading to system memory
+ - description: Path between the AP and IPA config space
+ - items:
+ - description: Path leading to system memory
+ - description: Path leading to internal memory
+ - description: Path between the AP and IPA config space
interconnect-names:
- items:
- - const: memory
- - const: imem
- - const: config
+ oneOf:
+ - items:
+ - const: memory
+ - const: config
+ - items:
+ - const: memory
+ - const: imem
+ - const: config
qcom,smem-states:
$ref: /schemas/types.yaml#/definitions/phandle-array
--
2.27.0
On 8/4/21 8:13 AM, Alex Elder wrote:
> On some newer SoCs, the interconnect between IPA and SoC internal
> memory (imem) is not used. Update the binding to indicate that
> having just the memory and config interconnects is another allowed
> configuration.
>
> Signed-off-by: Alex Elder <[email protected]>
And now I realize I mistakenly based this on net-next/master
rather than linux-next/master. I think I need to wait another
day or so before I can apply this to the right branch.
Sorry about that. Please ignore/retract this, I'll send
again when I can, and will call the update "v2".
-Alex
> ---
> Rob, Bjorn, Andy:
>
> This was posted as part of a small series once before, and accepted
> into the net-next/master branch by David Miller:
> https://lore.kernel.org/netdev/[email protected]/
>
> That series got reverted yesterday:
> https://lore.kernel.org/netdev/[email protected]/
>
> Now I'm posting this patch again (by itself, and a little different
> this time based on input from Rob) so that this patch can be taken
> through the Qualcomm repository. I will be posting other updates to
> DTS files in a separate series shortly.
>
> I didn't copy networking addressees this time...
>
> -Alex
>
> .../devicetree/bindings/net/qcom,ipa.yaml | 24 ++++++++++++-------
> 1 file changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/net/qcom,ipa.yaml b/Documentation/devicetree/bindings/net/qcom,ipa.yaml
> index ed88ba4b94df5..b8a0b392b24ea 100644
> --- a/Documentation/devicetree/bindings/net/qcom,ipa.yaml
> +++ b/Documentation/devicetree/bindings/net/qcom,ipa.yaml
> @@ -87,16 +87,24 @@ properties:
> - const: ipa-setup-ready
>
> interconnects:
> - items:
> - - description: Interconnect path between IPA and main memory
> - - description: Interconnect path between IPA and internal memory
> - - description: Interconnect path between IPA and the AP subsystem
> + oneOf:
> + - items:
> + - description: Path leading to system memory
> + - description: Path between the AP and IPA config space
> + - items:
> + - description: Path leading to system memory
> + - description: Path leading to internal memory
> + - description: Path between the AP and IPA config space
>
> interconnect-names:
> - items:
> - - const: memory
> - - const: imem
> - - const: config
> + oneOf:
> + - items:
> + - const: memory
> + - const: config
> + - items:
> + - const: memory
> + - const: imem
> + - const: config
>
> qcom,smem-states:
> $ref: /schemas/types.yaml#/definitions/phandle-array
>