Commit 1d0bd126 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branches 'clk-socfpga', 'clk-toshiba', 'clk-st' and 'clk-bitmain' into clk-next 

 - Clock and reset driver for Toshiba Visconti SoCs

* clk-socfpga:
  clk: socfpga: s10: Make use of the helper function devm_platform_ioremap_resource()
  clk: socfpga: agilex: Make use of the helper function devm_platform_ioremap_resource()
  clk: socfpga: remove redundant assignment after a mask operation
  clk: socfpga: remove redundant assignment on division

* clk-toshiba:
  clk: visconti: Remove pointless NULL check in visconti_pll_add_lookup()
  MAINTAINERS: Add entries for Toshiba Visconti PLL and clock controller
  clk: visconti: Add support common clock driver and reset driver
  dt-bindings: clock: Add DT bindings for SMU of Toshiba Visconti TMPV770x SoC
  dt-bindings: clock: Add DT bindings for PLL of Toshiba Visconti TMPV770x SoC

* clk-st:
  clk: Drop unused COMMON_CLK_STM32MP157_SCMI config
  clk: st: clkgen-mux: search reg within node or parent
  clk: st: clkgen-fsyn: search reg within node or parent

* clk-bitmain:
  clk: bm1880: remove kfrees on static allocations
parents f691c9b5 b739bca9 4e31bfa3 5dcc0ef8 c861c1be

Documentation/devicetree/bindings/clock/toshiba,tmpv770x-pipllct.yaml

0 → 100644
+57 −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/toshiba,tmpv770x-pipllct.yaml#

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



title: Toshiba Visconti5 TMPV770X PLL Controller Device Tree Bindings



maintainers:

  - Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>



description:

  Toshia Visconti5 PLL controller which supports the PLLs on TMPV770X.



properties:

  compatible:

    const: toshiba,tmpv7708-pipllct



  reg:

    maxItems: 1



  '#clock-cells':

    const: 1



  clocks:

    description: External reference clock (OSC2)

    maxItems: 1



required:

  - compatible

  - reg

  - "#clock-cells"

  - clocks



additionalProperties: false



examples:

  - |



    osc2_clk: osc2-clk {

      compatible = "fixed-clock";

      clock-frequency = <20000000>;

      #clock-cells = <0>;

    };



    soc {

        #address-cells = <2>;

        #size-cells = <2>;



        pipllct: clock-controller@24220000 {

            compatible = "toshiba,tmpv7708-pipllct";

            reg = <0 0x24220000 0 0x820>;

            #clock-cells = <1>;

            clocks = <&osc2_clk>;

        };

    };

...

Documentation/devicetree/bindings/clock/toshiba,tmpv770x-pismu.yaml

0 → 100644
+52 −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/toshiba,tmpv770x-pismu.yaml#

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



title: Toshiba Visconti5 TMPV770x SMU controller Device Tree Bindings



maintainers:

  - Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>



description:

  Toshia Visconti5 SMU (System Management Unit) which supports the clock

  and resets on TMPV770x.



properties:

  compatible:

    items:

      - const: toshiba,tmpv7708-pismu

      - const: syscon



  reg:

    maxItems: 1



  '#clock-cells':

    const: 1



  '#reset-cells':

    const: 1



required:

  - compatible

  - reg

  - "#clock-cells"

  - "#reset-cells"



additionalProperties: false



examples:

  - |

    soc {

        #address-cells = <2>;

        #size-cells = <2>;



        pismu: syscon@24200000 {

            compatible = "toshiba,tmpv7708-pismu", "syscon";

            reg = <0 0x24200000 0 0x2140>;

            #clock-cells = <1>;

            #reset-cells = <1>;

        };

    };

...

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -2782,12 +2782,15 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Supported

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti.git

F:	Documentation/devicetree/bindings/arm/toshiba.yaml

F:	Documentation/devicetree/bindings/clock/toshiba,tmpv770x-pipllct.yaml

F:	Documentation/devicetree/bindings/clock/toshiba,tmpv770x-pismu.yaml

F:	Documentation/devicetree/bindings/net/toshiba,visconti-dwmac.yaml

F:	Documentation/devicetree/bindings/gpio/toshiba,gpio-visconti.yaml

F:	Documentation/devicetree/bindings/pci/toshiba,visconti-pcie.yaml

F:	Documentation/devicetree/bindings/pinctrl/toshiba,visconti-pinctrl.yaml

F:	Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml

F:	arch/arm64/boot/dts/toshiba/

F:	drivers/clk/visconti/

F:	drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c

F:	drivers/gpio/gpio-visconti.c

F:	drivers/pci/controller/dwc/pcie-visconti.c

drivers/clk/Kconfig

+1 −10
Original line number Diff line number Diff line
@@ -354,16 +354,6 @@ config COMMON_CLK_STM32MP157 
	help

	  Support for stm32mp157 SoC family clocks



config COMMON_CLK_STM32MP157_SCMI

	bool "stm32mp157 Clock driver with Trusted Firmware"

	depends on COMMON_CLK_STM32MP157

	select COMMON_CLK_SCMI

	select ARM_SCMI_PROTOCOL

	default y

	help

	  Support for stm32mp157 SoC family clocks with Trusted Firmware using

	  SCMI protocol.



config COMMON_CLK_STM32F

	def_bool COMMON_CLK && (MACH_STM32F429 || MACH_STM32F469 || MACH_STM32F746)

	help
@@ -432,6 +422,7 @@ source "drivers/clk/sunxi-ng/Kconfig" 
source "drivers/clk/tegra/Kconfig"

source "drivers/clk/ti/Kconfig"

source "drivers/clk/uniphier/Kconfig"

source "drivers/clk/visconti/Kconfig"

source "drivers/clk/x86/Kconfig"

source "drivers/clk/xilinx/Kconfig"

source "drivers/clk/zynqmp/Kconfig"

drivers/clk/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ obj-y += ti/ 
obj-$(CONFIG_CLK_UNIPHIER)		+= uniphier/

obj-$(CONFIG_ARCH_U8500)		+= ux500/

obj-y					+= versatile/

obj-$(CONFIG_COMMON_CLK_VISCONTI)	+= visconti/

ifeq ($(CONFIG_COMMON_CLK), y)

obj-$(CONFIG_X86)			+= x86/

endif