Commit 1b14f3a5 authored by Hiroshi Doyu's avatar Hiroshi Doyu Committed by Stephen Warren
Browse files

ARM: tegra: Unify Device tree board files 



Unify board-dt-tegra{30,114} to the Tegra20 DT board file, "tegra.c".

Signed-off-by: default avatarHiroshi Doyu <hdoyu@nvidia.com>
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent 2dfc91e8

arch/arm/mach-tegra/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ obj-y += pm.o 
obj-y					+= reset.o

obj-y					+= reset-handler.o

obj-y					+= sleep.o

obj-y					+= tegra.o

obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= tegra20_speedo.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= tegra2_emc.o
@@ -27,9 +28,6 @@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o 
obj-$(CONFIG_CPU_FREQ)                  += cpu-tegra.o

obj-$(CONFIG_TEGRA_PCI)			+= pcie.o



obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= tegra.o

obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= board-dt-tegra30.o

obj-$(CONFIG_ARCH_TEGRA_114_SOC)	+= board-dt-tegra114.o

ifeq ($(CONFIG_CPU_IDLE),y)

obj-$(CONFIG_ARCH_TEGRA_114_SOC)	+= cpuidle-tegra114.o

endif

arch/arm/mach-tegra/board-dt-tegra114.c

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
/*

 * NVIDIA Tegra114 device tree board support

 *

 * Copyright (C) 2013 NVIDIA Corporation

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/clocksource.h>



#include <asm/mach/arch.h>



#include "board.h"

#include "common.h"



static void __init tegra114_dt_init(void)

{

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}



static const char * const tegra114_dt_board_compat[] = {

	"nvidia,tegra114",

	NULL,

};



DT_MACHINE_START(TEGRA114_DT, "NVIDIA Tegra114 (Flattened Device Tree)")

	.smp		= smp_ops(tegra_smp_ops),

	.map_io		= tegra_map_common_io,

	.init_early	= tegra_init_early,

	.init_irq	= tegra_dt_init_irq,

	.init_time	= clocksource_of_init,

	.init_machine	= tegra114_dt_init,

	.init_late	= tegra_init_late,

	.restart	= tegra_assert_system_reset,

	.dt_compat	= tegra114_dt_board_compat,

MACHINE_END

arch/arm/mach-tegra/board-dt-tegra30.c

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-tegra/board-dt-tegra30.c

 *

 * NVIDIA Tegra30 device tree board support

 *

 * Copyright (C) 2011, 2013, NVIDIA Corporation

 *

 * Derived from:

 *

 * arch/arm/mach-tegra/board-dt-tegra20.c

 *

 * Copyright (C) 2010 Secret Lab Technologies, Ltd.

 * Copyright (C) 2010 Google, Inc.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



#include <linux/clocksource.h>

#include <linux/kernel.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_fdt.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>



#include <asm/mach/arch.h>



#include "board.h"

#include "common.h"

#include "iomap.h"



static void __init tegra30_dt_init(void)

{

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}



static const char *tegra30_dt_board_compat[] = {

	"nvidia,tegra30",

	NULL

};



DT_MACHINE_START(TEGRA30_DT, "NVIDIA Tegra30 (Flattened Device Tree)")

	.smp		= smp_ops(tegra_smp_ops),

	.map_io		= tegra_map_common_io,

	.init_early	= tegra_init_early,

	.init_irq	= tegra_dt_init_irq,

	.init_time	= clocksource_of_init,

	.init_machine	= tegra30_dt_init,

	.init_late	= tegra_init_late,

	.restart	= tegra_assert_system_reset,

	.dt_compat	= tegra30_dt_board_compat,

MACHINE_END

arch/arm/mach-tegra/tegra.c

+9 −5
Original line number Diff line number Diff line 
/*

 * nVidia Tegra device tree board support

 * NVIDIA Tegra SoC device tree board support

 *

 * Copyright (C) 2011, 2013, NVIDIA Corporation

 * Copyright (C) 2010 Secret Lab Technologies, Ltd.

 * Copyright (C) 2010 Google, Inc.

 *
@@ -111,6 +112,7 @@ static void __init harmony_init(void) 


static void __init paz00_init(void)

{

	if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC))

		tegra_paz00_wifikill_init();

}
@@ -137,12 +139,14 @@ static void __init tegra_dt_init_late(void) 
	}

}



static const char *tegra20_dt_board_compat[] = {

static const char * const tegra_dt_board_compat[] = {

	"nvidia,tegra114",

	"nvidia,tegra30",

	"nvidia,tegra20",

	NULL

};



DT_MACHINE_START(TEGRA_DT, "nVidia Tegra20 (Flattened Device Tree)")

DT_MACHINE_START(TEGRA_DT, "NVIDIA Tegra SoC (Flattened Device Tree)")

	.map_io		= tegra_map_common_io,

	.smp		= smp_ops(tegra_smp_ops),

	.init_early	= tegra_init_early,
@@ -151,5 +155,5 @@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegra20 (Flattened Device Tree)") 
	.init_machine	= tegra_dt_init,

	.init_late	= tegra_dt_init_late,

	.restart	= tegra_assert_system_reset,

	.dt_compat	= tegra20_dt_board_compat,

	.dt_compat	= tegra_dt_board_compat,

MACHINE_END