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

Commit 68a26a1a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I641b7848,I6305c444,I5b122909 into msm-next 

* changes:
  arm64: Kconfig: Select the PM_OPP config for QCOM devices
  clk: Add support to provide OPP tables for clocks
  clk: Add support to vote to regulator framework from clk framework
parents 36e8b005 597b638a

arch/arm64/Kconfig.platforms

+1 −0
Original line number Original line Diff line number Diff line
@@ -123,6 +123,7 @@ config ARCH_QCOM 
	bool "Qualcomm Platforms"

	bool "Qualcomm Platforms"

	select GPIOLIB

	select GPIOLIB

	select PINCTRL

	select PINCTRL

	select PM_OPP

	help

	help

	  This enables support for the ARMv8 based Qualcomm chipsets.

	  This enables support for the ARMv8 based Qualcomm chipsets.

drivers/clk/clk-composite.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -219,7 +219,7 @@ struct clk_hw *clk_hw_register_composite(struct device *dev, const char *name, 
			unsigned long flags)

			unsigned long flags)

{

{

	struct clk_hw *hw;

	struct clk_hw *hw;

	struct clk_init_data init;

	struct clk_init_data init = {};

	struct clk_composite *composite;

	struct clk_composite *composite;

	struct clk_ops *clk_composite_ops;

	struct clk_ops *clk_composite_ops;

	int ret;

	int ret;

drivers/clk/clk-divider.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -434,7 +434,7 @@ static struct clk_hw *_register_divider(struct device *dev, const char *name, 
{

{

	struct clk_divider *div;

	struct clk_divider *div;

	struct clk_hw *hw;

	struct clk_hw *hw;

	struct clk_init_data init;

	struct clk_init_data init = {};

	int ret;

	int ret;





	if (clk_divider_flags & CLK_DIVIDER_HIWORD_MASK) {

	if (clk_divider_flags & CLK_DIVIDER_HIWORD_MASK) {

drivers/clk/clk-fixed-factor.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ struct clk_hw *clk_hw_register_fixed_factor(struct device *dev, 
		unsigned int mult, unsigned int div)

		unsigned int mult, unsigned int div)

{

{

	struct clk_fixed_factor *fix;

	struct clk_fixed_factor *fix;

	struct clk_init_data init;

	struct clk_init_data init = {};

	struct clk_hw *hw;

	struct clk_hw *hw;

	int ret;

	int ret;

drivers/clk/clk-fixed-rate.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,7 @@ struct clk_hw *clk_hw_register_fixed_rate_with_accuracy(struct device *dev, 
{

{

	struct clk_fixed_rate *fixed;

	struct clk_fixed_rate *fixed;

	struct clk_hw *hw;

	struct clk_hw *hw;

	struct clk_init_data init;

	struct clk_init_data init = {};

	int ret;

	int ret;





	/* allocate fixed-rate clock */

	/* allocate fixed-rate clock */