From patchwork Fri Dec 2 11:52:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 630428 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F19B1C47088 for ; Fri, 2 Dec 2022 11:52:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233256AbiLBLwo (ORCPT ); Fri, 2 Dec 2022 06:52:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233368AbiLBLwk (ORCPT ); Fri, 2 Dec 2022 06:52:40 -0500 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38838B4A4; Fri, 2 Dec 2022 03:52:37 -0800 (PST) Received: by mail-ej1-x633.google.com with SMTP id n21so10975555ejb.9; Fri, 02 Dec 2022 03:52:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=1PtgXAGJmcmMEV5+MQtqk497ZJ57rtsXRI8tIjkSb9M=; b=iDb0lkEMzmazESd5awPzg6ZyS1abQbKXpfLtGCsD8QafTrPd9VY/H4r1xegNz7As+J rQvTR++06iApH+ybBpDCVdB2nEtLoZXKwxNx26exg2lGz4plEChJwe6/3N3Ws3kxGxeB Wmr5iLSr931xsGgQiuSDwsluZeN+OkaoT8A3KJF04LHjJNJ3/fs3MhBrFLZXMmejh0Sz V8EGz5XledxGK1gUgI4FzCGMPThvV2JOvek/IUvnWw+7NkY37RrYzGTusSrqQGQz1PWG yR4ZIbXJ6n1Pnqti2PFV0RyYqLMdTNRE2PV7jYA05JrC4QO0+9ccdIS1YrEyNYwklQm3 47mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=1PtgXAGJmcmMEV5+MQtqk497ZJ57rtsXRI8tIjkSb9M=; b=YbGlZO82iC0dSLCptcZwTzhxkE5R6lxBImgCt44hdzi5UNqQ0Nb2N8dhe2Ncvqnr3q sO4QVJn3mt9l967zuuGoJ6gTH+iYW23ULrvoUJGz6kID+Vi0GmsrmZHEeqR4LtMlM6un fJSsl6OXfK1oNnZeXOKLrlRFRpB03JaIb7OE6t6RGJj6HhKat8RZGUvQe84o+tNsFNyo DvQeUFRb1lvS4U3ofd+wu9KdcVf4lQj3Dwm8g9mi7qcFM4qIknnbf+INlgOQWc/tbbX+ r7VgmBdQJRJWpE2TiNL8hsqjgClfhPebJQXKAvPZfXO0gYUhn4gerhyNfV+6sqqXYbSB eCRw== X-Gm-Message-State: ANoB5ploVXDnJER9Bux8Q7yZc25aWLF8wUq8r92ibfoOGFzQ5Fv9AnzU yWxulGCZd+NZhy3AyoJGDnQ+LI5hKywV+g== X-Google-Smtp-Source: AA0mqf7jj01A8oMhYJoBckXaekMhZdpOj5mhNi9QsJ1oBNazwr9oRc1BsyV5aCFi7NW8gl2Dy7/6MA== X-Received: by 2002:a17:906:6c7:b0:78d:4061:5e1b with SMTP id v7-20020a17090606c700b0078d40615e1bmr51092779ejb.47.1669981955805; Fri, 02 Dec 2022 03:52:35 -0800 (PST) Received: from cizrna.home (cst-prg-44-69.cust.vodafone.cz. [46.135.44.69]) by smtp.gmail.com with ESMTPSA id ha7-20020a170906a88700b007c0bb571da5sm1206762ejb.41.2022.12.02.03.52.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 03:52:35 -0800 (PST) Sender: Tomeu Vizoso From: Tomeu Vizoso Cc: italonicola@collabora.com, Tomeu Vizoso , Neil Armstrong , Philipp Zabel , Martin Blumenstingl , Rob Herring , Krzysztof Kozlowski , Kevin Hilman , Jerome Brunet , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Amlogic Meson SoC support), linux-amlogic@lists.infradead.org (open list:ARM/Amlogic Meson SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 1/8] dt-bindings: reset: meson-g12a: Add missing NNA reset Date: Fri, 2 Dec 2022 12:52:13 +0100 Message-Id: <20221202115223.39051-2-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221202115223.39051-1-tomeu.vizoso@collabora.com> References: <20221202115223.39051-1-tomeu.vizoso@collabora.com> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Doesn't appear in the TRM I have, but it is used by the downstream galcore driver. Signed-off-by: Tomeu Vizoso Acked-by: Neil Armstrong Acked-by: Philipp Zabel Reviewed-by: Martin Blumenstingl --- include/dt-bindings/reset/amlogic,meson-g12a-reset.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h b/include/dt-bindings/reset/amlogic,meson-g12a-reset.h index 6d487c5eba2c..45f6b8a951d0 100644 --- a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h +++ b/include/dt-bindings/reset/amlogic,meson-g12a-reset.h @@ -69,7 +69,9 @@ #define RESET_PARSER_FETCH 72 #define RESET_CTL 73 #define RESET_PARSER_TOP 74 -/* 75-77 */ +/* 75 */ +#define RESET_NNA 76 +/* 77 */ #define RESET_DVALIN 78 #define RESET_HDMITX 79 /* 80-95 */ From patchwork Fri Dec 2 11:52:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 630959 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E736C4321E for ; Fri, 2 Dec 2022 11:52:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233371AbiLBLwq (ORCPT ); Fri, 2 Dec 2022 06:52:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233185AbiLBLwm (ORCPT ); Fri, 2 Dec 2022 06:52:42 -0500 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCF5915811; Fri, 2 Dec 2022 03:52:39 -0800 (PST) Received: by mail-ej1-x62c.google.com with SMTP id fc4so4039069ejc.12; Fri, 02 Dec 2022 03:52:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=zpYJc8YISu2BRlH3hvxZv0fOIwXysejIA3F+djx3hbo=; b=f7b0KJLVs/0oskAJftN1Qp6QFdvpMjsxCbNbiw0zdeJ72tKWquaI5caqW/LDnVfhR6 qJE/N6ti/sPb37MKmE2J/YRHHtMYf8XzCrwNN6Ke0peHMXKrCYhfIgGPjcuQjEynX7vN +kkZBsFOtGrX1xrJxn60nO5hHLeUJirZu/2+KqNDANHoqK7k6ipCIyRLqSAb0Ziiv4Nt 0DWFlY+mVPZG1/1OnMG9Mqc4ys2wu0LJA08/RlR4xs0s8ZQ4kdsKne2bVNbON9vRt3DZ XGhIij0pQQD5Z9GvAKmms2+JemxRJHrHirV+kRiopMh9nuFp/C26GaAFMpNNAi5cGu/n oBgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=zpYJc8YISu2BRlH3hvxZv0fOIwXysejIA3F+djx3hbo=; b=jrJ9fOy0/LvQDufSPMkuB+yOSGsYclrOR/3SAD+Jktfo/tnNzDBeMZUEg0WJUDXTtF k0KZcL6xzv9nfIzjXbi1igjgwBr8sOqdVNbcT36U1DcV9CYidocsQeJ7/tV6gOEmMeBN F6wxNYNl79USFHh7HB49W7dj7YpDEXDgU8fBausJKTDWfwtNJJ3Bgqh8pI9PJS8ewp+g 7QOjcQ1IL78KHoQufLAv6AQiDc/RkB25jHAEr1YUPIFgOAF8dmTZxSHUVimuSqYJpAX1 T54DYyY+6qep8M/1YE3hXUQhxS3Ka5Oo9JHj0QuotqO4+OoE9coEBLRAR6jURGjtJGIU RsVw== X-Gm-Message-State: ANoB5pnPKTamGvaTU+IlS8TNjls8BlbDf/TFV3wEXP4uOqmpXJms8ABH Y7ywVyQ4kb0kA2bhSaF/Ihm1VEV9QwM4jQ== X-Google-Smtp-Source: AA0mqf6nsc6YYjKGVTd3lWG1CooxDXTgbjwEpGKczarRIZtXYEjv/A+Z7GaUd+d2lI3Yo0V2wBadoQ== X-Received: by 2002:a17:906:c2c9:b0:7c0:ba35:b9ec with SMTP id ch9-20020a170906c2c900b007c0ba35b9ecmr4229488ejb.687.1669981958335; Fri, 02 Dec 2022 03:52:38 -0800 (PST) Received: from cizrna.home (cst-prg-44-69.cust.vodafone.cz. [46.135.44.69]) by smtp.gmail.com with ESMTPSA id ha7-20020a170906a88700b007c0bb571da5sm1206762ejb.41.2022.12.02.03.52.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 03:52:37 -0800 (PST) Sender: Tomeu Vizoso From: Tomeu Vizoso Cc: italonicola@collabora.com, Tomeu Vizoso , Neil Armstrong , Martin Blumenstingl , Rob Herring , Krzysztof Kozlowski , Kevin Hilman , Jerome Brunet , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Amlogic Meson SoC support), linux-amlogic@lists.infradead.org (open list:ARM/Amlogic Meson SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 2/8] dt-bindings: power: Add G12A NNA power domain Date: Fri, 2 Dec 2022 12:52:14 +0100 Message-Id: <20221202115223.39051-3-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221202115223.39051-1-tomeu.vizoso@collabora.com> References: <20221202115223.39051-1-tomeu.vizoso@collabora.com> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add define for the NNA power domain for the NPU in the G12A. Signed-off-by: Tomeu Vizoso Acked-by: Neil Armstrong Reviewed-by: Martin Blumenstingl --- include/dt-bindings/power/meson-g12a-power.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/dt-bindings/power/meson-g12a-power.h b/include/dt-bindings/power/meson-g12a-power.h index bb5e67a842de..93b03bdd60b7 100644 --- a/include/dt-bindings/power/meson-g12a-power.h +++ b/include/dt-bindings/power/meson-g12a-power.h @@ -9,5 +9,6 @@ #define PWRC_G12A_VPU_ID 0 #define PWRC_G12A_ETH_ID 1 +#define PWRC_G12A_NNA_ID 2 #endif From patchwork Fri Dec 2 11:52:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 630427 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0108BC47089 for ; Fri, 2 Dec 2022 11:52:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233318AbiLBLwr (ORCPT ); Fri, 2 Dec 2022 06:52:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233000AbiLBLwn (ORCPT ); Fri, 2 Dec 2022 06:52:43 -0500 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B5A024F2C; Fri, 2 Dec 2022 03:52:42 -0800 (PST) Received: by mail-ed1-x529.google.com with SMTP id d14so1212396edj.11; Fri, 02 Dec 2022 03:52:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=emFoOM20hOM5X61XhU2Zz+3u4EcYFFGnLjIcqz3xjIc=; b=qGbxd30K3aoUCNRV3nAecE6ozZ6k5GHFTNjZ5lhz+nyIpwhHjEZJfCB8u43XI0hp1u zbB8Tob8DUgVVO8rRxdGFIOqh3jMy2eK7U+XhSBFf+9rEUbDnrs1qUBP0nC5Gvc2iknW ZKUgSSJrvtsFh/Yd+PGy012+1gt4J20IbV859+eln+HHAZ5JAiB30wBSxQXz2J+oKHhR nv06iSAIyqgwx0kgnRHP8g+jnjJiAmMotHkQIJfI0xCgVs7n4vXx4QHICBYoRM7cbsOj kSV64zlK5zrdMd6/mDfTKl5uoQbbNzN86Aab3UiFezv+24LDB3G0mDpfCj04F4+pbruV uJ1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=emFoOM20hOM5X61XhU2Zz+3u4EcYFFGnLjIcqz3xjIc=; b=h5M+W3ekBW0J3orE3DCEmlCwRY4TMPGM1bZmBNnxlK4aX7nAvS0jDV6rGA+7H4nhl6 72VJmx2wxJ3xKvOfySuFjnBRaKRicaZWBD2euZmDkPdZctqOg5mxYXYKJ/5oFHkBcihS J7Icu7dCSReNFvuYWYuazgN6N3EUdmGDmwdkIbaE1ABAHVHQZLnTyNkiyccyNUuvF0Y9 FqTpcKpODjAWhMvi3nFl5cWAOt2ZWNBLt+F1AVKQnOfASUWsrixhuj7jlHQbN80zOQsp xeUpYB3lRTn4BFeFWyHJabMdIYLbjZoMl+eqdspFPNXSc49OJ3GEIJIm6CpBMO409S+1 4TPQ== X-Gm-Message-State: ANoB5plyfAl4qvEnwxChd5QY9OXN78tvrOCtFEelUqfKY1sL0Zjq/EbC BM1itjXYs3UjUo8TplfSjwk= X-Google-Smtp-Source: AA0mqf5V6uCq7x3xqjBW+9xhSr7fmB9ifJ0yaL8Q+0LV5jIiurfuIcPejyhfPVb44rvShzNrrmpCag== X-Received: by 2002:aa7:da01:0:b0:46b:9f6e:4005 with SMTP id r1-20020aa7da01000000b0046b9f6e4005mr12419198eds.203.1669981960977; Fri, 02 Dec 2022 03:52:40 -0800 (PST) Received: from cizrna.home (cst-prg-44-69.cust.vodafone.cz. [46.135.44.69]) by smtp.gmail.com with ESMTPSA id ha7-20020a170906a88700b007c0bb571da5sm1206762ejb.41.2022.12.02.03.52.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 03:52:40 -0800 (PST) Sender: Tomeu Vizoso From: Tomeu Vizoso Cc: italonicola@collabora.com, Tomeu Vizoso , Neil Armstrong , Rob Herring , Krzysztof Kozlowski , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Amlogic Meson SoC support), linux-amlogic@lists.infradead.org (open list:ARM/Amlogic Meson SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 4/8] arm64: dts: Add DT node for the VIPNano-QI on the A311D Date: Fri, 2 Dec 2022 12:52:16 +0100 Message-Id: <20221202115223.39051-5-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221202115223.39051-1-tomeu.vizoso@collabora.com> References: <20221202115223.39051-1-tomeu.vizoso@collabora.com> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This "NPU" is very similar to the Vivante GPUs and Etnaviv works well with it with just a few small changes. v2: Add reference to RESET_NNA (Neil) v3: Fix indentation (Neil) Signed-off-by: Tomeu Vizoso Reviewed-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 11 +++++++++++ .../boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index 45947c1031c4..61c8461df614 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -11,6 +11,7 @@ #include #include #include +#include / { interrupt-parent = <&gic>; @@ -2484,4 +2485,14 @@ xtal: xtal-clk { #clock-cells = <0>; }; + npu: npu@ff100000 { + compatible = "vivante,gc"; + reg = <0x0 0xff100000 0x0 0x20000>; + interrupts = <0 147 4>; + clocks = <&clkc CLKID_NNA_CORE_CLK>, + <&clkc CLKID_NNA_AXI_CLK>; + clock-names = "core", "bus"; + resets = <&reset RESET_NNA>; + power-domains = <&pwrc PWRC_G12A_NNA_ID>; + }; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts index 124a80901084..73f3d87dcefd 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts @@ -15,6 +15,10 @@ / { compatible = "khadas,vim3", "amlogic,a311d", "amlogic,g12b"; }; +&npu { + status = "okay"; +}; + /* * The VIM3 on-board MCU can mux the PCIe/USB3.0 shared differential * lines using a FUSB340TMX USB 3.1 SuperSpeed Data Switch between From patchwork Fri Dec 2 11:52:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 630958 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15872C4321E for ; Fri, 2 Dec 2022 11:53:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233409AbiLBLxA (ORCPT ); Fri, 2 Dec 2022 06:53:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233383AbiLBLwu (ORCPT ); Fri, 2 Dec 2022 06:52:50 -0500 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BB0E5FB84; Fri, 2 Dec 2022 03:52:46 -0800 (PST) Received: by mail-ej1-x633.google.com with SMTP id n21so10976393ejb.9; Fri, 02 Dec 2022 03:52:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=57nQPIWboUhS0hM6UAXc+mV0l81PKd9lsPdM8FKXFZQ=; b=dVxzLkdhqEgqAKSv+70d22Uvs8M8T9J4rDG/8s4Oza0wQ0nriev5N8Qr5s1LjcPQTl EWIVfMQ76Lr0iDoC8moEya14poTgrFjQjojMmoa/vkCLJ+o64o/H1yxYxWJ1fR1oy/Nc 1lKARHnRHQEoi9E91Vj7G+nYaoQpCs51nSo7jB2JP/+BXi1u0EJRJ18/9UYKemR2WpT3 7ty8QKrRSwU6e+Cec5v0dwtfxuyAgOVNG9VV3m6F8nEV6kZwTDUlz2nF4P1J6sAoTJMp V9w3NX7V+lgSRlVgBaoE/z0QxvKVdYuv2dcc8oQWAh3OxenMr3iQMAC1XGvm+p4XBUtF uopQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=57nQPIWboUhS0hM6UAXc+mV0l81PKd9lsPdM8FKXFZQ=; b=7eU9rN7TE2miExefFiA6oDOndPNq+Jq4Yj3S+6fnK+XhbBiJRIk1fkJ/TCAhfprOeb nJXYr4TrOya3RvyrqP4tCtLVRGqRhVWZ3k0zIcRgyhetX05sXe301kWzMUDEzk8lg6up yXyeNuV5k7hhTX13ofqznO+7VPIvTY0AltUpd/kSA1GcZBFcHuj7WA69i7wHAfqQ2bCP 5NiCTPZTG1TtIR1n/5tdcSOPRN5+hgPQnCBFPoyzGIjB6EJn3eptqRVGe6OJJr3ts16Y Sps6lEsJT9st/rF1/fOEyYD0BUrVlLgaNkD/7HW5CP2USRaTp9qzrvM0IKSNMpdF3QLd GoeA== X-Gm-Message-State: ANoB5plliQgh8KH/77Vup8+ZEzyfFnRjXqBNIBuC7ajCBsi0sTdAIIXw LLvTsoRvfD+t0aZhC2pqxDs= X-Google-Smtp-Source: AA0mqf5dmSPQFvDVM2KnCeukh0RGM++NkoeSCFP2ggwb6ZRYdBekyNSRZ5XIe69a0MWQn+J1fofwOg== X-Received: by 2002:a17:906:a0d9:b0:78d:b912:6a6c with SMTP id bh25-20020a170906a0d900b0078db9126a6cmr60973122ejb.124.1669981966379; Fri, 02 Dec 2022 03:52:46 -0800 (PST) Received: from cizrna.home (cst-prg-44-69.cust.vodafone.cz. [46.135.44.69]) by smtp.gmail.com with ESMTPSA id ha7-20020a170906a88700b007c0bb571da5sm1206762ejb.41.2022.12.02.03.52.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 03:52:45 -0800 (PST) Sender: Tomeu Vizoso From: Tomeu Vizoso Cc: italonicola@collabora.com, Tomeu Vizoso , Rob Herring , Krzysztof Kozlowski , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Amlogic Meson SoC support), linux-amlogic@lists.infradead.org (open list:ARM/Amlogic Meson SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 8/8] arm64: dts: Fix NPU power domain references in Amlogic G12-based SoCs Date: Fri, 2 Dec 2022 12:52:20 +0100 Message-Id: <20221202115223.39051-9-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221202115223.39051-1-tomeu.vizoso@collabora.com> References: <20221202115223.39051-1-tomeu.vizoso@collabora.com> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The power sequence is different between SoCs in that family, so get the right bits for each one. Signed-off-by: Tomeu Vizoso --- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 -- arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 4 ++++ arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index 61c8461df614..d7eb01509685 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -11,7 +11,6 @@ #include #include #include -#include / { interrupt-parent = <&gic>; @@ -2493,6 +2492,5 @@ npu: npu@ff100000 { <&clkc CLKID_NNA_AXI_CLK>; clock-names = "core", "bus"; resets = <&reset RESET_NNA>; - power-domains = <&pwrc PWRC_G12A_NNA_ID>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi index ee8fcae9f9f0..886380b5a96f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi @@ -139,3 +139,7 @@ map1 { &mali { dma-coherent; }; + +&npu { + power-domains = <&pwrc PWRC_G12A_NNA_ID>; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi index 80737731af3f..318a16aa4433 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi @@ -543,3 +543,7 @@ &vpu { &usb { power-domains = <&pwrc PWRC_SM1_USB_ID>; }; + +&npu { + power-domains = <&pwrc PWRC_SM1_NNA_ID>; +};