diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:37:23 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:37:23 -0400 |
| commit | f6304f5804f228b6c2fea9e3dfac25c5b2db9b38 (patch) | |
| tree | 362b9b6a3bd32b868e5917a32d448ac75c5854df /arch/arm/plat-pxa/include/plat/mfp.h | |
| parent | 4fa73a1bf89ebea4eba8a9982b5f64d266d8b5e9 (diff) | |
| parent | 6daa642d9b8ec762b3c5641cd5e5fa855a5405bf (diff) | |
Merge branch 'omap4-i2c-init' into omap-for-linus
Diffstat (limited to 'arch/arm/plat-pxa/include/plat/mfp.h')
| -rw-r--r-- | arch/arm/plat-pxa/include/plat/mfp.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/plat-pxa/include/plat/mfp.h b/arch/arm/plat-pxa/include/plat/mfp.h index 857a6839071..9e604c80618 100644 --- a/arch/arm/plat-pxa/include/plat/mfp.h +++ b/arch/arm/plat-pxa/include/plat/mfp.h | |||
| @@ -316,6 +316,13 @@ enum { | |||
| 316 | MFP_PIN_PMIC_INT, | 316 | MFP_PIN_PMIC_INT, |
| 317 | MFP_PIN_RDY, | 317 | MFP_PIN_RDY, |
| 318 | 318 | ||
| 319 | /* additional pins on MMP2 */ | ||
| 320 | MFP_PIN_TWSI1_SCL, | ||
| 321 | MFP_PIN_TWSI1_SDA, | ||
| 322 | MFP_PIN_TWSI4_SCL, | ||
| 323 | MFP_PIN_TWSI4_SDA, | ||
| 324 | MFP_PIN_CLK_REQ, | ||
| 325 | |||
| 319 | MFP_PIN_MAX, | 326 | MFP_PIN_MAX, |
| 320 | }; | 327 | }; |
| 321 | 328 | ||