SAUCE: fix building errors after rebased to v3.2

Signed-off-by: Eric Miao <eric.miao@linaro.org>

5 files changed, 18 insertions, 13 deletions

diff --git a/arch/arm/mach-mx5/bus_freq.c b/arch/arm/mach-mx5/bus_freq.c
index 37e9038e37f..c2cbbd02d52 100644
--- a/arch/arm/mach-mx5/bus_freq.c
+++ b/arch/arm/mach-mx5/bus_freq.c
@@ -21,6 +21,7 @@
  *
  * @ingroup PM
  */
+#include <linux/module.h>
 #include <asm/io.h>
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
diff --git a/arch/arm/mach-mx5/devices.c b/arch/arm/mach-mx5/devices.c
index 652d23a83d4..d579ce49f64 100644
--- a/arch/arm/mach-mx5/devices.c
+++ b/arch/arm/mach-mx5/devices.c
@@ -40,8 +40,8 @@ static u64 usb_dma_mask = DMA_BIT_MASK(32);
 
 static struct resource usbotg_resources[] = {
 	{
-		.start = MX51_OTG_BASE_ADDR,
-		.end = MX51_OTG_BASE_ADDR + 0x1ff,
+		.start = MX51_USB_OTG_BASE_ADDR,
+		.end = MX51_USB_OTG_BASE_ADDR + 0x1ff,
 		.flags = IORESOURCE_MEM,
 	},
 	{
@@ -115,8 +115,8 @@ struct platform_device mx53_usbdr_wakeup_device = {
 
 static struct resource usbotg_xcvr_resources[] = {
 	{
-		.start = MX51_OTG_BASE_ADDR,
-		.end = MX51_OTG_BASE_ADDR + 0x1ff,
+		.start = MX51_USB_OTG_BASE_ADDR,
+		.end = MX51_USB_OTG_BASE_ADDR + 0x1ff,
 		.flags = IORESOURCE_MEM,
 	},
 	{
@@ -138,12 +138,12 @@ struct platform_device mx53_usbdr_otg_device = {
 
 static struct resource usbh1_resources[] = {
 	{
-		.start = MX51_OTG_BASE_ADDR + 0x200,
-		.end = MX51_OTG_BASE_ADDR + 0x200 + 0x1ff,
+		.start = MX51_USB_OTG_BASE_ADDR + 0x200,
+		.end = MX51_USB_OTG_BASE_ADDR + 0x200 + 0x1ff,
 		.flags = IORESOURCE_MEM,
 	},
 	{
-		.start = MX51_INT_USB_H1,
+		.start = MX51_INT_USB_HS1,
 		.flags = IORESOURCE_IRQ,
 	},
 };
@@ -172,12 +172,12 @@ struct platform_device mx53_usbh1_device = {
 
 static struct resource usbh2_resources[] = {
 	{
-		.start = MX51_OTG_BASE_ADDR + 0x400,
-		.end = MX51_OTG_BASE_ADDR + 0x400 + 0x1ff,
+		.start = MX51_USB_OTG_BASE_ADDR + 0x400,
+		.end = MX51_USB_OTG_BASE_ADDR + 0x400 + 0x1ff,
 		.flags = IORESOURCE_MEM,
 	},
 	{
-		.start = MX51_INT_USB_H2,
+		.start = MX51_INT_USB_HS2,
 		.flags = IORESOURCE_IRQ,
 	},
 };
@@ -200,11 +200,11 @@ struct platform_device mxc_pm_device = {
 
 static struct resource usbh1_wakeup_resources[] = {
         {
-                .start = MX51_INT_USB_H1, /*wakeup irq*/
+                .start = MX51_INT_USB_HS1, /*wakeup irq*/
                 .flags = IORESOURCE_IRQ,
         },
         {
-                .start = MX51_INT_USB_H1,
+                .start = MX51_INT_USB_HS1,
                 .flags = IORESOURCE_IRQ,/* usb core irq */
         },
 };
diff --git a/arch/arm/mach-mx5/sdram_autogating.c b/arch/arm/mach-mx5/sdram_autogating.c
index ca75739e9ad..f352d360a9d 100644
--- a/arch/arm/mach-mx5/sdram_autogating.c
+++ b/arch/arm/mach-mx5/sdram_autogating.c
@@ -20,6 +20,7 @@
  *
  * @ingroup PM
  */
+#include <linux/module.h>
 #include <asm/io.h>
 #include <linux/proc_fs.h>
 #include <linux/clk.h>
@@ -198,4 +199,3 @@ module_exit(sdram_autogating_cleanup);
 MODULE_AUTHOR("Freescale Semiconductor, Inc.");
 MODULE_DESCRIPTION("sdram_autogating driver");
 MODULE_LICENSE("GPL");
-
diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h
index c75f254abd8..787c2688eb0 100644
--- a/arch/arm/plat-mxc/include/mach/common.h
+++ b/arch/arm/plat-mxc/include/mach/common.h
@@ -87,6 +87,8 @@ enum mxc_cpu_pwr_mode {
 extern void mx5_cpu_lp_set(enum mxc_cpu_pwr_mode mode);
 extern void imx_print_silicon_rev(const char *cpu, int srev);
 
+struct pt_regs;
+
 void avic_handle_irq(struct pt_regs *);
 void tzic_handle_irq(struct pt_regs *);
 void gic_handle_irq(struct pt_regs *);
diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h
index 7a76a7e8843..eb49d7114ca 100644
--- a/arch/arm/plat-mxc/include/mach/mxc.h
+++ b/arch/arm/plat-mxc/include/mach/mxc.h
@@ -196,6 +196,8 @@ extern unsigned int __mxc_cpu_type;
 
 #ifndef __ASSEMBLY__
 
+#include <mach/common.h>
+
 struct cpu_op {
 	u32 pll_reg;
 	u32 pll_rate;