提交 112a674f 编写于 作者: R Russell King
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
#define MMC1_WP_MMC1_WP MFP_CFG_DRV(MMC1_WP, AF0, MEDIUM) #define MMC1_WP_MMC1_WP MFP_CFG_DRV(MMC1_WP, AF0, MEDIUM)
/* PWM */ /* PWM */
#define GPIO27 PWM3 AF2 MFP_CFG(GPIO27, AF2) #define GPIO27_PWM3_AF2 MFP_CFG(GPIO27, AF2)
#define GPIO51_PWM2_OUT MFP_CFG(GPIO51, AF2) #define GPIO51_PWM2_OUT MFP_CFG(GPIO51, AF2)
#define GPIO117_PWM1_OUT MFP_CFG(GPIO117, AF2) #define GPIO117_PWM1_OUT MFP_CFG(GPIO117, AF2)
#define GPIO118_PWM2_OUT MFP_CFG(GPIO118, AF2) #define GPIO118_PWM2_OUT MFP_CFG(GPIO118, AF2)
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <mach/colibri.h> #include <mach/colibri.h>
#include <mach/pxafb.h> #include <mach/pxafb.h>
#include <mach/ohci.h> #include <mach/ohci.h>
#include <mach/audio.h>
#include "generic.h" #include "generic.h"
#include "devices.h" #include "devices.h"
...@@ -145,7 +146,8 @@ static void __init colibri_pxa320_init_lcd(void) ...@@ -145,7 +146,8 @@ static void __init colibri_pxa320_init_lcd(void)
static inline void colibri_pxa320_init_lcd(void) {} static inline void colibri_pxa320_init_lcd(void) {}
#endif #endif
#if defined(SND_AC97_CODEC) || defined(SND_AC97_CODEC_MODULE) #if defined(CONFIG_SND_AC97_CODEC) || \
defined(CONFIG_SND_AC97_CODEC_MODULE)
static mfp_cfg_t colibri_pxa320_ac97_pin_config[] __initdata = { static mfp_cfg_t colibri_pxa320_ac97_pin_config[] __initdata = {
GPIO34_AC97_SYSCLK, GPIO34_AC97_SYSCLK,
GPIO35_AC97_SDATA_IN_0, GPIO35_AC97_SDATA_IN_0,
......
...@@ -604,7 +604,7 @@ static struct platform_device gpio_vbus = { ...@@ -604,7 +604,7 @@ static struct platform_device gpio_vbus = {
static const struct ads7846_platform_data tsc2046_info = { static const struct ads7846_platform_data tsc2046_info = {
.model = 7846, .model = 7846,
.vref_delay_usecs = 100, .vref_delay_usecs = 100,
.pressure_max = 512, .pressure_max = 1024,
.debounce_max = 10, .debounce_max = 10,
.debounce_tol = 3, .debounce_tol = 3,
.debounce_rep = 1, .debounce_rep = 1,
......
...@@ -46,5 +46,6 @@ ...@@ -46,5 +46,6 @@
beq 1001f beq 1001f
bic \irqstat, \irqstat, #0x80000000 bic \irqstat, \irqstat, #0x80000000
mov \irqnr, \irqstat, lsr #16 mov \irqnr, \irqstat, lsr #16
add \irqnr, \irqnr, #(PXA_IRQ(0))
1001: 1001:
.endm .endm
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#ifndef __ASM_PLAT_MFP_H #ifndef __ASM_PLAT_MFP_H
#define __ASM_PLAT_MFP_H #define __ASM_PLAT_MFP_H
#define mfp_to_gpio(m) ((m) % 128) #define mfp_to_gpio(m) ((m) % 256)
/* list of all the configurable MFP pins */ /* list of all the configurable MFP pins */
enum { enum {
......
...@@ -207,7 +207,7 @@ unsigned long mfp_read(int mfp) ...@@ -207,7 +207,7 @@ unsigned long mfp_read(int mfp)
{ {
unsigned long val, flags; unsigned long val, flags;
BUG_ON(mfp >= MFP_PIN_MAX); BUG_ON(mfp < 0 || mfp >= MFP_PIN_MAX);
spin_lock_irqsave(&mfp_spin_lock, flags); spin_lock_irqsave(&mfp_spin_lock, flags);
val = mfpr_readl(mfp_table[mfp].mfpr_off); val = mfpr_readl(mfp_table[mfp].mfpr_off);
...@@ -220,7 +220,7 @@ void mfp_write(int mfp, unsigned long val) ...@@ -220,7 +220,7 @@ void mfp_write(int mfp, unsigned long val)
{ {
unsigned long flags; unsigned long flags;
BUG_ON(mfp >= MFP_PIN_MAX); BUG_ON(mfp < 0 || mfp >= MFP_PIN_MAX);
spin_lock_irqsave(&mfp_spin_lock, flags); spin_lock_irqsave(&mfp_spin_lock, flags);
mfpr_writel(mfp_table[mfp].mfpr_off, val); mfpr_writel(mfp_table[mfp].mfpr_off, val);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册