Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fixes from Stephen Boyd:
"A randconfig build fix and a performance fix:
- Fix the CONFIG_RESET_CONTROLLER=n path signature of
clk_imx8mp_audiomix_reset_controller_register() to appease
randconfig
- Speed up the sdhci clk on TH1520 by a factor of 4 by adding
a fixed factor clk"
* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
clk: clk-imx8mp-audiomix: fix function signature
clk: thead: Fix TH1520 emmc and shdci clock rate
+14
-2
+2
-1
drivers/clk/imx/clk-imx8mp-audiomix.c
+2
-1
drivers/clk/imx/clk-imx8mp-audiomix.c
···
278
278
279
279
#else /* !CONFIG_RESET_CONTROLLER */
280
280
281
-
static int clk_imx8mp_audiomix_reset_controller_register(struct clk_imx8mp_audiomix_priv *priv)
281
+
static int clk_imx8mp_audiomix_reset_controller_register(struct device *dev,
282
+
struct clk_imx8mp_audiomix_priv *priv)
282
283
{
283
284
return 0;
284
285
}
+12
-1
drivers/clk/thead/clk-th1520-ap.c
+12
-1
drivers/clk/thead/clk-th1520-ap.c
···
779
779
},
780
780
};
781
781
782
+
static CLK_FIXED_FACTOR_HW(emmc_sdio_ref_clk, "emmc-sdio-ref",
783
+
&video_pll_clk.common.hw, 4, 1, 0);
784
+
785
+
static const struct clk_parent_data emmc_sdio_ref_clk_pd[] = {
786
+
{ .hw = &emmc_sdio_ref_clk.hw },
787
+
};
788
+
782
789
static CCU_GATE(CLK_BROM, brom_clk, "brom", ahb2_cpusys_hclk_pd, 0x100, BIT(4), 0);
783
790
static CCU_GATE(CLK_BMU, bmu_clk, "bmu", axi4_cpusys2_aclk_pd, 0x100, BIT(5), 0);
784
791
static CCU_GATE(CLK_AON2CPU_A2X, aon2cpu_a2x_clk, "aon2cpu-a2x", axi4_cpusys2_aclk_pd,
···
805
798
0x150, BIT(12), 0);
806
799
static CCU_GATE(CLK_NPU_AXI, npu_axi_clk, "npu-axi", axi_aclk_pd, 0x1c8, BIT(5), 0);
807
800
static CCU_GATE(CLK_CPU2VP, cpu2vp_clk, "cpu2vp", axi_aclk_pd, 0x1e0, BIT(13), 0);
808
-
static CCU_GATE(CLK_EMMC_SDIO, emmc_sdio_clk, "emmc-sdio", video_pll_clk_pd, 0x204, BIT(30), 0);
801
+
static CCU_GATE(CLK_EMMC_SDIO, emmc_sdio_clk, "emmc-sdio", emmc_sdio_ref_clk_pd, 0x204, BIT(30), 0);
809
802
static CCU_GATE(CLK_GMAC1, gmac1_clk, "gmac1", gmac_pll_clk_pd, 0x204, BIT(26), 0);
810
803
static CCU_GATE(CLK_PADCTRL1, padctrl1_clk, "padctrl1", perisys_apb_pclk_pd, 0x204, BIT(24), 0);
811
804
static CCU_GATE(CLK_DSMART, dsmart_clk, "dsmart", perisys_apb_pclk_pd, 0x204, BIT(23), 0);
···
1065
1058
if (ret)
1066
1059
return ret;
1067
1060
priv->hws[CLK_PLL_GMAC_100M] = &gmac_pll_clk_100m.hw;
1061
+
1062
+
ret = devm_clk_hw_register(dev, &emmc_sdio_ref_clk.hw);
1063
+
if (ret)
1064
+
return ret;
1068
1065
1069
1066
ret = devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, priv);
1070
1067
if (ret)