Both the qcm2290 and sm6115 gcc drivers need a non-standard Alpha PLL register map for DEFAULT and BRAMMO types. The initial gcc-sm6115 was lacking the DEFAULT override, so fix that first, then merge the two overrides by using newly created DEFAULT_EVO and BRAMMO_EVO types. Adam Skladowski (1): clk: qcom: gcc-sm6115: Override default Alpha PLL regs Iskren Chernev (2): clk: qcom: gcc-sm6115: Move alpha pll bramo overrides clk: qcom: Merge alt alpha plls for qcm2260, sm6115 drivers/clk/qcom/clk-alpha-pll.c | 21 ++++++++++++ drivers/clk/qcom/clk-alpha-pll.h | 2 ++ drivers/clk/qcom/gcc-qcm2290.c | 56 +++++++++----------------------- drivers/clk/qcom/gcc-sm6115.c | 48 ++++++++++----------------- 4 files changed, 57 insertions(+), 70 deletions(-) -- 2.37.2