tegra2: Add support for Compal Paz00 (Toshiba AC100)

The Toshiba AC100 (Compal code-name Paz00, aka Dynabook AZ) is a netbook derived from the NVIDIA Tegra Harmony reference board. It ships with Android, but is often repurposed to run Linux. This patch adds just enough support to get a U-Boot serial console, and the ability access built-in eMMC and the external SD slot. v2: * Rebased on latest HEAD, incorporated changes made to other board files. * Moved board files from board/nvidia to board/compal. * Switched to correct odmdata value. This required add the previous patch to fix U-Boot's interpretation of the odmdata RAM size field. * Removed nvmem= from default Linux kernel command-line; no drivers use the reserved memory yet, so there's no point reserving it. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>

tegra2: Add support for Compal Paz00 (Toshiba AC100)
The Toshiba AC100 (Compal code-name Paz00, aka Dynabook AZ) is a netbook derived from the NVIDIA Tegra Harmony reference board. It ships with Android, but is often repurposed to run Linux. This patch adds just enough support to get a U-Boot serial console, and the ability access built-in eMMC and the external SD slot. v2: * Rebased on latest HEAD, incorporated changes made to other board files. * Moved board files from board/nvidia to board/compal. * Switched to correct odmdata value. This required add the previous patch to fix U-Boot's interpretation of the odmdata RAM size field. * Removed nvmem= from default Linux kernel command-line; no drivers use the reserved memory yet, so there's no point reserving it. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>
Stephen Warren · Albert ARIBAUD
1 parent 9057e652c3
Showing 5 changed files with 175 additions and 0 deletions Side-by-side Diff
MAINTAINERS
board/compal/paz00/Makefile
board/compal/paz00/paz00.c
boards.cfg
include/configs/paz00.h
@@ -899,6 +899,7 @@
 Stephen Warren <swarren@nvidia.com>
  
 	ventana		Tegra2 (ARM7 & A9 Dual Core)
+	paz00		Tegra2 (ARM7 & A9 Dual Core)
  
 Thomas Weber <weber@corscience.de>
  
+#
+# Copyright (c) 2010-2012, NVIDIA CORPORATION.  All rights reserved.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms and conditions of the GNU General Public License,
+# version 2, as published by the Free Software Foundation.
+#
+# This program is distributed in the hope 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 $(TOPDIR)/config.mk
+
+ifneq ($(OBJTREE),$(SRCTREE))
+$(shell mkdir -p $(obj)../../nvidia/common)
+endif
+
+LIB	= $(obj)lib$(BOARD).o
+
+COBJS	:= $(BOARD).o
+COBJS	+= ../../nvidia/common/board.o
+
+SRCS	:= $(COBJS:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS))
+
+$(LIB):	$(obj).depend $(OBJS)
+	$(call cmd_link_o_target, $(OBJS))
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
+/*
+ * Copyright (c) 2010-2012, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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 <common.h>
+#include <asm/io.h>
+#include <asm/arch/tegra2.h>
+#include <asm/arch/pinmux.h>
+#include <asm/arch/mmc.h>
+#include <asm/gpio.h>
+#ifdef CONFIG_TEGRA2_MMC
+#include <mmc.h>
+#endif
+
+/*
+ * Routine: gpio_config_uart
+ * Description: Does nothing on Paz00 - no conflict w/SPI.
+ */
+void gpio_config_uart(void)
+{
+}
+
+#ifdef CONFIG_TEGRA2_MMC
+/*
+ * Routine: pin_mux_mmc
+ * Description: setup the pin muxes/tristate values for the SDMMC(s)
+ */
+static void pin_mux_mmc(void)
+{
+	/* SDMMC4: config 3, x8 on 2nd set of pins */
+	pinmux_set_func(PINGRP_ATB, PMUX_FUNC_SDIO4);
+	pinmux_set_func(PINGRP_GMA, PMUX_FUNC_SDIO4);
+	pinmux_set_func(PINGRP_GME, PMUX_FUNC_SDIO4);
+
+	pinmux_tristate_disable(PINGRP_ATB);
+	pinmux_tristate_disable(PINGRP_GMA);
+	pinmux_tristate_disable(PINGRP_GME);
+
+	/* SDMMC1: SDIO1_CLK, SDIO1_CMD, SDIO1_DAT[3:0] */
+	pinmux_set_func(PINGRP_SDMMC1, PMUX_FUNC_SDIO1);
+
+	pinmux_tristate_disable(PINGRP_SDMMC1);
+
+	/* For power GPIO PV1 */
+	pinmux_tristate_disable(PINGRP_UAC);
+	/* For CD GPIO PI5 */
+	pinmux_tristate_disable(PINGRP_ATC);
+}
+
+/* this is a weak define that we are overriding */
+int board_mmc_init(bd_t *bd)
+{
+	debug("board_mmc_init called\n");
+
+	/* Enable muxes, etc. for SDMMC controllers */
+	pin_mux_mmc();
+
+	debug("board_mmc_init: init eMMC\n");
+	/* init dev 0, eMMC chip, with 4-bit bus */
+	/* The board has an 8-bit bus, but 8-bit doesn't work yet */
+	tegra2_mmc_init(0, 4, -1, -1);
+
+	debug("board_mmc_init: init SD slot\n");
+	/* init dev 3, SD slot, with 4-bit bus */
+	tegra2_mmc_init(3, 4, GPIO_PV1, GPIO_PI5);
+
+	return 0;
+}
+#endif
@@ -250,6 +250,7 @@
 jornada                      arm         sa1100
 plutux                       arm         armv7       plutux              avionic-design tegra2
 medcom                       arm         armv7       medcom              avionic-design tegra2
