diff options
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/clk_rst.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/tegra.h | 3 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra2/pmu.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra2/tegra.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra3/pmu.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra3/pmu_core.h | 36 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra3/tegra.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/global_data.h | 8 |
8 files changed, 56 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-tegra/clk_rst.h b/arch/arm/include/asm/arch-tegra/clk_rst.h index 6bf9cb6131..3233d3b9d0 100644 --- a/arch/arm/include/asm/arch-tegra/clk_rst.h +++ b/arch/arm/include/asm/arch-tegra/clk_rst.h @@ -275,7 +275,7 @@ enum { #define SUPER_CDIV_ENB (1 << 31) /* CRC_SCLK_BURST_POLICY_0 28h */ -#define SCLK_SYS_STATE_RUN (2 << 28) +#define SCLK_SYS_CPU_STATE_RUN (2 << 28) #define SCLK_SWAKE_FIQ_SRC_CLKM (0 << 12) #define SCLK_SWAKE_IRQ_SRC_CLKM (0 << 8) #define SCLK_SWAKE_RUN_SRC_CLKM (0 << 4) diff --git a/arch/arm/include/asm/arch-tegra/tegra.h b/arch/arm/include/asm/arch-tegra/tegra.h index 471420136f..c51a8014e0 100644 --- a/arch/arm/include/asm/arch-tegra/tegra.h +++ b/arch/arm/include/asm/arch-tegra/tegra.h @@ -56,6 +56,9 @@ #define TEGRA_KBC_BASE 0x7000E200 #define NV_PA_PMC_BASE 0x7000E400 #define NV_PA_EMC_BASE 0x7000F400 +#define NV_PA_EMC_ADR_CFG_BASE (NV_PA_EMC_BASE + 0x10) +#define EMEM_DEVSIZE_MASK (0xf << EMEM_DEVSIZE_SHIFT) +#define EMEM_DEVSIZE_SHIFT (16) #define NV_PA_FUSE_BASE 0x7000F800 #define NV_PA_CSITE_BASE 0x70040000 diff --git a/arch/arm/include/asm/arch-tegra2/pmu.h b/arch/arm/include/asm/arch-tegra2/pmu.h index 5baab7604a..0faf07c3db 100644 --- a/arch/arm/include/asm/arch-tegra2/pmu.h +++ b/arch/arm/include/asm/arch-tegra2/pmu.h @@ -54,4 +54,6 @@ #define SM1_PWM_BIT 1 #define SM2_PWM_BIT 2 +#define MAX_I2C_RETRY 3 + #endif /* _ARCH_PMU_H_ */ diff --git a/arch/arm/include/asm/arch-tegra2/tegra.h b/arch/arm/include/asm/arch-tegra2/tegra.h index 6284e22c3b..125e31ed88 100644 --- a/arch/arm/include/asm/arch-tegra2/tegra.h +++ b/arch/arm/include/asm/arch-tegra2/tegra.h @@ -36,6 +36,8 @@ #define NV_PA_USB1_BASE 0xC5000000 #define NV_PA_USB3_BASE 0xC5008000 +#define NV_APB_MISC_BASE 0x70000000 + #include <asm/arch-tegra/tegra.h> #endif diff --git a/arch/arm/include/asm/arch-tegra3/pmu.h b/arch/arm/include/asm/arch-tegra3/pmu.h index e2ed1d0325..f014a0f15e 100644 --- a/arch/arm/include/asm/arch-tegra3/pmu.h +++ b/arch/arm/include/asm/arch-tegra3/pmu.h @@ -35,4 +35,6 @@ #define PMU_LDO5_SEL(decivolts) ((decivolts - 10) * PMU_LDO5_SEL_0_1V_DELTA + \ PMU_LDO5_SEL_1_0V) +#define MAX_I2C_RETRY 3 + #endif /* _ARCH_PMU_H_ */ diff --git a/arch/arm/include/asm/arch-tegra3/pmu_core.h b/arch/arm/include/asm/arch-tegra3/pmu_core.h new file mode 100644 index 0000000000..48c61e0437 --- /dev/null +++ b/arch/arm/include/asm/arch-tegra3/pmu_core.h @@ -0,0 +1,36 @@ +/* + * (C) Copyright 2012 + * Toradex AG <www.toradex.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 + */ + +/* definitions for TPS62360 / TPS62362 */ +#ifndef _PMU_CORE_H_ +#define _PMU_CORE_H_ + +#define DVC_I2C_BUS_NUMBER 0 +#define PMU_CORE_I2C_ADDRESS 0x60 + +#define PMU_CORE_VOLTAGE_START_REG 0x02 +#define PMU_CORE_VOLTAGE_DVFS_REG 0x00 + +#define VDD_CORE_NOMINAL_T30 43 /* 1.2V = 0.77V + x * 10mV */ + +#endif /* PMU_CORE_H */ diff --git a/arch/arm/include/asm/arch-tegra3/tegra.h b/arch/arm/include/asm/arch-tegra3/tegra.h index 62998fdbf1..046e58cddf 100644 --- a/arch/arm/include/asm/arch-tegra3/tegra.h +++ b/arch/arm/include/asm/arch-tegra3/tegra.h @@ -38,6 +38,8 @@ #define NV_PA_USB2_BASE 0x7D004000 #define NV_PA_USB3_BASE 0x7D008000 +#define NV_APB_MISC_BASE 0x70000000 + #include <asm/arch-tegra/tegra.h> #endif diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index c72f6400d1..800f5fe6a5 100644 --- a/arch/arm/include/asm/global_data.h +++ b/arch/arm/include/asm/global_data.h @@ -79,6 +79,14 @@ typedef struct global_data { const void *blob; /* Our device tree, NULL if none */ void **jt; /* jump table */ char env_buf[32]; /* buffer for getenv() before reloc. */ +#if defined(CONFIG_COLIBRI_T20) || defined(CONFIG_COLIBRI_T30) + unsigned env_offset; /* offset to the u-boot environment in mass storage */ + unsigned conf_blk_offset; /* offset to the Toradex config block in mass storage */ + unsigned conf_blk_offset2; /* offset to the Toradex config block (WinCE) in mass storage */ + unsigned kernel_offset; /* offset to the kernel in mass storage */ + unsigned rootfs_size; /* size of the rootfs in mass storage */ + unsigned rootfs_offset; /* offset to the rootfs in mass storage */ +#endif } gd_t; /* |