From patchwork Sun May 9 14:47:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 12246425 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=-10.9 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=ham 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 8FB28C433ED for ; Sun, 9 May 2021 14:49:26 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 184B4613F0 for ; Sun, 9 May 2021 14:49:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 184B4613F0 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=desiato.20200630; 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=KYm2QTmsNZbukoPCpB/PPHmHnph3RPyKxnY32dEN6ZU=; b=bRV4oP9lWLQxE+Vho2+ooE8XQ Mf7ppTOyHFGh4mKXRafTuH9m3GB8OdG0KIqpJKPhU2AtqzLgJOxm5xBK27FOoUcHD6cQZPqvu3+Pq vjFefCD8FK/VMzRYJ3yTgDMertRyqQGF97y28QYM9+seREDi9GR7SZ9g2HZOjI+gZYOnbmi0XZh4r Zbd3EBuiEUY9c6xAEBZH7z3NXS75wjpwY5buwkL+IXC0XqQmGzdull+0OT3xFNAaTb5P1IQ60+Rfc uTA6RGXmgSOokUC/zCxqEOo/mIevMJ48f45VoIzbHNLjdkT1S7rlKVsZRQ1wP0Te9TDWOu7TgqPZC Zcvd1g3gA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lfkiu-00BlTK-TN; Sun, 09 May 2021 14:48:01 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lfkiL-00BlNh-7i for linux-arm-kernel@desiato.infradead.org; Sun, 09 May 2021 14:47:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=69268yasEbBqYqAo7K2xyZWQnzNr5TiTY7nHjD5vilA=; b=NMbZAr1keqkPNF+olDO68GMH2S rT3/ICgUK/mLlm98jx+ZegNKMphNKak2Unmhe6aAMQdr95Cj5ooYhUMsVMVSesBOrzqru/dTn1z+Q JrwTWq1W30E82sgib33IqxISJPbGAHU2R4Wk6++jcTOOrsGte2AQ7eVInUBEp6Wf+lUe6KLhskmZs vvIO66sBOMV7RZ1XiqziFARyegwHqzpujcGuGjAN2rX/LTSb+4sVYPCWC3XOXVuw43vhX5cefp7hb TKlEbKg4g9qtnqIjjOcSp+y5wrCGOpvjMPu0HINpRINygYKUoqO5fvtLLgGJeCvhFzvXh7Js4QskF K2nMPOGw==; Received: from mail-io1-xd30.google.com ([2607:f8b0:4864:20::d30]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lfkiI-0080Dw-HY for linux-arm-kernel@lists.infradead.org; Sun, 09 May 2021 14:47:24 +0000 Received: by mail-io1-xd30.google.com with SMTP id n10so12404262ion.8 for ; Sun, 09 May 2021 07:47:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=69268yasEbBqYqAo7K2xyZWQnzNr5TiTY7nHjD5vilA=; b=bU/Y6e4tkIF8ikf1ybYYrvxeGlMHo6icCKRhkmUAJGIG0zwuLzz4tyZ15hvg/KmryY 7HD/+eNJgpGCZVl6UqXh8ZDqBBnSTjKXR6LXBMmdXFh05hN+KDkD8b7rdsnE4Y4s2wxK /iLQBpHrkE3Ddc1eQJ5GF00G0kM/in95tbQ8e5GB/BTBh84rele+vwXY3SyYV5ud/4VU iRd4CHKl5NDSrIxab9ym/h0fjDxRzG4oiOrRNHmfUjtvsiQrQ9y7FdBSpxR9lcsGRFdq MbLTdJsW1RM21HVrLXMq7gmyK6uDEBp2lPdMJLytHpuZkrsPeXvghCReM8GkYlw9xvNg E+MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=69268yasEbBqYqAo7K2xyZWQnzNr5TiTY7nHjD5vilA=; b=bk0F7h0Nqo6yK/ypth61XFto3wXJNNPuLG90UDrhcKKDv3YsiGYHQICsfg75ltdJc7 U4F1T30Z5i/rWmfwVLxFDbfcyU7QlO+lyIVZJspzaUWnbyyA3tUbq1RLkBpngRhIdqoW C0h2coSZWUV6f85tIf5pU3/9Az1unBPCtQWKyNsMX2yF6+cDEtE42KEtxtJgPuFyq+x0 KljRzbR9w6tDsCO31bXkggnSGicrZnnO9G95PrTKGAb0NpmnDhbdI2h7LZcRDc/4nvzX 6y0E6ZURwMYMUJ4jPHN6+DqLsevD6MDKPEZk7dwwRYUj4diiyRHBLgppH/s1dAWN7WhT yQnw== X-Gm-Message-State: AOAM53079Uhb6nXrvG49ElJcSRYIkUGqzroYte1wJxsC2tvAyb6NVdAi Ly4kyb12c4VWCMpdmlRK8FGXN3VDNfw1fg== X-Google-Smtp-Source: ABdhPJzSoOmsv0Nsu5gbmo2MhUaIBP4l/n/jsRb7r6JFOFNutZMq5MnhOvPDsGmRC+UI+OAiY8/w6w== X-Received: by 2002:a02:854a:: with SMTP id g68mr17313271jai.56.1620571641305; Sun, 09 May 2021 07:47:21 -0700 (PDT) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:18a0:bffb:ecae:3d39]) by smtp.gmail.com with ESMTPSA id d4sm6281759ilg.65.2021.05.09.07.47.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 May 2021 07:47:20 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: Adam Ford Subject: [RFC 3/4] soc: imx: Add blk-ctl driver for i.MX8MN Date: Sun, 9 May 2021 09:47:10 -0500 Message-Id: <20210509144711.2192991-4-aford173@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210509144711.2192991-1-aford173@gmail.com> References: <20210509144711.2192991-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210509_074722_606446_50224D6F X-CRM114-Status: GOOD ( 17.72 ) 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 The i.MX8MN SoC has dispmix BLK-CTL. It's similar to the i.MX8MM, but there are subtle differences, so it needs its own. Signed-off-by: Adam Ford diff --git a/drivers/soc/imx/Makefile b/drivers/soc/imx/Makefile index c260b962f495..3bcd7d5fd7ed 100644 --- a/drivers/soc/imx/Makefile +++ b/drivers/soc/imx/Makefile @@ -4,4 +4,4 @@ obj-$(CONFIG_ARCH_MXC) += soc-imx.o endif obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o obj-$(CONFIG_IMX_GPCV2_PM_DOMAINS) += gpcv2.o -obj-$(CONFIG_SOC_IMX8M) += soc-imx8m.o blk-ctl.o blk-ctl-imx8mm.o +obj-$(CONFIG_SOC_IMX8M) += soc-imx8m.o blk-ctl.o blk-ctl-imx8mm.o blk-ctl-imx8mn.o diff --git a/drivers/soc/imx/blk-ctl-imx8mn.c b/drivers/soc/imx/blk-ctl-imx8mn.c new file mode 100644 index 000000000000..eeb5c82bcf9a --- /dev/null +++ b/drivers/soc/imx/blk-ctl-imx8mn.c @@ -0,0 +1,118 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2021 NXP + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "blk-ctl.h" + +#define MEDIA_BLK_SFT_EN_BUS_CLK_RSTN BIT(8) +#define MEDIA_BLK_SFT_EN_ISI_CLK_RSTN GENMASK(7, 6) +#define MEDIA_BLK_SFT_EN_LCDIF_CLK_RSTN GENMASK(5, 4) +#define MEDIA_BLK_SFT_EN_MIPI_CSI_RSTN GENMASK(3, 2) +#define MEDIA_BLK_SFT_EN_DSI_RSTN GENMASK(1, 0) + +#define MEDIA_BLK_BUS_PD_MASK BIT(8) +#define MEDIA_BLK_ISI_PD_MASK GENMASK(7,6) +#define MEDIA_BLK_LCDIF_PD_MASK GENMASK(5, 4) +#define MEDIA_BLK_MIPI_CSI_PD_MASK GENMASK(3, 2) +#define MEDIA_BLK_MIPI_DSI_PD_MASK GENMASK(1, 0) + +static struct imx_blk_ctl_hw imx8mn_dispmix_blk_ctl_pds[] = { + IMX_BLK_CTL_PD("ISI", "dispmix", IMX8MN_BLK_CTL_DISPMIX_ISI, 0x4, + MEDIA_BLK_ISI_PD_MASK, 0, MEDIA_BLK_SFT_EN_ISI_CLK_RSTN, + IMX_BLK_CTL_PD_RESET), + IMX_BLK_CTL_PD("LCDIF", "dispmix", IMX8MN_BLK_CTL_DISPMIX_LCDIF, 0x4, + MEDIA_BLK_LCDIF_PD_MASK, 0, MEDIA_BLK_SFT_EN_LCDIF_CLK_RSTN, + IMX_BLK_CTL_PD_RESET), + IMX_BLK_CTL_PD("MIPI_DSI", "dispmix", IMX8MN_BLK_CTL_DISPMIX_MIPI_DSI, 0x4, + MEDIA_BLK_MIPI_DSI_PD_MASK, 0, MEDIA_BLK_SFT_EN_DSI_RSTN, + IMX_BLK_CTL_PD_RESET), + IMX_BLK_CTL_PD("MIPI_CSI", "ISI", IMX8MN_BLK_CTL_DISPMIX_MIPI_CSI, 0x4, + MEDIA_BLK_MIPI_CSI_PD_MASK, 0, MEDIA_BLK_SFT_EN_MIPI_CSI_RSTN, + IMX_BLK_CTL_PD_RESET), +}; + +static const struct regmap_config imx8mn_blk_ctl_regmap_config = { + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .max_register = 0x30, + .fast_io = true, +}; + +static const struct imx_blk_ctl_dev_data imx8mn_dispmix_blk_ctl_dev_data = { + .pds = imx8mn_dispmix_blk_ctl_pds, + .pds_num = ARRAY_SIZE(imx8mn_dispmix_blk_ctl_pds), + .hw_hsk = IMX_BLK_CTL_PD(NULL, NULL, -1, 0x4, MEDIA_BLK_BUS_PD_MASK, 0, + MEDIA_BLK_SFT_EN_BUS_CLK_RSTN, + IMX_BLK_CTL_PD_HANDSHAKE | IMX_BLK_CTL_PD_RESET), + .config = imx8mn_blk_ctl_regmap_config, + .active_pd_names = (char*[]){"dispmix", "mipi"}, + .num_active_pd = 2, +}; + +static int imx8mn_blk_ctl_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + const struct imx_blk_ctl_dev_data *dev_data = of_device_get_match_data(dev); + struct regmap *regmap; + struct imx_blk_ctl *ctl; + void __iomem *base; + + ctl = devm_kzalloc(dev, sizeof(*ctl), GFP_KERNEL); + if (!ctl) + return -ENOMEM; + + base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(base)) + return PTR_ERR(base); + + regmap = devm_regmap_init_mmio(dev, base, &dev_data->config); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + + ctl->regmap = regmap; + ctl->dev = dev; + ctl->power_count = 0; + mutex_init(&ctl->lock); + + ctl->num_clks = devm_clk_bulk_get_all(dev, &ctl->clks); + if (ctl->num_clks < 0) + return ctl->num_clks; + + dev_set_drvdata(dev, ctl); + ctl->dev_data = dev_data; + + return imx_blk_ctl_register(dev); +} + +static const struct of_device_id imx_blk_ctl_of_match[] = { + { .compatible = "fsl,imx8mn-dispmix-blk-ctl", .data = &imx8mn_dispmix_blk_ctl_dev_data }, + { /* Sentinel */ } +}; +MODULE_DEVICE_TABLE(of, imx_blk_ctl_of_match); + +static struct platform_driver imx_blk_ctl_driver = { + .probe = imx8mn_blk_ctl_probe, + .driver = { + .name = "imx8mn-blk-ctl", + .of_match_table = of_match_ptr(imx_blk_ctl_of_match), + .pm = &imx_blk_ctl_pm_ops, + }, +}; +module_platform_driver(imx_blk_ctl_driver);