Commit ff1c6c90 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'clk-microchip-6.5-2' of... 

Merge tag 'clk-microchip-6.5-2' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into clk-microchip

Pull Microchip clk driver updates from Claudiu Beznea:

It contains support for parent_data, parent_hw in AT91 clock drivers
used by SAMA7G5 SoC (e.g. main, master, generic, peripheral, programmable,
system, utmi, slow clocks) and also the update of SAMA7G5 to use
this new support.

* tag 'clk-microchip-6.5-2' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  clk: at91: sama7g5: s/ep_chg_chg_id/ep_chg_id
  clk: at91: sama7g5: switch to parent_hw and parent_data
  clk: at91: sckc: switch to parent_data/parent_hw
  clk: at91: clk-sam9x60-pll: add support for parent_hw
  clk: at91: clk-utmi: add support for parent_hw
  clk: at91: clk-system: add support for parent_hw
  clk: at91: clk-programmable: add support for parent_hw
  clk: at91: clk-peripheral: add support for parent_hw
  clk: at91: clk-master: add support for parent_hw
  clk: at91: clk-generated: add support for parent_hw
  clk: at91: clk-main: add support for parent_data/parent_hw
parents 3973bcc9 5619c2dd

drivers/clk/at91/at91rm9200.c

+7 −7
Original line number Diff line number Diff line
@@ -108,12 +108,12 @@ static void __init at91rm9200_pmc_setup(struct device_node *np) 


	bypass = of_property_read_bool(np, "atmel,osc-bypass");



	hw = at91_clk_register_main_osc(regmap, "main_osc", mainxtal_name,

	hw = at91_clk_register_main_osc(regmap, "main_osc", mainxtal_name, NULL,

					bypass);

	if (IS_ERR(hw))

		goto err_free;



	hw = at91_clk_register_rm9200_main(regmap, "mainck", "main_osc");

	hw = at91_clk_register_rm9200_main(regmap, "mainck", "main_osc", NULL);

	if (IS_ERR(hw))

		goto err_free;
@@ -140,7 +140,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np) 
	parent_names[2] = "pllack";

	parent_names[3] = "pllbck";

	hw = at91_clk_register_master_pres(regmap, "masterck_pres", 4,

					   parent_names,

					   parent_names, NULL,

					   &at91rm9200_master_layout,

					   &rm9200_mck_characteristics,

					   &rm9200_mck_lock);
@@ -148,7 +148,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np) 
		goto err_free;



	hw = at91_clk_register_master_div(regmap, "masterck_div",

					  "masterck_pres",

					  "masterck_pres", NULL,

					  &at91rm9200_master_layout,

					  &rm9200_mck_characteristics,

					  &rm9200_mck_lock, CLK_SET_RATE_GATE, 0);
@@ -171,7 +171,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np) 
		snprintf(name, sizeof(name), "prog%d", i);



		hw = at91_clk_register_programmable(regmap, name,

						    parent_names, 4, i,

						    parent_names, NULL, 4, i,

						    &at91rm9200_programmable_layout,

						    NULL);

		if (IS_ERR(hw))
