diff options
| author | Rob Herring <r.herring@freescale.com> | 2010-03-02 11:42:09 -0600 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-25 10:56:31 +0200 |
| commit | 3f0bbe89cf5d6cf29f2cf627e787d8b70cc92f52 (patch) | |
| tree | 8aa0cca68ded657809f791cf792ada5a77401a7a /drivers/mxc | |
| parent | 3d8b9c8da18c22fa7c3f3628c3101bcfa3c8c34d (diff) | |
ENGR00121296: imx51: rename mx51 to mx5
Rename mx51 to mx5 for common source for MX5x family
Signed-off-by: Rob Herring <r.herring@freescale.com>
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'drivers/mxc')
| -rw-r--r-- | drivers/mxc/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/mxc/security/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/mxc/security/sahara2/include/fsl_platform.h | 2 | ||||
| -rw-r--r-- | drivers/mxc/security/sahara2/include/sah_kernel.h | 2 | ||||
| -rw-r--r-- | drivers/mxc/vpu/Kconfig | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/drivers/mxc/Kconfig b/drivers/mxc/Kconfig index 72225bbe91de..6e67087d2efa 100644 --- a/drivers/mxc/Kconfig +++ b/drivers/mxc/Kconfig @@ -9,10 +9,10 @@ config MXC_IPU depends on !ARCH_MX21 depends on !ARCH_MX27 depends on !ARCH_MX25 - select MXC_IPU_V1 if !ARCH_MX37 && !ARCH_MX51 - select MXC_IPU_V3 if ARCH_MX37 || ARCH_MX51 + select MXC_IPU_V1 if !ARCH_MX37 && !ARCH_MX5 + select MXC_IPU_V3 if ARCH_MX37 || ARCH_MX5 select MXC_IPU_V3D if ARCH_MX37 - select MXC_IPU_V3EX if ARCH_MX51 + select MXC_IPU_V3EX if ARCH_MX5 help If you plan to use the Image Processing unit, say Y here. IPU is needed by Framebuffer and V4L2 drivers. diff --git a/drivers/mxc/security/Kconfig b/drivers/mxc/security/Kconfig index 83d856d85dc0..875848b2c69c 100644 --- a/drivers/mxc/security/Kconfig +++ b/drivers/mxc/security/Kconfig @@ -9,7 +9,7 @@ config MXC_SECURITY_SCC config MXC_SECURITY_SCC2 tristate "MXC SCC2 Driver" - depends on ARCH_MX37 || ARCH_MX51 + depends on ARCH_MX37 || ARCH_MX5 default n ---help--- This module contains the core API's for accessing the SCC2 module. @@ -57,7 +57,7 @@ config MXC_DRYICE This module contains the core API's for accessing the DryIce module. If you are unsure about this, say N here. -if (ARCH_MX37 || ARCH_MX51 || ARCH_MX27) +if (ARCH_MX37 || ARCH_MX5 || ARCH_MX27) source "drivers/mxc/security/sahara2/Kconfig" endif diff --git a/drivers/mxc/security/sahara2/include/fsl_platform.h b/drivers/mxc/security/sahara2/include/fsl_platform.h index e7a6fd1718b2..a8b9080fe2f9 100644 --- a/drivers/mxc/security/sahara2/include/fsl_platform.h +++ b/drivers/mxc/security/sahara2/include/fsl_platform.h @@ -68,7 +68,7 @@ #define FSL_HAVE_RTIC2 #define FSL_HAVE_SRTC -#elif defined(CONFIG_ARCH_MX51) +#elif defined(CONFIG_ARCH_MX5) #define FSL_HAVE_SCC2 #define FSL_HAVE_SAHARA4 diff --git a/drivers/mxc/security/sahara2/include/sah_kernel.h b/drivers/mxc/security/sahara2/include/sah_kernel.h index 42013272f610..13c1f170b9dc 100644 --- a/drivers/mxc/security/sahara2/include/sah_kernel.h +++ b/drivers/mxc/security/sahara2/include/sah_kernel.h @@ -31,7 +31,7 @@ #include <mach/hardware.h> #define SAHA_BASE_ADDR SAHARA_BASE_ADDR #define SAHARA_IRQ MXC_INT_SAHARA -#elif defined(CONFIG_ARCH_MX51) +#elif defined(CONFIG_ARCH_MX5) #include <mach/hardware.h> #define SAHA_BASE_ADDR SAHARA_BASE_ADDR #define SAHARA_IRQ MXC_INT_SAHARA_H0 diff --git a/drivers/mxc/vpu/Kconfig b/drivers/mxc/vpu/Kconfig index e41974591b86..37e55e03d2f2 100644 --- a/drivers/mxc/vpu/Kconfig +++ b/drivers/mxc/vpu/Kconfig @@ -6,7 +6,7 @@ menu "MXC VPU(Video Processing Unit) support" config MXC_VPU tristate "Support for MXC VPU(Video Processing Unit)" - depends on (ARCH_MX3 || ARCH_MX27 || ARCH_MXC92323 || ARCH_MX37 || ARCH_MX51) + depends on (ARCH_MX3 || ARCH_MX27 || ARCH_MX37 || ARCH_MX5) default y ---help--- The VPU codec device provides codec function for H.264/MPEG4/H.263, @@ -14,7 +14,7 @@ config MXC_VPU config MXC_VPU_IRAM tristate "Use IRAM as temporary buffer for VPU to enhance performace" - depends on (ARCH_MX37 || ARCH_MX51) + depends on (ARCH_MX37 || ARCH_MX5) default y ---help--- The VPU can use internal RAM as temporary buffer to save external |