Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BCM270x: Make bcm2835-pm-wdt and bcm2835-rng available #998

Merged
merged 2 commits into from Jun 2, 2015

Conversation

notro
Copy link
Contributor

@notro notro commented Jun 2, 2015

This makes it possible to use the mainline watchdog and random generator drivers:

dtparam=watchdog=on
dtparam=random=on

Test

$ sudo hexdump /dev/hwrng
0000000 a043 babf 4846 1add 30a4 cc16 6e32 0544
[...]

# Trigger watchdog reboot
$ sudo cat /dev/watchdog
cat: /dev/watchdog: Invalid argugment [  104.735203] watchdog watchdog0: watchdog did not stop!

bcm2708_wdog and bcm2708-rng can still be used.

Tested on Pi1 and Pi2.

notro added 2 commits June 2, 2015 15:51
Change the kconfig dependency to make bcm2835_wdt and bcm2835-rng
available on ARCH_BCM2708 and ARCH_BCM2709.
Enable them as loadable modules in bcmrpi_defconfig and
bcm2709_defconfig.

There is a commit in linux-next that will move restart/pm_power_off
to bcm2835_wdt for ARCH_BCM2835. This will not affect ARCH_BCM270x
since arm_pm_restart (.restart = bcm2708_restart) and
pm_power_off (=bcm2708_power_off) is set in
arch/arm/mach-bcm270X/bcm270X.c and will take presedence.

Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
This makes it possible to use the mainline watchdog and
random generator drivers:
dtparam=watchdog=on
dtparam=random=on

bcm2708_wdog and bcm2708-rng can still be used.

Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
@pelwell
Copy link
Contributor

pelwell commented Jun 2, 2015

Looks good to me. This Device Tree stuff is quite useful...

@notro
Copy link
Contributor Author

notro commented Jun 2, 2015

This Device Tree stuff is quite useful...

Yes, and overlays and parameters have made it very flexible and easy to use.

popcornmix added a commit that referenced this pull request Jun 2, 2015
BCM270x: Make bcm2835-pm-wdt and bcm2835-rng available
@popcornmix popcornmix merged commit 58bf0e4 into raspberrypi:rpi-4.0.y Jun 2, 2015
@notro notro deleted the rng-wdog branch June 2, 2015 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants