| Message ID | 20130701211504.GB15318@amd.pavel.ucw.cz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Pavel Machek <pavel@ucw.cz> [130701 14:21]: > > We still need video & sound drivers with device tree enabled. > > Signed-off-by: Pavel Machek <pavel@ucw.cz> Thanks, applying this into omap-for-v3.11/fixes. Benoit should queue the .dts related changes. Tony > > --- > > Patch against 3.10. > > --- linux-delme-clean//arch/arm/mach-omap2/board-rx51-video.c 2013-07-01 21:51:07.000000000 +0200 > +++ linux-delme/arch/arm/mach-omap2/board-rx51-video.c 2013-07-01 22:50:27.000000000 +0200 > @@ -61,7 +61,7 @@ > > 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 -urN linux-delme-clean//sound/soc/omap/rx51.c linux-delme/sound/soc/omap/rx51.c > --- linux-delme-clean//sound/soc/omap/rx51.c 2013-07-01 21:54:49.000000000 +0200 > +++ linux-delme/sound/soc/omap/rx51.c 2013-07-01 22:50:27.000000000 +0200 > @@ -396,7 +396,7 @@ > { > 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, > > -- > (english) http://www.livejournal.com/~pavelmachek > (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--- linux-delme-clean//arch/arm/mach-omap2/board-rx51-video.c 2013-07-01 21:51:07.000000000 +0200 +++ linux-delme/arch/arm/mach-omap2/board-rx51-video.c 2013-07-01 22:50:27.000000000 +0200 @@ -61,7 +61,7 @@ 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 -urN linux-delme-clean//sound/soc/omap/rx51.c linux-delme/sound/soc/omap/rx51.c --- linux-delme-clean//sound/soc/omap/rx51.c 2013-07-01 21:54:49.000000000 +0200 +++ linux-delme/sound/soc/omap/rx51.c 2013-07-01 22:50:27.000000000 +0200 @@ -396,7 +396,7 @@ { 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,
We still need video & sound drivers with device tree enabled. Signed-off-by: Pavel Machek <pavel@ucw.cz> --- Patch against 3.10.