diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-18 13:33:48 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-18 13:33:48 -0700 |
| commit | 62060a3548c5ea038b4ade518cce92be32a6718d (patch) | |
| tree | 5c43e721ce0c0ab53cd0d3b237d15dc8ded51a0a /drivers/mfd/rk808.c | |
| parent | 582271a3d0c8eed65d8716cf8dba6fa04e9bfc85 (diff) | |
| parent | 8cbd4c2f6a996f6cf5dfdf8775d331606cff95bd (diff) | |
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/mfd/rk808.c')
0 files changed, 0 insertions, 0 deletions