ARM: tegra: bonaire_sim: dpd init
Jin Qian [Wed, 5 Sep 2012 21:36:40 +0000 (14:36 -0700)]
disable tegra io dpd on t12x

Change-Id: I2e61d24ce94b3bb2a4380e4b3d0741514913096b
Signed-off-by: Jin Qian <jqian@nvidia.com>
Reviewed-on: http://git-master/r/129808
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Robert Bond <rbond@nvidia.com>
Reviewed-by: Mark Stadler <mastadler@nvidia.com>

arch/arm/mach-tegra/board-bonaire.c
arch/arm/mach-tegra/pm-t3.c

index eb8dc51..2206c68 100644 (file)
@@ -38,6 +38,9 @@
 #include <mach/clk.h>
 #include <mach/gpio-tegra.h>
 #include <mach/iomap.h>
+
+#include <mach/io_dpd.h>
+
 #include <mach/irqs.h>
 #include <mach/pinmux.h>
 #include <mach/iomap.h>
@@ -533,6 +536,7 @@ static void __init tegra_bonaire_init(void)
 #ifdef CONFIG_TEGRA_SIMULATION_PLATFORM
        bonaire_power_off_init();
 #endif
+       tegra_io_dpd_init();
 
        bonaire_sdhci_init();
        bonaire_i2c_init();
index 2d0e3f0..b0770c6 100644 (file)
@@ -613,7 +613,9 @@ static struct tegra_io_dpd tegra_list_io_dpd[] = {
 /* we want to cleanup bootloader io dpd setting in kernel */
 static void __iomem *pmc = IO_ADDRESS(TEGRA_PMC_BASE);
 
-#ifdef CONFIG_PM_SLEEP
+/* FIXME! remove !t12x after t12x added dpd */
+#if defined(CONFIG_PM_SLEEP) && \
+       !defined(CONFIG_ARCH_TEGRA_12x_SOC)
 struct tegra_io_dpd *tegra_io_dpd_get(struct device *dev)
 {
 #ifdef CONFIG_TEGRA_IO_DPD