From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E639C282C4 for ; Mon, 4 Feb 2019 11:00:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D86E620823 for ; Mon, 4 Feb 2019 10:59:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549278000; bh=MFCVvNvgko2OICbkeAtdkzyAsaYRMA+U758XRYGa3Fg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1TtZcZt6+J64S0MCHakYuW2yyoa1CgxmK0imJ30zzWbwHK8UFJD7eFqRAC3DDTawM sB40v9oCiS3NKd2WQZfG8rAqFr/SI9dnQdeR1qz54yRbNVsZK4UXL3ama4NrjA2o/R csFdj8j8H0Wc3SI9ILc03ZG0HSrHJz1/fJYM/l3w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730463AbfBDK77 (ORCPT ); Mon, 4 Feb 2019 05:59:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:47406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732046AbfBDKte (ORCPT ); Mon, 4 Feb 2019 05:49:34 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E1ABF2070C; Mon, 4 Feb 2019 10:49:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549277374; bh=MFCVvNvgko2OICbkeAtdkzyAsaYRMA+U758XRYGa3Fg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ryvDaf1AKnLdVU/0XexJeCrZL20h+VAA1mIvRhWrPlhYGvdQZNty4P1D4ZEuLSUGr voNQ9eeBmT/djorisnQdHX2nOpu7kEvlZ/m5WbPnfP41xfOc89Nt2zcKEyUlRpTLhy gIMUc03YPkO5mq39Cur41Z/pWlslDF8t7FoCXBwg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Neo Hou , Baolin Wang , Bartosz Golaszewski Subject: [PATCH 4.19 48/74] gpio: sprd: Fix the incorrect data register Date: Mon, 4 Feb 2019 11:37:01 +0100 Message-Id: <20190204103625.876660159@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190204103619.714714157@linuxfoundation.org> References: <20190204103619.714714157@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Neo Hou commit 09d158d52d2bceda736797a61b6c13d7fc83707b upstream. Since differnt type EICs have its own data register to read, thus fix the incorrect data register. Fixes: 25518e024e3a ("gpio: Add Spreadtrum EIC driver support") Cc: Signed-off-by: Neo Hou Signed-off-by: Baolin Wang Signed-off-by: Bartosz Golaszewski Signed-off-by: Greg Kroah-Hartman --- drivers/gpio/gpio-eic-sprd.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) --- a/drivers/gpio/gpio-eic-sprd.c +++ b/drivers/gpio/gpio-eic-sprd.c @@ -180,7 +180,18 @@ static void sprd_eic_free(struct gpio_ch static int sprd_eic_get(struct gpio_chip *chip, unsigned int offset) { - return sprd_eic_read(chip, offset, SPRD_EIC_DBNC_DATA); + struct sprd_eic *sprd_eic = gpiochip_get_data(chip); + + switch (sprd_eic->type) { + case SPRD_EIC_DEBOUNCE: + return sprd_eic_read(chip, offset, SPRD_EIC_DBNC_DATA); + case SPRD_EIC_ASYNC: + return sprd_eic_read(chip, offset, SPRD_EIC_ASYNC_DATA); + case SPRD_EIC_SYNC: + return sprd_eic_read(chip, offset, SPRD_EIC_SYNC_DATA); + default: + return -ENOTSUPP; + } } static int sprd_eic_direction_input(struct gpio_chip *chip, unsigned int offset)