IMX: MX31: Cleanup include files and drop nasty #ifdef in drivers

As exception among the i.MX processors, the i.MX31 has headers without general names (mx31-regs.h, mx31.h instead of imx-regs.h and clock.h). This requires several nasty #ifdef in the drivers to include the correct header. The patch cleans up the driver and renames the header files as for the other i.MX processors. Signed-off-by: Stefano Babic <sbabic@denx.de>
13 years ago · 8627111543
parent dcd441c325
commit 8627111543
27 changed files with 35 additions and 58 deletions
--- a/arch/arm/cpu/arm1136/mx31/devices.c
+++ b/arch/arm/cpu/arm1136/mx31/devices.c
@ -24,8 +24,8 @@
 */

 #include <common.h>
-#include <asm/arch/mx31-regs.h>
-#include <asm/arch/mx31.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/clock.h>

 #ifdef CONFIG_SYS_MX31_UART1
 void mx31_uart1_hw_init(void)
--- a/arch/arm/cpu/arm1136/mx31/generic.c
+++ b/arch/arm/cpu/arm1136/mx31/generic.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/imx-regs.h>
 #include <asm/io.h>

 static u32 mx31_decode_pll(u32 reg, u32 infreq)
--- a/arch/arm/cpu/arm1136/mx31/timer.c
+++ b/arch/arm/cpu/arm1136/mx31/timer.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/imx-regs.h>
 #include <div64.h>
 #include <watchdog.h>
 #include <asm/io.h>
--- a/arch/arm/include/asm/arch-mx31/clock.h
+++ b/arch/arm/include/asm/arch-mx31/clock.h
@ -21,8 +21,8 @@
 * MA 02111-1307 USA
 */

-#ifndef __ASM_ARCH_MX31_H
-#define __ASM_ARCH_MX31_H
+#ifndef __ASM_ARCH_CLOCK_H
+#define __ASM_ARCH_CLOCK_H

 extern u32 mx31_get_ipg_clk(void);
 #define imx_get_uartclk mx31_get_ipg_clk
@ -32,4 +32,4 @@ extern void mx31_set_pad(enum iomux_pins pin, u32 config);
 void mx31_uart1_hw_init(void);
 void mx31_spi2_hw_init(void);

-#endif /* __ASM_ARCH_MX31_H */
+#endif /* __ASM_ARCH_CLOCK_H */
--- a/arch/arm/include/asm/arch-mx31/mx31-regs.h
+++ b/arch/arm/include/asm/arch-mx31/mx31-regs.h
--- a/board/davedenx/qong/fpga.c
+++ b/board/davedenx/qong/fpga.c
@ -23,8 +23,8 @@
 */

 #include <common.h>
-#include <asm/arch/mx31.h>
-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/imx-regs.h>
 #include <mxc_gpio.h>
 #include <fpga.h>
 #include <lattice.h>
--- a/board/davedenx/qong/lowlevel_init.S
+++ b/board/davedenx/qong/lowlevel_init.S
@ -20,7 +20,7 @@
 * MA 02111-1307 USA
 */

-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/imx-regs.h>

 .macro REG reg, val
 	ldr r2, =\reg
--- a/board/davedenx/qong/qong.c
+++ b/board/davedenx/qong/qong.c
@ -23,8 +23,8 @@

 #include <common.h>
 #include <netdev.h>
-#include <asm/arch/mx31.h>
-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 #include <nand.h>
 #include <fsl_pmic.h>
--- a/board/freescale/mx31ads/lowlevel_init.S
+++ b/board/freescale/mx31ads/lowlevel_init.S
@ -17,7 +17,7 @@
 * MA 02111-1307 USA
 */

-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/imx-regs.h>

 .macro REG reg, val
 	ldr r2, =\reg
--- a/board/freescale/mx31ads/mx31ads.c
+++ b/board/freescale/mx31ads/mx31ads.c
@ -23,8 +23,8 @@
 #include <common.h>
 #include <netdev.h>
 #include <asm/io.h>
-#include <asm/arch/mx31.h>
-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/imx-regs.h>

 DECLARE_GLOBAL_DATA_PTR;

--- a/board/freescale/mx31pdk/lowlevel_init.S
+++ b/board/freescale/mx31pdk/lowlevel_init.S
@ -21,7 +21,7 @@
 */

 #include <config.h>
-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/imx-regs.h>
 #include <asm/macro.h>

 .globl lowlevel_init
--- a/board/freescale/mx31pdk/mx31pdk.c
+++ b/board/freescale/mx31pdk/mx31pdk.c
@ -26,8 +26,8 @@

 #include <common.h>
 #include <netdev.h>
-#include <asm/arch/mx31.h>
-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/imx-regs.h>

 DECLARE_GLOBAL_DATA_PTR;

--- a/board/imx31_phycore/imx31_phycore.c
+++ b/board/imx31_phycore/imx31_phycore.c
@ -25,8 +25,8 @@
 #include <common.h>
 #include <s6e63d6.h>
 #include <netdev.h>
-#include <asm/arch/mx31.h>
-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/imx-regs.h>

 DECLARE_GLOBAL_DATA_PTR;

--- a/board/imx31_phycore/lowlevel_init.S
+++ b/board/imx31_phycore/lowlevel_init.S
@ -21,7 +21,7 @@
 * MA 02111-1307 USA
 */

