Commit 634e438f authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Stephen Boyd
Browse files

clk: qcom: dispcc-sm8250: use parent_hws where possible 



Switch to using parent_hws instead of parent_data when parents are
defined in this driver and so accessible using clk_hw.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20210405224743.590029-19-dmitry.baryshkov@linaro.org


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent f8fae78c

drivers/clk/qcom/dispcc-sm8250.c

+58 −58
Original line number Diff line number Diff line
@@ -448,8 +448,8 @@ static struct clk_regmap_div disp_cc_mdss_byte0_div_clk_src = { 
	.width = 2,

	.clkr.hw.init = &(struct clk_init_data) {

		.name = "disp_cc_mdss_byte0_div_clk_src",

		.parent_data = &(const struct clk_parent_data){

			.hw = &disp_cc_mdss_byte0_clk_src.clkr.hw,

		.parent_hws = (const struct clk_hw*[]){

			&disp_cc_mdss_byte0_clk_src.clkr.hw,

		},

		.num_parents = 1,

		.ops = &clk_regmap_div_ops,
@@ -463,8 +463,8 @@ static struct clk_regmap_div disp_cc_mdss_byte1_div_clk_src = { 
	.width = 2,

	.clkr.hw.init = &(struct clk_init_data) {

		.name = "disp_cc_mdss_byte1_div_clk_src",

		.parent_data = &(const struct clk_parent_data){

			.hw = &disp_cc_mdss_byte1_clk_src.clkr.hw,

		.parent_hws = (const struct clk_hw*[]){

			&disp_cc_mdss_byte1_clk_src.clkr.hw,

		},

		.num_parents = 1,

		.ops = &clk_regmap_div_ops,
@@ -478,8 +478,8 @@ static struct clk_regmap_div disp_cc_mdss_dp_link1_div_clk_src = { 
	.width = 2,

	.clkr.hw.init = &(struct clk_init_data) {

		.name = "disp_cc_mdss_dp_link1_div_clk_src",

		.parent_data = &(const struct clk_parent_data){

			.hw = &disp_cc_mdss_dp_link1_clk_src.clkr.hw,

		.parent_hws = (const struct clk_hw*[]){

			&disp_cc_mdss_dp_link1_clk_src.clkr.hw,

		},

		.num_parents = 1,

		.ops = &clk_regmap_div_ro_ops,
@@ -493,8 +493,8 @@ static struct clk_regmap_div disp_cc_mdss_dp_link_div_clk_src = { 
	.width = 2,

	.clkr.hw.init = &(struct clk_init_data) {

		.name = "disp_cc_mdss_dp_link_div_clk_src",

		.parent_data = &(const struct clk_parent_data){

			.hw = &disp_cc_mdss_dp_link_clk_src.clkr.hw,

		.parent_hws = (const struct clk_hw*[]){

			&disp_cc_mdss_dp_link_clk_src.clkr.hw,

		},

		.num_parents = 1,

		.ops = &clk_regmap_div_ro_ops,
@@ -509,8 +509,8 @@ static struct clk_branch disp_cc_mdss_ahb_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_ahb_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_ahb_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_ahb_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -527,8 +527,8 @@ static struct clk_branch disp_cc_mdss_byte0_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_byte0_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_byte0_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_byte0_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -545,8 +545,8 @@ static struct clk_branch disp_cc_mdss_byte0_intf_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_byte0_intf_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_byte0_div_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_byte0_div_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -563,8 +563,8 @@ static struct clk_branch disp_cc_mdss_byte1_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_byte1_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_byte1_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_byte1_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -581,8 +581,8 @@ static struct clk_branch disp_cc_mdss_byte1_intf_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_byte1_intf_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_byte1_div_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_byte1_div_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -599,8 +599,8 @@ static struct clk_branch disp_cc_mdss_dp_aux1_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_dp_aux1_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_dp_aux1_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_dp_aux1_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -617,8 +617,8 @@ static struct clk_branch disp_cc_mdss_dp_aux_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_dp_aux_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_dp_aux_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_dp_aux_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -635,8 +635,8 @@ static struct clk_branch disp_cc_mdss_dp_link1_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_dp_link1_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_dp_link1_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_dp_link1_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -653,8 +653,8 @@ static struct clk_branch disp_cc_mdss_dp_link1_intf_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_dp_link1_intf_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_dp_link1_div_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_dp_link1_div_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.ops = &clk_branch2_ops,
@@ -670,8 +670,8 @@ static struct clk_branch disp_cc_mdss_dp_link_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_dp_link_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_dp_link_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_dp_link_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -688,8 +688,8 @@ static struct clk_branch disp_cc_mdss_dp_link_intf_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_dp_link_intf_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_dp_link_div_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_dp_link_div_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.ops = &clk_branch2_ops,
@@ -705,8 +705,8 @@ static struct clk_branch disp_cc_mdss_dp_pixel1_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_dp_pixel1_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_dp_pixel1_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_dp_pixel1_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -723,8 +723,8 @@ static struct clk_branch disp_cc_mdss_dp_pixel2_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_dp_pixel2_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_dp_pixel2_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_dp_pixel2_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -741,8 +741,8 @@ static struct clk_branch disp_cc_mdss_dp_pixel_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_dp_pixel_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_dp_pixel_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_dp_pixel_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -759,8 +759,8 @@ static struct clk_branch disp_cc_mdss_esc0_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_esc0_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_esc0_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_esc0_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -777,8 +777,8 @@ static struct clk_branch disp_cc_mdss_esc1_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_esc1_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_esc1_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_esc1_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -795,8 +795,8 @@ static struct clk_branch disp_cc_mdss_mdp_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_mdp_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_mdp_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_mdp_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -813,8 +813,8 @@ static struct clk_branch disp_cc_mdss_mdp_lut_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_mdp_lut_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_mdp_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_mdp_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.ops = &clk_branch2_ops,
@@ -830,8 +830,8 @@ static struct clk_branch disp_cc_mdss_non_gdsc_ahb_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_non_gdsc_ahb_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_ahb_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_ahb_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -848,8 +848,8 @@ static struct clk_branch disp_cc_mdss_pclk0_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_pclk0_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_pclk0_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_pclk0_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -866,8 +866,8 @@ static struct clk_branch disp_cc_mdss_pclk1_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_pclk1_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_pclk1_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_pclk1_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -884,8 +884,8 @@ static struct clk_branch disp_cc_mdss_rot_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_rot_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_rot_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_rot_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -902,8 +902,8 @@ static struct clk_branch disp_cc_mdss_rscc_ahb_clk = { 
		.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,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_ahb_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -920,8 +920,8 @@ static struct clk_branch disp_cc_mdss_rscc_vsync_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_rscc_vsync_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_vsync_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_vsync_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -938,8 +938,8 @@ static struct clk_branch disp_cc_mdss_vsync_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "disp_cc_mdss_vsync_clk",

			.parent_data = &(const struct clk_parent_data){

				.hw = &disp_cc_mdss_vsync_clk_src.clkr.hw,

			.parent_hws = (const struct clk_hw*[]){

				&disp_cc_mdss_vsync_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,