+paz00                        arm         armv7       paz00               compal         tegra2
 atngw100                     avr32       at32ap      -                   atmel          at32ap700x
 atstk1002                    avr32       at32ap      atstk1000           atmel          at32ap700x
 atstk1003                    avr32       at32ap      atstk1000           atmel          at32ap700x
+/*
+ * Copyright (c) 2010,2011, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include <asm/sizes.h>
+#include "tegra2-common.h"
+
+/* High-level configuration options */
+#define TEGRA2_SYSMEM		"mem=512M@0M"
+#define V_PROMPT		"Tegra2 (Paz00) MOD # "
+#define CONFIG_TEGRA2_BOARD_STRING	"Compal Paz00"
+
+/* Board-specific serial config */
+#define CONFIG_SERIAL_MULTI
+#define CONFIG_TEGRA2_ENABLE_UARTA
+#define CONFIG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
+
+#define CONFIG_MACH_TYPE		MACH_TYPE_PAZ00
+#define CONFIG_SYS_BOARD_ODMDATA	0x800c0085 /* lp1, 512MB */
+
+#define CONFIG_BOARD_EARLY_INIT_F
+
+/* SD/MMC */
+#define CONFIG_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_TEGRA2_MMC
+#define CONFIG_CMD_MMC
+
+#define CONFIG_DOS_PARTITION
+#define CONFIG_EFI_PARTITION
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+
+/* Environment not stored */
+#define CONFIG_ENV_IS_NOWHERE
+#endif /* __CONFIG_H */
...	...	@@ -899,6 +899,7 @@
899	899	Stephen Warren <swarren@nvidia.com>
900	900
901	901	ventana Tegra2 (ARM7 & A9 Dual Core)
	902	+ paz00 Tegra2 (ARM7 & A9 Dual Core)
