diff options
author | Javier Martinez Canillas <javier.martinez@collabora.co.uk> | 2013-10-09 05:19:19 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-10-09 10:55:12 -0400 |
commit | 68a531a1dec12708817552dad4eefc5968dd333f (patch) | |
tree | 899aa143bdbb740b877195b5c785926b66b5315b /arch/arm | |
parent | 15c9887e15e874f3c15342a897577e914a781738 (diff) |
ARM: OMAP2+: igep0020: use display init from dss-common
Now that display information and setup is made from dss-common
there is no need to have this code in the board file.
Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/board-igep0020.c | 41 |
1 files changed, 3 insertions, 38 deletions
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index 06dbb2d3d38b..d648d50d9d24 100644 --- a/arch/arm/mach-omap2/board-igep0020.c +++ b/arch/arm/mach-omap2/board-igep0020.c | |||
@@ -43,6 +43,7 @@ | |||
43 | #include "board-flash.h" | 43 | #include "board-flash.h" |
44 | #include "control.h" | 44 | #include "control.h" |
45 | #include "gpmc-onenand.h" | 45 | #include "gpmc-onenand.h" |
46 | #include "dss-common.h" | ||
46 | 47 | ||
47 | #define IGEP2_SMSC911X_CS 5 | 48 | #define IGEP2_SMSC911X_CS 5 |
48 | #define IGEP2_SMSC911X_GPIO 176 | 49 | #define IGEP2_SMSC911X_GPIO 176 |
@@ -50,7 +51,6 @@ | |||
50 | #define IGEP2_GPIO_LED0_GREEN 26 | 51 | #define IGEP2_GPIO_LED0_GREEN 26 |
51 | #define IGEP2_GPIO_LED0_RED 27 | 52 | #define IGEP2_GPIO_LED0_RED 27 |
52 | #define IGEP2_GPIO_LED1_RED 28 | 53 | #define IGEP2_GPIO_LED1_RED 28 |
53 | #define IGEP2_GPIO_DVI_PUP 170 | ||
54 | 54 | ||
55 | #define IGEP2_RB_GPIO_WIFI_NPD 94 | 55 | #define IGEP2_RB_GPIO_WIFI_NPD 94 |
56 | #define IGEP2_RB_GPIO_WIFI_NRESET 95 | 56 | #define IGEP2_RB_GPIO_WIFI_NRESET 95 |
@@ -429,41 +429,6 @@ static struct twl4030_gpio_platform_data igep_twl4030_gpio_pdata = { | |||
429 | .setup = igep_twl_gpio_setup, | 429 | .setup = igep_twl_gpio_setup, |
430 | }; | 430 | }; |
431 | 431 | ||
432 | static struct connector_dvi_platform_data omap3stalker_dvi_connector_pdata = { | ||
433 | .name = "dvi", | ||
434 | .source = "tfp410.0", | ||
435 | .i2c_bus_num = 3, | ||
436 | }; | ||
437 | |||
438 | static struct platform_device omap3stalker_dvi_connector_device = { | ||
439 | .name = "connector-dvi", | ||
440 | .id = 0, | ||
441 | .dev.platform_data = &omap3stalker_dvi_connector_pdata, | ||
442 | }; | ||
443 | |||
444 | static struct encoder_tfp410_platform_data omap3stalker_tfp410_pdata = { | ||
445 | .name = "tfp410.0", | ||
446 | .source = "dpi.0", | ||
447 | .data_lines = 24, | ||
448 | .power_down_gpio = IGEP2_GPIO_DVI_PUP, | ||
449 | }; | ||
450 | |||
451 | static struct platform_device omap3stalker_tfp410_device = { | ||
452 | .name = "tfp410", | ||
453 | .id = 0, | ||
454 | .dev.platform_data = &omap3stalker_tfp410_pdata, | ||
455 | }; | ||
456 | |||
457 | static struct omap_dss_board_info igep2_dss_data = { | ||
458 | .default_display_name = "dvi", | ||
459 | }; | ||
460 | |||
461 | static struct platform_device *igep_devices[] __initdata = { | ||
462 | &igep_vwlan_device, | ||
463 | &omap3stalker_tfp410_device, | ||
464 | &omap3stalker_dvi_connector_device, | ||
465 | }; | ||
466 | |||
467 | static int igep2_keymap[] = { | 432 | static int igep2_keymap[] = { |
468 | KEY(0, 0, KEY_LEFT), | 433 | KEY(0, 0, KEY_LEFT), |
469 | KEY(0, 1, KEY_RIGHT), | 434 | KEY(0, 1, KEY_RIGHT), |
@@ -663,7 +628,8 @@ static void __init igep_init(void) | |||
663 | 628 | ||
664 | /* Register I2C busses and drivers */ | 629 | /* Register I2C busses and drivers */ |
665 | igep_i2c_init(); | 630 | igep_i2c_init(); |
666 | platform_add_devices(igep_devices, ARRAY_SIZE(igep_devices)); | 631 | platform_device_register(&igep_vwlan_device); |
632 | omap3_igep2_display_init_of(); | ||
667 | omap_serial_init(); | 633 | omap_serial_init(); |
668 | omap_sdrc_init(m65kxxxxam_sdrc_params, | 634 | omap_sdrc_init(m65kxxxxam_sdrc_params, |
669 | m65kxxxxam_sdrc_params); | 635 | m65kxxxxam_sdrc_params); |
@@ -681,7 +647,6 @@ static void __init igep_init(void) | |||
681 | igep_wlan_bt_init(); | 647 | igep_wlan_bt_init(); |
682 | 648 | ||
683 | if (machine_is_igep0020()) { | 649 | if (machine_is_igep0020()) { |
684 | omap_display_init(&igep2_dss_data); | ||
685 | igep2_init_smsc911x(); | 650 | igep2_init_smsc911x(); |
686 | usbhs_init_phys(igep2_phy_data, ARRAY_SIZE(igep2_phy_data)); | 651 | usbhs_init_phys(igep2_phy_data, ARRAY_SIZE(igep2_phy_data)); |
687 | usbhs_init(&igep2_usbhs_bdata); | 652 | usbhs_init(&igep2_usbhs_bdata); |