Merge branches 'clk-socfpga', 'clk-toshiba', 'clk-st' and 'clk-bitmain' into clk...
authorStephen Boyd <sboyd@kernel.org>
Wed, 12 Jan 2022 02:30:50 +0000 (18:30 -0800)
committerStephen Boyd <sboyd@kernel.org>
Wed, 12 Jan 2022 02:30:50 +0000 (18:30 -0800)
 - 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

1  2  3  4  5 
MAINTAINERS
drivers/clk/Kconfig
drivers/clk/Makefile

diff --combined MAINTAINERS
index e58e0eec6ff0fbc156ae05f286b65c749974beb6,7a2345ce85213cd03ef4aca3735a26cc1677d018,efc00c1ff510f216ff164b9a3a20d6298d25a07a,7a2345ce85213cd03ef4aca3735a26cc1677d018,7a2345ce85213cd03ef4aca3735a26cc1677d018..99f2a312ae321dd8bd4c5a30c63f08e4640fd283
@@@@@@ -2782,12 -2782,12 -2782,15 -2782,12 -2782,12 +2782,15 @@@@@@ L:  linux-arm-kernel@lists.infradead.or
     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
@@@@@@ -15725,15 -15725,6 -15728,6 -15725,6 -15725,6 +15728,15 @@@@@@ F:        Documentation/admin-guide/media/qcom
     F: Documentation/devicetree/bindings/media/*camss*
     F: drivers/media/platform/qcom/camss/
     
 ++++QUALCOMM CLOCK DRIVERS
 ++++M: Bjorn Andersson <bjorn.andersson@linaro.org>
 ++++L: linux-arm-msm@vger.kernel.org
 ++++S: Supported
 ++++T: git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
 ++++F: Documentation/devicetree/bindings/clock/qcom,*
 ++++F: drivers/clk/qcom/
 ++++F: include/dt-bindings/clock/qcom,*
 ++++
     QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER
     M: Niklas Cassel <nks@flawful.org>
     L: linux-pm@vger.kernel.org
diff --combined drivers/clk/Kconfig
index 73243ce10107c06884e6c36d36fdf30a39abfe38,c5b3dc97396a64043b3eb6a3b71e038e503fb81a,5fb34467f404c86212e6ddfd42f20af08ac58c1c,b64058d1af2d67db5c9dbea58d0800c1faeb9426,c5b3dc97396a64043b3eb6a3b71e038e503fb81a..b23c56ab4d680fe241b94023c5b9fc9d204c4c2c
@@@@@@ -169,14 -169,6 -169,6 -169,6 -169,6 +169,14 @@@@@@ config COMMON_CLK_CDCE70
        help
          This driver supports TI CDCE706 programmable 3-PLL clock synthesizer.
     
 ++++config COMMON_CLK_TPS68470
 ++++   tristate "Clock Driver for TI TPS68470 PMIC"
 ++++   depends on I2C
 ++++   depends on INTEL_SKL_INT3472 || COMPILE_TEST
 ++++   select REGMAP_I2C
 ++++   help
 ++++     This driver supports the clocks provided by the TPS68470 PMIC.
 ++++
     config COMMON_CLK_CDCE925
        tristate "Clock driver for TI CDCE913/925/937/949 devices"
        depends on I2C
@@@@@@ -229,13 -221,6 -221,6 -221,6 -221,6 +229,13 @@@@@@ config COMMON_CLK_GEMIN
          This driver supports the SoC clocks on the Cortina Systems Gemini
          platform, also known as SL3516 or CS3516.
     
 ++++config COMMON_CLK_LAN966X
 ++++   bool "Generic Clock Controller driver for LAN966X SoC"
 ++++   help
 ++++     This driver provides support for Generic Clock Controller(GCK) on
 ++++     LAN966X SoC. GCK generates and supplies clock to various peripherals
 ++++     within the SoC.
 ++++
     config COMMON_CLK_ASPEED
        bool "Clock driver for Aspeed BMC SoCs"
        depends on ARCH_ASPEED || COMPILE_TEST
@@@@@@ -354,16 -339,16 -339,16 -339,6 -339,16 +354,6 @@@@@@ config COMMON_CLK_STM32MP15
        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 -417,6 -417,7 -407,6 -417,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"
diff --combined drivers/clk/Makefile
index 154bf3c6f1ae18dfc07f6e131bbfdf3abb2349c0,e42312121e511477e026706727c5eba638def706,4271fffc87a22ce2b587cfcd2d5041b722ae4a4d,e42312121e511477e026706727c5eba638def706,e42312121e511477e026706727c5eba638def706..5a984e4134a8642373a7f4baddd5649e037a474a
@@@@@@ -37,7 -37,6 -37,6 -37,6 -37,6 +37,7 @@@@@@ obj-$(CONFIG_ARCH_HIGHBANK)           += clk-hig
     obj-$(CONFIG_CLK_HSDK)                     += clk-hsdk-pll.o
     obj-$(CONFIG_COMMON_CLK_K210)              += clk-k210.o
     obj-$(CONFIG_LMK04832)                     += clk-lmk04832.o
 ++++obj-$(CONFIG_COMMON_CLK_LAN966X)   += clk-lan966x.o
     obj-$(CONFIG_COMMON_CLK_LOCHNAGAR) += clk-lochnagar.o
     obj-$(CONFIG_COMMON_CLK_MAX77686)  += clk-max77686.o
     obj-$(CONFIG_COMMON_CLK_MAX9485)   += clk-max9485.o
@@@@@@ -64,7 -63,6 -63,6 -63,6 -63,6 +64,7 @@@@@@ obj-$(CONFIG_COMMON_CLK_SI570)                += clk-
     obj-$(CONFIG_COMMON_CLK_STM32F)            += clk-stm32f4.o
     obj-$(CONFIG_COMMON_CLK_STM32H7)   += clk-stm32h7.o
     obj-$(CONFIG_COMMON_CLK_STM32MP157)        += clk-stm32mp1.o
 ++++obj-$(CONFIG_COMMON_CLK_TPS68470)      += clk-tps68470.o
     obj-$(CONFIG_CLK_TWL6040)          += clk-twl6040.o
     obj-$(CONFIG_ARCH_VT8500)          += clk-vt8500.o
     obj-$(CONFIG_COMMON_CLK_VC5)               += clk-versaclock5.o
@@@@@@ -112,12 -110,12 -110,13 -110,12 -110,12 +112,13 @@@@@@ obj-$(CONFIG_PLAT_SPEAR)          += spear
     obj-y                                      += sprd/
     obj-$(CONFIG_ARCH_STI)                     += st/
     obj-$(CONFIG_ARCH_SUNXI)           += sunxi/
 ----obj-$(CONFIG_SUNXI_CCU)                    += sunxi-ng/
 ++++obj-y                                      += sunxi-ng/
     obj-$(CONFIG_ARCH_TEGRA)           += tegra/
     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