Skip to content

Commit

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

One special-case is still left in board-dt-tegra20.c, since there is no
way to create a WiFi rfkill device from device tree yet. This logic is
now enabled unconditionally rather than via CONFIG_MACH_PAZ00. The extra
cases where it's enabled (.configs which did not enable Paz00 support)
shouldn't impact much since the amount of code is tiny.

Signed-off-by: Stephen Warren <[email protected]>
Acked-By: Marc Dietrich <[email protected]>
  • Loading branch information
nvswarren committed Sep 14, 2012
1 parent be6a919 commit cff1dfb
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 376 deletions.
6 changes: 0 additions & 6 deletions arch/arm/mach-tegra/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,6 @@ config MACH_HARMONY
help
Support for nVidia Harmony development platform

config MACH_PAZ00
bool "Paz00 board"
depends on ARCH_TEGRA_2x_SOC
help
Support for the Toshiba AC100/Dynabook AZ netbook

choice
prompt "Default low-level debug console UART"
default TEGRA_DEBUG_UART_NONE
Expand Down
3 changes: 1 addition & 2 deletions arch/arm/mach-tegra/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,4 @@ obj-$(CONFIG_MACH_HARMONY) += board-harmony-pinmux.o
obj-$(CONFIG_MACH_HARMONY) += board-harmony-pcie.o
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_ARCH_TEGRA_2x_SOC) += board-paz00.o
4 changes: 0 additions & 4 deletions arch/arm/mach-tegra/board-dt-tegra20.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,10 @@ static void __init harmony_init(void)
}
#endif

#ifdef CONFIG_MACH_PAZ00
static void __init paz00_init(void)
{
tegra_paz00_wifikill_init();
}
#endif

static struct {
char *machine;
Expand All @@ -138,9 +136,7 @@ static struct {
#ifdef CONFIG_MACH_HARMONY
{ "nvidia,harmony", harmony_init },
#endif
#ifdef CONFIG_MACH_PAZ00
{ "compal,paz00", paz00_init },
#endif
};

static void __init tegra_dt_init_late(void)
Expand Down
156 changes: 0 additions & 156 deletions arch/arm/mach-tegra/board-paz00-pinmux.c

This file was deleted.

Loading

0 comments on commit cff1dfb

Please sign in to comment.