arm: Xilinx Zynq SoC patches for v4.2

- Change SoC reset path
 - Fix SLCR unlock scheme
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iEYEABECAAYFAlVZ47oACgkQykllyylKDCFw2gCfcaUI+Sy9ewZ5IvbFPa36Kr9e
 1JUAn28Ze85ddkUNw/3XxVywSXPre7Ie
 =eDcD
 -----END PGP SIGNATURE-----

Merge tag 'zynq-soc-for-4.2' of https://github.com/Xilinx/linux-xlnx into next/soc

Merge "arm: Xilinx Zynq SoC patches for v4.2" from Michal Simek:

- Change SoC reset path
- Fix SLCR unlock scheme

* tag 'zynq-soc-for-4.2' of https://github.com/Xilinx/linux-xlnx:
  ARM: zynq: Drop use of slcr_unlock in zynq_slcr_system_restart
  ARM: zynq: Use restart_handler mechanism for slcr reset
This commit is contained in:
Arnd Bergmann 2015-05-20 17:41:15 +02:00
commit e0f8864fb4
3 changed files with 19 additions and 16 deletions