Merge "msm: 8x25: board: share the same ADM channel between NAND and eMMC" into msm-3.4