Received: by 2002:a05:6a10:d5a5:0:0:0:0 with SMTP id gn37csp426866pxb; Thu, 30 Sep 2021 08:58:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9y5jL3X6BIFY20dUMBvTU9raKzl4rL1rrDS9Nk4Ndse3HGFcrLtlBR6zcUTcWlT0cu+IT X-Received: by 2002:a17:906:3b8e:: with SMTP id u14mr7429519ejf.418.1633017487418; Thu, 30 Sep 2021 08:58:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633017487; cv=none; d=google.com; s=arc-20160816; b=Lie+oQlEywl+WkHlw5UKVMgnPhXfabgIDGYEwYtgpAsY+AXBfxtLsPYK2YBIHpY18z 4fR6y6au+u/ieznLHrNk+zrI57DvooSvyIbZGqx+erWWzqgKK+OUigO+SBU7Skn/S9zI UB9V8pWZ9zpbK2MzOMiHWPNxhf8YIlGZA8j83Kb3Kv/umJSexj6E7gHFCPMGrOtr1g4b dAB8RmzsuEJn+Xr6NxqK0GK6+iLNvASetHv6Wx8OhixZMcmfI/xvGKBhGZp5z0ejmghg FhbvoDCGzVE+9BFoXsuF5R8jOQlJKYhc8jg94P2LUGZlyKh+2GomKxSes96iXOc/Dzsj kbEA== 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; bh=fIBgnMsdfZqR54SUGcKznFQ3TeQFDolh/WlFZOfMCSU=; b=ka2McUhHotlYct49UYQAAtQZu4Z4soxiz8+yVuFTWIEFGWNqUEV+FPhwmhiaCUZwrv pGDc5aN7HvhGaBlNLHt+dRmB1of3dkFwRBb064ENzejsA7CXad5l/6xOdAp/2/aPylgi DqITmpZuu92ZLk//b5MNFQ0hF2mHaQHHPqTFmR2Jx32RQCOXCyyJhauGc/hKlrFK+VaZ LTGvKYPU5ts8Gzyzpo9b1E0Sosa2qF50DGcjPRjDjOqer+S8+apCoQmtYF0BeHv1BTdr gp0pwd8Y1s3cd4wQY2PAJ32ayzrcd1Y4q9o93G535ud1Iow3gkSeTpnXyYa+raDp8CPp zZOw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 17si3724260ejx.425.2021.09.30.08.57.41; Thu, 30 Sep 2021 08:58:07 -0700 (PDT) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346904AbhI3PyT (ORCPT + 99 others); Thu, 30 Sep 2021 11:54:19 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:57344 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1346724AbhI3PyN (ORCPT ); Thu, 30 Sep 2021 11:54:13 -0400 X-UUID: 33d2a2e99b0145abbce8581fdf38c5db-20210930 X-UUID: 33d2a2e99b0145abbce8581fdf38c5db-20210930 Received: from mtkcas06.mediatek.inc [(172.21.101.30)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1629619168; Thu, 30 Sep 2021 23:52:27 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 30 Sep 2021 23:52:26 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 30 Sep 2021 23:52:24 +0800 From: Yongqiang Niu To: Chun-Kuang Hu CC: Rob Herring , Matthias Brugger , Philipp Zabel , David Airlie , Daniel Vetter , Jassi Brar , Yongqiang Niu , Fabien Parent , Dennis YC Hsieh , , , , , , , Hsin-Yi Wang , CK Hu Subject: [PATCH v10, 4/5] soc: mediatek: add mtk mutex support for MT8192 Date: Thu, 30 Sep 2021 23:52:21 +0800 Message-ID: <20210930155222.5861-5-yongqiang.niu@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210930155222.5861-1-yongqiang.niu@mediatek.com> References: <20210930155222.5861-1-yongqiang.niu@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add mtk mutex support for MT8192 SoC. Signed-off-by: Yongqiang Niu Signed-off-by: Hsin-Yi Wang Reviewed-by: CK Hu --- drivers/soc/mediatek/mtk-mutex.c | 35 ++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/drivers/soc/mediatek/mtk-mutex.c b/drivers/soc/mediatek/mtk-mutex.c index 2e4bcc300576..2ca55bb5a8be 100644 --- a/drivers/soc/mediatek/mtk-mutex.c +++ b/drivers/soc/mediatek/mtk-mutex.c @@ -39,6 +39,18 @@ #define MT8167_MUTEX_MOD_DISP_DITHER 15 #define MT8167_MUTEX_MOD_DISP_UFOE 16 +#define MT8192_MUTEX_MOD_DISP_OVL0 0 +#define MT8192_MUTEX_MOD_DISP_OVL0_2L 1 +#define MT8192_MUTEX_MOD_DISP_RDMA0 2 +#define MT8192_MUTEX_MOD_DISP_COLOR0 4 +#define MT8192_MUTEX_MOD_DISP_CCORR0 5 +#define MT8192_MUTEX_MOD_DISP_AAL0 6 +#define MT8192_MUTEX_MOD_DISP_GAMMA0 7 +#define MT8192_MUTEX_MOD_DISP_POSTMASK0 8 +#define MT8192_MUTEX_MOD_DISP_DITHER0 9 +#define MT8192_MUTEX_MOD_DISP_OVL2_2L 16 +#define MT8192_MUTEX_MOD_DISP_RDMA4 17 + #define MT8183_MUTEX_MOD_DISP_RDMA0 0 #define MT8183_MUTEX_MOD_DISP_RDMA1 1 #define MT8183_MUTEX_MOD_DISP_OVL0 9 @@ -214,6 +226,20 @@ static const unsigned int mt8183_mutex_mod[DDP_COMPONENT_ID_MAX] = { [DDP_COMPONENT_WDMA0] = MT8183_MUTEX_MOD_DISP_WDMA0, }; +static const unsigned int mt8192_mutex_mod[DDP_COMPONENT_ID_MAX] = { + [DDP_COMPONENT_AAL0] = MT8192_MUTEX_MOD_DISP_AAL0, + [DDP_COMPONENT_CCORR] = MT8192_MUTEX_MOD_DISP_CCORR0, + [DDP_COMPONENT_COLOR0] = MT8192_MUTEX_MOD_DISP_COLOR0, + [DDP_COMPONENT_DITHER] = MT8192_MUTEX_MOD_DISP_DITHER0, + [DDP_COMPONENT_GAMMA] = MT8192_MUTEX_MOD_DISP_GAMMA0, + [DDP_COMPONENT_POSTMASK0] = MT8192_MUTEX_MOD_DISP_POSTMASK0, + [DDP_COMPONENT_OVL0] = MT8192_MUTEX_MOD_DISP_OVL0, + [DDP_COMPONENT_OVL_2L0] = MT8192_MUTEX_MOD_DISP_OVL0_2L, + [DDP_COMPONENT_OVL_2L2] = MT8192_MUTEX_MOD_DISP_OVL2_2L, + [DDP_COMPONENT_RDMA0] = MT8192_MUTEX_MOD_DISP_RDMA0, + [DDP_COMPONENT_RDMA4] = MT8192_MUTEX_MOD_DISP_RDMA4, +}; + static const unsigned int mt2712_mutex_sof[MUTEX_SOF_DSI3 + 1] = { [MUTEX_SOF_SINGLE_MODE] = MUTEX_SOF_SINGLE_MODE, [MUTEX_SOF_DSI0] = MUTEX_SOF_DSI0, @@ -275,6 +301,13 @@ static const struct mtk_mutex_data mt8183_mutex_driver_data = { .no_clk = true, }; +static const struct mtk_mutex_data mt8192_mutex_driver_data = { + .mutex_mod = mt8192_mutex_mod, + .mutex_sof = mt8183_mutex_sof, + .mutex_mod_reg = MT8183_MUTEX0_MOD0, + .mutex_sof_reg = MT8183_MUTEX0_SOF0, +}; + struct mtk_mutex *mtk_mutex_get(struct device *dev) { struct mtk_mutex_ctx *mtx = dev_get_drvdata(dev); @@ -507,6 +540,8 @@ static const struct of_device_id mutex_driver_dt_match[] = { .data = &mt8173_mutex_driver_data}, { .compatible = "mediatek,mt8183-disp-mutex", .data = &mt8183_mutex_driver_data}, + { .compatible = "mediatek,mt8192-disp-mutex", + .data = &mt8192_mutex_driver_data}, {}, }; MODULE_DEVICE_TABLE(of, mutex_driver_dt_match); -- 2.25.1