lkml.org 
[lkml]   [2011]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 3/3] arm/tegra: device tree support for ventana board
    Date
    Change-Id: I5ed18750e6a8aa3242dae4bcd7165cfd819356d2
    Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
    ---
    arch/arm/boot/dts/tegra-ventana.dts | 32 ++++++++++++++++++++++++++++++++
    arch/arm/mach-tegra/Kconfig | 6 ++++++
    arch/arm/mach-tegra/Makefile.boot | 1 +
    arch/arm/mach-tegra/board-dt.c | 26 +++++++++++++++++++++-----
    4 files changed, 60 insertions(+), 5 deletions(-)
    create mode 100644 arch/arm/boot/dts/tegra-ventana.dts

    diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
    new file mode 100644
    index 0000000..9b29a62
    --- /dev/null
    +++ b/arch/arm/boot/dts/tegra-ventana.dts
    @@ -0,0 +1,32 @@
    +/dts-v1/;
    +
    +/memreserve/ 0x1c000000 0x04000000;
    +/include/ "tegra20.dtsi"
    +
    +/ {
    + model = "NVIDIA Tegra2 Ventana evaluation board";
    + compatible = "nvidia,ventana", "nvidia,tegra20";
    +
    + chosen {
    + bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/ram rdinit=/sbin/init";
    + };
    +
    + memory {
    + reg = < 0x00000000 0x40000000 >;
    + };
    +
    + serial@70006300 {
    + clock-frequency = < 216000000 >;
    + };
    +
    + sdhci@c8000400 {
    + cd-gpios = <&gpio 69 0>; /* gpio PI5 */
    + wp-gpios = <&gpio 57 0>; /* gpio PH1 */
    + power-gpios = <&gpio 155 0>; /* gpio PT3 */
    + };
    +
    + sdhci@c8000600 {
    + power-gpios = <&gpio 70 0>; /* gpio PI6 */
    + support-8bit;
    + };
    +};
    diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
    index d82ebab..91aff7c 100644
    --- a/arch/arm/mach-tegra/Kconfig
    +++ b/arch/arm/mach-tegra/Kconfig
    @@ -69,6 +69,12 @@ config MACH_WARIO
    help
    Support for the Wario version of Seaboard

    +config MACH_VENTANA
    + bool "Ventana board"
    + select MACH_TEGRA_DT
    + help
    + Support for the nVidia Ventana development platform
    +
    choice
    prompt "Low-level debug console UART"
    default TEGRA_DEBUG_UART_NONE
    diff --git a/arch/arm/mach-tegra/Makefile.boot b/arch/arm/mach-tegra/Makefile.boot
    index 5e870d2..bd12c9f 100644
    --- a/arch/arm/mach-tegra/Makefile.boot
    +++ b/arch/arm/mach-tegra/Makefile.boot
    @@ -4,3 +4,4 @@ initrd_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00800000

    dtb-$(CONFIG_MACH_HARMONY) += tegra-harmony.dtb
    dtb-$(CONFIG_MACH_SEABOARD) += tegra-seaboard.dtb
    +dtb-$(CONFIG_MACH_VENTANA) += tegra-ventana.dtb
    diff --git a/arch/arm/mach-tegra/board-dt.c b/arch/arm/mach-tegra/board-dt.c
    index 9f47e04..96287a2 100644
    --- a/arch/arm/mach-tegra/board-dt.c
    +++ b/arch/arm/mach-tegra/board-dt.c
    @@ -47,7 +47,7 @@

    void harmony_pinmux_init(void);
    void seaboard_pinmux_init(void);
    -
    +void ventana_pinmux_init(void);

    struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = {
    OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC1_BASE, "sdhci-tegra.0", NULL),
    @@ -80,9 +80,19 @@ static struct of_device_id tegra_dt_gic_match[] __initdata = {
    {}
    };

    +static struct {
    + char *machine;
    + void (*init)(void);
    +} pinmux_configs[] = {
    + { "nvidia,harmony", harmony_pinmux_init },
    + { "nvidia,seaboard", seaboard_pinmux_init },
    + { "nvidia,ventana", ventana_pinmux_init },
    +};
    +
    static void __init tegra_dt_init(void)
    {
    struct device_node *node;
    + int i;

    node = of_find_matching_node_by_address(NULL, tegra_dt_gic_match,
    TEGRA_ARM_INT_DIST_BASE);
    @@ -91,10 +101,15 @@ static void __init tegra_dt_init(void)

    tegra_clk_init_from_table(tegra_dt_clk_init_table);

    - if (of_machine_is_compatible("nvidia,harmony"))
    - harmony_pinmux_init();
    - else if (of_machine_is_compatible("nvidia,seaboard"))
    - seaboard_pinmux_init();
    + for (i = 0; i < ARRAY_SIZE(pinmux_configs); i++) {
    + if (of_machine_is_compatible(pinmux_configs[i].machine)) {
    + pinmux_configs[i].init();
    + break;
    + }
    + }
    +
    + if (i == ARRAY_SIZE(pinmux_configs))
    + WARN(1, "Unknown platform! Pinmuxing not initialized\n");

    /*
    * Finished with the static registrations now; fill in the missing
    @@ -106,6 +121,7 @@ static void __init tegra_dt_init(void)
    static const char * tegra_dt_board_compat[] = {
    "nvidia,harmony",
    "nvidia,seaboard",
    + "nvidia,ventana",
    NULL
    };

    --
    1.7.7.rc0.72.g4b5ea.dirty


    \
     
     \ /
      Last update: 2011-10-11 12:47    [W:0.027 / U:59.348 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site