From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932548AbdKDS3E (ORCPT ); Sat, 4 Nov 2017 14:29:04 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:52720 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932148AbdKDS3C (ORCPT ); Sat, 4 Nov 2017 14:29:02 -0400 Date: Sat, 4 Nov 2017 19:27:58 +0100 (CET) From: Stefan Wahren To: Florian Fainelli Cc: Krzysztof Kozlowski , Ray Jui , Eric Anholt , Rob Herring , Steffen Trumtrar , Harald Freudenberger , Russell King , "moderated list:BROADCOM BCM2835 ARM ARCHITECTURE" , PrasannaKumar Muralidharan , Scott Branden , "open list:HARDWARE RANDOM NUMBER GENERATOR CORE" , Martin Kaiser , Herbert Xu , "maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE..." , Matt Mackall , Mark Rutland , "moderated list:BROADCOM BCM2835 ARM ARCHITECTURE" , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , linux-kernel@vger.kernel.org, Sean Wang Message-ID: <1831955836.132229.1509820078271@email.1und1.de> In-Reply-To: <20171102010408.27736-12-f.fainelli@gmail.com> References: <20171102010408.27736-1-f.fainelli@gmail.com> <20171102010408.27736-12-f.fainelli@gmail.com> Subject: Re: [PATCH 11/12] hwrng: bcm2835-rng: Enable BCM2835 RNG to work on BCM63xx platforms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Medium X-Mailer: Open-Xchange Mailer v7.8.3-Rev36 X-Originating-Client: open-xchange-appsuite X-Provags-ID: V03:K0:PZOnPz5Rkr0UsXEY6kcYvFISpFZfTzyCwdt5TNXzoqu+KbqAxm8 4NkJoS3bAsm8PvtG823cJGGi+83tu1tgV4gzwpMw6WiTqgD4kwRRLHX39gpfsfMzweN2c5Y AFOVGKJ0bK0pqP3gATUED8mxmAyDUW7XXJ54c7aHkCRNr54eiCIPw6s90BPKKLLGKr/TZIv 0ztSE9fO3ly0OUg8udLWw== X-UI-Out-Filterresults: notjunk:1;V01:K0:mtA05m4Q96w=:jMtlouyY6m5xstXnzFvOPR oZb30ZRvxj7EyMsGIw5a7AWyzNcx8+jrAH974wU/HDXFoKiGyjHs5PL+2dR6pOyhmElDYT52k X4XBHhNZ004wHv38HXch0fWqYQ4wrBfH7lJMWNt0rVH0mLQrZBLIIYkK18my7elTvy+CwG8h1 zbvwr/obcqtGiXwHbSoG/956J2F+K6MZAZt3bdQMgmlVz4SfRSEgq+2cRxDnjq2zRI9dy+aep 3HDTgpB98Wqrmy28/SyuLo4Hqtz014mcElbOg1H0E1ZLAjp9gvkL8hx/rkt+KfxoCB+sb3Xcm UDZ7boXM7D4p6iQ+9kYSG801cGftbA+oQ0OozAVowQCNIhtU3r1vcc9uTt9LvQPKDyEIX1H6j Zb07xq5gpna/UVLUTNmbltjQVrJRVQkHLjlMuOyRRJuZjseYtYdoBr/SkcgL4uMYQCWOnA/Vc JzB0Ln1/JKjrHO3XPBsAnoJBQ1gkSD/fPqnC21D/jW5aIhtypqSqrR4vPXTQIMtnqKJz+ao2G 6EgL0TUGBZ3XgXY6fVz3VffFS4UzbWme4DkPnlMZO1oYTxYbVKJi1O3CpMl1W8cQ5XxSyH0hJ D6Gv5ActE3H0zE3bL41Tv4/5DdWRCHopFSBy8F/RHn4Y/ivF0Ixfh9dL7kztYFX8TwslUpCk9 NGqplUKZlAfTFYWqTnCMihMkYvlr9DbTqlqrLRRDixK3Sh/+lq9mM3i6D0h5IB4DmXIthWz8l X574YL+JzrqQz1uOJ5MsZKvLS+AHk8+3uWBWTLkSUE0blh2cpqbStaWtMhc= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Florian > Florian Fainelli hat am 2. November 2017 um 02:04 geschrieben: > > > We have now incorporated all necessary functionality for the BCM63xx > platforms to successfully migrate over bcm2835-rng, so add the final > bits: Kconfig selection and proper platform_device device type matching > to keep the same platform device name for registration to work. > > Signed-off-by: Florian Fainelli > --- > drivers/char/hw_random/Kconfig | 7 ++++--- > drivers/char/hw_random/bcm2835-rng.c | 11 ++++++++++- > 2 files changed, 14 insertions(+), 4 deletions(-) > > diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig > index 95a031e9eced..d0689cc8c7fc 100644 > --- a/drivers/char/hw_random/Kconfig > +++ b/drivers/char/hw_random/Kconfig > @@ -87,12 +87,13 @@ config HW_RANDOM_BCM63XX > If unusure, say Y. > > config HW_RANDOM_BCM2835 > - tristate "Broadcom BCM2835 Random Number Generator support" > - depends on ARCH_BCM2835 || ARCH_BCM_NSP || ARCH_BCM_5301X > + tristate "Broadcom BCM2835/BCM63xx Random Number Generator support" > + depends on ARCH_BCM2835 || ARCH_BCM_NSP || ARCH_BCM_5301X || \ > + ARCH_BCM_63XX || BCM63XX || BMIPS_GENERIC > default HW_RANDOM > ---help--- > This driver provides kernel-side support for the Random Number > - Generator hardware found on the Broadcom BCM2835 SoCs. > + Generator hardware found on the Broadcom BCM2835 and BCM63xx SoCs. > > To compile this driver as a module, choose M here: the > module will be called bcm2835-rng > diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c > index 650e0033c273..d9ffe14f312b 100644 > --- a/drivers/char/hw_random/bcm2835-rng.c > +++ b/drivers/char/hw_random/bcm2835-rng.c > @@ -131,6 +131,7 @@ static const struct of_device_id bcm2835_rng_of_match[] = { > { .compatible = "brcm,bcm2835-rng"}, > { .compatible = "brcm,bcm-nsp-rng", .data = &nsp_rng_of_data }, > { .compatible = "brcm,bcm5301x-rng", .data = &nsp_rng_of_data }, > + { .compatible = "brcm,bcm6368-rng"}, > {}, > }; > > @@ -164,7 +165,7 @@ static int bcm2835_rng_probe(struct platform_device *pdev) > if (IS_ERR(priv->clk)) > priv->clk = NULL; > > - priv->rng.name = "bcm2835-rng"; > + priv->rng.name = pdev->id_entry->name; this change breaks registration on bcm2835, because the name is NULL. Regards Stefan > priv->rng.init = bcm2835_rng_init; > priv->rng.read = bcm2835_rng_read; > priv->rng.cleanup = bcm2835_rng_cleanup; > @@ -190,12 +191,20 @@ static int bcm2835_rng_probe(struct platform_device *pdev) > > MODULE_DEVICE_TABLE(of, bcm2835_rng_of_match); > > +static struct platform_device_id bcm2835_rng_devtype[] = { > + { .name = "bcm2835-rng" }, > + { .name = "bcm63xx-rng" }, > + { /* sentinel */ } > +}; > +MODULE_DEVICE_TABLE(platform, bcm2835_rng_devtype); > + > static struct platform_driver bcm2835_rng_driver = { > .driver = { > .name = "bcm2835-rng", > .of_match_table = bcm2835_rng_of_match, > }, > .probe = bcm2835_rng_probe, > + .id_table = bcm2835_rng_devtype, > }; > module_platform_driver(bcm2835_rng_driver); > > -- > 2.9.3 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel