diff options
| author | Ke Qinghua <qinghua.ke@freescale.com> | 2013-12-20 14:32:14 +0800 |
|---|---|---|
| committer | Ke Qinghua <qinghua.ke@freescale.com> | 2013-12-20 14:32:14 +0800 |
| commit | 68f2962a24700ad4759024ee26debce6b09afa27 (patch) | |
| tree | 2f2f17e55b438637f99d295a4ac840960003036e | |
| parent | 6702ef28b741ab2895f4220ac70f7949a55bb8ee (diff) | |
ENGR00292372 Add consumer IR support in android 4.4
Fix EVK SL build failed.
Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
| -rw-r--r-- | arch/arm/mach-mx6/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabresd.c | 7 | ||||
| -rw-r--r-- | drivers/char/Kconfig | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/mach-mx6/Kconfig b/arch/arm/mach-mx6/Kconfig index 75d7b823e64d..62ac9bbf7e02 100644 --- a/arch/arm/mach-mx6/Kconfig +++ b/arch/arm/mach-mx6/Kconfig @@ -330,7 +330,7 @@ config MX6_CLK_FOR_BOOTUI_TRANS config MX6_IR bool "MX6 IR Support" depends on IMX_HAVE_PLATFORM_MXC_PWM - default y + default n help This config is for MX6 IR support. Enable it if hardware supported. diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c index f182dfcb9f2a..d598c73d44c3 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabresd.c +++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c @@ -1700,11 +1700,13 @@ static struct platform_pwm_backlight_data mx6_sabresd_pwm_backlight_data = { .pwm_period_ns = 50000, }; +#ifdef CONFIG_HAVE_EPIT static struct platform_ir_data mx6_sabresd_ir_data = { .pwm_id = 1, .epit_id = 0, .gpio_id = 0, }; +#endif static struct mxc_dvfs_platform_data sabresd_dvfscore_data = { .reg_id = "VDDCORE", @@ -2065,16 +2067,21 @@ static void __init mx6_sabresd_board_init(void) gpio_request(SABRESD_CABC_EN1, "cabc-en1"); gpio_direction_output(SABRESD_CABC_EN1, 0); +#ifdef CONFIG_HAVE_EPIT imx6q_add_mxc_epit(0); imx6q_add_mxc_epit(1); +#endif imx6q_add_mxc_pwm(0); imx6q_add_mxc_pwm(1); imx6q_add_mxc_pwm(2); imx6q_add_mxc_pwm(3); imx6q_add_mxc_pwm_backlight(0, &mx6_sabresd_pwm_backlight_data); + +#ifdef CONFIG_MX6_IR /* add MXC IR device */ imx6q_add_mxc_ir(0, &mx6_sabresd_ir_data); +#endif imx6q_add_otp(); imx6q_add_viim(); diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 658e001072ad..4d7a16b27f4b 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -81,7 +81,7 @@ config TTY_PRINTK config DEVIR bool "/dev/ir IR device support" - default y + default n help Say Y here if you want to support the /dev/ir device. The /dev/ir device is used for consumer IR. |