Merge branches 'clk-renesas', 'clk-amlogic', 'clk-allwinner', 'clk-samsung',... (9d326162) · Commits · 戴 / test

Merge branches 'clk-renesas', 'clk-amlogic', 'clk-allwinner', 'clk-samsung', 'clk-doc' and 'clk-unused' into clk-next - Remove various unused variables in clk drivers * clk-renesas: clk: renesas: rcar-gen3: Update description for RZ/G2 clk: renesas: cpg-mssr: Add support for R-Car V3U clk: renesas: cpg-mssr: Add register pointers into struct cpg_mssr_priv clk: renesas: cpg-mssr: Use enum clk_reg_layout instead of a boolean flag dt-bindings: clock: renesas,cpg-mssr: Document r8a779a0 dt-bindings: clock: Add r8a779a0 CPG Core Clock Definitions dt-bindings: power: Add r8a779a0 SYSC power domain definitions clk: renesas: rcar-gen2: Rename vsp1-(sy|rt) clocks to vsp(s|r) clk: renesas: r8a7742: Add clk entry for VSPR * clk-amlogic: clk: meson: make shipped controller configurable clk: meson: g12a: mark fclk_div2 as critical clk: meson: axg-audio: fix g12a tdmout sclk inverter clk: meson: axg-audio: separate axg and g12a regmap tables clk: meson: add sclk-ws driver * clk-allwinner: clk: sunxi-ng: sun8i: r40: Use sigma delta modulation for audio PLL clk: sunxi-ng: add support for the Allwinner A100 CCU dt-bindings: clk: sunxi-ccu: add compatible string for A100 CCU and R-CCU * clk-samsung: clk: s2mps11: initialize driver via module_platform_driver clk: samsung: Use cached clk_hws instead of __clk_lookup() calls clk: samsung: exynos5420/5250: Add IDs to the CPU parent clk definitions clk: samsung: Add clk ID definitions for the CPU parent clocks clk: samsung: exynos5420: Avoid __clk_lookup() calls when enabling clocks clk: samsung: exynos5420: Add definition of clock ID for mout_sw_aclk_g3d clk: samsung: Keep top BPLL mux on Exynos542x enabled * clk-doc: clk: davinci: add missing kerneldoc clk: fixed: add missing kerneldoc * clk-unused: clk: socfpga: agilex: Remove unused variable 'cntr_mux' clk: si5341: drop unused 'err' variable clk: mmp: pxa1928: drop unused 'clk' variable clk: at91: drop unused at91sam9g45_pcr_layout

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml

+6 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,8 @@ properties:
		- allwinner,sun9i-a80-ccu
		- allwinner,sun50i-a64-ccu
		- allwinner,sun50i-a64-r-ccu
		- allwinner,sun50i-a100-ccu
		- allwinner,sun50i-a100-r-ccu
		- allwinner,sun50i-h5-ccu
		- allwinner,sun50i-h6-ccu
		- allwinner,sun50i-h6-r-ccu
		@@ -78,6 +80,7 @@ if:
		- allwinner,sun8i-a83t-r-ccu
		- allwinner,sun8i-h3-r-ccu
		- allwinner,sun50i-a64-r-ccu
		- allwinner,sun50i-a100-r-ccu
		- allwinner,sun50i-h6-r-ccu

		then:
		@@ -94,7 +97,9 @@ else:
		if:
		properties:
		compatible:
		const: allwinner,sun50i-h6-ccu
		enum:
		- allwinner,sun50i-a100-ccu
		- allwinner,sun50i-h6-ccu

		then:
		properties:

drivers/clk/at91/at91sam9g45.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -46,13 +46,6 @@ static const struct {
		{ .n = "pck1", .p = "prog1", .id = 9 },
		};

		static const struct clk_pcr_layout at91sam9g45_pcr_layout = {
		.offset = 0x10c,
		.cmd = BIT(12),
		.pid_mask = GENMASK(5, 0),
		.div_mask = GENMASK(17, 16),
		};

		struct pck {
		char *n;
		u8 id;

drivers/clk/clk-fixed-factor.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -206,6 +206,7 @@ static struct clk_hw _of_fixed_factor_clk_setup(struct device_node node)

		/**
		* of_fixed_factor_clk_setup() - Setup function for simple fixed factor clock
		* @node: device node for the clock
		*/
		void __init of_fixed_factor_clk_setup(struct device_node *node)
		{

drivers/clk/clk-fixed-rate.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -168,6 +168,7 @@ static struct clk_hw _of_fixed_clk_setup(struct device_node node)

		/**
		* of_fixed_clk_setup() - Setup function for simple fixed rate clock
		* @node: device node for the clock
		*/
		void __init of_fixed_clk_setup(struct device_node *node)
		{

drivers/clk/clk-s2mps11.c

+1 −12

Original line number	Diff line number	Diff line
		@@ -267,18 +267,7 @@ static struct platform_driver s2mps11_clk_driver = {
		.remove = s2mps11_clk_remove,
		.id_table = s2mps11_clk_id,
		};

		static int __init s2mps11_clk_init(void)
		{
		return platform_driver_register(&s2mps11_clk_driver);
		}
		subsys_initcall(s2mps11_clk_init);

		static void __exit s2mps11_clk_cleanup(void)
		{
		platform_driver_unregister(&s2mps11_clk_driver);
		}
		module_exit(s2mps11_clk_cleanup);
		module_platform_driver(s2mps11_clk_driver);

		MODULE_DESCRIPTION("S2MPS11 Clock Driver");
		MODULE_AUTHOR("Yadwinder Singh Brar <yadi.brar@samsung.com>");

Admin message