From patchwork Sat Nov 16 13:23:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 3192651 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 25350C045B for ; Sat, 16 Nov 2013 13:41:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5FF7D2088A for ; Sat, 16 Nov 2013 13:41:09 +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 7C4B620819 for ; Sat, 16 Nov 2013 13:41:08 +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 1VhfuP-0006LU-W2; Sat, 16 Nov 2013 13:27: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 1Vhfta-0003jM-D5; Sat, 16 Nov 2013 13:26:42 +0000 Received: from bhuna.collabora.co.uk ([93.93.135.160]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VhfsW-0003b3-0U for linux-arm-kernel@lists.infradead.org; Sat, 16 Nov 2013 13:25:42 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: javier) with ESMTPSA id 1C821268808D From: Javier Martinez Canillas To: Tony Lindgren Subject: [PATCH 11/11] OMAPDSS: DPI: use VPLL2 regulator if VDDS_DSI is not found Date: Sat, 16 Nov 2013 14:23:44 +0100 Message-Id: <1384608224-9452-12-git-send-email-javier.martinez@collabora.co.uk> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1384608224-9452-1-git-send-email-javier.martinez@collabora.co.uk> References: <1384608224-9452-1-git-send-email-javier.martinez@collabora.co.uk> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131116_082536_880589_09E7C688 X-CRM114-Status: GOOD ( 10.25 ) X-Spam-Score: -1.9 (-) Cc: Enric Balletbo i Serra , tomi.valkeinen@ti.com, bcousson@baylibre.com, linux-omap@vger.kernel.org, Javier Martinez Canillas , linux-arm-kernel@lists.infradead.org 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: , MIME-Version: 1.0 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 On Device Tree boot the VDDS_DSI regulator is not linked to the DPI device so omapfb driver probing fails with: [ 3.186035] OMAPFB: omapfb_probe [ 3.190704] omapdss DPI error: can't get VDDS_DSI regulator [ 3.196594] omapfb omapfb: failed to connect default display [ 3.202667] omapfb omapfb: failed to init overlay connections [ 3.208892] OMAPFB: free_resources [ 3.212493] OMAPFB: free all fbmem [ 3.216735] omapfb omapfb: failed to setup omapfb As a workaround try to use the VPLL2 regulator from twl4030 in dpi_init_regulator() if getting the VDDS_DSI regulator fails. Signed-off-by: Javier Martinez Canillas --- drivers/video/omap2/dss/dpi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index bd48cde..e328f0b 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c @@ -550,6 +550,11 @@ static int dpi_init_regulator(void) return 0; vdds_dsi = devm_regulator_get(&dpi.pdev->dev, "vdds_dsi"); + + /* DT HACK: try VPLL2 to make omapdss work for OMAP3 IGEPv2 */ + if (IS_ERR(vdds_dsi)) + vdds_dsi = devm_regulator_get(&dpi.pdev->dev, "VPLL2"); + if (IS_ERR(vdds_dsi)) { DSSERR("can't get VDDS_DSI regulator\n"); return PTR_ERR(vdds_dsi);