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

Merge tag 'clk-imx-5.10' of... 

Merge tag 'clk-imx-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into clk-imx

Pull i.MX clk driver updates from Shawn Guo:

 - A series from Anson Huang to support building i.MX ARMv8 platforms clock driver as module
 - Remove i.MX21 clock driver, as i.MX21 platform support is being dropped
 - A couple of minor imx8mp clock correction from Jacky Bai
 - Add clock for CRC block found on vf610 SoC
 - A couple of clock flag fix-up from Peng Fan
 - Minor kerneldoc fix-up for i.MX clock drivers

* tag 'clk-imx-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  clk: imx: imx21: Remove clock driver
  clk: imx: gate2: Fix a few typos
  clk: imx: Fix and update kerneldoc
  clk: imx: fix i.MX7D peripheral clk mux flags
  clk: imx: fix composite peripheral flags
  clk: imx: Correct the memrepair clock on imx8mp
  clk: imx: Correct the root clk of media ldb on imx8mp
  clk: imx: vf610: Add CRC clock
  clk: imx: Explicitly include bits.h
  clk: imx8qxp: Support building i.MX8QXP clock driver as module
  clk: imx8m: Support module build
  clk: imx: Add clock configuration for ARMv7 platforms
  clk: imx: Support building i.MX common clock driver as module
  clk: composite: Export clk_hw_register_composite()
  clk: imx6sl: Use BIT(x) to avoid shifting signed 32-bit value by 31 bits
parents 9123e3a7 80583774

drivers/clk/clk-composite.c

+1 −0
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ struct clk_hw *clk_hw_register_composite(struct device *dev, const char *name, 
					   rate_hw, rate_ops, gate_hw,

					   gate_ops, flags);

}

EXPORT_SYMBOL_GPL(clk_hw_register_composite);



