(CR):[kane]:kernel:add egis fps

add egis fps for evb

Change-Id: I3e164b62a866479a0f1d7ac637fe2f80561a4ba3
Signed-off-by: hq_guohongtao5_tmp <guohongtao5@huaqin.com>

diff --git a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_evb.dts b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_evb.dts
index 18eff5627f172857c415fee587b31c8dded1a7e8..853e93b3e3089a9bfe07f08bf65268889e5095a4 100755 (executable)
--- a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_evb.dts
+++ b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_evb.dts
@@ -87,6 +87,8 @@
                                pinctrl-0 = <&spi7_bus &spi7_cs_func>;
                                egistec,gpio_irq    = <&gpa0 5 0>;
                                egistec,gpio_rst    = <&gpa1 1 0>;
+                               egistec,gpio_ldo3p3_en    = <&gpg2 0 0>;
+                               egistec,gpio_ldo1p8_en    = <&gpg2 2 0>;
                        };
                        /*Fingerprint end*/
 

diff --git a/arch/arm64/boot/dts/exynos/exynos9609-wing.dts b/arch/arm64/boot/dts/exynos/exynos9609-wing.dts
old mode 100644 (file)
new mode 100755 (executable)
index e184ea2..e632d10
--- a/arch/arm64/boot/dts/exynos/exynos9609-wing.dts
+++ b/arch/arm64/boot/dts/exynos/exynos9609-wing.dts
@@ -87,6 +87,8 @@
                                pinctrl-0 = <&spi7_bus &spi7_cs_func>;
                                egistec,gpio_irq    = <&gpa0 5 0>;
                                egistec,gpio_rst    = <&gpa1 1 0>;
+                               egistec,gpio_ldo3p3_en    = <&gpg2 0 0>;
+                               egistec,gpio_ldo1p8_en    = <&gpg2 2 0>;
                        };
                        /*Fingerprint end*/
 

diff --git a/drivers/input/egistec/et320-int.c b/drivers/input/egistec/et320-int.c
index 0c5e6d92577f5a2bd14fd36a4b97704ed800d762..50f36388994964719db3adb7b4cd0787fc08fce9 100755 (executable)
--- a/drivers/input/egistec/et320-int.c
+++ b/drivers/input/egistec/et320-int.c
@@ -73,6 +73,8 @@ int request_irq_done = 0;
 #define LEVEL_TRIGGER_LOW       0x2\r
 #define LEVEL_TRIGGER_HIGH      0x3\r
 \r
+#define GPIO_LDO1P8_EN (1)
+#define GPIO_LDO3P3_EN (1)\r
 \r
 struct ioctl_cmd {\r
 int int_mode;\r
@@ -585,8 +587,8 @@ int etspi_platformInit(struct etspi_data *etspi)
 \r
        if (etspi != NULL) {\r
                /* initial 18V power pin */\r
-#if 0          \r
-               status = gpio_request(etspi->vdd_18v_Pin, "18v-gpio");\r
+#if GPIO_LDO1P8_EN
+               status = gpio_request(etspi->vdd_18v_Pin, "fp_18v-gpio");\r
                if (status < 0) {\r
                        pr_err("%s gpio_requset vdd_18v_Pin failed\n",\r
                                __func__);\r
@@ -603,8 +605,10 @@ int etspi_platformInit(struct etspi_data *etspi)
                gpio_set_value(etspi->vdd_18v_Pin, 1);\r
                pr_err("etspi:  vdd_18v_Pin set to high\n");\r
                mdelay(1);\r
+#endif\r
+#if GPIO_LDO3P3_EN\r
                /* initial 33V power pin */\r
-               status = gpio_request(etspi->vcc_33v_Pin, "33v-gpio");\r
+               status = gpio_request(etspi->vcc_33v_Pin, "fp_33v-gpio");\r
                if (status < 0) {\r
                        pr_err("%s gpio_requset vcc_33v_Pin failed\n",\r
                                __func__);\r
@@ -623,7 +627,7 @@ int etspi_platformInit(struct etspi_data *etspi)
 #endif\r
                \r
                /* Initial Reset Pin*/\r
-               status = gpio_request(etspi->rstPin, "ets_reset-gpio");\r
+               status = gpio_request(etspi->rstPin, "fp_reset-gpio");\r
                if (status < 0) {\r
                        pr_err("%s gpio_requset etspi_Reset failed\n",\r
                                __func__);\r
@@ -640,7 +644,7 @@ int etspi_platformInit(struct etspi_data *etspi)
                pr_err("etspi:  reset to high\n");\r
 \r
                /* Initial IRQ Pin*/\r
-               status = gpio_request(etspi->irqPin, "ets_irq-gpio");\r
+               status = gpio_request(etspi->irqPin, "fp_irq-gpio");\r
                if (status < 0) {\r
                        pr_err("%s gpio_request etspi_irq failed\n",\r
                                __func__);\r
@@ -659,8 +663,12 @@ int etspi_platformInit(struct etspi_data *etspi)
 \r
 etspi_platformInit_gpio_init_failed:\r
        gpio_free(etspi->irqPin);\r
-//     gpio_free(etspi->vcc_33v_Pin);\r
-//     gpio_free(etspi->vdd_18v_Pin);\r
+#if GPIO_LDO3P3_EN\r
+       gpio_free(etspi->vcc_33v_Pin);\r
+#endif\r
+#if GPIO_LDO1P8_EN
+       gpio_free(etspi->vdd_18v_Pin);\r
+#endif\r
 etspi_platformInit_irq_failed:\r
        gpio_free(etspi->rstPin);\r
 etspi_platformInit_rst_failed:\r
@@ -692,7 +700,7 @@ static int etspi_parse_dt(struct device *dev,
                data->irqPin = gpio;\r
                DEBUG_PRINT("%s: drdyPin=%d\n", __func__, data->irqPin);\r
        }\r
-/*\r
+#if GPIO_LDO3P3_EN\r
        gpio = of_get_named_gpio(np, "egistec,gpio_ldo3p3_en", 0);\r
        if (gpio < 0) {\r
                errorno = gpio;\r
@@ -701,6 +709,8 @@ static int etspi_parse_dt(struct device *dev,
                data->vcc_33v_Pin = gpio;\r
                pr_info("%s: 3.3v power pin=%d\n", __func__, data->vcc_33v_Pin);\r
        }\r
+#endif\r
+#if GPIO_LDO1P8_EN
        gpio = of_get_named_gpio(np, "egistec,gpio_ldo1p8_en", 0);\r
        if (gpio < 0) {\r
                errorno = gpio;\r
@@ -709,7 +719,7 @@ static int etspi_parse_dt(struct device *dev,
                data->vdd_18v_Pin = gpio;\r
                pr_info("%s: 18v power pin=%d\n", __func__, data->vdd_18v_Pin);\r
        }\r
-*/     \r
+#endif
        DEBUG_PRINT("%s is successful\n", __func__);\r
        return errorno;\r
 dt_exit:\r