[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20130704114755.GE5523@atomide.com>
Date: Thu, 4 Jul 2013 04:47:56 -0700
From: Tony Lindgren <tony@...mide.com>
To: Pavel Machek <pavel@....cz>
Cc: Aaro Koskinen <aaro.koskinen@....fi>, pali.rohar@...il.com,
kernel list <linux-kernel@...r.kernel.org>,
linux-arm-kernel <linux-arm-kernel@...ts.infradead.org>,
linux-omap@...r.kernel.org
Subject: Re: [PATCH] N900: enable N900-specific drivers even if device tree
is enabled
* Pavel Machek <pavel@....cz> [130701 14:21]:
>
> We still need video & sound drivers with device tree enabled.
>
> Signed-off-by: Pavel Machek <pavel@....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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists