From nobody Fri Sep 19 03:48:47 2025 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 A67BBC4332F for ; Tue, 29 Nov 2022 08:51:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231378AbiK2Ivl (ORCPT ); Tue, 29 Nov 2022 03:51:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229534AbiK2IvO (ORCPT ); Tue, 29 Nov 2022 03:51:14 -0500 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E53756EC9; Tue, 29 Nov 2022 00:51:14 -0800 (PST) Received: by mail-ed1-x533.google.com with SMTP id m19so17578168edj.8; Tue, 29 Nov 2022 00:51:13 -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=9cg4h08ScbCmARXEsFqgc8N6O4NbradYeqRREoszyl4=; b=OZ0nm34nOouWCtBLY5YQkfcXs5+gKWizxqRw4mpYirXfqgwxJKt8opypNNrkdrw8kE huRl4/2p57YfjPf+jIM9y6hfA9SAHXcBmUuf74fm30MwJ57+R+Prx9Gm3+xRPSLP7fdt DWJPCSW6DmbRLCiUrZ12qXYoyeILY/IkZm1rxzRKX2+KaoMxYseos1KGxMfU2odKqmy6 Kn2GhZs3dvjc6THp2I27gHqgVxI7Hq/P0RRxBJNpKYSvuord2DiCNUVYwUJ1pGKmmwYN tVTlTeAhVLDlbHgt9Y86FIiGccMsQ6RcLYfeMoyQL9H1qttiH7srDmsU9pcJgJH+KjGR UJHg== 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=9cg4h08ScbCmARXEsFqgc8N6O4NbradYeqRREoszyl4=; b=tPad5vlDotZ8K9AocXLUv9AVHjgj+4fjoeUs3BqHATDxGCwL4fV97ugbz6a4ABGB9v /NgLjRxLw8TP1W/ZC7SDnSKs1ebRRAXR3Ba3l/7ptSwRUHW4Mvz8Ad5X0X1xZlWhiBBI 0OC5IVuo9GMufzBU46jTew1m4uYFVg2h531OGG4ioIiVn/OD77jEqM6jbZ+dkXz4QQnN egHWEzmNnAA4iAwm8i/8PY/OKo3Sj0gS+/jR9lZLDM61NmXK4C4wJxKxP6dGIgzQimYd O+EKkxoqdsZC1WAv3J5jqTuELFkUYWEl+hM3GpMA+e9/Lxtb/P/flaevxuzB7qGKcZ1q U7Ww== X-Gm-Message-State: ANoB5pmN45dclWfXZeqswShL6Sh054jR4T10VpgqQ1iXP0oHs/y7+XFe Bf0XB5cs+I/5p/JIgTh/mxs= X-Google-Smtp-Source: AA0mqf6zBSi++3r4XX3e4bljQj59DYt7fFuQPepG/7qRf1barG5tfUFiR49fDNl2+4m2ca5nK8AiIw== X-Received: by 2002:a50:fc10:0:b0:464:2afe:ae18 with SMTP id i16-20020a50fc10000000b004642afeae18mr52242994edr.183.1669711872698; Tue, 29 Nov 2022 00:51:12 -0800 (PST) Received: from cizrna.home (cst-prg-44-69.cust.vodafone.cz. [46.135.44.69]) by smtp.gmail.com with ESMTPSA id kz1-20020a17090777c100b0078de26f66b9sm5873219ejc.114.2022.11.29.00.51.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Nov 2022 00:51:12 -0800 (PST) Sender: Tomeu Vizoso From: Tomeu Vizoso Cc: italonicola@collabora.com, Tomeu Vizoso , Neil Armstrong , Philipp Zabel , 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 v3 1/5] dt-bindings: reset: meson-g12a: Add missing NNA reset Date: Tue, 29 Nov 2022 09:50:41 +0100 Message-Id: <20221129085047.49813-2-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221129085047.49813-1-tomeu.vizoso@collabora.com> References: <20221129085047.49813-1-tomeu.vizoso@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 --- 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 */ --=20 2.38.1 From nobody Fri Sep 19 03:48:47 2025 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 77A40C4167B for ; Tue, 29 Nov 2022 08:51:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231409AbiK2Ivq (ORCPT ); Tue, 29 Nov 2022 03:51:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231438AbiK2IvR (ORCPT ); Tue, 29 Nov 2022 03:51:17 -0500 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC6E04C24F; Tue, 29 Nov 2022 00:51:16 -0800 (PST) Received: by mail-ej1-x632.google.com with SMTP id ha10so32095039ejb.3; Tue, 29 Nov 2022 00:51:16 -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=IIHeFovEuwjGuythdoubrFT/SXANkAJoc/lUtd9ZW10=; b=m5uCgXks2HvW5R/x6dE35mrXeuAHQ3cr7K5plc0T2J/N4Mquzkf5TDcI83kXewzzRm DMStLtEeRJtLpRPDN9ycQ/djzbNYE4IeGwTeYzoRPXoHxCAshDduI2e//fvw3xlzBRBe aiVSPeHLte/Z/tYGosRqjQFmY9XGgRJY3Cdoe3gtqQBte9EcKJNPuXvFGobaesY1CItP wHpwPERqM6TNBYIYtX7Qwp/X10/4NPSkzOyXA/MJefaQouAHeM/nGcrLtgNZysRZREsr 0HzAML7IUOKEJb7DM77mqFa6Kadv2Am2zVV9ZKaP9JbdwjiCGjeqv64ZHE3bJxTO34Ye jInA== 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=IIHeFovEuwjGuythdoubrFT/SXANkAJoc/lUtd9ZW10=; b=DV9BTpxFUsIlNN4BnWVS8EkkKCJFEXhClWiam8oTJeNOTmw0j/dzZR0UdAWbfC6FZZ Ip4vgWp0QjAPcHRIy/xK5BDsk25oVi/T9oycznpia24mOK0cTF/1+NZL30r1T5dJymZ6 VNYFGwPyxEyVJ9oJpL2av0Pem5Gqd9i2sILXhyb6iS+YpxguGc+Yyisu2V2szmwVRB0Q tVbfPDbUCTS+Y+ouK5f+13SJJDxxhTF78rrK/K/VlRxDEG8jOAFEF3TvG9qhyy6U7qkf Zqo6mh82Lda30hjr74vV49R7ETlaFVDNxNHJ78k5i4/pLNP54WQP6Y+5dxocbXUNpzOw myug== X-Gm-Message-State: ANoB5pkmka8NACGAXDGGjes9MWPgkYJ5aQHHl3tPaJmNQsiD4mpqmWv6 djNwmYP8RjA8W2i0xXBo7Hg= X-Google-Smtp-Source: AA0mqf4J/t4QZ6BLzbajN+wa5uDqJj33v1lQ2C5Hl8cQB2CTaAZVIab41wT63RWTwZ6RPm1AQvFETQ== X-Received: by 2002:a17:906:a58:b0:7ad:b45c:dbca with SMTP id x24-20020a1709060a5800b007adb45cdbcamr36204325ejf.388.1669711875344; Tue, 29 Nov 2022 00:51:15 -0800 (PST) Received: from cizrna.home (cst-prg-44-69.cust.vodafone.cz. [46.135.44.69]) by smtp.gmail.com with ESMTPSA id kz1-20020a17090777c100b0078de26f66b9sm5873219ejc.114.2022.11.29.00.51.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Nov 2022 00:51:14 -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 v3 2/5] dt-bindings: power: Add G12A NNA power domain Date: Tue, 29 Nov 2022 09:50:42 +0100 Message-Id: <20221129085047.49813-3-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221129085047.49813-1-tomeu.vizoso@collabora.com> References: <20221129085047.49813-1-tomeu.vizoso@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add define for the NNA power domain for the NPU in the G12A. Signed-off-by: Tomeu Vizoso Acked-by: Neil Armstrong --- 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-bind= ings/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 @@ =20 #define PWRC_G12A_VPU_ID 0 #define PWRC_G12A_ETH_ID 1 +#define PWRC_G12A_NNA_ID 2 =20 #endif --=20 2.38.1 From nobody Fri Sep 19 03:48:47 2025 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 88CADC46467 for ; Tue, 29 Nov 2022 08:52:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231515AbiK2Ivy (ORCPT ); Tue, 29 Nov 2022 03:51:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229640AbiK2IvT (ORCPT ); Tue, 29 Nov 2022 03:51:19 -0500 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59F6656D66 for ; Tue, 29 Nov 2022 00:51:18 -0800 (PST) Received: by mail-ej1-x632.google.com with SMTP id vv4so32074280ejc.2 for ; Tue, 29 Nov 2022 00:51:18 -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=Cw/am3froU3IMTWG9BB3ZSyfplgImMW6lCXqrhZP2N0=; b=MLKh8cdNSHTwMWrctPe//cKfk2YeweD6IiOtOpNFWPtWaa3dGYSXQ26Iyy0Mvi06pd yMSzWB1UEZcPHAAwX1WWMDmhwQqDEqGG1nBUTIwI9V4U+Y+g8Y6DoWVC1HuTWRBvKfKe cxIemB5+vH6Zix9m8MwyiBZwMe0ZFGD/RQgbcc6gx0C5xzmmeavCh9ZQ7vDd2MjEQtbX +Dc2KlMUGvNvZLsPSwvSucKRtJTcD5bZMC39GPz74J6AZfG/LcQZxDENPNRDQUR1FCeL SOuDLtFty5plgee61eo1Y6vuKjgz1dsYpOrju8g/sKPkEhiA+p19wuIF6LzBAsW2qY2T iuSg== 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=Cw/am3froU3IMTWG9BB3ZSyfplgImMW6lCXqrhZP2N0=; b=YkRsZ4F8AJ7AVknS18rMPg8fIS+OT0FBCcGBh+MfITPgyjDR+yrebTSOt+rrXuJvSa YpMmB3JdgDjlwiChzQEzGiH6gSIxiYrVCIO53E/cHgQCIzJ4kiWachJa+4m89gx1eOSp TYEFRzxCUyNCaLfH77llHGnFwv6dp9NAMcvwP78xBfWfvR2Md11VS6vWIfom5oU7B4ru VgL10Ob0a2z+WIVQGROvAw4qWBf5g7dLO1eSBHnQWQEFZweAk60HMyNo/ssEuk7UN5sD 1S4A7/cbIU6sBC7/4fBa3c4F34BFAhxiCmJUiT2dcdmql/qHv27JKsI1UkGoN7asEQkz H72Q== X-Gm-Message-State: ANoB5pnKM7qu0ndHbPQdro3fl1UFr7ggQNhjsdJ/lof86Rw4SIw/Ybtv nqMszVm0Y/bOSWoXB8jRvEM= X-Google-Smtp-Source: AA0mqf6Up2siIcQWYStjGjAfESej3aO3xQCrXX+nSu+RfXB3dccz+c6R1c389wG2ryi43AZZ0MqZDQ== X-Received: by 2002:a17:906:9c8a:b0:7bf:6698:d444 with SMTP id fj10-20020a1709069c8a00b007bf6698d444mr8732658ejc.548.1669711876881; Tue, 29 Nov 2022 00:51:16 -0800 (PST) Received: from cizrna.home (cst-prg-44-69.cust.vodafone.cz. [46.135.44.69]) by smtp.gmail.com with ESMTPSA id kz1-20020a17090777c100b0078de26f66b9sm5873219ejc.114.2022.11.29.00.51.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Nov 2022 00:51:16 -0800 (PST) Sender: Tomeu Vizoso From: Tomeu Vizoso Cc: italonicola@collabora.com, Tomeu Vizoso , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , 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 v3 3/5] soc: amlogic: meson-pwrc: Add NNA power domain for A311D Date: Tue, 29 Nov 2022 09:50:43 +0100 Message-Id: <20221129085047.49813-4-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221129085047.49813-1-tomeu.vizoso@collabora.com> References: <20221129085047.49813-1-tomeu.vizoso@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Based on power initialization sequence in downstream driver. Signed-off-by: Tomeu Vizoso Reviewed-by: Neil Armstrong --- drivers/soc/amlogic/meson-ee-pwrc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/soc/amlogic/meson-ee-pwrc.c b/drivers/soc/amlogic/meso= n-ee-pwrc.c index dd5f2a13ceb5..dfbf0b1c7d29 100644 --- a/drivers/soc/amlogic/meson-ee-pwrc.c +++ b/drivers/soc/amlogic/meson-ee-pwrc.c @@ -46,6 +46,9 @@ #define HHI_NANOQ_MEM_PD_REG1 (0x47 << 2) #define HHI_VPU_MEM_PD_REG2 (0x4d << 2) =20 +#define G12A_HHI_NANOQ_MEM_PD_REG0 (0x43 << 2) +#define G12A_HHI_NANOQ_MEM_PD_REG1 (0x44 << 2) + struct meson_ee_pwrc; struct meson_ee_pwrc_domain; =20 @@ -106,6 +109,13 @@ static struct meson_ee_pwrc_top_domain sm1_pwrc_usb = =3D SM1_EE_PD(17); static struct meson_ee_pwrc_top_domain sm1_pwrc_pci =3D SM1_EE_PD(18); static struct meson_ee_pwrc_top_domain sm1_pwrc_ge2d =3D SM1_EE_PD(19); =20 +static struct meson_ee_pwrc_top_domain g12a_pwrc_nna =3D { \ + .sleep_reg =3D GX_AO_RTI_GEN_PWR_SLEEP0, \ + .sleep_mask =3D BIT(16) | BIT(17), \ + .iso_reg =3D GX_AO_RTI_GEN_PWR_ISO0, \ + .iso_mask =3D BIT(16) | BIT(17), \ + }; + /* Memory PD Domains */ =20 #define VPU_MEMPD(__reg) \ @@ -217,6 +227,11 @@ static struct meson_ee_pwrc_mem_domain sm1_pwrc_mem_au= dio[] =3D { { HHI_AUDIO_MEM_PD_REG0, GENMASK(27, 26) }, }; =20 +static struct meson_ee_pwrc_mem_domain g12a_pwrc_mem_nna[] =3D { + { G12A_HHI_NANOQ_MEM_PD_REG0, GENMASK(31, 0) }, + { G12A_HHI_NANOQ_MEM_PD_REG1, GENMASK(23, 0) }, +}; + #define VPU_PD(__name, __top_pd, __mem, __is_pwr_off, __resets, __clks) \ { \ .name =3D __name, \ @@ -253,6 +268,8 @@ static struct meson_ee_pwrc_domain_desc g12a_pwrc_domai= ns[] =3D { [PWRC_G12A_VPU_ID] =3D VPU_PD("VPU", &gx_pwrc_vpu, g12a_pwrc_mem_vpu, pwrc_ee_is_powered_off, 11, 2), [PWRC_G12A_ETH_ID] =3D MEM_PD("ETH", meson_pwrc_mem_eth), + [PWRC_G12A_NNA_ID] =3D TOP_PD("NNA", &g12a_pwrc_nna, g12a_pwrc_mem_nna, + pwrc_ee_is_powered_off), }; =20 static struct meson_ee_pwrc_domain_desc gxbb_pwrc_domains[] =3D { --=20 2.38.1 From nobody Fri Sep 19 03:48:47 2025 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 79A6EC47089 for ; Tue, 29 Nov 2022 08:52:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231484AbiK2Ivw (ORCPT ); Tue, 29 Nov 2022 03:51:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229994AbiK2IvU (ORCPT ); Tue, 29 Nov 2022 03:51:20 -0500 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B291D5803A; Tue, 29 Nov 2022 00:51:19 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id vv4so32074404ejc.2; Tue, 29 Nov 2022 00:51:19 -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=nhKapcQ66LsxA85JQdzV2oZbWTII+lECh4PRQcH4mDiqEm4ojDHv7H95e1Yu9UhPbu qgXFEJe5IBj9/8AlpNKHmA92xYsyC4SZqZLvK6OLaPMuyeq4lmmUx9S6AraqRskOLIc0 sqDRTVS1XH6eQTpbbz2NXSWwHn2MgMncpfuDlJlmwa1XYivMD6NL9zGnWYa6ijPckc7c c2mkdLJpg7sVYVQgFSS+T86beZvtahhhakiO/RCC/l6JEGECGPLz+RSYnW7Oegj286j8 zPENNFHaBXDfvD0DIMp2vnBNikzzZAbi0CqXctM2F2ra4pGsxVa61JCC589gAilD2WC6 ju6w== 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=0tpv00KUklS1K9yx+aknKP/xctIExTEXDjTN18oJMVEse+BdVxdeGJfzMYU2is0dAt lQkwV91TiNJfvXGteY38HbYHfk2VkOIddYR6zxvLCiMz5BymLjoHiyySUEk3Ng38FGEa /F7nK1uEJlpS3fg8E0wViROtWanw24QZvLYyVtjpf4o009HwGVpjBIVMvtgy0CvTGQ57 DWut6mkJhsXNKol5+WxXEw89ifG7NkSk9fy/jiwuXQiVWQNoplnazipbY3sBRfHvyluG iUtAdLUtdkcY04X6LUhLejIrKznpLidhmqxLSCuz8xPgs2v2R58k4q7VSAFBVw2MrqnV 1hhQ== X-Gm-Message-State: ANoB5pn+r/20A2Eh9P8I6JhsW6832jAIqIhkw8htK6uAPzxSz5Nxs1Bd jNP7qlQ9Oj9GoEC3dMO7aK432J9JxJHm/w== X-Google-Smtp-Source: AA0mqf6g0V291RCuJE/6a7lckAJbDgRfo/msdIC8flyucHI+AJKI3XL0ggAyX2RdNHUyh2wH0hgteQ== X-Received: by 2002:a17:906:ca18:b0:781:c97c:84d1 with SMTP id jt24-20020a170906ca1800b00781c97c84d1mr46678807ejb.147.1669711878319; Tue, 29 Nov 2022 00:51:18 -0800 (PST) Received: from cizrna.home (cst-prg-44-69.cust.vodafone.cz. [46.135.44.69]) by smtp.gmail.com with ESMTPSA id kz1-20020a17090777c100b0078de26f66b9sm5873219ejc.114.2022.11.29.00.51.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Nov 2022 00:51:17 -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 v3 4/5] arm64: dts: Add DT node for the VIPNano-QI on the A311D Date: Tue, 29 Nov 2022 09:50:44 +0100 Message-Id: <20221129085047.49813-5-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221129085047.49813-1-tomeu.vizoso@collabora.com> References: <20221129085047.49813-1-tomeu.vizoso@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 =20 / { interrupt-parent =3D <&gic>; @@ -2484,4 +2485,14 @@ xtal: xtal-clk { #clock-cells =3D <0>; }; =20 + npu: npu@ff100000 { + compatible =3D "vivante,gc"; + reg =3D <0x0 0xff100000 0x0 0x20000>; + interrupts =3D <0 147 4>; + clocks =3D <&clkc CLKID_NNA_CORE_CLK>, + <&clkc CLKID_NNA_AXI_CLK>; + clock-names =3D "core", "bus"; + resets =3D <&reset RESET_NNA>; + power-domains =3D <&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 =3D "khadas,vim3", "amlogic,a311d", "amlogic,g12b"; }; =20 +&npu { + status =3D "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 --=20 2.38.1 From nobody Fri Sep 19 03:48:47 2025 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 98155C4708B for ; Tue, 29 Nov 2022 08:52:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231544AbiK2Iv4 (ORCPT ); Tue, 29 Nov 2022 03:51:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229641AbiK2IvX (ORCPT ); Tue, 29 Nov 2022 03:51:23 -0500 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08E7358BF9 for ; Tue, 29 Nov 2022 00:51:21 -0800 (PST) Received: by mail-ed1-x532.google.com with SMTP id d20so8051412edn.0 for ; Tue, 29 Nov 2022 00:51:20 -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=j/wAlj9+lbLEBeIqsdF+yfeUS1s2V84+JTVk1VCdcTE=; b=F3BLC6fjBiitgUFKsGVyTVAd7kZmy7Whapxwc6oWLXJG2YEVH6tfowU3+qwLpDxLxm BYBoPEs29A5J+sEPdBpDeQ4VzYuYwTfzcbdm4sWHgYt21XjcGvlJH51EG3kBZ8PNS3Fc 0ocfDufO/9u32Foc/LoNNEcj/5tnGjxfz9B++VlKxKZJ9vUJYsvT8knVy19XCqTApAxA QFIyydAvQFMFKz3vun5Ro66pHwIByRIGuUg01/mGLIioPZmit58rco0JTDyKHWF1oOtQ 2kMvEBzVn/6A7jFpoIK9DsYVkrqAZ/pZ8PtsxPhAhF9H0LkXnOKDvV+g3tos+OzoQBZw 7+sA== 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=j/wAlj9+lbLEBeIqsdF+yfeUS1s2V84+JTVk1VCdcTE=; b=pqbPsFwm1jmSYLM6I4muBkKAqEXOAtuxIvPq8SfJnLWs332h9LmnceWlzg7KQjT99N fUAQZZz84wOeT2oF3x6PQkZh2OpOsXPm4t1Sm5cwv3R9Ns6NoHrs/boqhgQot5TTdQoc Fa03tcuV6edrmeMrEp+TF/tIU5gTT/ZwoQ9mWceHN8udM9TtOQQqHjVIf0oioKmFD/vC cDoY+KmDQbMxazcOTejXp5DEIfh8TuFKcciq56Uz69a21ctZfByTrJ+2Uc3TsTuX2q1g fp2J/svfiYCv0qvGAsNKT2eYgy3FE9bbbeo+kfXYiAaFBA9c2AupP5MCI+2hB9snRdoV DTDg== X-Gm-Message-State: ANoB5pkUBXM7V5mhgL2zrFgTwYQAgfBksqkQOxcRzpK3f4eWWH83g+cq aaFL2cSPdr5Qe2dfBgZbsF8= X-Google-Smtp-Source: AA0mqf7jKhZ7QKnwHguva3IWUuFk9/+/O92m4VQX+VxAVGvVd4Kt2AlyTWN0negQts5Celyb9XWVcg== X-Received: by 2002:a05:6402:2b8b:b0:468:cae8:f5a6 with SMTP id fj11-20020a0564022b8b00b00468cae8f5a6mr52228379edb.263.1669711879597; Tue, 29 Nov 2022 00:51:19 -0800 (PST) Received: from cizrna.home (cst-prg-44-69.cust.vodafone.cz. [46.135.44.69]) by smtp.gmail.com with ESMTPSA id kz1-20020a17090777c100b0078de26f66b9sm5873219ejc.114.2022.11.29.00.51.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Nov 2022 00:51:19 -0800 (PST) Sender: Tomeu Vizoso From: Tomeu Vizoso Cc: italonicola@collabora.com, Tomeu Vizoso , Lucas Stach , Russell King , Christian Gmeiner , David Airlie , Daniel Vetter , etnaviv@lists.freedesktop.org (moderated list:DRM DRIVERS FOR VIVANTE GPU IP), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR VIVANTE GPU IP), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 5/5] drm/etnaviv: add HWDB entry for VIPNano-QI.7120.0055 Date: Tue, 29 Nov 2022 09:50:45 +0100 Message-Id: <20221129085047.49813-6-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221129085047.49813-1-tomeu.vizoso@collabora.com> References: <20221129085047.49813-1-tomeu.vizoso@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This is a compute-only module marketed towards AI and vision acceleration. This particular version can be found on the Amlogic A311D SoC. The feature bits are taken from the Khadas downstream kernel driver 6.4.4.3.310723AAA. Signed-off-by: Tomeu Vizoso --- drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 31 ++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c b/drivers/gpu/drm/etnav= iv/etnaviv_hwdb.c index f2fc645c7956..3f6fd9a3c088 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_hwdb.c @@ -130,6 +130,37 @@ static const struct etnaviv_chip_identity etnaviv_chip= _identities[] =3D { .minor_features10 =3D 0x90044250, .minor_features11 =3D 0x00000024, }, + { + .model =3D 0x8000, + .revision =3D 0x7120, + .product_id =3D 0x45080009, + .customer_id =3D 0x88, + .eco_id =3D 0, + .stream_count =3D 8, + .register_max =3D 64, + .thread_count =3D 256, + .shader_core_count =3D 1, + .vertex_cache_size =3D 16, + .vertex_output_buffer_size =3D 1024, + .pixel_pipes =3D 1, + .instruction_count =3D 512, + .num_constants =3D 320, + .buffer_size =3D 0, + .varyings_count =3D 16, + .features =3D 0xe0287cac, + .minor_features0 =3D 0xc1799eff, + .minor_features1 =3D 0xfefbfadb, + .minor_features2 =3D 0xeb9d6fbf, + .minor_features3 =3D 0xedfffced, + .minor_features4 =3D 0xd30dafc7, + .minor_features5 =3D 0x7b5ac333, + .minor_features6 =3D 0xfc8ee200, + .minor_features7 =3D 0x03fffa6f, + .minor_features8 =3D 0x00fe0ef0, + .minor_features9 =3D 0x0088003c, + .minor_features10 =3D 0x108048c0, + .minor_features11 =3D 0x00000010, + }, }; =20 bool etnaviv_fill_identity_from_hwdb(struct etnaviv_gpu *gpu) --=20 2.38.1