]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ENGR00298052-7 ARM: imx6q: remove function imx6q_lvds_cabc_init()
authorLiu Ying <Ying.Liu@freescale.com>
Tue, 18 Feb 2014 04:49:32 +0000 (12:49 +0800)
committerLiu Ying <Ying.Liu@freescale.com>
Wed, 19 Feb 2014 10:36:15 +0000 (18:36 +0800)
This patch removes the function imx6q_lvds_cabc_init() from the
machine layer since we have a dedicated Hannstar CABC driver to
control the CABC feature.

Signed-off-by: Liu Ying <Ying.Liu@freescale.com>
(cherry picked from commit b0d2154a9c63b2beba774e46b90ec3d55609c672)

arch/arm/mach-imx/mach-imx6q.c

index f24c231ce38a2c56695a632f3f26c74caa0863c0..8dbd402ec3b543d86f760ec20e0adea92212c1aa 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 Freescale Semiconductor, Inc.
+ * Copyright 2011-2014 Freescale Semiconductor, Inc.
  * Copyright 2011 Linaro Ltd.
  *
  * The code contained herein is licensed under the GNU General Public
@@ -231,38 +231,6 @@ static void __init imx6q_csi_mux_init(void)
        }
 }
 
-/*
- * Disable Hannstar LVDS panel CABC function.
- * This function turns the panel's backlight density automatically
- * according to the content shown on the panel which may cause
- * annoying unstable backlight issue.
- */
-static void __init imx6q_lvds_cabc_init(void)
-{
-       struct device_node *np = NULL;
-       int ret, lvds0_gpio, lvds1_gpio;
-
-       np = of_find_node_by_name(NULL, "lvds_cabc_ctrl");
-       if (!np)
-               return;
-
-       lvds0_gpio = of_get_named_gpio(np, "lvds0-gpios", 0);
-       if (gpio_is_valid(lvds0_gpio)) {
-               ret = gpio_request_one(lvds0_gpio, GPIOF_OUT_INIT_LOW,
-                               "LVDS0 CABC enable");
-               if (ret)
-                       pr_warn("failed to request LVDS0 CABC gpio\n");
-       }
-
-       lvds1_gpio = of_get_named_gpio(np, "lvds1-gpios", 0);
-       if (gpio_is_valid(lvds1_gpio)) {
-               ret = gpio_request_one(lvds1_gpio, GPIOF_OUT_INIT_LOW,
-                               "LVDS1 CABC enable");
-               if (ret)
-                       pr_warn("failed to request LVDS1 CABC gpio\n");
-       }
-}
-
 #define OCOTP_MACn(n)  (0x00000620 + (n) * 0x10)
 void __init imx6_enet_mac_init(const char *compatible)
 {
@@ -352,7 +320,6 @@ static void __init imx6q_init_machine(void)
        imx_anatop_init();
        imx6_pm_init();
        imx6q_csi_mux_init();
-       imx6q_lvds_cabc_init();
 }
 
 #define OCOTP_CFG3                     0x440