| Message ID | 1309934364-7963-1-git-send-email-ajay.bhargav@einfochips.com |
|---|---|
| State | Accepted |
| Commit | 82b13f73261a093ff305e36c9fc59173543dde2d |
| Headers | show |
> -----Original Message----- > From: Ajay Bhargav [mailto:ajay.bhargav@einfochips.com] > Sent: Wednesday, July 06, 2011 12:09 PM > To: Prafulla Wadaskar > Cc: u-boot@lists.denx.de; Ajay Bhargav > Subject: [PATCH 1/2] Armada100: MFP macro naming correction > > MFP macros for UART3 updated. > > Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com> > --- > arch/arm/include/asm/arch-armada100/mfp.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/include/asm/arch-armada100/mfp.h > b/arch/arm/include/asm/arch-armada100/mfp.h > index 73783a7..d6e0494 100644 > --- a/arch/arm/include/asm/arch-armada100/mfp.h > +++ b/arch/arm/include/asm/arch-armada100/mfp.h > @@ -57,8 +57,8 @@ > #define MFP89_UART2_TXD (MFP_REG(0x0164) | MFP_AF2 | > MFP_DRIVE_MEDIUM) > > /* UART3 */ > -#define MFPO8_UART3_RXD (MFP_REG(0x06c) | MFP_AF2 | > MFP_DRIVE_MEDIUM) > -#define MFPO9_UART3_TXD (MFP_REG(0x070) | MFP_AF2 | > MFP_DRIVE_MEDIUM) > +#define MFPO8_UART3_TXD (MFP_REG(0x06c) | MFP_AF2 | > MFP_DRIVE_MEDIUM) > +#define MFPO9_UART3_RXD (MFP_REG(0x070) | MFP_AF2 | > MFP_DRIVE_MEDIUM) > > /* I2c */ > #define MFP105_CI2C_SDA (MFP_REG(0x1a4) | MFP_AF1 | > MFP_DRIVE_MEDIUM) > -- Acked-By: Prafulla Wadaskar <Prafulla@marvell.com> Regards.. Prafulla . . > 1.7.0.4
> -----Original Message----- > From: Ajay Bhargav [mailto:ajay.bhargav@einfochips.com] > Sent: Wednesday, July 06, 2011 12:09 PM > To: Prafulla Wadaskar > Cc: u-boot@lists.denx.de; Ajay Bhargav > Subject: [PATCH 1/2] Armada100: MFP macro naming correction > > MFP macros for UART3 updated. > > Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com> > --- > arch/arm/include/asm/arch-armada100/mfp.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/include/asm/arch-armada100/mfp.h > b/arch/arm/include/asm/arch-armada100/mfp.h > index 73783a7..d6e0494 100644 > --- a/arch/arm/include/asm/arch-armada100/mfp.h > +++ b/arch/arm/include/asm/arch-armada100/mfp.h > @@ -57,8 +57,8 @@ > #define MFP89_UART2_TXD (MFP_REG(0x0164) | MFP_AF2 | > MFP_DRIVE_MEDIUM) > > /* UART3 */ > -#define MFPO8_UART3_RXD (MFP_REG(0x06c) | MFP_AF2 | > MFP_DRIVE_MEDIUM) > -#define MFPO9_UART3_TXD (MFP_REG(0x070) | MFP_AF2 | > MFP_DRIVE_MEDIUM) > +#define MFPO8_UART3_TXD (MFP_REG(0x06c) | MFP_AF2 | > MFP_DRIVE_MEDIUM) > +#define MFPO9_UART3_RXD (MFP_REG(0x070) | MFP_AF2 | > MFP_DRIVE_MEDIUM) > > /* I2c */ > #define MFP105_CI2C_SDA (MFP_REG(0x1a4) | MFP_AF1 | > MFP_DRIVE_MEDIUM) > -- Applied to u-boot-marvell.git master branch Regards.. Prafulla . . > 1.7.0.4
diff --git a/arch/arm/include/asm/arch-armada100/mfp.h b/arch/arm/include/asm/arch-armada100/mfp.h index 73783a7..d6e0494 100644 --- a/arch/arm/include/asm/arch-armada100/mfp.h +++ b/arch/arm/include/asm/arch-armada100/mfp.h @@ -57,8 +57,8 @@ #define MFP89_UART2_TXD (MFP_REG(0x0164) | MFP_AF2 | MFP_DRIVE_MEDIUM) /* UART3 */ -#define MFPO8_UART3_RXD (MFP_REG(0x06c) | MFP_AF2 | MFP_DRIVE_MEDIUM) -#define MFPO9_UART3_TXD (MFP_REG(0x070) | MFP_AF2 | MFP_DRIVE_MEDIUM) +#define MFPO8_UART3_TXD (MFP_REG(0x06c) | MFP_AF2 | MFP_DRIVE_MEDIUM) +#define MFPO9_UART3_RXD (MFP_REG(0x070) | MFP_AF2 | MFP_DRIVE_MEDIUM) /* I2c */ #define MFP105_CI2C_SDA (MFP_REG(0x1a4) | MFP_AF1 | MFP_DRIVE_MEDIUM)
MFP macros for UART3 updated. Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com> --- arch/arm/include/asm/arch-armada100/mfp.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)