diff options
| author | Dinh Nguyen <r00091@freescale.com> | 2010-02-19 06:53:27 -0600 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-25 10:48:09 +0200 |
| commit | b958bc27a3ddf5bdfea638620ee0518e7adb9030 (patch) | |
| tree | 38dd491aa5b51a5c688e4bc430fc419e51939994 /arch/arm/plat-mxc | |
| parent | c582e6a1a5d36c017aa99af56a438503e6cbac7d (diff) | |
ENGR00121003 Fix IRAM enabling for USB Gadget driver
In order to add IRAM to the USB Gadget driver, there are 2 kconfig
options to enable. One kconfig option was for USB host and the other
was for Gadget. The current SW required both kconfig to be
enable which is confusing. Also need to add iram_alloc function in
the Gadget driver.
Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'arch/arm/plat-mxc')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mx25.h | 7 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mx31.h | 5 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mx37.h | 3 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mx51.h | 7 |
4 files changed, 16 insertions, 6 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mx25.h b/arch/arm/plat-mxc/include/mach/mx25.h index 15305c47bca5..c3935d17b249 100644 --- a/arch/arm/plat-mxc/include/mach/mx25.h +++ b/arch/arm/plat-mxc/include/mach/mx25.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -65,8 +65,9 @@ #define SND_RAM_SIZE 0 #endif -#ifdef CONFIG_USB_STATIC_IRAM_PPH -#define USB_IRAM_SIZE (2*SZ_8K) +#if defined(CONFIG_USB_STATIC_IRAM) \ + || defined(CONFIG_USB_STATIC_IRAM_PPH) +#define USB_IRAM_SIZE SZ_8K #else #define USB_IRAM_SIZE 0 #endif diff --git a/arch/arm/plat-mxc/include/mach/mx31.h b/arch/arm/plat-mxc/include/mach/mx31.h index 4cf6d0074250..e2799d5b7c45 100644 --- a/arch/arm/plat-mxc/include/mach/mx31.h +++ b/arch/arm/plat-mxc/include/mach/mx31.h @@ -4,8 +4,9 @@ #define MX31_IRAM_BASE_ADDR 0x1FFC0000 /* internal ram */ #define MX31_IRAM_SIZE SZ_16K -#ifdef CONFIG_USB_STATIC_IRAM -#define USB_IRAM_SIZE (2*SZ_8K) +#if defined(CONFIG_USB_STATIC_IRAM) \ + || defined(CONFIG_USB_STATIC_IRAM_PPH) +#define USB_IRAM_SIZE SZ_8K #else #define USB_IRAM_SIZE 0 #endif diff --git a/arch/arm/plat-mxc/include/mach/mx37.h b/arch/arm/plat-mxc/include/mach/mx37.h index 8f0e38e0f618..3013d197f206 100644 --- a/arch/arm/plat-mxc/include/mach/mx37.h +++ b/arch/arm/plat-mxc/include/mach/mx37.h @@ -54,7 +54,8 @@ #define SND_RAM_SIZE 0 #endif -#ifdef CONFIG_USB_STATIC_IRAM +#if defined(CONFIG_USB_STATIC_IRAM) \ + || defined(CONFIG_USB_STATIC_IRAM_PPH) #define USB_IRAM_SIZE SZ_8K #else #define USB_IRAM_SIZE 0 diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx51.h index 82e2eac26071..32bfb0156b16 100644 --- a/arch/arm/plat-mxc/include/mach/mx51.h +++ b/arch/arm/plat-mxc/include/mach/mx51.h @@ -87,6 +87,13 @@ #define VPU_IRAM_SIZE 0 #endif +#if defined(CONFIG_USB_STATIC_IRAM) \ + || defined(CONFIG_USB_STATIC_IRAM_PPH) +#define USB_IRAM_SIZE SZ_8K +#else +#define USB_IRAM_SIZE 0 +#endif + /* * NFC */ |