ARM: dts: exynos: move exynos-bus nodes out of soc in Exynos5420
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Wed, 25 Jan 2023 09:45:06 +0000 (10:45 +0100)
committerKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Sun, 29 Jan 2023 10:32:32 +0000 (11:32 +0100)
The soc node is supposed to have only device nodes with MMIO addresses,
as reported by dtc W=1:

  arch/arm/boot/dts/exynos5420.dtsi:1070.24-1075.5:
    Warning (simple_bus_reg): /soc/bus-wcore: missing or empty reg/ranges property

and dtbs_check:

  exynos5420-arndale-octa.dtb: soc: bus-wcore:
    {'compatible': ['samsung,exynos-bus'], 'clocks': [[2, 769]], 'clock-names': ['bus'], 'status': ['disabled']} should not be valid under {'type': 'object'}

Move the bus nodes and their OPP tables out of SoC to fix this.
Re-order them alphabetically while moving and put some of the OPP tables
in device nodes (if they are not shared).

Link: https://lore.kernel.org/r/20230125094513.155063-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
arch/arm/boot/dts/exynos5420.dtsi

index b1051a7..13d7be2 100644 (file)
                spi2 = &spi_2;
        };
 
+       bus_disp1: bus-disp1 {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DOUT_ACLK400_DISP1>;
+               clock-names = "bus";
+               status = "disabled";
+       };
+
+       bus_disp1_fimd: bus-disp1-fimd {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DOUT_ACLK300_DISP1>;
+               clock-names = "bus";
+               status = "disabled";
+       };
+
+       bus_fsys: bus-fsys {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DOUT_ACLK200_FSYS>;
+               clock-names = "bus";
+               status = "disabled";
+       };
+
+       bus_fsys2: bus-fsys2 {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DOUT_ACLK200_FSYS2>;
+               clock-names = "bus";
+               status = "disabled";
+       };
+
+       bus_fsys_apb: bus-fsys-apb {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DOUT_PCLK200_FSYS>;
+               clock-names = "bus";
+               status = "disabled";
+       };
+
+       bus_g2d: bus-g2d {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DOUT_ACLK333_G2D>;
+               clock-names = "bus";
+               status = "disabled";
+       };
+
+       bus_g2d_acp: bus-g2d-acp {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DOUT_ACLK266_G2D>;
+               clock-names = "bus";
+               status = "disabled";
+       };
+       bus_gen: bus-gen {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DOUT_ACLK266>;
+               clock-names = "bus";
+               status = "disabled";
+       };
+
+       bus_gscl_scaler: bus-gscl-scaler {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DOUT_ACLK300_GSCL>;
+               clock-names = "bus";
+               status = "disabled";
+       };
+
+       bus_jpeg: bus-jpeg {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DOUT_ACLK300_JPEG>;
+               clock-names = "bus";
+               status = "disabled";
+       };
+
+       bus_jpeg_apb: bus-jpeg-apb {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DOUT_ACLK166>;
+               clock-names = "bus";
+               status = "disabled";
+       };
+
+       bus_mfc: bus-mfc {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DOUT_ACLK333>;
+               clock-names = "bus";
+               status = "disabled";
+       };
+
+       bus_mscl: bus-mscl {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DOUT_ACLK400_MSCL>;
+               clock-names = "bus";
+               status = "disabled";
+       };
+
+       bus_noc: bus-noc {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DOUT_ACLK100_NOC>;
+               clock-names = "bus";
+               status = "disabled";
+       };
+
+       bus_peri: bus-peri {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DOUT_ACLK66>;
+               clock-names = "bus";
+               status = "disabled";
+       };
+
+       bus_wcore: bus-wcore {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DOUT_ACLK400_WCORE>;
+               clock-names = "bus";
+               status = "disabled";
+       };
+
        /*
         * The 'cpus' node is not present here but instead it is provided
         * by exynos5420-cpus.dtsi or exynos5422-cpus.dtsi.
                        power-domains = <&disp_pd>;
                        #iommu-cells = <0>;
                };
-
-               bus_wcore: bus-wcore {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DOUT_ACLK400_WCORE>;
-                       clock-names = "bus";
-                       status = "disabled";
-               };
-
-               bus_noc: bus-noc {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DOUT_ACLK100_NOC>;
-                       clock-names = "bus";
-                       status = "disabled";
-               };
-
-               bus_fsys_apb: bus-fsys-apb {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DOUT_PCLK200_FSYS>;
-                       clock-names = "bus";
-                       status = "disabled";
-               };
-
-               bus_fsys: bus-fsys {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DOUT_ACLK200_FSYS>;
-                       clock-names = "bus";
-                       status = "disabled";
-               };
-
-               bus_fsys2: bus-fsys2 {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DOUT_ACLK200_FSYS2>;
-                       clock-names = "bus";
-                       status = "disabled";
-               };
-
-               bus_mfc: bus-mfc {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DOUT_ACLK333>;
-                       clock-names = "bus";
-                       status = "disabled";
-               };
-
-               bus_gen: bus-gen {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DOUT_ACLK266>;
-                       clock-names = "bus";
-                       status = "disabled";
-               };
-
-               bus_peri: bus-peri {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DOUT_ACLK66>;
-                       clock-names = "bus";
-                       status = "disabled";
-               };
-
-               bus_g2d: bus-g2d {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DOUT_ACLK333_G2D>;
-                       clock-names = "bus";
-                       status = "disabled";
-               };
-
-               bus_g2d_acp: bus-g2d-acp {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DOUT_ACLK266_G2D>;
-                       clock-names = "bus";
-                       status = "disabled";
-               };
-
-               bus_jpeg: bus-jpeg {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DOUT_ACLK300_JPEG>;
-                       clock-names = "bus";
-                       status = "disabled";
-               };
-
-               bus_jpeg_apb: bus-jpeg-apb {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DOUT_ACLK166>;
-                       clock-names = "bus";
-                       status = "disabled";
-               };
-
-               bus_disp1_fimd: bus-disp1-fimd {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DOUT_ACLK300_DISP1>;
-                       clock-names = "bus";
-                       status = "disabled";
-               };
-
-               bus_disp1: bus-disp1 {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DOUT_ACLK400_DISP1>;
-                       clock-names = "bus";
-                       status = "disabled";
-               };
-
-               bus_gscl_scaler: bus-gscl-scaler {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DOUT_ACLK300_GSCL>;
-                       clock-names = "bus";
-                       status = "disabled";
-               };
-
-               bus_mscl: bus-mscl {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DOUT_ACLK400_MSCL>;
-                       clock-names = "bus";
-                       status = "disabled";
-               };
        };
 
        thermal-zones {