Commit 34f74978 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'clk-at91-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into clk-at91 

Pull AT91 clk driver changes From Nicolas Ferre:

 - sama7g5: One low priority fix for GCLK of PDMC
 - clk-master: cleanup of dead code

* tag 'clk-at91-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  clk: at91: clk-master: remove dead code
  clk: at91: sama7g5: fix parents of PDMCs' GCLK
parents a5ab04af 8e842f02

drivers/clk/at91/at91rm9200.c

+1 −2
Original line number Diff line number Diff line
@@ -143,8 +143,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np) 
					   parent_names,

					   &at91rm9200_master_layout,

					   &rm9200_mck_characteristics,

					   &rm9200_mck_lock, CLK_SET_RATE_GATE,

					   INT_MIN);

					   &rm9200_mck_lock);

	if (IS_ERR(hw))

		goto err_free;

drivers/clk/at91/at91sam9260.c

+1 −2
Original line number Diff line number Diff line
@@ -419,8 +419,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np, 
					   parent_names,

					   &at91rm9200_master_layout,

					   data->mck_characteristics,

					   &at91sam9260_mck_lock,

					   CLK_SET_RATE_GATE, INT_MIN);

					   &at91sam9260_mck_lock);

	if (IS_ERR(hw))

		goto err_free;

drivers/clk/at91/at91sam9g45.c

+1 −2
Original line number Diff line number Diff line
@@ -154,8 +154,7 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np) 
					   parent_names,

					   &at91rm9200_master_layout,

					   &mck_characteristics,

					   &at91sam9g45_mck_lock,

					   CLK_SET_RATE_GATE, INT_MIN);

					   &at91sam9g45_mck_lock);

	if (IS_ERR(hw))

		goto err_free;

drivers/clk/at91/at91sam9n12.c

+1 −2
Original line number Diff line number Diff line
@@ -181,8 +181,7 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np) 
					   parent_names,

					   &at91sam9x5_master_layout,

					   &mck_characteristics,

					   &at91sam9n12_mck_lock,

					   CLK_SET_RATE_GATE, INT_MIN);

					   &at91sam9n12_mck_lock);

	if (IS_ERR(hw))

		goto err_free;

drivers/clk/at91/at91sam9rl.c

+1 −2
Original line number Diff line number Diff line
@@ -123,8 +123,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np) 
					   parent_names,

					   &at91rm9200_master_layout,

					   &sam9rl_mck_characteristics,

					   &sam9rl_mck_lock, CLK_SET_RATE_GATE,

					   INT_MIN);

					   &sam9rl_mck_lock);

	if (IS_ERR(hw))

		goto err_free;