The APR bindings were not describing properly children nodes for DAIs.
None of the DTSes use unit addresses for the children, so correct the
nodes and reference their schema: clock-controller, dais and routing.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20220910091428.50418-10-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
3 = AMDB Service.
4 = Voice processing manager.
3 = AMDB Service.
4 = Voice processing manager.
+ clock-controller:
+ $ref: /schemas/sound/qcom,q6dsp-lpass-clocks.yaml#
+ description: Qualcomm DSP LPASS clock controller
+ unevaluatedProperties: false
+
+ dais:
+ # TODO: Waiting for Documentation/devicetree/bindings/sound/qcom,q6asm.txt
+ type: object
+ description: Qualcomm DSP audio ports
+
+ routing:
+ # TODO: Waiting for Documentation/devicetree/bindings/sound/qcom,q6adm.txt
+ type: object
+ description: Qualcomm DSP LPASS audio routing
+
qcom,protection-domain:
$ref: /schemas/types.yaml#/definitions/string-array
description: protection domain service name and path for apr service
qcom,protection-domain:
$ref: /schemas/types.yaml#/definitions/string-array
description: protection domain service name and path for apr service
"tms/servreg", "msm/modem/wlan_pd".
"tms/servreg", "msm/slpi/sensor_pd".
"tms/servreg", "msm/modem/wlan_pd".
"tms/servreg", "msm/slpi/sensor_pd".
- '#address-cells':
- const: 1
-
- '#size-cells':
- const: 0
-
- patternProperties:
- "^.*@[0-9a-f]+$":
- type: object
- description:
- Service based devices like clock controllers or digital audio interfaces.
+ allOf:
+ - if:
+ properties:
+ compatible:
+ enum:
+ - qcom,q6afe
+ then:
+ properties:
+ dais:
+ properties:
+ compatible:
+ const: qcom,q6afe-dais
+
+ - if:
+ properties:
+ compatible:
+ enum:
+ - qcom,q6apm
+ then:
+ properties:
+ dais:
+ properties:
+ compatible:
+ enum:
+ - qcom,q6apm-dais
+ - qcom,q6apm-lpass-dais
+
+ - if:
+ properties:
+ compatible:
+ enum:
+ - qcom,q6asm
+ then:
+ properties:
+ dais:
+ properties:
+ compatible:
+ const: qcom,q6asm-dais
additionalProperties: false
additionalProperties: false
compatible:
const: qcom,q6apm-dais
compatible:
const: qcom,q6apm-dais
iommus:
maxItems: 1
required:
- compatible
- iommus
iommus:
maxItems: 1
required:
- compatible
- iommus
additionalProperties: false
additionalProperties: false
compatible = "qcom,q6apm";
reg = <1>;
compatible = "qcom,q6apm";
reg = <1>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- apm-dai@1 {
compatible = "qcom,q6apm-dais";
iommus = <&apps_smmu 0x1801 0x0>;
compatible = "qcom,q6apm-dais";
iommus = <&apps_smmu 0x1801 0x0>;
- qcom,q6afe-clocks
- qcom,q6prm-lpass-clocks
- qcom,q6afe-clocks
- qcom,q6prm-lpass-clocks
'#clock-cells':
const: 2
description:
'#clock-cells':
const: 2
description:
- "#clock-cells"
additionalProperties: false
- "#clock-cells"
additionalProperties: false
#size-cells = <0>;
apr-service@4 {
reg = <APR_SVC_AFE>;
#size-cells = <0>;
apr-service@4 {
reg = <APR_SVC_AFE>;
- #address-cells = <1>;
- #size-cells = <0>;
- clock-controller@2 {
compatible = "qcom,q6afe-clocks";
compatible = "qcom,q6afe-clocks";
#clock-cells = <2>;
};
};
#clock-cells = <2>;
};
};
service@2 {
reg = <GPR_PRM_MODULE_IID>;
compatible = "qcom,q6prm";
service@2 {
reg = <GPR_PRM_MODULE_IID>;
compatible = "qcom,q6prm";
- #address-cells = <1>;
- #size-cells = <0>;
- clock-controller@2 {
compatible = "qcom,q6prm-lpass-clocks";
compatible = "qcom,q6prm-lpass-clocks";
#clock-cells = <2>;
};
};
#clock-cells = <2>;
};
};
- qcom,q6afe-dais
- qcom,q6apm-lpass-dais
- qcom,q6afe-dais
- qcom,q6apm-lpass-dais
'#sound-dai-cells':
const: 1
'#sound-dai-cells':
const: 1
- "#sound-dai-cells"
- "#address-cells"
- "#size-cells"
- "#sound-dai-cells"
- "#address-cells"
- "#size-cells"
#size-cells = <0>;
apr-service@4 {
reg = <APR_SVC_AFE>;
#size-cells = <0>;
apr-service@4 {
reg = <APR_SVC_AFE>;
- #address-cells = <1>;
- #size-cells = <0>;
- q6afedai@1 {
compatible = "qcom,q6afe-dais";
compatible = "qcom,q6afe-dais";
#address-cells = <1>;
#size-cells = <0>;
#sound-dai-cells = <1>;
#address-cells = <1>;
#size-cells = <0>;
#sound-dai-cells = <1>;
service@1 {
compatible = "qcom,q6apm";
reg = <GPR_APM_MODULE_IID>;
service@1 {
compatible = "qcom,q6apm";
reg = <GPR_APM_MODULE_IID>;
- #address-cells = <1>;
- #size-cells = <0>;
- q6apmdai@1 {
compatible = "qcom,q6apm-lpass-dais";
compatible = "qcom,q6apm-lpass-dais";
#address-cells = <1>;
#size-cells = <0>;
#sound-dai-cells = <1>;
#address-cells = <1>;
#size-cells = <0>;
#sound-dai-cells = <1>;