git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sh-latest' of git://github.com/pmundt/linux-sh
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx5
/
board-cpuimx51sd.c
diff --git
a/arch/arm/mach-mx5/board-cpuimx51sd.c
b/arch/arm/mach-mx5/board-cpuimx51sd.c
index
b41fc27
..
52a11c1
100644
(file)
--- a/
arch/arm/mach-mx5/board-cpuimx51sd.c
+++ b/
arch/arm/mach-mx5/board-cpuimx51sd.c
@@
-22,7
+22,6
@@
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/interrupt.h>
-#include <linux/irq.h>
#include <linux/i2c-gpio.h>
#include <linux/spi/spi.h>
#include <linux/can/platform/mcp251x.h>
#include <linux/i2c-gpio.h>
#include <linux/spi/spi.h>
#include <linux/can/platform/mcp251x.h>
@@
-32,14
+31,12
@@
#include <mach/hardware.h>
#include <mach/iomux-mx51.h>
#include <mach/hardware.h>
#include <mach/iomux-mx51.h>
-#include <asm/irq.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include "devices-imx51.h"
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include "devices-imx51.h"
-#include "devices.h"
#include "cpu_op-mx51.h"
#define USBH1_RST IMX_GPIO_NR(2, 28)
#include "cpu_op-mx51.h"
#define USBH1_RST IMX_GPIO_NR(2, 28)
@@
-108,7
+105,7
@@
static iomux_v3_cfg_t eukrea_cpuimx51sd_pads[] = {
/* Touchscreen */
/* IRQ */
/* Touchscreen */
/* IRQ */
-
_MX51_PAD_GPIO_NAND__GPIO_NAND | MUX_PAD_CTRL(
PAD_CTL_PUS_22K_UP |
+
NEW_PAD_CTRL(MX51_PAD_GPIO_NAND__GPIO_NAND,
PAD_CTL_PUS_22K_UP |
PAD_CTL_PKE | PAD_CTL_SRE_FAST |
PAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS),
};
PAD_CTL_PKE | PAD_CTL_SRE_FAST |
PAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS),
};
@@
-129,7
+126,7
@@
static struct i2c_board_info eukrea_cpuimx51sd_i2c_devices[] = {
I2C_BOARD_INFO("tsc2007", 0x49),
.type = "tsc2007",
.platform_data = &tsc2007_info,
I2C_BOARD_INFO("tsc2007", 0x49),
.type = "tsc2007",
.platform_data = &tsc2007_info,
- .irq =
gpio_to_irq
(TSC2007_IRQGPIO),
+ .irq =
IMX_GPIO_TO_IRQ
(TSC2007_IRQGPIO),
},
};
},
};
@@
-149,7
+146,7
@@
static int initialize_otg_port(struct platform_device *pdev)
void __iomem *usb_base;
void __iomem *usbother_base;
void __iomem *usb_base;
void __iomem *usbother_base;
- usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
+ usb_base = ioremap(MX51_
USB_
OTG_BASE_ADDR, SZ_4K);
if (!usb_base)
return -ENOMEM;
usbother_base = usb_base + MX5_USBOTHER_REGS_OFFSET;
if (!usb_base)
return -ENOMEM;
usbother_base = usb_base + MX5_USBOTHER_REGS_OFFSET;
@@
-172,7
+169,7
@@
static int initialize_usbh1_port(struct platform_device *pdev)
void __iomem *usb_base;
void __iomem *usbother_base;
void __iomem *usb_base;
void __iomem *usbother_base;
- usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
+ usb_base = ioremap(MX51_
USB_
OTG_BASE_ADDR, SZ_4K);
if (!usb_base)
return -ENOMEM;
usbother_base = usb_base + MX5_USBOTHER_REGS_OFFSET;
if (!usb_base)
return -ENOMEM;
usbother_base = usb_base + MX5_USBOTHER_REGS_OFFSET;
@@
-189,17
+186,17
@@
static int initialize_usbh1_port(struct platform_device *pdev)
MXC_EHCI_ITC_NO_THRESHOLD);
}
MXC_EHCI_ITC_NO_THRESHOLD);
}
-static
struct mxc_usbh_platform_data dr_utmi_config
= {
+static
const struct mxc_usbh_platform_data dr_utmi_config __initconst
= {
.init = initialize_otg_port,
.portsc = MXC_EHCI_UTMI_16BIT,
};
.init = initialize_otg_port,
.portsc = MXC_EHCI_UTMI_16BIT,
};
-static
struct fsl_usb2_platform_data usb_pdata
= {
+static
const struct fsl_usb2_platform_data usb_pdata __initconst
= {
.operating_mode = FSL_USB2_DR_DEVICE,
.phy_mode = FSL_USB2_PHY_UTMI_WIDE,
};
.operating_mode = FSL_USB2_DR_DEVICE,
.phy_mode = FSL_USB2_PHY_UTMI_WIDE,
};
-static
struct mxc_usbh_platform_data usbh1_config
= {
+static
const struct mxc_usbh_platform_data usbh1_config __initconst
= {
.init = initialize_usbh1_port,
.portsc = MXC_EHCI_MODE_ULPI,
};
.init = initialize_usbh1_port,
.portsc = MXC_EHCI_MODE_ULPI,
};
@@
-245,7
+242,7
@@
static struct spi_board_info cpuimx51sd_spi_device[] = {
.mode = SPI_MODE_0,
.chip_select = 0,
.platform_data = &mcp251x_info,
.mode = SPI_MODE_0,
.chip_select = 0,
.platform_data = &mcp251x_info,
- .irq =
gpio_to_irq
(CAN_IRQGPIO)
+ .irq =
IMX_GPIO_TO_IRQ
(CAN_IRQGPIO)
},
};
},
};
@@
-303,17
+300,17
@@
static void __init eukrea_cpuimx51sd_init(void)
platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
if (otg_mode_host)
platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
if (otg_mode_host)
-
mxc_register_device(&mxc_usbdr_host_device,
&dr_utmi_config);
+
imx51_add_mxc_ehci_otg(
&dr_utmi_config);
else {
initialize_otg_port(NULL);
else {
initialize_otg_port(NULL);
-
mxc_register_device(&mxc_usbdr_udc_device,
&usb_pdata);
+
imx51_add_fsl_usb2_udc(
&usb_pdata);
}
gpio_request(USBH1_RST, "usb_rst");
gpio_direction_output(USBH1_RST, 0);
msleep(20);
gpio_set_value(USBH1_RST, 1);
}
gpio_request(USBH1_RST, "usb_rst");
gpio_direction_output(USBH1_RST, 0);
msleep(20);
gpio_set_value(USBH1_RST, 1);
-
mxc_register_device(&mxc_usbh1_device
, &usbh1_config);
+
imx51_add_mxc_ehci_hs(1
, &usbh1_config);
#ifdef CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD
eukrea_mbimxsd51_baseboard_init();
#ifdef CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD
eukrea_mbimxsd51_baseboard_init();
@@
-335,6
+332,7
@@
MACHINE_START(EUKREA_CPUIMX51SD, "Eukrea CPUIMX51SD")
.map_io = mx51_map_io,
.init_early = imx51_init_early,
.init_irq = mx51_init_irq,
.map_io = mx51_map_io,
.init_early = imx51_init_early,
.init_irq = mx51_init_irq,
+ .handle_irq = imx51_handle_irq,
.timer = &mxc_timer,
.init_machine = eukrea_cpuimx51sd_init,
MACHINE_END
.timer = &mxc_timer,
.init_machine = eukrea_cpuimx51sd_init,
MACHINE_END