Commit 61ccc8c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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 handful of clk driver fixes:

   - Avoid a deadlock in the Qualcomm clk driver by making the regulator
     which supplies the GDSC optional

   - Restore RPM clks on Qualcomm msm8976 by setting num_clks

   - Fix Allwinner H6 CPU rate changing logic to avoid system crashes by
     temporarily reparenting the CPU clk to something that isn't being
     changed

   - Set a MIPI PLL min/max rate on Allwinner A64 to fix blank screens
     on some devices

   - Revert back to of_match_device() in the Samsung clkout driver to
     get the match data based on the parent device's compatible string"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: samsung: Revert "clk: Use device_get_match_data()"
  clk: sunxi-ng: a64: Set minimum and maximum rate for PLL-MIPI
  clk: sunxi-ng: common: Support minimum and maximum rate
  clk: sunxi-ng: h6: Reparent CPUX during PLL CPUX rate change
  clk: qcom: smd-rpm: Restore msm8976 num_clk
  clk: qcom: gdsc: treat optional supplies as optional
parents 7367539a aacb99de

drivers/clk/qcom/clk-smd-rpm.c

+1 −0
Original line number Diff line number Diff line
@@ -768,6 +768,7 @@ static struct clk_smd_rpm *msm8976_clks[] = { 


static const struct rpm_smd_clk_desc rpm_clk_msm8976 = {

	.clks = msm8976_clks,

	.num_clks = ARRAY_SIZE(msm8976_clks),

	.icc_clks = bimc_pcnoc_snoc_smmnoc_icc_clks,

	.num_icc_clks = ARRAY_SIZE(bimc_pcnoc_snoc_smmnoc_icc_clks),

};

drivers/clk/qcom/gdsc.c

+8 −3
Original line number Diff line number Diff line
@@ -487,9 +487,14 @@ int gdsc_register(struct gdsc_desc *desc, 
		if (!scs[i] || !scs[i]->supply)

			continue;



		scs[i]->rsupply = devm_regulator_get(dev, scs[i]->supply);

		if (IS_ERR(scs[i]->rsupply))

			return PTR_ERR(scs[i]->rsupply);

		scs[i]->rsupply = devm_regulator_get_optional(dev, scs[i]->supply);

		if (IS_ERR(scs[i]->rsupply)) {

			ret = PTR_ERR(scs[i]->rsupply);

			if (ret != -ENODEV)

				return ret;



			scs[i]->rsupply = NULL;

		}

	}



	data->num_domains = num;

drivers/clk/samsung/clk-exynos-clkout.c

+10 −3
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ 
#include <linux/io.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/pm.h>

#include <linux/property.h>



#define EXYNOS_CLKOUT_NR_CLKS		1

#define EXYNOS_CLKOUT_PARENTS		32
@@ -84,17 +84,24 @@ MODULE_DEVICE_TABLE(of, exynos_clkout_ids); 
static int exynos_clkout_match_parent_dev(struct device *dev, u32 *mux_mask)

{

	const struct exynos_clkout_variant *variant;

	const struct of_device_id *match;



	if (!dev->parent) {

		dev_err(dev, "not instantiated from MFD\n");

		return -EINVAL;

	}



	variant = device_get_match_data(dev->parent);

	if (!variant) {

	/*

	 * 'exynos_clkout_ids' arrays is not the ids array matched by

	 * the dev->parent driver, so of_device_get_match_data() or

	 * device_get_match_data() cannot be used here.

	 */

	match = of_match_device(exynos_clkout_ids, dev->parent);

	if (!match) {

		dev_err(dev, "cannot match parent device\n");

		return -EINVAL;

	}

	variant = match->data;



	*mux_mask = variant->mux_mask;

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

+2 −0
Original line number Diff line number Diff line
@@ -182,6 +182,8 @@ static struct ccu_nkm pll_mipi_clk = { 
					      &ccu_nkm_ops,

					      CLK_SET_RATE_UNGATE | CLK_SET_RATE_PARENT),

		.features	= CCU_FEATURE_CLOSEST_RATE,

		.min_rate	= 500000000,

		.max_rate	= 1400000000,

	},

};

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

+17 −2
Original line number Diff line number Diff line
@@ -1181,11 +1181,18 @@ static const u32 usb2_clk_regs[] = { 
	SUN50I_H6_USB3_CLK_REG,

};



static struct ccu_mux_nb sun50i_h6_cpu_nb = {

	.common		= &cpux_clk.common,

	.cm		= &cpux_clk.mux,

	.delay_us       = 1,

	.bypass_index   = 0, /* index of 24 MHz oscillator */

};



static int sun50i_h6_ccu_probe(struct platform_device *pdev)

{

	void __iomem *reg;

	int i, ret;

	u32 val;

	int i;



	reg = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(reg))
@@ -1252,7 +1259,15 @@ static int sun50i_h6_ccu_probe(struct platform_device *pdev) 
	val |= BIT(24);

	writel(val, reg + SUN50I_H6_HDMI_CEC_CLK_REG);



	return devm_sunxi_ccu_probe(&pdev->dev, reg, &sun50i_h6_ccu_desc);

	ret = devm_sunxi_ccu_probe(&pdev->dev, reg, &sun50i_h6_ccu_desc);

	if (ret)

		return ret;



	/* Reparent CPU during PLL CPUX rate changes */

	ccu_mux_notifier_register(pll_cpux_clk.common.hw.clk,

				  &sun50i_h6_cpu_nb);



	return 0;

}



static const struct of_device_id sun50i_h6_ccu_ids[] = {