Messages in this thread | | | Date | Fri, 12 Oct 2012 14:01:13 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the pinctrl tree with Linus' tree |
| |
Hi Linus,
Today's linux-next merge of the pinctrl tree got a conflict in arch/arm/mach-at91/at91sam9263.c between commit 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@canb.auug.org.au
diff --cc arch/arm/mach-at91/at91sam9263.c index 6a01d03,2edf813..0000000 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c @@@ -211,7 -210,11 +211,12 @@@ static struct clk_lookup periph_clocks_ CLKDEV_CON_DEV_ID("hclk", "a00000.ohci", &ohci_clk), CLKDEV_CON_DEV_ID("spi_clk", "fffa4000.spi", &spi0_clk), CLKDEV_CON_DEV_ID("spi_clk", "fffa8000.spi", &spi1_clk), + CLKDEV_CON_DEV_ID(NULL, "fff88000.i2c", &twi_clk), + CLKDEV_CON_DEV_ID(NULL, "fffff200.gpio", &pioA_clk), + CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioB_clk), + CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioCDE_clk), + CLKDEV_CON_DEV_ID(NULL, "fffff800.gpio", &pioCDE_clk), + CLKDEV_CON_DEV_ID(NULL, "fffffa00.gpio", &pioCDE_clk), }; static struct clk_lookup usart_clocks_lookups[] = { [unhandled content-type:application/pgp-signature] | |