ARM: tegra: pm375: add jetson-tk1 references
Prabhu Kuttiyam [Tue, 6 May 2014 20:03:14 +0000 (13:03 -0700)]
This commit adds jetson-tk1 compatible reference checks
to the architecture code.

bug 1509239

Change-Id: I859452a0c8705b6fda8e1739906eb78f2b0527b2
Signed-off-by: Prabhu Kuttiyam <pkuttiyam@nvidia.com>
Reviewed-on: http://git-master/r/406016
Reviewed-by: Jong Kim <jongk@nvidia.com>
Reviewed-by: Sundeep Borra <sborra@nvidia.com>
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Matthew Pedro <mapedro@nvidia.com>

arch/arm/mach-tegra/board-ardbeg-sdhci.c
arch/arm/mach-tegra/board-ardbeg.c
arch/arm/mach-tegra/board-laguna-power.c

index 5d7d2fb..3a18f37 100644 (file)
@@ -384,7 +384,8 @@ static int __init ardbeg_wifi_prepower(void)
                !of_machine_is_compatible("nvidia,laguna") &&
                !of_machine_is_compatible("nvidia,ardbeg_sata") &&
                !of_machine_is_compatible("nvidia,tn8") &&
-               !of_machine_is_compatible("nvidia,norrin"))
+               !of_machine_is_compatible("nvidia,norrin") &&
+               !of_machine_is_compatible("nvidia,jetson-tk1"))
                return 0;
        ardbeg_wifi_power(1);
 
@@ -425,7 +426,8 @@ int __init ardbeg_sdhci_init(void)
                tegra_sdhci_platform_data3.boot_vcore_mv = boot_vcore_mv;
        }
 
-       if (of_machine_is_compatible("nvidia,laguna"))
+       if (of_machine_is_compatible("nvidia,laguna") ||
+           of_machine_is_compatible("nvidia,jetson-tk1"))
                tegra_sdhci_platform_data2.wp_gpio = ARDBEG_SD_WP;
 
        tegra_get_board_info(&board_info);
index 2b7e726..c85f0e2 100644 (file)
@@ -1447,6 +1447,11 @@ static const char * const norrin_dt_board_compat[] = {
        NULL
 };
 
+static const char * const jetson_dt_board_compat[] = {
+       "nvidia,jetson-tk1",
+       NULL
+};
+
 DT_MACHINE_START(LAGUNA, "laguna")
        .atag_offset    = 0x100,
        .smp            = smp_ops(tegra_smp_ops),
@@ -1517,3 +1522,17 @@ DT_MACHINE_START(ARDBEG_SATA, "ardbeg_sata")
        .init_late      = tegra_init_late
 
 MACHINE_END
+
+DT_MACHINE_START(JETSON_TK1, "jetson-tk1")
+       .atag_offset    = 0x100,
+       .smp            = smp_ops(tegra_smp_ops),
+       .map_io         = tegra_map_common_io,
+       .reserve        = tegra_ardbeg_reserve,
+       .init_early     = tegra_ardbeg_init_early,
+       .init_irq       = irqchip_init,
+       .init_time      = clocksource_of_init,
+       .init_machine   = tegra_ardbeg_dt_init,
+       .restart        = tegra_assert_system_reset,
+       .dt_compat      = jetson_dt_board_compat,
+       .init_late      = tegra_init_late
+MACHINE_END
index f2e0de9..c34f6b4 100644 (file)
@@ -852,7 +852,8 @@ static int __init laguna_fixed_regulator_init(void)
 {
        struct board_info board_info;
 
-       if (!of_machine_is_compatible("nvidia,laguna"))
+       if (!of_machine_is_compatible("nvidia,laguna") &&
+           !of_machine_is_compatible("nvidia,jetson-tk1"))
                return 0;
 
        tegra_get_board_info(&board_info);