diff options
author | Eric Miao <eric.miao@linaro.org> | 2012-01-12 10:27:36 +0800 |
---|---|---|
committer | Eric Miao <eric.miao@linaro.org> | 2012-01-12 10:27:36 +0800 |
commit | 7ac674d56fec2e9dd144416fd616020aad3170cb (patch) | |
tree | bad3070d766810bd1c10058ae5b54e4de93fae28 /arch/arm/plat-mxc/devices/platform-imx_tve.c | |
parent | 95df9608d81e4290a7a2657eef99229db2ec9aa6 (diff) | |
parent | 3ffa6554d683f636518844887d5dc259b367e731 (diff) |
Merge branch 'topic/lt-3.2-imx6-ugly' into lt-3.2-imx6
* topic/lt-3.2-imx6-ugly: (129 commits)
imx6q: add clock debugfs support
imx6q-sabrelite: add iomux setup
iomux: add and export mxc_iomux_set_gpr_register()
imx6q: add iomux v3 support
imx6q: add UART2 as debug UART (to be removed)
SAUCE: fix the missing header of <linux/module.h>
SAUCE: fix the removal of mxc_register_device()
SAUCE: mx53_loco: fix gpio_to_irq() being non-constant
SAUCE: fix building errors after rebased to v3.2
LINARO: Add lt-mx5_defconfig
ARM i.MX5: fix system_rev if not set by atag or DT
ENGR00162701 mxc_vout: fix potential deadlock of fb_blank
ENGR00162666 mxc_vout: v4l2 playback blocking issue
ENGR00162665 ipuv3 fb: fix non-interleave format wrong color issue
ENGR00162664 mxc_vout: modify pp bypass condition
ENGR00162663 ipuv3 fb: add vertical flip support
ENGR00162475 ipuv3 fb: fix camera preview failure
ENGR00162360 mxc_vout: fix STREAMOFF and G_CROP issues
ENGR00162358 ipuv3 fb: only check pos when fb is unblank
ENGR00162354 ipuv3 device: correct kthread operation for split task
...
Conflicts:
arch/arm/mach-imx/mach-imx6q.c
arch/arm/plat-mxc/include/mach/mx6q.h
arch/arm/plat-mxc/include/mach/mxc.h
drivers/char/Kconfig
drivers/char/Makefile
drivers/mxc/Kconfig
drivers/mxc/Makefile
drivers/rtc/Kconfig
Diffstat (limited to 'arch/arm/plat-mxc/devices/platform-imx_tve.c')
-rw-r--r-- | arch/arm/plat-mxc/devices/platform-imx_tve.c | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-imx_tve.c b/arch/arm/plat-mxc/devices/platform-imx_tve.c new file mode 100644 index 00000000000..7ab501a605c --- /dev/null +++ b/arch/arm/plat-mxc/devices/platform-imx_tve.c @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. + * Jason Chen <jason.chen@freescale.com> + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License version 2 as published by the + * Free Software Foundation. + */ +#include <mach/hardware.h> +#include <mach/devices-common.h> + +#define imx5_tve_data_entry_single(soc) \ + { \ + .iobase = soc ## _TVE_BASE_ADDR, \ + .irq = soc ## _INT_TVE, \ + } + +#ifdef CONFIG_SOC_IMX51 +const struct imx_tve_data imx51_tve_data __initconst = + imx5_tve_data_entry_single(MX51); +#endif /* ifdef CONFIG_SOC_IMX51 */ + +#ifdef CONFIG_SOC_IMX53 +const struct imx_tve_data imx53_tve_data __initconst = + imx5_tve_data_entry_single(MX53); +#endif /* ifdef CONFIG_SOC_IMX53 */ + +struct platform_device *__init imx_add_tve( + const struct imx_tve_data *data, + const struct fsl_mxc_tve_platform_data *pdata) +{ + struct resource res[] = { + { + .start = data->iobase, + .end = data->iobase + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, { + .start = data->irq, + .end = data->irq, + .flags = IORESOURCE_IRQ, + }, + }; + + return imx_add_platform_device("mxc_tve", -1, + res, ARRAY_SIZE(res), pdata, sizeof(*pdata)); +} |