Merge "ipq4019: Common dts support for nor and nor plus emmc" into eggplant