projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: imx: rename mxc_uart_devicex to follow a common naming scheme
[deliverable/linux.git]
/
arch
/
arm
/
mach-mx1
/
mach-scb9328.c
diff --git
a/arch/arm/mach-mx1/mach-scb9328.c
b/arch/arm/mach-mx1/mach-scb9328.c
index 7587a7a12460242d9f4b25b2233efef6dc5bab65..482b24df46247d33e03e0dcb2a02297588cbada0 100644
(file)
--- a/
arch/arm/mach-mx1/mach-scb9328.c
+++ b/
arch/arm/mach-mx1/mach-scb9328.c
@@
-31,8
+31,8
@@
* This scb9328 has a 32MiB flash
*/
static struct resource flash_resource = {
* This scb9328 has a 32MiB flash
*/
static struct resource flash_resource = {
- .start =
IMX
_CS0_PHYS,
- .end =
IMX
_CS0_PHYS + (32 * 1024 * 1024) - 1,
+ .start =
MX1
_CS0_PHYS,
+ .end =
MX1
_CS0_PHYS + (32 * 1024 * 1024) - 1,
.flags = IORESOURCE_MEM,
};
.flags = IORESOURCE_MEM,
};
@@
-70,13
+70,13
@@
static struct dm9000_plat_data dm9000_platdata = {
static struct resource dm9000x_resources[] = {
{
.name = "address area",
static struct resource dm9000x_resources[] = {
{
.name = "address area",
- .start =
IMX
_CS5_PHYS,
- .end =
IMX
_CS5_PHYS + 1,
+ .start =
MX1
_CS5_PHYS,
+ .end =
MX1
_CS5_PHYS + 1,
.flags = IORESOURCE_MEM, /* address access */
}, {
.name = "data area",
.flags = IORESOURCE_MEM, /* address access */
}, {
.name = "data area",
- .start =
IMX
_CS5_PHYS + 4,
- .end =
IMX
_CS5_PHYS + 5,
+ .start =
MX1
_CS5_PHYS + 4,
+ .end =
MX1
_CS5_PHYS + 5,
.flags = IORESOURCE_MEM, /* data access */
}, {
.start = IRQ_GPIOC(3),
.flags = IORESOURCE_MEM, /* data access */
}, {
.start = IRQ_GPIOC(3),
@@
-108,11
+108,10
@@
static int uart1_mxc_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart1_pins), "UART1");
}
ARRAY_SIZE(mxc_uart1_pins), "UART1");
}
-static
int
uart1_mxc_exit(struct platform_device *pdev)
+static
void
uart1_mxc_exit(struct platform_device *pdev)
{
mxc_gpio_release_multiple_pins(mxc_uart1_pins,
ARRAY_SIZE(mxc_uart1_pins));
{
mxc_gpio_release_multiple_pins(mxc_uart1_pins,
ARRAY_SIZE(mxc_uart1_pins));
- return 0;
}
static struct imxuart_platform_data uart_pdata = {
}
static struct imxuart_platform_data uart_pdata = {
@@
-131,7
+130,7
@@
static struct platform_device *devices[] __initdata = {
*/
static void __init scb9328_init(void)
{
*/
static void __init scb9328_init(void)
{
- mxc_register_device(&imx
_uart1_device
, &uart_pdata);
+ mxc_register_device(&imx
1_uart_device0
, &uart_pdata);
printk(KERN_INFO"Scb9328: Adding devices\n");
platform_add_devices(devices, ARRAY_SIZE(devices));
printk(KERN_INFO"Scb9328: Adding devices\n");
platform_add_devices(devices, ARRAY_SIZE(devices));
This page took
0.028292 seconds
and
5
git commands to generate.