[n7000] Fixups for n7000 and p3110.

Change-Id: Idc1515089473bcb78894fff3ee70d08d82231f3d