summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-05-29 12:43:43 -0700
committerOlof Johansson <olof@lixom.net>2014-05-29 12:43:43 -0700
commite1134cb6b3b8baa6d5d8dc858b9e71f7a060db4f (patch)
treee5dce08c83c2b7ce2e6e56975d2d63ff3384a5fe /drivers
parent81d1d392f30b6d8772dca6469adb8694280e1477 (diff)
parent43369f0fe81044427f6b1eedeb16bf8c74c86d48 (diff)
Merge tag 'omap-for-v3.16/dt-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Merge "omap dt fixes and and clocks for v3.16 merge window" from Tony Lindgren: Most likely the last pull request from me for omap changes for v3.16 that's dts fixes for clocks and enabling few features that were still being discussed earlier: - A bunch of omap clock related dts fixes queued by Tero Kristo. - Enable parallel nand on am437x that was not merged earlier as I requested more information about the muxing for it. And we need to also enable ecc hardware support for am43xx. - Enable the modem support for n900 that was dropped earlier because we had to fix the related hwmod entry first with patch ARM: OMAP2+: Fix ssi hwmod entry to allow idling. - And finally, add the omap2 clock dts files. These will allow us to enable the dt clocks and drop the legacy clocks for omap2 with a follow-up patch once the related clock driver binding changes are merged. * tag 'omap-for-v3.16/dt-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: omap2 clock data ARM: dts: am437x-gp-evm: add support for parallel NAND flash ARM: OMAP2+: gpmc: enable BCH_HW ecc-scheme for AM43xx platforms ARM: dts: omap3 a83x: fix duplicate usb pin config ARM: dts: omap3: set mcbsp2 status ARM: dts: omap3-n900: Add modem support ARM: dts: omap3-n900: Add SSI support ARM: OMAP2+: Fix ssi hwmod entry to allow idling ARM: dts: AM4372: clk: efuse based crystal frequency detect ARM: dts: am43xx-clocks.dtsi: add ti, set-rate-parent to display clock path ARM: dts: omap5-clocks.dtsi: add ti, set-rate-parent to dss_dss_clk ARM: dts: omap4: add twd clock to DT ARM: dts: omap54xx-clocks: Correct abe_iclk clock node ARM: dts: omap54xx-clocks: remove the autoidle properties for clock nodes ARM: dts: am43x-clock: add tbclk data for ehrpwm ARM: dts: am33xx-clock: Fix ehrpwm tbclk data ARM: dts: set 'ti,set-rate-parent' for dpll4_m5 path ARM: dts: use ti,fixed-factor-clock for dpll4_m5x2_mul_ck ARM: dts: am43xx-clocks: use ti, fixed-factor-clock for dpll_per_clkdcoldo Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/clk/ti/clk-43xx.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/clk/ti/clk-43xx.c b/drivers/clk/ti/clk-43xx.c
index 67c8de572c5..527a43da3d3 100644
--- a/drivers/clk/ti/clk-43xx.c
+++ b/drivers/clk/ti/clk-43xx.c
@@ -105,6 +105,12 @@ static struct ti_dt_clk am43xx_clks[] = {
DT_CLK(NULL, "func_12m_clk", "func_12m_clk"),
DT_CLK(NULL, "vtp_clk_div", "vtp_clk_div"),
DT_CLK(NULL, "usbphy_32khz_clkmux", "usbphy_32khz_clkmux"),
+ DT_CLK("48300200.ehrpwm", "tbclk", "ehrpwm0_tbclk"),
+ DT_CLK("48302200.ehrpwm", "tbclk", "ehrpwm1_tbclk"),
+ DT_CLK("48304200.ehrpwm", "tbclk", "ehrpwm2_tbclk"),
+ DT_CLK("48306200.ehrpwm", "tbclk", "ehrpwm3_tbclk"),
+ DT_CLK("48308200.ehrpwm", "tbclk", "ehrpwm4_tbclk"),
+ DT_CLK("4830a200.ehrpwm", "tbclk", "ehrpwm5_tbclk"),
{ .node_name = NULL },
};