From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 DF751C76186 for ; Thu, 18 Jul 2019 03:04:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B00DD2173E for ; Thu, 18 Jul 2019 03:04:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563419079; bh=M4Hp0DidtU4Z5FyikNxfkGbejwLV+GEO4duPURQZ+B0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tOpZEvTbhp5HXKKxTLJkfvpQp68CTJ7VVIaV5ZP61uuX4s0SBcP4zo4DW4Tgj6vk2 CNvBniMLepgC1EII7Dfer1Z2lFbuqk2eUipX9Z6RJ45d7bg+PmwEwhIyswjgTsXbd2 WPme2QPoaWM6CyzVJJVheIr3AdpXLS0PVAljcuT0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389753AbfGRDEi (ORCPT ); Wed, 17 Jul 2019 23:04:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:35552 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727541AbfGRDEh (ORCPT ); Wed, 17 Jul 2019 23:04:37 -0400 Received: from localhost (115.42.148.210.bf.2iij.net [210.148.42.115]) (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 0ACC82173B; Thu, 18 Jul 2019 03:04:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563419076; bh=M4Hp0DidtU4Z5FyikNxfkGbejwLV+GEO4duPURQZ+B0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Es3I931gMQy+ZJLHPxjARqCsnsntzO6zav4W0Ijncg3xFNKr/mWbwJgvO8H6ri0Ry nbTboP1mtDXvJqdzxyWv6gxpScvgqE4BtP6892u5IzUA+uWMH40IltEPl13UdvKcPM v36bb0U3MewvP6qaQ59FugRREP/Y4MlnoIIONm0I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Martin Blumenstingl , Kevin Hilman , Sasha Levin Subject: [PATCH 5.1 07/54] ARM: dts: meson8: fix GPU interrupts and drop an undocumented property Date: Thu, 18 Jul 2019 12:01:02 +0900 Message-Id: <20190718030053.928285686@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190718030053.287374640@linuxfoundation.org> References: <20190718030053.287374640@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 01dfdd7b4693496854ac92d1ebfb18d7b108f777 ] The interrupts in Amlogic's vendor kernel sources are all contiguous. There are two typos leading to pp2 and pp4 as well as ppmmu2 and ppmmu4 incorrectly sharing the same interrupt line. Fix this by using interrupt 170 for pp2 and 171 for ppmmu2. Also drop the undocumented "switch-delay" which is a left-over from my experiments with an early lima kernel driver when it was still out-of-tree and required this property on Amlogic SoCs. Fixes: 7d3f6b536e72c9 ("ARM: dts: meson8: add the Mali-450 MP6 GPU") Signed-off-by: Martin Blumenstingl Signed-off-by: Kevin Hilman Signed-off-by: Sasha Levin --- arch/arm/boot/dts/meson8.dtsi | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi index a9781243453e..048b55c8dc1e 100644 --- a/arch/arm/boot/dts/meson8.dtsi +++ b/arch/arm/boot/dts/meson8.dtsi @@ -248,8 +248,8 @@ , , , - , - , + , + , , , , @@ -264,7 +264,6 @@ clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_MALI>; clock-names = "bus", "core"; operating-points-v2 = <&gpu_opp_table>; - switch-delay = <0xffff>; }; }; }; /* end of / */ -- 2.20.1