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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D0B2C433F5 for ; Sat, 9 Oct 2021 16:30:35 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 F1E6B60F48 for ; Sat, 9 Oct 2021 16:30:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org F1E6B60F48 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Sjahnl0Q75igp2iyuwoxuyLV+VGf7xfw9FgP72MApwM=; b=WkrSxXLIHlGvjW 1Y6sDkyAZxyGUXFyyXKaDWvw2xMkd5y/MONYhfwbYiZZjEmoA62hXQ5U0PHTiH7pB58URhc+eJhvU ECFpAUMlSzxA/zJFfM0d1Q8WVze+DQ1KRX4iTZ9GIQ+Jw8QMW+ETh0lsNTS7Dzv3ZEqBtZntggARh +rrx1hC2zR45LSPrc9ej+bfJ6vU/pMGbCULFTLvcnhjldlun79laZaF1XWveechFdTEvhKF+uJI3R NSoG/HA4Y7x/GsZw/0ApvefmkpRTmAfm6oBFHUVouSB8IEENFqrrOAjxpNINNK044TalIhyJ6QDej 961KMQV720Ai1d2DWs+w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mZFCq-005pWy-3j; Sat, 09 Oct 2021 16:28:16 +0000 Received: from mail-il1-x130.google.com ([2607:f8b0:4864:20::130]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mZFC3-005pM0-Ue for linux-arm-kernel@lists.infradead.org; Sat, 09 Oct 2021 16:27:29 +0000 Received: by mail-il1-x130.google.com with SMTP id a8so1030905ilj.10 for ; Sat, 09 Oct 2021 09:27:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2YHxAAhtNoz/8OmsoDfBA9XDDy8t0TV6ugOyfLay0FI=; b=pS44Lb4CPobrJfXVK/SkNIVgeq5XISQ8llvDPgh9RS8zLtkelkk6Pp8rp+k8sXr8S9 4H8vZE5KTgSNllpNxhxI4DrTWAUuZ+rtEraspJAy2kan7l1dlCS8RHabF92JXpGIu6+v Gey8IEHzWC6gHfeRyDdMDJ3HUPmRIbDQ0uhR/tVTig/nSQE4FiqADARoQNwqW+QtJJks Tb8U6kUopbiGKW6MhzXjBixy/wCCb43gSiCHsNsf1pWEbyohph7/KCVilpNHX7FV0mMm Jf5TAM6qDypJy+A+vEe82I/CfpH68NeUMoPqJe7k04mgb/sp+eKM/aESFaPpWSQhbfKY NPLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2YHxAAhtNoz/8OmsoDfBA9XDDy8t0TV6ugOyfLay0FI=; b=kg7y33sKo9BibPmNziC5aMX/JkEKkYX4L1h2QVg7HeZYecrr1Ap2lzROodXOmstsaR ENxdFZ+qa48dZxKnUuuZmeCfiXfClO8v5xXF/tVutJkMqgym0Xfzg8cOs2RPm6f6a4uw XGiOLG7IVOD0kJaMjkGoWm/e5wUhT9x6Fkg6JWF/3frHJODW6w7zd9I5rtPuuTOYXFfy qiRW7d+TddQb03RC5/X+RQT+ztQtr4oidn5DnPyNbDftltkdQVN9KA3UNrmZUrDGS3iy UA3tNP/7pbzy5C+eOfrH57rTRMQaXGkKtkTV2qOQlQ90wvtMWGvMjT5osA97I0B7V4WZ IasQ== X-Gm-Message-State: AOAM531zL8KrUwQgwCB9hWBJYqopxhqgLc9Yq2JIBC+657DRxqcUQ5u5 Q6kkuxX2H3GUxampbOx1Q+KP58nCW8o= X-Google-Smtp-Source: ABdhPJzk1FFLqLVe3SgeMRv68vtEj0zhdAU/DLrLQqkNQ9hUMSnKHihHFJduNnFdWCsQx1Mp1zCH9A== X-Received: by 2002:a05:6e02:1985:: with SMTP id g5mr12600306ilf.311.1633796846940; Sat, 09 Oct 2021 09:27:26 -0700 (PDT) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:cb0f:c46c:9a27:ace]) by smtp.gmail.com with ESMTPSA id y5sm1253722ilg.58.2021.10.09.09.27.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Oct 2021 09:27:26 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: aford@beaconembedded.com, Adam Ford , Rob Herring , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Lucas Stach , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V2 5/9] soc: imx: imx8m-blk-ctrl: add i.MX8MN DISP blk-ctrl Date: Sat, 9 Oct 2021 11:26:55 -0500 Message-Id: <20211009162700.1452857-6-aford173@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211009162700.1452857-1-aford173@gmail.com> References: <20211009162700.1452857-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211009_092728_015547_A245237E X-CRM114-Status: GOOD ( 18.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This adds the description for the i.MX8MN disp blk-ctrl. Signed-off-by: Adam Ford --- drivers/soc/imx/imx8m-blk-ctrl.c | 75 +++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/drivers/soc/imx/imx8m-blk-ctrl.c b/drivers/soc/imx/imx8m-blk-ctrl.c index e172d295c441..8d3bf7690383 100644 --- a/drivers/soc/imx/imx8m-blk-ctrl.c +++ b/drivers/soc/imx/imx8m-blk-ctrl.c @@ -14,6 +14,7 @@ #include #include +#include #define BLK_SFT_RSTN 0x0 #define BLK_CLK_EN 0x4 @@ -498,6 +499,75 @@ static const struct imx8m_blk_ctrl_data imx8mm_disp_blk_ctl_dev_data = { .num_domains = ARRAY_SIZE(imx8mm_disp_blk_ctl_domain_data), }; + +static int imx8mn_disp_power_notifier(struct notifier_block *nb, + unsigned long action, void *data) +{ + struct imx8m_blk_ctrl *bc = container_of(nb, struct imx8m_blk_ctrl, + power_nb); + + if (action != GENPD_NOTIFY_ON && action != GENPD_NOTIFY_PRE_OFF) + return NOTIFY_OK; + + /* Enable bus clock and deassert bus reset */ + regmap_set_bits(bc->regmap, BLK_CLK_EN, BIT(8)); + regmap_set_bits(bc->regmap, BLK_SFT_RSTN, BIT(8)); + + /* + * On power up we have no software backchannel to the GPC to + * wait for the ADB handshake to happen, so we just delay for a + * bit. On power down the GPC driver waits for the handshake. + */ + if (action == GENPD_NOTIFY_ON) + udelay(5); + + + return NOTIFY_OK; +} + +static const struct imx8m_blk_ctrl_domain_data imx8mn_disp_blk_ctl_domain_data[] = { + [IMX8MN_DISPBLK_PD_MIPI_DSI] = { + .name = "dispblk-mipi-dsi", + .clk_names = (const char *[]){ "dsi-pclk", "dsi-ref", }, + .num_clks = 2, + .gpc_name = "mipi-dsi", + .rst_mask = BIT(0) | BIT(1), + .clk_mask = BIT(0) | BIT(1), + }, + [IMX8MN_DISPBLK_PD_MIPI_CSI] = { + .name = "dispblk-mipi-csi", + .clk_names = (const char *[]){ "csi-aclk", "csi-pclk" }, + .num_clks = 2, + .gpc_name = "mipi-csi", + .rst_mask = BIT(2) | BIT(3), + .clk_mask = BIT(2) | BIT(3), + }, + [IMX8MN_DISPBLK_PD_LCDIF] = { + .name = "dispblk-lcdif", + .clk_names = (const char *[]){ "lcdif-axi", "lcdif-apb", "lcdif-pix", }, + .num_clks = 3, + .gpc_name = "lcdif", + .rst_mask = BIT(4) | BIT(5), + .clk_mask = BIT(4) | BIT(5), + }, + [IMX8MN_DISPBLK_PD_ISI] = { + .name = "dispblk-isi", + .clk_names = (const char *[]){ "disp_axi", "disp_apb", "disp_axi_root", + "disp_apb_root"}, + .num_clks = 4, + .gpc_name = "isi", + .rst_mask = BIT(6) | BIT(7), + .clk_mask = BIT(6) | BIT(7), + }, +}; + +static const struct imx8m_blk_ctrl_data imx8mn_disp_blk_ctl_dev_data = { + .max_reg = 0x84, + .power_notifier_fn = imx8mn_disp_power_notifier, + .domains = imx8mn_disp_blk_ctl_domain_data, + .num_domains = ARRAY_SIZE(imx8mn_disp_blk_ctl_domain_data), +}; + static const struct of_device_id imx8m_blk_ctrl_of_match[] = { { .compatible = "fsl,imx8mm-vpu-blk-ctrl", @@ -505,7 +575,10 @@ static const struct of_device_id imx8m_blk_ctrl_of_match[] = { }, { .compatible = "fsl,imx8mm-disp-blk-ctrl", .data = &imx8mm_disp_blk_ctl_dev_data - } ,{ + }, { + .compatible = "fsl,imx8mn-disp-blk-ctrl", + .data = &imx8mn_disp_blk_ctl_dev_data + }, { /* Sentinel */ } }; -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel