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=-11.1 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable 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 C95FDC43461 for ; Wed, 16 Sep 2020 09:48:22 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2B1D022228 for ; Wed, 16 Sep 2020 09:48:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sVgSf2hw"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Yd0XMxNg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B1D022228 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=iDGV7nHpMOVgN35ngswSe2CdW0mi6L09iLc/g+Fhzes=; b=sVgSf2hwd10/VSR2ewbtKz1Dc W2XhOXep2jUX3gb1qQ8NFkAwcfsCOZbuClhYcFaaTEozgZM8Fcpt0M9Q5maSqj0pX8UyZIfDd4UgO t4vDrULK8eRr+P1EAn9eXhTT1f6HsTfKb9LIsjotpplgnVlDi2czXGKuzcu8WNyJ1ZuYSQJYuRj5x GqvuUuO0NFF0JYF2CiW34kJaKdzv1OdKLtPHVC5i3mndvC+7sHmJ696qJHSwH53QwJZani69fS5hb nYZLQSGgmTcxQJZ1iSOqES9oRNQHDgCphGe7SmgtOi19U/HUf04lxWaqxH3a+lQaR+qM6G58u0dwC W1wvVoz8A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIU1Y-0003ju-H9; Wed, 16 Sep 2020 09:46:48 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIU1V-0003jI-CW; Wed, 16 Sep 2020 09:46:46 +0000 Received: by mail-wm1-x343.google.com with SMTP id w2so2121324wmi.1; Wed, 16 Sep 2020 02:46:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=6Fkj8wM5yKsC66SuEjUDzuKRYwhCBNReGicCTVS1Nys=; b=Yd0XMxNgdeEVFS6Lmf+We78L1hwP+qj31BJWYueFnM1J9OLvSOMmddmDRuXwTNv+J4 tn6r5fGZL80nR/RSli+w8eNFW16y7jtIxsMSFZ9ZYayO+WV5FA/W/G25jkbusCh4YJYb eqE1aE/9hmGuktu7we9Kc8ryGIsAFce2E+pqWYBTDhSQ4kNpdMj421Q5IkUwInnWOyef 8BTXh9gtSsF29GDSyMycCDZWy8niQqujry1Iu9YA0VQ/V7Orohm0/rBVKHXrngfRrlOD FvyOKfOGE47d/6WaQjApuCCQRpKBra2c54QcFD/x3YI32nBPQn9tvTLthB+EPqpVEIFn UXOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=6Fkj8wM5yKsC66SuEjUDzuKRYwhCBNReGicCTVS1Nys=; b=bZbCjx/ljgYGIDkX4RCKQQjFmyiSCp9+v+/3ysnLRcZWbbdatxNKZikhF0RnAxtyTO FdJJ/h/TqepozTNuGX2yc7qrwKJDyfwT9JGsVAhoqgp/6yV/oTN07E5WN6eQpoXMDKPk 9DW1ZlILFAch3JmYymjs5eA0IHRx9FMNUQroCpNmp/s1qYAe+j/p6wVqMBBb5ngu9kUI wXj9JcVj0PF0N9yWlau+2sJxYizy8UVmc3RX1YUwbLCa0bddWk3hjdmu+fA1T24Xo0kb bX1CLZsqUWlKAjJ0leycuOjqLImWoHeXAyo1P0eV0EMPI34st+bqT369Le/ndSL7sL34 Z3yA== X-Gm-Message-State: AOAM532cXMyf0saAZeaW1Luo+E6biVfPFeF4NBpEUMQFAm/zsoPHT+57 6gcqjZvJg8h0mZqYPUsMNASfOymNm7d/Gg== X-Google-Smtp-Source: ABdhPJxPzUKf1K5YwPYcd6/6eV/PrHqUKjHJmhaTTGrryBOLqbu52jYYoK1GQAIKfXsa+u5reoNWNA== X-Received: by 2002:a1c:a953:: with SMTP id s80mr3741146wme.70.1600249602514; Wed, 16 Sep 2020 02:46:42 -0700 (PDT) Received: from ziggy.stardust ([213.195.113.201]) by smtp.gmail.com with ESMTPSA id s17sm33391388wrr.40.2020.09.16.02.46.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 16 Sep 2020 02:46:41 -0700 (PDT) Subject: Re: [PATCH 11/12] soc: mediatek: pm-domains: Add support for mt8183 To: Enric Balletbo i Serra , linux-kernel@vger.kernel.org References: <20200910172826.3074357-1-enric.balletbo@collabora.com> <20200910172826.3074357-12-enric.balletbo@collabora.com> From: Matthias Brugger Message-ID: <730273b4-914a-8a7a-1583-351e6f20df5b@gmail.com> Date: Wed, 16 Sep 2020 11:46:40 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20200910172826.3074357-12-enric.balletbo@collabora.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200916_054645_434061_0D93C55E X-CRM114-Status: GOOD ( 20.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: drinkcat@chromium.org, weiyi.lu@mediatek.com, fparent@baylibre.com, Matthias Brugger , linux-mediatek@lists.infradead.org, hsinyi@chromium.org, Collabora Kernel ML , linux-arm-kernel@lists.infradead.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 10/09/2020 19:28, Enric Balletbo i Serra wrote: > From: Matthias Brugger > > Add the needed board data to support mt8183 SoC. > > Signed-off-by: Matthias Brugger > Signed-off-by: Enric Balletbo i Serra > --- > > drivers/soc/mediatek/mtk-pm-domains.c | 162 ++++++++++++++++++++++++++ > include/linux/soc/mediatek/infracfg.h | 28 +++++ > 2 files changed, 190 insertions(+) > > diff --git a/drivers/soc/mediatek/mtk-pm-domains.c b/drivers/soc/mediatek/mtk-pm-domains.c > index 29e88adc8ea6..aa434f616fee 100644 > --- a/drivers/soc/mediatek/mtk-pm-domains.c > +++ b/drivers/soc/mediatek/mtk-pm-domains.c [...] > > +/* > + * MT8183 power domain support > + */ > +static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { > + [MT8183_POWER_DOMAIN_AUDIO] = { > + .sta_mask = PWR_STATUS_AUDIO, > + .ctl_offs = 0x0314, > + .sram_pdn_bits = GENMASK(11, 8), > + .sram_pdn_ack_bits = GENMASK(15, 12), > + }, > + [MT8183_POWER_DOMAIN_CONN] = { > + .sta_mask = PWR_STATUS_CONN, > + .ctl_offs = 0x032c, > + .sram_pdn_bits = 0, > + .sram_pdn_ack_bits = 0, > + .bp_infracfg = { > + BUS_PROT_WR(MT8183_TOP_AXI_PROT_EN_CONN, 0x2a0, 0x2a4, 0x228), We have repeating values triplets for set, clear and status register in infracfg and SMI. Weiyi can you help to get names to this registers? I wasn't able to find anything in the datasheet. Thanks! Matthias > + }, > + }, > + [MT8183_POWER_DOMAIN_MFG_ASYNC] = { > + .sta_mask = PWR_STATUS_MFG_ASYNC, > + .ctl_offs = 0x0334, > + .sram_pdn_bits = 0, > + .sram_pdn_ack_bits = 0, > + }, > + [MT8183_POWER_DOMAIN_MFG] = { > + .sta_mask = PWR_STATUS_MFG, > + .ctl_offs = 0x0338, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + }, > + [MT8183_POWER_DOMAIN_MFG_CORE0] = { > + .sta_mask = BIT(7), > + .ctl_offs = 0x034c, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + }, > + [MT8183_POWER_DOMAIN_MFG_CORE1] = { > + .sta_mask = BIT(20), > + .ctl_offs = 0x0310, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + }, > + [MT8183_POWER_DOMAIN_MFG_2D] = { > + .sta_mask = PWR_STATUS_MFG_2D, > + .ctl_offs = 0x0348, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + .bp_infracfg = { > + BUS_PROT_WR(MT8183_TOP_AXI_PROT_EN_1_MFG, 0x2a8, 0x2ac, 0x258), > + BUS_PROT_WR(MT8183_TOP_AXI_PROT_EN_MFG, 0x2a0, 0x2a4, 0x228), > + }, > + }, > + [MT8183_POWER_DOMAIN_DISP] = { > + .sta_mask = PWR_STATUS_DISP, > + .ctl_offs = 0x030c, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + .bp_infracfg = { > + BUS_PROT_WR(MT8183_TOP_AXI_PROT_EN_1_DISP, 0x2a8, 0x2ac, 0x258), > + BUS_PROT_WR(MT8183_TOP_AXI_PROT_EN_DISP, 0x2a0, 0x2a4, 0x228), > + }, > + .bp_smi = { > + BUS_PROT_WR(MT8183_SMI_COMMON_SMI_CLAMP_DISP, 0x3c4, 0x3c8, 0x3c0), > + }, > + }, > + [MT8183_POWER_DOMAIN_CAM] = { > + .sta_mask = BIT(25), > + .ctl_offs = 0x0344, > + .sram_pdn_bits = GENMASK(9, 8), > + .sram_pdn_ack_bits = GENMASK(13, 12), > + .bp_infracfg = { > + BUS_PROT_WR(MT8183_TOP_AXI_PROT_EN_MM_CAM, 0x2d4, 0x2d8, 0x2ec), > + BUS_PROT_WR(MT8183_TOP_AXI_PROT_EN_CAM, 0x2a0, 0x2a4, 0x228), > + BUS_PROT_WR_IGN(MT8183_TOP_AXI_PROT_EN_MM_CAM_2ND, 0x2d4, 0x2d8, 0x2ec), > + }, > + .bp_smi = { > + BUS_PROT_WR(MT8183_SMI_COMMON_SMI_CLAMP_CAM, 0x3c4, 0x3c8, 0x3c0), > + }, > + }, > + [MT8183_POWER_DOMAIN_ISP] = { > + .sta_mask = PWR_STATUS_ISP, > + .ctl_offs = 0x0308, > + .sram_pdn_bits = GENMASK(9, 8), > + .sram_pdn_ack_bits = GENMASK(13, 12), > + .bp_infracfg = { > + BUS_PROT_WR(MT8183_TOP_AXI_PROT_EN_MM_ISP, 0x2d4, 0x2d8, 0x2ec), > + BUS_PROT_WR_IGN(MT8183_TOP_AXI_PROT_EN_MM_ISP_2ND, 0x2d4, 0x2d8, 0x2ec), > + }, > + .bp_smi = { > + BUS_PROT_WR(MT8183_SMI_COMMON_SMI_CLAMP_ISP, 0x3c4, 0x3c8, 0x3c0), > + }, > + }, > + [MT8183_POWER_DOMAIN_VDEC] = { > + .sta_mask = BIT(31), > + .ctl_offs = 0x0300, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + .bp_smi = { > + BUS_PROT_WR(MT8183_SMI_COMMON_SMI_CLAMP_VDEC, 0x3c4, 0x3c8, 0x3c0), > + }, > + }, > + [MT8183_POWER_DOMAIN_VENC] = { > + .sta_mask = PWR_STATUS_VENC, > + .ctl_offs = 0x0304, > + .sram_pdn_bits = GENMASK(11, 8), > + .sram_pdn_ack_bits = GENMASK(15, 12), > + .bp_smi = { > + BUS_PROT_WR(MT8183_SMI_COMMON_SMI_CLAMP_VENC, 0x3c4, 0x3c8, 0x3c0), > + }, > + }, > + [MT8183_POWER_DOMAIN_VPU_TOP] = { > + .sta_mask = BIT(26), > + .ctl_offs = 0x0324, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + .bp_infracfg = { > + BUS_PROT_WR(MT8183_TOP_AXI_PROT_EN_MM_VPU_TOP, 0x2d4, 0x2d8, 0x2ec), > + BUS_PROT_WR(MT8183_TOP_AXI_PROT_EN_VPU_TOP, 0x2a0, 0x2a4, 0x228), > + BUS_PROT_WR(MT8183_TOP_AXI_PROT_EN_MM_VPU_TOP_2ND, 0x2d4, 0x2d8, 0x2ec), > + }, > + .bp_smi = { > + BUS_PROT_WR(MT8183_SMI_COMMON_SMI_CLAMP_VPU_TOP, 0x3c4, 0x3c8, 0x3c0), > + }, > + }, > + [MT8183_POWER_DOMAIN_VPU_CORE0] = { > + .sta_mask = BIT(27), > + .ctl_offs = 0x33c, > + .sram_pdn_bits = GENMASK(11, 8), > + .sram_pdn_ack_bits = GENMASK(13, 12), > + .bp_infracfg = { > + BUS_PROT_WR(MT8183_TOP_AXI_PROT_EN_MCU_VPU_CORE0, 0x2c4, 0x2c8, 0x2e4), > + BUS_PROT_WR(MT8183_TOP_AXI_PROT_EN_MCU_VPU_CORE0_2ND, 0x2c4, 0x2c8, 0x2e4), > + }, > + .caps = MTK_SCPD_SRAM_ISO, > + }, > + [MT8183_POWER_DOMAIN_VPU_CORE1] = { > + .sta_mask = BIT(28), > + .ctl_offs = 0x0340, > + .sram_pdn_bits = GENMASK(11, 8), > + .sram_pdn_ack_bits = GENMASK(13, 12), > + .bp_infracfg = { > + BUS_PROT_WR(MT8183_TOP_AXI_PROT_EN_MCU_VPU_CORE1, 0x2c4, 0x2c8, 0x2e4), > + BUS_PROT_WR(MT8183_TOP_AXI_PROT_EN_MCU_VPU_CORE1_2ND, 0x2c4, 0x2c8, 0x2e4), > + }, > + .caps = MTK_SCPD_SRAM_ISO, > + }, > +}; > + > static const struct scpsys_soc_data mt8173_scpsys_data = { > .domains = scpsys_domain_data_mt8173, > .num_domains = ARRAY_SIZE(scpsys_domain_data_mt8173), > @@ -705,11 +856,22 @@ static const struct scpsys_soc_data mt8173_scpsys_data = { > .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, > }; > > +static const struct scpsys_soc_data mt8183_scpsys_data = { > + .domains = scpsys_domain_data_mt8183, > + .num_domains = ARRAY_SIZE(scpsys_domain_data_mt8183), > + .pwr_sta_offs = 0x0180, > + .pwr_sta2nd_offs = 0x0184 > +}; > + > static const struct of_device_id scpsys_of_match[] = { > { > .compatible = "mediatek,mt8173-power-controller", > .data = &mt8173_scpsys_data, > }, > + { > + .compatible = "mediatek,mt8183-power-controller", > + .data = &mt8183_scpsys_data, > + }, > { } > }; > > diff --git a/include/linux/soc/mediatek/infracfg.h b/include/linux/soc/mediatek/infracfg.h > index 3f18cddffb44..2913ede9d734 100644 > --- a/include/linux/soc/mediatek/infracfg.h > +++ b/include/linux/soc/mediatek/infracfg.h > @@ -2,6 +2,34 @@ > #ifndef __SOC_MEDIATEK_INFRACFG_H > #define __SOC_MEDIATEK_INFRACFG_H > > +#define MT8183_TOP_AXI_PROT_EN_DISP (BIT(10) | BIT(11)) > +#define MT8183_TOP_AXI_PROT_EN_CONN (BIT(13) | BIT(14)) > +#define MT8183_TOP_AXI_PROT_EN_MFG (BIT(21) | BIT(22)) > +#define MT8183_TOP_AXI_PROT_EN_CAM BIT(28) > +#define MT8183_TOP_AXI_PROT_EN_VPU_TOP BIT(27) > +#define MT8183_TOP_AXI_PROT_EN_1_DISP (BIT(16) | BIT(17)) > +#define MT8183_TOP_AXI_PROT_EN_1_MFG GENMASK(21, 19) > +#define MT8183_TOP_AXI_PROT_EN_MM_ISP (BIT(3) | BIT(8)) > +#define MT8183_TOP_AXI_PROT_EN_MM_ISP_2ND BIT(10) > +#define MT8183_TOP_AXI_PROT_EN_MM_CAM (BIT(4) | BIT(5) | \ > + BIT(9) | BIT(13)) > +#define MT8183_TOP_AXI_PROT_EN_MM_VPU_TOP (GENMASK(9, 6) | \ > + BIT(12)) > +#define MT8183_TOP_AXI_PROT_EN_MM_VPU_TOP_2ND (BIT(10) | BIT(11)) > +#define MT8183_TOP_AXI_PROT_EN_MM_CAM_2ND BIT(11) > +#define MT8183_TOP_AXI_PROT_EN_MCU_VPU_CORE0_2ND (BIT(0) | BIT(2) | \ > + BIT(4)) > +#define MT8183_TOP_AXI_PROT_EN_MCU_VPU_CORE1_2ND (BIT(1) | BIT(3) | \ > + BIT(5)) > +#define MT8183_TOP_AXI_PROT_EN_MCU_VPU_CORE0 BIT(6) > +#define MT8183_TOP_AXI_PROT_EN_MCU_VPU_CORE1 BIT(7) > +#define MT8183_SMI_COMMON_SMI_CLAMP_DISP GENMASK(7, 0) > +#define MT8183_SMI_COMMON_SMI_CLAMP_VENC BIT(1) > +#define MT8183_SMI_COMMON_SMI_CLAMP_ISP BIT(2) > +#define MT8183_SMI_COMMON_SMI_CLAMP_CAM (BIT(3) | BIT(4)) > +#define MT8183_SMI_COMMON_SMI_CLAMP_VPU_TOP (BIT(5) | BIT(6)) > +#define MT8183_SMI_COMMON_SMI_CLAMP_VDEC BIT(7) > + > #define MT8173_TOP_AXI_PROT_EN_MCI_M2 BIT(0) > #define MT8173_TOP_AXI_PROT_EN_MM_M0 BIT(1) > #define MT8173_TOP_AXI_PROT_EN_MM_M1 BIT(2) > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel