arm: tegra: init tn8 and ardbeg as separate devices

Need to call DT_MACHINE_START for each platform so that
ro.hardware property is set according to platform name.
This also enforces one dts file per platform.

Bug 1328162

Change-Id: I368669af638ec2ee237fe090ad70c0d63375fef1
Signed-off-by: Ahung Cheng <ahcheng@nvidia.com>
Reviewed-on: http://git-master/r/255003
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>

diff --git a/arch/arm/mach-tegra/board-ardbeg-sdhci.c b/arch/arm/mach-tegra/board-ardbeg-sdhci.c
index d58a097f3d9a7172013e6c08e5babe37fa673304..26a250dae24975a0cea63cf3204b1828c2f6e678 100644 (file)
--- a/arch/arm/mach-tegra/board-ardbeg-sdhci.c
+++ b/arch/arm/mach-tegra/board-ardbeg-sdhci.c
@@ -283,7 +283,8 @@ static int __init ardbeg_wifi_init(void)
 static int __init ardbeg_wifi_prepower(void)
 {
        if (!of_machine_is_compatible("nvidia,ardbeg") &&
-               !of_machine_is_compatible("nvidia,laguna"))
+               !of_machine_is_compatible("nvidia,laguna") &&
+               !of_machine_is_compatible("nvidia,tn8"))
                return 0;
        ardbeg_wifi_power(1);
 

diff --git a/arch/arm/mach-tegra/board-ardbeg.c b/arch/arm/mach-tegra/board-ardbeg.c
index def32eb53a3eb7d0516b0aa9410407a98230bdaf..2930e5ce35ef4c8c3c533f651fbddee609867cea 100644 (file)
--- a/arch/arm/mach-tegra/board-ardbeg.c
+++ b/arch/arm/mach-tegra/board-ardbeg.c
@@ -1034,6 +1034,8 @@ static void __init tegra_ardbeg_early_init(void)
        tegra_clk_verify_parents();
        if (of_machine_is_compatible("nvidia,laguna"))
                tegra_soc_device_init("laguna");
+       else if (of_machine_is_compatible("nvidia,tn8"))
+               tegra_soc_device_init("tn8");
        else
                tegra_soc_device_init("ardbeg");
 }
@@ -1150,6 +1152,11 @@ static const char * const laguna_dt_board_compat[] = {
        NULL
 };
 
+static const char * const tn8_dt_board_compat[] = {
+       "nvidia,tn8",
+       NULL
+};
+
 DT_MACHINE_START(LAGUNA, "laguna")
        .atag_offset    = 0x100,
        .smp            = smp_ops(tegra_smp_ops),
@@ -1163,6 +1170,19 @@ DT_MACHINE_START(LAGUNA, "laguna")
        .dt_compat      = laguna_dt_board_compat,
 MACHINE_END
 
+DT_MACHINE_START(TN8, "tn8")
+       .atag_offset    = 0x100,
+       .smp            = smp_ops(tegra_smp_ops),
+       .map_io         = tegra_map_common_io,
+       .reserve        = tegra_ardbeg_reserve,
+       .init_early     = tegra12x_init_early,
+       .init_irq       = tegra_dt_init_irq,
+       .init_time      = tegra_init_timer,
+       .init_machine   = tegra_ardbeg_dt_init,
+       .restart        = tegra_assert_system_reset,
+       .dt_compat      = tn8_dt_board_compat,
+MACHINE_END
+
 DT_MACHINE_START(ARDBEG, "ardbeg")
        .atag_offset    = 0x100,
        .smp            = smp_ops(tegra_smp_ops),