Commit 53c9c276 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-fixes' into clk-next 

* clk-fixes:
  clk: clk-loongson2: Fix the number count of clk provider
  clk: mmp2: call pm_genpd_init() only after genpd.name is set
  clk: sunxi-ng: a100: enable MMC clock reparenting
  clk: clk-imx8mp-audiomix: fix function signature
  clk: thead: Fix TH1520 emmc and shdci clock rate
parents 1d2da923 5fb33b67

drivers/clk/clk-loongson2.c

+4 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static int loongson2_clk_probe(struct platform_device *pdev) 
		return -EINVAL;



	for (p = data; p->name; p++)

		clks_num++;

		clks_num = max(clks_num, p->id + 1);



	clp = devm_kzalloc(dev, struct_size(clp, clk_data.hws, clks_num),

			   GFP_KERNEL);
@@ -309,6 +309,9 @@ static int loongson2_clk_probe(struct platform_device *pdev) 
	clp->clk_data.num = clks_num;

	clp->dev = dev;



	/* Avoid returning NULL for unused id */

	memset_p((void **)clp->clk_data.hws, ERR_PTR(-ENOENT), clks_num);



	for (i = 0; i < clks_num; i++) {

		p = &data[i];

		switch (p->type) {

drivers/clk/imx/clk-imx8mp-audiomix.c

+2 −1
Original line number Diff line number Diff line
@@ -278,7 +278,8 @@ static int clk_imx8mp_audiomix_reset_controller_register(struct device *dev, 


#else /* !CONFIG_RESET_CONTROLLER */



static int clk_imx8mp_audiomix_reset_controller_register(struct clk_imx8mp_audiomix_priv *priv)

static int clk_imx8mp_audiomix_reset_controller_register(struct device *dev,

							 struct clk_imx8mp_audiomix_priv *priv)

{

	return 0;

}

drivers/clk/mmp/pwr-island.c

+1 −1
Original line number Diff line number Diff line
@@ -106,10 +106,10 @@ struct generic_pm_domain *mmp_pm_domain_register(const char *name, 
	pm_domain->flags = flags;

	pm_domain->lock = lock;



	pm_genpd_init(&pm_domain->genpd, NULL, true);

	pm_domain->genpd.name = name;

	pm_domain->genpd.power_on = mmp_pm_domain_power_on;

	pm_domain->genpd.power_off = mmp_pm_domain_power_off;

	pm_genpd_init(&pm_domain->genpd, NULL, true);



	return &pm_domain->genpd;

}

drivers/clk/sunxi-ng/ccu-sun50i-a100.c

+3 −3
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ static SUNXI_CCU_MP_WITH_MUX_GATE_POSTDIV(mmc0_clk, "mmc0", mmc_parents, 0x830, 
					  24, 2,	/* mux */

					  BIT(31),	/* gate */

					  2,		/* post-div */

					  CLK_SET_RATE_NO_REPARENT);

					  0);



static SUNXI_CCU_MP_WITH_MUX_GATE_POSTDIV(mmc1_clk, "mmc1", mmc_parents, 0x834,

					  0, 4,		/* M */
@@ -444,7 +444,7 @@ static SUNXI_CCU_MP_WITH_MUX_GATE_POSTDIV(mmc1_clk, "mmc1", mmc_parents, 0x834, 
					  24, 2,	/* mux */

					  BIT(31),	/* gate */

					  2,		/* post-div */

					  CLK_SET_RATE_NO_REPARENT);

					  0);



static SUNXI_CCU_MP_WITH_MUX_GATE_POSTDIV(mmc2_clk, "mmc2", mmc_parents, 0x838,

					  0, 4,		/* M */
@@ -452,7 +452,7 @@ static SUNXI_CCU_MP_WITH_MUX_GATE_POSTDIV(mmc2_clk, "mmc2", mmc_parents, 0x838, 
					  24, 2,	/* mux */

					  BIT(31),	/* gate */

					  2,		/* post-div */

					  CLK_SET_RATE_NO_REPARENT);

					  0);



static SUNXI_CCU_GATE(bus_mmc0_clk, "bus-mmc0", "ahb3", 0x84c, BIT(0), 0);

static SUNXI_CCU_GATE(bus_mmc1_clk, "bus-mmc1", "ahb3", 0x84c, BIT(1), 0);

drivers/clk/thead/clk-th1520-ap.c

+12 −1
Original line number Diff line number Diff line
@@ -779,6 +779,13 @@ static struct ccu_div dpu1_clk = { 
	},

};



static CLK_FIXED_FACTOR_HW(emmc_sdio_ref_clk, "emmc-sdio-ref",

			   &video_pll_clk.common.hw, 4, 1, 0);



static const struct clk_parent_data emmc_sdio_ref_clk_pd[] = {

	{ .hw = &emmc_sdio_ref_clk.hw },

};



static CCU_GATE(CLK_BROM, brom_clk, "brom", ahb2_cpusys_hclk_pd, 0x100, BIT(4), 0);

static CCU_GATE(CLK_BMU, bmu_clk, "bmu", axi4_cpusys2_aclk_pd, 0x100, BIT(5), 0);

static CCU_GATE(CLK_AON2CPU_A2X, aon2cpu_a2x_clk, "aon2cpu-a2x", axi4_cpusys2_aclk_pd,
@@ -798,7 +805,7 @@ static CCU_GATE(CLK_PERISYS_APB4_HCLK, perisys_apb4_hclk, "perisys-apb4-hclk", p 
		0x150, BIT(12), 0);

static CCU_GATE(CLK_NPU_AXI, npu_axi_clk, "npu-axi", axi_aclk_pd, 0x1c8, BIT(5), 0);

static CCU_GATE(CLK_CPU2VP, cpu2vp_clk, "cpu2vp", axi_aclk_pd, 0x1e0, BIT(13), 0);

static CCU_GATE(CLK_EMMC_SDIO, emmc_sdio_clk, "emmc-sdio", video_pll_clk_pd, 0x204, BIT(30), 0);

static CCU_GATE(CLK_EMMC_SDIO, emmc_sdio_clk, "emmc-sdio", emmc_sdio_ref_clk_pd, 0x204, BIT(30), 0);

static CCU_GATE(CLK_GMAC1, gmac1_clk, "gmac1", gmac_pll_clk_pd, 0x204, BIT(26), 0);

static CCU_GATE(CLK_PADCTRL1, padctrl1_clk, "padctrl1", perisys_apb_pclk_pd, 0x204, BIT(24), 0);

static CCU_GATE(CLK_DSMART, dsmart_clk, "dsmart", perisys_apb_pclk_pd, 0x204, BIT(23), 0);
@@ -1060,6 +1067,10 @@ static int th1520_clk_probe(struct platform_device *pdev) 
		return ret;

	priv->hws[CLK_PLL_GMAC_100M] = &gmac_pll_clk_100m.hw;



	ret = devm_clk_hw_register(dev, &emmc_sdio_ref_clk.hw);

	if (ret)

		return ret;



	ret = devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, priv);

	if (ret)

		return ret;