Commit 203f974d authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

Merge branch 'clk-samsung' of... 

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).
parents 92e963f5 85997a7c

Documentation/devicetree/bindings/clock/xgene.txt

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ Required properties: 
	"apm,xgene-socpll-clock" - for a X-Gene SoC PLL clock

	"apm,xgene-pcppll-clock" - for a X-Gene PCP PLL clock

	"apm,xgene-device-clock" - for a X-Gene device clock

	"apm,xgene-socpll-v2-clock" - for a X-Gene SoC PLL v2 clock

	"apm,xgene-pcppll-v2-clock" - for a X-Gene PCP PLL v2 clock



Required properties for SoC or PCP PLL clocks:

- reg : shall be the physical PLL register address for the pll clock.

arch/arm/mach-s3c24xx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ config PLAT_S3C24XX 
	select NO_IOPORT_MAP

	select S3C_DEV_NAND

	select IRQ_DOMAIN

	select COMMON_CLK

	help

	  Base platform code for any Samsung S3C24XX device

drivers/clk/Kconfig

+3 −5
Original line number Diff line number Diff line
@@ -202,11 +202,9 @@ config COMMON_CLK_CDCE706 


source "drivers/clk/bcm/Kconfig"

source "drivers/clk/hisilicon/Kconfig"

source "drivers/clk/qcom/Kconfig"



endmenu



source "drivers/clk/mvebu/Kconfig"



source "drivers/clk/qcom/Kconfig"

source "drivers/clk/samsung/Kconfig"

source "drivers/clk/tegra/Kconfig"



endmenu

drivers/clk/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ obj-$(CONFIG_COMMON_CLK_SI514) += clk-si514.o 
obj-$(CONFIG_COMMON_CLK_SI570)		+= clk-si570.o

obj-$(CONFIG_COMMON_CLK_CDCE925)	+= clk-cdce925.o

obj-$(CONFIG_ARCH_STM32)		+= clk-stm32f4.o

obj-$(CONFIG_ARCH_TANGOX)		+= clk-tango4.o

obj-$(CONFIG_ARCH_TANGO)		+= clk-tango4.o

obj-$(CONFIG_CLK_TWL6040)		+= clk-twl6040.o

obj-$(CONFIG_ARCH_U300)			+= clk-u300.o

obj-$(CONFIG_ARCH_VT8500)		+= clk-vt8500.o

drivers/clk/clk-composite.c

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
#include <linux/err.h>

#include <linux/slab.h>



#define to_clk_composite(_hw) container_of(_hw, struct clk_composite, hw)



static u8 clk_composite_get_parent(struct clk_hw *hw)

{

	struct clk_composite *composite = to_clk_composite(hw);

CRA Git | Maintained and supported by SUSTech CRA and CCSE