diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-imx/devices-imx1.h | 4 | ||||
-rw-r--r-- | arch/arm/plat-mxc/devices/platform-imx-fb.c | 5 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mx1.h | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/devices-imx1.h b/arch/arm/mach-imx/devices-imx1.h index fd267158e0f6..da593657ff3f 100644 --- a/arch/arm/mach-imx/devices-imx1.h +++ b/arch/arm/mach-imx/devices-imx1.h | |||
@@ -9,6 +9,10 @@ | |||
9 | #include <mach/mx1.h> | 9 | #include <mach/mx1.h> |
10 | #include <mach/devices-common.h> | 10 | #include <mach/devices-common.h> |
11 | 11 | ||
12 | extern const struct imx_imx_fb_data imx1_imx_fb_data __initconst; | ||
13 | #define imx1_add_imx_fb(pdata) \ | ||
14 | imx_add_imx_fb(&imx1_imx_fb_data, pdata) | ||
15 | |||
12 | extern const struct imx_imx_i2c_data imx1_imx_i2c_data __initconst; | 16 | extern const struct imx_imx_i2c_data imx1_imx_i2c_data __initconst; |
13 | #define imx1_add_imx_i2c(pdata) \ | 17 | #define imx1_add_imx_i2c(pdata) \ |
14 | imx_add_imx_i2c(&imx1_imx_i2c_data, pdata) | 18 | imx_add_imx_i2c(&imx1_imx_i2c_data, pdata) |
diff --git a/arch/arm/plat-mxc/devices/platform-imx-fb.c b/arch/arm/plat-mxc/devices/platform-imx-fb.c index 6100a7d824dd..79a1cb18a5b0 100644 --- a/arch/arm/plat-mxc/devices/platform-imx-fb.c +++ b/arch/arm/plat-mxc/devices/platform-imx-fb.c | |||
@@ -16,6 +16,11 @@ | |||
16 | .irq = soc ## _INT_LCDC, \ | 16 | .irq = soc ## _INT_LCDC, \ |
17 | } | 17 | } |
18 | 18 | ||
19 | #ifdef CONFIG_SOC_IMX1 | ||
20 | const struct imx_imx_fb_data imx1_imx_fb_data __initconst = | ||
21 | imx_imx_fb_data_entry_single(MX1, SZ_4K); | ||
22 | #endif /* ifdef CONFIG_SOC_IMX1 */ | ||
23 | |||
19 | #ifdef CONFIG_SOC_IMX21 | 24 | #ifdef CONFIG_SOC_IMX21 |
20 | const struct imx_imx_fb_data imx21_imx_fb_data __initconst = | 25 | const struct imx_imx_fb_data imx21_imx_fb_data __initconst = |
21 | imx_imx_fb_data_entry_single(MX21, SZ_4K); | 26 | imx_imx_fb_data_entry_single(MX21, SZ_4K); |
diff --git a/arch/arm/plat-mxc/include/mach/mx1.h b/arch/arm/plat-mxc/include/mach/mx1.h index 7c871b87e97a..97b19e7800bc 100644 --- a/arch/arm/plat-mxc/include/mach/mx1.h +++ b/arch/arm/plat-mxc/include/mach/mx1.h | |||
@@ -89,7 +89,7 @@ | |||
89 | #define MX1_GPIO_INT_PORTA 11 | 89 | #define MX1_GPIO_INT_PORTA 11 |
90 | #define MX1_GPIO_INT_PORTB 12 | 90 | #define MX1_GPIO_INT_PORTB 12 |
91 | #define MX1_GPIO_INT_PORTC 13 | 91 | #define MX1_GPIO_INT_PORTC 13 |
92 | #define MX1_LCDC_INT 14 | 92 | #define MX1_INT_LCDC 14 |
93 | #define MX1_SIM_INT 15 | 93 | #define MX1_SIM_INT 15 |
94 | #define MX1_SIM_DATA_INT 16 | 94 | #define MX1_SIM_DATA_INT 16 |
95 | #define MX1_RTC_INT 17 | 95 | #define MX1_RTC_INT 17 |