Merge branch 'samsung/driver' into next/drivers
Arnd Bergmann [Mon, 9 Jan 2012 16:16:29 +0000 (16:16 +0000)]
Conflicts:
arch/arm/mach-mxs/include/mach/common.h

Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.

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

55 files changed:
1  2 
arch/arm/Kconfig
arch/arm/mach-exynos/Kconfig
arch/arm/mach-exynos/Makefile
arch/arm/mach-exynos/include/mach/map.h
arch/arm/mach-exynos/mach-origen.c
arch/arm/mach-exynos/mach-smdkv310.c
arch/arm/mach-mmp/aspenite.c
arch/arm/mach-mmp/avengers_lite.c
arch/arm/mach-mmp/brownstone.c
arch/arm/mach-mmp/flint.c
arch/arm/mach-mmp/gplugd.c
arch/arm/mach-mmp/include/mach/pxa168.h
arch/arm/mach-mmp/pxa168.c
arch/arm/mach-mmp/tavorevb.c
arch/arm/mach-mmp/teton_bga.c
arch/arm/mach-mmp/ttc_dkb.c
arch/arm/mach-mxs/include/mach/common.h
arch/arm/mach-mxs/mach-mx28evk.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-am3517evm.c
arch/arm/mach-pxa/balloon3.c
arch/arm/mach-pxa/capc7117.c
arch/arm/mach-pxa/cm-x2xx.c
arch/arm/mach-pxa/cm-x300.c
arch/arm/mach-pxa/colibri-pxa270.c
arch/arm/mach-pxa/colibri-pxa300.c
arch/arm/mach-pxa/colibri-pxa320.c
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/em-x270.c
arch/arm/mach-pxa/eseries.c
arch/arm/mach-pxa/hx4700.c
arch/arm/mach-pxa/icontrol.c
arch/arm/mach-pxa/idp.c
arch/arm/mach-pxa/littleton.c
arch/arm/mach-pxa/lpd270.c
arch/arm/mach-pxa/lubbock.c
arch/arm/mach-pxa/magician.c
arch/arm/mach-pxa/mainstone.c
arch/arm/mach-pxa/mioa701.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/raumfeld.c
arch/arm/mach-pxa/saar.c
arch/arm/mach-pxa/saarb.c
arch/arm/mach-pxa/spitz.c
arch/arm/mach-pxa/stargate2.c
arch/arm/mach-pxa/tavorevb.c
arch/arm/mach-pxa/tavorevb3.c
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/viper.c
arch/arm/mach-pxa/vpac270.c
arch/arm/mach-pxa/z2.c
arch/arm/mach-pxa/zeus.c
arch/arm/mach-pxa/zylonite.c
arch/arm/mach-sa1100/generic.c
arch/arm/plat-omap/include/plat/irqs.h

Simple merge
Simple merge
@@@ -47,8 -49,8 +49,9 @@@ obj-$(CONFIG_EXYNOS4_DEV_PD)          += dev-pd
  obj-$(CONFIG_EXYNOS4_DEV_SYSMMU)      += dev-sysmmu.o
  obj-$(CONFIG_EXYNOS4_DEV_DWMCI)               += dev-dwmci.o
  obj-$(CONFIG_EXYNOS4_DEV_DMA)         += dma.o
 +obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)    += dev-ohci.o
  
+ obj-$(CONFIG_ARCH_EXYNOS4)            += setup-i2c0.o
  obj-$(CONFIG_EXYNOS4_SETUP_FIMC)      += setup-fimc.o
  obj-$(CONFIG_EXYNOS4_SETUP_FIMD0)     += setup-fimd0.o
  obj-$(CONFIG_EXYNOS4_SETUP_I2C1)      += setup-i2c1.o
  #include <plat/fb.h>
  #include <plat/mfc.h>
  
 +#include <mach/ohci.h>
  #include <mach/map.h>
  
+ #include "common.h"
  /* Following are default values for UCON, ULCON and UFCON UART registers */
  #define ORIGEN_UCON_DEFAULT   (S3C2410_UCON_TXILEVEL |        \
                                 S3C2410_UCON_RXILEVEL |        \
  #include <plat/clock.h>
  
  #include <mach/map.h>
 +#include <mach/ohci.h>
  
+ #include "common.h"
  /* Following are default values for UCON, ULCON and UFCON UART registers */
  #define SMDKV310_UCON_DEFAULT (S3C2410_UCON_TXILEVEL |        \
                                 S3C2410_UCON_RXILEVEL |        \
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -16,7 -16,7 +16,8 @@@ struct clk
  extern const u32 *mxs_get_ocotp(void);
  extern int mxs_reset_block(void __iomem *);
  extern void mxs_timer_init(struct clk *, int);
+ extern void mxs_restart(char, const char *);
 +extern int mxs_saif_clkmux_select(unsigned int clkmux);
  
  extern int mx23_register_gpios(void);
  extern int mx23_clocks_init(void);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge