Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp381188pxb; Tue, 3 Nov 2020 01:59:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJw+IkRUVGS3y1sY8oMMhDKVs5JA0tQCOT5bK6hewFsIfOk16jb+POTSbzr0Z0QQlQPK2LwZ X-Received: by 2002:a17:906:8608:: with SMTP id o8mr1489629ejx.36.1604397564035; Tue, 03 Nov 2020 01:59:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604397564; cv=none; d=google.com; s=arc-20160816; b=zBRtwh/h+tcPMHVs8aRApysGc1L0cnko7cyezaodNkRIqEummE27HC0RtkJ3xV1zQy cTuosWyQPGNvQ5x+lMLSbgo83xcXuTtzuZ96UIevGAzQjvagpU7HhCRbBq0fF1SVD7RY bL4E6lD9xSq+0L/mAtEVK7RCW3/s2lUGbpz+9MgXatAEqUVInWqc1C82yepqtNdFCHwT gygLyq1QVurkv2BI4JVWsRXY4aD4dC2Yha195iumroneOnugrbH8fnunEWUOICUyEe8w nkaA9e5kPozpHmj2IhZ/GWb3Gae8zms0RRZG714ptlugnvR5SxBZ96IvjRGiwLuo0FsO b/iA== 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=jKrtLyJGF3AzRmmBFr8DjhXHlWCRY0H/Wn/z9uSrEIA=; b=H/RnGSrC6fldSjMI1s97TYLyvEM5nKOUZ+55PQ+I6GUBg3+nvZngBIvoPYmP+ijbBW VuMOs2tDD5S+uWNI2mvu4XWSOsl/LwxnKu/53KqVUq+HGcAFOwhsTULZV9V62LYTVSJT J5Qy6v2V+fFeo8lmPXQ7jnJDTOlfmMHS0I03wAtaTIh3wSnRxAAn6DJcbABx+GgSrCa6 YX3+qUKWSRgJQtXukwO9A68eq+zpw+xGDkOfsRenBEGqPTy8/S1jhKvR9fitzG10En6f rSuHvkivPp3ATVbRNZnKpUXr4atJXKbTrJPkmnu6AoKSB+Gp5EPspogv2QomSerS+xne 1iMQ== 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 k6si13463024edl.228.2020.11.03.01.59.01; Tue, 03 Nov 2020 01:59:24 -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 S1728036AbgKCJz0 (ORCPT + 99 others); Tue, 3 Nov 2020 04:55:26 -0500 Received: from rtits2.realtek.com ([211.75.126.72]:39322 "EHLO rtits2.realtek.com.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727109AbgKCJzY (ORCPT ); Tue, 3 Nov 2020 04:55:24 -0500 Authenticated-By: X-SpamFilter-By: ArmorX SpamTrap 5.73 with qID 0A39tD5n9015391, 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 0A39tD5n9015391 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 3 Nov 2020 17:55:14 +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:55:13 +0800 From: To: , , CC: , , Rui Feng Subject: [PATCH 7/8] misc: rtsx: Add hardware auto power off for RTS5261 Date: Tue, 3 Nov 2020 17:55:12 +0800 Message-ID: <1604397312-2991-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 enable hardware auto power off when card is removed. Signed-off-by: Rui Feng --- drivers/misc/cardreader/rts5261.c | 9 +++++++++ include/linux/rtsx_pci.h | 3 +++ 2 files changed, 12 insertions(+) diff --git a/drivers/misc/cardreader/rts5261.c b/drivers/misc/cardreader/rts5261.c index 0ef6b3e04a8d..2ada973a0f33 100644 --- a/drivers/misc/cardreader/rts5261.c +++ b/drivers/misc/cardreader/rts5261.c @@ -176,6 +176,8 @@ static int rts5261_card_power_on(struct rtsx_pcr *pcr, int card) if (option->ocp_en) rtsx_pci_enable_ocp(pcr); + rtsx_pci_write_register(pcr, REG_CRC_DUMMY_0, + CFG_SD_POW_AUTO_PD, CFG_SD_POW_AUTO_PD); rtsx_pci_write_register(pcr, RTS5261_LDO1_CFG1, RTS5261_LDO1_TUNE_MASK, RTS5261_LDO1_33); @@ -303,6 +305,8 @@ static int rts5261_card_power_off(struct rtsx_pcr *pcr, int card) err = rtsx_pci_write_register(pcr, RTS5261_LDO1233318_POW_CTL, RTS5261_LDO_POWERON_MASK, 0); + rtsx_pci_write_register(pcr, REG_CRC_DUMMY_0, + CFG_SD_POW_AUTO_PD, 0); if (pcr->option.ocp_en) rtsx_pci_disable_ocp(pcr); @@ -475,6 +479,7 @@ static void rts5261_init_from_cfg(struct rtsx_pcr *pcr) static int rts5261_extra_init_hw(struct rtsx_pcr *pcr) { struct rtsx_cr_option *option = &pcr->option; + u32 val; rtsx_pci_write_register(pcr, RTS5261_AUTOLOAD_CFG1, CD_RESUME_EN_MASK, CD_RESUME_EN_MASK); @@ -489,6 +494,10 @@ static int rts5261_extra_init_hw(struct rtsx_pcr *pcr) AUX_CLK_ACTIVE_SEL_MASK, MAC_CKSW_DONE); rtsx_pci_write_register(pcr, L1SUB_CONFIG3, 0xFF, 0); + if (is_version_higher_than(pcr, PID_5261, IC_VER_B)) { + val = rtsx_pci_readl(pcr, RTSX_DUM_REG); + rtsx_pci_writel(pcr, RTSX_DUM_REG, val | 0x1); + } rtsx_pci_write_register(pcr, RTS5261_AUTOLOAD_CFG4, RTS5261_AUX_CLK_16M_EN, 0); diff --git a/include/linux/rtsx_pci.h b/include/linux/rtsx_pci.h index db249e8707f3..fcaadc7c9df1 100644 --- a/include/linux/rtsx_pci.h +++ b/include/linux/rtsx_pci.h @@ -82,6 +82,7 @@ #define MS_OC_INT_EN (1 << 23) #define SD_OC_INT_EN (1 << 22) +#define RTSX_DUM_REG 0x1C /* * macros for easy use @@ -1272,6 +1273,8 @@ struct rtsx_pcr { #define PCI_PID(pcr) ((pcr)->pci->device) #define is_version(pcr, pid, ver) \ (CHK_PCI_PID(pcr, pid) && (pcr)->ic_version == (ver)) +#define is_version_higher_than(pcr, pid, ver) \ + (CHK_PCI_PID(pcr, pid) && (pcr)->ic_version > (ver)) #define pcr_dbg(pcr, fmt, arg...) \ dev_dbg(&(pcr)->pci->dev, fmt, ##arg) -- 2.17.1