linux-next: manual merge of the pinctrl tree with Linus' tree

[Stephen Rothwell]

Hi Linus,

Today's linux-next merge of the pinctrl tree got a conflict in arch/arm/mach-at91/at91sam9x5.c between commits af2a5f09fb6d ("Replace clk_lookup.con_id with clk_lookup.dev_id entries for twi clk") and f7d19b906556 ("ARM: at91: add clocks for I2C DT entries") from Linus' tree and commit 5c70cd3c7c69 ("arm: at91: dt: at91sam9 add pinctrl support") from the pinctrl 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 arch/arm/mach-at91/at91sam9x5.c
index e503538,79b5c52..0000000
--- a/arch/arm/mach-at91/at91sam9x5.c
+++ b/arch/arm/mach-at91/at91sam9x5.c
@@@ -231,13 -231,10 +231,13 @@@ static struct clk_lookup periph_clocks_
  	CLKDEV_CON_DEV_ID("t0_clk", "f800c000.timer", &tcb0_clk),
  	CLKDEV_CON_DEV_ID("dma_clk", "ffffec00.dma-controller", &dma0_clk),
  	CLKDEV_CON_DEV_ID("dma_clk", "ffffee00.dma-controller", &dma1_clk),
 +	CLKDEV_CON_DEV_ID(NULL, "f8010000.i2c", &twi0_clk),
 +	CLKDEV_CON_DEV_ID(NULL, "f8014000.i2c", &twi1_clk),
 +	CLKDEV_CON_DEV_ID(NULL, "f8018000.i2c", &twi2_clk),
- 	CLKDEV_CON_ID("pioA", &pioAB_clk),
- 	CLKDEV_CON_ID("pioB", &pioAB_clk),
- 	CLKDEV_CON_ID("pioC", &pioCD_clk),
- 	CLKDEV_CON_ID("pioD", &pioCD_clk),
+ 	CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioAB_clk),
+ 	CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioAB_clk),
+ 	CLKDEV_CON_DEV_ID(NULL, "fffff800.gpio", &pioCD_clk),
+ 	CLKDEV_CON_DEV_ID(NULL, "fffffa00.gpio", &pioCD_clk),
  	/* additional fake clock for macb_hclk */
  	CLKDEV_CON_DEV_ID("hclk", "f802c000.ethernet", &macb0_clk),
  	CLKDEV_CON_DEV_ID("hclk", "f8030000.ethernet", &macb1_clk),

Attachment: pgp00000.pgp
Description: PGP signature