struct clk_hw *clk_hw_register_composite_pdata(struct device *dev,

			const char *name,

drivers/clk/imx/Kconfig

+76 −14
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# common clock support for NXP i.MX SoC family.

config MXC_CLK

	bool

	def_bool ARCH_MXC

	tristate "IMX clock"

	depends on ARCH_MXC || COMPILE_TEST



config MXC_CLK_SCU

	bool

	depends on IMX_SCU

	tristate "IMX SCU clock"

	depends on ARCH_MXC || COMPILE_TEST

	depends on IMX_SCU && HAVE_ARM_SMCCC



config CLK_IMX1

	def_bool SOC_IMX1

	select MXC_CLK



config CLK_IMX25

	def_bool SOC_IMX25

	select MXC_CLK



config CLK_IMX27

	def_bool SOC_IMX27

	select MXC_CLK



config CLK_IMX31

	def_bool SOC_IMX31

	select MXC_CLK



config CLK_IMX35

	def_bool SOC_IMX35

	select MXC_CLK



config CLK_IMX5

	def_bool SOC_IMX5

	select MXC_CLK



config CLK_IMX6Q

	def_bool SOC_IMX6Q

	select MXC_CLK



config CLK_IMX6SL

	def_bool SOC_IMX6SL

	select MXC_CLK



config CLK_IMX6SLL

	def_bool SOC_IMX6SLL

	select MXC_CLK



config CLK_IMX6SX

	def_bool SOC_IMX6SX

	select MXC_CLK



config CLK_IMX6UL

	def_bool SOC_IMX6UL

	select MXC_CLK



config CLK_IMX7D

	def_bool SOC_IMX7D

	select MXC_CLK



config CLK_IMX7ULP

	def_bool SOC_IMX7ULP

	select MXC_CLK



config CLK_VF610

	def_bool SOC_VF610

	select MXC_CLK



config CLK_IMX8MM

	bool "IMX8MM CCM Clock Driver"

	depends on ARCH_MXC

	tristate "IMX8MM CCM Clock Driver"

	depends on ARCH_MXC || COMPILE_TEST

	select MXC_CLK

	help

	    Build the driver for i.MX8MM CCM Clock Driver



config CLK_IMX8MN

	bool "IMX8MN CCM Clock Driver"

	depends on ARCH_MXC

	tristate "IMX8MN CCM Clock Driver"

	depends on ARCH_MXC || COMPILE_TEST

	select MXC_CLK

	help

	    Build the driver for i.MX8MN CCM Clock Driver



config CLK_IMX8MP

	bool "IMX8MP CCM Clock Driver"

	depends on ARCH_MXC

	tristate "IMX8MP CCM Clock Driver"

	depends on ARCH_MXC || COMPILE_TEST

	select MXC_CLK

	help

	    Build the driver for i.MX8MP CCM Clock Driver



config CLK_IMX8MQ

	bool "IMX8MQ CCM Clock Driver"

	depends on ARCH_MXC

	tristate "IMX8MQ CCM Clock Driver"

	depends on ARCH_MXC || COMPILE_TEST

	select MXC_CLK

	help

	    Build the driver for i.MX8MQ CCM Clock Driver



config CLK_IMX8QXP

	bool "IMX8QXP SCU Clock"

	depends on ARCH_MXC && IMX_SCU && ARM64

	tristate "IMX8QXP SCU Clock"

	depends on (ARCH_MXC && ARM64) || COMPILE_TEST

	depends on IMX_SCU && HAVE_ARM_SMCCC

	select MXC_CLK_SCU

	help

	  Build the driver for IMX8QXP SCU based clocks.

drivers/clk/imx/Makefile

+38 −40
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



obj-$(CONFIG_MXC_CLK) += \

	clk.o \

	clk-busy.o \

	clk-composite-8m.o \

	clk-cpu.o \

	clk-composite-7ulp.o \

	clk-divider-gate.o \

	clk-fixup-div.o \

	clk-fixup-mux.o \

	clk-frac-pll.o \

	clk-gate-exclusive.o \

	clk-gate2.o \

	clk-pfd.o \

	clk-pfdv2.o \

	clk-pllv1.o \

	clk-pllv2.o \

	clk-pllv3.o \

	clk-pllv4.o \

	clk-sscg-pll.o \

	clk-pll14xx.o



obj-$(CONFIG_MXC_CLK_SCU) += \

	clk-scu.o \

	clk-lpcg-scu.o

mxc-clk-objs += clk.o

mxc-clk-objs += clk-busy.o

mxc-clk-objs += clk-composite-7ulp.o

mxc-clk-objs += clk-composite-8m.o

mxc-clk-objs += clk-cpu.o

mxc-clk-objs += clk-divider-gate.o

mxc-clk-objs += clk-fixup-div.o

mxc-clk-objs += clk-fixup-mux.o

mxc-clk-objs += clk-frac-pll.o

mxc-clk-objs += clk-gate2.o

mxc-clk-objs += clk-gate-exclusive.o

mxc-clk-objs += clk-pfd.o

mxc-clk-objs += clk-pfdv2.o

mxc-clk-objs += clk-pllv1.o

mxc-clk-objs += clk-pllv2.o

mxc-clk-objs += clk-pllv3.o

mxc-clk-objs += clk-pllv4.o

mxc-clk-objs += clk-pll14xx.o

mxc-clk-objs += clk-sscg-pll.o

obj-$(CONFIG_MXC_CLK) += mxc-clk.o



obj-$(CONFIG_CLK_IMX8MM) += clk-imx8mm.o

obj-$(CONFIG_CLK_IMX8MN) += clk-imx8mn.o

obj-$(CONFIG_CLK_IMX8MP) += clk-imx8mp.o

obj-$(CONFIG_CLK_IMX8MQ) += clk-imx8mq.o

obj-$(CONFIG_CLK_IMX8QXP) += clk-imx8qxp.o clk-imx8qxp-lpcg.o



obj-$(CONFIG_SOC_IMX1)   += clk-imx1.o

obj-$(CONFIG_SOC_IMX21)  += clk-imx21.o

obj-$(CONFIG_SOC_IMX25)  += clk-imx25.o

obj-$(CONFIG_SOC_IMX27)  += clk-imx27.o

obj-$(CONFIG_SOC_IMX31)  += clk-imx31.o

obj-$(CONFIG_SOC_IMX35)  += clk-imx35.o

obj-$(CONFIG_SOC_IMX5)   += clk-imx5.o

obj-$(CONFIG_SOC_IMX6Q)  += clk-imx6q.o

obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o

obj-$(CONFIG_SOC_IMX6SLL) += clk-imx6sll.o

obj-$(CONFIG_SOC_IMX6SX) += clk-imx6sx.o

obj-$(CONFIG_SOC_IMX6UL) += clk-imx6ul.o

obj-$(CONFIG_SOC_IMX7D)  += clk-imx7d.o

obj-$(CONFIG_SOC_IMX7ULP) += clk-imx7ulp.o

obj-$(CONFIG_SOC_VF610)  += clk-vf610.o
 
obj-$(CONFIG_MXC_CLK_SCU) += clk-imx-scu.o clk-imx-lpcg-scu.o

clk-imx-scu-$(CONFIG_CLK_IMX8QXP) += clk-scu.o clk-imx8qxp.o

clk-imx-lpcg-scu-$(CONFIG_CLK_IMX8QXP) += clk-lpcg-scu.o clk-imx8qxp-lpcg.o



obj-$(CONFIG_CLK_IMX1)   += clk-imx1.o

obj-$(CONFIG_CLK_IMX25)  += clk-imx25.o

obj-$(CONFIG_CLK_IMX27)  += clk-imx27.o

obj-$(CONFIG_CLK_IMX31)  += clk-imx31.o

obj-$(CONFIG_CLK_IMX35)  += clk-imx35.o

obj-$(CONFIG_CLK_IMX5)   += clk-imx5.o

obj-$(CONFIG_CLK_IMX6Q)  += clk-imx6q.o

obj-$(CONFIG_CLK_IMX6SL) += clk-imx6sl.o

obj-$(CONFIG_CLK_IMX6SLL) += clk-imx6sll.o

obj-$(CONFIG_CLK_IMX6SX) += clk-imx6sx.o

obj-$(CONFIG_CLK_IMX6UL) += clk-imx6ul.o

obj-$(CONFIG_CLK_IMX7D)  += clk-imx7d.o

obj-$(CONFIG_CLK_IMX7ULP) += clk-imx7ulp.o

obj-$(CONFIG_CLK_VF610)  += clk-vf610.o

drivers/clk/imx/clk-busy.c

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 * Copyright 2012 Linaro Ltd.

 */



#include <linux/bits.h>

#include <linux/clk.h>

#include <linux/clk-provider.h>

#include <linux/io.h>

drivers/clk/imx/clk-composite-7ulp.c

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 *

 */



#include <linux/bits.h>

#include <linux/clk-provider.h>

#include <linux/err.h>

#include <linux/slab.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE