Merge "plat: imx8m: Add the aipstz init to config peripheral access" into integration

author Soby Mathew <soby.mathew@arm.com>

Tue, 28 May 2019 13:18:56 +0000 (13:18 +0000)

committer TrustedFirmware Code Review <review@review.trustedfirmware.org>

Tue, 28 May 2019 13:18:56 +0000 (13:18 +0000)
author Soby Mathew <soby.mathew@arm.com>
Tue, 28 May 2019 13:18:56 +0000 (13:18 +0000)
committer TrustedFirmware Code Review <review@review.trustedfirmware.org>
Tue, 28 May 2019 13:18:56 +0000 (13:18 +0000)
diff --cc plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
Simple merge
author	Soby Mathew <soby.mathew@arm.com>
	Tue, 28 May 2019 13:18:56 +0000 (13:18 +0000)
committer	TrustedFirmware Code Review <review@review.trustedfirmware.org>
	Tue, 28 May 2019 13:18:56 +0000 (13:18 +0000)