Merge "vad: enable tm2 vad wakeup [2/2]" into amlogic-4.9-dev

author Jianxin Pan <jianxin.pan@amlogic.com>

Fri, 27 Sep 2019 11:48:59 +0000 (04:48 -0700)

committer Gerrit Code Review <gituser@scgit2.amlogic.com>

Fri, 27 Sep 2019 11:49:00 +0000 (04:49 -0700)
author Jianxin Pan <jianxin.pan@amlogic.com>
Fri, 27 Sep 2019 11:48:59 +0000 (04:48 -0700)
committer Gerrit Code Review <gituser@scgit2.amlogic.com>
Fri, 27 Sep 2019 11:49:00 +0000 (04:49 -0700)
diff --cc arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
Simple merge
diff --cc arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts
Simple merge
diff --cc arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
Simple merge
diff --cc arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
Simple merge
author	Jianxin Pan <jianxin.pan@amlogic.com>
	Fri, 27 Sep 2019 11:48:59 +0000 (04:48 -0700)
committer	Gerrit Code Review <gituser@scgit2.amlogic.com>
	Fri, 27 Sep 2019 11:49:00 +0000 (04:49 -0700)
		1	2
arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts	patch \|	diff1 \|	diff2 \|	blob \| history