Hello Lei,
Lei Wen wrote:
> Add i2c support to dkb board with pantheon soc.
>
> Signed-off-by: Lei Wen <lei...@marvell.com>
> ---
> arch/arm/cpu/arm926ejs/pantheon/cpu.c | 10 ++++++++++
> arch/arm/include/asm/arch-pantheon/cpu.h | 4 +++-
> arch/arm/include/asm/arch-pantheon/mfp.h | 2 ++
> board/Marvell/dkb/dkb.c | 4 ++++
> include/configs/dkb.h | 11 +++++++++++
> 5 files changed, 30 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/cpu/arm926ejs/pantheon/cpu.c
> b/arch/arm/cpu/arm926ejs/pantheon/cpu.c
> index 9ddc77c..88ecfae 100644
> --- a/arch/arm/cpu/arm926ejs/pantheon/cpu.c
> +++ b/arch/arm/cpu/arm926ejs/pantheon/cpu.c
> @@ -59,6 +59,10 @@ int arch_cpu_init(void)
> /* Enable GPIO clock */
> writel(APBC_APBCLK, &apbclkres->gpio);
>
> + /* Enable I2C clock */
> + writel(APBC_RST | APBC_FNCLK | APBC_APBCLK, &apbclkres->twsi);
> + writel(APBC_FNCLK | APBC_APBCLK, &apbclkres->twsi);
> +
> icache_enable();
>
> return 0;
> @@ -76,3 +80,9 @@ int print_cpuinfo(void)
> return 0;
> }
> #endif
> +
> +#ifdef CONFIG_I2C_MV
> +void i2c_clk_enable (void)
> +{
> +}
> +#endif
> diff --git a/arch/arm/include/asm/arch-pantheon/cpu.h
> b/arch/arm/include/asm/arch-pantheon/cpu.h
> index 30f4393..60955c5 100644
> --- a/arch/arm/include/asm/arch-pantheon/cpu.h
> +++ b/arch/arm/include/asm/arch-pantheon/cpu.h
> @@ -50,7 +50,9 @@ struct panthapb_registers {
> u32 uart0; /*0x000*/
> u32 uart1; /*0x004*/
> u32 gpio; /*0x008*/
> - u8 pad0[0x034 - 0x08 - 4];
> + u8 pad0[0x02c - 0x08 - 4];
> + u32 twsi; /*0x02c*/
> + u8 pad1[0x034 - 0x2c - 4];
> u32 timers; /*0x034*/
> };
>
> diff --git a/arch/arm/include/asm/arch-pantheon/mfp.h
> b/arch/arm/include/asm/arch-pantheon/mfp.h
> index fb291cf..041e64c 100644
> --- a/arch/arm/include/asm/arch-pantheon/mfp.h
> +++ b/arch/arm/include/asm/arch-pantheon/mfp.h
> @@ -34,6 +34,8 @@
> /* UART2 */
> #define MFP47_UART2_RXD MFP_REG(0x198) | MFP_AF6 |
> MFP_DRIVE_MEDIUM
> #define MFP48_UART2_TXD MFP_REG(0x19c) | MFP_AF6 |
> MFP_DRIVE_MEDIUM
> +#define MFP53_CI2C_SCL MFP_REG(0x1b0) | MFP_AF2 |
> MFP_DRIVE_MEDIUM
> +#define MFP54_CI2C_SDA MFP_REG(0x1b4) | MFP_AF2 |
> MFP_DRIVE_MEDIUM
Please add braces around this multiple or concatenation
> /* More macros can be defined here... */
>
> diff --git a/board/Marvell/dkb/dkb.c b/board/Marvell/dkb/dkb.c
> index 72a2d2a..00f73e7 100644
> --- a/board/Marvell/dkb/dkb.c
> +++ b/board/Marvell/dkb/dkb.c
> @@ -36,6 +36,10 @@ int board_early_init_f(void)
> MFP47_UART2_RXD,
> MFP48_UART2_TXD,
>
> + /* I2C */
> + MFP53_CI2C_SCL,
> + MFP54_CI2C_SDA,
> +
> MFP_EOC /*End of configureation*/
> };
> /* configure MFP's */
> diff --git a/include/configs/dkb.h b/include/configs/dkb.h
> index 638af5e..75c4b99 100644
> --- a/include/configs/dkb.h
> +++ b/include/configs/dkb.h
> @@ -56,6 +56,17 @@
> #include "mv-common.h"
>
> #undef CONFIG_ARCH_MISC_INIT
> +
> +/*
> + * I2C definition
> + */
> +#define CONFIG_CMD_I2C
> +#define CONFIG_I2C_MV 1
> +#define CONFIG_PXA_I2C_REG 0xd4011000
> +#define CONFIG_HARD_I2C 1
> +#define CONFIG_SYS_I2C_SPEED 0
> +#define CONFIG_SYS_I2C_SLAVE 0xfe
> +
> /*
> * Environment variables configurations
> */
bye,
Heiko
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
