From patchwork Mon Apr 27 08:40:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Benedikt-Alexander_Mokro=C3=9F?= X-Patchwork-Id: 1277449 X-Patchwork-Delegate: openwrt@kresin.me Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=none (p=none dis=none) header.from=bamkrs.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=jPK4UPIa; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=bamkrs.de header.i=@bamkrs.de header.a=rsa-sha256 header.s=strato-dkim-0002 header.b=jrkJgAxe; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 499dXk3wGHz9sP7 for ; Mon, 27 Apr 2020 18:41:10 +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-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Subject:MIME-Version:Date:Message-ID:From:To: 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=85nixhWQFfmw58DW3OnezgMQrkdeYWkQaAEp4i9Rkf8=; b=jPK4UPIaQw5+gX uD0ebm0Aur8ya63XbkZWj3YQ/ylUKlS4NxqnQPCc3VZbDldm/nXYHzEJEzcwdTpP7Br3ZfJTFv+70 cxjh1TI04bi/oTlJp5+txo2iaMaw32oId3sZi1XNg0VMH1Z8YBF3FDxPbP7Uwoo62vvBZkFlugJ9o z7wD4ftLro17jik1D96OtC955znk/RaDAj7OY+xVXjWNK0XHWWdQ1EhrzGZSYfw5FoKhJr/KNfzXc 86uKhDTDkCV7PBgOzb1TnAtcT0gK3IglvPLFApBCn68dmtmTrlhCHa1ymhmiXQ1sr3Ewd3O3ObjdF ejTpNkk8Pi7JFza8tHTA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jSzK5-0001Rz-5e; Mon, 27 Apr 2020 08:41:05 +0000 Received: from mo6-p00-ob.smtp.rzone.de ([2a01:238:20a:202:5300::6]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jSzK1-0001Qu-Nr for openwrt-devel@lists.openwrt.org; Mon, 27 Apr 2020 08:41:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1587976857; s=strato-dkim-0002; d=bamkrs.de; h=Date:Message-ID:Subject:From:To:X-RZG-CLASS-ID:X-RZG-AUTH:From: Subject:Sender; bh=TE9QLvedoaD4deG8ntg68S8pVzGGsBpUHdS4T0r5LRs=; b=jrkJgAxeZanxjWyUAZ7WTUtB+0WTnuYgJMiLo4VBJghmL6Iuu6fclXvrbT47sXZIbV bBJMEAk7byEW28eJ9k++FdHi8M2gbMJ8Oiz/+ZNz+cUCqIYT5S93Fl/FdPV3EqOXOmVE EIGOEzJFLI42LJQc9knJPbGriZocDiXHNESk/ZWzIfR6IMMJYjU8Ur8tLXkmXf4wx6k/ 9QvTfhiyrsv7DRxPDsWw+7RmPetccJFJiIcuASuT0kP7/p5EotDYIbUd5+JpvIoiFVl3 dBX+vshzPlARI0qbkDBfd+4TCtSCvykIN1iukw4d75iqDAZ9KHDEQdm/Hu0fubWODYaQ sB0Q== X-RZG-AUTH: ":L20Qdkipd/NtQfa67vW/eJfuQpomyW4cBm3G2ZWMm0e+aME9udSL7FwAirwWgNfi+hnaB2xN1T82gTJZvCkNvW/JEERhW3RJaw==" X-RZG-CLASS-ID: mo00 Received: from [IPv6:2a02:b98:0:20d:51aa:b659:9ee4:9410] by smtp.strato.de (RZmta 46.6.2 AUTH) with ESMTPSA id k08b13w3R8evEwr (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate) for ; Mon, 27 Apr 2020 10:40:57 +0200 (CEST) To: openwrt-devel@lists.openwrt.org From: =?utf-8?q?Benedikt-Alexander_Mokro=C3=9F?= Message-ID: <040ba113-764c-9b06-930c-b147c5ab7f90@bamkrs.de> Date: Mon, 27 Apr 2020 10:40:56 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200427_014102_358086_42AC09AC X-CRM114-Status: GOOD ( 12.13 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a01:238:20a:202:5300:0:0:6 listed in] [list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 SPF_NONE SPF: sender does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [OpenWrt-Devel] [PATCH] ramips: mmc: Read mmc-caps from dt with mmc_of_parse X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The original mmc-driver for ramips used hardcoded mmc-caps. This patch removes the hardcoded caps and enables dt parsing with mmc_of_parse. Signed-off-by: Benedikt-Alexander Mokroß --- .../ramips/files/drivers/mmc/host/mtk-mmc/sd.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) cd_active_low = !of_property_read_bool(pdev->dev.of_node, "mediatek,cd-high"); diff --git a/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c b/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c index 8cbc87da3a..c027526118 100644 --- a/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c +++ b/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c @@ -2235,10 +2235,19 @@ static int msdc_drv_probe(struct platform_device *pdev) mmc->f_max = HOST_MAX_MCLK; mmc->ocr_avail = MSDC_OCR_AVAIL; - mmc->caps = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED; + ret = mmc_of_parse(mmc); + if (ret) + goto release; - //TODO: read this as bus-width from dt (via mmc_of_parse) - mmc->caps |= MMC_CAP_4_BIT_DATA; + if (mmc->f_max > HOST_MAX_MCLK) { + dev_warn(mmc->parent, + "\"max-frequency\" property greater than max-frequency of %d, using %d.\n", + HOST_MAX_MCLK, HOST_MAX_MCLK); + mmc->f_max = HOST_MAX_MCLK; + } + + /* It seems these caps must be set regardles of the dt */ + mmc->caps = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;