Commit 69a4d0ba 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 small collection of fixes. I'll make another sweep soon to look for
  more fixes for this -rc series.

   - Mark device node const in of_clk_get_parent APIs to ease landing
     changes in users later

   - Fix flag for Qualcomm SC7180 video clocks where we thought it would
     never turn off but actually hardware takes care of it

   - Remove disp_cc_mdss_rscc_ahb_clk on Qualcomm SC7180 SoCs because
     this clk is always on anyway

   - Correct some bad dt-binding numbers for i.MX8MN SoCs"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: imx8mn: Fix incorrect clock defines
  clk: qcom: dispcc: Remove support of disp_cc_mdss_rscc_ahb_clk
  clk: qcom: videocc: Update the clock flag for video_cc_vcodec0_core_clk
  of: clk: Make of_clk_get_parent_{count,name}() parameter const
parents fffb08b3 20055448

drivers/clk/clk.c

+2 −2
Original line number Diff line number Diff line
@@ -4713,7 +4713,7 @@ EXPORT_SYMBOL(of_clk_get_by_name); 
 *

 * Returns: The number of clocks that are possible parents of this node

 */

unsigned int of_clk_get_parent_count(struct device_node *np)

unsigned int of_clk_get_parent_count(const struct device_node *np)

{

	int count;
@@ -4725,7 +4725,7 @@ unsigned int of_clk_get_parent_count(struct device_node *np) 
}

EXPORT_SYMBOL_GPL(of_clk_get_parent_count);



const char *of_clk_get_parent_name(struct device_node *np, int index)

const char *of_clk_get_parent_name(const struct device_node *np, int index)

{

	struct of_phandle_args clkspec;

	struct property *prop;

drivers/clk/qcom/dispcc-sc7180.c

+0 −19
Original line number Diff line number Diff line
@@ -592,24 +592,6 @@ static struct clk_branch disp_cc_mdss_rot_clk = { 
	},

};



static struct clk_branch disp_cc_mdss_rscc_ahb_clk = {

	.halt_reg = 0x400c,

	.halt_check = BRANCH_HALT,

	.clkr = {

		.enable_reg = 0x400c,

		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_rscc_ahb_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_ahb_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_IS_CRITICAL | CLK_SET_RATE_PARENT,

			.ops = &clk_branch2_ops,

		},

	},

};



static struct clk_branch disp_cc_mdss_rscc_vsync_clk = {

	.halt_reg = 0x4008,

	.halt_check = BRANCH_HALT,
@@ -687,7 +669,6 @@ static struct clk_regmap *disp_cc_sc7180_clocks[] = { 
	[DISP_CC_MDSS_PCLK0_CLK_SRC] = &disp_cc_mdss_pclk0_clk_src.clkr,

	[DISP_CC_MDSS_ROT_CLK] = &disp_cc_mdss_rot_clk.clkr,

	[DISP_CC_MDSS_ROT_CLK_SRC] = &disp_cc_mdss_rot_clk_src.clkr,

	[DISP_CC_MDSS_RSCC_AHB_CLK] = &disp_cc_mdss_rscc_ahb_clk.clkr,

	[DISP_CC_MDSS_RSCC_VSYNC_CLK] = &disp_cc_mdss_rscc_vsync_clk.clkr,

	[DISP_CC_MDSS_VSYNC_CLK] = &disp_cc_mdss_vsync_clk.clkr,

	[DISP_CC_MDSS_VSYNC_CLK_SRC] = &disp_cc_mdss_vsync_clk_src.clkr,

drivers/clk/qcom/videocc-sc7180.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static struct clk_branch video_cc_vcodec0_axi_clk = { 


static struct clk_branch video_cc_vcodec0_core_clk = {

	.halt_reg = 0x890,

	.halt_check = BRANCH_HALT,

	.halt_check = BRANCH_HALT_VOTED,

	.clkr = {

		.enable_reg = 0x890,

		.enable_mask = BIT(0),

include/dt-bindings/clock/imx8mn-clock.h

+2 −2
Original line number Diff line number Diff line
@@ -122,8 +122,8 @@ 
#define IMX8MN_CLK_I2C1				105

#define IMX8MN_CLK_I2C2				106

#define IMX8MN_CLK_I2C3				107

#define IMX8MN_CLK_I2C4				118

#define IMX8MN_CLK_UART1			119

#define IMX8MN_CLK_I2C4				108

#define IMX8MN_CLK_UART1			109

#define IMX8MN_CLK_UART2			110

#define IMX8MN_CLK_UART3			111

#define IMX8MN_CLK_UART4			112

include/linux/of_clk.h

+4 −4
Original line number Diff line number Diff line
@@ -11,17 +11,17 @@ struct of_device_id; 


#if defined(CONFIG_COMMON_CLK) && defined(CONFIG_OF)



unsigned int of_clk_get_parent_count(struct device_node *np);

const char *of_clk_get_parent_name(struct device_node *np, int index);

unsigned int of_clk_get_parent_count(const struct device_node *np);

const char *of_clk_get_parent_name(const struct device_node *np, int index);

void of_clk_init(const struct of_device_id *matches);



#else /* !CONFIG_COMMON_CLK || !CONFIG_OF */



static inline unsigned int of_clk_get_parent_count(struct device_node *np)

static inline unsigned int of_clk_get_parent_count(const struct device_node *np)

{

	return 0;

}

static inline const char *of_clk_get_parent_name(struct device_node *np,

static inline const char *of_clk_get_parent_name(const struct device_node *np,

						 int index)

{

	return NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE