Merge branch 'clk-qcom-rpm' into clk-next

* clk-qcom-rpm:
  clk: qcom: Add support for RPM Clocks
  clk: qcom: Add support for SMD-RPM Clocks
  clk: qcom: Always add factor clock for xo clocks

diff --cc drivers/clk/qcom/Kconfig
Simple merge

diff --cc drivers/clk/qcom/Makefile
Simple merge

diff --cc drivers/clk/qcom/common.c
Simple merge