Skip to content

Commit 60950df

Browse files
committed
Merge branches 'clk-microchip', 'clk-allwinner', 'clk-mediatek', 'clk-imx' and 'clk-core' into clk-next
- Various cleanups and improvements to Mediatek clk drivers to reduce code size and modernize the drivers - Support for Mediatek MT7891 SoC clks * clk-microchip: clk: at91: do not compile dt-compat.c for sama7g5 and sam9x60 clk: at91: mark ddr clocks as critical * clk-allwinner: clk: sunxi-ng: d1: Add CAN bus gates and resets dt-bindings: clock: Add D1 CAN bus gates and resets clk: sunxi-ng: d1: Mark cpux clock as critical clk: sunxi-ng: d1: Allow building for R528/T113 clk: sunxi-ng: Move SoC driver conditions to dependencies clk: sunxi-ng: Remove duplicate ARCH_SUNXI dependencies clk: sunxi-ng: Avoid computing the rate twice clk: sunxi-ng: h3/h5: Model H3 CLK_DRAM as a fixed clock clk: sunxi-ng: fix ccu_mmc_timing.c kernel-doc issues * clk-mediatek: (29 commits) clk: mediatek: clk-mtk: Remove unneeded semicolon clk: mediatek: remove MT8195 vppsys/0/1 simple_probe dt-bindings: arm: mediatek: migrate MT8195 vppsys0/1 to mtk-mmsys driver clk: mediatek: add MT7981 clock support dt-bindings: clock: mediatek: add mt7981 clock IDs dt-bindings: clock: Add compatibles for MT7981 clk: mediatek: clk-mt7986-topckgen: Migrate to mtk_clk_simple_probe() clk: mediatek: clk-mt7986-topckgen: Properly keep some clocks enabled clk: mediatek: clk-mt6795-topckgen: Migrate to mtk_clk_simple_probe() clk: mediatek: clk-mt8186-topckgen: Migrate to mtk_clk_simple_probe() clk: mediatek: clk-mt8192: Migrate topckgen to mtk_clk_simple_probe() clk: mediatek: clk-mtk: Register MFG notifier in mtk_clk_simple_probe() clk: mediatek: clk-mt8183: Join top_aud_muxes and top_aud_divs clk: mediatek: mt8186: Join top_adj_div and top_muxes clk: mediatek: mt8192: Join top_adj_divs and top_muxes clk: mediatek: clk-mt8192: Move CLK_TOP_CSW_F26M_D2 in top_divs clk: mediatek: mt8173: Migrate pericfg/topckgen to mtk_clk_simple_probe() clk: mediatek: clk-mtk: Extend mtk_clk_simple_probe() clk: mediatek: Switch to mtk_clk_simple_probe() where possible clk: mediatek: mt8173: Break down clock drivers and allow module build ... * clk-imx: clk: imx: pll14xx: fix recalc_rate for negative kdiv MAINTAINERS: clk: imx: Add Peng Fan as reviewer clk: imx: fix compile testing imxrt1050 clk: imx: set imx_clk_gpr_mux_ops storage-class-specifier to static clk: imx6ul: add ethernet refclock mux support clk: imx6ul: fix enet1 gate configuration clk: imx: add imx_obtain_fixed_of_clock() clk: imx6q: add ethernet refclock mux support clk: imx: add clk-gpr-mux driver dt-bindings: imx8ulp: clock: no spaces before tabs clk: imx6sll: add proper spdx license identifier clk: imx: imx93: invoke imx_register_uart_clocks clk: imx: remove clk_count of imx_register_uart_clocks clk: imx: get stdout clk count from device tree clk: imx: avoid memory leak * clk-core: clk: Honor CLK_OPS_PARENT_ENABLE in clk_core_is_enabled()
6 parents 792d682 + 9645ccf + 633ff55 + b30a027 + 02d7bd1 + 79200d5 commit 60950df

