Merge branch 'clk-next-shmobile' into clk-next

2026-10-26 19:14:18 +00:00 · 2013-12-12 19:29:03 -08:00 · 2013-12-12 19:29:03 -08:00 · 7535d8f930
commit 7535d8f930
parent cdf64eeeb0 f94859c215
9 changed files with 850 additions and 0 deletions
--- a/Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt
+++ b/Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt
--- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
--- a/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt
+++ b/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
--- a/drivers/clk/shmobile/Makefile
+++ b/drivers/clk/shmobile/Makefile
--- a/drivers/clk/shmobile/clk-div6.c
+++ b/drivers/clk/shmobile/clk-div6.c
--- a/drivers/clk/shmobile/clk-mstp.c
+++ b/drivers/clk/shmobile/clk-mstp.c
--- a/drivers/clk/shmobile/clk-rcar-gen2.c
+++ b/drivers/clk/shmobile/clk-rcar-gen2.c
--- a/include/linux/clk/shmobile.h
+++ b/include/linux/clk/shmobile.h