aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/clk/bcm/Makefile
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2015-10-21 17:28:19 -0700
committerStephen Boyd <sboyd@codeaurora.org>2015-10-21 17:28:19 -0700
commitf63d19ef52aa66e97fca2425974845177ce02b0a (patch)
tree53ec668d90828b5a4144ef445df347e6fea19ae5 /drivers/clk/bcm/Makefile
parentMerge tag 'sunxi-clocks-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into clk-next (diff)
parentclk: iproc: define Broadcom NS2 iProc clock binding (diff)
downloadwireguard-linux-f63d19ef52aa66e97fca2425974845177ce02b0a.tar.xz
wireguard-linux-f63d19ef52aa66e97fca2425974845177ce02b0a.zip
Merge branch 'clk-iproc' into clk-next
* clk-iproc: clk: iproc: define Broadcom NS2 iProc clock binding clk: iproc: define Broadcom NSP iProc clock binding clk: ns2: add clock support for Broadcom Northstar 2 SoC clk: iproc: Separate status and control variables clk: iproc: Split off dig_filter clk: iproc: Add PLL base write function clk: nsp: add clock support for Broadcom Northstar Plus SoC clk: iproc: Add PWRCTRL support clk: cygnus: Convert all macros to all caps ARM: cygnus: fix link failures when CONFIG_COMMON_CLK_IPROC is disabled
Diffstat (limited to 'drivers/clk/bcm/Makefile')
-rw-r--r--drivers/clk/bcm/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile
index ee2349bbe1f1..3fc95060d875 100644
--- a/drivers/clk/bcm/Makefile
+++ b/drivers/clk/bcm/Makefile
@@ -4,4 +4,7 @@ obj-$(CONFIG_CLK_BCM_KONA) += clk-bcm281xx.o
obj-$(CONFIG_CLK_BCM_KONA) += clk-bcm21664.o
obj-$(CONFIG_COMMON_CLK_IPROC) += clk-iproc-armpll.o clk-iproc-pll.o clk-iproc-asiu.o
obj-$(CONFIG_ARCH_BCM2835) += clk-bcm2835.o
+obj-$(CONFIG_COMMON_CLK_IPROC) += clk-ns2.o
obj-$(CONFIG_ARCH_BCM_CYGNUS) += clk-cygnus.o
+obj-$(CONFIG_ARCH_BCM_NSP) += clk-nsp.o
+obj-$(CONFIG_ARCH_BCM_5301X) += clk-nsp.o