From patchwork Tue Oct 27 13:53:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 307259 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2259C5517A for ; Tue, 27 Oct 2020 16:54:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9083F20727 for ; Tue, 27 Oct 2020 16:54:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603817680; bh=tt3NQKYNv8WXmCGKswzK/TFW7PKxX+/qbaeIGNOZU/I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yBcEEf36gCh8PpenmQVgPgVjOzCIZj5QeV22GZVflrkf2jle+k9Ka3whVl5ONAiRe WJXj/u5LVtu7kwxCL47T6YGwEflL7xCNOJF1nhdDjvND+kyXMIwg3bLWWAkQ6vCd0I dA5yDZ043KjHuhAGV1vtatMqhtc+Dt7Jc0/VMM/w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1794435AbgJ0PLs (ORCPT ); Tue, 27 Oct 2020 11:11:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:47730 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1794431AbgJ0PLr (ORCPT ); Tue, 27 Oct 2020 11:11:47 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4922121D41; Tue, 27 Oct 2020 15:11:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603811506; bh=tt3NQKYNv8WXmCGKswzK/TFW7PKxX+/qbaeIGNOZU/I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sPOehKPvW4QYFZdx25EDvJorpx4W6EfrfA1tF5BoBkr7MAXKrU8LEhBLEb1BAIbRm QmdhxJO2kPl1qsJSKcRqDCm8ey9r19hs0leVgDYrODwOiBFwmpkbAyKYPre6CfabMV c585bI5BMWNr/XWqU2Bmo3ATWmThUkF3wsZELw4A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qiang Yu , Maxime Ripard , Sasha Levin Subject: [PATCH 5.8 486/633] arm64: dts: allwinner: h5: remove Mali GPU PMU module Date: Tue, 27 Oct 2020 14:53:49 +0100 Message-Id: <20201027135545.537464896@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Qiang Yu [ Upstream commit 2933bf3528007f834fb7f5eab033f9c5b0683f91 ] H5's Mali GPU PMU is not present or working corretly although H5 datasheet record its interrupt vector. Adding this module will miss lead lima driver try to shutdown it and get waiting timeout. This problem is not exposed before lima runtime PM support is added. Fixes: bb39ed07e55b ("arm64: dts: allwinner: h5: Add device node for Mali-450 GPU") Signed-off-by: Qiang Yu Signed-off-by: Maxime Ripard Link: https://lore.kernel.org/r/20200822062755.534761-1-yuq825@gmail.com Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi index 4462a68c06815..cdc4209f94d0e 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi @@ -125,8 +125,7 @@ mali: gpu@1e80000 { , , , - , - ; + ; interrupt-names = "gp", "gpmmu", "pp", @@ -137,8 +136,7 @@ mali: gpu@1e80000 { "pp2", "ppmmu2", "pp3", - "ppmmu3", - "pmu"; + "ppmmu3"; clocks = <&ccu CLK_BUS_GPU>, <&ccu CLK_GPU>; clock-names = "bus", "core"; resets = <&ccu RST_BUS_GPU>;