From patchwork Thu Nov 4 16:18:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 12603457 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 8F722C433FE for ; Thu, 4 Nov 2021 16:21:57 +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 61F4461220 for ; Thu, 4 Nov 2021 16:21:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 61F4461220 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=J8gA4HFicNF+Bs6SSvYQ4GPvKadOUSWVbz2uvL9VdEM=; b=DPGTdpwCA+R+is hJstTJx2sfuDpplVeMUTDkR4VYBEgt21chZG75sSrbMiK/8LmIC2XGahn87tkGIVV9dxSP3Rw8CRy UmxPF9W8bq8bAQcGiJ5t15V560c9bmktNSMq3z6CB2NY79x4cI6C/B8sDDBaBcwIe1IvVRX7j3Ju3 q2eDNYvleWTqwVD9AkjegMgfNQxS90FpgPBPJGQuzF5myE0oXQB42dyQmm8sMB1T/Sfliuais4Zth UrL5f4c1UlKR2G4PSetyQvM4Pl9xpe4QPrq8y/96JbddFwfGKU59EgwLM2EnJ95GmtXDzbSL1JwVj 4Yl0BKFDfZk3VG05jZWQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mifTP-009QAV-Hh; Thu, 04 Nov 2021 16:20:20 +0000 Received: from mail-il1-x135.google.com ([2607:f8b0:4864:20::135]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mifRm-009PT3-Ev for linux-arm-kernel@lists.infradead.org; Thu, 04 Nov 2021 16:18:39 +0000 Received: by mail-il1-x135.google.com with SMTP id i12so6697144ila.12 for ; Thu, 04 Nov 2021 09:18:37 -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=V8Fc8ke3iYOumBqOlWNgqlYhlma1UuQm/49sDGNHcnE=; b=BU9ivg121YwQ/viUzudfS8N488FYWmgpv4k45+ar6xwhzo1d0vjzRJv9tCAb+4JsTt 7K5DVTwxJv5137PcMeEyHVkDEEE2OlElJkAB/PRTICIC0lLZNBV8F+FFArezB2iWi8S/ XWAd8e+v7SEm3naqNdYvWWY9cs4AFIPCTkv/ZV/V4u2FVQqWQkLsyqxJ8GxB9BBj7RAg nIQW3VgwW/k2LUHNeA4FEA4D9vjDNjaZW4QWsxzfePbIU+G40RC5bLWtIYEDibhzfcVH dFSJSGr7ql+AzDWZdQaIMj7ebg9wL5zttgHA0EjEhtWVG/884wmFcBciMSZJ3NDr0Piy Hc4Q== 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=V8Fc8ke3iYOumBqOlWNgqlYhlma1UuQm/49sDGNHcnE=; b=IXNshfcSFQ3jhnzf7GIzG/JTDeoKYCGasEqnn5X4KdZevfcZ3cuYmL72cwGE5u38Ae Mep9ng88bwv4h4XcOrw7P7F13a4lLI9/WXJyC9HqdjgxjdB1lXIVDk/q1dYaSv1OE8kW II0T1yNsCte4WThVclsNBsO1QHd8watsSGEz8wUVzNtcmiR9UHd0qL4EHlAvAAy3Besk cH9N05m0ey7WOEwqrf/P9h5edJjsPrh8f2dvebFKmGJzJhei2w1Vw1sLztNkUwDqVOGj XYOH8z1hNyx82Wc5Ozljr8rhRGP8XcRQrobRxnrHk7VAWAFXbA8T7wGnw0Hi7yxoLmLx paWA== X-Gm-Message-State: AOAM5308N4AXF1VzR+g6eOJ4QlqMxjbR58n3uWjZepVt/8rWh8qssikY mMmxlBDZTNJ8V6CuJn3OCiA8ki0Bkm8= X-Google-Smtp-Source: ABdhPJxb3gLA4v3sKw6lJ/XP1t20YrngWSaBe9t0FzVYUDsfncWtAjMnrkXDOK1nt3aMKrzUCStRHA== X-Received: by 2002:a05:6e02:19c8:: with SMTP id r8mr6214329ill.47.1636042716748; Thu, 04 Nov 2021 09:18:36 -0700 (PDT) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:e81d:737a:bb84:83ba]) by smtp.gmail.com with ESMTPSA id e17sm3266326iow.18.2021.11.04.09.18.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Nov 2021 09:18:36 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: aford@beaconembedded.com, ariel.dalessandro@collabora.com, krzk@kernel.org, tharvey@gateworks.com, l.stach@pengutronix.de, devicetree@vger.kernel.org, Adam Ford , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-kernel@vger.kernel.org Subject: [PATCH V3 5/9] soc: imx: imx8m-blk-ctrl: add i.MX8MN DISP blk-ctrl Date: Thu, 4 Nov 2021 11:18:00 -0500 Message-Id: <20211104161804.587250-6-aford173@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211104161804.587250-1-aford173@gmail.com> References: <20211104161804.587250-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211104_091838_568130_D30A48F4 X-CRM114-Status: GOOD ( 16.21 ) 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: , 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 diff --git a/drivers/soc/imx/imx8m-blk-ctrl.c b/drivers/soc/imx/imx8m-blk-ctrl.c index 519b3651d1d9..6feeff5a3776 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 */ } };