ARM: tegra: Use <linux/clk/tegra.h> instead of <mach/clk.h>
So that the upstream common clk infrastructure can live side by side.
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Change-Id: I0fe0ef8cd207d27b707821eed838c75b8ec04025
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 551a200..a133ff7 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -181,6 +181,7 @@
select PINCTRL
select TEGRA_DC_TEMPORAL_DITHER
select REGULATOR_TEGRA_DFLL_BYPASS
+ select HAVE_ARM_ARCH_TIMER
help
Support for NVIDIA Tegra 12x family of SoCs, based upon the
ARM Cortex-A15MP CPU
diff --git a/arch/arm/mach-tegra/board-ardbeg.c b/arch/arm/mach-tegra/board-ardbeg.c
index c669fb2d..fd571ed 100644
--- a/arch/arm/mach-tegra/board-ardbeg.c
+++ b/arch/arm/mach-tegra/board-ardbeg.c
@@ -52,8 +52,8 @@
#include <linux/edp.h>
#include <linux/usb/tegra_usb_phy.h>
#include <linux/mfd/palmas.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#include <mach/irqs.h>
#include <mach/pci.h>
#include <mach/tegra_fiq_debugger.h>
diff --git a/arch/arm/mach-tegra/board-bonaire.c b/arch/arm/mach-tegra/board-bonaire.c
index 04552d3..cd7eb3f 100644
--- a/arch/arm/mach-tegra/board-bonaire.c
+++ b/arch/arm/mach-tegra/board-bonaire.c
@@ -38,7 +38,7 @@
#include <linux/platform_data/tegra_usb.h>
#include <linux/platform_data/serial-tegra.h>
#include <linux/of_platform.h>
-#include <mach/clk.h>
+#include <linux/clk/tegra.h>
#include <mach/gpio-tegra.h>
#include <mach/io_dpd.h>
diff --git a/arch/arm/mach-tegra/board-common.c b/arch/arm/mach-tegra/board-common.c
index 575d286..d432221 100644
--- a/arch/arm/mach-tegra/board-common.c
+++ b/arch/arm/mach-tegra/board-common.c
@@ -21,8 +21,8 @@
#include <linux/clk.h>
#include <linux/serial_8250.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#include <mach/edp.h>
#include "board.h"
@@ -118,8 +118,10 @@
if (!IS_ERR_OR_NULL(debug_uart_clk)) {
struct clk *c;
+#ifndef CONFIG_COMMON_CLK
pr_info("The debug console clock name is %s\n",
debug_uart_clk->name);
+#endif
c = tegra_get_clock_by_name("pll_p");
if (IS_ERR_OR_NULL(c))
pr_err("Not getting the parent clock pll_p\n");
diff --git a/arch/arm/mach-tegra/board-curacao.c b/arch/arm/mach-tegra/board-curacao.c
index 571bd1c..b32109c 100644
--- a/arch/arm/mach-tegra/board-curacao.c
+++ b/arch/arm/mach-tegra/board-curacao.c
@@ -36,8 +36,8 @@
#include <linux/platform_data/tegra_usb.h>
#include <linux/of_platform.h>
#include <linux/usb/tegra_usb_phy.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#include <mach/gpio-tegra.h>
#include <mach/iomap.h>
#include <mach/io_dpd.h>
diff --git a/arch/arm/mach-tegra/board-dalmore.c b/arch/arm/mach-tegra/board-dalmore.c
index 3a34e3d..c9205b6 100644
--- a/arch/arm/mach-tegra/board-dalmore.c
+++ b/arch/arm/mach-tegra/board-dalmore.c
@@ -48,8 +48,8 @@
#include <linux/of_platform.h>
#include <linux/edp.h>
#include <linux/usb/tegra_usb_phy.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#include <mach/irqs.h>
#include <mach/pinmux.h>
#include <mach/pinmux-t11.h>
diff --git a/arch/arm/mach-tegra/board-loki.c b/arch/arm/mach-tegra/board-loki.c
index 8234f86..99eb06d 100644
--- a/arch/arm/mach-tegra/board-loki.c
+++ b/arch/arm/mach-tegra/board-loki.c
@@ -52,8 +52,8 @@
#include <linux/edp.h>
#include <linux/mfd/palmas.h>
#include <linux/usb/tegra_usb_phy.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#include <mach/irqs.h>
#include <mach/pci.h>
#include <mach/tegra_fiq_debugger.h>
diff --git a/arch/arm/mach-tegra/board-macallan.c b/arch/arm/mach-tegra/board-macallan.c
index b4c2c13..3c2c22f 100644
--- a/arch/arm/mach-tegra/board-macallan.c
+++ b/arch/arm/mach-tegra/board-macallan.c
@@ -46,8 +46,8 @@
#include <linux/i2c/at24.h>
#include <linux/of_platform.h>
#include <linux/edp.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#include <mach/irqs.h>
#include <mach/pinmux.h>
#include <mach/pinmux-t11.h>
diff --git a/arch/arm/mach-tegra/board-pismo.c b/arch/arm/mach-tegra/board-pismo.c
index f2ff716..98453b4 100644
--- a/arch/arm/mach-tegra/board-pismo.c
+++ b/arch/arm/mach-tegra/board-pismo.c
@@ -48,8 +48,8 @@
#include <linux/of_platform.h>
#include <linux/edp.h>
#include <linux/usb/tegra_usb_phy.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#include <mach/irqs.h>
#include <mach/pinmux.h>
#include <mach/pinmux-t11.h>
diff --git a/arch/arm/mach-tegra/board-pluto.c b/arch/arm/mach-tegra/board-pluto.c
index 390c875..447f6bb 100644
--- a/arch/arm/mach-tegra/board-pluto.c
+++ b/arch/arm/mach-tegra/board-pluto.c
@@ -52,8 +52,8 @@
#include <linux/mfd/tlv320aic3262-registers.h>
#include <linux/mfd/tlv320aic3xxx-core.h>
#include <linux/usb/tegra_usb_phy.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#include <mach/irqs.h>
#include <mach/pinmux.h>
#include <mach/pinmux-t11.h>
diff --git a/arch/arm/mach-tegra/board-roth.c b/arch/arm/mach-tegra/board-roth.c
index 35bdd9a..2a2b302 100644
--- a/arch/arm/mach-tegra/board-roth.c
+++ b/arch/arm/mach-tegra/board-roth.c
@@ -46,9 +46,10 @@
#include <linux/issp.h>
#include <linux/of_platform.h>
#include <linux/usb/tegra_usb_phy.h>
+#include <linux/clk/tegra.h>
+
#include <asm/system_info.h>
-#include <mach/clk.h>
#include <mach/irqs.h>
#include <mach/pinmux.h>
#include <mach/pinmux-t11.h>
diff --git a/arch/arm/mach-tegra/dvfs.c b/arch/arm/mach-tegra/dvfs.c
index b32769e..55d3799 100644
--- a/arch/arm/mach-tegra/dvfs.c
+++ b/arch/arm/mach-tegra/dvfs.c
@@ -33,6 +33,7 @@
#include <linux/delay.h>
#include <linux/clk/tegra.h>
#include <linux/reboot.h>
+#include <linux/clk/tegra.h>
#include <mach/hardware.h>
diff --git a/arch/arm/mach-tegra/hotplug.c b/arch/arm/mach-tegra/hotplug.c
index 52ced7f..b07a52c 100644
--- a/arch/arm/mach-tegra/hotplug.c
+++ b/arch/arm/mach-tegra/hotplug.c
@@ -12,6 +12,7 @@
#include <linux/smp.h>
#include <linux/clk/tegra.h>
#include <linux/cpu_pm.h>
+#include <linux/clk/tegra.h>
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
diff --git a/arch/arm/mach-tegra/latency_allowance.c b/arch/arm/mach-tegra/latency_allowance.c
index 2f6fec0..dcce132 100644
--- a/arch/arm/mach-tegra/latency_allowance.c
+++ b/arch/arm/mach-tegra/latency_allowance.c
@@ -25,12 +25,12 @@
#include <linux/spinlock.h>
#include <linux/stringify.h>
#include <linux/clk.h>
+#include <linux/clk/tegra.h>
#include <linux/syscore_ops.h>
#include <asm/bug.h>
#include <asm/io.h>
#include <asm/string.h>
#include <mach/hardware.h>
-#include <mach/clk.h>
#include <mach/latency_allowance.h>
#include "la_priv.h"
diff --git a/arch/arm/mach-tegra/pcie.c b/arch/arm/mach-tegra/pcie.c
index b5518fb..a00752e 100644
--- a/arch/arm/mach-tegra/pcie.c
+++ b/arch/arm/mach-tegra/pcie.c
@@ -39,6 +39,7 @@
#include <linux/workqueue.h>
#include <linux/gpio.h>
#include <linux/clk.h>
+#include <linux/clk/tegra.h>
#include <linux/async.h>
#include <linux/vmalloc.h>
#include <linux/pm_runtime.h>
diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c
index f3227bd..c3eed84 100644
--- a/arch/arm/mach-tegra/platsmp.c
+++ b/arch/arm/mach-tegra/platsmp.c
@@ -290,7 +290,7 @@
- CPU mode switch is not allowed */
status = -EINVAL;
} else {
-#ifdef CONFIG_CPU_FREQ
+#if defined(CONFIG_CPU_FREQ) && !defined(CONFIG_COMMON_CLK)
/* set cpu rate is within g-mode range before switch */
unsigned int speed = max(
(unsigned long)tegra_getspeed(0),
diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c
index ee23231..8374cd1 100644
--- a/arch/arm/mach-tegra/pm.c
+++ b/arch/arm/mach-tegra/pm.c
@@ -47,6 +47,7 @@
#include <linux/memblock.h>
#include <linux/console.h>
#include <linux/tegra_audio.h>
+#include <linux/clk/tegra.h>
#include <trace/events/power.h>
#include <trace/events/nvsecurity.h>
diff --git a/arch/arm/mach-tegra/powergate-priv.h b/arch/arm/mach-tegra/powergate-priv.h
index 50ca510..996d915 100644
--- a/arch/arm/mach-tegra/powergate-priv.h
+++ b/arch/arm/mach-tegra/powergate-priv.h
@@ -18,11 +18,11 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/clk.h>
+#include <linux/clk/tegra.h>
#include <linux/err.h>
#include <linux/spinlock.h>
#include <linux/io.h>
-#include <mach/clk.h>
#include <mach/powergate.h>
#include "clock.h"
diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c
index bca08f9..6f5a41d 100644
--- a/arch/arm/mach-tegra/powergate.c
+++ b/arch/arm/mach-tegra/powergate.c
@@ -21,6 +21,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/clk.h>
+#include <linux/clk/tegra.h>
#include <linux/string.h>
#include <linux/debugfs.h>
#include <linux/delay.h>
diff --git a/arch/arm/mach-tegra/tegra11x_la.c b/arch/arm/mach-tegra/tegra11x_la.c
index 138c306..bb15cab 100644
--- a/arch/arm/mach-tegra/tegra11x_la.c
+++ b/arch/arm/mach-tegra/tegra11x_la.c
@@ -19,9 +19,9 @@
#include <linux/err.h>
#include <linux/stringify.h>
#include <linux/clk.h>
+#include <linux/clk/tegra.h>
#include <asm/io.h>
#include <mach/hardware.h>
-#include <mach/clk.h>
#include <mach/latency_allowance.h>
#include "iomap.h"
diff --git a/arch/arm/mach-tegra/tegra12_clocks.c b/arch/arm/mach-tegra/tegra12_clocks.c
index 2b21b06..04fbb9c 100644
--- a/arch/arm/mach-tegra/tegra12_clocks.c
+++ b/arch/arm/mach-tegra/tegra12_clocks.c
@@ -46,7 +46,6 @@
#include "devices.h"
#include "tegra12_emc.h"
#include "tegra_cl_dvfs.h"
-#include "tegra_cpu_car.h"
/* FIXME: Disable for initial Si bringup */
#undef USE_PLLE_SS
diff --git a/arch/arm/mach-tegra/tegra14x_la.c b/arch/arm/mach-tegra/tegra14x_la.c
index f356c1a..22f7c62 100644
--- a/arch/arm/mach-tegra/tegra14x_la.c
+++ b/arch/arm/mach-tegra/tegra14x_la.c
@@ -19,9 +19,9 @@
#include <linux/err.h>
#include <linux/stringify.h>
#include <linux/clk.h>
+#include <linux/clk/tegra.h>
#include <asm/io.h>
#include <mach/hardware.h>
-#include <mach/clk.h>
#include <mach/latency_allowance.h>
#include "iomap.h"
diff --git a/arch/arm/mach-tegra/tegra3_la.c b/arch/arm/mach-tegra/tegra3_la.c
index 61f9a84..44dbd75 100644
--- a/arch/arm/mach-tegra/tegra3_la.c
+++ b/arch/arm/mach-tegra/tegra3_la.c
@@ -19,9 +19,9 @@
#include <linux/err.h>
#include <linux/stringify.h>
#include <linux/clk.h>
+#include <linux/clk/tegra.h>
#include <asm/io.h>
#include <mach/hardware.h>
-#include <mach/clk.h>
#include <mach/latency_allowance.h>
#include "iomap.h"
diff --git a/arch/arm/mach-tegra/tegra_bb.c b/arch/arm/mach-tegra/tegra_bb.c
index 9eb40aa..63fc1b0 100644
--- a/arch/arm/mach-tegra/tegra_bb.c
+++ b/arch/arm/mach-tegra/tegra_bb.c
@@ -30,10 +30,10 @@
#include <asm/io.h>
#include <linux/regulator/consumer.h>
#include <linux/clk.h>
+#include <linux/clk/tegra.h>
#include <linux/suspend.h>
#include <linux/pm_runtime.h>
-#include <mach/clk.h>
#include <mach/tegra_bb.h>
#include <mach/tegra_bbc_proxy.h>
#include <mach/pm_domains.h>
diff --git a/drivers/ata/ahci-tegra.c b/drivers/ata/ahci-tegra.c
index 6f30112..9b38245 100644
--- a/drivers/ata/ahci-tegra.c
+++ b/drivers/ata/ahci-tegra.c
@@ -45,7 +45,7 @@
#include "ahci.h"
#include <linux/clk.h>
-#include <mach/clk.h>
+#include <linux/clk/tegra.h>
#include <mach/iomap.h>
#include <mach/powergate.h>
#include <linux/platform_data/tegra_ahci.h>
diff --git a/drivers/hwmon/tegra-tsensor.c b/drivers/hwmon/tegra-tsensor.c
index 0e0d265..ab2c92a 100644
--- a/drivers/hwmon/tegra-tsensor.c
+++ b/drivers/hwmon/tegra-tsensor.c
@@ -30,8 +30,8 @@
#include <linux/regulator/consumer.h>
#include <linux/delay.h>
#include <linux/module.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#include <mach/tsensor.h>
#include <mach/tegra_fuse.h>
diff --git a/drivers/i2c/busses/i2c-slave-tegra.c b/drivers/i2c/busses/i2c-slave-tegra.c
index 82f3cfa..afd3e35 100644
--- a/drivers/i2c/busses/i2c-slave-tegra.c
+++ b/drivers/i2c/busses/i2c-slave-tegra.c
@@ -32,7 +32,7 @@
#include <linux/i2c-slave.h>
#include <linux/module.h>
#include <asm/unaligned.h>
-#include <mach/clk.h>
+#include <linux/clk/tegra.h>
#include <mach/pinmux.h>
#include <linux/pm_runtime.h>
#define BYTES_PER_FIFO_WORD 4
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 27d1498..2525315 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -38,6 +38,7 @@
#include <linux/module.h>
#include <linux/clk/tegra.h>
#include <linux/spinlock.h>
+#include <linux/clk/tegra.h>
#include <asm/unaligned.h>
diff --git a/drivers/media/platform/tegra/nvavp/nvavp_dev.c b/drivers/media/platform/tegra/nvavp/nvavp_dev.c
index 4265a43..4f87c28 100644
--- a/drivers/media/platform/tegra/nvavp/nvavp_dev.c
+++ b/drivers/media/platform/tegra/nvavp/nvavp_dev.c
@@ -37,8 +37,8 @@
#include <linux/vmalloc.h>
#include <linux/workqueue.h>
#include <linux/pm_runtime.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#include <mach/hardware.h>
#include <mach/legacy_irq.h>
#include <mach/pm_domains.h>
diff --git a/drivers/mipi_bif/mipi-bif-tegra.c b/drivers/mipi_bif/mipi-bif-tegra.c
index e126720..ffcb967 100644
--- a/drivers/mipi_bif/mipi-bif-tegra.c
+++ b/drivers/mipi_bif/mipi-bif-tegra.c
@@ -29,8 +29,8 @@
#include <linux/slab.h>
#include <linux/mipi-bif-tegra.h>
#include <linux/pm_runtime.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#define TEGRA_MIPIBIF_TIMEOUT 1000
#define MIPIBIF_CTRL 0x0
diff --git a/drivers/misc/tegra-cec/tegra_cec.c b/drivers/misc/tegra-cec/tegra_cec.c
index 18357e3..b4e0a30 100644
--- a/drivers/misc/tegra-cec/tegra_cec.c
+++ b/drivers/misc/tegra-cec/tegra_cec.c
@@ -34,8 +34,7 @@
#include <linux/platform_device.h>
#include <linux/miscdevice.h>
-
-#include <mach/clk.h>
+#include <linux/clk/tegra.h>
#include "tegra_cec.h"
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index eacb9db..60f5fc5 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -40,12 +40,12 @@
#include <linux/seq_file.h>
#include <linux/reboot.h>
#include <linux/devfreq.h>
+#include <linux/clk/tegra.h>
#include <mach/hardware.h>
#include <linux/platform_data/mmc-sdhci-tegra.h>
#include <mach/pinmux.h>
#include <mach/pm_domains.h>
-#include <mach/clk.h>
#include "sdhci-pltfm.h"
diff --git a/drivers/platform/tegra/tegra_usb_pmc.c b/drivers/platform/tegra/tegra_usb_pmc.c
index 61fd1b3..8ca4e90 100644
--- a/drivers/platform/tegra/tegra_usb_pmc.c
+++ b/drivers/platform/tegra/tegra_usb_pmc.c
@@ -25,7 +25,7 @@
#include <linux/clk.h>
#include <linux/regulator/consumer.h>
#include <linux/platform_data/tegra_usb.h>
-#include <mach/clk.h>
+#include <linux/clk/tegra.h>
#include <mach/pinmux.h>
#include <mach/pinmux-t11.h>
#include <mach/tegra_usb_pmc.h>
diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
index cf9924e..8956541 100644
--- a/drivers/spi/spi-tegra114.c
+++ b/drivers/spi/spi-tegra114.c
@@ -35,8 +35,7 @@
#include <linux/of_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi-tegra.h>
-
-#include <mach/clk.h>
+#include <linux/clk/tegra.h>
#define SPI_COMMAND1 0x000
#define SPI_BIT_LENGTH(x) (((x) & 0x1f) << 0)
diff --git a/drivers/tty/serial/serial-tegra.c b/drivers/tty/serial/serial-tegra.c
index a18a606..054c427 100644
--- a/drivers/tty/serial/serial-tegra.c
+++ b/drivers/tty/serial/serial-tegra.c
@@ -44,7 +44,7 @@
#include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/platform_data/serial-tegra.h>
-#include <mach/clk.h>
+#include <linux/clk/tegra.h>
#define TEGRA_UART_TYPE "SERIAL_TEGRA"
#define TX_EMPTY_STATUS (UART_LSR_TEMT | UART_LSR_THRE)
diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
index d852b8b..1df744e 100644
--- a/drivers/usb/host/xhci-tegra.c
+++ b/drivers/usb/host/xhci-tegra.c
@@ -33,9 +33,9 @@
#include <linux/kthread.h>
#include <linux/gpio.h>
#include <linux/usb/otg.h>
+#include <linux/clk/tegra.h>
#include <mach/powergate.h>
-#include <mach/clk.h>
#include <mach/tegra_usb_pad_ctrl.h>
#include <mach/tegra_usb_pmc.h>
#include <mach/pm_domains.h>
diff --git a/drivers/usb/phy/tegra11x_usb_phy.c b/drivers/usb/phy/tegra11x_usb_phy.c
index 73c20dc..3c458a7 100644
--- a/drivers/usb/phy/tegra11x_usb_phy.c
+++ b/drivers/usb/phy/tegra11x_usb_phy.c
@@ -27,7 +27,7 @@
#include <linux/clk.h>
#include <linux/regulator/consumer.h>
#include <linux/platform_data/tegra_usb.h>
-#include <mach/clk.h>
+#include <linux/clk/tegra.h>
#include <mach/pinmux.h>
#include <mach/tegra_usb_pmc.h>
#include <mach/tegra_usb_pad_ctrl.h>
diff --git a/drivers/usb/phy/tegra2_usb_phy.c b/drivers/usb/phy/tegra2_usb_phy.c
index 1f77be2..d7eb230 100644
--- a/drivers/usb/phy/tegra2_usb_phy.c
+++ b/drivers/usb/phy/tegra2_usb_phy.c
@@ -28,10 +28,10 @@
#include <linux/clk.h>
#include <linux/regulator/consumer.h>
#include <linux/platform_data/tegra_usb.h>
+#include <linux/clk/tegra.h>
#include <asm/mach-types.h>
-#include <mach/clk.h>
#include <mach/iomap.h>
#include <mach/pinmux.h>
#include <mach/pinmux-tegra20.h>
diff --git a/drivers/usb/phy/tegra3_usb_phy.c b/drivers/usb/phy/tegra3_usb_phy.c
index aa3ab89..561c8a3 100644
--- a/drivers/usb/phy/tegra3_usb_phy.c
+++ b/drivers/usb/phy/tegra3_usb_phy.c
@@ -26,7 +26,7 @@
#include <linux/clk.h>
#include <linux/regulator/consumer.h>
#include <linux/platform_data/tegra_usb.h>
-#include <mach/clk.h>
+#include <linux/clk/tegra.h>
#include <mach/pinmux.h>
#include <mach/pinmux-tegra30.h>
#include "tegra_usb_phy.h"
diff --git a/drivers/video/tegra/camera/camera_priv_defs.h b/drivers/video/tegra/camera/camera_priv_defs.h
index 5558694..b4e755d 100644
--- a/drivers/video/tegra/camera/camera_priv_defs.h
+++ b/drivers/video/tegra/camera/camera_priv_defs.h
@@ -29,9 +29,9 @@
#include <linux/delay.h>
#include <linux/export.h>
#include <linux/slab.h>
+#include <linux/clk/tegra.h>
#include <mach/powergate.h>
-#include <mach/clk.h>
#include <mach/mc.h>
#if defined(CONFIG_TEGRA_ISOMGR)
#include <mach/isomgr.h>
diff --git a/drivers/video/tegra/dc/bandwidth.c b/drivers/video/tegra/dc/bandwidth.c
index 1225fb1..a8f6966 100644
--- a/drivers/video/tegra/dc/bandwidth.c
+++ b/drivers/video/tegra/dc/bandwidth.c
@@ -19,8 +19,8 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/clk.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#include <mach/dc.h>
#include <mach/fb.h>
#include <mach/mc.h>
diff --git a/drivers/video/tegra/dc/clock.c b/drivers/video/tegra/dc/clock.c
index a36dc59..d6fd51c 100644
--- a/drivers/video/tegra/dc/clock.c
+++ b/drivers/video/tegra/dc/clock.c
@@ -19,8 +19,8 @@
#include <linux/err.h>
#include <linux/types.h>
#include <linux/clk.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#include <mach/dc.h>
#include "dc_reg.h"
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index 26e0b47..e5091d8 100644
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -37,6 +37,7 @@
#include <linux/backlight.h>
#include <linux/gpio.h>
#include <linux/nvhost.h>
+#include <linux/clk/tegra.h>
#include <video/tegrafb.h>
#include <drm/drm_fixed.h>
#ifdef CONFIG_SWITCH
@@ -46,7 +47,6 @@
#define CREATE_TRACE_POINTS
#include <trace/events/display.h>
-#include <mach/clk.h>
#include <mach/dc.h>
#include <mach/fb.h>
#include <mach/mc.h>
diff --git a/drivers/video/tegra/dc/dc_priv_defs.h b/drivers/video/tegra/dc/dc_priv_defs.h
index b308a35..0acd731 100644
--- a/drivers/video/tegra/dc/dc_priv_defs.h
+++ b/drivers/video/tegra/dc/dc_priv_defs.h
@@ -28,12 +28,12 @@
#include <linux/switch.h>
#include <linux/nvhost.h>
#include <linux/types.h>
+#include <linux/clk/tegra.h>
#include <mach/dc.h>
#include <mach/tegra_dc_ext.h>
#include <mach/hardware.h>
-#include <mach/clk.h>
#include <mach/isomgr.h>
#include "dc_reg.h"
diff --git a/drivers/video/tegra/dc/dsi.c b/drivers/video/tegra/dc/dsi.c
index b124808..cdb9376 100644
--- a/drivers/video/tegra/dc/dsi.c
+++ b/drivers/video/tegra/dc/dsi.c
@@ -34,8 +34,8 @@
#include <linux/of_gpio.h>
#include <linux/regulator/consumer.h>
#include <linux/pm_runtime.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#include <mach/dc.h>
#include <mach/fb.h>
#include <mach/csi.h>
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c
index 946549a..657f37e 100644
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@ -34,8 +34,8 @@
#include <linux/seq_file.h>
#include <linux/device.h>
#include <linux/export.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#include <mach/dc.h>
#include <mach/fb.h>
#include <linux/nvhost.h>
diff --git a/drivers/video/tegra/dc/mode.c b/drivers/video/tegra/dc/mode.c
index d71748f..4c2fd73 100644
--- a/drivers/video/tegra/dc/mode.c
+++ b/drivers/video/tegra/dc/mode.c
@@ -21,8 +21,8 @@
#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/export.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#include <mach/dc.h>
#include <mach/mc.h>
#include <trace/events/display.h>
diff --git a/drivers/video/tegra/dc/sor.c b/drivers/video/tegra/dc/sor.c
index 2ff43ea..50362cd 100644
--- a/drivers/video/tegra/dc/sor.c
+++ b/drivers/video/tegra/dc/sor.c
@@ -22,8 +22,8 @@
#include <linux/delay.h>
#include <linux/seq_file.h>
#include <linux/debugfs.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#include <mach/dc.h>
#include "sor.h"
diff --git a/drivers/video/tegra/host/gk20a/clk_gk20a.c b/drivers/video/tegra/host/gk20a/clk_gk20a.c
index f2332a7..c1d0b29 100644
--- a/drivers/video/tegra/host/gk20a/clk_gk20a.c
+++ b/drivers/video/tegra/host/gk20a/clk_gk20a.c
@@ -22,10 +22,9 @@
#include <linux/delay.h> /* for mdelay */
#include <linux/module.h>
#include <linux/debugfs.h>
+#include <linux/clk/tegra.h>
#include <mach/thermal.h>
-#include <mach/clk.h>
-
#include "../dev.h"
#include "gk20a.h"
diff --git a/drivers/video/tegra/host/gk20a/gk20a_scale.c b/drivers/video/tegra/host/gk20a/gk20a_scale.c
index ff99bb9..d3cb5e8 100644
--- a/drivers/video/tegra/host/gk20a/gk20a_scale.c
+++ b/drivers/video/tegra/host/gk20a/gk20a_scale.c
@@ -22,8 +22,8 @@
#include <linux/clk.h>
#include <linux/export.h>
#include <linux/slab.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#include <mach/hardware.h>
#include <governor.h>
diff --git a/drivers/video/tegra/host/gr3d/pod_scaling.c b/drivers/video/tegra/host/gr3d/pod_scaling.c
index a2f83dc..04326d1 100644
--- a/drivers/video/tegra/host/gr3d/pod_scaling.c
+++ b/drivers/video/tegra/host/gr3d/pod_scaling.c
@@ -38,11 +38,11 @@
#include <linux/clk.h>
#include <linux/export.h>
#include <linux/slab.h>
+#include <linux/clk/tegra.h>
#define CREATE_TRACE_POINTS
#include <trace/events/nvhost_podgov.h>
-#include <mach/clk.h>
#include <mach/hardware.h>
#include <governor.h>
diff --git a/drivers/video/tegra/host/msenc/msenc.c b/drivers/video/tegra/host/msenc/msenc.c
index ca704fc..e0917b3 100644
--- a/drivers/video/tegra/host/msenc/msenc.c
+++ b/drivers/video/tegra/host/msenc/msenc.c
@@ -22,7 +22,7 @@
#include <linux/firmware.h>
#include <linux/module.h>
#include <linux/pm_runtime.h>
-#include <mach/clk.h>
+#include <linux/clk/tegra.h>
#include <asm/byteorder.h> /* for parsing ucode image wrt endianness */
#include <linux/delay.h> /* for udelay */
#include <linux/scatterlist.h>
diff --git a/drivers/video/tegra/host/nvhost_acm.c b/drivers/video/tegra/host/nvhost_acm.c
index 409ada5..f2d31b2 100644
--- a/drivers/video/tegra/host/nvhost_acm.c
+++ b/drivers/video/tegra/host/nvhost_acm.c
@@ -29,10 +29,10 @@
#include <linux/platform_device.h>
#include <linux/pm.h>
#include <linux/pm_runtime.h>
+#include <linux/clk/tegra.h>
#include <trace/events/nvhost.h>
#include <mach/powergate.h>
-#include <mach/clk.h>
#include <mach/hardware.h>
#include <mach/mc.h>
#include <mach/pm_domains.h>
diff --git a/drivers/video/tegra/host/nvhost_scale.c b/drivers/video/tegra/host/nvhost_scale.c
index abcfdff..c3b6527 100644
--- a/drivers/video/tegra/host/nvhost_scale.c
+++ b/drivers/video/tegra/host/nvhost_scale.c
@@ -22,8 +22,8 @@
#include <linux/clk.h>
#include <linux/export.h>
#include <linux/slab.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#include <mach/hardware.h>
#include <governor.h>
diff --git a/drivers/video/tegra/host/tsec/tsec.c b/drivers/video/tegra/host/tsec/tsec.c
index f4d6b43..02f28c3 100644
--- a/drivers/video/tegra/host/tsec/tsec.c
+++ b/drivers/video/tegra/host/tsec/tsec.c
@@ -22,7 +22,7 @@
#include <linux/firmware.h>
#include <linux/module.h>
#include <linux/pm_runtime.h>
-#include <mach/clk.h>
+#include <linux/clk/tegra.h>
#include <asm/byteorder.h> /* for parsing ucode image wrt endianness */
#include <linux/delay.h> /* for udelay */
#include <linux/scatterlist.h>
diff --git a/drivers/video/tegra/host/vi/vi.c b/drivers/video/tegra/host/vi/vi.c
index 6bc31db..903f04e 100644
--- a/drivers/video/tegra/host/vi/vi.c
+++ b/drivers/video/tegra/host/vi/vi.c
@@ -26,9 +26,9 @@
#include <linux/of_device.h>
#include <linux/of_platform.h>
#include <linux/nvhost_vi_ioctl.h>
+#include <linux/clk/tegra.h>
#include <mach/pm_domains.h>
-#include <mach/clk.h>
#include <media/tegra_v4l2_camera.h>
#include "dev.h"
diff --git a/include/linux/clk/tegra.h b/include/linux/clk/tegra.h
index 642a912..ace4ad1 100644
--- a/include/linux/clk/tegra.h
+++ b/include/linux/clk/tegra.h
@@ -139,6 +139,10 @@
void tegra_clocks_init(void);
void tegra_clocks_apply_init_table(void);
+static inline int tegra_dvfs_override_core_voltage(int override_mv)
+{
+ return -EINVAL;
+}
static inline int tegra_clk_cfg_ex(struct clk *c, enum tegra_clk_ex_param p, u32 setting)
{
return -EINVAL;
diff --git a/sound/soc/tegra/tegra30_spdif.c b/sound/soc/tegra/tegra30_spdif.c
index 393ea41..c5355f9 100644
--- a/sound/soc/tegra/tegra30_spdif.c
+++ b/sound/soc/tegra/tegra30_spdif.c
@@ -36,8 +36,8 @@
#include <linux/slab.h>
#include <linux/io.h>
#include <linux/delay.h>
+#include <linux/clk/tegra.h>
#include <mach/hdmi-audio.h>
-#include <mach/clk.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
diff --git a/sound/soc/tegra/tegra_asoc_utils.c b/sound/soc/tegra/tegra_asoc_utils.c
index e67a94b..fcbc065 100644
--- a/sound/soc/tegra/tegra_asoc_utils.c
+++ b/sound/soc/tegra/tegra_asoc_utils.c
@@ -26,8 +26,8 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/of.h>
+#include <linux/clk/tegra.h>
-#include <mach/clk.h>
#include <mach/pinmux.h>
#ifdef CONFIG_ARCH_TEGRA_2x_SOC
#include <mach/pinmux-tegra20.h>
