Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37aa4dac 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 driver fixes from Stephen Boyd:
 "An assortment of vendor specific clk drivers fixes, most notably
  fallout from adding Tegra210 and rockchip rk3036/rk3368 drivers this
  cycle.

  There's also the random smattering of sparse/checker fixes, a build
  "fix" to get the Tango clk driver to compile because the Kconfig
  symbol was renamed after the fact, and a clk gpio fix for a patch
  mismerge"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (28 commits)
  clk: gpio: Really allow an optional clock= DT property
  Revert "clk: qcom: Specify LE device endianness"
  clk: versatile: mask VCO bits before writing
  clk: tegra: super: Fix sparse warnings for functions not declared as static
  clk: tegra: Fix sparse warnings for functions not declared as static
  clk: tegra: Fix sparse warning for pll_m
  clk: tegra: Use definition for pll_u override bit
  clk: tegra: Fix warning caused by pll_u failing to lock
  clk: tegra: Fix clock sources for Tegra210 EMC
  clk: tegra: Add the APB2APE audio clock on Tegra210
  clk: tegra: Add missing of_node_put()
  clk: tegra: Fix PLLE SS coefficients
  clk: tegra: Fix typos around clearing PLLE bits during enable
  clk: tegra: Do not disable PLLE when under hardware control
  clk: tegra: Fix pllx dyn step calculation
  clk: tegra: pll: Fix potential sleeping-while-atomic
  clk: tegra: Fix the misnaming of nvenc from msenc
  clk: tegra: Fix naming of MISC registers
  clk: tango4: rename ARCH_TANGOX to ARCH_TANGO
  clk: scpi: Fix checking return value of platform_device_register_simple()
  ...
parents a703f42d 4462b4bb

Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ that they are defined using standard clock bindings with following 
clock-output-names:

clock-output-names:

 - "xin24m" - crystal input - required,

 - "xin24m" - crystal input - required,

 - "ext_i2s" - external I2S clock - optional,

 - "ext_i2s" - external I2S clock - optional,

 - "ext_gmac" - external GMAC clock - optional

 - "rmii_clkin" - external EMAC clock - optional





Example: Clock controller node:

Example: Clock controller node:

drivers/clk/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ obj-$(CONFIG_COMMON_CLK_SI514) += clk-si514.o 
obj-$(CONFIG_COMMON_CLK_SI570)		+= clk-si570.o

obj-$(CONFIG_COMMON_CLK_SI570)		+= clk-si570.o

obj-$(CONFIG_COMMON_CLK_CDCE925)	+= clk-cdce925.o

obj-$(CONFIG_COMMON_CLK_CDCE925)	+= clk-cdce925.o

obj-$(CONFIG_ARCH_STM32)		+= clk-stm32f4.o

obj-$(CONFIG_ARCH_STM32)		+= clk-stm32f4.o

obj-$(CONFIG_ARCH_TANGOX)		+= clk-tango4.o

obj-$(CONFIG_ARCH_TANGO)		+= clk-tango4.o

obj-$(CONFIG_CLK_TWL6040)		+= clk-twl6040.o

obj-$(CONFIG_CLK_TWL6040)		+= clk-twl6040.o

obj-$(CONFIG_ARCH_U300)			+= clk-u300.o

obj-$(CONFIG_ARCH_U300)			+= clk-u300.o

obj-$(CONFIG_ARCH_VT8500)		+= clk-vt8500.o

obj-$(CONFIG_ARCH_VT8500)		+= clk-vt8500.o

drivers/clk/clk-gpio.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -289,7 +289,7 @@ static void __init of_gpio_clk_setup(struct device_node *node, 




	num_parents = of_clk_get_parent_count(node);

	num_parents = of_clk_get_parent_count(node);

	if (num_parents < 0)

	if (num_parents < 0)

		return;

		num_parents = 0;





	data = kzalloc(sizeof(*data), GFP_KERNEL);

	data = kzalloc(sizeof(*data), GFP_KERNEL);

	if (!data)

	if (!data)

drivers/clk/clk-scpi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -299,7 +299,7 @@ static int scpi_clocks_probe(struct platform_device *pdev) 
	/* Add the virtual cpufreq device */

	/* Add the virtual cpufreq device */

	cpufreq_dev = platform_device_register_simple("scpi-cpufreq",

	cpufreq_dev = platform_device_register_simple("scpi-cpufreq",

						      -1, NULL, 0);

						      -1, NULL, 0);

	if (!cpufreq_dev)

	if (IS_ERR(cpufreq_dev))

		pr_warn("unable to register cpufreq device");

		pr_warn("unable to register cpufreq device");





	return 0;

	return 0;

drivers/clk/mvebu/dove-divider.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -247,7 +247,7 @@ static struct clk_onecell_data dove_divider_data = { 




void __init dove_divider_clk_init(struct device_node *np)

void __init dove_divider_clk_init(struct device_node *np)

{

{

	void *base;

	void __iomem *base;





	base = of_iomap(np, 0);

	base = of_iomap(np, 0);

	if (WARN_ON(!base))

	if (WARN_ON(!base))