diff options
| author | Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com> | 2011-03-02 11:11:05 +0300 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-03-07 21:29:36 +0300 |
| commit | 9685a3609d7f15297987c511c323b43693317960 (patch) | |
| tree | a7c31c7ea628ca31df9d5952a6b08a2168b35bb2 /arch/arm | |
| parent | 54c4bd658ee7cfdaec57d5fb8677e9bf8a380df5 (diff) | |
| download | linux-9685a3609d7f15297987c511c323b43693317960.tar.xz | |
MX1: Add structure, registration functions for framebuffer and rename LCDC INT
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
| -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 @@ #include <mach/mx1.h> #include <mach/devices-common.h> +extern const struct imx_imx_fb_data imx1_imx_fb_data __initconst; +#define imx1_add_imx_fb(pdata) \ + imx_add_imx_fb(&imx1_imx_fb_data, pdata) + extern const struct imx_imx_i2c_data imx1_imx_i2c_data __initconst; #define imx1_add_imx_i2c(pdata) \ 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 @@ .irq = soc ## _INT_LCDC, \ } +#ifdef CONFIG_SOC_IMX1 +const struct imx_imx_fb_data imx1_imx_fb_data __initconst = + imx_imx_fb_data_entry_single(MX1, SZ_4K); +#endif /* ifdef CONFIG_SOC_IMX1 */ + #ifdef CONFIG_SOC_IMX21 const struct imx_imx_fb_data imx21_imx_fb_data __initconst = 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 @@ #define MX1_GPIO_INT_PORTA 11 #define MX1_GPIO_INT_PORTB 12 #define MX1_GPIO_INT_PORTC 13 -#define MX1_LCDC_INT 14 +#define MX1_INT_LCDC 14 #define MX1_SIM_INT 15 #define MX1_SIM_DATA_INT 16 #define MX1_RTC_INT 17 |