diff options
| author | Paul Kocialkowski <contact@paulk.fr> | 2014-01-12 23:51:13 +0100 |
|---|---|---|
| committer | Paul Kocialkowski <contact@paulk.fr> | 2014-01-12 23:51:13 +0100 |
| commit | 3910e4e1ffaa7968ad33cbf03bdee078c8698f66 (patch) | |
| tree | 557266215b0bbeb7938b377140abb79885ca1302 | |
| parent | b55c6be89aed324252e17f0241ea19af7dd82335 (diff) | |
| download | kernel_samsung_espresso10-3910e4e1ffaa7968ad33cbf03bdee078c8698f66.tar.gz kernel_samsung_espresso10-3910e4e1ffaa7968ad33cbf03bdee078c8698f66.tar.bz2 kernel_samsung_espresso10-3910e4e1ffaa7968ad33cbf03bdee078c8698f66.zip | |
sec_ts: Avoid loading firmwares
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
| -rw-r--r-- | arch/arm/configs/cyanogenmod_p3100_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/cyanogenmod_p3110_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/cyanogenmod_p5100_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/cyanogenmod_p5110_defconfig | 2 | ||||
| -rw-r--r-- | drivers/input/touchscreen/mms136.c | 12 | ||||
| -rw-r--r-- | drivers/input/touchscreen/synaptics_s7301.c | 5 |
6 files changed, 6 insertions, 19 deletions
diff --git a/arch/arm/configs/cyanogenmod_p3100_defconfig b/arch/arm/configs/cyanogenmod_p3100_defconfig index caa875d4c51..fce32839da4 100644 --- a/arch/arm/configs/cyanogenmod_p3100_defconfig +++ b/arch/arm/configs/cyanogenmod_p3100_defconfig @@ -333,7 +333,7 @@ CONFIG_MACH_OMAP_SAMSUNG=y CONFIG_MACH_OMAP4_SAMSUNG=y # CONFIG_MACH_SAMSUNG_T1 is not set CONFIG_MACH_SAMSUNG_ESPRESSO=y -CONFIG_FW_SAMSUNG_ESPRESSO_TSP=y +# CONFIG_FW_SAMSUNG_ESPRESSO_TSP is not set # CONFIG_MACH_SAMSUNG_ESPRESSO_10 is not set # CONFIG_FW_SAMSUNG_ESPRESSO_10_TSP is not set # CONFIG_MACH_SAMSUNG_PALAU is not set diff --git a/arch/arm/configs/cyanogenmod_p3110_defconfig b/arch/arm/configs/cyanogenmod_p3110_defconfig index e797b02e25c..2b41053903d 100644 --- a/arch/arm/configs/cyanogenmod_p3110_defconfig +++ b/arch/arm/configs/cyanogenmod_p3110_defconfig @@ -333,7 +333,7 @@ CONFIG_MACH_OMAP_SAMSUNG=y CONFIG_MACH_OMAP4_SAMSUNG=y # CONFIG_MACH_SAMSUNG_T1 is not set CONFIG_MACH_SAMSUNG_ESPRESSO=y -CONFIG_FW_SAMSUNG_ESPRESSO_TSP=y +# CONFIG_FW_SAMSUNG_ESPRESSO_TSP is not set # CONFIG_MACH_SAMSUNG_ESPRESSO_10 is not set # CONFIG_FW_SAMSUNG_ESPRESSO_10_TSP is not set # CONFIG_MACH_SAMSUNG_PALAU is not set diff --git a/arch/arm/configs/cyanogenmod_p5100_defconfig b/arch/arm/configs/cyanogenmod_p5100_defconfig index dd69f26f47c..e4fb30f9daf 100644 --- a/arch/arm/configs/cyanogenmod_p5100_defconfig +++ b/arch/arm/configs/cyanogenmod_p5100_defconfig @@ -335,7 +335,7 @@ CONFIG_MACH_OMAP4_SAMSUNG=y # CONFIG_MACH_SAMSUNG_ESPRESSO is not set # CONFIG_FW_SAMSUNG_ESPRESSO_TSP is not set CONFIG_MACH_SAMSUNG_ESPRESSO_10=y -CONFIG_FW_SAMSUNG_ESPRESSO_10_TSP=y +# CONFIG_FW_SAMSUNG_ESPRESSO_10_TSP is not set # CONFIG_MACH_SAMSUNG_PALAU is not set # CONFIG_MACH_SAMSUNG_KONA is not set # CONFIG_FW_SAMSUNG_KONA_TSP is not set diff --git a/arch/arm/configs/cyanogenmod_p5110_defconfig b/arch/arm/configs/cyanogenmod_p5110_defconfig index 1c80a7c352f..36b55fd4947 100644 --- a/arch/arm/configs/cyanogenmod_p5110_defconfig +++ b/arch/arm/configs/cyanogenmod_p5110_defconfig @@ -335,7 +335,7 @@ CONFIG_MACH_OMAP4_SAMSUNG=y # CONFIG_MACH_SAMSUNG_ESPRESSO is not set # CONFIG_FW_SAMSUNG_ESPRESSO_TSP is not set CONFIG_MACH_SAMSUNG_ESPRESSO_10=y -CONFIG_FW_SAMSUNG_ESPRESSO_10_TSP=y +# CONFIG_FW_SAMSUNG_ESPRESSO_10_TSP is not set # CONFIG_MACH_SAMSUNG_PALAU is not set # CONFIG_MACH_SAMSUNG_KONA is not set # CONFIG_FW_SAMSUNG_KONA_TSP is not set diff --git a/drivers/input/touchscreen/mms136.c b/drivers/input/touchscreen/mms136.c index bee556d4e9c..e9cb9aad059 100644 --- a/drivers/input/touchscreen/mms136.c +++ b/drivers/input/touchscreen/mms136.c @@ -197,8 +197,7 @@ static bool fw_updater(struct ts_data *ts, char const *mode) if (request_firmware(&fw, ts->platform_data->fw_name, &client->dev)) { pr_err("tsp: fail to request built-in firmware\n"); - ret = false; - goto out; + return true; } if (ts_read_reg_data(ts, TS_READ_VERSION_ADDR, 4, buf) > 0) { @@ -1348,15 +1347,6 @@ static int __devinit ts_probe(struct i2c_client *client, ts->early_suspend.resume = ts_late_resume; register_early_suspend(&ts->early_suspend); #endif - /* Check to fw. update necessity */ - if (!fw_updater(ts, "normal")) { - i = 3; - pr_err("tsp: ts_probe: fw. update failed. retry %d", i); - while (i--) { - if (fw_updater(ts, "force")) - break; - } - } if (ts->client->irq) { tsp_log("trying to request irq: %s-%d", diff --git a/drivers/input/touchscreen/synaptics_s7301.c b/drivers/input/touchscreen/synaptics_s7301.c index 8b05bb53086..742b2ec4c72 100644 --- a/drivers/input/touchscreen/synaptics_s7301.c +++ b/drivers/input/touchscreen/synaptics_s7301.c @@ -213,7 +213,7 @@ static bool fw_updater(struct ts_data *ts, char *mode) if (request_firmware(&fw, ts->platform_data->fw_name, &ts->client->dev)) { pr_err("tsp: fail to request built-in firmware\n"); - goto out; + return true; } ts->fw_info->version[0] = fw->data[0xb100]; @@ -1183,9 +1183,6 @@ static int __devinit ts_probe(struct i2c_client *client, if (ts->platform_data->set_power) ts->platform_data->set_power(true); - /* Check the new fw. and update */ - fw_updater(ts, "normal"); - if (ts->client->irq) { tsp_debug("trying to request irq: %s %d\n", ts->client->name, ts->client->irq); |