Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp380106pxb; Tue, 3 Nov 2020 01:56:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJw0O96gqqUqrLRAWCTEZYzFZSOux0EyFK9mE+RUNxNUtwm7OeVoF0EL5g1QBV2/Nh6TlJWv X-Received: by 2002:a05:6402:1148:: with SMTP id g8mr21823239edw.271.1604397405984; Tue, 03 Nov 2020 01:56:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604397405; cv=none; d=google.com; s=arc-20160816; b=cyq9f7VnMnQnl8wSmqv2CNLTIuVoWqto97nrPNrWrdPWsHNeWdXtDyxdy09vWWZAS2 ZHmZ60Fo0aQ3twi2d8VPcPr2mp5lteAbLphrBTRP7HP/FauteJHHWlbQ5AFrmJiEdFBG BeZn2mNgux29Lg41kdVttfYAJdsDVpRteBBr+QSC3s121B/hDPtzU+io6byoC33wIGrL 9Z4rzof6ZE+MYHH1zxevFRILM2WqdTljkInEhuQ30YGPaU9HMCx4uUXJq1qSGFvTYQRL dQCN9vQYINrWUXpjECfyS1TSURFQ3BvEdg54VNrHVu4s3h7BZGKgyATbJ6lsbpW8PUkN 1JEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from :authenticated-by; bh=6QWW7GAOTuVB2CPvif8DYe3r1FKs6nuuPQRtV6VFpT8=; b=uWFp+RDzHIXUqRKHT/HftoUm7TLNEDYRTU9Vt3U8mYCXz7ihqlNFXXa4IZtDLVvd/U C3E//bqn8atH9U8f+b3apyt7WKvx++TPWNqVJxXP1t2V5mzdoGmd5P4bVIghUzVHDk1F mVzTnMkU7XIeetyBZ8b9va69hEJdPBsA2/Qk5vf0b7/xu6LrrNSpFmepQ+oWReciF50q 3PJ8o0GV6R7XaY09no3ClrtEDeM7WL0LTt3w2j724Q52r/FQUegYJ5V97br00d8OVA54 eOY+Sb4bcc7t9TJPsVYYjsEq6c7OGNSk+ol+OS7tDGcP3CYuUkoasOdlvFGHGt8yyAtp vqYA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id pw16si11797695ejb.430.2020.11.03.01.56.23; Tue, 03 Nov 2020 01:56:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727789AbgKCJyu (ORCPT + 99 others); Tue, 3 Nov 2020 04:54:50 -0500 Received: from rtits2.realtek.com ([211.75.126.72]:39269 "EHLO rtits2.realtek.com.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727709AbgKCJyt (ORCPT ); Tue, 3 Nov 2020 04:54:49 -0500 Authenticated-By: X-SpamFilter-By: ArmorX SpamTrap 5.73 with qID 0A39seWpB015332, This message is accepted by code: ctloc85258 Received: from RSEXMBS01.realsil.com.cn ([172.29.17.195]) by rtits2.realtek.com.tw (8.15.2/2.70/5.88) with ESMTPS id 0A39seWpB015332 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 3 Nov 2020 17:54:40 +0800 Received: from localhost (172.29.40.150) by RSEXMBS01.realsil.com.cn (172.29.17.195) with Microsoft SMTP Server id 15.1.2044.4; Tue, 3 Nov 2020 17:54:40 +0800 From: To: , , CC: , , Rui Feng Subject: [PATCH 2/8] misc: rtsx: Fix OCP function for RTS5261 Date: Tue, 3 Nov 2020 17:54:38 +0800 Message-ID: <1604397278-2815-1-git-send-email-rui_feng@realsil.com.cn> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.29.40.150] Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rui Feng This patch fix the bug that when there is over current but reader can't enable OCP. Signed-off-by: Rui Feng --- drivers/misc/cardreader/rts5261.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/misc/cardreader/rts5261.c b/drivers/misc/cardreader/rts5261.c index 536c90d4fd76..531bbaed7a12 100644 --- a/drivers/misc/cardreader/rts5261.c +++ b/drivers/misc/cardreader/rts5261.c @@ -272,6 +272,9 @@ static void rts5261_enable_ocp(struct rtsx_pcr *pcr) u8 val = 0; val = SD_OCP_INT_EN | SD_DETECT_EN; + rtsx_pci_write_register(pcr, RTS5261_LDO1_CFG0, + RTS5261_LDO1_OCP_EN | RTS5261_LDO1_OCP_LMT_EN, + RTS5261_LDO1_OCP_EN | RTS5261_LDO1_OCP_LMT_EN); rtsx_pci_write_register(pcr, REG_OCPCTL, 0xFF, val); } @@ -340,7 +343,7 @@ static void rts5261_clear_ocpstat(struct rtsx_pcr *pcr) rtsx_pci_write_register(pcr, REG_OCPCTL, mask, val); - udelay(10); + udelay(1000); rtsx_pci_write_register(pcr, REG_OCPCTL, mask, 0); } @@ -353,9 +356,9 @@ static void rts5261_process_ocp(struct rtsx_pcr *pcr) rtsx_pci_get_ocpstat(pcr, &pcr->ocp_stat); if (pcr->ocp_stat & (SD_OC_NOW | SD_OC_EVER)) { + rts5261_clear_ocpstat(pcr); rts5261_card_power_off(pcr, RTSX_SD_CARD); rtsx_pci_write_register(pcr, CARD_OE, SD_OUTPUT_EN, 0); - rts5261_clear_ocpstat(pcr); pcr->ocp_stat = 0; } @@ -513,6 +516,7 @@ static int rts5261_extra_init_hw(struct rtsx_pcr *pcr) rtsx_pci_write_register(pcr, PETXCFG, FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH); + rtsx_pci_write_register(pcr, PWD_SUSPEND_EN, 0xFF, 0xFB); rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3, 0x10, 0x00); rtsx_pci_write_register(pcr, RTS5261_REG_PME_FORCE_CTL, FORCE_PM_CONTROL | FORCE_PM_VALUE, FORCE_PM_CONTROL); -- 2.17.1