FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-14 04:41:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: imx: move iomux drivers and headers into mach-imx

Browse Source 
The board files in mach-imx are the only users of iomux drivers and
headers.  Move them into mach-imx from plat-mxc.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Shawn Guo 2012-09-13 13:26:00 +08:00
parent 3ed0bcb4c5
commit 267dd34c47
68 changed files with 79 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-imx/Kconfig
View File

@ -7,6 +7,12 @@ config HAVE_IMX_MMDC
config HAVE_IMX_SRC
bool
config IMX_HAVE_IOMUX_V1
bool
config ARCH_MXC_IOMUX_V3
bool
config ARCH_MX1
bool

3
arch/arm/mach-imx/Makefile
View File

@ -15,6 +15,9 @@ obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o $(i
obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-gate2.o \
clk-pfd.o clk-busy.o clk.o
obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o
obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
# Support for CMOS sensor interface
obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o

2
arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
View File

@ -30,10 +30,10 @@
#include <asm/mach/arch.h>
#include <mach/common.h>
#include <mach/iomux-mx27.h>
#include <mach/hardware.h>
#include "devices-imx27.h"
#include "iomux-mx27.h"
static const int eukrea_mbimx27_pins[] __initconst = {
/* UART2 */

2
arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
View File

@ -27,13 +27,13 @@
#include <video/platform_lcd.h>
#include <mach/hardware.h>
#include <mach/iomux-mx25.h>
#include <mach/common.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/mx25.h>
#include "devices-imx25.h"
#include "iomux-mx25.h"
static iomux_v3_cfg_t eukrea_mbimxsd_pads[] = {
/* LCD */

2
arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c
View File

@ -38,9 +38,9 @@
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/iomux-mx35.h>
#include "devices-imx35.h"
#include "iomux-mx35.h"
static const struct fb_videomode fb_modedb[] = {
{

2
arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c
View File

@ -38,9 +38,9 @@
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/iomux-mx51.h>
#include "devices-imx51.h"
#include "iomux-mx51.h"
static iomux_v3_cfg_t eukrea_mbimxsd51_pads[] = {
/* LED */

3
arch/arm/mach-imx/iomux-imx31.c
View File

@ -23,7 +23,8 @@
#include <linux/io.h>
#include <linux/kernel.h>
#include <mach/hardware.h>
#include <mach/iomux-mx3.h>
#include "iomux-mx3.h"
/*
* IOMUX register (base) addresses

2
arch/arm/plat-mxc/include/mach/iomux-mx1.h → arch/arm/mach-imx/iomux-mx1.h
View File

@ -18,7 +18,7 @@
#ifndef __MACH_IOMUX_MX1_H__
#define __MACH_IOMUX_MX1_H__
#include <mach/iomux-v1.h>
#include "iomux-v1.h"
#define PA0_AIN_SPI2_CLK (GPIO_PORTA | GPIO_AIN | GPIO_OUT | 0)
#define PA0_AF_ETMTRACESYNC (GPIO_PORTA | GPIO_AF | 0)

4
arch/arm/plat-mxc/include/mach/iomux-mx21.h → arch/arm/mach-imx/iomux-mx21.h
View File

@ -18,8 +18,8 @@
#ifndef __MACH_IOMUX_MX21_H__
#define __MACH_IOMUX_MX21_H__
#include <mach/iomux-mx2x.h>
#include <mach/iomux-v1.h>
#include "iomux-mx2x.h"
#include "iomux-v1.h"
/* Primary GPIO pin functions */

2
arch/arm/plat-mxc/include/mach/iomux-mx25.h → arch/arm/mach-imx/iomux-mx25.h
View File

@ -19,7 +19,7 @@
#ifndef __MACH_IOMUX_MX25_H__
#define __MACH_IOMUX_MX25_H__
#include <mach/iomux-v3.h>
#include "iomux-v3.h"
/*
* IOMUX/PAD Bit field definitions

4
arch/arm/plat-mxc/include/mach/iomux-mx27.h → arch/arm/mach-imx/iomux-mx27.h
View File

@ -19,8 +19,8 @@
#ifndef __MACH_IOMUX_MX27_H__
#define __MACH_IOMUX_MX27_H__
#include <mach/iomux-mx2x.h>
#include <mach/iomux-v1.h>
#include "iomux-mx2x.h"
#include "iomux-v1.h"
/* Primary GPIO pin functions */

0
arch/arm/plat-mxc/include/mach/iomux-mx2x.h → arch/arm/mach-imx/iomux-mx2x.h
View File

0
arch/arm/plat-mxc/include/mach/iomux-mx3.h → arch/arm/mach-imx/iomux-mx3.h
View File

2
arch/arm/plat-mxc/include/mach/iomux-mx35.h → arch/arm/mach-imx/iomux-mx35.h
View File

@ -19,7 +19,7 @@
#ifndef __MACH_IOMUX_MX35_H__
#define __MACH_IOMUX_MX35_H__
#include <mach/iomux-v3.h>
#include "iomux-v3.h"
/*
* The naming convention for the pad modes is MX35_PAD_<padname>__<padmode>

2
arch/arm/plat-mxc/include/mach/iomux-mx50.h → arch/arm/mach-imx/iomux-mx50.h
View File

@ -19,7 +19,7 @@
#ifndef __MACH_IOMUX_MX50_H__
#define __MACH_IOMUX_MX50_H__
#include <mach/iomux-v3.h>
#include "iomux-v3.h"
#define MX50_ELCDIF_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_DSE_HIGH)

2
arch/arm/plat-mxc/include/mach/iomux-mx51.h → arch/arm/mach-imx/iomux-mx51.h
View File

@ -13,7 +13,7 @@
#ifndef __MACH_IOMUX_MX51_H__
#define __MACH_IOMUX_MX51_H__
#include <mach/iomux-v3.h>
#include "iomux-v3.h"
#define __NA_ 0x000

3
arch/arm/plat-mxc/iomux-v1.c → arch/arm/mach-imx/iomux-v1.c
View File

@ -30,7 +30,8 @@
#include <mach/hardware.h>
#include <asm/mach/map.h>
#include <mach/iomux-v1.h>
#include "iomux-v1.h"
static void __iomem *imx_iomuxv1_baseaddr;
static unsigned imx_iomuxv1_numports;

0
arch/arm/plat-mxc/include/mach/iomux-v1.h → arch/arm/mach-imx/iomux-v1.h
View File

3
arch/arm/plat-mxc/iomux-v3.c → arch/arm/mach-imx/iomux-v3.c
View File

@ -27,7 +27,8 @@
#include <mach/hardware.h>
#include <asm/mach/map.h>
#include <mach/iomux-v3.h>
#include "iomux-v3.h"
static void __iomem *base;

0
arch/arm/plat-mxc/include/mach/iomux-v3.h → arch/arm/mach-imx/iomux-v3.h
View File

2
arch/arm/mach-imx/mach-apf9328.c
View File

@ -27,9 +27,9 @@
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/iomux-mx1.h>
#include "devices-imx1.h"
#include "iomux-mx1.h"
static const int apf9328_pins[] __initconst = {
/* UART1 */

2
arch/arm/mach-imx/mach-armadillo5x0.c
View File

@ -49,11 +49,11 @@
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/iomux-mx3.h>
#include <mach/ulpi.h>
#include "devices-imx31.h"
#include "crmregs-imx3.h"
#include "iomux-mx3.h"
static int armadillo5x0_pins[] = {
/* UART1 */

2
arch/arm/mach-imx/mach-bug.c
View File

@ -19,7 +19,6 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <mach/iomux-mx3.h>
#include <mach/hardware.h>
#include <mach/common.h>
@ -28,6 +27,7 @@
#include <asm/mach-types.h>
#include "devices-imx31.h"
#include "iomux-mx3.h"
static const struct imxuart_platform_data uart_pdata __initconst = {
.flags = IMXUART_HAVE_RTSCTS,

2
arch/arm/mach-imx/mach-cpuimx27.c
View File

@ -36,11 +36,11 @@
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/iomux-mx27.h>
#include <mach/ulpi.h>
#include "devices-imx27.h"
#include "eukrea-baseboards.h"
#include "iomux-mx27.h"
static const int eukrea_cpuimx27_pins[] __initconst = {
/* UART1 */

2
arch/arm/mach-imx/mach-cpuimx35.c
View File

@ -39,10 +39,10 @@
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/iomux-mx35.h>
#include "devices-imx35.h"
#include "eukrea-baseboards.h"
#include "iomux-mx35.h"
static const struct imxuart_platform_data uart_pdata __initconst = {
.flags = IMXUART_HAVE_RTSCTS,

2
arch/arm/mach-imx/mach-cpuimx51sd.c
View File

@ -28,7 +28,6 @@
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/iomux-mx51.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
@ -38,6 +37,7 @@
#include "devices-imx51.h"
#include "cpu_op-mx51.h"
#include "eukrea-baseboards.h"
#include "iomux-mx51.h"
#define USBH1_RST IMX_GPIO_NR(2, 28)
#define ETH_RST IMX_GPIO_NR(2, 31)

2
arch/arm/mach-imx/mach-eukrea_cpuimx25.c
View File

@ -35,10 +35,10 @@
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/mx25.h>
#include <mach/iomux-mx25.h>
#include "devices-imx25.h"
#include "eukrea-baseboards.h"
#include "iomux-mx25.h"
static const struct imxuart_platform_data uart_pdata __initconst = {
.flags = IMXUART_HAVE_RTSCTS,

2
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
View File

@ -42,9 +42,9 @@
#include <asm/memblock.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/iomux-mx27.h>
#include "devices-imx27.h"
#include "iomux-mx27.h"
#define TVP5150_RSTN (GPIO_PORTC + 18)
#define TVP5150_PWDN (GPIO_PORTC + 19)

2
arch/arm/mach-imx/mach-imx27ipcam.c
View File

@ -19,9 +19,9 @@
#include <asm/mach/time.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/iomux-mx27.h>
#include "devices-imx27.h"
#include "iomux-mx27.h"
static const int mx27ipcam_pins[] __initconst = {
/* UART1 */

2
arch/arm/mach-imx/mach-imx27lite.c
View File

@ -22,9 +22,9 @@
#include <asm/mach/map.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/iomux-mx27.h>
#include "devices-imx27.h"
#include "iomux-mx27.h"
static const int mx27lite_pins[] __initconst = {
/* UART1 */

2
arch/arm/mach-imx/mach-kzm_arm11_01.c
View File

@ -38,9 +38,9 @@
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/iomux-mx3.h>
#include "devices-imx31.h"
#include "iomux-mx3.h"
#define KZM_ARM11_IO_ADDRESS(x) (IOMEM( \
IMX_IO_P2V_MODULE(x, MX31_CS4) ?: \

2
arch/arm/mach-imx/mach-mx1ads.c
View File

@ -25,9 +25,9 @@
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/iomux-mx1.h>
#include "devices-imx1.h"
#include "iomux-mx1.h"
static const int mx1ads_pins[] __initconst = {
/* UART1 */

2
arch/arm/mach-imx/mach-mx21ads.c
View File

@ -24,9 +24,9 @@
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include <mach/iomux-mx21.h>
#include "devices-imx21.h"
#include "iomux-mx21.h"
/*
* Memory-mapped I/O on MX21ADS base board

2
arch/arm/mach-imx/mach-mx25_3ds.c
View File

@ -39,9 +39,9 @@
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/mx25.h>
#include <mach/iomux-mx25.h>
#include "devices-imx25.h"
#include "iomux-mx25.h"
#define MX25PDK_CAN_PWDN IMX_GPIO_NR(4, 6)

2
arch/arm/mach-imx/mach-mx27_3ds.c
View File

@ -38,11 +38,11 @@
#include <asm/mach/time.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/iomux-mx27.h>
#include <mach/ulpi.h>
#include "3ds_debugboard.h"
#include "devices-imx27.h"
#include "iomux-mx27.h"
#define SD1_EN_GPIO IMX_GPIO_NR(2, 25)
#define OTG_PHY_RESET_GPIO IMX_GPIO_NR(2, 23)

2
arch/arm/mach-imx/mach-mx27ads.c
View File

@ -27,9 +27,9 @@
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include <mach/iomux-mx27.h>
#include "devices-imx27.h"
#include "iomux-mx27.h"
/*
* Base address of PBC controller, CS4

2
arch/arm/mach-imx/mach-mx31_3ds.c
View File

@ -38,11 +38,11 @@
#include <asm/mach/map.h>
#include <asm/memblock.h>
#include <mach/common.h>
#include <mach/iomux-mx3.h>
#include <mach/ulpi.h>
#include "3ds_debugboard.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"
static int mx31_3ds_pins[] = {
/* UART1 */

2
arch/arm/mach-imx/mach-mx31ads.c
View File

@ -29,7 +29,6 @@
#include <asm/memory.h>
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/iomux-mx3.h>
#ifdef CONFIG_MACH_MX31ADS_WM1133_EV1
#include <linux/mfd/wm8350/audio.h>
@ -38,6 +37,7 @@
#endif
#include "devices-imx31.h"
#include "iomux-mx3.h"
/* Base address of PBC controller */
#define PBC_BASE_ADDRESS MX31_CS4_BASE_ADDR_VIRT

2
arch/arm/mach-imx/mach-mx31lilly.c
View File

@ -44,11 +44,11 @@
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/iomux-mx3.h>
#include <mach/ulpi.h>
#include "board-mx31lilly.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"
/*
* This file contains module-specific initialization routines for LILLY-1131.

2
arch/arm/mach-imx/mach-mx31lite.c
View File

@ -41,11 +41,11 @@
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/iomux-mx3.h>
#include <mach/ulpi.h>
#include "board-mx31lite.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"
/*
* This file contains the module-specific initialization routines.

2
arch/arm/mach-imx/mach-mx31moboard.c
View File

@ -44,12 +44,12 @@
#include <asm/memblock.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/iomux-mx3.h>
#include <mach/ulpi.h>
#include <linux/platform_data/asoc-imx-ssi.h>
#include "board-mx31moboard.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"
static unsigned int moboard_pins[] = {
/* UART0 */

2
arch/arm/mach-imx/mach-mx35_3ds.c
View File

@ -45,13 +45,13 @@
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/iomux-mx35.h>
#include <video/platform_lcd.h>
#include <media/soc_camera.h>
#include "3ds_debugboard.h"
#include "devices-imx35.h"
#include "iomux-mx35.h"
#define GPIO_MC9S08DZ60_GPS_ENABLE 0
#define GPIO_MC9S08DZ60_HDD_ENABLE 4

2
arch/arm/mach-imx/mach-mx50_rdp.c
View File

@ -26,7 +26,6 @@
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/iomux-mx50.h>
#include <asm/irq.h>
#include <asm/setup.h>
@ -35,6 +34,7 @@
#include <asm/mach/time.h>
#include "devices-imx50.h"
#include "iomux-mx50.h"
#define FEC_EN IMX_GPIO_NR(6, 23)
#define FEC_RESET_B IMX_GPIO_NR(4, 12)

2
arch/arm/mach-imx/mach-mx51_3ds.c
View File

@ -21,10 +21,10 @@
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/iomux-mx51.h>
#include "3ds_debugboard.h"
#include "devices-imx51.h"
#include "iomux-mx51.h"
#define MX51_3DS_ECSPI2_CS (GPIO_PORTC + 28)

2
arch/arm/mach-imx/mach-mx51_babbage.c
View File

@ -22,7 +22,6 @@
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/iomux-mx51.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
@ -31,6 +30,7 @@
#include "devices-imx51.h"
#include "cpu_op-mx51.h"
#include "iomux-mx51.h"
#define BABBAGE_USB_HUB_RESET IMX_GPIO_NR(1, 7)
#define BABBAGE_USBH1_STP IMX_GPIO_NR(1, 27)

2
arch/arm/mach-imx/mach-mxt_td60.c
View File

@ -28,10 +28,10 @@
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include <linux/gpio.h>
#include <mach/iomux-mx27.h>
#include <linux/i2c/pca953x.h>
#include "devices-imx27.h"
#include "iomux-mx27.h"
static const int mxt_td60_pins[] __initconst = {
/* UART0 */

2
arch/arm/mach-imx/mach-pca100.c
View File

@ -34,11 +34,11 @@
#include <asm/mach-types.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/iomux-mx27.h>
#include <asm/mach/time.h>
#include <mach/ulpi.h>
#include "devices-imx27.h"
#include "iomux-mx27.h"
#define OTG_PHY_CS_GPIO (GPIO_PORTB + 23)
#define USBH2_PHY_CS_GPIO (GPIO_PORTB + 24)

2
arch/arm/mach-imx/mach-pcm037.c
View File

@ -44,10 +44,10 @@
#include <asm/memblock.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/iomux-mx3.h>
#include <mach/ulpi.h>
#include "devices-imx31.h"
#include "iomux-mx3.h"
#include "pcm037.h"
static enum pcm037_board_variant pcm037_instance = PCM037_PCM970;

2
arch/arm/mach-imx/mach-pcm037_eet.c
View File

@ -12,12 +12,12 @@
#include <linux/spi/spi.h>
#include <mach/common.h>
#include <mach/iomux-mx3.h>
#include <asm/mach-types.h>
#include "pcm037.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"
static unsigned int pcm037_eet_pins[] = {
/* Reserve and hardwire GPIO 57 high - S6E63D6 chipselect */

2
arch/arm/mach-imx/mach-pcm038.c
View File

@ -35,11 +35,11 @@
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/iomux-mx27.h>
#include <mach/ulpi.h>
#include "board-pcm038.h"
#include "devices-imx27.h"
#include "iomux-mx27.h"
static const int pcm038_pins[] __initconst = {
/* UART1 */

2
arch/arm/mach-imx/mach-pcm043.c
View File

@ -35,10 +35,10 @@
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/iomux-mx35.h>
#include <mach/ulpi.h>
#include "devices-imx35.h"
#include "iomux-mx35.h"
static const struct fb_videomode fb_modedb[] = {
{

2
arch/arm/mach-imx/mach-qong.c
View File

@ -29,9 +29,9 @@
#include <mach/common.h>
#include <asm/page.h>
#include <asm/setup.h>
#include <mach/iomux-mx3.h>
#include "devices-imx31.h"
#include "iomux-mx3.h"
/* FPGA defines */
#define QONG_FPGA_VERSION(major, minor, rev) \

2
arch/arm/mach-imx/mach-scb9328.c
View File

@ -22,9 +22,9 @@
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/iomux-mx1.h>
#include "devices-imx1.h"
#include "iomux-mx1.h"
/*
* This scb9328 has a 32MiB flash

2
arch/arm/mach-imx/mach-vpr200.c
View File

@ -30,13 +30,13 @@
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/iomux-mx35.h>
#include <linux/i2c.h>
#include <linux/i2c/at24.h>
#include <linux/mfd/mc13xxx.h>
#include "devices-imx35.h"
#include "iomux-mx35.h"
#define GPIO_LCDPWR IMX_GPIO_NR(1, 2)
#define GPIO_PMIC_INT IMX_GPIO_NR(2, 0)

3
arch/arm/mach-imx/mm-imx1.c
View File

@ -24,7 +24,8 @@
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/iomux-v1.h>
#include "iomux-v1.h"
static struct map_desc imx_io_desc[] __initdata = {
imx_map_entry(MX1, IO, MT_DEVICE),

3
arch/arm/mach-imx/mm-imx21.c
View File

@ -26,7 +26,8 @@
#include <mach/devices-common.h>
#include <asm/pgtable.h>
#include <asm/mach/map.h>
#include <mach/iomux-v1.h>
#include "iomux-v1.h"
/* MX21 memory map definition */
static struct map_desc imx21_io_desc[] __initdata = {

3
arch/arm/mach-imx/mm-imx25.c
View File

@ -28,7 +28,8 @@
#include <mach/devices-common.h>
#include <mach/hardware.h>
#include <mach/mx25.h>
#include <mach/iomux-v3.h>
#include "iomux-v3.h"
/*
* This table defines static virtual address mappings for I/O regions.

3
arch/arm/mach-imx/mm-imx27.c
View File

@ -26,7 +26,8 @@
#include <mach/devices-common.h>
#include <asm/pgtable.h>
#include <asm/mach/map.h>
#include <mach/iomux-v1.h>
#include "iomux-v1.h"
/* MX27 memory map definition */
static struct map_desc imx27_io_desc[] __initdata = {

2
arch/arm/mach-imx/mm-imx3.c
View File

@ -29,9 +29,9 @@
#include <mach/common.h>
#include <mach/devices-common.h>
#include <mach/hardware.h>
#include <mach/iomux-v3.h>
#include "crmregs-imx3.h"
#include "iomux-v3.h"
void __iomem *mx3_ccm_base;

3
arch/arm/mach-imx/mm-imx5.c
View File

@ -21,7 +21,8 @@
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/devices-common.h>
#include <mach/iomux-v3.h>
#include "iomux-v3.h"
/*
* Define the MX50 memory map.

2
arch/arm/mach-imx/mx31lilly-db.c
View File

@ -32,10 +32,10 @@
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/iomux-mx3.h>
#include "board-mx31lilly.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"
/*
* This file contains board-specific initialization routines for the

2
arch/arm/mach-imx/mx31lite-db.c
View File

@ -33,10 +33,10 @@
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/iomux-mx3.h>
#include "board-mx31lite.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"
/*
* This file contains board-specific initialization routines for the

2
arch/arm/mach-imx/mx31moboard-devboard.c
View File

@ -23,11 +23,11 @@
#include <linux/usb/otg.h>
#include <mach/common.h>
#include <mach/iomux-mx3.h>
#include <mach/hardware.h>
#include <mach/ulpi.h>
#include "devices-imx31.h"
#include "iomux-mx3.h"
static unsigned int devboard_pins[] = {
/* UART1 */

2
arch/arm/mach-imx/mx31moboard-marxbot.c
View File

@ -26,12 +26,12 @@
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/iomux-mx3.h>
#include <mach/ulpi.h>
#include <media/soc_camera.h>
#include "devices-imx31.h"
#include "iomux-mx3.h"
static unsigned int marxbot_pins[] = {
/* SDHC2 */

2
arch/arm/mach-imx/mx31moboard-smartbot.c
View File

@ -25,13 +25,13 @@
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/iomux-mx3.h>
#include <mach/ulpi.h>
#include <media/soc_camera.h>
#include "board-mx31moboard.h"
#include "devices-imx31.h"
#include "iomux-mx3.h"
static unsigned int smartbot_pins[] = {
/* UART1 */

2
arch/arm/mach-imx/pcm970-baseboard.c
View File

@ -24,10 +24,10 @@
#include <asm/mach/arch.h>
#include <mach/common.h>
#include <mach/iomux-mx27.h>
#include <mach/hardware.h>
#include "devices-imx27.h"
#include "iomux-mx27.h"
static const int pcm970_pins[] __initconst = {
/* SDHC */

6
arch/arm/plat-mxc/Kconfig
View File

@ -76,12 +76,6 @@ config MXC_ULPI
config ARCH_HAS_RNGA
bool
config IMX_HAVE_IOMUX_V1
bool
config ARCH_MXC_IOMUX_V3
bool
config IRAM_ALLOC
bool
select GENERIC_ALLOCATOR

2
arch/arm/plat-mxc/Makefile
View File

@ -8,8 +8,6 @@ obj-y := time.o devices.o cpu.o system.o irq-common.o
obj-$(CONFIG_MXC_TZIC) += tzic.o
obj-$(CONFIG_MXC_AVIC) += avic.o
obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o
obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
obj-$(CONFIG_IRAM_ALLOC) += iram_alloc.o
obj-$(CONFIG_MXC_ULPI) += ulpi.o
obj-$(CONFIG_MXC_USE_EPIT) += epit.o