Skip to content
Commit deae9088 authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents 51fe3a37 d7bab65b
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment