From: Olof Johansson Date: Tue, 15 May 2018 20:49:13 +0000 (-0700) Subject: Merge tag 'reset-for-4.18' of git://git.pengutronix.de/pza/linux into next/drivers X-Git-Tag: v4.18-rc1~49^2~5 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=deae9088c58a580674449477294926a4b0aa4a34;p=linux.git 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 --- deae9088c58a580674449477294926a4b0aa4a34