Merge "ARM: dts: msm: Correct funnel port of modem_etm for sdxpoorwills"