On 10.12.2022 12:57, Krzysztof Kozlowski wrote:
> The SoC node is a simple-bus and its schema expect to have nodes only
> with unit addresses:
>
> sdm850-lenovo-yoga-c630.dtb: soc@0: opp-table-qup: {'compatible': ['operating-points-v2'], 'phandle': [[60]], 'opp-50000000':
> ... 'required-opps': [[55]]}} should not be valid under {'type': 'object'}
>
> Move to top-level OPP tables:
> - DSI and QUP which are shared between multiple nodes,
> - QSPI which cannot be placed in its node due to address/size cells.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Konrad
> arch/arm64/boot/dts/qcom/sdm845.dtsi | 154 +++++++++++++--------------
> 1 file changed, 77 insertions(+), 77 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> index a63dbd12230f..573b2394e63f 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> @@ -696,6 +696,83 @@ cpu4_opp32: opp-2803200000 {
> };
> };
>
> + dsi_opp_table: opp-table-dsi {
> + compatible = "operating-points-v2";
> +
> + opp-19200000 {
> + opp-hz = /bits/ 64 <19200000>;
> + required-opps = <&rpmhpd_opp_min_svs>;
> + };
> +
> + opp-180000000 {
> + opp-hz = /bits/ 64 <180000000>;
> + required-opps = <&rpmhpd_opp_low_svs>;
> + };
> +
> + opp-275000000 {
> + opp-hz = /bits/ 64 <275000000>;
> + required-opps = <&rpmhpd_opp_svs>;
> + };
> +
> + opp-328580000 {
> + opp-hz = /bits/ 64 <328580000>;
> + required-opps = <&rpmhpd_opp_svs_l1>;
> + };
> +
> + opp-358000000 {
> + opp-hz = /bits/ 64 <358000000>;
> + required-opps = <&rpmhpd_opp_nom>;
> + };
> + };
> +
> + qspi_opp_table: opp-table-qspi {
> + compatible = "operating-points-v2";
> +
> + opp-19200000 {
> + opp-hz = /bits/ 64 <19200000>;
> + required-opps = <&rpmhpd_opp_min_svs>;
> + };
> +
> + opp-100000000 {
> + opp-hz = /bits/ 64 <100000000>;
> + required-opps = <&rpmhpd_opp_low_svs>;
> + };
> +
> + opp-150000000 {
> + opp-hz = /bits/ 64 <150000000>;
> + required-opps = <&rpmhpd_opp_svs>;
> + };
> +
> + opp-300000000 {
> + opp-hz = /bits/ 64 <300000000>;
> + required-opps = <&rpmhpd_opp_nom>;
> + };
> + };
> +
> + qup_opp_table: opp-table-qup {
> + compatible = "operating-points-v2";
> +
> + opp-50000000 {
> + opp-hz = /bits/ 64 <50000000>;
> + required-opps = <&rpmhpd_opp_min_svs>;
> + };
> +
> + opp-75000000 {
> + opp-hz = /bits/ 64 <75000000>;
> + required-opps = <&rpmhpd_opp_low_svs>;
> + };
> +
> + opp-100000000 {
> + opp-hz = /bits/ 64 <100000000>;
> + required-opps = <&rpmhpd_opp_svs>;
> + };
> +
> + opp-128000000 {
> + opp-hz = /bits/ 64 <128000000>;
> + required-opps = <&rpmhpd_opp_nom>;
> + };
> + };
> +
> pmu {
> compatible = "arm,armv8-pmuv3";
> interrupts = <GIC_PPI 5 IRQ_TYPE_LEVEL_HIGH>;
> @@ -1125,30 +1202,6 @@ rng: rng@793000 {
> clock-names = "core";
> };
>
> - qup_opp_table: opp-table-qup {
> - compatible = "operating-points-v2";
> -
> - opp-50000000 {
> - opp-hz = /bits/ 64 <50000000>;
> - required-opps = <&rpmhpd_opp_min_svs>;
> - };
> -
> - opp-75000000 {
> - opp-hz = /bits/ 64 <75000000>;
> - required-opps = <&rpmhpd_opp_low_svs>;
> - };
> -
> - opp-100000000 {
> - opp-hz = /bits/ 64 <100000000>;
> - required-opps = <&rpmhpd_opp_svs>;
> - };
> -
> - opp-128000000 {
> - opp-hz = /bits/ 64 <128000000>;
> - required-opps = <&rpmhpd_opp_nom>;
> - };
> - };
> -
> gpi_dma0: dma-controller@800000 {
> #dma-cells = <3>;
> compatible = "qcom,sdm845-gpi-dma";
> @@ -3807,30 +3860,6 @@ opp-201500000 {
> };
> };
>
> - qspi_opp_table: opp-table-qspi {
> - compatible = "operating-points-v2";
> -
> - opp-19200000 {
> - opp-hz = /bits/ 64 <19200000>;
> - required-opps = <&rpmhpd_opp_min_svs>;
> - };
> -
> - opp-100000000 {
> - opp-hz = /bits/ 64 <100000000>;
> - required-opps = <&rpmhpd_opp_low_svs>;
> - };
> -
> - opp-150000000 {
> - opp-hz = /bits/ 64 <150000000>;
> - required-opps = <&rpmhpd_opp_svs>;
> - };
> -
> - opp-300000000 {
> - opp-hz = /bits/ 64 <300000000>;
> - required-opps = <&rpmhpd_opp_nom>;
> - };
> - };
> -
> qspi: spi@88df000 {
> compatible = "qcom,sdm845-qspi", "qcom,qspi-v1";
> reg = <0 0x088df000 0 0x600>;
> @@ -4428,35 +4457,6 @@ clock_camcc: clock-controller@ad00000 {
> clock-names = "bi_tcxo";
> };
>
> - dsi_opp_table: opp-table-dsi {
> - compatible = "operating-points-v2";
> -
> - opp-19200000 {
> - opp-hz = /bits/ 64 <19200000>;
> - required-opps = <&rpmhpd_opp_min_svs>;
> - };
> -
> - opp-180000000 {
> - opp-hz = /bits/ 64 <180000000>;
> - required-opps = <&rpmhpd_opp_low_svs>;
> - };
> -
> - opp-275000000 {
> - opp-hz = /bits/ 64 <275000000>;
> - required-opps = <&rpmhpd_opp_svs>;
> - };
> -
> - opp-328580000 {
> - opp-hz = /bits/ 64 <328580000>;
> - required-opps = <&rpmhpd_opp_svs_l1>;
> - };
> -
> - opp-358000000 {
> - opp-hz = /bits/ 64 <358000000>;
> - required-opps = <&rpmhpd_opp_nom>;
> - };
> - };
> -
> mdss: mdss@ae00000 {
> compatible = "qcom,sdm845-mdss";
> reg = <0 0x0ae00000 0 0x1000>;
