git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-mx3
/
mach-armadillo5x0.c
diff --git
a/arch/arm/mach-mx3/mach-armadillo5x0.c
b/arch/arm/mach-mx3/mach-armadillo5x0.c
index 5f72ec91af2d62c97acbdff70fbccd4988c292b5..96aadcadb4ff094b1b5eeaaebc502b68cd87a370 100644
(file)
--- a/
arch/arm/mach-mx3/mach-armadillo5x0.c
+++ b/
arch/arm/mach-mx3/mach-armadillo5x0.c
@@
-48,16
+48,14
@@
#include <asm/mach/map.h>
#include <mach/common.h>
#include <asm/mach/map.h>
#include <mach/common.h>
-#include <mach/imx-uart.h>
#include <mach/iomux-mx3.h>
#include <mach/iomux-mx3.h>
-#include <mach/board-armadillo5x0.h>
#include <mach/mmc.h>
#include <mach/ipu.h>
#include <mach/mx3fb.h>
#include <mach/mmc.h>
#include <mach/ipu.h>
#include <mach/mx3fb.h>
-#include <mach/mxc_nand.h>
#include <mach/mxc_ehci.h>
#include <mach/ulpi.h>
#include <mach/mxc_ehci.h>
#include <mach/ulpi.h>
+#include "devices-imx31.h"
#include "devices.h"
#include "crm_regs.h"
#include "devices.h"
#include "crm_regs.h"
@@
-301,7
+299,8
@@
static struct platform_device armadillo5x0_button_device = {
/*
* NAND Flash
*/
/*
* NAND Flash
*/
-static struct mxc_nand_platform_data armadillo5x0_nand_flash_pdata = {
+static const struct mxc_nand_platform_data
+armadillo5x0_nand_board_info __initconst = {
.width = 1,
.hw_ecc = 1,
};
.width = 1,
.hw_ecc = 1,
};
@@
-493,13
+492,12
@@
static struct platform_device armadillo5x0_smc911x_device = {
};
/* UART device data */
};
/* UART device data */
-static
struct imxuart_platform_data uart_pdata
= {
+static
const struct imxuart_platform_data uart_pdata __initconst
= {
.flags = IMXUART_HAVE_RTSCTS,
};
static struct platform_device *devices[] __initdata = {
&armadillo5x0_smc911x_device,
.flags = IMXUART_HAVE_RTSCTS,
};
static struct platform_device *devices[] __initdata = {
&armadillo5x0_smc911x_device,
- &mxc_i2c_device1,
&armadillo5x0_button_device,
};
&armadillo5x0_button_device,
};
@@
-512,10
+510,11
@@
static void __init armadillo5x0_init(void)
ARRAY_SIZE(armadillo5x0_pins), "armadillo5x0");
platform_add_devices(devices, ARRAY_SIZE(devices));
ARRAY_SIZE(armadillo5x0_pins), "armadillo5x0");
platform_add_devices(devices, ARRAY_SIZE(devices));
+ imx31_add_imx_i2c1(NULL);
/* Register UART */
/* Register UART */
-
mxc_register_device(&mxc_uart_device0,
&uart_pdata);
-
mxc_register_device(&mxc_uart_device1,
&uart_pdata);
+
imx31_add_imx_uart0(
&uart_pdata);
+
imx31_add_imx_uart1(
&uart_pdata);
/* SMSC9118 IRQ pin */
gpio_direction_input(MX31_PIN_GPIO1_0);
/* SMSC9118 IRQ pin */
gpio_direction_input(MX31_PIN_GPIO1_0);
@@
-532,7
+531,7
@@
static void __init armadillo5x0_init(void)
&armadillo5x0_nor_flash_pdata);
/* Register NAND Flash */
&armadillo5x0_nor_flash_pdata);
/* Register NAND Flash */
-
mxc_register_device(&mxc_nand_device, &armadillo5x0_nand_flash_pdata
);
+
imx31_add_mxc_nand(&armadillo5x0_nand_board_info
);
/* set NAND page size to 2k if not configured via boot mode pins */
__raw_writel(__raw_readl(MXC_CCM_RCSR) | (1 << 30), MXC_CCM_RCSR);
/* set NAND page size to 2k if not configured via boot mode pins */
__raw_writel(__raw_readl(MXC_CCM_RCSR) | (1 << 30), MXC_CCM_RCSR);