Unverified Commit 64c21f25 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-fixes' into clk-next 

Resolve conflicts with i.MX95 changes 88768d6f ("clk:
imx95-blk-ctl: Rename lvds and displaymix csr blk") in clk-imx
and aacc875a ("clk: imx: Fix an out-of-bounds access in
dispmix_csr_clk_dev_data") in clk-fixes.

* clk-fixes:
  clk: sunxi-ng: v3s: Fix TCON clock parents
  clk: sunxi-ng: v3s: Fix CSI1 MCLK clock name
  clk: sunxi-ng: v3s: Fix CSI SCLK clock name
  dt-bindings: clock: mediatek: Add #reset-cells property for MT8188
  clk: imx: Fix an out-of-bounds access in dispmix_csr_clk_dev_data
  clk: scmi: Handle case where child clocks are initialized before their parents
  clk: sunxi-ng: a523: Mark MBUS clock as critical
parents 3cf186ec e4b2a0c2

Documentation/devicetree/bindings/clock/mediatek,mt8188-clock.yaml

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ properties: 
  '#clock-cells':

    const: 1



  '#reset-cells':

    const: 1



required:

  - compatible

  - reg

Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ examples: 
        reg = <0x01cb4000 0x1000>;

        interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&ccu CLK_BUS_CSI>,

                 <&ccu CLK_CSI1_SCLK>,

                 <&ccu CLK_CSI_SCLK>,

                 <&ccu CLK_DRAM_CSI>;

        clock-names = "bus",

                      "mod",

Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ examples: 
        reg = <0x01cb8000 0x1000>;

        interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&ccu CLK_BUS_CSI>,

             <&ccu CLK_CSI1_SCLK>,

             <&ccu CLK_CSI_SCLK>,

             <&ccu CLK_DRAM_CSI>;

        clock-names = "bus", "mod", "ram";

        resets = <&ccu RST_BUS_CSI>;

Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ examples: 
        reg = <0x01cb1000 0x1000>;

        interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&ccu CLK_BUS_CSI>,

                 <&ccu CLK_CSI1_SCLK>;

                 <&ccu CLK_CSI_SCLK>;

        clock-names = "bus", "mod";

        resets = <&ccu RST_BUS_CSI>;

arch/arm/boot/dts/allwinner/sun8i-v3s.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ csi1: camera@1cb4000 { 
			reg = <0x01cb4000 0x3000>;

			interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_CSI>,

				 <&ccu CLK_CSI1_SCLK>,

				 <&ccu CLK_CSI_SCLK>,

				 <&ccu CLK_DRAM_CSI>;

			clock-names = "bus", "mod", "ram";

			resets = <&ccu RST_BUS_CSI>;