From patchwork Fri Aug 16 08:32:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 11097207 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C54841395 for ; Fri, 16 Aug 2019 08:36:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B568A289C4 for ; Fri, 16 Aug 2019 08:36:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A9D62289DC; Fri, 16 Aug 2019 08:36:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C35F289C4 for ; Fri, 16 Aug 2019 08:36:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726836AbfHPIgi (ORCPT ); Fri, 16 Aug 2019 04:36:38 -0400 Received: from esa3.mentor.iphmx.com ([68.232.137.180]:3892 "EHLO esa3.mentor.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726810AbfHPIgh (ORCPT ); Fri, 16 Aug 2019 04:36:37 -0400 IronPort-SDR: 9z+5PZFDS3f6ws7dm4EI1fZW2Km8RkKXDhGa/i2fawhn+Odm9FTBGKpGwzOH45i/f6lMgpjNKT eJmhuot0MZqrXM2G7ISKTq4myB+Cm5vRMkpct0Q5CLQXmVj+Yr6onb252x6a7aF6wrtwv5Qq3R q+foHgd8qgbJr+sE+HBlHYu0Bdeo9W8KpvDkeMXBxZGKrdb1QP1b7yEucU65aeZMSdLAJbLarG kDBOz7hGHTd9g/aUArXE+pCvFbcYa6ZoBGC/LMMMKg4nAU6e0Dk8xdlBynP1rlTqwgWYrLizXE Ols= X-IronPort-AV: E=Sophos;i="5.64,391,1559548800"; d="scan'208";a="40507144" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 16 Aug 2019 00:33:32 -0800 IronPort-SDR: 1qQBRup5yXpGIrDE9+Y2vDjPw3oloVFOtGl15bH0lo2ms8envzajAwWkkVBzfnUs2McdBkL8J1 sq29iHNhID1kJ2vWdQRYCRu3mOkU8UHh49Oa1LB8eQb1qapeYdf0JGrbpGTu2vcL1wJ+AKFzHr sgWuV37oQnSM9QkF+n6wmoROfJeDGELdiWUaI4s2lx40dd2zlejASZzA+84W1DKKmFWCjc1F1d SYvUBf+TzXHU/mLiIYn9fJ528TGw5m64DLeQZF279y1HltvCvkUB1HO95gdgDAptRNZoepskam XAA= From: Jiada Wang To: , CC: , , , Subject: [PATCH v1 21/63] Input: atmel_mxt_ts - refactor code to enter bootloader into separate func Date: Fri, 16 Aug 2019 17:32:56 +0900 Message-ID: <20190816083338.18685-2-jiada_wang@mentor.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190816083338.18685-1-jiada_wang@mentor.com> References: <20190816083338.18685-1-jiada_wang@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-04.mgc.mentorg.com (147.34.90.204) To svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Nick Dyer Signed-off-by: Nick Dyer (cherry picked from ndyer/linux/for-upstream commit bedd706a32522b946467e15f4f4f24de86a1b4d7) [gdavis: Resolve forward port conflicts due to applying upstream commit 96a938aa214e ("Input: atmel_mxt_ts - remove platform data support").] Signed-off-by: George G. Davis Signed-off-by: Jiada Wang --- drivers/input/touchscreen/atmel_mxt_ts.c | 43 +++++++++++++++--------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index ad5b4a246f55..e171a843751f 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -3253,23 +3253,10 @@ static int mxt_check_firmware_format(struct device *dev, return -EINVAL; } -static int mxt_load_fw(struct device *dev) +static int mxt_enter_bootloader(struct mxt_data *data) { - struct mxt_data *data = dev_get_drvdata(dev); - struct mxt_flash f = { 0, }; int ret; - ret = request_firmware(&f.fw, data->fw_name, dev); - if (ret) { - dev_err(dev, "Unable to open firmware %s\n", data->fw_name); - return ret; - } - - /* Check for incorrect enc file */ - ret = mxt_check_firmware_format(dev, f.fw); - if (ret) - goto release_firmware; - if (data->suspended) { if (data->suspend_mode == MXT_SUSPEND_REGULATOR) mxt_regulator_enable(data); @@ -3287,14 +3274,14 @@ static int mxt_load_fw(struct device *dev) ret = mxt_t6_command(data, MXT_COMMAND_RESET, MXT_BOOT_VALUE, false); if (ret) - goto release_firmware; + return ret; msleep(MXT_RESET_TIME); /* Do not need to scan since we know family ID */ ret = mxt_lookup_bootloader_address(data, 0); if (ret) - goto release_firmware; + return ret; mxt_sysfs_remove(data); mxt_free_input_device(data); @@ -3305,6 +3292,30 @@ static int mxt_load_fw(struct device *dev) reinit_completion(&data->bl_completion); + return 0; +} + +static int mxt_load_fw(struct device *dev) +{ + struct mxt_data *data = dev_get_drvdata(dev); + struct mxt_flash f = { 0, }; + int ret; + + ret = request_firmware(&f.fw, data->fw_name, dev); + if (ret) { + dev_err(dev, "Unable to open firmware %s\n", data->fw_name); + return ret; + } + + ret = mxt_enter_bootloader(data); + if (ret) + goto release_firmware; + + /* Check for incorrect enc file */ + ret = mxt_check_firmware_format(dev, f.fw); + if (ret) + goto release_firmware; + ret = mxt_check_bootloader(data, MXT_WAITING_BOOTLOAD_CMD, false); if (ret) { /* Bootloader may still be unlocked from previous attempt */