Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ba8dac0 authored by Mike Turquette's avatar Mike Turquette
Browse files

Merge branch 'clk-fixes' into clk-next

parents 7e50e7e1 f63fcc90

drivers/clk/at91/clk-master.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ of_at91_clk_master_setup(struct device_node *np, struct at91_pmc *pmc, 


	irq = irq_of_parse_and_map(np, 0);

	if (!irq)

		return;

		goto out_free_characteristics;



	clk = at91_clk_register_master(pmc, irq, name, num_parents,

				       parent_names, layout,

drivers/clk/clk-nomadik.c

+3 −0
Original line number Diff line number Diff line
@@ -494,6 +494,9 @@ static const struct file_operations nomadik_src_clk_debugfs_ops = { 


static int __init nomadik_src_clk_init_debugfs(void)

{

	/* Vital for multiplatform */

	if (!src_base)

		return -ENODEV;

	src_pcksr0_boot = readl(src_base + SRC_PCKSR0);

	src_pcksr1_boot = readl(src_base + SRC_PCKSR1);

	debugfs_create_file("nomadik-src-clk", S_IFREG | S_IRUGO,