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

Merge branches 'clk-amlogic', 'clk-rockchip', 'clk-of', 'clk-freescale' and... 

Merge branches 'clk-amlogic', 'clk-rockchip', 'clk-of', 'clk-freescale' and 'clk-unused' into clk-next

 - Replace clk-provider.h with of_clk.h when possible

* clk-amlogic:
  clk: meson: g12a: add MIPI DSI Host Pixel Clock
  dt-bindings: clk: g12a-clkc: add DSI Pixel clock bindings
  clk: meson: enable building as modules
  clk: meson: Kconfig: fix dependency for G12A
  clk: meson: axg: add MIPI DSI Host clock
  clk: meson: axg: add Video Clocks
  dt-bindings: clk: axg-clkc: add MIPI DSI Host clock binding
  dt-bindings: clk: axg-clkc: add Video Clocks

* clk-rockchip:
  clk: rockchip: fix i2s gate bits on rk3066 and rk3188
  clk: rockchip: add CLK_SET_RATE_PARENT to sclk for rk3066a i2s and uart clocks
  clk: rockchip: Remove redundant null check before clk_prepare_enable
  clk: rockchip: Add appropriate arch dependencies

* clk-of:
  xtensa: Replace <linux/clk-provider.h> by <linux/of_clk.h>
  sh: boards: Replace <linux/clk-provider.h> by <linux/of_clk.h>

* clk-freescale:
  clk: fsl-flexspi: new driver
  dt-bindings: clock: document the fsl-flexspi-clk device
  clk: divider: add devm_clk_hw_register_divider_table()
  clk: qoriq: provide constants for the type
  clk: fsl-sai: use devm_clk_hw_register_composite_pdata()
  clk: composite: add devm_clk_hw_register_composite_pdata()
  clk: fsl-sai: fix memory leak
  clk: qoriq: Add platform dependencies

* clk-unused:
  clk: scpi: mark scpi_clk_match as maybe unused
  clk: pwm: drop of_match_ptr from of_device_id table
parents 23cae54f cadd5312 f4ac0c56 047b0420 fcf77be8 975d25cb

Documentation/devicetree/bindings/clock/fsl,flexspi-clock.yaml

0 → 100644
+55 −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/fsl,flexspi-clock.yaml#

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



title: Freescale FlexSPI clock driver for Layerscape SoCs



maintainers:

  - Michael Walle <michael@walle.cc>



description:

  The Freescale Layerscape SoCs have a special FlexSPI clock which is

  derived from the platform PLL.



properties:

  compatible:

    enum:

      - fsl,ls1028a-flexspi-clk

      - fsl,lx2160a-flexspi-clk



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  '#clock-cells':

    const: 0



  clock-output-names:

    maxItems: 1



required:

  - compatible

  - reg

  - clocks

  - '#clock-cells'



additionalProperties: false



examples:

  - |

    dcfg {

        #address-cells = <1>;

        #size-cells = <1>;



        fspi_clk: clock-controller@900 {

            compatible = "fsl,ls1028a-flexspi-clk";

            reg = <0x900 0x4>;

            #clock-cells = <0>;

            clocks = <&parentclk>;

            clock-output-names = "fspi_clk";

        };

    };

arch/sh/boards/of-generic.c

+1 −1
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ 
 */



#include <linux/of.h>

#include <linux/of_clk.h>

#include <linux/of_fdt.h>

#include <linux/clocksource.h>

#include <linux/irqchip.h>

#include <linux/clk-provider.h>

#include <asm/machvec.h>

#include <asm/rtc.h>

arch/xtensa/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 */



#include <linux/clk.h>

#include <linux/clk-provider.h>

#include <linux/of_clk.h>

#include <linux/errno.h>

#include <linux/sched.h>

#include <linux/time.h>

drivers/clk/Kconfig

+10 −1
Original line number Diff line number Diff line
@@ -188,6 +188,14 @@ config COMMON_CLK_CS2000_CP 
	help

	  If you say yes here you get support for the CS2000 clock multiplier.



config COMMON_CLK_FSL_FLEXSPI

	tristate "Clock driver for FlexSPI on Layerscape SoCs"

	depends on ARCH_LAYERSCAPE || COMPILE_TEST

	default ARCH_LAYERSCAPE && SPI_NXP_FLEXSPI

	help

	  On Layerscape SoCs there is a special clock for the FlexSPI

	  interface.



config COMMON_CLK_FSL_SAI

	bool "Clock driver for BCLK of Freescale SAI cores"

	depends on ARCH_LAYERSCAPE || COMPILE_TEST
@@ -246,7 +254,8 @@ config COMMON_CLK_AXI_CLKGEN 


config CLK_QORIQ

	bool "Clock driver for Freescale QorIQ platforms"

	depends on (PPC_E500MC || ARM || ARM64 || COMPILE_TEST) && OF

	depends on OF

	depends on PPC_E500MC || SOC_LS1021A || ARCH_LAYERSCAPE || COMPILE_TEST

	help

	  This adds the clock driver support for Freescale QorIQ platforms

	  using common clock framework.

drivers/clk/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ obj-$(CONFIG_COMMON_CLK_CS2000_CP) += clk-cs2000-cp.o 
obj-$(CONFIG_ARCH_EFM32)		+= clk-efm32gg.o

obj-$(CONFIG_ARCH_SPARX5)		+= clk-sparx5.o

obj-$(CONFIG_COMMON_CLK_FIXED_MMIO)	+= clk-fixed-mmio.o

obj-$(CONFIG_COMMON_CLK_FSL_FLEXSPI)	+= clk-fsl-flexspi.o

obj-$(CONFIG_COMMON_CLK_FSL_SAI)	+= clk-fsl-sai.o

obj-$(CONFIG_COMMON_CLK_GEMINI)		+= clk-gemini.o

obj-$(CONFIG_COMMON_CLK_ASPEED)		+= clk-aspeed.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE