Patched in Tegra support.

5 files changed, 12 insertions, 9 deletions

diff --git a/arch/arm/plat-pxa/Makefile b/arch/arm/plat-pxa/Makefile
index 1fc94194491..3aca5ba0f87 100644
--- a/arch/arm/plat-pxa/Makefile
+++ b/arch/arm/plat-pxa/Makefile
@@ -4,7 +4,10 @@
 
 obj-y   := dma.o
 
+obj-$(CONFIG_GENERIC_GPIO)      += gpio.o
 obj-$(CONFIG_PXA3xx)            += mfp.o
+obj-$(CONFIG_PXA95x)            += mfp.o
 obj-$(CONFIG_ARCH_MMP)          += mfp.o
 
+obj-$(CONFIG_HAVE_PWM)          += pwm.o
 obj-$(CONFIG_PXA_SSP)           += ssp.o
diff --git a/arch/arm/plat-pxa/dma.c b/arch/arm/plat-pxa/dma.c
index 79ef102e3b2..2d3c19d7c7b 100644
--- a/arch/arm/plat-pxa/dma.c
+++ b/arch/arm/plat-pxa/dma.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/dma-mapping.h>
 
+#include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/memory.h>
 #include <mach/hardware.h>
diff --git a/arch/arm/plat-pxa/include/plat/mfp.h b/arch/arm/plat-pxa/include/plat/mfp.h
index 10bc4f3757d..89e68e07b0a 100644
--- a/arch/arm/plat-pxa/include/plat/mfp.h
+++ b/arch/arm/plat-pxa/include/plat/mfp.h
@@ -423,7 +423,7 @@ typedef unsigned long mfp_cfg_t;
         ((MFP_CFG_DEFAULT & ~(MFP_AF_MASK | MFP_DS_MASK | MFP_LPM_STATE_MASK)) |\
          (MFP_PIN(MFP_PIN_##pin) | MFP_##af | MFP_##drv | MFP_LPM_##lpm))
 
-#if defined(CONFIG_PXA3xx) || defined(CONFIG_ARCH_MMP)
+#if defined(CONFIG_PXA3xx) || defined(CONFIG_PXA95x) || defined(CONFIG_ARCH_MMP)
 /*
  * each MFP pin will have a MFPR register, since the offset of the
  * register varies between processors, the processor specific code
@@ -456,7 +456,7 @@ struct mfp_addr_map {
 
 #define MFP_ADDR_END    { MFP_PIN_INVALID, 0 }
 
-void __init mfp_init_base(void __iomem *mfpr_base);
+void __init mfp_init_base(unsigned long mfpr_base);
 void __init mfp_init_addr(struct mfp_addr_map *map);
 
 /*
@@ -470,6 +470,6 @@ void mfp_write(int mfp, unsigned long mfpr_val);
 void mfp_config(unsigned long *mfp_cfgs, int num);
 void mfp_config_run(void);
 void mfp_config_lpm(void);
-#endif /* CONFIG_PXA3xx || CONFIG_ARCH_MMP */
+#endif /* CONFIG_PXA3xx || CONFIG_PXA95x || CONFIG_ARCH_MMP */
 
 #endif /* __ASM_PLAT_MFP_H */
diff --git a/arch/arm/plat-pxa/mfp.c b/arch/arm/plat-pxa/mfp.c
index 2c4dbb1f423..be12eadcce2 100644
--- a/arch/arm/plat-pxa/mfp.c
+++ b/arch/arm/plat-pxa/mfp.c
@@ -229,7 +229,7 @@ void mfp_write(int mfp, unsigned long val)
         spin_unlock_irqrestore(&mfp_spin_lock, flags);
 }
 
-void __init mfp_init_base(void __iomem *mfpr_base)
+void __init mfp_init_base(unsigned long mfpr_base)
 {
         int i;
 
@@ -237,7 +237,7 @@ void __init mfp_init_base(void __iomem *mfpr_base)
         for (i = 0; i < ARRAY_SIZE(mfp_table); i++)
                 mfp_table[i].config = -1;
 
-        mfpr_mmio_base = mfpr_base;
+        mfpr_mmio_base = (void __iomem *)mfpr_base;
 }
 
 void __init mfp_init_addr(struct mfp_addr_map *map)
diff --git a/arch/arm/plat-pxa/ssp.c b/arch/arm/plat-pxa/ssp.c
index 8e11e96eab5..58b79809d20 100644
--- a/arch/arm/plat-pxa/ssp.c
+++ b/arch/arm/plat-pxa/ssp.c
@@ -72,7 +72,7 @@ void pxa_ssp_free(struct ssp_device *ssp)
 }
 EXPORT_SYMBOL(pxa_ssp_free);
 
-static int pxa_ssp_probe(struct platform_device *pdev)
+static int __devinit pxa_ssp_probe(struct platform_device *pdev)
 {
         const struct platform_device_id *id = platform_get_device_id(pdev);
         struct resource *res;
@@ -164,7 +164,7 @@ err_free:
         return ret;
 }
 
-static int pxa_ssp_remove(struct platform_device *pdev)
+static int __devexit pxa_ssp_remove(struct platform_device *pdev)
 {
         struct resource *res;
         struct ssp_device *ssp;
@@ -193,13 +193,12 @@ static const struct platform_device_id ssp_id_table[] = {
         { "pxa25x-nssp",        PXA25x_NSSP },
         { "pxa27x-ssp",         PXA27x_SSP },
         { "pxa168-ssp",         PXA168_SSP },
-        { "pxa910-ssp",         PXA910_SSP },
         { },
 };
 
 static struct platform_driver pxa_ssp_driver = {
         .probe          = pxa_ssp_probe,
-        .remove         = pxa_ssp_remove,
+        .remove         = __devexit_p(pxa_ssp_remove),
         .driver         = {
                 .owner  = THIS_MODULE,
                 .name   = "pxa2xx-ssp",