diff options
| author | Pavel Machek <pavel@ucw.cz> | 2013-07-01 23:15:04 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-07-04 05:11:16 -0700 |
| commit | ea2409bab7ee7c309e558f257a3b6b7e8233f209 (patch) | |
| tree | 6d5fa4ab8561deec2adadd4565bb3bc550722cd4 | |
| parent | 1261674a2dded2b5b055f51fb44677a8654d3f06 (diff) | |
ARM: OMAP2+: N900: enable N900-specific drivers even if device tree is enabled
We still need video & sound drivers with device tree enabled.
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51-video.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/rx51.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c index bd74f9f6063..bdd1e3a179e 100644 --- a/arch/arm/mach-omap2/board-rx51-video.c +++ b/arch/arm/mach-omap2/board-rx51-video.c @@ -61,7 +61,7 @@ static struct omap_dss_board_info rx51_dss_board_info = { static int __init rx51_video_init(void) { - if (!machine_is_nokia_rx51()) + if (!machine_is_nokia_rx51() && !of_machine_is_compatible("nokia,omap3-n900")) return 0; if (omap_mux_init_gpio(RX51_LCD_RESET_GPIO, OMAP_PIN_OUTPUT)) { diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c index 249cd230ad8..611179c3bca 100644 --- a/sound/soc/omap/rx51.c +++ b/sound/soc/omap/rx51.c @@ -396,7 +396,7 @@ static int __init rx51_soc_init(void) { int err; - if (!machine_is_nokia_rx51()) + if (!machine_is_nokia_rx51() && !of_machine_is_compatible("nokia,omap3-n900")) return -ENODEV; err = gpio_request_one(RX51_TVOUT_SEL_GPIO, |