Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb25af81 authored by Stephen Warren's avatar Stephen Warren
Browse files

ARM: tegra: remove board (but not DT) support for Harmony 



Harmony 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.

Two special-cases are still left in board-dt-tegra20.c, since the Tegra
PCIe driver doesn't support device tree yet, and the Harmony .dts file
doesn't yet describe regulators which are needed for PCIe. This logic is
now enabled unconditionally rather than via CONFIG_MACH_HARMONY. While
this is more code than other boards, it's still unlikely to be much of a
problem, and both regulators and PCIe should be supported via device tree
in the near future, allowing the remaining code to be removed.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent cff1dfbf

arch/arm/mach-tegra/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -60,12 +60,6 @@ config TEGRA_AHB 


comment "Tegra board type"



config MACH_HARMONY

       bool "Harmony board"

       depends on ARCH_TEGRA_2x_SOC

       help

         Support for nVidia Harmony development platform



choice

        prompt "Default low-level debug console UART"

        default TEGRA_DEBUG_UART_NONE

arch/arm/mach-tegra/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -26,9 +26,7 @@ obj-$(CONFIG_USB_SUPPORT) += usb_phy.o 
obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= board-dt-tegra20.o

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



obj-$(CONFIG_MACH_HARMONY)              += board-harmony.o

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_ARCH_TEGRA_2x_SOC)		+= board-harmony-pcie.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= board-harmony-power.o



obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= board-paz00.o

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

+2 −4
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ static void __init trimslice_init(void) 
#endif

}



#ifdef CONFIG_MACH_HARMONY

static void __init harmony_init(void)

{

	int ret;
@@ -117,11 +116,12 @@ static void __init harmony_init(void) 
		return;

	}



#ifdef CONFIG_TEGRA_PCI

	ret = harmony_pcie_init();

	if (ret)

		pr_err("harmony_pcie_init() failed: %d\n", ret);

}

#endif

}



static void __init paz00_init(void)