@@ -182,7 +182,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np) 


	for (i = 0; i < ARRAY_SIZE(at91rm9200_systemck); i++) {

		hw = at91_clk_register_system(regmap, at91rm9200_systemck[i].n,

					      at91rm9200_systemck[i].p,

					      at91rm9200_systemck[i].p, NULL,

					      at91rm9200_systemck[i].id, 0);

		if (IS_ERR(hw))

			goto err_free;
@@ -193,7 +193,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np) 
	for (i = 0; i < ARRAY_SIZE(at91rm9200_periphck); i++) {

		hw = at91_clk_register_peripheral(regmap,

						  at91rm9200_periphck[i].n,

						  "masterck_div",

						  "masterck_div", NULL,

						  at91rm9200_periphck[i].id);

		if (IS_ERR(hw))

			goto err_free;

drivers/clk/at91/at91sam9260.c

+7 −7
Original line number Diff line number Diff line
@@ -363,12 +363,12 @@ static void __init at91sam926x_pmc_setup(struct device_node *np, 


	bypass = of_property_read_bool(np, "atmel,osc-bypass");



	hw = at91_clk_register_main_osc(regmap, "main_osc", mainxtal_name,

	hw = at91_clk_register_main_osc(regmap, "main_osc", mainxtal_name, NULL,

					bypass);

	if (IS_ERR(hw))

		goto err_free;



	hw = at91_clk_register_rm9200_main(regmap, "mainck", "main_osc");

	hw = at91_clk_register_rm9200_main(regmap, "mainck", "main_osc", NULL);

	if (IS_ERR(hw))

		goto err_free;
@@ -416,7 +416,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np, 
	parent_names[2] = "pllack";

	parent_names[3] = "pllbck";

	hw = at91_clk_register_master_pres(regmap, "masterck_pres", 4,

					   parent_names,

					   parent_names, NULL,

					   &at91rm9200_master_layout,

					   data->mck_characteristics,

					   &at91sam9260_mck_lock);
@@ -424,7 +424,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np, 
		goto err_free;



	hw = at91_clk_register_master_div(regmap, "masterck_div",

					  "masterck_pres",

					  "masterck_pres", NULL,

					  &at91rm9200_master_layout,

					  data->mck_characteristics,

					  &at91sam9260_mck_lock,
@@ -448,7 +448,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np, 
		snprintf(name, sizeof(name), "prog%d", i);



		hw = at91_clk_register_programmable(regmap, name,

						    parent_names, 4, i,

						    parent_names, NULL, 4, i,

						    &at91rm9200_programmable_layout,

						    NULL);

		if (IS_ERR(hw))
@@ -459,7 +459,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np, 


	for (i = 0; i < data->num_sck; i++) {

		hw = at91_clk_register_system(regmap, data->sck[i].n,

					      data->sck[i].p,

					      data->sck[i].p, NULL,

					      data->sck[i].id, 0);

		if (IS_ERR(hw))

			goto err_free;
@@ -470,7 +470,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np, 
	for (i = 0; i < data->num_pck; i++) {

		hw = at91_clk_register_peripheral(regmap,

						  data->pck[i].n,

						  "masterck_div",

						  "masterck_div", NULL,

						  data->pck[i].id);

		if (IS_ERR(hw))

			goto err_free;

drivers/clk/at91/at91sam9g45.c

+8 −8
Original line number Diff line number Diff line
@@ -123,12 +123,12 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np) 


	bypass = of_property_read_bool(np, "atmel,osc-bypass");



	hw = at91_clk_register_main_osc(regmap, "main_osc", mainxtal_name,

	hw = at91_clk_register_main_osc(regmap, "main_osc", mainxtal_name, NULL,

					bypass);

	if (IS_ERR(hw))

		goto err_free;



	hw = at91_clk_register_rm9200_main(regmap, "mainck", "main_osc");

	hw = at91_clk_register_rm9200_main(regmap, "mainck", "main_osc", NULL);

	if (IS_ERR(hw))

		goto err_free;
@@ -145,7 +145,7 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np) 


	at91sam9g45_pmc->chws[PMC_PLLACK] = hw;



	hw = at91_clk_register_utmi(regmap, NULL, "utmick", "mainck");

	hw = at91_clk_register_utmi(regmap, NULL, "utmick", "mainck", NULL);

	if (IS_ERR(hw))

		goto err_free;
@@ -156,7 +156,7 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np) 
	parent_names[2] = "plladivck";

	parent_names[3] = "utmick";

	hw = at91_clk_register_master_pres(regmap, "masterck_pres", 4,

					   parent_names,

					   parent_names, NULL,

					   &at91rm9200_master_layout,

					   &mck_characteristics,

					   &at91sam9g45_mck_lock);
@@ -164,7 +164,7 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np) 
		goto err_free;



	hw = at91_clk_register_master_div(regmap, "masterck_div",

					  "masterck_pres",

					  "masterck_pres", NULL,

					  &at91rm9200_master_layout,

					  &mck_characteristics,

					  &at91sam9g45_mck_lock,
@@ -191,7 +191,7 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np) 
		snprintf(name, sizeof(name), "prog%d", i);



		hw = at91_clk_register_programmable(regmap, name,

						    parent_names, 5, i,

						    parent_names, NULL, 5, i,

						    &at91sam9g45_programmable_layout,

						    NULL);

		if (IS_ERR(hw))
@@ -202,7 +202,7 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np) 


	for (i = 0; i < ARRAY_SIZE(at91sam9g45_systemck); i++) {

		hw = at91_clk_register_system(regmap, at91sam9g45_systemck[i].n,

					      at91sam9g45_systemck[i].p,

					      at91sam9g45_systemck[i].p, NULL,

					      at91sam9g45_systemck[i].id,

					      at91sam9g45_systemck[i].flags);

		if (IS_ERR(hw))
@@ -214,7 +214,7 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np) 
	for (i = 0; i < ARRAY_SIZE(at91sam9g45_periphck); i++) {

		hw = at91_clk_register_peripheral(regmap,

						  at91sam9g45_periphck[i].n,

						  "masterck_div",

						  "masterck_div", NULL,

						  at91sam9g45_periphck[i].id);

		if (IS_ERR(hw))

			goto err_free;

drivers/clk/at91/at91sam9n12.c

+7 −7
Original line number Diff line number Diff line
@@ -147,14 +147,14 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np) 


	bypass = of_property_read_bool(np, "atmel,osc-bypass");



	hw = at91_clk_register_main_osc(regmap, "main_osc", mainxtal_name,

	hw = at91_clk_register_main_osc(regmap, "main_osc", mainxtal_name, NULL,

					bypass);

	if (IS_ERR(hw))

		goto err_free;



	parent_names[0] = "main_rc_osc";

	parent_names[1] = "main_osc";

	hw = at91_clk_register_sam9x5_main(regmap, "mainck", parent_names, 2);

	hw = at91_clk_register_sam9x5_main(regmap, "mainck", parent_names, NULL, 2);

	if (IS_ERR(hw))

		goto err_free;
@@ -183,7 +183,7 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np) 
	parent_names[2] = "plladivck";

	parent_names[3] = "pllbck";

	hw = at91_clk_register_master_pres(regmap, "masterck_pres", 4,

					   parent_names,

					   parent_names, NULL,

					   &at91sam9x5_master_layout,

					   &mck_characteristics,

					   &at91sam9n12_mck_lock);
@@ -191,7 +191,7 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np) 
		goto err_free;



	hw = at91_clk_register_master_div(regmap, "masterck_div",

					  "masterck_pres",

					  "masterck_pres", NULL,

					  &at91sam9x5_master_layout,

					  &mck_characteristics,

					  &at91sam9n12_mck_lock,
@@ -216,7 +216,7 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np) 
		snprintf(name, sizeof(name), "prog%d", i);



		hw = at91_clk_register_programmable(regmap, name,

						    parent_names, 5, i,

						    parent_names, NULL, 5, i,

						    &at91sam9x5_programmable_layout,

						    NULL);

		if (IS_ERR(hw))
@@ -227,7 +227,7 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np) 


	for (i = 0; i < ARRAY_SIZE(at91sam9n12_systemck); i++) {

		hw = at91_clk_register_system(regmap, at91sam9n12_systemck[i].n,

					      at91sam9n12_systemck[i].p,

					      at91sam9n12_systemck[i].p, NULL,

					      at91sam9n12_systemck[i].id,

					      at91sam9n12_systemck[i].flags);

		if (IS_ERR(hw))
@@ -240,7 +240,7 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np) 
		hw = at91_clk_register_sam9x5_peripheral(regmap, &pmc_pcr_lock,

							 &at91sam9n12_pcr_layout,

							 at91sam9n12_periphck[i].n,

							 "masterck_div",

							 "masterck_div", NULL,

							 at91sam9n12_periphck[i].id,

							 &range, INT_MIN, 0);

		if (IS_ERR(hw))

