Merge branch 'clk-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux into next/soc64

Before removal of ARCH_EXYNOS7 Kconfig symbol, we need to get rid of last usage of it (in the clocks Kconfig entries).
2026-11-13 07:31:07 +00:00 · 2016-02-23 08:46:27 +09:00 · 2016-02-23 08:46:27 +09:00 · 203f974de7
commit 203f974de7
parent 92e963f50f 85997a7cba
37 changed files with 174 additions and 187 deletions
--- a/Documentation/devicetree/bindings/clock/xgene.txt
+++ b/Documentation/devicetree/bindings/clock/xgene.txt
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
--- a/drivers/clk/clk-composite.c
+++ b/drivers/clk/clk-composite.c
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
--- a/drivers/clk/clk-fixed-factor.c
+++ b/drivers/clk/clk-fixed-factor.c
--- a/drivers/clk/clk-fixed-rate.c
+++ b/drivers/clk/clk-fixed-rate.c
--- a/drivers/clk/clk-fractional-divider.c
+++ b/drivers/clk/clk-fractional-divider.c
--- a/drivers/clk/clk-gate.c
+++ b/drivers/clk/clk-gate.c
--- a/drivers/clk/clk-gpio.c
+++ b/drivers/clk/clk-gpio.c
--- a/drivers/clk/clk-multiplier.c
+++ b/drivers/clk/clk-multiplier.c
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
--- a/drivers/clk/clk-s2mps11.c
+++ b/drivers/clk/clk-s2mps11.c
--- a/drivers/clk/clk-scpi.c
+++ b/drivers/clk/clk-scpi.c
--- a/drivers/clk/clk-xgene.c
+++ b/drivers/clk/clk-xgene.c
--- a/drivers/clk/imx/clk-busy.c
+++ b/drivers/clk/imx/clk-busy.c
--- a/drivers/clk/imx/clk-fixup-div.c
+++ b/drivers/clk/imx/clk-fixup-div.c
--- a/drivers/clk/imx/clk-fixup-mux.c
+++ b/drivers/clk/imx/clk-fixup-mux.c
--- a/drivers/clk/imx/clk-gate-exclusive.c
+++ b/drivers/clk/imx/clk-gate-exclusive.c
--- a/drivers/clk/mediatek/clk-gate.c
+++ b/drivers/clk/mediatek/clk-gate.c
--- a/drivers/clk/mediatek/clk-gate.h
+++ b/drivers/clk/mediatek/clk-gate.h
--- a/drivers/clk/mediatek/clk-mtk.c
+++ b/drivers/clk/mediatek/clk-mtk.c
--- a/drivers/clk/mvebu/common.c
+++ b/drivers/clk/mvebu/common.c
--- a/drivers/clk/mvebu/dove-divider.c
+++ b/drivers/clk/mvebu/dove-divider.c
--- a/drivers/clk/mvebu/kirkwood.c
+++ b/drivers/clk/mvebu/kirkwood.c
--- a/drivers/clk/mxs/clk-div.c
+++ b/drivers/clk/mxs/clk-div.c
--- a/drivers/clk/nxp/clk-lpc18xx-ccu.c
+++ b/drivers/clk/nxp/clk-lpc18xx-ccu.c
--- a/drivers/clk/rockchip/clk.c
+++ b/drivers/clk/rockchip/clk.c
--- a/drivers/clk/samsung/Kconfig
+++ b/drivers/clk/samsung/Kconfig
--- a/drivers/clk/samsung/Makefile
+++ b/drivers/clk/samsung/Makefile
--- a/drivers/clk/st/clkgen-mux.c
+++ b/drivers/clk/st/clkgen-mux.c
--- a/drivers/clk/ti/composite.c
+++ b/drivers/clk/ti/composite.c
--- a/drivers/clk/ti/divider.c
+++ b/drivers/clk/ti/divider.c
--- a/drivers/clk/ti/gate.c
+++ b/drivers/clk/ti/gate.c
--- a/drivers/clk/ti/mux.c
+++ b/drivers/clk/ti/mux.c
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h