902	903
903	904	Thomas Weber <weber@corscience.de>
904	905
	1	+#
	2	+# Copyright (c) 2010-2012, NVIDIA CORPORATION. All rights reserved.
	3	+#
	4	+# See file CREDITS for list of people who contributed to this
	5	+# project.
	6	+#
	7	+# This program is free software; you can redistribute it and/or modify it
	8	+# under the terms and conditions of the GNU General Public License,
	9	+# version 2, as published by the Free Software Foundation.
	10	+#
	11	+# This program is distributed in the hope it will be useful, but WITHOUT
	12	+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
	13	+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
	14	+# more details.
	15	+#
	16	+
	17	+include $(TOPDIR)/config.mk
	18	+
	19	+ifneq ($(OBJTREE),$(SRCTREE))
	20	+$(shell mkdir -p $(obj)../../nvidia/common)
	21	+endif
	22	+
	23	+LIB = $(obj)lib$(BOARD).o
	24	+
	25	+COBJS := $(BOARD).o
	26	+COBJS += ../../nvidia/common/board.o
	27	+
	28	+SRCS := $(COBJS:.o=.c)
	29	+OBJS := $(addprefix $(obj),$(COBJS))
	30	+
	31	+$(LIB): $(obj).depend $(OBJS)
	32	+ $(call cmd_link_o_target, $(OBJS))
	33	+
	34	+#########################################################################
	35	+
	36	+# defines $(obj).depend target
	37	+include $(SRCTREE)/rules.mk
	38	+
	39	+sinclude $(obj).depend
	40	+
	41	+#########################################################################
	1	+/*
	2	+ * Copyright (c) 2010-2012, NVIDIA CORPORATION. All rights reserved.
	3	+ *
	4	+ * See file CREDITS for list of people who contributed to this
	5	+ * project.
	6	+ *
	7	+ * This program is free software; you can redistribute it and/or modify it
	8	+ * under the terms and conditions of the GNU General Public License,
	9	+ * version 2, as published by the Free Software Foundation.
	10	+ *
	11	+ * This program is distributed in the hope it will be useful, but WITHOUT
	12	+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
	13	+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
	14	+ * more details.
	15	+ */
	16	+
	17	+#include <common.h>
	18	+#include <asm/io.h>
	19	+#include <asm/arch/tegra2.h>
	20	+#include <asm/arch/pinmux.h>
	21	+#include <asm/arch/mmc.h>
	22	+#include <asm/gpio.h>
	23	+#ifdef CONFIG_TEGRA2_MMC
	24	+#include <mmc.h>
	25	+#endif
	26	+
	27	+/*
	28	+ * Routine: gpio_config_uart
	29	+ * Description: Does nothing on Paz00 - no conflict w/SPI.
	30	+ */
	31	+void gpio_config_uart(void)
	32	+{
	33	+}
	34	+
	35	+#ifdef CONFIG_TEGRA2_MMC
	36	+/*
	37	+ * Routine: pin_mux_mmc
	38	+ * Description: setup the pin muxes/tristate values for the SDMMC(s)
	39	+ */
	40	+static void pin_mux_mmc(void)
	41	+{
	42	+ /* SDMMC4: config 3, x8 on 2nd set of pins */
	43	+ pinmux_set_func(PINGRP_ATB, PMUX_FUNC_SDIO4);
	44	+ pinmux_set_func(PINGRP_GMA, PMUX_FUNC_SDIO4);
	45	+ pinmux_set_func(PINGRP_GME, PMUX_FUNC_SDIO4);
	46	+
	47	+ pinmux_tristate_disable(PINGRP_ATB);
	48	+ pinmux_tristate_disable(PINGRP_GMA);
	49	+ pinmux_tristate_disable(PINGRP_GME);
	50	+
	51	+ /* SDMMC1: SDIO1_CLK, SDIO1_CMD, SDIO1_DAT[3:0] */
	52	+ pinmux_set_func(PINGRP_SDMMC1, PMUX_FUNC_SDIO1);
	53	+
	54	+ pinmux_tristate_disable(PINGRP_SDMMC1);
	55	+
	56	+ /* For power GPIO PV1 */
	57	+ pinmux_tristate_disable(PINGRP_UAC);
	58	+ /* For CD GPIO PI5 */
	59	+ pinmux_tristate_disable(PINGRP_ATC);
	60	+}
	61	+
	62	+/* this is a weak define that we are overriding */
	63	+int board_mmc_init(bd_t *bd)
	64	+{
	65	+ debug("board_mmc_init called\n");
	66	+
	67	+ /* Enable muxes, etc. for SDMMC controllers */
	68	+ pin_mux_mmc();
	69	+
	70	+ debug("board_mmc_init: init eMMC\n");
	71	+ /* init dev 0, eMMC chip, with 4-bit bus */
	72	+ /* The board has an 8-bit bus, but 8-bit doesn't work yet */
	73	+ tegra2_mmc_init(0, 4, -1, -1);
	74	+
	75	+ debug("board_mmc_init: init SD slot\n");
	76	+ /* init dev 3, SD slot, with 4-bit bus */
	77	+ tegra2_mmc_init(3, 4, GPIO_PV1, GPIO_PI5);
	78	+
	79	+ return 0;
	80	+}
	81	+#endif