{
@@ -133,9 +133,7 @@ static struct { 
	void (*init)(void);

} board_init_funcs[] = {

	{ "compulab,trimslice", trimslice_init },

#ifdef CONFIG_MACH_HARMONY

	{ "nvidia,harmony", harmony_init },

#endif

	{ "compal,paz00", paz00_init },

};

arch/arm/mach-tegra/board-harmony-pinmux.c

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

 * arch/arm/mach-tegra/board-harmony-pinmux.c

 *

 * Copyright (C) 2010 Google, Inc.

 * Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.

 *

 * 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/kernel.h>



#include "board-harmony.h"

#include "board-pinmux.h"



static struct pinctrl_map harmony_map[] = {

	TEGRA_MAP_MUXCONF("ata",   "ide",           none, driven),

	TEGRA_MAP_MUXCONF("atb",   "sdio4",         none, driven),

	TEGRA_MAP_MUXCONF("atc",   "nand",          none, driven),

	TEGRA_MAP_MUXCONF("atd",   "gmi",           none, driven),

	TEGRA_MAP_MUXCONF("ate",   "gmi",           none, driven),

	TEGRA_MAP_MUXCONF("cdev1", "plla_out",      none, driven),

	TEGRA_MAP_MUXCONF("cdev2", "pllp_out4",     down, tristate),

	TEGRA_MAP_MUXCONF("crtp",  "crt",           none, tristate),

	TEGRA_MAP_MUXCONF("csus",  "vi_sensor_clk", down, tristate),

	TEGRA_MAP_MUXCONF("dap1",  "dap1",          none, driven),

	TEGRA_MAP_MUXCONF("dap2",  "dap2",          none, tristate),

	TEGRA_MAP_MUXCONF("dap3",  "dap3",          none, tristate),

	TEGRA_MAP_MUXCONF("dap4",  "dap4",          none, tristate),

	TEGRA_MAP_MUXCONF("ddc",   "i2c2",          up,   driven),

	TEGRA_MAP_MUXCONF("dta",   "sdio2",         up,   driven),

	TEGRA_MAP_MUXCONF("dtb",   "rsvd1",         none, driven),

	TEGRA_MAP_MUXCONF("dtc",   "rsvd1",         none, tristate),

	TEGRA_MAP_MUXCONF("dtd",   "sdio2",         up,   driven),

	TEGRA_MAP_MUXCONF("dte",   "rsvd1",         none, tristate),

	TEGRA_MAP_MUXCONF("dtf",   "i2c3",          none, tristate),

	TEGRA_MAP_MUXCONF("gma",   "sdio4",         none, driven),

	TEGRA_MAP_MUXCONF("gmb",   "gmi",           none, driven),

	TEGRA_MAP_MUXCONF("gmc",   "uartd",         none, driven),

	TEGRA_MAP_MUXCONF("gmd",   "gmi",           none, driven),

	TEGRA_MAP_MUXCONF("gme",   "sdio4",         none, driven),

	TEGRA_MAP_MUXCONF("gpu",   "gmi",           none, tristate),

	TEGRA_MAP_MUXCONF("gpu7",  "rtck",          none, driven),

	TEGRA_MAP_MUXCONF("gpv",   "pcie",          none, driven),

	TEGRA_MAP_MUXCONF("hdint", "hdmi",          na,   tristate),

	TEGRA_MAP_MUXCONF("i2cp",  "i2cp",          none, driven),

	TEGRA_MAP_MUXCONF("irrx",  "uarta",         up,   tristate),

	TEGRA_MAP_MUXCONF("irtx",  "uarta",         up,   tristate),

	TEGRA_MAP_MUXCONF("kbca",  "kbc",           up,   driven),

	TEGRA_MAP_MUXCONF("kbcb",  "kbc",           up,   driven),

	TEGRA_MAP_MUXCONF("kbcc",  "kbc",           up,   driven),

	TEGRA_MAP_MUXCONF("kbcd",  "kbc",           up,   driven),

	TEGRA_MAP_MUXCONF("kbce",  "kbc",           up,   driven),

	TEGRA_MAP_MUXCONF("kbcf",  "kbc",           up,   driven),

	TEGRA_MAP_MUXCONF("lcsn",  "displaya",      na,   tristate),

	TEGRA_MAP_MUXCONF("ld0",   "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("ld1",   "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("ld10",  "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("ld11",  "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("ld12",  "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("ld13",  "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("ld14",  "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("ld15",  "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("ld16",  "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("ld17",  "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("ld2",   "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("ld3",   "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("ld4",   "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("ld5",   "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("ld6",   "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("ld7",   "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("ld8",   "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("ld9",   "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("ldc",   "displaya",      na,   tristate),

	TEGRA_MAP_MUXCONF("ldi",   "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("lhp0",  "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("lhp1",  "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("lhp2",  "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("lhs",   "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("lm0",   "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("lm1",   "displaya",      na,   tristate),

	TEGRA_MAP_MUXCONF("lpp",   "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("lpw0",  "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("lpw1",  "displaya",      na,   tristate),

	TEGRA_MAP_MUXCONF("lpw2",  "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("lsc0",  "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("lsc1",  "displaya",      na,   tristate),

	TEGRA_MAP_MUXCONF("lsck",  "displaya",      na,   tristate),

	TEGRA_MAP_MUXCONF("lsda",  "displaya",      na,   tristate),

	TEGRA_MAP_MUXCONF("lsdi",  "displaya",      na,   tristate),

	TEGRA_MAP_MUXCONF("lspi",  "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("lvp0",  "displaya",      na,   tristate),

	TEGRA_MAP_MUXCONF("lvp1",  "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("lvs",   "displaya",      na,   driven),

	TEGRA_MAP_MUXCONF("owc",   "rsvd2",         na,   tristate),

	TEGRA_MAP_MUXCONF("pmc",   "pwr_on",        na,   driven),

	TEGRA_MAP_MUXCONF("pta",   "hdmi",          none, driven),

	TEGRA_MAP_MUXCONF("rm",    "i2c1",          none, driven),

	TEGRA_MAP_MUXCONF("sdb",   "pwm",           na,   tristate),

	TEGRA_MAP_MUXCONF("sdc",   "pwm",           up,   driven),

	TEGRA_MAP_MUXCONF("sdd",   "pwm",           up,   tristate),

	TEGRA_MAP_MUXCONF("sdio1", "sdio1",         none, tristate),

	TEGRA_MAP_MUXCONF("slxa",  "pcie",          none, driven),

	TEGRA_MAP_MUXCONF("slxc",  "spdif",         none, tristate),

	TEGRA_MAP_MUXCONF("slxd",  "spdif",         none, tristate),

	TEGRA_MAP_MUXCONF("slxk",  "pcie",          none, driven),

	TEGRA_MAP_MUXCONF("spdi",  "rsvd2",         none, tristate),

	TEGRA_MAP_MUXCONF("spdo",  "rsvd2",         none, tristate),

	TEGRA_MAP_MUXCONF("spia",  "gmi",           none, driven),

	TEGRA_MAP_MUXCONF("spib",  "gmi",           none, driven),

	TEGRA_MAP_MUXCONF("spic",  "gmi",           up,   tristate),

	TEGRA_MAP_MUXCONF("spid",  "spi1",          down, tristate),

	TEGRA_MAP_MUXCONF("spie",  "spi1",          up,   tristate),

	TEGRA_MAP_MUXCONF("spif",  "spi1",          down, tristate),

	TEGRA_MAP_MUXCONF("spig",  "spi2_alt",      none, tristate),

	TEGRA_MAP_MUXCONF("spih",  "spi2_alt",      up,   tristate),

	TEGRA_MAP_MUXCONF("uaa",   "ulpi",          up,   tristate),

	TEGRA_MAP_MUXCONF("uab",   "ulpi",          up,   tristate),

	TEGRA_MAP_MUXCONF("uac",   "rsvd2",         none, tristate),

	TEGRA_MAP_MUXCONF("uad",   "irda",          up,   tristate),

	TEGRA_MAP_MUXCONF("uca",   "uartc",         up,   tristate),

	TEGRA_MAP_MUXCONF("ucb",   "uartc",         up,   tristate),

	TEGRA_MAP_MUXCONF("uda",   "ulpi",          none, tristate),

	TEGRA_MAP_CONF("ck32",    none, na),

	TEGRA_MAP_CONF("ddrc",    none, na),

	TEGRA_MAP_CONF("pmca",    none, na),

	TEGRA_MAP_CONF("pmcb",    none, na),

	TEGRA_MAP_CONF("pmcc",    none, na),

	TEGRA_MAP_CONF("pmcd",    none, na),

	TEGRA_MAP_CONF("pmce",    none, na),

	TEGRA_MAP_CONF("xm2c",    none, na),

	TEGRA_MAP_CONF("xm2d",    none, na),

	TEGRA_MAP_CONF("ls",      up,   na),

	TEGRA_MAP_CONF("lc",      up,   na),

	TEGRA_MAP_CONF("ld17_0",  down, na),

	TEGRA_MAP_CONF("ld19_18", down, na),

	TEGRA_MAP_CONF("ld21_20", down, na),

	TEGRA_MAP_CONF("ld23_22", down, na),

};



static struct tegra_board_pinmux_conf conf = {

	.maps = harmony_map,

	.map_count = ARRAY_SIZE(harmony_map),

};



void harmony_pinmux_init(void)

{

	tegra_board_pinmux_init(&conf, NULL);

}

arch/arm/mach-tegra/board-harmony-power.c

+15 −19
Original line number Diff line number Diff line
@@ -128,15 +128,12 @@ static struct i2c_board_info __initdata harmony_regulators[] = { 


int __init harmony_regulator_init(void)

{

	regulator_register_always_on(0, "vdd_5v0",

		NULL, 0, 5000000);



	if (machine_is_harmony()) {

		i2c_register_board_info(3, harmony_regulators, 1);

	} else { /* Harmony, booted using device tree */

	struct device_node *np;

	struct i2c_adapter *adapter;



	regulator_register_always_on(0, "vdd_5v0",

		NULL, 0, 5000000);



	np = of_find_node_by_path("/i2c@7000d000");

	if (np == NULL) {

		pr_err("Could not find device_node for DVC I2C\n");
@@ -150,7 +147,6 @@ int __init harmony_regulator_init(void) 
	}



	i2c_new_device(adapter, harmony_regulators);

	}



	return 0;

}