On Mon, Feb 21, 2011 at 11:06 AM, Olof Johansson <[email protected]> wrote:
> This adds board support for the Seaboard eval platform and some of the
> derivatives that are very similar. Since they only differ in some very
> minor ways, most of the code is shared.
>
> Signed-off-by: Olof Johansson <[email protected]>
> ---
> arch/arm/mach-tegra/Kconfig | 17 +++
> arch/arm/mach-tegra/Makefile | 3 +
> arch/arm/mach-tegra/board-seaboard-pinmux.c | 179 ++++++++++++++++++++++++
> arch/arm/mach-tegra/board-seaboard.c | 195
> +++++++++++++++++++++++++++
> arch/arm/mach-tegra/board-seaboard.h | 38 +++++
> 5 files changed, 432 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/mach-tegra/board-seaboard-pinmux.c
> create mode 100644 arch/arm/mach-tegra/board-seaboard.c
> create mode 100644 arch/arm/mach-tegra/board-seaboard.h
>
> diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
> index cac8a79..36f0d3c 100644
> --- a/arch/arm/mach-tegra/Kconfig
> +++ b/arch/arm/mach-tegra/Kconfig
> @@ -27,6 +27,23 @@ config MACH_HARMONY
> help
> Support for nVidia Harmony development platform
>
> +config MACH_SEABOARD
> + bool "Seaboard board family"
> + help
> + Support for nVidia Seaboard development platform
> +
> +config MACH_KAEN
> + bool "Kaen board"
> + depends on MACH_SEABOARD
> + help
> + Support for the Kaen version of Seaboard
> +
> +config MACH_WARIO
> + bool "Wario board"
> + depends on MACH_SEABOARD
> + help
> + Support for the Wario version of Seaboard
> +
It's easier to prevent merge conflicts if these stay in alphabetical
order. Even though these 3 are closely related, the next person to
add a board is going to assume they are not in alphabetical order and
put theirs at the bottom. I would also suggest "selects
MACH_SEABOARD" instead of "depends on MACH_SEABOARD", which will help
when they are out of order.
> config MACH_TRIMSLICE
> bool "TrimSlice board"
> select TEGRA_PCI
<snip>
> diff --git a/arch/arm/mach-tegra/board-seaboard-pinmux.c
> b/arch/arm/mach-tegra/board-seaboard-pinmux.c
> new file mode 100644
> index 0000000..24e14c5
> --- /dev/null
> +++ b/arch/arm/mach-tegra/board-seaboard-pinmux.c
> @@ -0,0 +1,179 @@
> +/*
> + * Copyright (C) 2010 NVIDIA Corporation
This seems unique enough not be copyright nVidia.
> diff --git a/arch/arm/mach-tegra/board-seaboard.c
> b/arch/arm/mach-tegra/board-seaboard.c
> new file mode 100644
> index 0000000..deeddfe
> --- /dev/null
> +++ b/arch/arm/mach-tegra/board-seaboard.c
<snip>
> +#include <mach/io.h>
#include <linux/io.h> instead
<snip>
> +static void __init __tegra_seaboard_init(void)
> +{
> + seaboard_pinmux_init();
> +
> + tegra_common_init();
My recent clock patch series includes a change to replace
tegra_common_init with tegra_early_init. If my patch goes in before
this one, you'll need to update this one.
<snip>
> +MACHINE_START(SEABOARD, "seaboard")
> + .boot_params = 0x00000100,
> + .init_irq = tegra_init_irq,
> + .init_machine = tegra_seaboard_init,
> + .map_io = tegra_map_common_io,
> + .timer = &tegra_timer,
> +MACHINE_END
> +
> +MACHINE_START(KAEN, "kaen")
> + .boot_params = 0x00000100,
> + .init_irq = tegra_init_irq,
> + .init_machine = tegra_kaen_init,
> + .map_io = tegra_map_common_io,
> + .timer = &tegra_timer,
> +MACHINE_END
> +
> +MACHINE_START(WARIO, "wario")
> + .boot_params = 0x00000100,
> + .init_irq = tegra_init_irq,
> + .init_machine = tegra_wario_init,
> + .map_io = tegra_map_common_io,
> + .timer = &tegra_timer,
> +MACHINE_END
These should be in the order they are called during init: map_io,
init_irq, timer, init_machine.
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
