Merge branch 'for-4.3/clk' into for-4.3/dt

2026-11-10 20:48:12 +00:00 · 2015-08-21 18:44:15 +02:00 · 2015-08-21 18:44:15 +02:00 · 233da3b1c6
commit 233da3b1c6
parent 7292ba64bd 79cf95c763
13 changed files with 2396 additions and 9 deletions
--- a/Documentation/devicetree/bindings/clock/nvidia,tegra124-dfll.txt
+++ b/Documentation/devicetree/bindings/clock/nvidia,tegra124-dfll.txt
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
--- a/drivers/clk/tegra/Makefile
+++ b/drivers/clk/tegra/Makefile
--- a/drivers/clk/tegra/clk-dfll.c
+++ b/drivers/clk/tegra/clk-dfll.c
--- a/drivers/clk/tegra/clk-dfll.h
+++ b/drivers/clk/tegra/clk-dfll.h
--- a/drivers/clk/tegra/clk-tegra-super-gen4.c
+++ b/drivers/clk/tegra/clk-tegra-super-gen4.c
--- a/drivers/clk/tegra/clk-tegra124-dfll-fcpu.c
+++ b/drivers/clk/tegra/clk-tegra124-dfll-fcpu.c
--- a/drivers/clk/tegra/clk-tegra124.c
+++ b/drivers/clk/tegra/clk-tegra124.c
--- a/drivers/clk/tegra/clk.c
+++ b/drivers/clk/tegra/clk.c
--- a/drivers/clk/tegra/clk.h
+++ b/drivers/clk/tegra/clk.h
--- a/drivers/clk/tegra/cvb.c
+++ b/drivers/clk/tegra/cvb.c
--- a/drivers/clk/tegra/cvb.h
+++ b/drivers/clk/tegra/cvb.h
--- a/include/dt-bindings/reset/tegra124-car.h
+++ b/include/dt-bindings/reset/tegra124-car.h