Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccfe30a7 authored by Holger Schurig's avatar Holger Schurig Committed by Sascha Hauer
Browse files

arm/imx2x: new IOMUX definitions 



* removed iomux-mx1-mx2.h completely
* distributes the former contents to four different files (iomux-mx1.h,
  iomux-mx21.h, iomux-mx27.h and the file iomux-mx2x.h, which is common to
  both i.MX21 and i.MX27).
* adds all documented IOMUX definitions for i.MX21 and i.MX27
* fixes a few that were wrong (PD14_AOUT_FEC_CLR, PE16_AF_RTCK).
* don't silenly include <linux/io.h>
* and fixes all collateral damage from above

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 16b71fdf

arch/arm/mach-mx1/devices.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/gpio.h>

#include <mach/irqs.h>

#include <mach/hardware.h>



static struct resource imx_csi_resources[] = {

arch/arm/mach-mx1/mx1ads.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <mach/hardware.h>

#include <mach/common.h>

#include <mach/imx-uart.h>

#include <mach/iomux-mx1-mx2.h>

#include <mach/iomux.h>

#include "devices.h"



/*

arch/arm/mach-mx2/mx27ads.c

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <asm/mach/map.h>

#include <mach/gpio.h>

#include <mach/imx-uart.h>

#include <mach/iomux-mx1-mx2.h>

#include <mach/iomux.h>

#include <mach/board-mx27ads.h>



#include "devices.h"
@@ -196,7 +196,7 @@ static int mxc_fec_pins[] = { 
	PD11_AOUT_FEC_TX_CLK,

	PD12_AOUT_FEC_RXD0,

	PD13_AOUT_FEC_RX_DV,

	PD14_AOUT_FEC_CLR,

	PD14_AOUT_FEC_RX_CLK,

	PD15_AOUT_FEC_COL,

	PD16_AIN_FEC_TX_ER,

	PF23_AIN_FEC_TX_EN

arch/arm/mach-mx2/pcm038.c

+4 −3
Original line number Diff line number Diff line
@@ -20,11 +20,12 @@ 
#include <linux/platform_device.h>

#include <linux/mtd/physmap.h>

#include <linux/mtd/plat-ram.h>

#include <linux/io.h>

#include <asm/mach/arch.h>

#include <asm/mach-types.h>

#include <mach/common.h>

#include <mach/hardware.h>

#include <mach/iomux-mx1-mx2.h>

#include <mach/iomux.h>

#include <asm/mach/time.h>

#include <mach/imx-uart.h>

#include <mach/board-pcm038.h>
@@ -170,7 +171,7 @@ static int mxc_fec_pins[] = { 
	PD11_AOUT_FEC_TX_CLK,

	PD12_AOUT_FEC_RXD0,

	PD13_AOUT_FEC_RX_DV,

	PD14_AOUT_FEC_CLR,

	PD14_AOUT_FEC_RX_CLK,

	PD15_AOUT_FEC_COL,

	PD16_AIN_FEC_TX_ER,

	PF23_AIN_FEC_TX_EN
@@ -217,7 +218,7 @@ static void __init pcm038_init(void) 
	mxc_register_device(&mxc_uart_device1, &uart_pdata[1]);

	mxc_register_device(&mxc_uart_device2, &uart_pdata[2]);



	mxc_gpio_mode(PE16_AF_RTCK); /* OWIRE */

	mxc_gpio_mode(PE16_AF_OWIRE);

	mxc_register_device(&mxc_nand_device, &pcm038_nand_board_info);



	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));

arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h

deleted100644 → 0
+0 −416

File deleted.

Preview size limit exceeded, changes collapsed.