From patchwork Thu Jun 7 17:36:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 926479 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="g8/mXKqK"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CMCdDvcw"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 411t5B1d4nz9s1b for ; Fri, 8 Jun 2018 03:36:46 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id:Date:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=n1YAarEzpX5gvAOSRTYOPoPoZnEIIkaLVBcuDCUDf4o=; b=g8/mXKqKvIDY3N GCdgC+SFBUWiMoOWHrX+34oAPMe2znLz7Jw0541GOdErN0k/0yWvjxFBPkxqwwExg1Y7SNOP45ujT ogZWuJmu2/vbFlITvOu2EG+mPRwptKA+neM5QQ5mSXoM0rTjLe2wirglBZgny8ZTToQbE4nDpqxaI P7aM5z+htoXpT4PZI5wHGLiC6Eqzf6+ofdsDQrwmra9G4RReCpd1RYUTkHGgYclXNqU5+hSyBueBo UlJDoa8O/TWBddfwEL5fdMN0NNwzcBx2vshd716bSXH8bg9ukBEwpKoo+VbB3dEV+P4D2xyNEdTuh MXluHblRdPAARZwt6elA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fQypw-00033h-6U; Thu, 07 Jun 2018 17:36:36 +0000 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fQyps-00032m-SC for lede-dev@lists.infradead.org; Thu, 07 Jun 2018 17:36:34 +0000 Received: by mail-pl0-x242.google.com with SMTP id 31-v6so6570442plc.4 for ; Thu, 07 Jun 2018 10:36:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=IYgvv8qc762/RnnHDFuVdxZWxbc3lI3DbAYvxoyhzP8=; b=CMCdDvcwegfmU6Swetp+e02riiCtLwywLEgQuBGNUoENar87JPmFS7Ml7kgRsCVOuN vaYGOhg0jOtsVxNctZMvan148T7gymuHy4cZNQZ+eY9KebbVKFDbgryBURUcegfNNxus 8frF2LZb10m9/15eiNimcDQRCG4nfNztwQVdLqEQeS9rQYJOsSZrrCvtgfELLJWpjoBd DNfU2y4b1j2m5qIucqkvyTr77oW2FnJrh8EZ9ZQDuclKPqHegtD0ST2L9C01ac6qWRmQ 2rQ027ymMXfzfQk0rzw/G/A5zqQ3OQEjPQZx3UYG9vWC/GLOI3s5wH/5368q/7OlMX5B XfBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=IYgvv8qc762/RnnHDFuVdxZWxbc3lI3DbAYvxoyhzP8=; b=NCFAFTkZHo+wT5TQjiMXoY/xkhNJTQZa0+8LmVckALT95d3SdjvPzK07Na5b+NRjhL j9KzM3K7V6deU9uikUKTdCRDrjdpcfAsAslPMpu/EkLiZZHuLhCnotNymh0oohMKTwsp eFit09GWwARGPG5F5yESugW/mJNQ5OvplAOaaPomZmE/73xpRhuIBk5J9lFaDJmdMxNC I13N0+fDBViG0VUxn+iQnCKQaLB5dEHzH6Sc3hJZ5Q7oDl7/eQM9D7qjknFNGMtgLSB1 GEZ94aJTPNGEC9s0LPZ7gjxkWBk0zg2QUPIFuJcPhzRjyjeegMx7eMJbdxAlgUZUDJNf YRdA== X-Gm-Message-State: APt69E0+Rdhy+dzmh8uj4mQhsgNs9BCpZU4uxvR4fvsPfK1dAXsuEXIT f3FSZgupWZtvlxjlLrRJmoW11EfQ X-Google-Smtp-Source: ADUXVKLX1OzfLxGUvUG+UNGI9iietxLdJR4EEQRODN6qaKEvZpj8Kkgm191iyVxf8UifOCCkCI8qCg== X-Received: by 2002:a17:902:1e4:: with SMTP id b91-v6mr2965273plb.155.1528392981535; Thu, 07 Jun 2018 10:36:21 -0700 (PDT) Received: from clevo-mangix.lan (astound-69-42-5-101.ca.astound.net. [69.42.5.101]) by smtp.gmail.com with ESMTPSA id d22-v6sm76316285pfk.126.2018.06.07.10.36.20 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Jun 2018 10:36:21 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Date: Thu, 7 Jun 2018 10:36:19 -0700 Message-Id: <20180607173619.5210-1-rosenp@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180607_103632_912483_02670B3C X-CRM114-Status: GOOD ( 11.34 ) X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c01:0:0:0:242 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rosenp[at]gmail.com) 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is CUSTOM_MED 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid 1.2 NML_ADSP_CUSTOM_MED ADSP custom_med hit, and not from a mailing list Subject: [OpenWrt-Devel] [PATCH] ramips: mmc: Add back some non-mt7621 code that staging removed X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This reverts commit 8a570921b5ba49a2d3824f1220e4c53809063468. This seems to have been accidentally reverted. This fixes mt7620 and mt7628. Signed-off-by: Rosen Penev Acked-by: Daniel Golle --- .../files-4.14/drivers/mmc/host/mtk-mmc/sd.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/sd.c b/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/sd.c index 2a032fcba1..97ae927d2d 100644 --- a/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/sd.c +++ b/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/sd.c @@ -2209,7 +2209,23 @@ static int msdc_drv_probe(struct platform_device *pdev) // Set the pins for sdxc to sdxc mode //FIXME: this should be done by pinctl and not by the sd driver - reg = sdr_read32((void __iomem *)(RALINK_SYSCTL_BASE + 0x60)) & ~(0x3 << 18); + if (ralink_soc == MT762X_SOC_MT7620A || + ralink_soc == MT762X_SOC_MT7621AT) { + reg = sdr_read32((void __iomem *)(RALINK_SYSCTL_BASE + + 0x60)) & ~(0x3 << 18); + if (ralink_soc == MT762X_SOC_MT7620A) + reg |= 0x1 << 18; + } else { + reg = sdr_read32((void __iomem *)(RALINK_SYSCTL_BASE + 0x3c)); + reg |= 0x1e << 16; + sdr_write32((void __iomem *)(RALINK_SYSCTL_BASE + 0x3c), reg); + reg = sdr_read32((void __iomem *)(RALINK_SYSCTL_BASE + + 0x60)) & ~(0x3 << 10); +#if defined(CONFIG_MTK_MMC_EMMC_8BIT) + reg |= 0x3 << 26 | 0x3 << 28 | 0x3 << 30; +#endif + } + sdr_write32((void __iomem *)(RALINK_SYSCTL_BASE + 0x60), reg); hw = &msdc0_hw;