Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d1d13a5 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branches 'clk-remove-asm-clkdev', 'clk-debugfs-fixes', 'clk-renesas' and... 

Merge branches 'clk-remove-asm-clkdev', 'clk-debugfs-fixes', 'clk-renesas' and 'clk-meson' into clk-next

* clk-remove-asm-clkdev:
  clk: Move __clk_{get,put}() into private clk.h API
  clk: sunxi: Use CLK_IS_CRITICAL flag for critical clks
  arch: Remove clkdev.h asm-generic from Kbuild
  clk: Prepare to remove asm-generic/clkdev.h
  blackfin: Use generic clkdev.h header

* clk-debugfs-fixes:
  clk: Simplify debugfs registration
  clk: Fix debugfs_create_*() usage
  clk: Show symbolic clock flags in debugfs
  clk: Improve flags doc for of_clk_detect_critical()

* clk-renesas:
  clk: renesas: r8a7796: Add FDP clock
  clk: renesas: cpg-mssr: Keep wakeup sources active during system suspend
  clk: renesas: mstp: Keep wakeup sources active during system suspend
  clk: renesas: r8a77970: Add LVDS clock

* clk-meson:
  clk: meson-axg: fix potential NULL dereference in axg_clkc_probe()
  clk: meson-axg: make local symbol axg_gp0_params_table static
  clk: meson-axg: fix return value check in axg_clkc_probe()
  clk: meson: mpll: use 64-bit maths in params_from_rate
  clk: meson-axg: add clock controller drivers
  clk: meson-axg: add clocks dt-bindings required header
  dt-bindings: clock: add compatible variant for the Meson-AXG
  clk: meson: make the spinlock naming more specific
  clk: meson: gxbb: remove IGNORE_UNUSED from mmc clocks
  clk: meson: gxbb: fix wrong clock for SARADC/SANA
parents 716d9b1d bfc0cbfc db3188fa ade98cbc 9d548d80

Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt

+5 −2
Original line number Diff line number Diff line
@@ -5,8 +5,11 @@ controllers within the SoC. 


Required Properties:



- compatible: should be "amlogic,gxbb-clkc" for GXBB SoC,

	      or "amlogic,gxl-clkc" for GXL and GXM SoC.

- compatible: should be:

		"amlogic,gxbb-clkc" for GXBB SoC,

		"amlogic,gxl-clkc" for GXL and GXM SoC,

		"amlogic,axg-clkc" for AXG SoC.



- reg: physical base address of the clock controller and length of memory

       mapped region.

arch/alpha/include/asm/Kbuild

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





generic-y += clkdev.h

generic-y += exec.h

generic-y += export.h

generic-y += fb.h

arch/arc/include/asm/Kbuild

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

generic-y += bugs.h

generic-y += clkdev.h

generic-y += device.h

generic-y += div64.h

generic-y += emergency-restart.h

arch/arm/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line 
generic-y += clkdev.h

generic-y += current.h

generic-y += early_ioremap.h

generic-y += emergency-restart.h

arch/arm64/Kconfig.platforms

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ config ARCH_MESON 
	select PINCTRL_MESON

	select COMMON_CLK_AMLOGIC

	select COMMON_CLK_GXBB

	select COMMON_CLK_AXG

	select MESON_IRQ_GPIO

	help

	  This enables support for the Amlogic S905 SoCs.