diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/i2c.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa-regs.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/i2c.h b/arch/arm/mach-pxa/include/mach/i2c.h index 897e71752177..1a9f65e6ec0f 100644 --- a/arch/arm/mach-pxa/include/mach/i2c.h +++ b/arch/arm/mach-pxa/include/mach/i2c.h | |||
@@ -65,7 +65,8 @@ struct i2c_pxa_platform_data { | |||
65 | unsigned int slave_addr; | 65 | unsigned int slave_addr; |
66 | struct i2c_slave_client *slave; | 66 | struct i2c_slave_client *slave; |
67 | unsigned int class; | 67 | unsigned int class; |
68 | int use_pio; | 68 | unsigned int use_pio :1; |
69 | unsigned int fast_mode :1; | ||
69 | }; | 70 | }; |
70 | 71 | ||
71 | extern void pxa_set_i2c_info(struct i2c_pxa_platform_data *info); | 72 | extern void pxa_set_i2c_info(struct i2c_pxa_platform_data *info); |
diff --git a/arch/arm/mach-pxa/include/mach/pxa-regs.h b/arch/arm/mach-pxa/include/mach/pxa-regs.h index 12288ca3cbb2..772c67635e23 100644 --- a/arch/arm/mach-pxa/include/mach/pxa-regs.h +++ b/arch/arm/mach-pxa/include/mach/pxa-regs.h | |||
@@ -448,6 +448,7 @@ | |||
448 | #define ICR_ALDIE (1 << 12) /* enable arbitration interrupt */ | 448 | #define ICR_ALDIE (1 << 12) /* enable arbitration interrupt */ |
449 | #define ICR_SADIE (1 << 13) /* slave address detected int enable */ | 449 | #define ICR_SADIE (1 << 13) /* slave address detected int enable */ |
450 | #define ICR_UR (1 << 14) /* unit reset */ | 450 | #define ICR_UR (1 << 14) /* unit reset */ |
451 | #define ICR_FM (1 << 15) /* fast mode */ | ||
451 | 452 | ||
452 | #define ISR_RWM (1 << 0) /* read/write mode */ | 453 | #define ISR_RWM (1 << 0) /* read/write mode */ |
453 | #define ISR_ACKNAK (1 << 1) /* ack/nak status */ | 454 | #define ISR_ACKNAK (1 << 1) /* ack/nak status */ |