From: Olof Johansson <olof@lixom.net>
Date: Mon, 1 Oct 2012 21:26:04 +0000 (-0700)
Subject: Merge branch 'next/soc2' into HEAD
X-Git-Tag: firefly_0821_release~3680^2~1958^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5c008d7029fcd12a9a54fa618781b71353f6c4bd;p=firefly-linux-kernel-4.4.55.git

Merge branch 'next/soc2' into HEAD
---

5c008d7029fcd12a9a54fa618781b71353f6c4bd
diff --cc arch/arm/mach-mxs/include/mach/common.h
index 4dec79563f19,10e4e12df870..be5a9c93cb2a
--- a/arch/arm/mach-mxs/include/mach/common.h
+++ b/arch/arm/mach-mxs/include/mach/common.h
@@@ -17,12 -17,22 +17,13 @@@ extern void mxs_timer_init(void)
  extern void mxs_restart(char, const char *);
  extern int mxs_saif_clkmux_select(unsigned int clkmux);
  
 -extern void mx23_soc_init(void);
  extern int mx23_clocks_init(void);
  extern void mx23_map_io(void);
 -extern void mx23_init_irq(void);
  
 -extern void mx28_soc_init(void);
  extern int mx28_clocks_init(void);
  extern void mx28_map_io(void);
 -extern void mx28_init_irq(void);
  
  extern void icoll_init_irq(void);
+ extern void icoll_handle_irq(struct pt_regs *);
  
 -extern struct platform_device *mxs_add_dma(const char *devid,
 -						resource_size_t base);
 -extern struct platform_device *mxs_add_gpio(char *name, int id,
 -					    resource_size_t iobase, int irq);
 -
  #endif /* __MACH_MXS_COMMON_H__ */
diff --cc arch/arm/mach-mxs/mach-mxs.c
index cf43e5effb91,256ec656fc65..4748ec551a68
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@@ -12,18 -12,13 +12,16 @@@
  
  #include <linux/clk.h>
  #include <linux/clkdev.h>
 +#include <linux/can/platform/flexcan.h>
 +#include <linux/delay.h>
  #include <linux/err.h>
 -#include <linux/init.h>
 +#include <linux/gpio.h>
  #include <linux/init.h>
- #include <linux/irqdomain.h>
  #include <linux/micrel_phy.h>
  #include <linux/mxsfb.h>
- #include <linux/of_irq.h>
  #include <linux/of_platform.h>
  #include <linux/phy.h>
 +#include <linux/pinctrl/consumer.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/time.h>
  #include <mach/common.h>