-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJPFmj/AAoJEIwa5zzehBx3utoP/2JKstlluwVdoIjzLDwJIZWS
 BiFO90iC6knKHb3c4ZXBNtD4yz8ImFGr2v3IY4pR+feECu+zS/AYeynrr4AjlaRj
 2wHI3/Cl2VktlzUR0k1KqfNrt1HLpZ8myxJ/pKchU8+KnxeQwCdV7MzkxocO0Abs
 BQFhXj2WuS6b+H3kObrTy7n3tIyVeGUOW/bPU9TfWeRYEWBpGlqtPOH6A2cGi5e3
 Iu9d9MPAiMt33+e7wZdmVHFky+ueqqeKevev+Vt8/JSJbPO7EseS/sbTOZH7Q1Yc
 BWe5iARFpV9viJJMlwlO+wJ08BrqzCZ6M/mBITMAZ+a/EMYRn0TwibsWDw1GcAsA
 H04Z1TW7pjni7SNFJavW3YWIR3TAKDZqwWbekGl2RzYqKmer1Hk6gwHAhxDQlMGY
 2S7dSnw97zRA0WxW6kMPw5VY9VpDD1qjW+29UpEEePfAVhKkwE+lKYlX4k/l0ElC
 9iYNoMVlhS4d5A7ZvhNU28XyGoxzAPNA4nC5OMUARZN++oSURDJ1kGNc73WQ8IbG
 x+zZ7AFvt7y8OgZqG4bE+SeiHlYVAjtyV08WLxtDx4vTyNYuiWIXguf2hLJWEJPY
 sqPGFHrMeh9YvYOXaa+DFb0fPkBJVJt663FPZ4TG2UBlphi26Ax5FtcnSBBvY4QV
 CCen+xhdxX/dp83A/A0k
 =ZgSs
 -----END PGP SIGNATURE-----
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.
* tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM i.MX: Update defconfig
  ARM i.MX: Merge i.MX5 support into mach-imx
  ARM i.MX5: remove unnecessary includes from board files
Fix up fairly trivial conflicts due to various changes nearby in
arch/arm/{mach,plat}-imx/{Kconfig,Makefile}
Pull request had been sent to the wrong email address, but happened
before the merge window closed.  I'm merging the MX 5 consolidation,
since it apparently will help the next development window and will avoid
conflicts later as per Arnd.
		
	
			
		
			
				
	
	
		
			178 lines
		
	
	
	
		
			4.5 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			178 lines
		
	
	
	
		
			4.5 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Copyright (C) 2010-2011 Freescale Semiconductor, Inc. All Rights Reserved.
 | 
						|
 * Copyright (C) 2010 Yong Shen. <Yong.Shen@linaro.org>
 | 
						|
 */
 | 
						|
 | 
						|
