linux-next: manual merge of the pinctrl tree with the arm and arm-soc trees

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Linus,

Today's linux-next merge of the pinctrl tree got conflicts in
arch/arm/mach-u300/Kconfig and arch/arm/mach-u300/core.c between commit
cc890cd78acd ("ARM: 7083/1: rewrite U300 GPIO to use gpiolib") from the
arm tree, commits c21d2319efcd ("mach-u300: retire AVE device") and
d70a5969e9d5 ("ARM: mach-u300: Setup consistent dma size at boot time")
from the arm-soc tree and commit bb41f2392a5a ("pinmux: add a driver for
the U300 pinmux") from the pinctrl tree.

I did the obvious (but maybe wrong - see below) fixups and can carry the
fixes as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-u300/Kconfig
index 39e077e,449fd6a..0000000
--- a/arch/arm/mach-u300/Kconfig
+++ b/arch/arm/mach-u300/Kconfig
@@@ -6,7 -6,8 +6,9 @@@ comment "ST-Ericsson Mobile Platform Pr
  
  config MACH_U300
  	bool "U300"
 +	select GPIO_U300
+ 	select PINCTRL
+ 	select PINMUX_U300
  
  comment "ST-Ericsson U300/U330/U335/U365 Feature Selections"
  
diff --cc arch/arm/mach-u300/core.c
index 2f1d758,2f5929b..0000000
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@@ -25,7 -25,8 +25,9 @@@
  #include <linux/err.h>
  #include <linux/mtd/nand.h>
  #include <linux/mtd/fsmc.h>
 +#include <linux/dma-mapping.h>
+ #include <linux/pinctrl/machine.h>
+ #include <linux/pinctrl/pinmux.h>
  
  #include <asm/types.h>
  #include <asm/setup.h>
@@@ -1600,6 -1719,8 +1676,7 @@@ static struct platform_device *platform
  	&gpio_device,
  	&nand_device,
  	&wdog_device,
 -	&ave_device,
+ 	&pinmux_device,
  };
  
  /*
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux