Commit a69cd911 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'sunxi-clk-for-5.16-1' of... 

Merge tag 'sunxi-clk-for-5.16-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-allwinner

Pull Allwinner clk driver updates from Maxime Ripard:

Our usual PR for the Allwinner SoCs, this time improving the module
support and converting to more helpers.

* tag 'sunxi-clk-for-5.16-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  clk: sunxi: sun8i-apb0: Make use of the helper function devm_platform_ioremap_resource()
  clk: sunxi: sun6i-ar100: Make use of the helper function devm_platform_ioremap_resource()
  clk: sunxi: sun6i-apb0-gates: Make use of the helper function devm_platform_ioremap_resource()
  clk: sunxi: sun6i-apb0: Make use of the helper function devm_platform_ioremap_resource()
  clk: sunxi-ng: ccu-sun9i-a80-usb: Make use of the helper function devm_platform_ioremap_resource()
  clk: sunxi-ng: ccu-sun9i-a80-de: Make use of the helper function devm_platform_ioremap_resource()
  clk: sunxi-ng: ccu-sun9i-a80: Make use of the helper function devm_platform_ioremap_resource()
  clk: sunxi-ng: ccu-sun8i-r40: Make use of the helper function devm_platform_ioremap_resource()
  clk: sunxi-ng: ccu-sun8i-de2: Make use of the helper function devm_platform_ioremap_resource()
  clk: sunxi-ng: ccu-sun8i-a83t: Make use of the helper function devm_platform_ioremap_resource()
  clk: sunxi-ng: ccu-sun50i-h6: Make use of the helper function devm_platform_ioremap_resource()
  clk: sunxi-ng: ccu-sun50i-a64: Make use of the helper function devm_platform_ioremap_resource()
  clk: sunxi: clk-mod0: Make use of the helper function devm_platform_ioremap_resource()
  dt-bindings: clocks: Fix typo in the H6 compatible
  clk: sunxi-ng: Use a separate lock for each CCU instance
  clk: sunxi-ng: Prevent unbinding CCUs via sysfs
  clk: sunxi-ng: Unregister clocks/resets when unbinding
  clk: sunxi-ng: Add machine dependency to A83T CCU
  clk: sunxi-ng: mux: Remove unused 'reg' field
parents 6880fa6c e65d38e3

Documentation/devicetree/bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ properties: 
      - const: allwinner,sun8i-v3s-de2-clk

      - const: allwinner,sun50i-a64-de2-clk

      - const: allwinner,sun50i-h5-de2-clk

      - const: allwinner,sun50i-h6-de2-clk

      - const: allwinner,sun50i-h6-de3-clk

      - items:

          - const: allwinner,sun8i-r40-de2-clk

          - const: allwinner,sun8i-h3-de2-clk

drivers/clk/sunxi-ng/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ config SUN8I_A33_CCU 
config SUN8I_A83T_CCU

	bool "Support for the Allwinner A83T CCU"

	default MACH_SUN8I

	depends on MACH_SUN8I || COMPILE_TEST



config SUN8I_H3_CCU

	bool "Support for the Allwinner H3 CCU"

drivers/clk/sunxi-ng/ccu-sun4i-a10.c

+1 −1
Original line number Diff line number Diff line
@@ -1464,7 +1464,7 @@ static void __init sun4i_ccu_init(struct device_node *node, 
	val &= ~GENMASK(7, 6);

	writel(val | (2 << 6), reg + SUN4I_AHB_REG);



	sunxi_ccu_probe(node, reg, desc);

	of_sunxi_ccu_probe(node, reg, desc);

}



static void __init sun4i_a10_ccu_setup(struct device_node *node)

drivers/clk/sunxi-ng/ccu-sun50i-a100-r.c

+2 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ static int sun50i_a100_r_ccu_probe(struct platform_device *pdev) 
	if (IS_ERR(reg))

		return PTR_ERR(reg);



	return sunxi_ccu_probe(pdev->dev.of_node, reg, &sun50i_a100_r_ccu_desc);

	return devm_sunxi_ccu_probe(&pdev->dev, reg, &sun50i_a100_r_ccu_desc);

}



static const struct of_device_id sun50i_a100_r_ccu_ids[] = {
@@ -208,6 +208,7 @@ static struct platform_driver sun50i_a100_r_ccu_driver = { 
	.probe	= sun50i_a100_r_ccu_probe,

	.driver	= {

		.name	= "sun50i-a100-r-ccu",

		.suppress_bind_attrs = true,

		.of_match_table	= sun50i_a100_r_ccu_ids,

	},

};

drivers/clk/sunxi-ng/ccu-sun50i-a100.c

+2 −1
Original line number Diff line number Diff line
@@ -1247,7 +1247,7 @@ static int sun50i_a100_ccu_probe(struct platform_device *pdev) 
		writel(val, reg + sun50i_a100_usb2_clk_regs[i]);

	}



	ret = sunxi_ccu_probe(pdev->dev.of_node, reg, &sun50i_a100_ccu_desc);

	ret = devm_sunxi_ccu_probe(&pdev->dev, reg, &sun50i_a100_ccu_desc);

	if (ret)

		return ret;
@@ -1270,6 +1270,7 @@ static struct platform_driver sun50i_a100_ccu_driver = { 
	.probe	= sun50i_a100_ccu_probe,

	.driver	= {

		.name	= "sun50i-a100-ccu",

		.suppress_bind_attrs = true,

		.of_match_table	= sun50i_a100_ccu_ids,

	},

};