/*
 | 
						|
 * This program is free software; you can redistribute it and/or modify
 | 
						|
 * it under the terms of the GNU General Public License as published by
 | 
						|
 * the Free Software Foundation; either version 2 of the License, or
 | 
						|
 * (at your option) any later version.
 | 
						|
 | 
						|
 * This program is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
 * GNU General Public License for more details.
 | 
						|
 | 
						|
 * You should have received a copy of the GNU General Public License along
 | 
						|
 * with this program; if not, write to the Free Software Foundation, Inc.,
 | 
						|
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/init.h>
 | 
						|
#include <linux/clk.h>
 | 
						|
#include <linux/delay.h>
 | 
						|
#include <linux/gpio.h>
 | 
						|
#include <linux/spi/flash.h>
 | 
						|
#include <linux/spi/spi.h>
 | 
						|
#include <mach/common.h>
 | 
						|
#include <mach/hardware.h>
 | 
						|
#include <asm/mach-types.h>
 | 
						|
#include <asm/mach/arch.h>
 | 
						|
#include <asm/mach/time.h>
 | 
						|
#include <mach/iomux-mx53.h>
 | 
						|
 | 
						|
#define MX53_EVK_FEC_PHY_RST	IMX_GPIO_NR(7, 6)
 | 
						|
#define EVK_ECSPI1_CS0		IMX_GPIO_NR(2, 30)
 | 
						|
#define EVK_ECSPI1_CS1		IMX_GPIO_NR(3, 19)
 | 
						|
#define MX53EVK_LED		IMX_GPIO_NR(7, 7)
 | 
						|
 | 
						|
#include "devices-imx53.h"
 | 
						|
 | 
						|
static iomux_v3_cfg_t mx53_evk_pads[] = {
 | 
						|
	MX53_PAD_CSI0_DAT10__UART1_TXD_MUX,
 | 
						|
	MX53_PAD_CSI0_DAT11__UART1_RXD_MUX,
 | 
						|
 | 
						|
	MX53_PAD_PATA_BUFFER_EN__UART2_RXD_MUX,
 | 
						|
	MX53_PAD_PATA_DMARQ__UART2_TXD_MUX,
 | 
						|
	MX53_PAD_PATA_DIOR__UART2_RTS,
 | 
						|
	MX53_PAD_PATA_INTRQ__UART2_CTS,
 | 
						|
 | 
						|
	MX53_PAD_PATA_CS_0__UART3_TXD_MUX,
 | 
						|
	MX53_PAD_PATA_CS_1__UART3_RXD_MUX,
 | 
						|
 | 
						|
	MX53_PAD_EIM_D16__ECSPI1_SCLK,
 | 
						|
	MX53_PAD_EIM_D17__ECSPI1_MISO,
 | 
						|
	MX53_PAD_EIM_D18__ECSPI1_MOSI,
 | 
						|
 | 
						|
	/* ecspi chip select lines */
 | 
						|
	MX53_PAD_EIM_EB2__GPIO2_30,
 | 
						|
	MX53_PAD_EIM_D19__GPIO3_19,
 | 
						|
	/* LED */
 | 
						|
	MX53_PAD_PATA_DA_1__GPIO7_7,
 | 
						|
};
 | 
						|
 | 
						|
static const struct imxuart_platform_data mx53_evk_uart_pdata __initconst = {
 | 
						|
	.flags = IMXUART_HAVE_RTSCTS,
 | 
						|
};
 | 
						|
 | 
						|
static const struct gpio_led mx53evk_leds[] __initconst = {
 | 
						|
	{
 | 
						|
		.name			= "green",
 | 
						|
		.default_trigger	= "heartbeat",
 | 
						|
		.gpio			= MX53EVK_LED,
 | 
						|
	},
 | 
						|
};
 | 
						|
 | 
						|
static const struct gpio_led_platform_data mx53evk_leds_data __initconst = {
 | 
						|
	.leds		= mx53evk_leds,
 | 
						|
	.num_leds	= ARRAY_SIZE(mx53evk_leds),
 | 
						|
};
 | 
						|
 | 
						|
static inline void mx53_evk_init_uart(void)
 | 
						|
{
 | 
						|
	imx53_add_imx_uart(0, NULL);
 | 
						|
	imx53_add_imx_uart(1, &mx53_evk_uart_pdata);
 | 
						|
	imx53_add_imx_uart(2, NULL);
 | 
						|
}
 | 
						|
 | 
						|
static const struct imxi2c_platform_data mx53_evk_i2c_data __initconst = {
 | 
						|
	.bitrate = 100000,
 | 
						|
};
 | 
						|
 | 
						|
static inline void mx53_evk_fec_reset(void)
 | 
						|
{
 | 
						|
	int ret;
 | 
						|
 | 
						|
	/* reset FEC PHY */
 | 
						|
	ret = gpio_request_one(MX53_EVK_FEC_PHY_RST, GPIOF_OUT_INIT_LOW,
 | 
						|
							"fec-phy-reset");
 | 
						|
	if (ret) {
 | 
						|
		printk(KERN_ERR"failed to get GPIO_FEC_PHY_RESET: %d\n", ret);
 | 
						|
		return;
 | 
						|
	}
 | 
						|
	msleep(1);
 | 
						|
	gpio_set_value(MX53_EVK_FEC_PHY_RST, 1);
 | 
						|
}
 | 
						|
 | 
						|
