Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+12 -1
+1
drivers/clk/Makefile
··· 73 73 obj-y += imgtec/ 74 74 obj-$(CONFIG_ARCH_MXC) += imx/ 75 75 obj-$(CONFIG_MACH_INGENIC) += ingenic/ 76 + obj-$(CONFIG_ARCH_K3) += keystone/ 76 77 obj-$(CONFIG_ARCH_KEYSTONE) += keystone/ 77 78 obj-$(CONFIG_MACH_LOONGSON32) += loongson1/ 78 79 obj-y += mediatek/
+1 -1
drivers/clk/keystone/Kconfig
··· 7 7 8 8 config TI_SCI_CLK 9 9 tristate "TI System Control Interface clock drivers" 10 - depends on (ARCH_KEYSTONE || COMPILE_TEST) && OF 10 + depends on (ARCH_KEYSTONE || ARCH_K3 || COMPILE_TEST) && OF 11 11 depends on TI_SCI_PROTOCOL 12 12 default ARCH_KEYSTONE 13 13 ---help---
+5
drivers/clk/keystone/gate.c
··· 266 266 } 267 267 CLK_OF_DECLARE(keystone_gate_clk, "ti,keystone,psc-clock", 268 268 of_keystone_psc_clk_init); 269 + 270 + MODULE_LICENSE("GPL"); 271 + MODULE_DESCRIPTION("Clock driver for Keystone 2 based devices"); 272 + MODULE_AUTHOR("Murali Karicheri <m-karicheri2@ti.com>"); 273 + MODULE_AUTHOR("Santosh Shilimkar <santosh.shilimkar@ti.com>");
+5
drivers/clk/keystone/pll.c
··· 338 338 pr_err("%s: error registering mux %s\n", __func__, clk_name); 339 339 } 340 340 CLK_OF_DECLARE(pll_mux_clock, "ti,keystone,pll-mux-clock", of_pll_mux_clk_init); 341 + 342 + MODULE_LICENSE("GPL"); 343 + MODULE_DESCRIPTION("PLL clock driver for Keystone devices"); 344 + MODULE_AUTHOR("Murali Karicheri <m-karicheri2@ti.com>"); 345 + MODULE_AUTHOR("Santosh Shilimkar <santosh.shilimkar@ti.com>");