Skip to content

Commit 9babf95

Browse files
committed
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
5 parents f9fca89 + b191fe3 + 8df6418 + ec8b557 + 328212d commit 9babf95

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1724
-362
lines changed

Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ This binding uses the common clock binding[1].
8686

8787
Required properties:
8888
- compatible: Should be one of:
89+
"fsl,imx8dxl-clk"
8990
"fsl,imx8qm-clk"
9091
"fsl,imx8qxp-clk"
9192
followed by "fsl,scu-clk"

Documentation/devicetree/bindings/clock/bitmain,bm1880-clk.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,4 @@ examples:
6161
#clock-cells = <1>;
6262
};
6363
64-
# Example UART controller node that consumes clock generated by the clock controller:
65-
- |
66-
uart0: serial@58018000 {
67-
compatible = "snps,dw-apb-uart";
68-
reg = <0x58018000 0x2000>;
69-
clocks = <&clk 45>, <&clk 46>;
70-
clock-names = "baudclk", "apb_pclk";
71-
interrupts = <0 9 4>;
72-
reg-shift = <2>;
73-
reg-io-width = <4>;
74-
};
75-
7664
...

Documentation/devicetree/bindings/clock/idt,versaclock5.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,4 @@ examples:
191191
};
192192
};
193193
194-
/* Consumer referencing the 5P49V5923 pin OUT1 */
195-
consumer {
196-
/* ... */
197-
clocks = <&vc5 1>;
198-
/* ... */
199-
};
200-
201194
...

Documentation/devicetree/bindings/clock/imx1-clock.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,3 @@ examples:
4040
compatible = "fsl,imx1-ccm";
4141
reg = <0x0021b000 0x1000>;
4242
};
43-
44-
pwm@208000 {
45-
#pwm-cells = <2>;
46-
compatible = "fsl,imx1-pwm";
47-
reg = <0x00208000 0x1000>;
48-
interrupts = <34>;
49-
clocks = <&clks IMX1_CLK_DUMMY>, <&clks IMX1_CLK_PER1>;
50-
clock-names = "ipg", "per";
51-
};

Documentation/devicetree/bindings/clock/imx21-clock.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,3 @@ examples:
4040
reg = <0x10027000 0x800>;
4141
#clock-cells = <1>;
4242
};
43-
44-
serial@1000a000 {
45-
compatible = "fsl,imx21-uart";
46-
reg = <0x1000a000 0x1000>;
47-
interrupts = <20>;
48-
clocks = <&clks IMX21_CLK_UART1_IPG_GATE>,
49-
<&clks IMX21_CLK_PER1>;
50-
clock-names = "ipg", "per";
51-
};

Documentation/devicetree/bindings/clock/imx23-clock.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,3 @@ examples:
8383
reg = <0x80040000 0x2000>;
8484
#clock-cells = <1>;
8585
};
86-
87-
serial@8006c000 {
88-
compatible = "fsl,imx23-auart";
89-
reg = <0x8006c000 0x2000>;
90-
interrupts = <24>;
91-
clocks = <&clks 32>;
92-
dmas = <&dma_apbx 6>, <&dma_apbx 7>;
93-
dma-names = "rx", "tx";
94-
};

Documentation/devicetree/bindings/clock/imx25-clock.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,3 @@ examples:
176176
interrupts = <31>;
177177
#clock-cells = <1>;
178178
};
179-
180-
serial@43f90000 {
181-
compatible = "fsl,imx25-uart", "fsl,imx21-uart";
182-
reg = <0x43f90000 0x4000>;
183-
interrupts = <45>;
184-
clocks = <&clks 79>, <&clks 50>;
185-
clock-names = "ipg", "per";
186-
};

Documentation/devicetree/bindings/clock/imx27-clock.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,3 @@ examples:
4444
interrupts = <31>;
4545
#clock-cells = <1>;
4646
};
47-
48-
serial@1000a000 {
49-
compatible = "fsl,imx27-uart", "fsl,imx21-uart";
50-
reg = <0x1000a000 0x1000>;
51-
interrupts = <20>;
52-
clocks = <&clks IMX27_CLK_UART1_IPG_GATE>,
53-
<&clks IMX27_CLK_PER1_GATE>;
54-
clock-names = "ipg", "per";
55-
};

Documentation/devicetree/bindings/clock/imx28-clock.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,3 @@ examples:
106106
reg = <0x80040000 0x2000>;
107107
#clock-cells = <1>;
108108
};
109-
110-
serial@8006a000 {
111-
compatible = "fsl,imx28-auart";
112-
reg = <0x8006a000 0x2000>;
113-
interrupts = <112>;
114-
dmas = <&dma_apbx 8>, <&dma_apbx 9>;
115-
dma-names = "rx", "tx";
116-
clocks = <&clks 45>;
117-
};

Documentation/devicetree/bindings/clock/imx31-clock.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,3 @@ examples:
110110
interrupts = <31>, <53>;
111111
#clock-cells = <1>;
112112
};
113-
114-
serial@43f90000 {
115-
compatible = "fsl,imx31-uart", "fsl,imx21-uart";
116-
reg = <0x43f90000 0x4000>;
117-
interrupts = <45>;
118-
clocks = <&clks 10>, <&clks 30>;
119-
clock-names = "ipg", "per";
120-
};

0 commit comments

Comments
 (0)