-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/imx-regs.h>

 .macro REG reg, val
 	ldr r2, =\reg
--- a/board/logicpd/imx31_litekit/imx31_litekit.c
+++ b/board/logicpd/imx31_litekit/imx31_litekit.c
@ -24,8 +24,8 @@

 #include <common.h>
 #include <netdev.h>
-#include <asm/arch/mx31.h>
-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/imx-regs.h>

 DECLARE_GLOBAL_DATA_PTR;

--- a/board/logicpd/imx31_litekit/lowlevel_init.S
+++ b/board/logicpd/imx31_litekit/lowlevel_init.S
@ -21,7 +21,7 @@
 * MA 02111-1307 USA
 */

-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/imx-regs.h>

 .macro REG reg, val
 	ldr r2, =\reg
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@ -21,12 +21,7 @@
 * MA 02111-1307 USA
 */
 #include <common.h>
-#ifdef CONFIG_MX31
-#include <asm/arch/mx31-regs.h>
-#endif
-#if defined(CONFIG_MX51) || defined(CONFIG_MX53)
 #include <asm/arch/imx-regs.h>
-#endif
 #include <asm/io.h>
 #include <mxc_gpio.h>

--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@ -27,13 +27,8 @@

 #if defined(CONFIG_HARD_I2C)

-#if defined(CONFIG_MX31)
-#include <asm/arch/mx31.h>
-#include <asm/arch/mx31-regs.h>
-#else
-#include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
-#endif
+#include <asm/arch/imx-regs.h>

 #define IADR	0x00
 #define IFDR	0x04
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@ -19,12 +19,8 @@

 #include <common.h>
 #include <watchdog.h>
-#ifdef CONFIG_MX31
-#include <asm/arch/mx31.h>
-#else
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
-#endif

 #define __REG(x)     (*((volatile u32 *)(x)))

--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@ -24,6 +24,8 @@
 #include <asm/errno.h>
 #include <asm/io.h>
 #include <mxc_gpio.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/clock.h>

 #ifdef CONFIG_MX27
 /* i.MX27 has a completely wrong register layout and register definitions in the
@ -34,8 +36,6 @@

 #elif defined(CONFIG_MX31)

-#include <asm/arch/mx31.h>
-
 #define MXC_CSPICTRL_EN		(1 << 0)
 #define MXC_CSPICTRL_MODE	(1 << 1)
 #define MXC_CSPICTRL_XCH	(1 << 2)
@ -63,8 +63,6 @@ static unsigned long spi_bases[] = {
 #define mxc_get_clock(x)	mx31_get_ipg_clk()

 #elif defined(CONFIG_MX51)
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>

 #define MXC_CSPICTRL_EN		(1 << 0)
 #define MXC_CSPICTRL_MODE	(1 << 1)
@ -97,9 +95,6 @@ static unsigned long spi_bases[] = {

 #elif defined(CONFIG_MX35)

-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
-
 #define MXC_CSPICTRL_EN		(1 << 0)
 #define MXC_CSPICTRL_MODE	(1 << 1)
 #define MXC_CSPICTRL_XCH	(1 << 2)
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@ -20,7 +20,7 @@
 #include <common.h>
 #include <usb.h>
 #include <asm/io.h>
-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/imx-regs.h>
 #include <usb/ehci-fsl.h>
 #include <errno.h>

--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@ -22,8 +22,8 @@
 */
 #include <common.h>
 #include <lcd.h>
-#include <asm/arch/mx31.h>
-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/imx-regs.h>
 #include <asm/errno.h>

 DECLARE_GLOBAL_DATA_PTR;
@ -192,7 +192,7 @@ enum ipu_panel {
 };

 /* IPU Common registers */
-/* IPU_CONF and its bits already defined in mx31-regs.h */
+/* IPU_CONF and its bits already defined in imx-regs.h */
 #define IPU_CHA_BUF0_RDY	(0x04 + IPU_BASE)
 #define IPU_CHA_BUF1_RDY	(0x08 + IPU_BASE)
 #define IPU_CHA_DB_MODE_SEL	(0x0C + IPU_BASE)
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@ -28,7 +28,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H

-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/imx-regs.h>

 /* High Level Configuration Options */
 #define CONFIG_ARM1136		1    /* This is an arm1136 CPU core */
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@ -22,7 +22,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H

-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/imx-regs.h>

 /* High Level Configuration Options */
 #define CONFIG_ARM1136		1		/* This is an arm1136 CPU core */
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@ -30,7 +30,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H

-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/imx-regs.h>

 /* High Level Configuration Options */
 #define CONFIG_ARM1136		1	/* This is an arm1136 CPU core */
--- a/include/configs/qong.h
+++ b/include/configs/qong.h
@ -22,7 +22,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H

-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/imx-regs.h>

 /* High Level Configuration Options */
 #define CONFIG_ARM1136		1	/* This is an arm1136 CPU core */
--- a/nand_spl/nand_boot_fsl_nfc.c
+++ b/nand_spl/nand_boot_fsl_nfc.c
@ -26,11 +26,7 @@

 #include <common.h>
 #include <nand.h>
-#ifdef CONFIG_MX31
-#include <asm/arch/mx31-regs.h>
-#else
 #include <asm/arch/imx-regs.h>
-#endif
 #include <asm/io.h>
 #include <fsl_nfc.h>