lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: OMAP2+: N900: enable N900-specific drivers even if device tree is enabled

Browse Source 
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>
This commit is contained in:
Pavel Machek
2013-07-01 23:15:04 +02:00
committed by Tony Lindgren
parent 1261674a2d
commit ea2409bab7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/board-rx51-video.c
View File

@@ -61,7 +61,7 @@ static struct omap_dss_board_info rx51_dss_board_info = {
static int __init rx51_video_init(void) 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; return 0;
if (omap_mux_init_gpio(RX51_LCD_RESET_GPIO, OMAP_PIN_OUTPUT)) { if (omap_mux_init_gpio(RX51_LCD_RESET_GPIO, OMAP_PIN_OUTPUT)) {

2
sound/soc/omap/rx51.c
View File

@@ -396,7 +396,7 @@ static int __init rx51_soc_init(void)
{ {
int err; int err;
if (!machine_is_nokia_rx51()) if (!machine_is_nokia_rx51() && !of_machine_is_compatible("nokia,omap3-n900"))
return -ENODEV; return -ENODEV;
err = gpio_request_one(RX51_TVOUT_SEL_GPIO, err = gpio_request_one(RX51_TVOUT_SEL_GPIO,