summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorDavid Anders <x0132446@ti.com>2010-08-13 01:12:50 +0530
committerBryan Wu <bryan.wu@canonical.com>2010-08-26 21:45:40 +0800
commit3b0862fca176f65cad607c68e1a111705a4f9caa (patch)
tree43fbe853de3d8dbe50010f4aa964d8199c60b95f /arch
parent2655be9d633e7532f86b8157687379f690b46498 (diff)
Introducing HWMOD in DSS for PandaBoard
This patch would make use of HWMOD functions for registration of DSS inside of the PandaBoard machine file. Signed-off-by: David Anders <x0132446@ti.com> Signed-off-by: Sebastien Jan <s-jan@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/board-omap4panda.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index c32fc5c07dd7..4c648f3893fe 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -103,6 +103,7 @@ static struct omap_dss_device panda_hdmi_device = {
.phy.dpi.data_lines = 24,
.platform_enable = panda_panel_enable_hdmi,
.platform_disable = panda_panel_disable_hdmi,
+ .channel = OMAP_DSS_CHANNEL_DIGIT,
};
static struct omap_dss_device *panda_dss_devices[] = {
@@ -115,14 +116,6 @@ static struct omap_dss_board_info panda_dss_data = {
.default_device = &panda_hdmi_device,
};
-static struct platform_device panda_dss_device = {
- .name = "omapdss",
- .id = -1,
- .dev = {
- .platform_data = &panda_dss_data,
- },
-};
-
static struct platform_device *panda_devices[] __initdata = {
&panda_dss_device,
&wl127x_device
@@ -147,13 +140,8 @@ static void __init omap4_display_init(void) {}
#endif
-static struct omap_board_config_kernel panda_config[] __initdata = {
-};
-
static void __init omap_panda_init_irq(void)
{
- omap_board_config = panda_config;
- omap_board_config_size = ARRAY_SIZE(panda_config);
omap2_init_common_hw(NULL, NULL);
#ifdef CONFIG_OMAP_32K_TIMER
omap2_gp_clockevent_set_gptimer(1);
@@ -516,6 +504,7 @@ static void __init omap_panda_init(void)
usb_nop_xceiv_register();
usb_musb_init(&musb_board_data);
omap4_ehci_init();
+ omap_display_init(&panda_dss_data);
}