Commit 0ff66f0c authored by Russell King's avatar Russell King Committed by Russell King

Merge branch 'pxa-plat' into devel

* pxa-plat: (53 commits)
  [ARM] 4762/1: Basic support for Toradex Colibri module
  [ARM] pxa: fix mci_init functions returning -1
  [ARM] 4737/1: Refactor corgi_lcd to improve readability + bugfix
  [ARM] 4747/1: pcm027: support for pcm990 baseboard for phyCORE-PXA270
  [ARM] 4746/1: pcm027: network support for phyCORE-PXA270
  [ARM] 4745/1: pcm027: default configuration
  [ARM] 4744/1: pcm027: add support for phyCORE-PXA270 CPU module
  [NET] smc91x: Make smc91x use IRQ resource trigger flags
  [ARM] pxa: add default config for littleton
  [ARM] pxa: add basic support for Littleton (PXA3xx Form Factor Platform)
  [ARM] 4664/1: Add basic support for HTC Magician PDA phones
  [ARM] 4649/1: Base support for pxa-based Toshiba e-series PDAs.
  [ARM] pxa: skip registers saving/restoring if entering standby mode
  [ARM] pxa: fix PXA27x resume
  [ARM] pxa: Avoid fiddling with CKEN register on suspend
  [ARM] pxa: Add PXA3 standby code hooked into the IRQ wake scheme
  [ARM] pxa: Add zylonite MFP wakeup configurations
  [ARM] pxa: program MFPs for low power mode when suspending
  [ARM] pxa: make MFP configuration processor independent
  [ARM] pxa: remove un-used pxa3xx_mfp_set_xxx() functions
  ...

