summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-harmony.c
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2010-05-14 19:30:34 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:34:49 -0800
commit4e27c5bf74da8e479312e43294cf992078a62e9a (patch)
tree7f7c0c91701643c2ac1bccb074fe3d06d4b64282 /arch/arm/mach-tegra/board-harmony.c
parenta5ce5894b9418484e8cd4f6d0dd809494d68fb72 (diff)
[ARM] tegra: harmony: Make board init calls explicit
Signed-off-by: Colin Cross <ccross@android.com> Change-Id: Ic14e8db00f2272de2f4ee4013bb3ab5c1951e7fe
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony.c')
-rw-r--r--arch/arm/mach-tegra/board-harmony.c35
1 files changed, 35 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c
index a3ca0994b2ab..be604ec73e95 100644
--- a/arch/arm/mach-tegra/board-harmony.c
+++ b/arch/arm/mach-tegra/board-harmony.c
@@ -48,6 +48,31 @@
#include "devices.h"
#include "gpio-names.h"
+/* NVidia bootloader tags */
+#define ATAG_NVIDIA 0x41000801
+
+#define ATAG_NVIDIA_RM 0x1
+#define ATAG_NVIDIA_DISPLAY 0x2
+#define ATAG_NVIDIA_FRAMEBUFFER 0x3
+#define ATAG_NVIDIA_CHIPSHMOO 0x4
+#define ATAG_NVIDIA_CHIPSHMOOPHYS 0x5
+#define ATAG_NVIDIA_PRESERVED_MEM_0 0x10000
+#define ATAG_NVIDIA_PRESERVED_MEM_N 2
+#define ATAG_NVIDIA_FORCE_32 0x7fffffff
+
+struct tag_tegra {
+ __u32 bootarg_key;
+ __u32 bootarg_len;
+ char bootarg[1];
+};
+
+static int __init parse_tag_nvidia(const struct tag *tag)
+{
+
+ return 0;
+}
+__tagtable(ATAG_NVIDIA, parse_tag_nvidia);
+
static struct tegra_nand_chip_parms nand_chip_parms[] = {
/* Samsung K5E2G1GACM */
[0] = {
@@ -288,6 +313,14 @@ static struct platform_device *harmony_devices[] __initdata = {
&tegra_nand_device,
&tegra_otg,
&pda_power_device,
+ &tegra_i2c_device1,
+ &tegra_i2c_device2,
+ &tegra_i2c_device3,
+ &tegra_i2c_device4,
+ &tegra_spi_device1,
+ &tegra_spi_device2,
+ &tegra_spi_device3,
+ &tegra_spi_device4,
};
static void __init tegra_harmony_fixup(struct machine_desc *desc,
@@ -343,6 +376,8 @@ static void __init tegra_harmony_init(void)
platform_add_devices(harmony_devices, ARRAY_SIZE(harmony_devices));
harmony_i2c_init();
harmony_regulator_init();
+ harmony_panel_init();
+ harmony_sdhci_init();
}
MACHINE_START(HARMONY, "harmony")