Revert "input: touch: sharp: turn off TOUCH_CLK by default."
David Pu [Fri, 20 Nov 2015 19:49:21 +0000 (11:49 -0800)]
This reverts commit 11208e8d20f890ddf72bf81e8f609e26019c83e2.

it causes bug 1706267. reverting it.
original Bug 1704518

Change-Id: I96dc461b265ea2cc56ae483fb5448e9d16e4d199
Signed-off-by: David Pu <dpu@nvidia.com>
Reviewed-on: http://git-master/r/836025
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

drivers/input/touchscreen/lr388k7_ts.c

index 36ffb12..4c16a8d 100644 (file)
@@ -2282,9 +2282,8 @@ static struct lr388k7_platform_data *lr388k7_parse_dt(struct device *dev,
        struct lr388k7_platform_data *pdata;
        struct device_node *np = dev->of_node;
        int ret, val, irq_gpio;
-#if defined(ACTIVE_ENABLE)
        const char *str;
-#endif
+
        pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
        if (!pdata)
                return ERR_PTR(-ENOMEM);
@@ -2336,7 +2335,6 @@ static struct lr388k7_platform_data *lr388k7_parse_dt(struct device *dev,
                goto exit_release_all_gpio;
        pdata->ts_touch_num_max = val;
 
-#if defined(ACTIVE_ENABLE)
        ret = of_property_read_string(np, "name-of-clock", &str);
        if (ret < 0)
                goto exit_release_all_gpio;
@@ -2347,6 +2345,7 @@ static struct lr388k7_platform_data *lr388k7_parse_dt(struct device *dev,
                goto exit_release_all_gpio;
        pdata->name_of_clock_con = (char *)str;
 
+#if defined(ACTIVE_ENABLE)
        pdata->gpio_clk_sel = of_get_named_gpio_flags(np,
                                                      "clock-sel-gpio",
                                                      0,