Merge branches 'clk-typo', 'clk-json-schema', 'clk-mtk-2712-eco' and 'clk-rockchip...

[sfrench/cifs-2.6.git] / drivers / clk / mediatek / clk-mt2712.c

diff --git a/drivers/clk/mediatek/clk-mt2712.c b/drivers/clk/mediatek/clk-mt2712.c
index 991d4093726e5c1a191af47895a2dd247a53f9dc..b09cb3d99f66f939b5e948a4aed229d8ae6311d2 100644 (file)
--- a/drivers/clk/mediatek/clk-mt2712.c
+++ b/drivers/clk/mediatek/clk-mt2712.c
@@ -223,6 +223,8 @@ static const struct mtk_fixed_factor top_divs[] = {
                4),
        FACTOR(CLK_TOP_APLL1_D3, "apll1_d3", "apll1_ck", 1,
                3),
+       FACTOR(CLK_TOP_APLL2_D3, "apll2_d3", "apll2_ck", 1,
+               3),
 };
 
 static const char * const axi_parents[] = {
@@ -594,7 +596,8 @@ static const char * const a1sys_hp_parents[] = {
        "apll1_ck",
        "apll1_d2",
        "apll1_d4",
-       "apll1_d8"
+       "apll1_d8",
+       "apll1_d3"
 };
 
 static const char * const a2sys_hp_parents[] = {
@@ -602,7 +605,8 @@ static const char * const a2sys_hp_parents[] = {
        "apll2_ck",
        "apll2_d2",
        "apll2_d4",
-       "apll2_d8"
+       "apll2_d8",
+       "apll2_d3"
 };
 
 static const char * const asm_l_parents[] = {
@@ -1463,7 +1467,6 @@ static struct platform_driver clk_mt2712_drv = {
        .probe = clk_mt2712_probe,
        .driver = {
                .name = "clk-mt2712",
-               .owner = THIS_MODULE,
                .of_match_table = of_match_clk_mt2712,
        },
 };