Commit 0b0d4be6 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:
 "This is a sort of random collection of clk fixes that have come in
  since the merge window:

   - Handful of memory allocation and potentially bad pointer usage
     fixes

   - JSON format was incorrect for clk_dump because it missed a comma

   - Two Kconfig fixes, one duplicate and one missing select line

   - Compiler warning fix for the VC5 clk driver

   - Name and rate fixes for PLLs in the stratix10 driver so it can
     properly detect PLL rates and parents"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: socfpga: stratix10: fix naming convention for the fixed-clocks
  clk: socfpga: stratix10: fix rate calculation for pll clocks
  clk: qcom: Select QCOM_GDSC with MSM_GCC_8998
  clk: vc5: Abort clock configuration without upstream clock
  clk: sysfs: fix invalid JSON in clk_dump
  clk: imx: Remove Kconfig duplicate include
  clk: zynqmp: Fix memory allocation in zynqmp_clk_setup
  clk: tegra: dfll: Fix a potential Oop in remove()
  clk: imx: fix potential NULL dereference in imx8qxp_lpcg_clk_probe()
parents 8f45fa27 b488517b

drivers/clk/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -293,7 +293,6 @@ config COMMON_CLK_BD718XX 
source "drivers/clk/actions/Kconfig"

source "drivers/clk/bcm/Kconfig"

source "drivers/clk/hisilicon/Kconfig"

source "drivers/clk/imx/Kconfig"

source "drivers/clk/imgtec/Kconfig"

source "drivers/clk/imx/Kconfig"

source "drivers/clk/ingenic/Kconfig"

drivers/clk/clk-versaclock5.c

+3 −1
Original line number Diff line number Diff line
@@ -262,8 +262,10 @@ static int vc5_mux_set_parent(struct clk_hw *hw, u8 index) 


		if (vc5->clk_mux_ins == VC5_MUX_IN_XIN)

			src = VC5_PRIM_SRC_SHDN_EN_XTAL;

		if (vc5->clk_mux_ins == VC5_MUX_IN_CLKIN)

		else if (vc5->clk_mux_ins == VC5_MUX_IN_CLKIN)

			src = VC5_PRIM_SRC_SHDN_EN_CLKIN;

		else /* Invalid; should have been caught by vc5_probe() */

			return -EINVAL;

	}



	return regmap_update_bits(vc5->regmap, VC5_PRIM_SRC_SHDN, mask, src);

drivers/clk/clk.c

+1 −1
Original line number Diff line number Diff line
@@ -2779,7 +2779,7 @@ static void clk_dump_one(struct seq_file *s, struct clk_core *c, int level) 
	seq_printf(s, "\"protect_count\": %d,", c->protect_count);

	seq_printf(s, "\"rate\": %lu,", clk_core_get_rate(c));

	seq_printf(s, "\"accuracy\": %lu,", clk_core_get_accuracy(c));

	seq_printf(s, "\"phase\": %d", clk_core_get_phase(c));

	seq_printf(s, "\"phase\": %d,", clk_core_get_phase(c));

	seq_printf(s, "\"duty_cycle\": %u",

		   clk_core_get_scaled_duty_cycle(c, 100000));

}

drivers/clk/imx/clk-imx8qxp-lpcg.c

+2 −0
Original line number Diff line number Diff line
@@ -169,6 +169,8 @@ static int imx8qxp_lpcg_clk_probe(struct platform_device *pdev) 
		return -ENODEV;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res)

		return -EINVAL;

	base = devm_ioremap(dev, res->start, resource_size(res));

	if (!base)

		return -ENOMEM;

drivers/clk/qcom/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ config MSM_MMCC_8996 


config MSM_GCC_8998

	tristate "MSM8998 Global Clock Controller"

	select QCOM_GDSC

	help

	  Support for the global clock controller on msm8998 devices.

	  Say Y if you want to use peripheral devices such as UART, SPI,

CRA Git | Maintained and supported by SUSTech CRA and CCSE