manual merge for pm-hwmod-uart due to conflicts