Commit 9babf952 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branches 'clk-mvebu', 'clk-const', 'clk-imx' and 'clk-rockchip' into clk-next

 - Mark mux table as const in clk-mux
 - Make the all_lists array const

* clk-mvebu:
  clk: mvebu: use time_is_before_eq_jiffies() instead of open coding it

* clk-const:
  clk: Mark clk_core_evict_parent_cache_subtree() 'target' const
  clk: Mark 'all_lists' as const
  clk: pistachio: Declare mux table as const u32[]
  clk: qcom: Declare mux table as const u32[]
  clk: mmp: Declare mux tables as const u32[]
  clk: hisilicon: Remove unnecessary cast of mux table to u32 *
  clk: mux: Declare u32 *table parameter as const
  clk: nxp: Declare mux table parameter as const u32 *
  clk: nxp: Remove unused variable

* clk-imx: (28 commits)
  dt-bindings: clock: drop useless consumer example
  clk: imx: Select MXC_CLK for i.MX93 clock driver
  clk: imx: remove redundant re-assignment of pll->base
  MAINTAINERS: clk: imx: add git tree and dt-bindings files
  clk: imx: pll14xx: Support dynamic rates
  clk: imx: pll14xx: Add pr_fmt
  clk: imx: pll14xx: explicitly return lowest rate
  clk: imx: pll14xx: name variables after usage
  clk: imx: pll14xx: consolidate rate calculation
  clk: imx: pll14xx: Use FIELD_GET/FIELD_PREP
  clk: imx: pll14xx: Drop wrong shifting
  clk: imx: pll14xx: Use register defines consistently
  clk: imx8mp: remove SYS PLL 1/2 clock gates
  clk: imx8mn: remove SYS PLL 1/2 clock gates
  clk: imx8mm: remove SYS PLL 1/2 clock gates
  clk: imx: add i.MX93 clk
  clk: imx: support fracn gppll
  clk: imx: add i.MX93 composite clk
  dt-bindings: clock: add i.MX93 clock definition
  dt-bindings: clock: Add imx93 clock support
  ...

* clk-rockchip:
  clk: rockchip: re-add rational best approximation algorithm to the fractional divider
  clk/rockchip: Use of_device_get_match_data()
  clk: rockchip: Add CLK_SET_RATE_PARENT to the HDMI reference clock on rk3568
  clk: rockchip: drop CLK_SET_RATE_PARENT from dclk_vop* on rk3568
  clk: rockchip: Add more PLL rates for rk3568
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ This binding uses the common clock binding[1].

Required properties:
- compatible:		Should be one of:
			  "fsl,imx8dxl-clk"
			  "fsl,imx8qm-clk"
			  "fsl,imx8qxp-clk"
			followed by "fsl,scu-clk"
+0 −12
Original line number Diff line number Diff line
@@ -61,16 +61,4 @@ examples:
        #clock-cells = <1>;
    };

  # Example UART controller node that consumes clock generated by the clock controller:
  - |
    uart0: serial@58018000 {
         compatible = "snps,dw-apb-uart";
         reg = <0x58018000 0x2000>;
         clocks = <&clk 45>, <&clk 46>;
         clock-names = "baudclk", "apb_pclk";
         interrupts = <0 9 4>;
         reg-shift = <2>;
         reg-io-width = <4>;
    };

...
+0 −7
Original line number Diff line number Diff line
@@ -191,11 +191,4 @@ examples:
        };
    };

    /* Consumer referencing the 5P49V5923 pin OUT1 */
    consumer {
        /* ... */
        clocks = <&vc5 1>;
        /* ... */
    };

...
+0 −9
Original line number Diff line number Diff line
@@ -40,12 +40,3 @@ examples:
        compatible = "fsl,imx1-ccm";
        reg = <0x0021b000 0x1000>;
    };

    pwm@208000 {
        #pwm-cells = <2>;
        compatible = "fsl,imx1-pwm";
        reg = <0x00208000 0x1000>;
        interrupts = <34>;
        clocks = <&clks IMX1_CLK_DUMMY>, <&clks IMX1_CLK_PER1>;
        clock-names = "ipg", "per";
    };
+0 −9
Original line number Diff line number Diff line
@@ -40,12 +40,3 @@ examples:
        reg = <0x10027000 0x800>;
        #clock-cells = <1>;
    };

    serial@1000a000 {
        compatible = "fsl,imx21-uart";
        reg = <0x1000a000 0x1000>;
        interrupts = <20>;
        clocks = <&clks IMX21_CLK_UART1_IPG_GATE>,
                 <&clks IMX21_CLK_PER1>;
        clock-names = "ipg", "per";
    };
Loading