Commit f49afecc authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-bcm63xx' into clk-next 

* clk-bcm63xx:
  clk: bcm: Add BCM63138 clock support
  clk: iproc: Extend binding to cover BCM63138
parents 329cabce addc3ba6

Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt

+5 −0
Original line number Diff line number Diff line
@@ -208,3 +208,8 @@ These clock IDs are defined in: 
    ch3_unused	lcpll_ports	4	BCM_NS2_LCPLL_PORTS_CH3_UNUSED

    ch4_unused	lcpll_ports	5	BCM_NS2_LCPLL_PORTS_CH4_UNUSED

    ch5_unused	lcpll_ports	6	BCM_NS2_LCPLL_PORTS_CH5_UNUSED



BCM63138

--------

PLL and leaf clock compatible strings for BCM63138 are:

    "brcm,bcm63138-armpll"

drivers/clk/bcm/Kconfig

+10 −0
Original line number Diff line number Diff line 
config CLK_BCM_63XX

	bool "Broadcom BCM63xx clock support"

	depends on ARCH_BCM_63XX || COMPILE_TEST

	depends on COMMON_CLK

	select COMMON_CLK_IPROC

	default ARCH_BCM_63XX

	help

	  Enable common clock framework support for Broadcom BCM63xx DSL SoCs

	  based on the ARM architecture



config CLK_BCM_KONA

	bool "Broadcom Kona CCU clock support"

	depends on ARCH_BCM_MOBILE || COMPILE_TEST

drivers/clk/bcm/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_CLK_BCM_63XX)	+= clk-bcm63xx.o

obj-$(CONFIG_CLK_BCM_KONA)	+= clk-kona.o

obj-$(CONFIG_CLK_BCM_KONA)	+= clk-kona-setup.o

obj-$(CONFIG_CLK_BCM_KONA)	+= clk-bcm281xx.o

drivers/clk/bcm/clk-bcm63xx.c

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 Broadcom Corporation

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation version 2.

 *

 * This program is distributed "as is" WITHOUT ANY WARRANTY of any

 * kind, whether express or implied; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */

#include <linux/init.h>

#include <linux/clk-provider.h>

#include <linux/of.h>

#include "clk-iproc.h"



static void __init bcm63138_armpll_init(struct device_node *node)

{

	iproc_armpll_setup(node);

}

CLK_OF_DECLARE(bcm63138_armpll, "brcm,bcm63138-armpll", bcm63138_armpll_init);