Merge "ipq807x: Detect NOC error"