...	...	@@ -250,6 +250,7 @@
250	250	jornada arm sa1100
251	251	plutux arm armv7 plutux avionic-design tegra2
252	252	medcom arm armv7 medcom avionic-design tegra2
	253	+paz00 arm armv7 paz00 compal tegra2
253	254	atngw100 avr32 at32ap - atmel at32ap700x
254	255	atstk1002 avr32 at32ap atstk1000 atmel at32ap700x
255	256	atstk1003 avr32 at32ap atstk1000 atmel at32ap700x
	1	+/*
	2	+ * Copyright (c) 2010,2011, NVIDIA CORPORATION. All rights reserved.
	3	+ *
	4	+ * See file CREDITS for list of people who contributed to this
	5	+ * project.
	6	+ *
	7	+ * This program is free software; you can redistribute it and/or modify it
	8	+ * under the terms and conditions of the GNU General Public License,
	9	+ * version 2, as published by the Free Software Foundation.
	10	+ *
	11	+ * This program is distributed in the hope it will be useful, but WITHOUT
	12	+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
	13	+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
	14	+ * more details.
	15	+ */
	16	+
	17	+#ifndef __CONFIG_H
	18	+#define __CONFIG_H
	19	+
	20	+#include <asm/sizes.h>
	21	+#include "tegra2-common.h"
	22	+
	23	+/* High-level configuration options */
	24	+#define TEGRA2_SYSMEM "mem=512M@0M"
	25	+#define V_PROMPT "Tegra2 (Paz00) MOD # "
	26	+#define CONFIG_TEGRA2_BOARD_STRING "Compal Paz00"
	27	+
	28	+/* Board-specific serial config */
	29	+#define CONFIG_SERIAL_MULTI
	30	+#define CONFIG_TEGRA2_ENABLE_UARTA
	31	+#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
	32	+
	33	+#define CONFIG_MACH_TYPE MACH_TYPE_PAZ00
	34	+#define CONFIG_SYS_BOARD_ODMDATA 0x800c0085 /* lp1, 512MB */
	35	+
	36	+#define CONFIG_BOARD_EARLY_INIT_F
	37	+
	38	+/* SD/MMC */
	39	+#define CONFIG_MMC
	40	+#define CONFIG_GENERIC_MMC
	41	+#define CONFIG_TEGRA2_MMC
	42	+#define CONFIG_CMD_MMC
	43	+
	44	+#define CONFIG_DOS_PARTITION
	45	+#define CONFIG_EFI_PARTITION
	46	+#define CONFIG_CMD_EXT2
	47	+#define CONFIG_CMD_FAT
	48	+
	49	+/* Environment not stored */
	50	+#define CONFIG_ENV_IS_NOWHERE
	51	+#endif /* __CONFIG_H */