diff options
Diffstat (limited to 'board/nvidia')
| -rw-r--r-- | board/nvidia/common/Makefile | 1 | ||||
| -rw-r--r-- | board/nvidia/common/board.c | 42 | ||||
| -rw-r--r-- | board/nvidia/common/emc.c | 53 | ||||
| -rw-r--r-- | board/nvidia/common/emc.h | 29 | ||||
| -rw-r--r-- | board/nvidia/dts/tegra2-seaboard.dts | 64 | 
5 files changed, 188 insertions, 1 deletions
diff --git a/board/nvidia/common/Makefile b/board/nvidia/common/Makefile index 3e748fdd2..a93d4583e 100644 --- a/board/nvidia/common/Makefile +++ b/board/nvidia/common/Makefile @@ -27,6 +27,7 @@ LIB	= $(obj)lib$(VENDOR).o  COBJS-y += board.o  COBJS-$(CONFIG_SPI_UART_SWITCH) += uart-spi-switch.o +COBJS-$(CONFIG_TEGRA_CLOCK_SCALING) += emc.o  COBJS	:= $(COBJS-y)  SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index 85dd359ec..2e2213359 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -23,6 +23,7 @@  #include <common.h>  #include <ns16550.h> +#include <linux/compiler.h>  #include <asm/io.h>  #include <asm/arch/tegra2.h>  #include <asm/arch/sys_proto.h> @@ -30,12 +31,17 @@  #include <asm/arch/board.h>  #include <asm/arch/clk_rst.h>  #include <asm/arch/clock.h> +#include <asm/arch/emc.h>  #include <asm/arch/pinmux.h> +#include <asm/arch/pmc.h> +#include <asm/arch/pmu.h>  #include <asm/arch/uart.h> +#include <asm/arch/warmboot.h>  #include <spi.h>  #include <asm/arch/usb.h>  #include <i2c.h>  #include "board.h" +#include "emc.h"  DECLARE_GLOBAL_DATA_PTR; @@ -59,11 +65,28 @@ void __pin_mux_usb(void)  void pin_mux_usb(void) __attribute__((weak, alias("__pin_mux_usb")));  /* + * Routine: power_det_init + * Description: turn off power detects + */ +static void power_det_init(void) +{ +#if defined(CONFIG_TEGRA2) +	struct pmc_ctlr *const pmc = (struct pmc_ctlr *)TEGRA2_PMC_BASE; + +	/* turn off power detects */ +	writel(0, &pmc->pmc_pwr_det_latch); +	writel(0, &pmc->pmc_pwr_det); +#endif +} + +/*   * Routine: board_init   * Description: Early hardware init.   */  int board_init(void)  { +	__maybe_unused int err; +  	/* Do clocks and UART first so that printf() works */  	clock_init();  	clock_verify(); @@ -76,18 +99,35 @@ int board_init(void)  #endif  	/* boot param addr */  	gd->bd->bi_boot_params = (NV_PA_SDRAM_BASE + 0x100); + +	power_det_init(); +  #ifdef CONFIG_TEGRA_I2C  #ifndef CONFIG_SYS_I2C_INIT_BOARD  #error "You must define CONFIG_SYS_I2C_INIT_BOARD to use i2c on Nvidia boards"  #endif  	i2c_init_board(); -#endif +# ifdef CONFIG_TEGRA_PMU +	if (pmu_set_nominal()) +		debug("Failed to select nominal voltages\n"); +#  ifdef CONFIG_TEGRA_CLOCK_SCALING +	err = board_emc_init(); +	if (err) +		debug("Memory controller init failed: %d\n", err); +#  endif +# endif /* CONFIG_TEGRA_PMU */ +#endif /* CONFIG_TEGRA_I2C */  #ifdef CONFIG_USB_EHCI_TEGRA  	pin_mux_usb();  	board_usb_init(gd->fdt_blob);  #endif +#ifdef CONFIG_TEGRA2_LP0 +	/* prepare the WB code to LP0 location */ +	warmboot_prepare_code(TEGRA_LP0_ADDR, TEGRA_LP0_SIZE); +#endif +  	return 0;  } diff --git a/board/nvidia/common/emc.c b/board/nvidia/common/emc.c new file mode 100644 index 000000000..8e4290cee --- /dev/null +++ b/board/nvidia/common/emc.c @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2011 The Chromium OS Authors. + * + * 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 of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <common.h> +#include <asm/io.h> +#include <asm/arch/ap20.h> +#include <asm/arch/clk_rst.h> +#include <asm/arch/clock.h> +#include <asm/arch/emc.h> +#include <asm/arch/pmu.h> +#include <asm/arch/sys_proto.h> +#include <asm/arch/tegra2.h> + +DECLARE_GLOBAL_DATA_PTR; + +/* These rates are hard-coded for now, until fdt provides them */ +#define EMC_SDRAM_RATE_T20	(333000 * 2 * 1000) +#define EMC_SDRAM_RATE_T25	(380000 * 2 * 1000) + +int board_emc_init(void) +{ +	unsigned rate; + +	switch (tegra_get_chip_type()) { +	default: +	case TEGRA_SOC_T20: +		rate  = EMC_SDRAM_RATE_T20; +		break; +	case TEGRA_SOC_T25: +		rate  = EMC_SDRAM_RATE_T25; +		break; +	} +	return tegra_set_emc(gd->fdt_blob, rate); +} diff --git a/board/nvidia/common/emc.h b/board/nvidia/common/emc.h new file mode 100644 index 000000000..ec1b115f4 --- /dev/null +++ b/board/nvidia/common/emc.h @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2011 The Chromium OS Authors. + * (C) Copyright 2010,2011 NVIDIA Corporation <www.nvidia.com> + * + * 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 of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef _NVIDIA_EMC_H_ +#define _NVIDIA_EMC_H_ + +int board_emc_init(void); + +#endif diff --git a/board/nvidia/dts/tegra2-seaboard.dts b/board/nvidia/dts/tegra2-seaboard.dts index 6ba3ec48f..335253953 100644 --- a/board/nvidia/dts/tegra2-seaboard.dts +++ b/board/nvidia/dts/tegra2-seaboard.dts @@ -89,4 +89,68 @@  	i2c@7000c500 {  		clock-frequency = <100000>;  	}; + +	emc@7000f400 { +		emc-table@190000 { +			reg = < 190000 >; +			compatible = "nvidia,tegra20-emc-table"; +			clock-frequency = < 190000 >; +			nvidia,emc-registers = < 0x0000000c 0x00000026 +				0x00000009 0x00000003 0x00000004 0x00000004 +				0x00000002 0x0000000c 0x00000003 0x00000003 +				0x00000002 0x00000001 0x00000004 0x00000005 +				0x00000004 0x00000009 0x0000000d 0x0000059f +				0x00000000 0x00000003 0x00000003 0x00000003 +				0x00000003 0x00000001 0x0000000b 0x000000c8 +				0x00000003 0x00000007 0x00000004 0x0000000f +				0x00000002 0x00000000 0x00000000 0x00000002 +				0x00000000 0x00000000 0x00000083 0xa06204ae +				0x007dc010 0x00000000 0x00000000 0x00000000 +				0x00000000 0x00000000 0x00000000 0x00000000 >; +		}; +		emc-table@380000 { +			reg = < 380000 >; +			compatible = "nvidia,tegra20-emc-table"; +			clock-frequency = < 380000 >; +			nvidia,emc-registers = < 0x00000017 0x0000004b +				0x00000012 0x00000006 0x00000004 0x00000005 +				0x00000003 0x0000000c 0x00000006 0x00000006 +				0x00000003 0x00000001 0x00000004 0x00000005 +				0x00000004 0x00000009 0x0000000d 0x00000b5f +				0x00000000 0x00000003 0x00000003 0x00000006 +				0x00000006 0x00000001 0x00000011 0x000000c8 +				0x00000003 0x0000000e 0x00000007 0x0000000f +				0x00000002 0x00000000 0x00000000 0x00000002 +				0x00000000 0x00000000 0x00000083 0xe044048b +				0x007d8010 0x00000000 0x00000000 0x00000000 +				0x00000000 0x00000000 0x00000000 0x00000000 >; +		}; +	}; + +	kbc@7000e200 { +		linux,keymap = <0x00020011 0x0003001f 0x0004001e 0x0005002c +			0x000701d0 0x0107007d 0x02060064 0x02070038 0x03000006 +			0x03010005 0x03020013 0x03030012 0x03040021 0x03050020 +			0x0306002d 0x04000008 0x04010007 0x04020014 0x04030023 +			0x04040022 0x0405002f 0x0406002e 0x04070039 0x0500000a +			0x05010009 0x05020016 0x05030015 0x05040024 0x05050031 +			0x05060030 0x0507002b 0x0600000c 0x0601000b 0x06020018 +			0x06030017 0x06040026 0x06050025 0x06060033 0x06070032 +			0x0701000d 0x0702001b 0x0703001c 0x0707008b 0x08040036 +			0x0805002a 0x09050061 0x0907001d 0x0b00001a 0x0b010019 +			0x0b020028 0x0b030027 0x0b040035 0x0b050034 0x0c000044 +			0x0c010043 0x0c02000e 0x0c030004 0x0c040003 0x0c050067 +			0x0c0600d2 0x0c070077 0x0d00006e 0x0d01006f 0x0d030068 +			0x0d04006d 0x0d05006a 0x0d06006c 0x0d070069 0x0e000057 +			0x0e010058 0x0e020042 0x0e030010 0x0e04003e 0x0e05003d +			0x0e060002 0x0e070041 0x0f000001 0x0f010029 0x0f02003f +			0x0f03000f 0x0f04003b 0x0f05003c 0x0f06003a 0x0f070040 +			0x14000047 0x15000049 0x15010048 0x1502004b 0x1504004f +			0x16010062 0x1602004d 0x1603004c 0x16040051 0x16050050 +			0x16070052 0x1b010037 0x1b03004a 0x1b04004e 0x1b050053 +			0x1c050073 0x1d030066 0x1d04006b 0x1d0500e0 0x1d060072 +			0x1d0700e1 0x1e000045 0x1e010046 0x1e020071 +			0x1f04008a>; +		linux,fn-keymap = <0x05040002>; +	};  };  |