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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 D199BC3F2CD for ; Wed, 4 Mar 2020 11:41:55 +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 A5594214D8 for ; Wed, 4 Mar 2020 11:41:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="h4mRVl+y" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A5594214D8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-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=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ncAXi/mBeqRLBeaY53ucI8zKTDPVZNirKpVItmjcHjw=; b=h4mRVl+ygmOK4u M5/vFuU2o2+XawpQsl6X2lEu+y+UT05M01D35gWQ1abzhbcNbUq3xoa1s0Q8Mg2UQW4f85FI7Af1T AuyNadboMLSt2q1/CWQpfhF0lNnKiX5XtmmcnXGZdIHizxzWHqj7l4vzsU5ZhLRllmbzxyshLP7vs 67ena2ql5MT4fOhqJdAxsjUE9q6gCAfRFuHYtoFoeeUZerdJRBSt0Yqv6yfPinWnvKo2JzudrR/QG Z32RkK9mCSiPH7im1U5k7XKCqnJh1wTh2/MvLyibIkYbEjHNJ6gSLkPE5PIDQ6j8/WKOZe8eZze8e OtCu31Ld03OdDNPcaSxQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j9SPO-0005YY-8j; Wed, 04 Mar 2020 11:41:50 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j9SPJ-0005Xf-QU for linux-arm-kernel@lists.infradead.org; Wed, 04 Mar 2020 11:41:47 +0000 Received: from lupine.hi.pengutronix.de ([2001:67c:670:100:3ad5:47ff:feaf:1a17] helo=lupine) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1j9SP7-0001eR-T3; Wed, 04 Mar 2020 12:41:33 +0100 Received: from pza by lupine with local (Exim 4.92) (envelope-from ) id 1j9SP7-0005kZ-6Z; Wed, 04 Mar 2020 12:41:33 +0100 Message-ID: Subject: Re: [RFC 10/11] reset: imx: Add audiomix reset controller support From: Philipp Zabel To: Abel Vesa , Rob Herring , Shawn Guo , Sascha Hauer , Fabio Estevam , Mike Turquette , Stephen Boyd , Lee Jones , Anson Huang , Leonard Crestez , Peng Fan , Jacky Bai Date: Wed, 04 Mar 2020 12:41:33 +0100 In-Reply-To: <1583226206-19758-11-git-send-email-abel.vesa@nxp.com> References: <1583226206-19758-1-git-send-email-abel.vesa@nxp.com> <1583226206-19758-11-git-send-email-abel.vesa@nxp.com> User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:3ad5:47ff:feaf:1a17 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200304_034146_018859_91754D38 X-CRM114-Status: GOOD ( 20.45 ) 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: devicetree@vger.kernel.org, linux-clk@vger.kernel.org, Linux Kernel Mailing List , linux-arm-kernel@lists.infradead.org, NXP Linux Team Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Abel, On Tue, 2020-03-03 at 11:03 +0200, Abel Vesa wrote: > The imx-mix MFD driver registers some devices, one of which, in case of > audiomix, maps correctly to a reset controller type. This driver registers > a reset controller for that. For now, only the EARC specific resets are added. > > Signed-off-by: Abel Vesa > Reviewed-by: Leonard Crestez > --- > drivers/reset/Kconfig | 7 ++ > drivers/reset/Makefile | 1 + > drivers/reset/reset-imx-audiomix.c | 122 +++++++++++++++++++++++++ > include/dt-bindings/reset/imx-audiomix-reset.h | 15 +++ > 4 files changed, 145 insertions(+) > create mode 100644 drivers/reset/reset-imx-audiomix.c > create mode 100644 include/dt-bindings/reset/imx-audiomix-reset.h > > diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig > index d9efbfd..2f8d9b3 100644 > --- a/drivers/reset/Kconfig > +++ b/drivers/reset/Kconfig > @@ -81,6 +81,13 @@ config RESET_INTEL_GW > Say Y to control the reset signals provided by reset controller. > Otherwise, say N. > > +config RESET_IMX_AUDIOMIX > + bool "i.MX Audiomix Reset Driver" if COMPILE_TEST > + depends on HAS_IOMEM > + default ARCH_MXC > + help > + This enables the audiomix reset controller driver for i.MX SoCs. > + > config RESET_LANTIQ > bool "Lantiq XWAY Reset Driver" if COMPILE_TEST > default SOC_TYPE_XWAY > diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile > index 249ed35..cf23d38 100644 > --- a/drivers/reset/Makefile > +++ b/drivers/reset/Makefile > @@ -12,6 +12,7 @@ obj-$(CONFIG_RESET_BRCMSTB_RESCAL) += reset-brcmstb-rescal.o > obj-$(CONFIG_RESET_HSDK) += reset-hsdk.o > obj-$(CONFIG_RESET_IMX7) += reset-imx7.o > obj-$(CONFIG_RESET_INTEL_GW) += reset-intel-gw.o > +obj-$(CONFIG_RESET_IMX_AUDIOMIX) += reset-imx-audiomix.o > obj-$(CONFIG_RESET_LANTIQ) += reset-lantiq.o > obj-$(CONFIG_RESET_LPC18XX) += reset-lpc18xx.o > obj-$(CONFIG_RESET_MESON) += reset-meson.o > diff --git a/drivers/reset/reset-imx-audiomix.c b/drivers/reset/reset-imx-audiomix.c > new file mode 100644 > index 00000000..d1c62ef > --- /dev/null > +++ b/drivers/reset/reset-imx-audiomix.c > @@ -0,0 +1,122 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright 2019 NXP. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#define IMX_AUDIOMIX_EARC_CTRL_REG 0x200 > + > +#define IMX_AUDIOMIX_EARC_RESET_BIT 0x0 > +#define IMX_AUDIOMIX_EARC_PHY_RESET_BIT 0x1 > + > +struct imx_audiomix_reset_data { > + void __iomem *base; > + struct reset_controller_dev rcdev; > + spinlock_t lock; > +}; > + > +static int imx_audiomix_reset_set(struct reset_controller_dev *rcdev, > + unsigned long id, bool assert) > +{ > + struct imx_audiomix_reset_data *drvdata = container_of(rcdev, > + struct imx_audiomix_reset_data, rcdev); > + void __iomem *reg_addr = drvdata->base; > + unsigned long flags; > + unsigned int offset; > + u32 reg; > + > + switch (id) { > + case IMX_AUDIOMIX_EARC_PHY_RESET: > + reg_addr += IMX_AUDIOMIX_EARC_CTRL_REG; > + offset = IMX_AUDIOMIX_EARC_PHY_RESET_BIT; > + break; > + case IMX_AUDIOMIX_EARC_RESET: > + reg_addr += IMX_AUDIOMIX_EARC_CTRL_REG; > + offset = IMX_AUDIOMIX_EARC_RESET_BIT; > + break; > + default: > + return -EINVAL; > + } > + > + if (assert) { > + pm_runtime_get_sync(rcdev->dev); This seems wrong. Why is the runtime PM reference count incremented when a reset is asserted ... > + spin_lock_irqsave(&drvdata->lock, flags); > + reg = readl(reg_addr); > + writel(reg & ~BIT(offset), reg_addr); > + spin_unlock_irqrestore(&drvdata->lock, flags); > + } else { > + spin_lock_irqsave(&drvdata->lock, flags); > + reg = readl(reg_addr); > + writel(reg | BIT(offset), reg_addr); > + spin_unlock_irqrestore(&drvdata->lock, flags); > + pm_runtime_put(rcdev->dev); ... and decremented when a reset is deasserted? Apart from the runtime PM handling this looks like it could reuse reset- simple. > + } > + > + return 0; > +} > + > +static int imx_audiomix_reset_assert(struct reset_controller_dev *rcdev, > + unsigned long id) > +{ > + return imx_audiomix_reset_set(rcdev, id, true); > +} > + > +static int imx_audiomix_reset_deassert(struct reset_controller_dev *rcdev, > + unsigned long id) > +{ > + return imx_audiomix_reset_set(rcdev, id, false); > +} > + > +static const struct reset_control_ops imx_audiomix_reset_ops = { > + .assert = imx_audiomix_reset_assert, > + .deassert = imx_audiomix_reset_deassert, > +}; > + > +static int imx_audiomix_reset_probe(struct platform_device *pdev) > +{ > + struct imx_audiomix_reset_data *drvdata; > + struct device *dev = &pdev->dev; > + > + drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL); > + if (drvdata == NULL) > + return -ENOMEM; > + > + drvdata->base = dev_get_drvdata(dev->parent); > + > + platform_set_drvdata(pdev, drvdata); > + > + pm_runtime_enable(dev); > + > + spin_lock_init(&drvdata->lock); > + > + drvdata->rcdev.owner = THIS_MODULE; > + drvdata->rcdev.nr_resets = IMX_AUDIOMIX_RESET_NUM; > + drvdata->rcdev.ops = &imx_audiomix_reset_ops; > + drvdata->rcdev.of_node = dev->of_node; > + drvdata->rcdev.dev = dev; > + > + return devm_reset_controller_register(dev, &drvdata->rcdev); > +} > + > +static const struct of_device_id imx_audiomix_reset_dt_ids[] = { > + { .compatible = "fsl,imx8mp-audiomix-reset", }, > + { /* sentinel */ }, > +}; > + > +static struct platform_driver imx_audiomix_reset_driver = { > + .probe = imx_audiomix_reset_probe, > + .driver = { > + .name = KBUILD_MODNAME, > + .of_match_table = imx_audiomix_reset_dt_ids, > + }, > +}; > +module_platform_driver(imx_audiomix_reset_driver); > diff --git a/include/dt-bindings/reset/imx-audiomix-reset.h b/include/dt-bindings/reset/imx-audiomix-reset.h > new file mode 100644 > index 00000000..2e26878 > --- /dev/null > +++ b/include/dt-bindings/reset/imx-audiomix-reset.h > @@ -0,0 +1,15 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright 2019 NXP. > + */ > + > +#ifndef DT_BINDING_RESET_IMX_AUDIOMIX_H > +#define DT_BINDING_RESET_IMX_AUDIOMIX_H > + > +#define IMX_AUDIOMIX_EARC_RESET 0x0 > +#define IMX_AUDIOMIX_EARC_PHY_RESET 0x1 > + > +#define IMX_AUDIOMIX_RESET_NUM 2 > + > +#endif > + The imx-audiomix-reset.h change should go into a separate patch, together with the binding docs for fsl,imx8mp-audiomix-reset. regards Philipp _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel