From 862a8680693130e0237c89bf20a3d16ac38a2c0a Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Sat, 22 Sep 2012 15:13:57 +0200 Subject: ARM i.MX35: give register base addresses a proper MX35_ prefix Signed-off-by: Sascha Hauer --- arch/arm/mach-imx/include/mach/devices-imx35.h | 34 +++++++++++++++++--------- 1 file changed, 22 insertions(+), 12 deletions(-) (limited to 'arch/arm/mach-imx/include/mach/devices-imx35.h') diff --git a/arch/arm/mach-imx/include/mach/devices-imx35.h b/arch/arm/mach-imx/include/mach/devices-imx35.h index 9ecaa35ffe..27c49e7161 100644 --- a/arch/arm/mach-imx/include/mach/devices-imx35.h +++ b/arch/arm/mach-imx/include/mach/devices-imx35.h @@ -3,60 +3,70 @@ static inline struct device_d *imx35_add_i2c0(struct i2c_platform_data *pdata) { - return imx_add_i2c((void *)IMX_I2C1_BASE, 0, pdata); + return imx_add_i2c((void *)MX35_I2C1_BASE_ADDR, 0, pdata); } static inline struct device_d *imx35_add_i2c1(struct i2c_platform_data *pdata) { - return imx_add_i2c((void *)IMX_I2C2_BASE, 1, pdata); + return imx_add_i2c((void *)MX35_I2C2_BASE_ADDR, 1, pdata); } static inline struct device_d *imx35_add_i2c2(struct i2c_platform_data *pdata) { - return imx_add_i2c((void *)IMX_I2C3_BASE, 2, pdata); + return imx_add_i2c((void *)MX35_I2C3_BASE_ADDR, 2, pdata); } static inline struct device_d *imx35_add_spi0(struct spi_imx_master *pdata) { - return imx_add_spi((void *)IMX_CSPI1_BASE, 0, pdata); + return imx_add_spi((void *)MX35_CSPI1_BASE_ADDR, 0, pdata); +} + +static inline struct device_d *imx35_add_spi(struct spi_imx_master *pdata) +{ + return imx_add_spi((void *)MX35_CSPI2_BASE_ADDR, 1, pdata); } static inline struct device_d *imx35_add_uart0(void) { - return imx_add_uart((void *)IMX_UART1_BASE, 0); + return imx_add_uart((void *)MX35_UART1_BASE_ADDR, 0); } static inline struct device_d *imx35_add_uart1(void) { - return imx_add_uart((void *)IMX_UART2_BASE, 1); + return imx_add_uart((void *)MX35_UART2_BASE_ADDR, 1); +} + +static inline struct device_d *imx35_add_uart2(void) +{ + return imx_add_uart((void *)MX35_UART3_BASE_ADDR, 2); } static inline struct device_d *imx35_add_nand(struct imx_nand_platform_data *pdata) { - return imx_add_nand((void *)IMX_NFC_BASE, pdata); + return imx_add_nand((void *)MX35_NFC_BASE_ADDR, pdata); } static inline struct device_d *imx35_add_fb(struct imx_ipu_fb_platform_data *pdata) { - return imx_add_ipufb((void *)IMX_IPU_BASE, pdata); + return imx_add_ipufb((void *)MX35_IPU_CTRL_BASE_ADDR, pdata); } static inline struct device_d *imx35_add_fec(struct fec_platform_data *pdata) { - return imx_add_fec((void *)IMX_FEC_BASE, pdata); + return imx_add_fec((void *)MX35_FEC_BASE_ADDR, pdata); } static inline struct device_d *imx35_add_mmc0(struct esdhc_platform_data *pdata) { - return imx_add_esdhc((void *)IMX_SDHC1_BASE, 0, pdata); + return imx_add_esdhc((void *)MX35_ESDHC1_BASE_ADDR, 0, pdata); } static inline struct device_d *imx35_add_mmc1(struct esdhc_platform_data *pdata) { - return imx_add_esdhc((void *)IMX_SDHC2_BASE, 1, pdata); + return imx_add_esdhc((void *)MX35_ESDHC2_BASE_ADDR, 1, pdata); } static inline struct device_d *imx35_add_mmc2(struct esdhc_platform_data *pdata) { - return imx_add_esdhc((void *)IMX_SDHC3_BASE, 2, pdata); + return imx_add_esdhc((void *)MX35_ESDHC3_BASE_ADDR, 2, pdata); } -- cgit v1.2.3