Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
e7c74b34
Commit
e7c74b34
authored
Nov 11, 2010
by
Uwe Kleine-König
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ARM: mx25: dynamically allocate imxdi_rtc devices
Signed-off-by:
Uwe Kleine-König
<
u.kleine-koenig@pengutronix.de
>
parent
ab9cee4b
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
60 additions
and
22 deletions
+60
-22
arch/arm/mach-mx25/Kconfig
arch/arm/mach-mx25/Kconfig
+2
-0
arch/arm/mach-mx25/devices-imx25.h
arch/arm/mach-mx25/devices-imx25.h
+4
-0
arch/arm/mach-mx25/devices.c
arch/arm/mach-mx25/devices.c
+0
-19
arch/arm/mach-mx25/devices.h
arch/arm/mach-mx25/devices.h
+0
-1
arch/arm/mach-mx25/mach-cpuimx25.c
arch/arm/mach-mx25/mach-cpuimx25.c
+1
-1
arch/arm/mach-mx25/mach-mx25_3ds.c
arch/arm/mach-mx25/mach-mx25_3ds.c
+1
-1
arch/arm/plat-mxc/devices/Kconfig
arch/arm/plat-mxc/devices/Kconfig
+3
-0
arch/arm/plat-mxc/devices/Makefile
arch/arm/plat-mxc/devices/Makefile
+1
-0
arch/arm/plat-mxc/devices/platform-imxdi_rtc.c
arch/arm/plat-mxc/devices/platform-imxdi_rtc.c
+41
-0
arch/arm/plat-mxc/include/mach/devices-common.h
arch/arm/plat-mxc/include/mach/devices-common.h
+7
-0
No files found.
arch/arm/mach-mx25/Kconfig
View file @
e7c74b34
...
...
@@ -5,6 +5,7 @@ comment "MX25 platforms:"
config MACH_MX25_3DS
bool "Support MX25PDK (3DS) Platform"
select IMX_HAVE_PLATFORM_ESDHC
select IMX_HAVE_PLATFORM_IMXDI_RTC
select IMX_HAVE_PLATFORM_IMX_KEYPAD
select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_MXC_EHCI
...
...
@@ -15,6 +16,7 @@ config MACH_EUKREA_CPUIMX25
select IMX_HAVE_PLATFORM_ESDHC
select IMX_HAVE_PLATFORM_FLEXCAN
select IMX_HAVE_PLATFORM_FSL_USB2_UDC
select IMX_HAVE_PLATFORM_IMXDI_RTC
select IMX_HAVE_PLATFORM_IMX_I2C
select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_MXC_EHCI
...
...
arch/arm/mach-mx25/devices-imx25.h
View file @
e7c74b34
...
...
@@ -23,6 +23,10 @@ extern const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data __initconst;
#define imx25_add_fsl_usb2_udc(pdata) \
imx_add_fsl_usb2_udc(&imx25_fsl_usb2_udc_data, pdata)
extern
struct
imx_imxdi_rtc_data
imx25_imxdi_rtc_data
__initconst
;
#define imx25_add_imxdi_rtc(pdata) \
imx_add_imxdi_rtc(&imx25_imxdi_rtc_data)
extern
const
struct
imx_imx_i2c_data
imx25_imx_i2c_data
[]
__initconst
;
#define imx25_add_imx_i2c(id, pdata) \
imx_add_imx_i2c(&imx25_imx_i2c_data[id], pdata)
...
...
arch/arm/mach-mx25/devices.c
View file @
e7c74b34
...
...
@@ -22,25 +22,6 @@
#include <mach/mx25.h>
#include <mach/irqs.h>
static
struct
resource
mx25_rtc_resources
[]
=
{
{
.
start
=
MX25_DRYICE_BASE_ADDR
,
.
end
=
MX25_DRYICE_BASE_ADDR
+
0x40
,
.
flags
=
IORESOURCE_MEM
,
},
{
.
start
=
MX25_INT_DRYICE
,
.
flags
=
IORESOURCE_IRQ
},
};
struct
platform_device
mx25_rtc_device
=
{
.
name
=
"imxdi_rtc"
,
.
id
=
0
,
.
num_resources
=
ARRAY_SIZE
(
mx25_rtc_resources
),
.
resource
=
mx25_rtc_resources
,
};
static
struct
resource
mx25_fb_resources
[]
=
{
{
.
start
=
MX25_LCDC_BASE_ADDR
,
...
...
arch/arm/mach-mx25/devices.h
View file @
e7c74b34
extern
struct
platform_device
mx25_rtc_device
;
extern
struct
platform_device
mx25_fb_device
;
extern
struct
platform_device
mxc_wdt
;
extern
struct
platform_device
mx25_csi_device
;
arch/arm/mach-mx25/mach-cpuimx25.c
View file @
e7c74b34
...
...
@@ -124,7 +124,7 @@ static void __init eukrea_cpuimx25_init(void)
imx25_add_imx_uart0
(
&
uart_pdata
);
imx25_add_mxc_nand
(
&
eukrea_cpuimx25_nand_board_info
);
mxc_register_device
(
&
mx25_rtc_device
,
NULL
);
imx25_add_imxdi_rtc
(
NULL
);
imx25_add_fec
(
&
mx25_fec_pdata
);
i2c_register_board_info
(
0
,
eukrea_cpuimx25_i2c_devices
,
...
...
arch/arm/mach-mx25/mach-mx25_3ds.c
View file @
e7c74b34
...
...
@@ -194,7 +194,7 @@ static void __init mx25pdk_init(void)
imx25_add_imx_uart0
(
&
uart_pdata
);
imx25_add_mxc_ehci_hs
(
NULL
);
imx25_add_mxc_nand
(
&
mx25pdk_nand_board_info
);
mxc_register_device
(
&
mx25_rtc_device
,
NULL
);
imx25_add_imxdi_rtc
(
NULL
);
mxc_register_device
(
&
mx25_fb_device
,
&
mx25pdk_fb_pdata
);
mxc_register_device
(
&
mxc_wdt
,
NULL
);
...
...
arch/arm/plat-mxc/devices/Kconfig
View file @
e7c74b34
...
...
@@ -22,6 +22,9 @@ config IMX_HAVE_PLATFORM_IMX21_HCD
config IMX_HAVE_PLATFORM_IMX2_WDT
bool
config IMX_HAVE_PLATFORM_IMXDI_RTC
bool
config IMX_HAVE_PLATFORM_IMX_FB
bool
...
...
arch/arm/plat-mxc/devices/Makefile
View file @
e7c74b34
...
...
@@ -5,6 +5,7 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_FSL_USB2_UDC) += platform-fsl-usb2-udc.o
obj-$(CONFIG_IMX_HAVE_PLATFORM_GPIO_KEYS)
+=
platform-gpio_keys.o
obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX21_HCD)
+=
platform-imx21-hcd.o
obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX2_WDT)
+=
platform-imx2-wdt.o
obj-$(CONFIG_IMX_HAVE_PLATFORM_IMXDI_RTC)
+=
platform-imxdi_rtc.o
obj-y
+=
platform-imx-dma.o
obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_FB)
+=
platform-imx-fb.o
obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_I2C)
+=
platform-imx-i2c.o
...
...
arch/arm/plat-mxc/devices/platform-imxdi_rtc.c
0 → 100644
View file @
e7c74b34
/*
* Copyright (C) 2010 Pengutronix
* Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation.
*/
#include <asm/sizes.h>
#include <mach/hardware.h>
#include <mach/devices-common.h>
#define imx_imxdi_rtc_data_entry_single(soc) \
{ \
.iobase = soc ## _DRYICE_BASE_ADDR, \
.irq = soc ## _INT_DRYICE, \
}
#ifdef CONFIG_ARCH_MX25
const
struct
imx_imxdi_rtc_data
imx25_imxdi_rtc_data
__initconst
=
imx_imxdi_rtc_data_entry_single
(
MX25
);
#endif
/* ifdef CONFIG_ARCH_MX25 */
struct
platform_device
*
__init
imx_add_imxdi_rtc
(
const
struct
imx_imxdi_rtc_data
*
data
)
{
struct
resource
res
[]
=
{
{
.
start
=
data
->
iobase
,
.
end
=
data
->
iobase
+
SZ_16K
,
.
flags
=
IORESOURCE_MEM
,
},
{
.
start
=
data
->
irq
,
.
end
=
data
->
irq
,
.
flags
=
IORESOURCE_IRQ
,
},
};
return
imx_add_platform_device
(
"imxdi_rtc"
,
0
,
res
,
ARRAY_SIZE
(
res
),
NULL
,
0
);
}
arch/arm/plat-mxc/include/mach/devices-common.h
View file @
e7c74b34
...
...
@@ -72,6 +72,13 @@ struct imx_imx2_wdt_data {
struct
platform_device
*
__init
imx_add_imx2_wdt
(
const
struct
imx_imx2_wdt_data
*
data
);
struct
imx_imxdi_rtc_data
{
resource_size_t
iobase
;
resource_size_t
irq
;
};
struct
platform_device
*
__init
imx_add_imxdi_rtc
(
const
struct
imx_imxdi_rtc_data
*
data
);
#include <mach/imxfb.h>
struct
imx_imx_fb_data
{
resource_size_t
iobase
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment