diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2016-07-07 14:09:00 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 14:09:00 +0200 |
| commit | 7dccd2ec967dbf64464c4681d81d0af07edfac34 (patch) | |
| tree | 577fa49330cdfe7199a855280b1480c13e867260 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'tegra-for-4.8-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers (diff) | |
| parent | Merge branch 'reset/explicit-api' into reset/next (diff) | |
| download | wireguard-linux-7dccd2ec967dbf64464c4681d81d0af07edfac34.tar.xz wireguard-linux-7dccd2ec967dbf64464c4681d81d0af07edfac34.zip | |
Merge tag 'reset-for-4.8-3' of git://git.pengutronix.de/git/pza/linux into next/drivers
Merge "Reset controller changes for v4.8, part 3" from Philipp Zabel:
- change request API to be more explicit about the difference between
exclusive and shared resets (the former guarantee the reset line is
asserted immediately when reset_control_assert is called, the latter
are refcounted and do not guarantee this).
- add Hisilicon hi6220 media subsystem reset controller support
- add TI SYSCON based reset controller support
* tag 'reset-for-4.8-3' of git://git.pengutronix.de/git/pza/linux:
reset: add TI SYSCON based reset driver
Documentation: dt: reset: Add TI syscon reset binding
reset: hisilicon: Add hi6220 media subsystem reset support
reset: hisilicon: Change to syscon register access
arm64: dts: hi6220: Add media subsystem reset dts
reset: hisilicon: Add media reset controller binding
reset: TRIVIAL: Add line break at same place for similar APIs
reset: Supply *_shared variant calls when using *_optional APIs
reset: Supply *_shared variant calls when using of_* API
reset: Ensure drivers are explicit when requesting reset lines
reset: Reorder inline reset_control_get*() wrappers
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions