Received: by 2002:a05:6a10:d593:0:0:0:0 with SMTP id gn19csp759644pxb; Thu, 7 Jan 2021 17:13:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJwbiRzTRQn8fohbZF3PZg0Wgdkru4JnNDYVQJcel6/rXhNPyhg8WjIqD4zb+byCOQkGEjNl X-Received: by 2002:a17:906:d146:: with SMTP id br6mr1025193ejb.331.1610068412708; Thu, 07 Jan 2021 17:13:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610068412; cv=none; d=google.com; s=arc-20160816; b=U9Y7i2OcPROJQmy9dg3+YWMgMr5bTbzeXP5U20+TFXvXc//9OV5dfCjR/KcFUiCIuV 5IzeqjW7oiskHJCqPcLvIkbfrHU2+ObuWb2xrRkVBqXper8CmOgLwLxwb6VbBXOyXrZC s2pJUnIf34G+yrHvP6jdBFwm4sBJXBcLFnEB8oK0tDTIoN2HIxyDJuFgoIbFxrsTBuVV idxz3CqtnC8HHdUbFbkAO3xkJzZpLphqfQNj/3qVRjmrTm+QYRIfYn1j2dpB+sW6VQ88 RhGKH3ltZ90HhiOm/2/9WZeAx3jzknFX4INnVpmRPxpxxmCkliYGWAEmpjo0WMr6BGsD EPBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dHyReSQ8KVVUvJdBXmnrYM8WgHzQsbbibvjALLFnNFs=; b=Azm0R18tTk9g1SymDW3z3CqAu1pI/Ckg/279Cmok/2+6r2aXhDw84UqL5FMOjfqirA iXOmwusITmwqan8AbZ+/vtTpI2hyXlcuxtk+qPOxeiBdCzWLJxq7DqeUIsUIajXb4WI9 20SvvFeDR3leahwvml694T5FS6mQPhCkavFuu4skytQrURDz89UkZDhvy2qMQPhDC8yz pxjc6KYaBc9cWITi4R6qWFm9oeWiqMkK5gQX3RhPcMkhph2m1tIqRr1I3b/3jRGepl90 kAH7nfNGVbFhAurooUFiRvUe3nJpBjmSY3wL33rVxLXTbkqG7KRqCH/lgW1qUlQSBcf1 GXHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=lDELuF+l; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h15si3092798ejq.383.2021.01.07.17.13.08; Thu, 07 Jan 2021 17:13:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=lDELuF+l; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729888AbhAHBLm (ORCPT + 99 others); Thu, 7 Jan 2021 20:11:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729805AbhAHBLi (ORCPT ); Thu, 7 Jan 2021 20:11:38 -0500 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05F95C0612FB for ; Thu, 7 Jan 2021 17:10:25 -0800 (PST) Received: by mail-pj1-x102d.google.com with SMTP id lj6so2764814pjb.0 for ; Thu, 07 Jan 2021 17:10:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dHyReSQ8KVVUvJdBXmnrYM8WgHzQsbbibvjALLFnNFs=; b=lDELuF+llCKSUT0QHPQdBbMLG7pUP2dUUuBfsZyb2PwvwF9GmWrYfS02Fs4i/Sc3mT Abf4dRtD8gwx3+4l7cSGP5V7AgOxse4jNVlZ834b6HcjSAtcBoKy+dAtnflYrtmlg9gs clcS9ZKFieBIhACgoQMLbJJuyMY79vCTcW8C4= 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=dHyReSQ8KVVUvJdBXmnrYM8WgHzQsbbibvjALLFnNFs=; b=JLfnC2wWnbq8TzchAPX1nbudVjpK2RNYGigyqklVRAgLek5qIHJssAV6PR3EO5u4Ap DnNOO+15L63lts+MD1jrymQCcdGUB9qxe9qfamuBvyr3UjzhpbSgsf7P03FI1VET1EC6 cv1yyhKXzL9JomFEAWuWyEu3Ah1K4mhsIx5VXTk41aYmADJkR+rEXZOdAwDZ3bPRaEN2 Ou2o7ctijsyN/bGXaofWUHyKWVjas5PeyM2jaFD/KKN2gFpLvsfHCE426CiY0MIctLy9 1SW9SH3SfL893LglXJdX7hMcy4VZ5rzgV8gosyoDgdG5DOKL1Fpzv8pAZW8UKjRb14pw 7YRg== X-Gm-Message-State: AOAM531gIpKcX0FMf5KfXpQUbr3Krb/Y9LiFBiB81sOt/Fj6emBul+3+ MCaNcbL5AFYioZW5QDRhnX835A== X-Received: by 2002:a17:90b:1202:: with SMTP id gl2mr1155793pjb.123.1610068224540; Thu, 07 Jan 2021 17:10:24 -0800 (PST) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:7220:84ff:fe09:41dc]) by smtp.gmail.com with ESMTPSA id s1sm6400083pfb.103.2021.01.07.17.10.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 17:10:23 -0800 (PST) From: Nicolas Boichat To: Rob Herring , Steven Price , Alyssa Rosenzweig Cc: fshao@chromium.org, hoegsberg@chromium.org, hsinyi@chromium.org, boris.brezillon@collabora.com, Tomeu Vizoso , Nicolas Boichat , Matthias Brugger , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v9 2/4] arm64: dts: mt8183: Add node for the Mali GPU Date: Fri, 8 Jan 2021 09:10:09 +0800 Message-Id: <20210108091005.v9.2.I9f45f5c1f975422d58b5904d11546349e9ccdc94@changeid> X-Mailer: git-send-email 2.29.2.729.g45daf8777d-goog In-Reply-To: <20210108011011.4061575-1-drinkcat@chromium.org> References: <20210108011011.4061575-1-drinkcat@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a basic GPU node for mt8183. Signed-off-by: Nicolas Boichat --- The binding we use with out-of-tree Mali drivers includes more clocks, this is used for devfreq: the out-of-tree driver switches clk_mux to clk_sub_parent (26Mhz), adjusts clk_main_parent, then switches clk_mux back to clk_main_parent: (see https://chromium.googlesource.com/chromiumos/third_party/kernel/+/chromeos-4.19/drivers/gpu/arm/midgard/platform/mediatek/mali_kbase_runtime_pm.c#423) clocks = <&topckgen CLK_TOP_MFGPLL_CK>, <&topckgen CLK_TOP_MUX_MFG>, <&clk26m>, <&mfgcfg CLK_MFG_BG3D>; clock-names = "clk_main_parent", "clk_mux", "clk_sub_parent", "subsys_mfg_cg"; (based on discussions, this probably belongs in the clock core) This only matters for devfreq, that is disabled anyway as we don't have platform-specific code to handle >1 supplies. (no changes since v6) Changes in v6: - Add gpu regulators to kukui dtsi as well. - Power domains are now attached to spm, not scpsys - Drop R-B. Changes in v5: - Rename "2d" power domain to "core2" (keep R-B again). Changes in v4: - Add power-domain-names to describe the 3 domains. (kept Alyssa's reviewed-by as the change is minor) Changes in v3: - No changes Changes in v2: - Use sram instead of mali_sram as SRAM supply name. - Rename mali@ to gpu@. arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 6 + .../arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 6 + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 105 ++++++++++++++++++ 3 files changed, 117 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts index cba2d8933e79..0a8c2fad8e16 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts @@ -42,6 +42,12 @@ &auxadc { status = "okay"; }; +&gpu { + supply-names = "mali", "sram"; + mali-supply = <&mt6358_vgpu_reg>; + sram-supply = <&mt6358_vsram_gpu_reg>; +}; + &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c_pins_0>; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi index bf2ad1294dd3..00d8e112cab9 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi @@ -249,6 +249,12 @@ &cpu7 { proc-supply = <&mt6358_vproc11_reg>; }; +&gpu { + supply-names = "mali", "sram"; + mali-supply = <&mt6358_vgpu_reg>; + sram-supply = <&mt6358_vsram_gpu_reg>; +}; + &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c0_pins>; diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi index 5b782a4769e7..5430e05e18a0 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi @@ -964,6 +964,111 @@ mfgcfg: syscon@13000000 { #clock-cells = <1>; }; + gpu: gpu@13040000 { + compatible = "mediatek,mt8183-mali", "arm,mali-bifrost"; + reg = <0 0x13040000 0 0x4000>; + interrupts = + , + , + ; + interrupt-names = "job", "mmu", "gpu"; + + clocks = <&topckgen CLK_TOP_MFGPLL_CK>; + + power-domains = + <&spm MT8183_POWER_DOMAIN_MFG_CORE0>, + <&spm MT8183_POWER_DOMAIN_MFG_CORE1>, + <&spm MT8183_POWER_DOMAIN_MFG_2D>; + power-domain-names = "core0", "core1", "core2"; + + operating-points-v2 = <&gpu_opp_table>; + }; + + gpu_opp_table: opp_table0 { + compatible = "operating-points-v2"; + opp-shared; + + opp-300000000 { + opp-hz = /bits/ 64 <300000000>; + opp-microvolt = <625000>, <850000>; + }; + + opp-320000000 { + opp-hz = /bits/ 64 <320000000>; + opp-microvolt = <631250>, <850000>; + }; + + opp-340000000 { + opp-hz = /bits/ 64 <340000000>; + opp-microvolt = <637500>, <850000>; + }; + + opp-360000000 { + opp-hz = /bits/ 64 <360000000>; + opp-microvolt = <643750>, <850000>; + }; + + opp-380000000 { + opp-hz = /bits/ 64 <380000000>; + opp-microvolt = <650000>, <850000>; + }; + + opp-400000000 { + opp-hz = /bits/ 64 <400000000>; + opp-microvolt = <656250>, <850000>; + }; + + opp-420000000 { + opp-hz = /bits/ 64 <420000000>; + opp-microvolt = <662500>, <850000>; + }; + + opp-460000000 { + opp-hz = /bits/ 64 <460000000>; + opp-microvolt = <675000>, <850000>; + }; + + opp-500000000 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <687500>, <850000>; + }; + + opp-540000000 { + opp-hz = /bits/ 64 <540000000>; + opp-microvolt = <700000>, <850000>; + }; + + opp-580000000 { + opp-hz = /bits/ 64 <580000000>; + opp-microvolt = <712500>, <850000>; + }; + + opp-620000000 { + opp-hz = /bits/ 64 <620000000>; + opp-microvolt = <725000>, <850000>; + }; + + opp-653000000 { + opp-hz = /bits/ 64 <653000000>; + opp-microvolt = <743750>, <850000>; + }; + + opp-698000000 { + opp-hz = /bits/ 64 <698000000>; + opp-microvolt = <768750>, <868750>; + }; + + opp-743000000 { + opp-hz = /bits/ 64 <743000000>; + opp-microvolt = <793750>, <893750>; + }; + + opp-800000000 { + opp-hz = /bits/ 64 <800000000>; + opp-microvolt = <825000>, <925000>; + }; + }; + mmsys: syscon@14000000 { compatible = "mediatek,mt8183-mmsys", "syscon"; reg = <0 0x14000000 0 0x1000>; -- 2.29.2.729.g45daf8777d-goog