linux-next: manual merge of the spi tree with the mpc5xxx tree

[Stephen Rothwell]

Hi Mark,

Today's linux-next merge of the spi tree got a conflict in
drivers/spi/spi-mpc512x-psc.c between commit 9d37619fb37f ("spi: mpc512x:
adjust to OF based clock lookup") from the mpc5xxx tree and commit
e1d0cd473be4 ("spi: mpc512x: Use devm_*() functions") from the spi tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>

diff --cc drivers/spi/spi-mpc512x-psc.c
index 2babea28b310,46d2313f7c6f..000000000000
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@@ -519,10 -519,12 +518,10 @@@ static int mpc512x_psc_spi_do_probe(str
  		goto free_master;
  	init_completion(&mps->txisrdone);
  
 -	psc_num = master->bus_num;
 -	snprintf(clk_name, sizeof(clk_name), "psc%d_mclk", psc_num);
 -	clk = devm_clk_get(dev, clk_name);
 +	clk = devm_clk_get(dev, "mclk");
  	if (IS_ERR(clk)) {
  		ret = PTR_ERR(clk);
- 		goto free_irq;
+ 		goto free_master;
  	}
  	ret = clk_prepare_enable(clk);
  	if (ret)
@@@ -550,15 -542,9 +549,11 @@@
  
  	return ret;
  
 -free_clock:
 +free_ipg_clock:
 +	clk_disable_unprepare(mps->clk_ipg);
 +free_mclk_clock:
  	clk_disable_unprepare(mps->clk_mclk);
- free_irq:
- 	free_irq(mps->irq, mps);
  free_master:
- 	if (mps->psc)
- 		iounmap(mps->psc);
  	spi_master_put(master);
  
  	return ret;
@@@ -570,10 -556,6 +565,7 @@@ static int mpc512x_psc_spi_do_remove(st
  	struct mpc512x_psc_spi *mps = spi_master_get_devdata(master);
  
  	clk_disable_unprepare(mps->clk_mclk);
 +	clk_disable_unprepare(mps->clk_ipg);
- 	free_irq(mps->irq, mps);
- 	if (mps->psc)
- 		iounmap(mps->psc);
  
  	return 0;
  }

Attachment: pgp00000.pgp
Description: PGP signature