Merge branch 'v3.4/features' of git://gitorious.org/linux-davinci/linux-davinci into...

* 'v3.4/features' of git://gitorious.org/linux-davinci/linux-davinci:
  ARM: davinci: dm644x evm: add support for VPBE display
  ARM: davinci: dm644x: add support for v4l2 video display

* included from the davinci/cleanup branch:
  ARM: davinci: dm644x: don't force vpfe registeration on all boards
  ARM: davinci: dm644x: fix inconsistent variable naming
  ARM: davinci: dm644x: improve readability using macro
  ARM: davinci: streamline sysmod access
  ARM: davinci: create new common platform header for davinci
  ARM: davinci: dm646x: move private definitions to C file
  ARM: davinci: dm365: move private definitions to C file
  ARM: davinci: dm644x: move private definitions to C file

Conflicts:
	arch/arm/mach-davinci/board-dm644x-evm.c
	arch/arm/mach-davinci/board-neuros-osd2.c
	arch/arm/mach-davinci/board-sffsdr.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/mach-davinci/board-dm365-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm644x-evm.c
index 1247ecd,3854235..3683306
--- 1/arch/arm/mach-davinci/board-dm644x-evm.c
--- 2/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@@ -40,7 -39,9 +39,9 @@@
  #include <mach/usb.h>
  #include <mach/aemif.h>
  
 -#define DM644X_EVM_PHY_ID             "0:01"
+ #include "davinci.h"
+ 
 +#define DM644X_EVM_PHY_ID             "davinci_mdio-0:01"
  #define LXT971_PHY_ID (0x001378e2)
  #define LXT971_PHY_MASK       (0xfffffff0)
  

diff --cc arch/arm/mach-davinci/board-dm646x-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-neuros-osd2.c
index 8d34f51,3d12a3a..a772bb4
--- 1/arch/arm/mach-davinci/board-neuros-osd2.c
--- 2/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@@ -39,7 -38,9 +38,9 @@@
  #include <mach/mmc.h>
  #include <mach/usb.h>
  
 -#define NEUROS_OSD2_PHY_ID            "0:01"
+ #include "davinci.h"
+ 
 +#define NEUROS_OSD2_PHY_ID            "davinci_mdio-0:01"
  #define LXT971_PHY_ID                 0x001378e2
  #define LXT971_PHY_MASK                       0xfffffff0
  

diff --cc arch/arm/mach-davinci/board-sffsdr.c
index 31da3c5,897cec5..76e6750
--- 1/arch/arm/mach-davinci/board-sffsdr.c
--- 2/arch/arm/mach-davinci/board-sffsdr.c
+++ b/arch/arm/mach-davinci/board-sffsdr.c
@@@ -42,7 -41,9 +41,9 @@@
  #include <mach/mux.h>
  #include <mach/usb.h>
  
 -#define SFFSDR_PHY_ID         "0:01"
+ #include "davinci.h"
+ 
 +#define SFFSDR_PHY_ID         "davinci_mdio-0:01"
  static struct mtd_partition davinci_sffsdr_nandflash_partition[] = {
        /* U-Boot Environment: Block 0
         * UBL:                Block 1