From patchwork Thu Oct 20 06:46:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 9385983 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2D872607F0 for ; Thu, 20 Oct 2016 06:46:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 169BD29AC8 for ; Thu, 20 Oct 2016 06:46:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0704429ACE; Thu, 20 Oct 2016 06:46:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 007FD29AC8 for ; Thu, 20 Oct 2016 06:46:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752837AbcJTGqo (ORCPT ); Thu, 20 Oct 2016 02:46:44 -0400 Received: from mail-lf0-f54.google.com ([209.85.215.54]:35264 "EHLO mail-lf0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752435AbcJTGqn (ORCPT ); Thu, 20 Oct 2016 02:46:43 -0400 Received: by mail-lf0-f54.google.com with SMTP id l131so64576383lfl.2 for ; Wed, 19 Oct 2016 23:46:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=hOMSLNZ/HPZKNLJculDxCiwxjwha2Vv0MMDH/Rx0zeU=; b=Du7Y7PVlayrxVca5uxAtkyQLJcUyGG/Db9OLKUZASZ6uUxEqiTZ0NZOsmEzBKEzX34 NiA8JKpCqO7IEbW+4S4IhyKvrYFGzfXbOtjB+HlLea8kV4nTEiwq7SHyC8L2fIQipWyB RT83pLcjGb0i3B4jJodhbzL4/L77VyiMpCCwo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=hOMSLNZ/HPZKNLJculDxCiwxjwha2Vv0MMDH/Rx0zeU=; b=DerNSIz4+jd8ybNUP25lJg/uIRhJTQK6T5CovuPwfagJ1TkG9g+ycCdJID6tCAeiFv OdubFMY7SzlYZAUtoDBJOz2yp8DJFTE1WCPWfG/tX7/iiuQ2pOgedFZ4GWeOlmy8x3VM vpIhiZYFGeZJOhzaJEFqTdWlato43IZSw+Qq71iiWKUxNpAW+4C9FpnSpeYxshRi4g6a g+83A/J2gGiYh3OTHd+AY1WJ6GQ+SHgnRJRsDeki5ZP3FwpfmFtPYA8zfTfa7KFEkJC1 OlwfWN7IiBDRpGwmzuy3amIUJvov/YUUt1XAYoUeuVX4mUKPov5OQz7FdVXDpfdsAjdc rJ1A== X-Gm-Message-State: AA6/9RkCWUSgCJ7Vt2n9mOAjgVda3cnNJrJRVhWiozcB2WW6QXh0+0xS3lt2aWOSH5QnDMFj X-Received: by 10.25.195.209 with SMTP id t200mr6629329lff.172.1476946001341; Wed, 19 Oct 2016 23:46:41 -0700 (PDT) Received: from localhost.localdomain.localdomain (c-357171d5.014-348-6c756e10.cust.bredbandsbolaget.se. [213.113.113.53]) by smtp.gmail.com with ESMTPSA id n6sm2433500lfd.45.2016.10.19.23.46.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Oct 2016 23:46:40 -0700 (PDT) From: Linus Walleij To: linux-fbdev@vger.kernel.org, Tomi Valkeinen , Jean-Christophe Plagniol-Villard , Pawel Moll , Amit Pundir Cc: linux-arm-kernel@lists.infradead.org, Linus Walleij Subject: [PATCH] video: ARM CLCD: fix Vexpress regression Date: Thu, 20 Oct 2016 08:46:32 +0200 Message-Id: <1476945992-5164-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The CLCD does not come up on Versatile Express as it does not (currently) have a syscon node for controlling the block apart from the CLCD itself. Make sure the .init() function can bail out without an error making it probe again. Reported-by: Amit Pundir Signed-off-by: Linus Walleij Tested-by: Amit Pundir Tested-by: Nicolae Rosia --- drivers/video/fbdev/amba-clcd-versatile.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/amba-clcd-versatile.c b/drivers/video/fbdev/amba-clcd-versatile.c index 19ad8645d93c..d909b7dda14d 100644 --- a/drivers/video/fbdev/amba-clcd-versatile.c +++ b/drivers/video/fbdev/amba-clcd-versatile.c @@ -527,7 +527,8 @@ int versatile_clcd_init_panel(struct clcd_fb *fb, &clcd_id); if (!np) { dev_err(dev, "no Versatile syscon node\n"); - return -ENODEV; + /* Vexpress does not have this */ + return 0; } versatile_clcd_type = (enum versatile_clcd)clcd_id->data;