From patchwork Thu Aug 18 10:11:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9287333 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 DD0E1607FF for ; Thu, 18 Aug 2016 10:25:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE05629099 for ; Thu, 18 Aug 2016 10:25:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C14302909E; Thu, 18 Aug 2016 10:25:51 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6DC94290AA for ; Thu, 18 Aug 2016 10:25:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1baKW7-00041R-73; Thu, 18 Aug 2016 10:25:43 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1baKVi-0002LW-6w for linux-amlogic@bombadil.infradead.org; Thu, 18 Aug 2016 10:25:18 +0000 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]) by casper.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1baKIf-00029s-7s for linux-amlogic@lists.infradead.org; Thu, 18 Aug 2016 10:11:49 +0000 Received: by mail-wm0-x230.google.com with SMTP id i5so24622862wmg.0 for ; Thu, 18 Aug 2016 03:11:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=D77HJr7evX68qKOZDxUefSXoiqKMVS8JCkTYX5hngQM=; b=dVwcab9eQNTHmtstzsNX8V15ufio9dlbQnxmjgMZ7IqDKWE0Vn1mSxpzhnC60kZsKv cnGhlijCbwaVS0tyOJwdvm6/rCnMX1NztI1OHIoX9m4dQgpD81FbnKRda7GqzK5Sr2oc Kx7vNr4xxF78CAz1KeWvGafGZhUQJZN80GKynEarFZmI6cJXnhjKYU+MW/UQwDmhzJ8W 9TmaRA0cqM5T0dNelGlKwAnK2FQhNF8m1zC+/74lGfmilD8XUIuzQwPP1gRjIHbmPc3Y GnTcFg9NS6DWz3p0vKcCxqQwQ8LyalRFVq1xKCPyA/oPDqHT/pZ90cbsJIfigvcHrmF0 qN7w== 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:in-reply-to :references; bh=D77HJr7evX68qKOZDxUefSXoiqKMVS8JCkTYX5hngQM=; b=ls6omHJoA6QzKeN5DPyhZh/3e2+4OLfiYpLxaMq8L5953eFKhA8VykboASpLTgiueG McVlfsfjMT9Y64I1LEzamVNUQ6P+oftYwQi92OJJN3k9pwLS1iJg6BbqJUCymWSSHfJ9 k4vcAtX6KAZIXZ05DBcQDzXkXXeZ5ZHIR2pL8a0Dyzgyv7ZTpAhr5eUa2cihsRLU1vXa Uu83F/wL/FA9WM0zYg1558ypv7OWx3d9AJF67UuTjuVNo9J5siBEB3Q5gswh4P41JhxV BLdmtIpQfETlEVjMNvW96i8D7iuqKhHlEM8n21mJVfm+Pk+iWXG0CEaOCRO/3lyXkOxS 2LTQ== X-Gm-Message-State: AEkooutLf6Z8F5LxQS6sbQOYOpC/oMGbtN07VClW1QF5lxXyGm/tD6plS1bTVbWbWml0/6V7 X-Received: by 10.194.179.163 with SMTP id dh3mr1350105wjc.73.1471515087811; Thu, 18 Aug 2016 03:11:27 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id f4sm30915247wmf.8.2016.08.18.03.11.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Aug 2016 03:11:27 -0700 (PDT) From: Neil Armstrong To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, sudeep.holla@arm.com Subject: [PATCH 07/13] scpi: ignore init_versions failure if reported not supported Date: Thu, 18 Aug 2016 12:11:00 +0200 Message-Id: <1471515066-3626-8-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1471515066-3626-1-git-send-email-narmstrong@baylibre.com> References: <1471515066-3626-1-git-send-email-narmstrong@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160818_111149_324044_7C1B820D X-CRM114-Status: GOOD ( 10.72 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: heiko@sntech.de, Neil Armstrong , frank.wang@rock-chips.com, khilman@baylibre.com, linux-amlogic@lists.infradead.org, wxt@rock-chips.com MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In Amlogic GXBB Legacy SCPI, the LEGACY_SCPI_CMD_SCPI_CAPABILITIES report as SCPI_ERR_SUPPORT, so do not fail if this command is not supported. Signed-off-by: Neil Armstrong --- drivers/firmware/arm_scpi.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c index 3fe39fe..d3be4c5 100644 --- a/drivers/firmware/arm_scpi.c +++ b/drivers/firmware/arm_scpi.c @@ -1111,12 +1111,13 @@ err: ret = scpi_info->ops->init_versions(scpi_info); else ret = scpi_init_versions(scpi_info); - if (ret) { + if (ret && ret != -EOPNOTSUPP) { dev_err(dev, "incorrect or no SCP firmware found\n"); scpi_remove(pdev); return ret; } + if (ret != -EOPNOTSUPP) { _dev_info(dev, "SCP Protocol %d.%d Firmware %d.%d.%d version\n", PROTOCOL_REV_MAJOR(scpi_info->protocol_version), PROTOCOL_REV_MINOR(scpi_info->protocol_version), @@ -1124,15 +1125,16 @@ err: FW_REV_MINOR(scpi_info->firmware_version), FW_REV_PATCH(scpi_info->firmware_version)); + ret = sysfs_create_groups(&dev->kobj, versions_groups); + if (ret) + dev_err(dev, "unable to create sysfs version group\n"); + } + if (scpi_info->ops && scpi_info->ops->scpi_ops) scpi_info->scpi_ops = scpi_info->ops->scpi_ops; else scpi_info->scpi_ops = &scpi_ops; - ret = sysfs_create_groups(&dev->kobj, versions_groups); - if (ret) - dev_err(dev, "unable to create sysfs version group\n"); - return of_platform_populate(dev->of_node, NULL, NULL, dev); }