File tree

144 files changed

+3707
-2382
lines changed

Some content is hidden

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

144 files changed

+3707
-2382
lines changed

Documentation/devicetree/bindings/arm/mediatek/mediatek,ethsys.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Required Properties:
1010
- "mediatek,mt7622-ethsys", "syscon"
1111
- "mediatek,mt7623-ethsys", "mediatek,mt2701-ethsys", "syscon"
1212
- "mediatek,mt7629-ethsys", "syscon"
13+
- "mediatek,mt7981-ethsys", "syscon"
1314
- "mediatek,mt7986-ethsys", "syscon"
1415
- #clock-cells: Must be 1
1516
- #reset-cells: Must be 1

Documentation/devicetree/bindings/arm/mediatek/mediatek,infracfg.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ properties:
2828
- mediatek,mt6797-infracfg
2929
- mediatek,mt7622-infracfg
3030
- mediatek,mt7629-infracfg
31+
- mediatek,mt7981-infracfg
3132
- mediatek,mt7986-infracfg
3233
- mediatek,mt8135-infracfg
3334
- mediatek,mt8167-infracfg

Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8195-clock.yaml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,9 @@ properties:
2828
- mediatek,mt8195-imp_iic_wrap_s
2929
- mediatek,mt8195-imp_iic_wrap_w
3030
- mediatek,mt8195-mfgcfg
31-
- mediatek,mt8195-vppsys0
3231
- mediatek,mt8195-wpesys
3332
- mediatek,mt8195-wpesys_vpp0
3433
- mediatek,mt8195-wpesys_vpp1
35-
- mediatek,mt8195-vppsys1
3634
- mediatek,mt8195-imgsys
3735
- mediatek,mt8195-imgsys1_dip_top
3836
- mediatek,mt8195-imgsys1_dip_nr
@@ -92,13 +90,6 @@ examples:
9290
#clock-cells = <1>;
9391
};
9492
95-
- |
96-
vppsys0: clock-controller@14000000 {
97-
compatible = "mediatek,mt8195-vppsys0";
98-
reg = <0x14000000 0x1000>;
99-
#clock-cells = <1>;
100-
};
101-
10293
- |
10394
wpesys: clock-controller@14e00000 {
10495
compatible = "mediatek,mt8195-wpesys";
@@ -120,13 +111,6 @@ examples:
120111
#clock-cells = <1>;
121112
};
122113
123-
- |
124-
vppsys1: clock-controller@14f00000 {
125-
compatible = "mediatek,mt8195-vppsys1";
126-
reg = <0x14f00000 0x1000>;
127-
#clock-cells = <1>;
128-
};
129-
130114
- |
131115
imgsys: clock-controller@15000000 {
132116
compatible = "mediatek,mt8195-imgsys";

Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ Required Properties:
88
- compatible: Should be:
99
- "mediatek,mt7622-sgmiisys", "syscon"
1010
- "mediatek,mt7629-sgmiisys", "syscon"
11+
- "mediatek,mt7981-sgmiisys_0", "syscon"
12+
- "mediatek,mt7981-sgmiisys_1", "syscon"
1113
- "mediatek,mt7986-sgmiisys_0", "syscon"
1214
- "mediatek,mt7986-sgmiisys_1", "syscon"
1315
- #clock-cells: Must be 1

Documentation/devicetree/bindings/clock/mediatek,apmixedsys.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ properties:
2020
- enum:
2121
- mediatek,mt6797-apmixedsys
2222
- mediatek,mt7622-apmixedsys
23+
- mediatek,mt7981-apmixedsys
2324
- mediatek,mt7986-apmixedsys
2425
- mediatek,mt8135-apmixedsys
2526
- mediatek,mt8173-apmixedsys

Documentation/devicetree/bindings/clock/mediatek,topckgen.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ properties:
3535
- mediatek,mt6779-topckgen
3636
- mediatek,mt6795-topckgen
3737
- mediatek,mt7629-topckgen
38+
- mediatek,mt7981-topckgen
3839
- mediatek,mt7986-topckgen
3940
- mediatek,mt8167-topckgen
4041
- mediatek,mt8183-topckgen

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14993,6 +14993,7 @@ F: drivers/iio/gyro/fxas21002c_spi.c
1499314993

1499414994
NXP i.MX CLOCK DRIVERS
1499514995
M: Abel Vesa <[email protected]>
14996+
R: Peng Fan <[email protected]>
1499614997
1499714998
1499814999
S: Maintained

drivers/clk/at91/Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Makefile for at91 specific clk
44
#
55

6-
obj-y += pmc.o sckc.o dt-compat.o
6+
obj-y += pmc.o sckc.o
77
obj-y += clk-slow.o clk-main.o clk-pll.o clk-plldiv.o clk-master.o
88
obj-y += clk-system.o clk-peripheral.o clk-programmable.o
99

@@ -15,12 +15,12 @@ obj-$(CONFIG_HAVE_AT91_H32MX) += clk-h32mx.o
1515
obj-$(CONFIG_HAVE_AT91_GENERATED_CLK) += clk-generated.o
1616
obj-$(CONFIG_HAVE_AT91_I2S_MUX_CLK) += clk-i2s-mux.o
1717
obj-$(CONFIG_HAVE_AT91_SAM9X60_PLL) += clk-sam9x60-pll.o
18-
obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200.o
19-
obj-$(CONFIG_SOC_AT91SAM9) += at91sam9260.o at91sam9rl.o at91sam9x5.o
20-
obj-$(CONFIG_SOC_AT91SAM9) += at91sam9g45.o
21-
obj-$(CONFIG_SOC_AT91SAM9) += at91sam9n12.o at91sam9x5.o
18+
obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200.o dt-compat.o
19+
obj-$(CONFIG_SOC_AT91SAM9) += at91sam9260.o at91sam9rl.o at91sam9x5.o dt-compat.o
20+
obj-$(CONFIG_SOC_AT91SAM9) += at91sam9g45.o dt-compat.o
21+
obj-$(CONFIG_SOC_AT91SAM9) += at91sam9n12.o at91sam9x5.o dt-compat.o
2222
obj-$(CONFIG_SOC_SAM9X60) += sam9x60.o
23-
obj-$(CONFIG_SOC_SAMA5D3) += sama5d3.o
24-
obj-$(CONFIG_SOC_SAMA5D4) += sama5d4.o
25-
obj-$(CONFIG_SOC_SAMA5D2) += sama5d2.o
23+
obj-$(CONFIG_SOC_SAMA5D3) += sama5d3.o dt-compat.o
24+
obj-$(CONFIG_SOC_SAMA5D4) += sama5d4.o dt-compat.o
25+
obj-$(CONFIG_SOC_SAMA5D2) += sama5d2.o dt-compat.o
2626
obj-$(CONFIG_SOC_SAMA7G5) += sama7g5.o

drivers/clk/at91/at91rm9200.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np)
183183
for (i = 0; i < ARRAY_SIZE(at91rm9200_systemck); i++) {
184184
hw = at91_clk_register_system(regmap, at91rm9200_systemck[i].n,
185185
at91rm9200_systemck[i].p,
186-
at91rm9200_systemck[i].id);
186+
at91rm9200_systemck[i].id, 0);
187187
if (IS_ERR(hw))
188188
goto err_free;
189189

drivers/clk/at91/at91sam9260.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np,
460460
for (i = 0; i < data->num_sck; i++) {
461461
hw = at91_clk_register_system(regmap, data->sck[i].n,
462462
data->sck[i].p,
463-
data->sck[i].id);
463+
data->sck[i].id, 0);
464464
if (IS_ERR(hw))
465465
goto err_free;
466466

0 commit comments

Comments
 (0)