| Message ID | 1335324807-16177-1-git-send-email-troy.kisky@boundarydevices.com |
|---|---|
| State | Accepted |
| Delegated to: | Heiko Schocher |
| Headers | show |
On 25/04/2012 05:33, Troy Kisky wrote: > The following platforms had their config files changed > flea3, imx31_phycore, mx35pdk, mx53ard, mx53evk, mx53smd > > Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> > --- Hi Troy, > arch/arm/include/asm/arch-mx31/imx-regs.h | 7 +++++++ > arch/arm/include/asm/arch-mx35/imx-regs.h | 2 +- > drivers/i2c/mxc_i2c.c | 25 ++++--------------------- > include/configs/flea3.h | 2 +- > include/configs/imx31_phycore.h | 3 ++- > include/configs/mx35pdk.h | 2 +- > include/configs/mx53ard.h | 2 +- > include/configs/mx53evk.h | 2 +- > include/configs/mx53smd.h | 2 +- > 9 files changed, 19 insertions(+), 28 deletions(-) > Acked-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
On 06.05.2012 17:27, Stefano Babic wrote: > On 25/04/2012 05:33, Troy Kisky wrote: >> The following platforms had their config files changed >> flea3, imx31_phycore, mx35pdk, mx53ard, mx53evk, mx53smd >> >> Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> >> --- > > Hi Troy, > >> arch/arm/include/asm/arch-mx31/imx-regs.h | 7 +++++++ >> arch/arm/include/asm/arch-mx35/imx-regs.h | 2 +- >> drivers/i2c/mxc_i2c.c | 25 ++++--------------------- >> include/configs/flea3.h | 2 +- >> include/configs/imx31_phycore.h | 3 ++- >> include/configs/mx35pdk.h | 2 +- >> include/configs/mx53ard.h | 2 +- >> include/configs/mx53evk.h | 2 +- >> include/configs/mx53smd.h | 2 +- >> 9 files changed, 19 insertions(+), 28 deletions(-) >> > > Acked-by: Stefano Babic <sbabic@denx.de> Hmm, is this already applied anywhere? It doesn't seem to be included in v2012.07-rc1? Best regards Dirk
Hello Dirk, On 11.07.2012 08:25, Dirk Behme wrote: > On 06.05.2012 17:27, Stefano Babic wrote: >> On 25/04/2012 05:33, Troy Kisky wrote: >>> The following platforms had their config files changed >>> flea3, imx31_phycore, mx35pdk, mx53ard, mx53evk, mx53smd >>> >>> Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> >>> --- >> >> Hi Troy, >> >>> arch/arm/include/asm/arch-mx31/imx-regs.h | 7 +++++++ >>> arch/arm/include/asm/arch-mx35/imx-regs.h | 2 +- >>> drivers/i2c/mxc_i2c.c | 25 ++++--------------------- >>> include/configs/flea3.h | 2 +- >>> include/configs/imx31_phycore.h | 3 ++- >>> include/configs/mx35pdk.h | 2 +- >>> include/configs/mx53ard.h | 2 +- >>> include/configs/mx53evk.h | 2 +- >>> include/configs/mx53smd.h | 2 +- >>> 9 files changed, 19 insertions(+), 28 deletions(-) >>> >> >> Acked-by: Stefano Babic <sbabic@denx.de> > > Hmm, is this already applied anywhere? It doesn't seem to be included in v2012.07-rc1? Yes, it is applied in: http://git.denx.de/?p=u-boot/u-boot-i2c.git;a=summary But I could not found my pull request to Wolfgang :-( Currently rebased to current master, send pull reqeust soon. Thanks for detecting this! bye, Heiko
diff --git a/arch/arm/include/asm/arch-mx31/imx-regs.h b/arch/arm/include/asm/arch-mx31/imx-regs.h index 6454acb..7ddbbd6 100644 --- a/arch/arm/include/asm/arch-mx31/imx-regs.h +++ b/arch/arm/include/asm/arch-mx31/imx-regs.h @@ -606,6 +606,13 @@ struct esdc_regs { #define UART4_BASE 0x43FB0000 #define UART5_BASE 0x43FB4000 +#define I2C1_BASE_ADDR 0x43f80000 +#define I2C1_CLK_OFFSET 26 +#define I2C2_BASE_ADDR 0x43F98000 +#define I2C2_CLK_OFFSET 28 +#define I2C3_BASE_ADDR 0x43f84000 +#define I2C3_CLK_OFFSET 30 + #define ESDCTL_SDE (1 << 31) #define ESDCTL_CMD_RW (0 << 28) #define ESDCTL_CMD_PRECHARGE (1 << 28) diff --git a/arch/arm/include/asm/arch-mx35/imx-regs.h b/arch/arm/include/asm/arch-mx35/imx-regs.h index e570ad1..3146006 100644 --- a/arch/arm/include/asm/arch-mx35/imx-regs.h +++ b/arch/arm/include/asm/arch-mx35/imx-regs.h @@ -39,7 +39,7 @@ #define MAX_BASE_ADDR 0x43F04000 #define EVTMON_BASE_ADDR 0x43F08000 #define CLKCTL_BASE_ADDR 0x43F0C000 -#define I2C_BASE_ADDR 0x43F80000 +#define I2C1_BASE_ADDR 0x43F80000 #define I2C3_BASE_ADDR 0x43F84000 #define ATA_BASE_ADDR 0x43F8C000 #define UART1_BASE 0x43F90000 diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index c88ac7c..416ffee 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -59,27 +59,10 @@ struct mxc_i2c_regs { #define I2SR_IIF (1 << 1) #define I2SR_RX_NO_AK (1 << 0) -#if defined(CONFIG_SYS_I2C_MX31_PORT1) -#define I2C_BASE 0x43f80000 -#define I2C_CLK_OFFSET 26 -#elif defined (CONFIG_SYS_I2C_MX31_PORT2) -#define I2C_BASE 0x43f98000 -#define I2C_CLK_OFFSET 28 -#elif defined (CONFIG_SYS_I2C_MX31_PORT3) -#define I2C_BASE 0x43f84000 -#define I2C_CLK_OFFSET 30 -#elif defined(CONFIG_SYS_I2C_MX53_PORT1) -#define I2C_BASE I2C1_BASE_ADDR -#elif defined(CONFIG_SYS_I2C_MX53_PORT2) -#define I2C_BASE I2C2_BASE_ADDR -#elif defined(CONFIG_SYS_I2C_MX35_PORT1) -#define I2C_BASE I2C_BASE_ADDR -#elif defined(CONFIG_SYS_I2C_MX35_PORT2) -#define I2C_BASE I2C2_BASE_ADDR -#elif defined(CONFIG_SYS_I2C_MX35_PORT3) -#define I2C_BASE I2C3_BASE_ADDR +#ifdef CONFIG_SYS_I2C_BASE +#define I2C_BASE CONFIG_SYS_I2C_BASE #else -#error "define CONFIG_SYS_I2C_MX<Processor>_PORTx to use the mx I2C driver" +#error "define CONFIG_SYS_I2C_BASE to use the mxc_i2c driver" #endif #define I2C_MAX_TIMEOUT 10000 @@ -114,7 +97,7 @@ static uint8_t i2c_imx_get_clk(unsigned int rate) (struct clock_control_regs *)CCM_BASE; /* start the required I2C clock */ - writel(readl(&sc_regs->cgr0) | (3 << I2C_CLK_OFFSET), + writel(readl(&sc_regs->cgr0) | (3 << CONFIG_SYS_I2C_CLK_OFFSET), &sc_regs->cgr0); #endif diff --git a/include/configs/flea3.h b/include/configs/flea3.h index f046a58..75330c4 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -68,7 +68,7 @@ */ #define CONFIG_HARD_I2C #define CONFIG_I2C_MXC -#define CONFIG_SYS_I2C_MX35_PORT3 +#define CONFIG_SYS_I2C_BASE I2C3_BASE_ADDR #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SLAVE 0xfe #define CONFIG_MXC_SPI diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index 3153eb5..197cefa 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -54,7 +54,8 @@ #define CONFIG_HARD_I2C #define CONFIG_I2C_MXC -#define CONFIG_SYS_I2C_MX31_PORT2 +#define CONFIG_SYS_I2C_BASE I2C2_BASE_ADDR +#define CONFIG_SYS_I2C_CLK_OFFSET I2C2_CLK_OFFSET #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SLAVE 0xfe diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index de4b954..dfe39b8 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -59,7 +59,7 @@ */ #define CONFIG_HARD_I2C #define CONFIG_I2C_MXC -#define CONFIG_SYS_I2C_MX35_PORT1 +#define CONFIG_SYS_I2C_BASE I2C1_BASE_ADDR #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SLAVE 0xfe #define CONFIG_MXC_SPI diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index f48a41e..0bdf6a3 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -50,7 +50,7 @@ #define CONFIG_CMD_I2C #define CONFIG_HARD_I2C #define CONFIG_I2C_MXC -#define CONFIG_SYS_I2C_MX53_PORT2 +#define CONFIG_SYS_I2C_BASE I2C2_BASE_ADDR #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SLAVE 0xfe diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index a77e5b2..3c7c329 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -53,7 +53,7 @@ #define CONFIG_CMD_I2C #define CONFIG_HARD_I2C #define CONFIG_I2C_MXC -#define CONFIG_SYS_I2C_MX53_PORT2 1 +#define CONFIG_SYS_I2C_BASE I2C2_BASE_ADDR #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SLAVE 0xfe diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index a04db3f..a904130 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -50,7 +50,7 @@ #define CONFIG_CMD_I2C #define CONFIG_HARD_I2C #define CONFIG_I2C_MXC -#define CONFIG_SYS_I2C_MX53_PORT2 +#define CONFIG_SYS_I2C_BASE I2C2_BASE_ADDR #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SLAVE 0xfe
The following platforms had their config files changed flea3, imx31_phycore, mx35pdk, mx53ard, mx53evk, mx53smd Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> --- arch/arm/include/asm/arch-mx31/imx-regs.h | 7 +++++++ arch/arm/include/asm/arch-mx35/imx-regs.h | 2 +- drivers/i2c/mxc_i2c.c | 25 ++++--------------------- include/configs/flea3.h | 2 +- include/configs/imx31_phycore.h | 3 ++- include/configs/mx35pdk.h | 2 +- include/configs/mx53ard.h | 2 +- include/configs/mx53evk.h | 2 +- include/configs/mx53smd.h | 2 +- 9 files changed, 19 insertions(+), 28 deletions(-)