Merge series from Konrad Dybcio <konrad.dybcio@linaro.org>: Like most Qualcomm SoCs, SM6115 has a TX Macro. Only some minor changes were required.