Conflicts:

	arch/arm/mach-pxa/ssp.c
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parents c00d4ffd 4e4fc05a
...@@ -45,6 +45,7 @@ The following ARM processors are supported by cpufreq: ...@@ -45,6 +45,7 @@ The following ARM processors are supported by cpufreq:
ARM Integrator ARM Integrator
ARM-SA1100 ARM-SA1100
ARM-SA1110 ARM-SA1110
Intel PXA
1.2 x86 1.2 x86
......
...@@ -356,6 +356,7 @@ config ARCH_PXA ...@@ -356,6 +356,7 @@ config ARCH_PXA
select GENERIC_GPIO select GENERIC_GPIO
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select TICK_ONESHOT
help help
Support for Intel/Marvell's PXA2xx/PXA3xx processor line. Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
...@@ -895,7 +896,7 @@ config KEXEC ...@@ -895,7 +896,7 @@ config KEXEC
endmenu endmenu
if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX ) if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)
menu "CPU Frequency scaling" menu "CPU Frequency scaling"
...@@ -931,6 +932,12 @@ config CPU_FREQ_IMX ...@@ -931,6 +932,12 @@ config CPU_FREQ_IMX
If in doubt, say N. If in doubt, say N.
config CPU_FREQ_PXA
bool
depends on CPU_FREQ && ARCH_PXA && PXA25x
default y
select CPU_FREQ_DEFAULT_GOV_USERSPACE
endmenu endmenu
endif endif
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -76,7 +76,7 @@ static struct resource smc91x_resources[] = { ...@@ -76,7 +76,7 @@ static struct resource smc91x_resources[] = {
[1] = { [1] = {
.start = INT_730_MPU_EXT_NIRQ, .start = INT_730_MPU_EXT_NIRQ,
.end = 0, .end = 0,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
}, },
}; };
......
...@@ -209,7 +209,7 @@ static struct resource h2_smc91x_resources[] = { ...@@ -209,7 +209,7 @@ static struct resource h2_smc91x_resources[] = {
[1] = { [1] = {
.start = OMAP_GPIO_IRQ(0), .start = OMAP_GPIO_IRQ(0),
.end = OMAP_GPIO_IRQ(0), .end = OMAP_GPIO_IRQ(0),
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
}, },
}; };
......
...@@ -208,7 +208,7 @@ static struct resource smc91x_resources[] = { ...@@ -208,7 +208,7 @@ static struct resource smc91x_resources[] = {
[1] = { [1] = {
.start = OMAP_GPIO_IRQ(40), .start = OMAP_GPIO_IRQ(40),
.end = OMAP_GPIO_IRQ(40), .end = OMAP_GPIO_IRQ(40),
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
}, },
}; };
......
...@@ -202,7 +202,7 @@ static struct resource innovator1510_smc91x_resources[] = { ...@@ -202,7 +202,7 @@ static struct resource innovator1510_smc91x_resources[] = {
[1] = { [1] = {
.start = OMAP1510_INT_ETHER, .start = OMAP1510_INT_ETHER,
.end = OMAP1510_INT_ETHER, .end = OMAP1510_INT_ETHER,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
}, },
}; };
...@@ -269,7 +269,7 @@ static struct resource innovator1610_smc91x_resources[] = { ...@@ -269,7 +269,7 @@ static struct resource innovator1610_smc91x_resources[] = {
[1] = { [1] = {
.start = OMAP_GPIO_IRQ(0), .start = OMAP_GPIO_IRQ(0),
.end = OMAP_GPIO_IRQ(0), .end = OMAP_GPIO_IRQ(0),
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
}, },
}; };
......
...@@ -111,7 +111,7 @@ static struct resource osk5912_smc91x_resources[] = { ...@@ -111,7 +111,7 @@ static struct resource osk5912_smc91x_resources[] = {
[1] = { [1] = {
.start = OMAP_GPIO_IRQ(0), .start = OMAP_GPIO_IRQ(0),
.end = OMAP_GPIO_IRQ(0), .end = OMAP_GPIO_IRQ(0),
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
}, },
}; };
......
...@@ -75,7 +75,7 @@ static struct resource smc91x_resources[] = { ...@@ -75,7 +75,7 @@ static struct resource smc91x_resources[] = {
[1] = { [1] = {
.start = INT_730_MPU_EXT_NIRQ, .start = INT_730_MPU_EXT_NIRQ,
.end = 0, .end = 0,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
}, },
}; };
......
...@@ -117,7 +117,7 @@ static struct resource voiceblue_smc91x_resources[] = { ...@@ -117,7 +117,7 @@ static struct resource voiceblue_smc91x_resources[] = {
[1] = { [1] = {
.start = OMAP_GPIO_IRQ(8), .start = OMAP_GPIO_IRQ(8),
.end = OMAP_GPIO_IRQ(8), .end = OMAP_GPIO_IRQ(8),
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
}, },
}; };
......
...@@ -104,7 +104,7 @@ static struct resource sdp2430_smc91x_resources[] = { ...@@ -104,7 +104,7 @@ static struct resource sdp2430_smc91x_resources[] = {
[1] = { [1] = {
.start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), .start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ),
.end = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), .end = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ),
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
}, },
}; };
......
...@@ -126,7 +126,7 @@ static struct resource apollon_smc91x_resources[] = { ...@@ -126,7 +126,7 @@ static struct resource apollon_smc91x_resources[] = {
[1] = { [1] = {
.start = OMAP_GPIO_IRQ(APOLLON_ETHR_GPIO_IRQ), .start = OMAP_GPIO_IRQ(APOLLON_ETHR_GPIO_IRQ),
.end = OMAP_GPIO_IRQ(APOLLON_ETHR_GPIO_IRQ), .end = OMAP_GPIO_IRQ(APOLLON_ETHR_GPIO_IRQ),
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
}, },
}; };
......
This diff is collapsed.
This diff is collapsed.
...@@ -487,18 +487,15 @@ static int cmx270_mci_init(struct device *dev, ...@@ -487,18 +487,15 @@ static int cmx270_mci_init(struct device *dev,
/* card detect IRQ on GPIO 83 */ /* card detect IRQ on GPIO 83 */
pxa_gpio_mode(IRQ_TO_GPIO(CMX270_MMC_IRQ)); pxa_gpio_mode(IRQ_TO_GPIO(CMX270_MMC_IRQ));
set_irq_type(CMX270_MMC_IRQ, IRQT_FALLING);
err = request_irq(CMX270_MMC_IRQ, cmx270_detect_int, err = request_irq(CMX270_MMC_IRQ, cmx270_detect_int,
IRQF_DISABLED | IRQF_TRIGGER_FALLING, IRQF_DISABLED | IRQF_TRIGGER_FALLING,
"MMC card detect", data); "MMC card detect", data);
if (err) { if (err)
printk(KERN_ERR "cmx270_mci_init: MMC/SD: can't" printk(KERN_ERR "cmx270_mci_init: MMC/SD: can't"
" request MMC card detect IRQ\n"); " request MMC card detect IRQ\n");
return -1;
}
return 0; return err;
} }
static void cmx270_mci_setpower(struct device *dev, unsigned int vdd) static void cmx270_mci_setpower(struct device *dev, unsigned int vdd)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <asm/arch/ssp.h> #include <asm/arch/ssp.h>
#include <asm/arch/pxa-regs.h> #include <asm/arch/pxa-regs.h>
#include <asm/arch/regs-ssp.h>
#include "sharpsl.h" #include "sharpsl.h"
static DEFINE_SPINLOCK(corgi_ssp_lock); static DEFINE_SPINLOCK(corgi_ssp_lock);
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment