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=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS 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 A0F08C43441 for ; Thu, 22 Nov 2018 20:47:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 375DC214D9 for ; Thu, 22 Nov 2018 20:47:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dzBMLciN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 375DC214D9 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-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438821AbeKWH2c (ORCPT ); Fri, 23 Nov 2018 02:28:32 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:45581 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2438808AbeKWH2c (ORCPT ); Fri, 23 Nov 2018 02:28:32 -0500 Received: by mail-pg1-f193.google.com with SMTP id y4so2128728pgc.12; Thu, 22 Nov 2018 12:47:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=fzfVPfWvBHnoaq5CXHPYh/SJKCQhOxlTKr5fmvE1jG8=; b=dzBMLciNCinLI3OvHAsWFl17pP/KexuPe6pD/Uueb97YawL3OMFBfiXm63h2bAvBQP 1bcSBda2gdXMmbHk8h3HN4OskTDxv+32zHMHeiRAhFgyxj5vKmE72NFXLGc+/r1/Zsuo sz4bcxJbrDoLABDFwYGxrWfuSfPEHkJdeBnvlnkdIH9MJNX82avS9dXr2v9utVZ8Ivmv m0J1vd3YaDKcl6MENH8PvqLcg3ibNq7FVkBagJ/FrFkUOtp4DfpwuklP8cjH8YhxxJFv f1pbmcytbdR4XvCU7nlLmNh4kHKbxIIDU5AzaJB+U9uWHEX81naQCdSmQqilCexrGUmN U8sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=fzfVPfWvBHnoaq5CXHPYh/SJKCQhOxlTKr5fmvE1jG8=; b=r2xoQ+c32s8WB0+8zbhI4iPCMWGfe1kZCRfOXUEC7vXOx0hocOWn4qGsDXTdZriP4l fVAl6DiPXHCajq82FCozeVRTsfmWT/+c/rOLy4nsMDu2Rfkt/4mxTqHKhWaE61ZFsEaF 8jYeXCm11R0R8CHFZpDJ3Rmuq6boPo8uwXiv2roWfqcS8FP3m2+5mzSwGQ/tF/Gt4e/l Wh89btXGvo62s3PvxVO2kwJksYZ177Vlo3yQ0+J2kAz4exHlVeNIF9GLPRK3jvofeTLv yOi866X1Xw74qYlrV9Nx6oGZTM44U6YC5SeGCwMWAqP5FEABuVxvxoP8f3mBbMf1KFOB 8Ewg== X-Gm-Message-State: AGRZ1gJxC8JO33cwXmz6Ce6Qh87FvA3MtXnxKy7A+2MO5eKa3yQ2NU5T iAxmp23+KBlZsSimj2KrLJABT3/+ X-Google-Smtp-Source: AJdET5eVMIhbPdf5mSfofdPLFARdS4DHH3nSBbjXtxxQJx7C9Fh7XDTXT3PYcR8IIhe3Htqw5gmXvQ== X-Received: by 2002:a62:ce0e:: with SMTP id y14mr13479044pfg.100.1542919647190; Thu, 22 Nov 2018 12:47:27 -0800 (PST) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id k137sm54457896pfd.56.2018.11.22.12.47.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Nov 2018 12:47:26 -0800 (PST) Subject: Re: [PATCH v2 2/5] bcm2835-pm: Move bcm2835-watchdog's DT probe to an MFD. To: Eric Anholt , Florian Fainelli , Rob Herring , Mark Rutland , Wim Van Sebroeck , linux-watchdog@vger.kernel.org Cc: linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Stefan Wahren , bcm-kernel-feedback-list@broadcom.com References: <20181120213702.27958-1-eric@anholt.net> <20181120213702.27958-3-eric@anholt.net> From: Guenter Roeck Message-ID: <83d14e62-982d-64a6-99df-e16b3a254745@roeck-us.net> Date: Thu, 22 Nov 2018 12:47:24 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: <20181120213702.27958-3-eric@anholt.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/20/18 1:36 PM, 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 > --- > arch/arm/mach-bcm/Kconfig | 1 + > drivers/mfd/Makefile | 1 + > drivers/mfd/bcm2835-pm.c | 70 ++++++++++++++++++++++++++++++++++ > drivers/watchdog/bcm2835_wdt.c | 30 ++++++--------- > include/linux/mfd/bcm2835-pm.h | 13 +++++++ > 5 files changed, 97 insertions(+), 18 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..197ff8bcca90 > --- /dev/null > +++ b/drivers/mfd/bcm2835-pm.c > @@ -0,0 +1,70 @@ > +// 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 Alphabetic order would be a bit nicer. > + > +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 int bcm2835_pm_remove(struct platform_device *pdev) > +{ > + return 0; > +} I don't think that is needed. > + > +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, > + .remove = bcm2835_pm_remove, > + .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..9061436fbf90 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; > }; > > +struct bcm2835_wdt *bcm2835_power_off_wdt; static > + > 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; > @@ -220,24 +219,19 @@ static int bcm2835_wdt_probe(struct platform_device *pdev) > > static int bcm2835_wdt_remove(struct platform_device *pdev) > { > - if (pm_power_off == bcm2835_power_off) > + if (pm_power_off == bcm2835_power_off) { > pm_power_off = NULL; > + bcm2835_power_off_wdt = NULL; I don't think this is needed. > + } > > 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 */ >