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
194ee8e8
Commit
194ee8e8
authored
Nov 11, 2010
by
Uwe Kleine-König
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ARM: mx25: dynamically allocatate imx-fb devices
Signed-off-by:
Uwe Kleine-König
<
u.kleine-koenig@pengutronix.de
>
parent
e7c74b34
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
21 additions
and
34 deletions
+21
-34
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
-23
arch/arm/mach-mx25/devices.h
arch/arm/mach-mx25/devices.h
+0
-1
arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c
arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c
+2
-3
arch/arm/mach-mx25/mach-mx25_3ds.c
arch/arm/mach-mx25/mach-mx25_3ds.c
+2
-3
arch/arm/plat-mxc/devices/platform-imx-fb.c
arch/arm/plat-mxc/devices/platform-imx-fb.c
+10
-4
arch/arm/plat-mxc/include/mach/devices-common.h
arch/arm/plat-mxc/include/mach/devices-common.h
+1
-0
No files found.
arch/arm/mach-mx25/Kconfig
View file @
194ee8e8
...
...
@@ -6,6 +6,7 @@ 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_FB
select IMX_HAVE_PLATFORM_IMX_KEYPAD
select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_MXC_EHCI
...
...
@@ -17,6 +18,7 @@ config MACH_EUKREA_CPUIMX25
select IMX_HAVE_PLATFORM_FLEXCAN
select IMX_HAVE_PLATFORM_FSL_USB2_UDC
select IMX_HAVE_PLATFORM_IMXDI_RTC
select IMX_HAVE_PLATFORM_IMX_FB
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 @
194ee8e8
...
...
@@ -27,6 +27,10 @@ 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_fb_data
imx25_imx_fb_data
__initconst
;
#define imx25_add_imx_fb(pdata) \
imx_add_imx_fb(&imx25_imx_fb_data, pdata)
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 @
194ee8e8
...
...
@@ -22,29 +22,6 @@
#include <mach/mx25.h>
#include <mach/irqs.h>
static
struct
resource
mx25_fb_resources
[]
=
{
{
.
start
=
MX25_LCDC_BASE_ADDR
,
.
end
=
MX25_LCDC_BASE_ADDR
+
0xfff
,
.
flags
=
IORESOURCE_MEM
,
},
{
.
start
=
MX25_INT_LCDC
,
.
end
=
MX25_INT_LCDC
,
.
flags
=
IORESOURCE_IRQ
,
},
};
struct
platform_device
mx25_fb_device
=
{
.
name
=
"imx-fb"
,
.
id
=
0
,
.
resource
=
mx25_fb_resources
,
.
num_resources
=
ARRAY_SIZE
(
mx25_fb_resources
),
.
dev
=
{
.
coherent_dma_mask
=
0xFFFFFFFF
,
},
};
static
struct
resource
mxc_wdt_resources
[]
=
{
{
.
start
=
MX25_WDOG_BASE_ADDR
,
...
...
arch/arm/mach-mx25/devices.h
View file @
194ee8e8
extern
struct
platform_device
mx25_fb_device
;
extern
struct
platform_device
mxc_wdt
;
extern
struct
platform_device
mx25_csi_device
;
arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c
View file @
194ee8e8
...
...
@@ -33,7 +33,6 @@
#include <asm/mach/arch.h>
#include <mach/mx25.h>
#include <mach/imx-uart.h>
#include <mach/imxfb.h>
#include <mach/audmux.h>
#include "devices-imx25.h"
...
...
@@ -151,7 +150,7 @@ static struct imx_fb_videomode eukrea_mximxsd_modes[] = {
},
};
static
struct
imx_fb_platform_data
eukrea_mximxsd_fb_pdata
=
{
static
const
struct
imx_fb_platform_data
eukrea_mximxsd_fb_pdata
__initconst
=
{
.
mode
=
eukrea_mximxsd_modes
,
.
num_modes
=
ARRAY_SIZE
(
eukrea_mximxsd_modes
),
.
pwmr
=
0x00A903FF
,
...
...
@@ -273,7 +272,7 @@ void __init eukrea_mbimxsd25_baseboard_init(void)
#endif
imx25_add_imx_uart1
(
&
uart_pdata
);
mxc_register_device
(
&
mx25_fb_device
,
&
eukrea_mximxsd_fb_pdata
);
imx25_add_imx_fb
(
&
eukrea_mximxsd_fb_pdata
);
imx25_add_imx_ssi
(
0
,
&
eukrea_mbimxsd_ssi_pdata
);
imx25_add_flexcan1
(
NULL
);
...
...
arch/arm/mach-mx25/mach-mx25_3ds.c
View file @
194ee8e8
...
...
@@ -39,7 +39,6 @@
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/mx25.h>
#include <mach/imxfb.h>
#include <mach/iomux-mx25.h>
#include "devices-imx25.h"
...
...
@@ -154,7 +153,7 @@ static struct imx_fb_videomode mx25pdk_modes[] = {
},
};
static
struct
imx_fb_platform_data
mx25pdk_fb_pdata
=
{
static
const
struct
imx_fb_platform_data
mx25pdk_fb_pdata
__initconst
=
{
.
mode
=
mx25pdk_modes
,
.
num_modes
=
ARRAY_SIZE
(
mx25pdk_modes
),
.
pwmr
=
0x00A903FF
,
...
...
@@ -195,7 +194,7 @@ static void __init mx25pdk_init(void)
imx25_add_mxc_ehci_hs
(
NULL
);
imx25_add_mxc_nand
(
&
mx25pdk_nand_board_info
);
imx25_add_imxdi_rtc
(
NULL
);
mxc_register_device
(
&
mx25_fb_device
,
&
mx25pdk_fb_pdata
);
imx25_add_imx_fb
(
&
mx25pdk_fb_pdata
);
mxc_register_device
(
&
mxc_wdt
,
NULL
);
mx25pdk_fec_reset
();
...
...
arch/arm/plat-mxc/devices/platform-imx-fb.c
View file @
194ee8e8
...
...
@@ -9,20 +9,26 @@
#include <mach/hardware.h>
#include <mach/devices-common.h>
#define imx_imx_fb_data_entry_single(soc
)
\
#define imx_imx_fb_data_entry_single(soc
, _size)
\
{ \
.iobase = soc ## _LCDC_BASE_ADDR, \
.iosize = _size, \
.irq = soc ## _INT_LCDC, \
}
#ifdef CONFIG_SOC_IMX21
const
struct
imx_imx_fb_data
imx21_imx_fb_data
__initconst
=
imx_imx_fb_data_entry_single
(
MX21
);
imx_imx_fb_data_entry_single
(
MX21
,
SZ_4K
);
#endif
/* ifdef CONFIG_SOC_IMX21 */
#ifdef CONFIG_ARCH_MX25
const
struct
imx_imx_fb_data
imx25_imx_fb_data
__initconst
=
imx_imx_fb_data_entry_single
(
MX25
,
SZ_16K
);
#endif
#ifdef CONFIG_SOC_IMX27
const
struct
imx_imx_fb_data
imx27_imx_fb_data
__initconst
=
imx_imx_fb_data_entry_single
(
MX27
);
imx_imx_fb_data_entry_single
(
MX27
,
SZ_4K
);
#endif
/* ifdef CONFIG_SOC_IMX27 */
struct
platform_device
*
__init
imx_add_imx_fb
(
...
...
@@ -32,7 +38,7 @@ struct platform_device *__init imx_add_imx_fb(
struct
resource
res
[]
=
{
{
.
start
=
data
->
iobase
,
.
end
=
data
->
iobase
+
SZ_4K
-
1
,
.
end
=
data
->
iobase
+
data
->
iosize
-
1
,
.
flags
=
IORESOURCE_MEM
,
},
{
.
start
=
data
->
irq
,
...
...
arch/arm/plat-mxc/include/mach/devices-common.h
View file @
194ee8e8
...
...
@@ -82,6 +82,7 @@ struct platform_device *__init imx_add_imxdi_rtc(
#include <mach/imxfb.h>
struct
imx_imx_fb_data
{
resource_size_t
iobase
;
resource_size_t
iosize
;
resource_size_t
irq
;
};
struct
platform_device
*
__init
imx_add_imx_fb
(
...
...
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