[U-Boot] [PATCH 2/2] i2c: update config using mxc driver to new subsystem
Heiko Schocher
hs at denx.de
Tue Sep 17 06:51:29 CEST 2013
Hello Phillipe,
added Stefano Babic to cc
Am 15.09.2013 21:09, schrieb Philippe Reynes:
> Signed-off-by: Philippe Reynes<tremyfr at yahoo.fr>
> ---
> include/configs/apf27.h | 5 ++---
> include/configs/flea3.h | 6 +++---
> include/configs/imx31_phycore.h | 6 +++---
> include/configs/m53evk.h | 6 +++---
> include/configs/mx25pdk.h | 6 +++---
> include/configs/mx35pdk.h | 6 +++---
> include/configs/mx53ard.h | 6 +++---
> include/configs/mx53evk.h | 6 +++---
> include/configs/mx53loco.h | 6 +++---
> include/configs/mx53smd.h | 6 +++---
> include/configs/mx6qsabreauto.h | 3 ++-
> include/configs/nitrogen6x.h | 3 ++-
> include/configs/titanium.h | 3 ++-
> include/configs/vf610twr.h | 6 +++---
> include/configs/woodburn_common.h | 6 +++---
> 15 files changed, 41 insertions(+), 39 deletions(-)
>
> diff --git a/include/configs/apf27.h b/include/configs/apf27.h
> index e7e258f..7e0a8a8 100644
> --- a/include/configs/apf27.h
> +++ b/include/configs/apf27.h
> @@ -321,9 +321,8 @@
> */
>
> #ifdef CONFIG_CMD_I2C
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE IMX_I2C1_BASE
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> #define CONFIG_SYS_I2C_SPEED 100000 /* 100 kHz */
> #define CONFIG_SYS_I2C_SLAVE 0x7F
> #define CONFIG_SYS_I2C_NOPROBES { }
> diff --git a/include/configs/flea3.h b/include/configs/flea3.h
> index cfcaf1b..d91fdab 100644
> --- a/include/configs/flea3.h
> +++ b/include/configs/flea3.h
> @@ -50,9 +50,9 @@
> /*
> * Hardware drivers
> */
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE I2C3_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM 2
> #define CONFIG_SYS_I2C_SPEED 100000
> #define CONFIG_SYS_I2C_SLAVE 0xfe
Ah, here we have a different slave address as before -> we need this settings
configurable. Speed setting is equal for all boards, so we need only the slave
addr configurable at the moment.
> #define CONFIG_MXC_SPI
> diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
> index 720e1bf..bf1a2cb 100644
> --- a/include/configs/imx31_phycore.h
> +++ b/include/configs/imx31_phycore.h
> @@ -35,9 +35,9 @@
> * Hardware drivers
> */
>
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE I2C2_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM 1
> #define CONFIG_SYS_I2C_CLK_OFFSET I2C2_CLK_OFFSET
> #define CONFIG_SYS_I2C_SPEED 100000
>
> diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
> index ccb07e3..4e06537 100644
> --- a/include/configs/m53evk.h
> +++ b/include/configs/m53evk.h
> @@ -161,9 +161,9 @@
> * I2C
> */
> #ifdef CONFIG_CMD_I2C
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE I2C2_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM 1
> #define CONFIG_SYS_I2C_SPEED 100000
> #endif
>
> diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
> index 543c415..22fb31b 100644
> --- a/include/configs/mx25pdk.h
> +++ b/include/configs/mx25pdk.h
> @@ -111,9 +111,9 @@
>
> /* I2C Configs */
> #define CONFIG_CMD_I2C
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE IMX_I2C_BASE
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM 0
> #define CONFIG_SYS_I2C_SPEED 100000
>
> /* RTC */
> diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
> index 68b225a..f9387a3 100644
> --- a/include/configs/mx35pdk.h
> +++ b/include/configs/mx35pdk.h
> @@ -41,9 +41,9 @@
> /*
> * Hardware drivers
> */
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE I2C1_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM 0
> #define CONFIG_SYS_I2C_SPEED 100000
> #define CONFIG_MXC_SPI
> #define CONFIG_MXC_GPIO
> diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
> index 122ffd0..e74fc5a 100644
> --- a/include/configs/mx53ard.h
> +++ b/include/configs/mx53ard.h
> @@ -44,9 +44,9 @@
>
> /* I2C Configs */
> #define CONFIG_CMD_I2C
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE I2C2_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM 1
> #define CONFIG_SYS_I2C_SPEED 100000
>
> /* MMC Configs */
> diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
> index d39ce7b..c7582f9 100644
> --- a/include/configs/mx53evk.h
> +++ b/include/configs/mx53evk.h
> @@ -37,9 +37,9 @@
>
> /* I2C Configs */
> #define CONFIG_CMD_I2C
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE I2C2_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM 1
> #define CONFIG_SYS_I2C_SPEED 100000
>
> /* PMIC Configs */
> diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
> index 7237da5..acac6e8 100644
> --- a/include/configs/mx53loco.h
> +++ b/include/configs/mx53loco.h
> @@ -71,9 +71,9 @@
> #define CONFIG_MXC_USB_FLAGS 0
>
> /* I2C Configs */
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE I2C1_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM 0
> #define CONFIG_SYS_I2C_SPEED 100000
>
> /* PMIC Controller */
> diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
> index 7e4e1c9..d13e02c 100644
> --- a/include/configs/mx53smd.h
> +++ b/include/configs/mx53smd.h
> @@ -34,9 +34,9 @@
>
> /* I2C Configs */
> #define CONFIG_CMD_I2C
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE I2C2_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM 1
> #define CONFIG_SYS_I2C_SPEED 100000
>
> /* MMC Configs */
> diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
> index 5530fc6..505b7aa 100644
> --- a/include/configs/mx6qsabreauto.h
> +++ b/include/configs/mx6qsabreauto.h
> @@ -36,8 +36,9 @@
>
> /* I2C Configs */
> #define CONFIG_CMD_I2C
> +#define CONFIG_SYS_I2C
> #define CONFIG_I2C_MULTI_BUS
This define is no longer needed. Please delete this line.
> -#define CONFIG_I2C_MXC
> +#define CONFIG_SYS_I2C_MXC
> #define CONFIG_SYS_I2C_SPEED 100000
>
> #endif /* __MX6QSABREAUTO_CONFIG_H */
> diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
> index 3454b86..e975401 100644
> --- a/include/configs/nitrogen6x.h
> +++ b/include/configs/nitrogen6x.h
> @@ -51,9 +51,10 @@
> #endif
>
> /* I2C Configs */
> +#define CONFIG_SYS_I2C
> #define CONFIG_CMD_I2C
> #define CONFIG_I2C_MULTI_BUS
This define is no longer needed. Please delete this line, and all other.
> -#define CONFIG_I2C_MXC
> +#define CONFIG_SYS_I2C_MXC
> #define CONFIG_SYS_I2C_SPEED 100000
>
> /* OCOTP Configs */
> diff --git a/include/configs/titanium.h b/include/configs/titanium.h
> index 077e25e..86c27b3 100644
> --- a/include/configs/titanium.h
> +++ b/include/configs/titanium.h
> @@ -40,9 +40,10 @@
> #define CONFIG_MXC_UART_BASE UART1_BASE
>
> /* I2C Configs */
> +#define CONFIG_SYS_I2C
> #define CONFIG_CMD_I2C
> #define CONFIG_I2C_MULTI_BUS
> -#define CONFIG_I2C_MXC
> +#define CONFIG_SYS_I2C_MXC
> #define CONFIG_SYS_I2C_SPEED 100000
>
> /* MMC Configs */
> diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
> index 5a7a066..2f3c57f 100644
> --- a/include/configs/vf610twr.h
> +++ b/include/configs/vf610twr.h
> @@ -70,9 +70,9 @@
>
> /* I2C Configs */
> #define CONFIG_CMD_I2C
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE I2C0_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM 0
> #define CONFIG_SYS_I2C_SPEED 100000
>
> #define CONFIG_BOOTDELAY 3
> diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
> index 6b7e81f..de4e3cc 100644
> --- a/include/configs/woodburn_common.h
> +++ b/include/configs/woodburn_common.h
> @@ -45,9 +45,9 @@
> /*
> * Hardware drivers
> */
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE I2C1_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM 0
> #define CONFIG_SYS_I2C_SPEED 100000
> #define CONFIG_MXC_SPI
> #define CONFIG_MXC_GPIO
bye,
Heiko
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
More information about the U-Boot
mailing list