From patchwork Sat Apr 20 09:32:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10910107 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1D3B114DB for ; Sat, 20 Apr 2019 09:33:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0CF5828D91 for ; Sat, 20 Apr 2019 09:33:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 010FF28D98; Sat, 20 Apr 2019 09:33:38 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A99C928D91 for ; Sat, 20 Apr 2019 09:33:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OELVK7dMA7axElYg6GoNzXdl0ss7BFYGttOoozMEMv8=; b=gdqChoFgpawTOQ 7Prrb20Ke5e97YDHqFV93eklW6q8ZHOSyXW6Pnoe8Fh0dVbxS0hk5whtUxAMaaPY58OwkH15r1r6p JB7/EE3oPketPLucGDAMloPCdR2289KmL8lKXN2NMZ6fQS7xdgUzXybZD05DAW4AtdWVO9BDwdziN erZnUjiaPJlSRaB9ve0uFYsZFg0NfjKQv48r6//ZB2JHF17+Gn1mwSYc7OrkSrjdJZTUGDsJOb2GI iqEYS6cXgW9uKJE8IV52blBbpADB2n9wq+6fe4YK8jox9KSyYbmFijHv3+kcWpC/3siqn+WTC45sF AW+3BC6+dnPh/C3Ny+AQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hHmNK-00076f-Ih; Sat, 20 Apr 2019 09:33:34 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hHmN2-0006mL-3e; Sat, 20 Apr 2019 09:33:17 +0000 Received: by mail-wr1-x444.google.com with SMTP id o12so6307732wrn.2; Sat, 20 Apr 2019 02:33:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sQ+tn26yoSTxpsC/FCAOuzkhs/vTmJv3gslqGviFWhE=; b=DkVfbgQvvjGuK8Az1uYDPffYw0jFhUcl1uDHsogv2Rv04vz3a2Ha7GWX2FRfzWD/ox pbnOIbslpKUFJXdvw5PL74GVtw40g6gPzQb7q25fdcWEW/sYKnLQjsfrozOiFzHqVn1S YgSpWncgsblFP8x4FqFO5LV8RIizrTt1p7mIXynsBq9CrNonUc8UHNgXGwM8dKsSQjmy gq562idPbg+kFBv3BOT3uBioX/evlN4I2YibH62hi6Ar2lbpt7hhcP8lkmW5J467JWPJ rIE1DjSn0+rvw9CZIKVJXAcocidaUQQa+4pHvAz6gLL6oWHwViOe8MfOWE+7qQxIiIOC oyzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sQ+tn26yoSTxpsC/FCAOuzkhs/vTmJv3gslqGviFWhE=; b=dXNlSYLnFj055fmcbB5NDRBThXEjw4GKGPsvFXHtAXBa7+4mbOak5ldIUZamzI4q1Q cOh4AQwnfpv58L5B4rjy9VetZMj2w+Io/iPQ1WNW2aVw94cj4s4jdHzgKPYMapEzYHhV o/vFKi00MtFD44VC7SVqW5j8u6KQB/Rxd3pyRO6eNxpCIoglxBN7IrOZjFekZvbVTsBa LK2P/sNZpIhWfNTBZFcyMdfBbctqwfsTLtuoFNRPhcw/uNYkLnTHUARaKBVrcf60b++o 14gjEe60uVFvOLXxoHdzNv+u21zERBDoY4ioNSO3lMDtv8yb4VON5yopJUqgGqLzegwz Oa/w== X-Gm-Message-State: APjAAAWYZetJfKGmxhBGwH0QSl5Mx8YvIoG/AKZmRLlLvSpnnOhyDPwd VlKm5REUaucUmLD3mUOQu2noyfeL X-Google-Smtp-Source: APXvYqz44BVdQ6SIXDaTxW3Sxyrgkr340DMrA9/sYxJIqOgJDR+MEBnI+oqq4Oqs6aHOt1p+4l7XyQ== X-Received: by 2002:adf:f3ce:: with SMTP id g14mr6365248wrp.129.1555752794023; Sat, 20 Apr 2019 02:33:14 -0700 (PDT) Received: from blackbox.darklights.net (p200300F133C8AD0028C4739A57449001.dip0.t-ipconnect.de. [2003:f1:33c8:ad00:28c4:739a:5744:9001]) by smtp.googlemail.com with ESMTPSA id w11sm12858244wre.15.2019.04.20.02.33.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Apr 2019 02:33:13 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, khilman@baylibre.com Subject: [PATCH 1/2] ARM: dts: meson8: fix GPU interrupts and drop an undocumented property Date: Sat, 20 Apr 2019 11:32:57 +0200 Message-Id: <20190420093258.2012-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190420093258.2012-1-martin.blumenstingl@googlemail.com> References: <20190420093258.2012-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190420_023316_145292_1BD4EE39 X-CRM114-Status: GOOD ( 11.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Martin Blumenstingl , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 7ef442462ea4..40c11b6b217a 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 / */