diff options
| author | Olof Johansson <olof@lixom.net> | 2018-05-15 13:49:13 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-05-15 13:49:13 -0700 |
| commit | deae9088c58a580674449477294926a4b0aa4a34 (patch) | |
| tree | 110e88fa3e7f9f1f44333b67b40152208c9cc4a4 /net/tipc | |
| parent | 51fe3a373ee44bbad72a27c56110f3c1d80c0a04 (diff) | |
| parent | d7bab65b1f57cdf2d81fc469cea6b2160a50e917 (diff) | |
| download | linux-deae9088c58a580674449477294926a4b0aa4a34.tar.gz linux-deae9088c58a580674449477294926a4b0aa4a34.tar.bz2 linux-deae9088c58a580674449477294926a4b0aa4a34.zip | |
Merge tag 'reset-for-4.18' of git://git.pengutronix.de/pza/linux into next/drivers
Reset controller changes for v4.18
This adds PCIe, SATA, and HSC reset control support on various Uniphier
SoCs. PCIe reset control is added for Pro5, LD20, and PXs3 SoCs, SATA
reset control support is added on Pro4 and PXs3 SoCs. The previously
added PXs2 SATA reset control identifier is changed to the same value
for consistency. HSC (MPEG2 transport stream I/O and demux system) reset
controls are added for LD11 and LD20 SoCs.
* tag 'reset-for-4.18' of git://git.pengutronix.de/pza/linux:
reset: uniphier: add LD11/LD20 stream demux system reset control
reset: uniphier: add SATA reset control support and change SATA-PHY ID
reset: uniphier: add PCIe reset control support
reset: uniphier: fix USB clock line for LD20
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'net/tipc')
0 files changed, 0 insertions, 0 deletions