diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
commit | f987e832a9e79d2ce8009a5ea9c7b677624b3b30 (patch) | |
tree | 0dd09a5e6b4c60ee0a9916907dfc2cda83f3e496 /include/linux/platform_data/tegra_nor.h | |
parent | f737b7f46a72c099cf8ac88baff02fbf61b1a47c (diff) | |
parent | fc993d9bc48f772133d8cd156c67c296477db070 (diff) |
Merge branch 'l4t/l4t-r16-r2' into colibri
Conflicts:
arch/arm/mach-tegra/tegra3_usb_phy.c
arch/arm/mach-tegra/usb_phy.c
drivers/usb/gadget/tegra_udc.c
drivers/usb/otg/Makefile
drivers/video/tegra/fb.c
sound/soc/tegra/tegra_pcm.c
Diffstat (limited to 'include/linux/platform_data/tegra_nor.h')
-rw-r--r-- | include/linux/platform_data/tegra_nor.h | 46 |
1 files changed, 40 insertions, 6 deletions
diff --git a/include/linux/platform_data/tegra_nor.h b/include/linux/platform_data/tegra_nor.h index cd8faff2f1cd..4bd980d2195b 100644 --- a/include/linux/platform_data/tegra_nor.h +++ b/include/linux/platform_data/tegra_nor.h @@ -1,10 +1,5 @@ /* - * include/linux/platform_data/tegra_nor.h - * - * Copyright (C) 2010 - 2011 NVIDIA Corporation. - * - * Author: - * Raghavendra V K <rvk@nvidia.com> + * Copyright (C) 2010-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 @@ -15,6 +10,11 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * + * include/linux/platform_data/tegra_nor.h + * + * Author: + * Raghavendra V K <rvk@nvidia.com> + * */ #ifndef __MACH_TEGRA_NOR_PDATA_H @@ -22,11 +22,45 @@ #include <asm/mach/flash.h> +typedef enum { + NorMuxMode_ADNonMux, + NorMuxMode_ADMux, +}NorMuxMode; + +typedef enum { + NorPageLength_Unsupported, + NorPageLength_4Word, + NorPageLength_8Word, +}NorPageLength; + +typedef enum { + NorBurstLength_CntBurst, + NorBurstLength_8Word, + NorBurstLength_16Word, + NorBurstLength_32Word, +}NorBurstLength; + +typedef enum { + NorReadMode_Async, + NorReadMode_Page, + NorReadMode_Burst, +}NorReadMode; + +typedef enum { + NorReadyActive_WithData, + NorReadyActive_BeforeData, +}NorReadyActive; + struct tegra_nor_chip_parms { struct { uint32_t timing0; uint32_t timing1; } timing_default, timing_read; + NorMuxMode MuxMode; + NorReadMode ReadMode; + NorPageLength PageLength; + NorBurstLength BurstLength; + NorReadyActive ReadyActive; }; struct tegra_nor_platform_data { |