Commit ea2409ba authored Jul 01, 2013 by Pavel Machek Committed by Tony Lindgren Jul 04, 2013

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>

parent 1261674a

arch/arm/mach-omap2/board-rx51-video.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)) {

sound/soc/omap/rx51.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,