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

Merge branches 'clk-xilinx', 'clk-broadcom' and 'clk-platform' into clk-next 

 - BCM63268 timer clock and reset controller
 - Convert platform clk drivers to remove_new

* clk-xilinx:
  clocking-wizard: Support higher frequency accuracy
  clk: zynqmp: pll: Remove the limit

* clk-broadcom:
  clk: bcm: Add BCM63268 timer clock and reset driver
  dt-bindings: clock: Add BCM63268 timer binding
  dt-bindings: reset: add BCM63268 timer reset definitions
  dt-bindings: clk: add BCM63268 timer clock definitions

* clk-platform: (25 commits)
  clk: xilinx: Convert to platform remove callback returning void
  clk: x86: Convert to platform remove callback returning void
  clk: uniphier: Convert to platform remove callback returning void
  clk: ti: Convert to platform remove callback returning void
  clk: tegra: Convert to platform remove callback returning void
  clk: stm32: Convert to platform remove callback returning void
  clk: mvebu: Convert to platform remove callback returning void
  clk: mmp: Convert to platform remove callback returning void
  clk: keystone: Convert to platform remove callback returning void
  clk: hisilicon: Convert to platform remove callback returning void
  clk: stm32mp1: Convert to platform remove callback returning void
  clk: scpi: Convert to platform remove callback returning void
  clk: s2mps11: Convert to platform remove callback returning void
  clk: pwm: Convert to platform remove callback returning void
  clk: palmas: Convert to platform remove callback returning void
  clk: hsdk-pll: Convert to platform remove callback returning void
  clk: fixed-rate: Convert to platform remove callback returning void
  clk: fixed-mmio: Convert to platform remove callback returning void
  clk: fixed-factor: Convert to platform remove callback returning void
  clk: axm5516: Convert to platform remove callback returning void
  ...
parents 6f7478e3 595c88cd ba7c8d27 ce1c5f84

Documentation/devicetree/bindings/clock/brcm,bcm63268-timer-clocks.yaml

0 → 100644
+40 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/clock/brcm,bcm63268-timer-clocks.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Broadcom BCM63268 Timer Clock and Reset Device Tree Bindings



maintainers:

  - Álvaro Fernández Rojas <noltari@gmail.com>



properties:

  compatible:

    const: brcm,bcm63268-timer-clocks



  reg:

    maxItems: 1



  "#clock-cells":

    const: 1



  "#reset-cells":

    const: 1



required:

  - compatible

  - reg

  - "#clock-cells"

  - "#reset-cells"



additionalProperties: false



examples:

  - |

    timer_clk: clock-controller@100000ac {

      compatible = "brcm,bcm63268-timer-clocks";

      reg = <0x100000ac 0x4>;

      #clock-cells = <1>;

      #reset-cells = <1>;

    };

drivers/clk/axs10x/i2s_pll_clock.c

+2 −3
Original line number Diff line number Diff line
@@ -198,10 +198,9 @@ static int i2s_pll_clk_probe(struct platform_device *pdev) 
	return of_clk_add_provider(node, of_clk_src_simple_get, clk);

}



static int i2s_pll_clk_remove(struct platform_device *pdev)

static void i2s_pll_clk_remove(struct platform_device *pdev)

{

	of_clk_del_provider(pdev->dev.of_node);

	return 0;

}



static const struct of_device_id i2s_pll_clk_id[] = {
@@ -216,7 +215,7 @@ static struct platform_driver i2s_pll_clk_driver = { 
		.of_match_table = i2s_pll_clk_id,

	},

	.probe = i2s_pll_clk_probe,

	.remove = i2s_pll_clk_remove,

	.remove_new = i2s_pll_clk_remove,

};

module_platform_driver(i2s_pll_clk_driver);

drivers/clk/axs10x/pll_clock.c

+2 −3
Original line number Diff line number Diff line
@@ -257,10 +257,9 @@ static int axs10x_pll_clk_probe(struct platform_device *pdev) 
			&pll_clk->hw);

}



static int axs10x_pll_clk_remove(struct platform_device *pdev)

static void axs10x_pll_clk_remove(struct platform_device *pdev)

{

	of_clk_del_provider(pdev->dev.of_node);

	return 0;

}



static void __init of_axs10x_pll_clk_setup(struct device_node *node)
@@ -332,7 +331,7 @@ static struct platform_driver axs10x_pll_clk_driver = { 
		.of_match_table = axs10x_pll_clk_id,

	},

	.probe = axs10x_pll_clk_probe,

	.remove = axs10x_pll_clk_remove,

	.remove_new = axs10x_pll_clk_remove,

};

builtin_platform_driver(axs10x_pll_clk_driver);

drivers/clk/bcm/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -37,6 +37,15 @@ config CLK_BCM_63XX_GATE 
	  Enable common clock framework support for Broadcom BCM63xx DSL SoCs

	  based on the MIPS architecture



config CLK_BCM63268_TIMER

	bool "Broadcom BCM63268 timer clock and reset support"

	depends on BMIPS_GENERIC || COMPILE_TEST

	default BMIPS_GENERIC

	select RESET_CONTROLLER

	help

	  Enable timer clock and reset support for Broadcom BCM63268 DSL SoCs

	  based on the MIPS architecture.



config CLK_BCM_KONA

	bool "Broadcom Kona CCU clock support"

	depends on ARCH_BCM_MOBILE || COMPILE_TEST

drivers/clk/bcm/Makefile

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_CLK_BCM_63XX)	+= clk-bcm63xx.o

obj-$(CONFIG_CLK_BCM_63XX_GATE)	+= clk-bcm63xx-gate.o

obj-$(CONFIG_CLK_BCM63268_TIMER) += clk-bcm63268-timer.o

obj-$(CONFIG_CLK_BCM_KONA)	+= clk-kona.o

obj-$(CONFIG_CLK_BCM_KONA)	+= clk-kona-setup.o

obj-$(CONFIG_CLK_BCM_KONA)	+= clk-bcm281xx.o