| Message ID | 767176330.2399815.1344951232964.JavaMail.root@advansee.com |
|---|---|
| State | Accepted |
| Commit | f2d3ae0739617a671c09297dc49bf6d92b4c8bdc |
| Delegated to: | Stefano Babic |
| Headers | show |
On 14/08/2012 15:33, Benoît Thébaudeau wrote: > Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> > Cc: Stefano Babic <sbabic@denx.de> > --- > .../arch/arm/include/asm/arch-mx31/imx-regs.h | 2 +- > .../arch/arm/include/asm/arch-mx35/imx-regs.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx31/imx-regs.h u-boot-4d3c95f/arch/arm/include/asm/arch-mx31/imx-regs.h > index 7ddbbd6..bba37ac 100644 > --- u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx31/imx-regs.h > +++ u-boot-4d3c95f/arch/arm/include/asm/arch-mx31/imx-regs.h > @@ -669,7 +669,7 @@ struct esdc_regs { > #define IPU_CONF_PF_EN (1<<3) > #define IPU_CONF_ROT_EN (1<<2) > #define IPU_CONF_IC_EN (1<<1) > -#define IPU_CONF_SCI_EN (1<<0) > +#define IPU_CONF_CSI_EN (1<<0) > > #define ARM_PPMRR 0x40000015 > > diff --git u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/imx-regs.h u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/imx-regs.h > index 3146006..e292bcf 100644 > --- u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/imx-regs.h > +++ u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/imx-regs.h > @@ -177,7 +177,7 @@ > #define IPU_CONF_PF_EN (1<<3) > #define IPU_CONF_ROT_EN (1<<2) > #define IPU_CONF_IC_EN (1<<1) > -#define IPU_CONF_SCI_EN (1<<0) > +#define IPU_CONF_CSI_EN (1<<0) > > /* > * CSPI register definitions > Acked-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
On 14/08/2012 15:33, Benoît Thébaudeau wrote: > Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> > Cc: Stefano Babic <sbabic@denx.de> > --- > .../arch/arm/include/asm/arch-mx31/imx-regs.h | 2 +- > .../arch/arm/include/asm/arch-mx35/imx-regs.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx31/imx-regs.h u-boot-4d3c95f/arch/arm/include/asm/arch-mx31/imx-regs.h > index 7ddbbd6..bba37ac 100644 > --- u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx31/imx-regs.h > +++ u-boot-4d3c95f/arch/arm/include/asm/arch-mx31/imx-regs.h > @@ -669,7 +669,7 @@ struct esdc_regs { > #define IPU_CONF_PF_EN (1<<3) > #define IPU_CONF_ROT_EN (1<<2) > #define IPU_CONF_IC_EN (1<<1) > -#define IPU_CONF_SCI_EN (1<<0) > +#define IPU_CONF_CSI_EN (1<<0) > > #define ARM_PPMRR 0x40000015 > > diff --git u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/imx-regs.h u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/imx-regs.h > index 3146006..e292bcf 100644 > --- u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/imx-regs.h > +++ u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/imx-regs.h > @@ -177,7 +177,7 @@ > #define IPU_CONF_PF_EN (1<<3) > #define IPU_CONF_ROT_EN (1<<2) > #define IPU_CONF_IC_EN (1<<1) > -#define IPU_CONF_SCI_EN (1<<0) > +#define IPU_CONF_CSI_EN (1<<0) > > /* > * CSPI register definitions > Applied to u-boot-imx, thanks. Best regards, Stefano Babic
diff --git u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx31/imx-regs.h u-boot-4d3c95f/arch/arm/include/asm/arch-mx31/imx-regs.h index 7ddbbd6..bba37ac 100644 --- u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx31/imx-regs.h +++ u-boot-4d3c95f/arch/arm/include/asm/arch-mx31/imx-regs.h @@ -669,7 +669,7 @@ struct esdc_regs { #define IPU_CONF_PF_EN (1<<3) #define IPU_CONF_ROT_EN (1<<2) #define IPU_CONF_IC_EN (1<<1) -#define IPU_CONF_SCI_EN (1<<0) +#define IPU_CONF_CSI_EN (1<<0) #define ARM_PPMRR 0x40000015 diff --git u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/imx-regs.h u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/imx-regs.h index 3146006..e292bcf 100644 --- u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/imx-regs.h +++ u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/imx-regs.h @@ -177,7 +177,7 @@ #define IPU_CONF_PF_EN (1<<3) #define IPU_CONF_ROT_EN (1<<2) #define IPU_CONF_IC_EN (1<<1) -#define IPU_CONF_SCI_EN (1<<0) +#define IPU_CONF_CSI_EN (1<<0) /* * CSPI register definitions
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Cc: Stefano Babic <sbabic@denx.de> --- .../arch/arm/include/asm/arch-mx31/imx-regs.h | 2 +- .../arch/arm/include/asm/arch-mx35/imx-regs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)