![Linus Torvalds](/assets/img/avatar_default.png)
New or improved SoC support: - Addition of support for Atmel's SAMA5D2 SoC - Addition of Freescale i.MX6UL - Improved support of TI's DM814x platform - Misc fixes and improvements for RockChip platforms - Marvell MVEBU suspend/resume support A few driver changes that ideally would belong in the drivers branch are also here (acked by appropriate maintainers): - Power key input driver for Freescale platforms (svns) - RTC driver updates for Freescale platforms (svns/mxc) - Clk fixes for TI DM814/816X + a bunch of other changes for various platforms -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJV5Mo6AAoJEIwa5zzehBx3VnMP/28LFJVUjIbd2xjJBo2gbSwV jN7uGlTkKU+1kHjZqnUPuirlBxBzsXKgRfBvCoeu0cPOggwmFcaF915/HHPz7xuz vTP7k98+Y5nSXScIohWkWCdZTpKKjve4sn74rXmiNakTUiuaHf5lKut/m7ldVrWd hN1o9W4LN+5O1mOYbc9ZD98v3bkDb6eu+a22oK7qemXiEiQi+NIMoDx+IR2bd4pA FeDaW7sOFWTEYU/p+M5nZNvI3n53P0/mlB5rPRiAYRjhQf9DrWHm5G7HdnMkUkgo /s8/QlVjBkJwhkY0TqpwtHY23JjSSB6UtCnXzb1eVAkX1nJN6PJQpcpCz1zJhd9q +sJ2k1zEvrfomJCK7/iZ1ubQE09KlJLEeb8xi5xCwD0MBOBAYC31bovDVAswCitV 8NHnfltEG+wCMyX955eqqGkVxkcw8sJMJUK5A95aK6w+vKqjd7gUgLJjXFC1u4eN ECuVVUf1hVmUEmM799CDayTlfGDt4oGLmHGao+SiSCVc1XbG9HkWr7Lcgr6u9UHr lNv3RIe6Axb85xxIU0/9hqLHrtB85uEQjjlbnQx3o7u8RsSOeaiZvCz4BzcjP9E1 VGyD6zkRWhuDiMFlPVXiAX0qIH5xSjIWkC0wPNJNy8eWFH9tkfGL0mOlLbl09oGR gtuvOrjbF/BhILkPw38y =8T5Z -----END PGP SIGNATURE----- Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC platform updates from Olof Johansson: "New or improved SoC support: - add support for Atmel's SAMA5D2 SoC - add support for Freescale i.MX6UL - improved support for TI's DM814x platform - misc fixes and improvements for RockChip platforms - Marvell MVEBU suspend/resume support A few driver changes that ideally would belong in the drivers branch are also here (acked by appropriate maintainers): - power key input driver for Freescale platforms (svns) - RTC driver updates for Freescale platforms (svns/mxc) - clk fixes for TI DM814/816X + a bunch of other changes for various platforms" * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits) ARM: rockchip: pm: Fix PTR_ERR() argument ARM: imx: mach-imx6ul: Fix allmodconfig build clk: ti: fix for definition movement ARM: uniphier: drop v7_invalidate_l1 call at secondary entry memory: kill off set_irq_flags usage rtc: snvs: select option REGMAP_MMIO ARM: brcmstb: select ARCH_DMA_ADDR_T_64BIT for LPAE ARM: BCM: Enable ARM erratum 798181 for BRCMSTB ARM: OMAP2+: Fix power domain operations regression caused by 81xx ARM: rockchip: enable PMU_GPIOINT_WAKEUP_EN when entering shallow suspend ARM: rockchip: set correct stabilization thresholds in suspend ARM: rockchip: rename osc_switch_to_32k variable ARM: imx6ul: add fec MAC refrence clock and phy fixup init ARM: imx6ul: add fec bits to GPR syscon definition rtc: mxc: add support of device tree dt-binding: document the binding for mxc rtc rtc: mxc: use a second rtc clock ARM: davinci: cp_intc: use IRQCHIP_SKIP_SET_WAKE instead of irq_set_wake callback soc: mediatek: Fix SCPSYS compilation ARM: at91/soc: add basic support for new sama5d2 SoC ...
56 lines
1.7 KiB
C
56 lines
1.7 KiB
C
/*
|
|
* 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/kernel.h>
|
|
#include <linux/list.h>
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/clk/ti.h>
|
|
|
|
#include "clock.h"
|
|
|
|
static struct ti_dt_clk dm816x_clks[] = {
|
|
DT_CLK(NULL, "sys_clkin", "sys_clkin_ck"),
|
|
DT_CLK(NULL, "timer_sys_ck", "sys_clkin_ck"),
|
|
DT_CLK(NULL, "sys_32k_ck", "sys_32k_ck"),
|
|
DT_CLK(NULL, "mpu_ck", "mpu_ck"),
|
|
DT_CLK(NULL, "timer1_fck", "timer1_fck"),
|
|
DT_CLK(NULL, "timer2_fck", "timer2_fck"),
|
|
DT_CLK(NULL, "timer3_fck", "timer3_fck"),
|
|
DT_CLK(NULL, "timer4_fck", "timer4_fck"),
|
|
DT_CLK(NULL, "timer5_fck", "timer5_fck"),
|
|
DT_CLK(NULL, "timer6_fck", "timer6_fck"),
|
|
DT_CLK(NULL, "timer7_fck", "timer7_fck"),
|
|
DT_CLK(NULL, "sysclk4_ck", "sysclk4_ck"),
|
|
DT_CLK(NULL, "sysclk5_ck", "sysclk5_ck"),
|
|
DT_CLK(NULL, "sysclk6_ck", "sysclk6_ck"),
|
|
DT_CLK(NULL, "sysclk10_ck", "sysclk10_ck"),
|
|
DT_CLK(NULL, "sysclk18_ck", "sysclk18_ck"),
|
|
DT_CLK(NULL, "sysclk24_ck", "sysclk24_ck"),
|
|
DT_CLK("4a100000.ethernet", "sysclk24_ck", "sysclk24_ck"),
|
|
{ .node_name = NULL },
|
|
};
|
|
|
|
static const char *enable_init_clks[] = {
|
|
"ddr_pll_clk1",
|
|
"ddr_pll_clk2",
|
|
"ddr_pll_clk3",
|
|
};
|
|
|
|
int __init dm816x_dt_clk_init(void)
|
|
{
|
|
ti_dt_clocks_register(dm816x_clks);
|
|
omap2_clk_disable_autoidle_all();
|
|
omap2_clk_enable_init_clocks(enable_init_clks,
|
|
ARRAY_SIZE(enable_init_clks));
|
|
|
|
return 0;
|
|
}
|