Commit 75f486c0 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branches 'clk-qcom-msm8998', 'clk-fractional-parent', 'clk-x86-mv' and... 

Merge branches 'clk-qcom-msm8998', 'clk-fractional-parent', 'clk-x86-mv' and 'clk-SA-fixes' into clk-next

 - Updates for qcom MSM8998 GCC clks
 - qcom MSM8998 RPM managed clks
 - Random static analysis fixes for clk drivers

* clk-qcom-msm8998:
  clk: qcom: Make common clk_hw registrations
  clk: qcom: smd: Add support for MSM8998 rpm clocks
  clk: qcom: Skip halt checks on gcc_usb3_phy_pipe_clk for 8998
  clk: qcom: Add missing freq for usb30_master_clk on 8998
  clk: qcom: Add CLK_SET_RATE_PARENT for 8998 branch clocks

* clk-fractional-parent:
  clk: fractional-divider: check parent rate only if flag is set

* clk-x86-mv:
  clk: x86: Move clk-lpss.h to platform_data/x86

* clk-SA-fixes:
  clk: mediatek: fix platform_no_drv_owner.cocci warnings
  clk: tegra: dfll: Fix debugfs_simple_attr.cocci warnings
  clk: qoriq: Improve an error message
parents 461ea6ab 760be658 d13501a2 a9443a63 81229663

Documentation/devicetree/bindings/clock/qcom,rpmcc.txt

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ Required properties : 
			"qcom,rpmcc-msm8974", "qcom,rpmcc"

			"qcom,rpmcc-apq8064", "qcom,rpmcc"

			"qcom,rpmcc-msm8996", "qcom,rpmcc"

			"qcom,rpmcc-msm8998", "qcom,rpmcc"

			"qcom,rpmcc-qcs404", "qcom,rpmcc"



- #clock-cells : shall contain 1

drivers/acpi/acpi_lpss.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/mutex.h>

#include <linux/pci.h>

#include <linux/platform_device.h>

#include <linux/platform_data/clk-lpss.h>

#include <linux/platform_data/x86/clk-lpss.h>

#include <linux/platform_data/x86/pmc_atom.h>

#include <linux/pm_domain.h>

#include <linux/pm_runtime.h>

drivers/clk/clk-fractional-divider.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static long clk_fd_round_rate(struct clk_hw *hw, unsigned long rate, 
	unsigned long m, n;

	u64 ret;



	if (!rate || rate >= *parent_rate)

	if (!rate || (!clk_hw_can_set_rate_parent(hw) && rate >= *parent_rate))

		return *parent_rate;



	if (fd->approximation)

drivers/clk/clk-qoriq.c

+2 −2
Original line number Diff line number Diff line
@@ -1148,8 +1148,8 @@ static void __init create_one_pll(struct clockgen *cg, int idx) 
		pll->div[i].clk = clk;

		ret = clk_register_clkdev(clk, pll->div[i].name, NULL);

		if (ret != 0)

			pr_err("%s: %s: register to lookup table failed %ld\n",

			       __func__, pll->div[i].name, PTR_ERR(clk));

			pr_err("%s: %s: register to lookup table failed %d\n",

			       __func__, pll->div[i].name, ret);



	}

}

drivers/clk/mediatek/clk-mt2712.c

+0 −1
Original line number Diff line number Diff line
@@ -1463,7 +1463,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,

	},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE