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=-9.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,URIBL_SBL,URIBL_SBL_A,USER_AGENT_MUTT 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 05FEEC04EB8 for ; Fri, 30 Nov 2018 22:11:04 +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 C76782082F for ; Fri, 30 Nov 2018 22:11:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lhA0RFk6"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VNmRP4Jf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C76782082F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net 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:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2AncjNTf4MFUYEU9bbvuJkVf+2FKgxPANDK/utsiti0=; b=lhA0RFk6hw53UG p1FbXLdx6HWFhpxWMwRWbfp4WvHNhWR9z/7u//zyJ0dZFDoXarL4bqH/3e+JNF+Yq0zJz8Kka9Dwz vQc7K4qSzLK+A/ohXBmCmxczkLGVwcXfJDCiOC31sVakeZLB4yl5aykA/bOuEOveJM3AVJ8WemJgA 84gmVSClrArzpDEPg/PKeYuPq+8TbIuwMZzZUVOsZp8cIvmXWBDMMoiueiw6FG7zjIYj9tVvirJLW NDXGaaAgeDl7cPAr/E0auXRw1pKgPrMmX+J5vgwtRzmHuv7RjqWN504fJoTU06agC8sfH5maOlevE 4nyyzF8kv9/czBSE+X8w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gSr01-0004aP-NA; Fri, 30 Nov 2018 22:11:01 +0000 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gSqzy-0004ZM-Q6; Fri, 30 Nov 2018 22:11:00 +0000 Received: by mail-pl1-x643.google.com with SMTP id z23so3453915plo.0; Fri, 30 Nov 2018 14:10:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=8GtRRzOY5ATBepJOAl3pdQm5CD35g8XR46WHt4Phzwk=; b=VNmRP4Jf/WUiQArq4cztsnDKdxyg6HK0TOoAiK+VupSjSAj3+/Aa2fY0ebWLOMbrPP 7f+8X7rVhKViHbmEWwUrg08hDUkyrXFpg3mWd3DMb7MVo0L432M/WJ3fpCeK0f/1986z xqRJqjv5qE5IEGgwx7ZFj9qW4DqhTFb9DpHXrgqjiqaRPFWOEAjXdd/indg3BM8TVsmd NEpV62XgQi/9D4JLrykijkORTP8PPT8SWPxUlnQszmibdk6mxAOuLrpQfTkzOfbANXFV isF/nwAJWefqlF7S4sAposgZyCxDD1sVzOihL/CU+rj9xl9jQu3wC9TNmlbWfCrV3syy xDeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=8GtRRzOY5ATBepJOAl3pdQm5CD35g8XR46WHt4Phzwk=; b=bNmhx+uPDES6Pb+IEsPSRh6WWhwbnnRUZOeL4KVFRMgl3SJitqxSsf+q9oi1W+hR5O DRmDut/tsiT/DCNlK5a9cUU7tm8ZBkd6bN5pX5fwNOhmlYCfUzKhK+N7zp4MQOz5ON3n SPpm4MO8QYy4quHwkij7/jjRPSMXqFotQJUIRepMvo1hftB2PQ2nRYtxom5U0tHYiXRf rExJmgsjdpPpCr8+p3lWHoWzhkhsKkhGxRJjBdi2vrPANj7HRUsEoUeF7S3WM6QxZvCs YCrbBjNmuasRLeKxCQAYZwT6ONYRtHSMqhFOMiksBzlUNocnt19cDHE4W8WtMM9oK50F ElmQ== X-Gm-Message-State: AA+aEWY8mchmVqBtxILjfZhlijSRQD7Ri9agikiWn7P/GB/2bV6QejRK PFu4FISu8Nc7aVtpzoERALcWyht3 X-Google-Smtp-Source: AFSGD/VLPrrukpTH+doI3MggCumkxSIZWSDSxZZESjYDfeefoStFr1UZ/4zdWZUB7nAXWE3NbsccgQ== X-Received: by 2002:a17:902:201:: with SMTP id 1mr7244045plc.62.1543615847140; Fri, 30 Nov 2018 14:10:47 -0800 (PST) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id 202sm11973496pfy.87.2018.11.30.14.10.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Nov 2018 14:10:45 -0800 (PST) Date: Fri, 30 Nov 2018 14:10:44 -0800 From: Guenter Roeck To: Eric Anholt Subject: Re: [PATCH v3 2/5] bcm2835-pm: Move bcm2835-watchdog's DT probe to an MFD. Message-ID: <20181130221044.GA15333@roeck-us.net> References: <20181130202743.20585-1-eric@anholt.net> <20181130202743.20585-3-eric@anholt.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20181130202743.20585-3-eric@anholt.net> User-Agent: Mutt/1.5.24 (2015-08-30) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181130_141058_843815_C9FB414D X-CRM114-Status: GOOD ( 26.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Florian Fainelli , linux-watchdog@vger.kernel.org, Stefan Wahren , linux-kernel@vger.kernel.org, Rob Herring , bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, Wim Van Sebroeck , linux-arm-kernel@lists.infradead.org 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 On Fri, Nov 30, 2018 at 12:27:40PM -0800, Eric Anholt wrote: > The PM block that the wdt driver was binding to actually has multiple > features we want to expose (power domains, reset, watchdog). Move the > DT attachment to a MFD driver and make WDT probe against MFD. > > Signed-off-by: Eric Anholt For watchdog: Reviewed-by: Guenter Roeck > --- > > v3: don't reset bcm2835_power_off_wdt on remove, drop pm driver's > empty remove, sort includes, add a "static". > > arch/arm/mach-bcm/Kconfig | 1 + > drivers/mfd/Makefile | 1 + > drivers/mfd/bcm2835-pm.c | 64 ++++++++++++++++++++++++++++++++++ > drivers/watchdog/bcm2835_wdt.c | 26 +++++--------- > include/linux/mfd/bcm2835-pm.h | 13 +++++++ > 5 files changed, 88 insertions(+), 17 deletions(-) > create mode 100644 drivers/mfd/bcm2835-pm.c > create mode 100644 include/linux/mfd/bcm2835-pm.h > > diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig > index 25aac6ee2ab1..95242c2162a2 100644 > --- a/arch/arm/mach-bcm/Kconfig > +++ b/arch/arm/mach-bcm/Kconfig > @@ -167,6 +167,7 @@ config ARCH_BCM2835 > select BCM2835_TIMER > select PINCTRL > select PINCTRL_BCM2835 > + select MFD_CORE > help > This enables support for the Broadcom BCM2835 and BCM2836 SoCs. > This SoC is used in the Raspberry Pi and Roku 2 devices. > diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile > index 12980a4ad460..ee6fb6af655e 100644 > --- a/drivers/mfd/Makefile > +++ b/drivers/mfd/Makefile > @@ -10,6 +10,7 @@ obj-$(CONFIG_MFD_88PM805) += 88pm805.o 88pm80x.o > obj-$(CONFIG_MFD_ACT8945A) += act8945a.o > obj-$(CONFIG_MFD_SM501) += sm501.o > obj-$(CONFIG_MFD_ASIC3) += asic3.o tmio_core.o > +obj-$(CONFIG_ARCH_BCM2835) += bcm2835-pm.o > obj-$(CONFIG_MFD_BCM590XX) += bcm590xx.o > obj-$(CONFIG_MFD_BD9571MWV) += bd9571mwv.o > cros_ec_core-objs := cros_ec.o > diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c > new file mode 100644 > index 000000000000..53839e6a81e7 > --- /dev/null > +++ b/drivers/mfd/bcm2835-pm.c > @@ -0,0 +1,64 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * PM MFD driver for Broadcom BCM2835 > + * > + * This driver binds to the PM block and creates the MFD device for > + * the WDT driver. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +static const struct mfd_cell bcm2835_pm_devs[] = { > + { .name = "bcm2835-wdt" }, > +}; > + > +static int bcm2835_pm_probe(struct platform_device *pdev) > +{ > + struct resource *res; > + struct device *dev = &pdev->dev; > + struct bcm2835_pm *pm; > + > + pm = devm_kzalloc(dev, sizeof(*pm), GFP_KERNEL); > + if (!pm) > + return -ENOMEM; > + platform_set_drvdata(pdev, pm); > + > + pm->dev = dev; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + pm->base = devm_ioremap_resource(dev, res); > + if (IS_ERR(pm->base)) > + return PTR_ERR(pm->base); > + > + return devm_mfd_add_devices(dev, -1, > + bcm2835_pm_devs, ARRAY_SIZE(bcm2835_pm_devs), > + NULL, 0, NULL); > +} > + > +static const struct of_device_id bcm2835_pm_of_match[] = { > + { .compatible = "brcm,bcm2835-pm-wdt", }, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, bcm2835_pm_of_match); > + > +static struct platform_driver bcm2835_pm_driver = { > + .probe = bcm2835_pm_probe, > + .driver = { > + .name = "bcm2835-pm", > + .of_match_table = bcm2835_pm_of_match, > + }, > +}; > +module_platform_driver(bcm2835_pm_driver); > + > +MODULE_AUTHOR("Eric Anholt "); > +MODULE_DESCRIPTION("Driver for Broadcom BCM2835 PM MFD"); > +MODULE_LICENSE("GPL"); > diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c > index ed05514cc2dc..1834524ae373 100644 > --- a/drivers/watchdog/bcm2835_wdt.c > +++ b/drivers/watchdog/bcm2835_wdt.c > @@ -12,6 +12,7 @@ > > #include > #include > +#include > #include > #include > #include > @@ -47,6 +48,8 @@ struct bcm2835_wdt { > spinlock_t lock; > }; > > +static struct bcm2835_wdt *bcm2835_power_off_wdt; > + > static unsigned int heartbeat; > static bool nowayout = WATCHDOG_NOWAYOUT; > > @@ -148,10 +151,7 @@ static struct watchdog_device bcm2835_wdt_wdd = { > */ > static void bcm2835_power_off(void) > { > - struct device_node *np = > - of_find_compatible_node(NULL, NULL, "brcm,bcm2835-pm-wdt"); > - struct platform_device *pdev = of_find_device_by_node(np); > - struct bcm2835_wdt *wdt = platform_get_drvdata(pdev); > + struct bcm2835_wdt *wdt = bcm2835_power_off_wdt; > u32 val; > > /* > @@ -169,7 +169,7 @@ static void bcm2835_power_off(void) > > static int bcm2835_wdt_probe(struct platform_device *pdev) > { > - struct resource *res; > + struct bcm2835_pm *pm = dev_get_drvdata(pdev->dev.parent); > struct device *dev = &pdev->dev; > struct bcm2835_wdt *wdt; > int err; > @@ -181,10 +181,7 @@ static int bcm2835_wdt_probe(struct platform_device *pdev) > > spin_lock_init(&wdt->lock); > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - wdt->base = devm_ioremap_resource(dev, res); > - if (IS_ERR(wdt->base)) > - return PTR_ERR(wdt->base); > + wdt->base = pm->base; > > watchdog_set_drvdata(&bcm2835_wdt_wdd, wdt); > watchdog_init_timeout(&bcm2835_wdt_wdd, heartbeat, dev); > @@ -211,8 +208,10 @@ static int bcm2835_wdt_probe(struct platform_device *pdev) > return err; > } > > - if (pm_power_off == NULL) > + if (pm_power_off == NULL) { > pm_power_off = bcm2835_power_off; > + bcm2835_power_off_wdt = wdt; > + } > > dev_info(dev, "Broadcom BCM2835 watchdog timer"); > return 0; > @@ -226,18 +225,11 @@ static int bcm2835_wdt_remove(struct platform_device *pdev) > return 0; > } > > -static const struct of_device_id bcm2835_wdt_of_match[] = { > - { .compatible = "brcm,bcm2835-pm-wdt", }, > - {}, > -}; > -MODULE_DEVICE_TABLE(of, bcm2835_wdt_of_match); > - > static struct platform_driver bcm2835_wdt_driver = { > .probe = bcm2835_wdt_probe, > .remove = bcm2835_wdt_remove, > .driver = { > .name = "bcm2835-wdt", > - .of_match_table = bcm2835_wdt_of_match, > }, > }; > module_platform_driver(bcm2835_wdt_driver); > diff --git a/include/linux/mfd/bcm2835-pm.h b/include/linux/mfd/bcm2835-pm.h > new file mode 100644 > index 000000000000..b7d0ee1feffa > --- /dev/null > +++ b/include/linux/mfd/bcm2835-pm.h > @@ -0,0 +1,13 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > + > +#ifndef BCM2835_MFD_PM_H > +#define BCM2835_MFD_PM_H > + > +#include > + > +struct bcm2835_pm { > + struct device *dev; > + void __iomem *base; > +}; > + > +#endif /* BCM2835_MFD_PM_H */ > -- > 2.20.0.rc1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel