From patchwork Mon Jul 1 21:15:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 2810141 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D1B2B9F3EB for ; Mon, 1 Jul 2013 21:15:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1146B20185 for ; Mon, 1 Jul 2013 21:15:38 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EB6B020163 for ; Mon, 1 Jul 2013 21:15:36 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UtlRd-0002ky-LC; Mon, 01 Jul 2013 21:15:34 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UtlRa-0008Jb-RQ; Mon, 01 Jul 2013 21:15:30 +0000 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UtlRX-0008J1-7G for linux-arm-kernel@lists.infradead.org; Mon, 01 Jul 2013 21:15:28 +0000 Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id E2BCF81793; Mon, 1 Jul 2013 23:15:05 +0200 (CEST) Date: Mon, 1 Jul 2013 23:15:04 +0200 From: Pavel Machek To: Tony Lindgren Subject: [PATCH] N900: enable N900-specific drivers even if device tree is enabled Message-ID: <20130701211504.GB15318@amd.pavel.ucw.cz> References: <20130613132624.GA3464@amd.pavel.ucw.cz> <20130613141001.GF8164@atomide.com> <20130613142809.GA3775@amd.pavel.ucw.cz> <20130613145724.GH8164@atomide.com> <20130613155240.GB3775@amd.pavel.ucw.cz> <20130613161418.GJ8164@atomide.com> <20130613230808.GA14876@amd.pavel.ucw.cz> <20130614055629.GM8164@atomide.com> <20130614212816.GA31768@atrey.karlin.mff.cuni.cz> <20130617111031.GQ20992@atomide.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130617111031.GQ20992@atomide.com> User-Agent: Mutt/1.5.20 (2009-06-14) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130701_171527_405530_C1261CFB X-CRM114-Status: GOOD ( 11.16 ) X-Spam-Score: -1.9 (-) Cc: linux-omap@vger.kernel.org, pali.rohar@gmail.com, kernel list , linux-arm-kernel , Aaro Koskinen X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We still need video & sound drivers with device tree enabled. Signed-off-by: Pavel Machek --- 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,