mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +00:00
Merge branch 'clk-k3-tisci' into clk-next
- TI SCI clks on K3 SoCs * clk-k3-tisci: clk: keystone: add missing MODULE_LICENSE clk: keystone: Enable TISCI clocks if K3_ARCH
This commit is contained in:
commit
cc2adbe370
@ -73,6 +73,7 @@ obj-$(CONFIG_ARCH_HISI) += hisilicon/
|
||||
obj-y += imgtec/
|
||||
obj-$(CONFIG_ARCH_MXC) += imx/
|
||||
obj-$(CONFIG_MACH_INGENIC) += ingenic/
|
||||
obj-$(CONFIG_ARCH_K3) += keystone/
|
||||
obj-$(CONFIG_ARCH_KEYSTONE) += keystone/
|
||||
obj-$(CONFIG_MACH_LOONGSON32) += loongson1/
|
||||
obj-y += mediatek/
|
||||
|
@ -7,7 +7,7 @@ config COMMON_CLK_KEYSTONE
|
||||
|
||||
config TI_SCI_CLK
|
||||
tristate "TI System Control Interface clock drivers"
|
||||
depends on (ARCH_KEYSTONE || COMPILE_TEST) && OF
|
||||
depends on (ARCH_KEYSTONE || ARCH_K3 || COMPILE_TEST) && OF
|
||||
depends on TI_SCI_PROTOCOL
|
||||
default ARCH_KEYSTONE
|
||||
---help---
|
||||
|
@ -266,3 +266,8 @@ static void __init of_keystone_psc_clk_init(struct device_node *node)
|
||||
}
|
||||
CLK_OF_DECLARE(keystone_gate_clk, "ti,keystone,psc-clock",
|
||||
of_keystone_psc_clk_init);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("Clock driver for Keystone 2 based devices");
|
||||
MODULE_AUTHOR("Murali Karicheri <m-karicheri2@ti.com>");
|
||||
MODULE_AUTHOR("Santosh Shilimkar <santosh.shilimkar@ti.com>");
|
||||
|
@ -338,3 +338,8 @@ static void __init of_pll_mux_clk_init(struct device_node *node)
|
||||
pr_err("%s: error registering mux %s\n", __func__, clk_name);
|
||||
}
|
||||
CLK_OF_DECLARE(pll_mux_clock, "ti,keystone,pll-mux-clock", of_pll_mux_clk_init);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("PLL clock driver for Keystone devices");
|
||||
MODULE_AUTHOR("Murali Karicheri <m-karicheri2@ti.com>");
|
||||
MODULE_AUTHOR("Santosh Shilimkar <santosh.shilimkar@ti.com>");
|
||||
|
Loading…
Reference in New Issue
Block a user