Skip to content

Commit

Permalink
ARM: tegra: remove board (but not DT) support for TrimSlice
Browse files Browse the repository at this point in the history
TrimSlice can be booted using device tree with equal functionality as
when booted using a board file. Remove the board file since it's no
longer needed.

One special-case is still left in board-dt-tegra20.c, since the Tegra
PCIe driver doesn't support device tree yet. This logic is now enabled
by CONFIG_TEGRA_PCI rather than via CONFIG_MACH_TRIMSLICE. The extra
cases where it's enabled (.configs which did not enable TrimSlice
support) shouldn't impact much since the amount of code is tiny.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
  • Loading branch information
Stephen Warren committed Sep 14, 2012
1 parent 1ab710f commit be6a919
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 382 deletions.
7 changes: 0 additions & 7 deletions arch/arm/mach-tegra/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,6 @@ config MACH_PAZ00
help
Support for the Toshiba AC100/Dynabook AZ netbook

config MACH_TRIMSLICE
bool "TrimSlice board"
depends on ARCH_TEGRA_2x_SOC
select TEGRA_PCI
help
Support for CompuLab TrimSlice platform

choice
prompt "Default low-level debug console UART"
default TEGRA_DEBUG_UART_NONE
Expand Down
3 changes: 0 additions & 3 deletions arch/arm/mach-tegra/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,3 @@ obj-$(CONFIG_MACH_HARMONY) += board-harmony-power.o

obj-$(CONFIG_MACH_PAZ00) += board-paz00.o
obj-$(CONFIG_MACH_PAZ00) += board-paz00-pinmux.o

obj-$(CONFIG_MACH_TRIMSLICE) += board-trimslice.o
obj-$(CONFIG_MACH_TRIMSLICE) += board-trimslice-pinmux.o
6 changes: 2 additions & 4 deletions arch/arm/mach-tegra/board-dt-tegra20.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,16 @@ static void __init tegra_dt_init(void)
tegra20_auxdata_lookup, NULL);
}

#ifdef CONFIG_MACH_TRIMSLICE
static void __init trimslice_init(void)
{
#ifdef CONFIG_TEGRA_PCI
int ret;

ret = tegra_pcie_init(true, true);
if (ret)
pr_err("tegra_pci_init() failed: %d\n", ret);
}
#endif
}

#ifdef CONFIG_MACH_HARMONY
static void __init harmony_init(void)
Expand Down Expand Up @@ -134,9 +134,7 @@ static struct {
char *machine;
void (*init)(void);
} board_init_funcs[] = {
#ifdef CONFIG_MACH_TRIMSLICE
{ "compulab,trimslice", trimslice_init },
#endif
#ifdef CONFIG_MACH_HARMONY
{ "nvidia,harmony", harmony_init },
#endif
Expand Down
155 changes: 0 additions & 155 deletions arch/arm/mach-tegra/board-trimslice-pinmux.c

This file was deleted.

183 changes: 0 additions & 183 deletions arch/arm/mach-tegra/board-trimslice.c

This file was deleted.

Loading

0 comments on commit be6a919

Please sign in to comment.