Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 10:01:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

hwrng: bcm2835 - Enable BCM2835 RNG to work on BCM63xx platforms

Browse Source 
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 <f.fainelli@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Florian Fainelli 2017-11-07 16:44:48 -08:00 committed by Herbert Xu
parent 67fe2fa8cf
commit 8705f24f7b
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/char/hw_random/Kconfig
View File

@ -87,12 +87,13 @@ config HW_RANDOM_BCM63XX
If unusure, say Y. If unusure, say Y.
config HW_RANDOM_BCM2835 config HW_RANDOM_BCM2835
tristate "Broadcom BCM2835 Random Number Generator support" tristate "Broadcom BCM2835/BCM63xx Random Number Generator support"
depends on ARCH_BCM2835 || ARCH_BCM_NSP || ARCH_BCM_5301X depends on ARCH_BCM2835 || ARCH_BCM_NSP || ARCH_BCM_5301X || \
ARCH_BCM_63XX || BCM63XX || BMIPS_GENERIC
default HW_RANDOM default HW_RANDOM
---help--- ---help---
This driver provides kernel-side support for the Random Number 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 To compile this driver as a module, choose M here: the
module will be called bcm2835-rng module will be called bcm2835-rng

11
drivers/char/hw_random/bcm2835-rng.c
View File

@ -134,6 +134,7 @@ static const struct of_device_id bcm2835_rng_of_match[] = {
{ .compatible = "brcm,bcm2835-rng"}, { .compatible = "brcm,bcm2835-rng"},
{ .compatible = "brcm,bcm-nsp-rng", .data = &nsp_rng_of_data }, { .compatible = "brcm,bcm-nsp-rng", .data = &nsp_rng_of_data },
{ .compatible = "brcm,bcm5301x-rng", .data = &nsp_rng_of_data }, { .compatible = "brcm,bcm5301x-rng", .data = &nsp_rng_of_data },
{ .compatible = "brcm,bcm6368-rng"},
{}, {},
}; };
@ -165,7 +166,7 @@ static int bcm2835_rng_probe(struct platform_device *pdev)
/* Clock is optional on most platforms */ /* Clock is optional on most platforms */
priv->clk = devm_clk_get(dev, NULL); priv->clk = devm_clk_get(dev, NULL);
priv->rng.name = "bcm2835-rng"; priv->rng.name = pdev->name;
priv->rng.init = bcm2835_rng_init; priv->rng.init = bcm2835_rng_init;
priv->rng.read = bcm2835_rng_read; priv->rng.read = bcm2835_rng_read;
priv->rng.cleanup = bcm2835_rng_cleanup; priv->rng.cleanup = bcm2835_rng_cleanup;
@ -191,12 +192,20 @@ static int bcm2835_rng_probe(struct platform_device *pdev)
MODULE_DEVICE_TABLE(of, bcm2835_rng_of_match); 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 = { static struct platform_driver bcm2835_rng_driver = {
.driver = { .driver = {
.name = "bcm2835-rng", .name = "bcm2835-rng",
.of_match_table = bcm2835_rng_of_match, .of_match_table = bcm2835_rng_of_match,
}, },
.probe = bcm2835_rng_probe, .probe = bcm2835_rng_probe,
.id_table = bcm2835_rng_devtype,
}; };
module_platform_driver(bcm2835_rng_driver); module_platform_driver(bcm2835_rng_driver);