8960-display:revert to d2-common 8960-h: add define for infiniteuscc tap m2-display:revert to d2-common