static const struct fec_platform_data mx53_evk_fec_pdata __initconst = {
 | 
						|
	.phy = PHY_INTERFACE_MODE_RMII,
 | 
						|
};
 | 
						|
 | 
						|
static struct spi_board_info mx53_evk_spi_board_info[] __initdata = {
 | 
						|
	{
 | 
						|
		.modalias = "mtd_dataflash",
 | 
						|
		.max_speed_hz = 25000000,
 | 
						|
		.bus_num = 0,
 | 
						|
		.chip_select = 1,
 | 
						|
		.mode = SPI_MODE_0,
 | 
						|
		.platform_data = NULL,
 | 
						|
	},
 | 
						|
};
 | 
						|
 | 
						|
static int mx53_evk_spi_cs[] = {
 | 
						|
	EVK_ECSPI1_CS0,
 | 
						|
	EVK_ECSPI1_CS1,
 | 
						|
};
 | 
						|
 | 
						|
static const struct spi_imx_master mx53_evk_spi_data __initconst = {
 | 
						|
	.chipselect     = mx53_evk_spi_cs,
 | 
						|
	.num_chipselect = ARRAY_SIZE(mx53_evk_spi_cs),
 | 
						|
};
 | 
						|
 | 
						|
void __init imx53_evk_common_init(void)
 | 
						|
{
 | 
						|
	mxc_iomux_v3_setup_multiple_pads(mx53_evk_pads,
 | 
						|
					 ARRAY_SIZE(mx53_evk_pads));
 | 
						|
}
 | 
						|
 | 
						|
static void __init mx53_evk_board_init(void)
 | 
						|
{
 | 
						|
	imx53_soc_init();
 | 
						|
	imx53_evk_common_init();
 | 
						|
 | 
						|
	mx53_evk_init_uart();
 | 
						|
	mx53_evk_fec_reset();
 | 
						|
	imx53_add_fec(&mx53_evk_fec_pdata);
 | 
						|
 | 
						|
	imx53_add_imx_i2c(0, &mx53_evk_i2c_data);
 | 
						|
	imx53_add_imx_i2c(1, &mx53_evk_i2c_data);
 | 
						|
 | 
						|
	imx53_add_sdhci_esdhc_imx(0, NULL);
 | 
						|
	imx53_add_sdhci_esdhc_imx(1, NULL);
 | 
						|
 | 
						|
	spi_register_board_info(mx53_evk_spi_board_info,
 | 
						|
		ARRAY_SIZE(mx53_evk_spi_board_info));
 | 
						|
	imx53_add_ecspi(0, &mx53_evk_spi_data);
 | 
						|
	imx53_add_imx2_wdt(0, NULL);
 | 
						|
	gpio_led_register_device(-1, &mx53evk_leds_data);
 | 
						|
}
 | 
						|
 | 
						|
static void __init mx53_evk_timer_init(void)
 | 
						|
{
 | 
						|
	mx53_clocks_init(32768, 24000000, 22579200, 0);
 | 
						|
}
 | 
						|
 | 
						|
static struct sys_timer mx53_evk_timer = {
 | 
						|
	.init	= mx53_evk_timer_init,
 | 
						|
};
 | 
						|
 | 
						|
MACHINE_START(MX53_EVK, "Freescale MX53 EVK Board")
 | 
						|
	.map_io = mx53_map_io,
 | 
						|
	.init_early = imx53_init_early,
 | 
						|
	.init_irq = mx53_init_irq,
 | 
						|
	.handle_irq = imx53_handle_irq,
 | 
						|
	.timer = &mx53_evk_timer,
 | 
						|
	.init_machine = mx53_evk_board_init,
 | 
						|
	.restart	= mxc_restart,
 | 
						|
MACHINE_END
 |