drivers/clk/at91/at91sam9rl.c

+7 −7
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np) 
	if (!at91sam9rl_pmc)

		return;



	hw = at91_clk_register_rm9200_main(regmap, "mainck", mainxtal_name);

	hw = at91_clk_register_rm9200_main(regmap, "mainck", mainxtal_name, NULL);

	if (IS_ERR(hw))

		goto err_free;
@@ -109,7 +109,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np) 


	at91sam9rl_pmc->chws[PMC_PLLACK] = hw;



	hw = at91_clk_register_utmi(regmap, NULL, "utmick", "mainck");

	hw = at91_clk_register_utmi(regmap, NULL, "utmick", "mainck", NULL);

	if (IS_ERR(hw))

		goto err_free;
@@ -120,7 +120,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np) 
	parent_names[2] = "pllack";

	parent_names[3] = "utmick";

	hw = at91_clk_register_master_pres(regmap, "masterck_pres", 4,

					   parent_names,

					   parent_names, NULL,

					   &at91rm9200_master_layout,

					   &sam9rl_mck_characteristics,

					   &sam9rl_mck_lock);
@@ -128,7 +128,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np) 
		goto err_free;



	hw = at91_clk_register_master_div(regmap, "masterck_div",

					  "masterck_pres",

					  "masterck_pres", NULL,

					  &at91rm9200_master_layout,

					  &sam9rl_mck_characteristics,

					  &sam9rl_mck_lock, CLK_SET_RATE_GATE, 0);
@@ -148,7 +148,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np) 
		snprintf(name, sizeof(name), "prog%d", i);



		hw = at91_clk_register_programmable(regmap, name,

						    parent_names, 5, i,

						    parent_names, NULL, 5, i,

						    &at91rm9200_programmable_layout,

						    NULL);

		if (IS_ERR(hw))
@@ -159,7 +159,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np) 


	for (i = 0; i < ARRAY_SIZE(at91sam9rl_systemck); i++) {

		hw = at91_clk_register_system(regmap, at91sam9rl_systemck[i].n,

					      at91sam9rl_systemck[i].p,

					      at91sam9rl_systemck[i].p, NULL,

					      at91sam9rl_systemck[i].id, 0);

		if (IS_ERR(hw))

			goto err_free;
@@ -170,7 +170,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np) 
	for (i = 0; i < ARRAY_SIZE(at91sam9rl_periphck); i++) {

		hw = at91_clk_register_peripheral(regmap,

						  at91sam9rl_periphck[i].n,

						  "masterck_div",

						  "masterck_div", NULL,

						  at91sam9rl_periphck[i].id);

		if (IS_ERR(hw))

			goto err_free;