diff options
| author | Olof Johansson | 2015-08-18 22:33:48 +0200 |
|---|---|---|
| committer | Olof Johansson | 2015-08-18 22:33:48 +0200 |
| commit | 62060a3548c5ea038b4ade518cce92be32a6718d (patch) | |
| tree | 5c43e721ce0c0ab53cd0d3b237d15dc8ded51a0a /drivers/clk | |
| parent | Merge tag 'renesas-dt4-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | arm: boot: dts: am4372: add ARM timers and SCU nodes (diff) | |
| download | kernel-qcow2-linux-62060a3548c5ea038b4ade518cce92be32a6718d.tar.gz kernel-qcow2-linux-62060a3548c5ea038b4ade518cce92be32a6718d.tar.xz kernel-qcow2-linux-62060a3548c5ea038b4ade518cce92be32a6718d.zip | |
Merge tag 'omap-for-v4.3/dt-pt4-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Fix up bogus RTC compatible change for am4372 and add missing
DPLL for am4372 cpsw Ethernet driver. Also add ARM global and
local timers for am4372.
* tag 'omap-for-v4.3/dt-pt4-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
arm: boot: dts: am4372: add ARM timers and SCU nodes
ARM: dts: AM4372: Add the am4372-rtc compatible string
ARM: dts: am4372: Set the default clock rate for dpll_clksel_mac_clk clock
ARM: dts: AM437X: add dpll_clksel_mac_clk node
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/ti/clk-43xx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/ti/clk-43xx.c b/drivers/clk/ti/clk-43xx.c index 3795fce8a830..7549b87c41ef 100644 --- a/drivers/clk/ti/clk-43xx.c +++ b/drivers/clk/ti/clk-43xx.c @@ -71,6 +71,7 @@ static struct ti_dt_clk am43xx_clks[] = { DT_CLK(NULL, "clk_24mhz", "clk_24mhz"), DT_CLK(NULL, "cpsw_125mhz_gclk", "cpsw_125mhz_gclk"), DT_CLK(NULL, "cpsw_cpts_rft_clk", "cpsw_cpts_rft_clk"), + DT_CLK(NULL, "dpll_clksel_mac_clk", "dpll_clksel_mac_clk"), DT_CLK(NULL, "gpio0_dbclk_mux_ck", "gpio0_dbclk_mux_ck"), DT_CLK(NULL, "gpio0_dbclk", "gpio0_dbclk"), DT_CLK(NULL, "gpio1_dbclk", "gpio1_dbclk"), |