From patchwork Tue Jun 9 10:17:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Tomer X-Patchwork-Id: 11595033 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8F97F618 for ; Tue, 9 Jun 2020 10:17:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 588C32078D for ; Tue, 9 Jun 2020 10:17:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cjXoQGca"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ku32MxuA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 588C32078D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=qQvFn8z7LGbN3XXeTiCmASOHW110Q7ZZKF7H13zeNvM=; b=cjXoQGcaXMF1Tn652gcxmzCG+o K8jhDvK5JtTxWhuREIvR5x1zNfttGh9xG1UlgvgBBY3fdATk9KIv4VCFqqv99ec2yZagBh9Yj++il +bKqVzGHP6GjAZHzAUTnwGKILLflA+q5Xok3BnsYCnc/MmzcY2LCodHd72ayH8fZXeQKr4nogyka6 PrSrIaV5eUIcmzkxhc9ehz9ReE3zyAobTaGydJKGYk6QxOo1xkEcvLSAzXY4kEwfCuiHxA6bH5fH3 q1AUHqpU/j4cGCfNyAka833aGu297AnB8amnrnGhUFf8ryG981EDtzpRT7qmrlhjBIoqMuNu+R3rM luJfmMdw==; 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 1jibKH-0005D6-Eo; Tue, 09 Jun 2020 10:17:49 +0000 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jibK4-0004wc-DW; Tue, 09 Jun 2020 10:17:38 +0000 Received: by mail-pl1-x643.google.com with SMTP id x11so7855296plv.9; Tue, 09 Jun 2020 03:17:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OaQ7+auRM9Q1yLKBuV5VyQHz4qYUBbJ7B40lNF33USM=; b=Ku32MxuAaf7eN9eEOJTcQfS7+B561Jo1jSnNdzP4XO+v+GxlPub6PWRxbOIRXAxCay g5jNspd9MBTQctWNEQMX8YcDqUzb/+KiCaEGHJo9xvLGNbodOasSinTK3omWIMjx8deQ LzLhn1TPTXYFw4SYBcC6dA/sM6DJGVEnAZJG2KisflS8SRl+5xApRvminGbQYpxuHRpc 40tH5tMiU1TPZzjLnGjbLQ43JnSbAVbZLdSVpzRdCMoLGMHhXNB3bWHsVBx48CDW2kRX 2a4cPf/zX9VYp70Dr+ECvj2LmW+5tqFSjl82TJWvm1Z3UW5EcIYBY3hxI896hRQCw5Iv HUBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OaQ7+auRM9Q1yLKBuV5VyQHz4qYUBbJ7B40lNF33USM=; b=tuhaZxhPfsXYhXV11v6FhdLreIN0nm9JsyGQX5k4YzWmxGaMPExvNjezE1kXOwhvaD inEuBpmmMAr+EHkkpWp/GulYLexRXIaQ9tCumXytEjSrTLSPsb2ut482cOyNcNRSj/AE 1oZDyteJ+xmcIw6c5cJJeDwW0Wi39ZfKNleDxQhQcrXuoDoI5dagrfrpKvGurvXxLg+Y SxFeSAzIJTQ1etae8XeKGFSk/uvqzULTZWkbAXe5TYe/R4p27zJmkzfYDPov+sjEqmTz N5reGXB9n4INtOVMvFlHzh2vZa9OA1FxyQE2hKLUBs8qEWq8bcP6ap4b4UXSkGxImAI1 nZcg== X-Gm-Message-State: AOAM533PGr9RjccVN0eHJ8Y93j+TMXE72oIie72ql+NuRchm37LI5Wtn ozqpJuB6w1o0nxwkvLJSPII= X-Google-Smtp-Source: ABdhPJw3kW2M43xVqqQRBt9O8taxkJlAxVuvWJZ+mj2Ra2oAOk+9XlH16UvUH2wMPAqhKXHKFGIu0g== X-Received: by 2002:a17:90a:65c9:: with SMTP id i9mr4008012pjs.201.1591697855603; Tue, 09 Jun 2020 03:17:35 -0700 (PDT) Received: from localhost.localdomain ([223.190.87.90]) by smtp.gmail.com with ESMTPSA id d189sm9637253pfc.51.2020.06.09.03.17.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jun 2020 03:17:34 -0700 (PDT) From: Amit Singh Tomar To: andre.przywara@arm.com, vkoul@kernel.org, afaerber@suse.de, manivannan.sadhasivam@linaro.org Subject: [PATCH v4 01/10] dmaengine: Actions: get rid of bit fields from dma descriptor Date: Tue, 9 Jun 2020 15:47:01 +0530 Message-Id: <1591697830-16311-2-git-send-email-amittomer25@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> References: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200609_031736_492864_84D423E3 X-CRM114-Status: GOOD ( 18.00 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:643 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [amittomer25[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [amittomer25[at]gmail.com] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-actions@lists.infradead.org, linux-kernel@vger.kernel.org, cristian.ciocaltea@gmail.com, dmaengine@vger.kernel.org, dan.j.williams@intel.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org At the moment, Driver uses bit fields to describe registers of the DMA descriptor structure that makes it less portable and maintainable, and Andre suugested(and even sketched important bits for it) to make use of array to describe this DMA descriptors instead. It gives the flexibility while extending support for other platform such as Actions S700. This commit removes the "owl_dma_lli_hw" (that includes bit-fields) and uses array to describe DMA descriptor. Suggested-by: Andre Przywara Signed-off-by: Amit Singh Tomar --- Changes since v3: * Added description for enum fields. * Restored the old comment. * Added detailed comment about, the way FLEN and FCNT values are filled. Changes since v2: * No change. Changes since v1: * Defined macro for frame count value. * Introduced llc_hw_flen() from patch 2/9. * Removed the unnecessary line break. Changes since rfc: * No change. --- drivers/dma/owl-dma.c | 98 +++++++++++++++++++++++++++++---------------------- 1 file changed, 56 insertions(+), 42 deletions(-) diff --git a/drivers/dma/owl-dma.c b/drivers/dma/owl-dma.c index 66ef70b00ec0..948d1bead860 100644 --- a/drivers/dma/owl-dma.c +++ b/drivers/dma/owl-dma.c @@ -120,30 +120,33 @@ #define BIT_FIELD(val, width, shift, newshift) \ ((((val) >> (shift)) & ((BIT(width)) - 1)) << (newshift)) +/* Frame count value is fixed as 1 */ +#define FCNT_VAL 0x1 + /** - * struct owl_dma_lli_hw - Hardware link list for dma transfer - * @next_lli: physical address of the next link list - * @saddr: source physical address - * @daddr: destination physical address - * @flen: frame length - * @fcnt: frame count - * @src_stride: source stride - * @dst_stride: destination stride - * @ctrla: dma_mode and linklist ctrl config - * @ctrlb: interrupt config - * @const_num: data for constant fill + * owl_dmadesc_offsets - Describe DMA descriptor, hardware link + * list for dma transfer + * @OWL_DMADESC_NEXT_LLI: physical address of the next link list + * @OWL_DMADESC_SADDR: source physical address + * @OWL_DMADESC_DADDR: destination physical address + * @OWL_DMADESC_FLEN: frame length + * @OWL_DMADESC_SRC_STRIDE: source stride + * @OWL_DMADESC_DST_STRIDE: destination stride + * @OWL_DMADESC_CTRLA: dma_mode and linklist ctrl config + * @OWL_DMADESC_CTRLB: interrupt config + * @OWL_DMADESC_CONST_NUM: data for constant fill */ -struct owl_dma_lli_hw { - u32 next_lli; - u32 saddr; - u32 daddr; - u32 flen:20; - u32 fcnt:12; - u32 src_stride; - u32 dst_stride; - u32 ctrla; - u32 ctrlb; - u32 const_num; +enum owl_dmadesc_offsets { + OWL_DMADESC_NEXT_LLI = 0, + OWL_DMADESC_SADDR, + OWL_DMADESC_DADDR, + OWL_DMADESC_FLEN, + OWL_DMADESC_SRC_STRIDE, + OWL_DMADESC_DST_STRIDE, + OWL_DMADESC_CTRLA, + OWL_DMADESC_CTRLB, + OWL_DMADESC_CONST_NUM, + OWL_DMADESC_SIZE }; /** @@ -153,7 +156,7 @@ struct owl_dma_lli_hw { * @node: node for txd's lli_list */ struct owl_dma_lli { - struct owl_dma_lli_hw hw; + u32 hw[OWL_DMADESC_SIZE]; dma_addr_t phys; struct list_head node; }; @@ -318,6 +321,11 @@ static inline u32 llc_hw_ctrlb(u32 int_ctl) return ctl; } +static u32 llc_hw_flen(struct owl_dma_lli *lli) +{ + return lli->hw[OWL_DMADESC_FLEN] & GENMASK(19, 0); +} + static void owl_dma_free_lli(struct owl_dma *od, struct owl_dma_lli *lli) { @@ -349,8 +357,9 @@ static struct owl_dma_lli *owl_dma_add_lli(struct owl_dma_txd *txd, list_add_tail(&next->node, &txd->lli_list); if (prev) { - prev->hw.next_lli = next->phys; - prev->hw.ctrla |= llc_hw_ctrla(OWL_DMA_MODE_LME, 0); + prev->hw[OWL_DMADESC_NEXT_LLI] = next->phys; + prev->hw[OWL_DMADESC_CTRLA] |= + llc_hw_ctrla(OWL_DMA_MODE_LME, 0); } return next; @@ -363,8 +372,7 @@ static inline int owl_dma_cfg_lli(struct owl_dma_vchan *vchan, struct dma_slave_config *sconfig, bool is_cyclic) { - struct owl_dma_lli_hw *hw = &lli->hw; - u32 mode; + u32 mode, ctrlb; mode = OWL_DMA_MODE_PW(0); @@ -405,22 +413,28 @@ static inline int owl_dma_cfg_lli(struct owl_dma_vchan *vchan, return -EINVAL; } - hw->next_lli = 0; /* One link list by default */ - hw->saddr = src; - hw->daddr = dst; - - hw->fcnt = 1; /* Frame count fixed as 1 */ - hw->flen = len; /* Max frame length is 1MB */ - hw->src_stride = 0; - hw->dst_stride = 0; - hw->ctrla = llc_hw_ctrla(mode, - OWL_DMA_LLC_SAV_LOAD_NEXT | - OWL_DMA_LLC_DAV_LOAD_NEXT); + lli->hw[OWL_DMADESC_CTRLA] = llc_hw_ctrla(mode, + OWL_DMA_LLC_SAV_LOAD_NEXT | + OWL_DMA_LLC_DAV_LOAD_NEXT); if (is_cyclic) - hw->ctrlb = llc_hw_ctrlb(OWL_DMA_INTCTL_BLOCK); + ctrlb = llc_hw_ctrlb(OWL_DMA_INTCTL_BLOCK); else - hw->ctrlb = llc_hw_ctrlb(OWL_DMA_INTCTL_SUPER_BLOCK); + ctrlb = llc_hw_ctrlb(OWL_DMA_INTCTL_SUPER_BLOCK); + + lli->hw[OWL_DMADESC_NEXT_LLI] = 0; /* One link list by default */ + lli->hw[OWL_DMADESC_SADDR] = src; + lli->hw[OWL_DMADESC_DADDR] = dst; + lli->hw[OWL_DMADESC_SRC_STRIDE] = 0; + lli->hw[OWL_DMADESC_DST_STRIDE] = 0; + /* + * Word starts from offset 0xC is shared between frame length + * (max frame length is 1MB) and frame count, where first 20 + * bits are for frame length and rest of 12 bits are for frame + * count. + */ + lli->hw[OWL_DMADESC_FLEN] = len | FCNT_VAL << 20; + lli->hw[OWL_DMADESC_CTRLB] = ctrlb; return 0; } @@ -752,7 +766,7 @@ static u32 owl_dma_getbytes_chan(struct owl_dma_vchan *vchan) /* Start from the next active node */ if (lli->phys == next_lli_phy) { list_for_each_entry(lli, &txd->lli_list, node) - bytes += lli->hw.flen; + bytes += llc_hw_flen(lli); break; } } @@ -783,7 +797,7 @@ static enum dma_status owl_dma_tx_status(struct dma_chan *chan, if (vd) { txd = to_owl_txd(&vd->tx); list_for_each_entry(lli, &txd->lli_list, node) - bytes += lli->hw.flen; + bytes += llc_hw_flen(lli); } else { bytes = owl_dma_getbytes_chan(vchan); } From patchwork Tue Jun 9 10:17:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Tomer X-Patchwork-Id: 11595035 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6CD6C138C for ; Tue, 9 Jun 2020 10:18:17 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 46AD52078D for ; Tue, 9 Jun 2020 10:18:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="at1PGDyj"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gwR3G7PW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 46AD52078D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Z3U0igqcRt+D2mKT/2rvcqPVssmAdXEVJNM068Dh7HA=; b=at1PGDyjYaBmAL32QXk9BfF/vX 63iijYxILM8zx+pS36vpgSfjgBbbLIfIbqICFb9l7Rj6SwJZnho5St0Wh8qBoADzdMMmL/VBicVQb YEaglqVigkllgvBvwR06o3ZusUsRyFmNgG08ici+iiitenRNpbX+Or/ON/ugMzjhwze8FUKeOoB5i BczoEshLg1t7fA/nXa4RVoMz0/qWPbRx3QZmvJm0I3U8ccwi3V9tIZ0CvK5rfenQbCN6Q+74NG459 m6IXfguqRfUYj9f0nmeru0dRIz+uOkHMiceSFZPyt5IsxI/WcgbhRFEZZASV13m8OYtk/6qQsDGM7 /ehb3fZg==; 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 1jibKg-0005Xs-Mm; Tue, 09 Jun 2020 10:18:14 +0000 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jibKB-00054c-0P; Tue, 09 Jun 2020 10:17:44 +0000 Received: by mail-pl1-x644.google.com with SMTP id y18so7860527plr.4; Tue, 09 Jun 2020 03:17:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MQdCRFfYdPppZGvtRf2Qw+IWmyFiiFu+29JBhbNDyN8=; b=gwR3G7PWt79JOA99k7n/mSRwpOh2VjLsZUwX0BsNQE3xxs0d6mFAg3MXK/V4K0y8OV uSGHffxdUDKNFEQfKJKMsraVQ3Wiap5RHxpsUVL8Ln7lXHWxJb7EySZmGMI4io1eBohp XePta9FC+Cbh+MXyQvZ1JTARhq3FZUWPySYvyryKSq41XZYyMkZDx41E+F2FeaDwZiSh 6Upi2/cY994OFjcvXjGGKypFPfstRP0ji0W1Pts2gTsiQlqOz+Wvf376Ku/xxPISGRNr Xe/FynLFK6j9YfMz133sUCv7lvlVCRgFdJBQXsxRK63MoWgxgqi+dego6PFCnWLZFbB/ KjMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MQdCRFfYdPppZGvtRf2Qw+IWmyFiiFu+29JBhbNDyN8=; b=DOgjn61VrZQGcCgmTnIgMhWTz460WJG9RXZhWoCCvKL4eri2smDrF4QUPJog6J/Pbm s3mOs8gLNvt3pvfUzmuFAKlI535k/t/ty9EeqfAer/Gg1kblAjOFr6rypidwRW3eyBr+ CHcyP3zHKoUNC7GES38vQrYuEK7/VSX14Gs6+ggsBbDitMYoPRjMxKIocwhn4rRtBRlq ns8J5psng2kfKYH3B9g3cvXx5Y86SbaINcQfO7Z+UQz35sBUikLyR/hyvaSRLR9HVTB1 PKIivU5ek1lcoSPFK0sX/7SEw3d6EaoiS3X2x10ygI9RTBBSOA/5FEdiiDbWC5fRIc3B Q9OQ== X-Gm-Message-State: AOAM533d4l8dFE0L+bVOxakk7QVAlQXyj/e0LzbkJ+Z9wENzRipkhbEu pGlu8x/i2Rrgs09LwyWDr94= X-Google-Smtp-Source: ABdhPJwciG5MYDIMBgSNFzw7qXrwbjg3B1y2d56BPNz6SnwxdpXiInt4nZczfNrlUqO/UpXljWfUeQ== X-Received: by 2002:a17:902:c3c3:: with SMTP id j3mr2687249plj.307.1591697861962; Tue, 09 Jun 2020 03:17:41 -0700 (PDT) Received: from localhost.localdomain ([223.190.87.90]) by smtp.gmail.com with ESMTPSA id d189sm9637253pfc.51.2020.06.09.03.17.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jun 2020 03:17:41 -0700 (PDT) From: Amit Singh Tomar To: andre.przywara@arm.com, vkoul@kernel.org, afaerber@suse.de, manivannan.sadhasivam@linaro.org Subject: [PATCH v4 02/10] dmaengine: Actions: Add support for S700 DMA engine Date: Tue, 9 Jun 2020 15:47:02 +0530 Message-Id: <1591697830-16311-3-git-send-email-amittomer25@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> References: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200609_031743_061770_ED6B3BA2 X-CRM114-Status: GOOD ( 18.81 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:644 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [amittomer25[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [amittomer25[at]gmail.com] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-actions@lists.infradead.org, linux-kernel@vger.kernel.org, cristian.ciocaltea@gmail.com, dmaengine@vger.kernel.org, dan.j.williams@intel.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DMA controller present on S700 SoC is compatible with the one on S900 (as most of registers are same), but it has different DMA descriptor structure where registers "fcnt" and "ctrlb" uses different encoding. For instance, on S900 "fcnt" starts at offset 0x0c and uses upper 12 bits whereas on S700, it starts at offset 0x1c and uses lower 12 bits. This commit adds support for DMA controller present on S700. Signed-off-by: Amit Singh Tomar --- Changes since v3: * Provided detailed comment about, the way shared DMA descriptor fields are programmed. * Fixed following clang compilation warning: warning: cast to smaller integer type 'enum owl_dma_id' from 'const void *' [-Wvoid-pointer-to-enum-cast] Changes since v2: * No changes. Changes since v1: * Moved llc_hw_flen() to patch 1/9. * provided comments about dma descriptor difference. between S700 and S900. Changes since RFC: * Added accessor function to get the frame lenght. * Removed the SoC specific check in IRQ routine. --- drivers/dma/owl-dma.c | 59 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 15 deletions(-) diff --git a/drivers/dma/owl-dma.c b/drivers/dma/owl-dma.c index 948d1bead860..f0c5425c06e7 100644 --- a/drivers/dma/owl-dma.c +++ b/drivers/dma/owl-dma.c @@ -149,6 +149,11 @@ enum owl_dmadesc_offsets { OWL_DMADESC_SIZE }; +enum owl_dma_id { + S900_DMA, + S700_DMA, +}; + /** * struct owl_dma_lli - Link list for dma transfer * @hw: hardware link list @@ -213,6 +218,7 @@ struct owl_dma_vchan { * @pchans: array of data for the physical channels * @nr_vchans: the number of physical channels * @vchans: array of data for the physical channels + * @devid: device id based on OWL SoC */ struct owl_dma { struct dma_device dma; @@ -227,6 +233,7 @@ struct owl_dma { unsigned int nr_vchans; struct owl_dma_vchan *vchans; + enum owl_dma_id devid; }; static void pchan_update(struct owl_dma_pchan *pchan, u32 reg, @@ -316,6 +323,10 @@ static inline u32 llc_hw_ctrlb(u32 int_ctl) { u32 ctl; + /* + * Irrespective of the SoC, ctrlb value starts filling from + * bit 18. + */ ctl = BIT_FIELD(int_ctl, 7, 0, 18); return ctl; @@ -372,6 +383,7 @@ static inline int owl_dma_cfg_lli(struct owl_dma_vchan *vchan, struct dma_slave_config *sconfig, bool is_cyclic) { + struct owl_dma *od = to_owl_dma(vchan->vc.chan.device); u32 mode, ctrlb; mode = OWL_DMA_MODE_PW(0); @@ -427,14 +439,26 @@ static inline int owl_dma_cfg_lli(struct owl_dma_vchan *vchan, lli->hw[OWL_DMADESC_DADDR] = dst; lli->hw[OWL_DMADESC_SRC_STRIDE] = 0; lli->hw[OWL_DMADESC_DST_STRIDE] = 0; - /* - * Word starts from offset 0xC is shared between frame length - * (max frame length is 1MB) and frame count, where first 20 - * bits are for frame length and rest of 12 bits are for frame - * count. - */ - lli->hw[OWL_DMADESC_FLEN] = len | FCNT_VAL << 20; - lli->hw[OWL_DMADESC_CTRLB] = ctrlb; + + if (od->devid == S700_DMA) { + /* Max frame length is 1MB */ + lli->hw[OWL_DMADESC_FLEN] = len; + /* + * On S700, word starts from offset 0x1C is shared between + * frame count and ctrlb, where first 12 bits are for frame + * count and rest of 20 bits are for ctrlb. + */ + lli->hw[OWL_DMADESC_CTRLB] = FCNT_VAL | ctrlb; + } else { + /* + * On S900, word starts from offset 0xC is shared between + * frame length (max frame length is 1MB) and frame count, + * where first 20 bits are for frame length and rest of + * 12 bits are for frame count. + */ + lli->hw[OWL_DMADESC_FLEN] = len | FCNT_VAL << 20; + lli->hw[OWL_DMADESC_CTRLB] = ctrlb; + } return 0; } @@ -596,7 +620,7 @@ static irqreturn_t owl_dma_interrupt(int irq, void *dev_id) global_irq_pending = dma_readl(od, OWL_DMA_IRQ_PD0); - if (chan_irq_pending && !(global_irq_pending & BIT(i))) { + if (chan_irq_pending && !(global_irq_pending & BIT(i))) { dev_dbg(od->dma.dev, "global and channel IRQ pending match err\n"); @@ -1054,11 +1078,20 @@ static struct dma_chan *owl_dma_of_xlate(struct of_phandle_args *dma_spec, return chan; } +static const struct of_device_id owl_dma_match[] = { + { .compatible = "actions,s900-dma", .data = (void *)S900_DMA,}, + { .compatible = "actions,s700-dma", .data = (void *)S700_DMA,}, + { /* sentinel */ }, +}; +MODULE_DEVICE_TABLE(of, owl_dma_match); + static int owl_dma_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; struct owl_dma *od; int ret, i, nr_channels, nr_requests; + const struct of_device_id *of_id = + of_match_device(owl_dma_match, &pdev->dev); od = devm_kzalloc(&pdev->dev, sizeof(*od), GFP_KERNEL); if (!od) @@ -1083,6 +1116,8 @@ static int owl_dma_probe(struct platform_device *pdev) dev_info(&pdev->dev, "dma-channels %d, dma-requests %d\n", nr_channels, nr_requests); + od->devid = (enum owl_dma_id)(uintptr_t)of_id->data; + od->nr_pchans = nr_channels; od->nr_vchans = nr_requests; @@ -1215,12 +1250,6 @@ static int owl_dma_remove(struct platform_device *pdev) return 0; } -static const struct of_device_id owl_dma_match[] = { - { .compatible = "actions,s900-dma", }, - { /* sentinel */ } -}; -MODULE_DEVICE_TABLE(of, owl_dma_match); - static struct platform_driver owl_dma_driver = { .probe = owl_dma_probe, .remove = owl_dma_remove, From patchwork Tue Jun 9 10:17:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Tomer X-Patchwork-Id: 11595037 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E808A138C for ; Tue, 9 Jun 2020 10:18:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9FF4E2078D for ; Tue, 9 Jun 2020 10:18:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="iixgpeYt"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lr683qhe" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9FF4E2078D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=KztRnhGk3GWw/jJTfrKt1Z5bNqKDE4edPqJwe+unb4Y=; b=iixgpeYt3vvxG5aIPd+5c66q6E +X9vg7l4hvLUVuRn8BVyJ/s80S558GOrKM3caTLgYKLb6x1K3CTsV/tNbvdEtRbHfLhEFijXzeyKO e/TbP/O147UHbgj3NKzPIq95kguJm0u4JJuIWsiKPppDH8naxQJL6Jpiws9/mELD84tkL2d2gOQFj 8e38S4743k0UuLhsCfnEJvhiFkaEAIKdyzS9VsWdslY6fCieYChy4AAdXtfA9sKRZ+Cw0WeStYf/H 95y9jVtoNjvGD8LDXSHlk+mwg6sigBk3TiLHJGFqtyQSqMX331Qsp/tWa6LnkTFjZ0Ypkkc77vgnw Dgcj/t3A==; 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 1jibL1-0005o1-KH; Tue, 09 Jun 2020 10:18:35 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jibKF-0005Af-8h; Tue, 09 Jun 2020 10:17:49 +0000 Received: by mail-pf1-x444.google.com with SMTP id b5so9872368pfp.9; Tue, 09 Jun 2020 03:17:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GaViz1C7phajEC01jHhddMW7VzXhQ3Zl5PNkL37o/YE=; b=lr683qheUJhLXvT0Shdk8NNrX2sIZgyJd5/S737Hi3D+5RtHGzASLEQff9fZH9tVf+ r6bp8ckEz5po2xObkxJeV4cSt9CdLHNL0ynnGbjxYMs9IcWUj1Jam8qdcROYuZyMt2ii Z7sSW7WxzUpOERLH+b7+bm1cnAgm7+LiwktXx6s1zfNAUF9ADLl+HsEtq29OOLVIKIMg SsCxYSyIL38MeSmIbA/8jGYufg/9v6woVnz/rr72wFPQ82rFh6hsEYLF650j79OtZX+y lwWlWJ4J7/BUlmAs5k5JhcnA/a64Wf8TGFnst2b3klZzwgZcYe5Dr07rToLbXNkbVsk8 Qunw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GaViz1C7phajEC01jHhddMW7VzXhQ3Zl5PNkL37o/YE=; b=nK6Ta1rDwGuNzbXTbv5orok/EOtxsdvIkmebzMBUPNmTrtoKjyo/hI6LO2T8O7iJwZ D735kB4wgZ6v090WTTlIisPAKAzVxDDaGxi1xFki8oj/4Rt9pNUsf2XVqB3RSrbCuMKT IfikNMsepNjbY3bxI7p6XFR7wYybSfduDDPvumotOnmpTUWmdnb2XkkWOyjsAtT59vu9 Ke3X3cr8c+ZGWrBRUkb+6tPWvYd9kj2to1+3Mecfty2POy8wXTE5yt80Qr6GfMsIrz3s Kbmfol9nuux+yk7++ZfZlV1oeY+hdbtY+p8tMO8sBKWq7nCwVWriI+HuWQ1qfMkL7Vsy CSQw== X-Gm-Message-State: AOAM532CJsfHuiILXIO9HdzJzIYczDl/ceaLoECZOOm1JOG3LwD3erwa Pd+tmyhwbbH29C6DUIBSCLc= X-Google-Smtp-Source: ABdhPJzDTr7NdhFSHN9qc74QCMb1dDEOcethACVE2tEEA7eddP78bWgBXRKbzA3ZXb33/1N5MaIGSg== X-Received: by 2002:a62:b40b:: with SMTP id h11mr24013563pfn.183.1591697865815; Tue, 09 Jun 2020 03:17:45 -0700 (PDT) Received: from localhost.localdomain ([223.190.87.90]) by smtp.gmail.com with ESMTPSA id d189sm9637253pfc.51.2020.06.09.03.17.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jun 2020 03:17:45 -0700 (PDT) From: Amit Singh Tomar To: andre.przywara@arm.com, afaerber@suse.de, manivannan.sadhasivam@linaro.org, sboyd@kernel.org Subject: [PATCH v4 03/10] clk: actions: Add MMC clock-register reset bits Date: Tue, 9 Jun 2020 15:47:03 +0530 Message-Id: <1591697830-16311-4-git-send-email-amittomer25@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> References: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200609_031747_311214_30A2BC89 X-CRM114-Status: UNSURE ( 9.58 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:444 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [amittomer25[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [amittomer25[at]gmail.com] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-actions@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, cristian.ciocaltea@gmail.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This commit adds reset bits needed for MMC clock registers present on Actions S700 SoC. Signed-off-by: Amit Singh Tomar Reported-by: kernel test robot --- Changes from v3: * NO change. Changes from v2: * No change. Changes from v1: * No change. Changes from RFC: * No change. --- drivers/clk/actions/owl-s700.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/clk/actions/owl-s700.c b/drivers/clk/actions/owl-s700.c index a2f34d13fb54..cd60eca7727d 100644 --- a/drivers/clk/actions/owl-s700.c +++ b/drivers/clk/actions/owl-s700.c @@ -577,6 +577,9 @@ static const struct owl_reset_map s700_resets[] = { [RESET_DSI] = { CMU_DEVRST0, BIT(2) }, [RESET_CSI] = { CMU_DEVRST0, BIT(13) }, [RESET_SI] = { CMU_DEVRST0, BIT(14) }, + [RESET_SD0] = { CMU_DEVRST0, BIT(22) }, + [RESET_SD1] = { CMU_DEVRST0, BIT(23) }, + [RESET_SD2] = { CMU_DEVRST0, BIT(24) }, [RESET_I2C0] = { CMU_DEVRST1, BIT(0) }, [RESET_I2C1] = { CMU_DEVRST1, BIT(1) }, [RESET_I2C2] = { CMU_DEVRST1, BIT(2) }, From patchwork Tue Jun 9 10:17:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Tomer X-Patchwork-Id: 11595039 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6E767618 for ; Tue, 9 Jun 2020 10:18:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3B41220814 for ; Tue, 9 Jun 2020 10:18:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="kFtrnGPO"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bIcDhJTC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B41220814 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=lEnvc/fD9YSYh9bBjWVHhupITaGW+dXX8niD+tV0i8o=; b=kFtrnGPOTjnd7W7YLHGL/4s9vw peCa4Q34SbQkUOeUnuWB/wnxX+DPGwLM6sXsWviR2IwZP5f1yrFDmdORW1V/RyJnaBpEnqI/l34pr FhaDz40RbD6FQHw4n8QcOB9AFFnC386l4qO554PeINE9OMtiGypk/YgnO8nlrqf4QtKHrBbg4brcP AMa+Lv1DmJ4hj4xPSQSUtmP9N++eYrVzF5tLug7pBX/y9KMpuqvFLUIFdyApp5opgaYa82xBGucH0 ti+qHccIFMcPtaGlGez7bz2Xt0h/T1jS0mFtQq2HyJLumlFFgpiC6Oj4B29lx6w0SW4dCGcV9ahjR tPol1BjA==; 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 1jibLJ-00063B-N9; Tue, 09 Jun 2020 10:18:53 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jibKL-0005Gv-KT; Tue, 09 Jun 2020 10:17:56 +0000 Received: by mail-pf1-x443.google.com with SMTP id 64so3015031pfv.11; Tue, 09 Jun 2020 03:17:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sYZja2GPkizS9cmr8paj+1jHLT3TNrYTxpF+FFiGMT8=; b=bIcDhJTCcatY4ggDNPTS8ubPZaYdUJrYKLQYijEc/Olj7keEcU4bWoaQwVHDP4hFrL Cy7eK7KQpwSOR2mnEcJ05khRcOTNKQ9+up5yigCE9SDCIJEWkUNZHNAt+ZFv394OcAWW 2xfUrhvE3cANsRXHl82BSvUrRum9fx0y8c2joPq4CL/sOaLBGdCfmkrCVLjUml8aok31 BlGDVIGfnVR8zRTrlCDcI1cvDkaft8G91nkRz++yhkfJoaUETUhCcBUEJLEH1eQnJZi/ Rz8WnK3Do470IvX6OGVUuVtiCwN7qINiMCOzOx86JapZ5ionbzDZTa09qOebTo22Wnrj CHyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sYZja2GPkizS9cmr8paj+1jHLT3TNrYTxpF+FFiGMT8=; b=hbSPHMW+2jk/LcYx3VMoigCbFHCR/i6MbaT79l3cEt0YhB17sG59K2fHGUL70+ZBGP 1JrH0M4PxrH2VsHeVXZPklq8BbU5CnrMJoXwcbSATFNjo93TNvVR4N6buQZuUu+hM3WJ xMk0u883lukqk3dnD0m2/ccUmVl9jnVtP76ORbi+HrMo4kLtqBKGxYBHmZYKsZNa6FIz +eMMaRgT+UHzIDgYu4jr2ktsNw2kuu7mjqKvtjZKtnLQJ38SJ1nDFMaUnO9gChkDyCMJ kjm3Zj+5Dv6Ol5JxV+LnE95dDcJybZQxLvdEB+R1KipBT7K5bWo9a+GXYwOztWJNwKTw h1DQ== X-Gm-Message-State: AOAM532FhYhPZG7xJkIJA/3FZmgkpNGcd/HXkE7lCcAa7FtOFa8a87HN L6HWDBu5OlL+LNPfdaAwknw= X-Google-Smtp-Source: ABdhPJwq6bFtOgYz+uURvmMRxjvekgHvng7JWPHkbsL4XW5DMvdIS0Fks1p0EDrifuU+F7HraNZGUg== X-Received: by 2002:a63:a84d:: with SMTP id i13mr22967029pgp.342.1591697871778; Tue, 09 Jun 2020 03:17:51 -0700 (PDT) Received: from localhost.localdomain ([223.190.87.90]) by smtp.gmail.com with ESMTPSA id d189sm9637253pfc.51.2020.06.09.03.17.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jun 2020 03:17:51 -0700 (PDT) From: Amit Singh Tomar To: andre.przywara@arm.com, afaerber@suse.de, manivannan.sadhasivam@linaro.org, robh+dt@kernel.org Subject: [PATCH v4 04/10] arm64: dts: actions: limit address range for pinctrl node Date: Tue, 9 Jun 2020 15:47:04 +0530 Message-Id: <1591697830-16311-5-git-send-email-amittomer25@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> References: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200609_031753_739305_71A7D836 X-CRM114-Status: GOOD ( 13.60 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:443 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [amittomer25[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [amittomer25[at]gmail.com] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-actions@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, cristian.ciocaltea@gmail.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org After commit 7cdf8446ed1d ("arm64: dts: actions: Add pinctrl node for Actions Semi S700") following error has been observed while booting Linux on Cubieboard7-lite(based on S700 SoC). [ 0.257415] pinctrl-s700 e01b0000.pinctrl: can't request region for resource [mem 0xe01b0000-0xe01b0fff] [ 0.266902] pinctrl-s700: probe of e01b0000.pinctrl failed with error -16 This is due to the fact that memory range for "sps" power domain controller clashes with pinctrl. One way to fix it, is to limit pinctrl address range which is safe to do as current pinctrl driver uses address range only up to 0x100. This commit limits the pinctrl address range to 0x100 so that it doesn't conflict with sps range. Fixes: 7cdf8446ed1d ("arm64: dts: actions: Add pinctrl node for Actions Semi S700") Suggested-by: Andre Przywara Signed-off-by: Amit Singh Tomar --- Changes since v3: * No change. Changes since v2: * this is no more don't merge and fixed the broken S700 boot by limiting pinctrl address range. * Modified the subject to reflect the changes. Changes since v1: * No change. Changes since RFC: * kept as do not merge. --- arch/arm64/boot/dts/actions/s700.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/actions/s700.dtsi b/arch/arm64/boot/dts/actions/s700.dtsi index 2006ad5424fa..f8eb72bb4125 100644 --- a/arch/arm64/boot/dts/actions/s700.dtsi +++ b/arch/arm64/boot/dts/actions/s700.dtsi @@ -231,7 +231,7 @@ pinctrl: pinctrl@e01b0000 { compatible = "actions,s700-pinctrl"; - reg = <0x0 0xe01b0000 0x0 0x1000>; + reg = <0x0 0xe01b0000 0x0 0x100>; clocks = <&cmu CLK_GPIO>; gpio-controller; gpio-ranges = <&pinctrl 0 0 136>; From patchwork Tue Jun 9 10:17:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Tomer X-Patchwork-Id: 11595041 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D92E0138C for ; Tue, 9 Jun 2020 10:19:12 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B55DC207F9 for ; Tue, 9 Jun 2020 10:19:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="GON6hTgD"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pjhnNr4v" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B55DC207F9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=BRvmbx0LL/5X8F+t+sq4YcSZkCwkQwiLSLpoTIGgJFs=; b=GON6hTgDYbauaqwWAHysmscNOe C2MBG0Ds5Q+9TkEdl1CyCdRBIV/bgp/PKupDnLDbVENDXRzkfqTYIroDQFr/p0UEcCSFZRBWggYm+ xTw8V86yiVHJv+FxRlWHPbXVcxzI6127X7apMEyjut2y4xgca/RL9wDr9j2uP90tGg8IC3cikjFLQ 3albuYjBg4ysaLJGiux7vhgDLO4uFSHOVZlL4qkbxKbwHmPy0G6jp9maO3uLtnIGsY6GHaQILshUw N4KrAEy5hr8pMXNKXG777rduqscDjVxWjthouDXne2H2IcG4Gbubrr25aLp/0s65ku6uKaB0i6ZiC 62g9BOjA==; 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 1jibLa-0006Lx-I7; Tue, 09 Jun 2020 10:19:10 +0000 Received: from mail-pj1-x1042.google.com ([2607:f8b0:4864:20::1042]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jibKP-0005Kw-HL; Tue, 09 Jun 2020 10:18:00 +0000 Received: by mail-pj1-x1042.google.com with SMTP id u8so1202871pje.4; Tue, 09 Jun 2020 03:17:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VwGuJZ2SH+okk9ABn43uTSotJJ51Z2CMuq/qQeoTEe4=; b=pjhnNr4vrnj6HYrJGX/WyRx8Ck+Yvq1V3yeairSuLeJmlRbV/5vmehtKGpXFXZHdPv qb67J9+elPBxQasYreEOTVLpQ2TuLkpIa2GVOnlzrmqcLVIBWb5SWnFhwR49Yz6z/fAW yZ8xfkImwJDOJzlV4iS9Hlo4Dl7LhuGWNcqbklKdM3kzfFe0lOChEXAA06W/mCYDTJbE TSRxIQCJ0onxfqaRGiAS8gM0zCkOx90noAs5AoWdUOX+UzEje01ALwSoTYtO+izX71ZL g8ZI/ct9Z2Uw+nzr/zRC2taxiHIV/wAoLdrPoE3IOu1ZYQ5Ww6cncMlE8PidJHSilAUc bXIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VwGuJZ2SH+okk9ABn43uTSotJJ51Z2CMuq/qQeoTEe4=; b=KRsI+hpV3Mu6HK7Fl5XpXgFhBCylxBgp0QIaLtmQAQFB1bG64A7nRxdZ/DYlPXyjOc SOqQfe9KAchj9uuSSO/gQgpbD2v/wGS+MzNkJ3KyR7g/9TXB9Emo5MBZmclNnosfjHtV kSTMYV4MtlJza9zrJB6+U3jJE2GDg6Dh9osTolNs3NSNjB+pMJvryPZ8UsGwZetoIhD+ GY7Xbb2jNBqDz25AUM8vrOY4ZpuDg4gp+26O292vJ/+iWqA1Ov/awLonfveKpyVcMXJM M5V+/r3w1oR/00HvtigT+bnpeVadCJ3dmU657q0ZZ62tHzuTpn+3D7w6INZCUDqCu4Yy wo0A== X-Gm-Message-State: AOAM532OSTvBuZCVlhbQVaxyar7gutJG+yFpimwIf7iYcekSEx5yICO5 5RdNUmWKAjQ6cc3bDiNSYDE= X-Google-Smtp-Source: ABdhPJy0RGzAkPRj4695BSIL/JFNnbyi0b/ndV/rgx2MHZZLBK0qJRib4cLx+e1PBg0PY/egHfAbDA== X-Received: by 2002:a17:902:aa4c:: with SMTP id c12mr2633454plr.280.1591697876517; Tue, 09 Jun 2020 03:17:56 -0700 (PDT) Received: from localhost.localdomain ([223.190.87.90]) by smtp.gmail.com with ESMTPSA id d189sm9637253pfc.51.2020.06.09.03.17.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jun 2020 03:17:55 -0700 (PDT) From: Amit Singh Tomar To: andre.przywara@arm.com, afaerber@suse.de, vkoul@kernel.org, manivannan.sadhasivam@linaro.org, robh+dt@kernel.org Subject: [PATCH v4 05/10] dt-bindings: dmaengine: convert Actions Semi Owl SoCs bindings to yaml Date: Tue, 9 Jun 2020 15:47:05 +0530 Message-Id: <1591697830-16311-6-git-send-email-amittomer25@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> References: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200609_031757_606526_1A35784C X-CRM114-Status: GOOD ( 14.69 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1042 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [amittomer25[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [amittomer25[at]gmail.com] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-actions@lists.infradead.org, linux-kernel@vger.kernel.org, cristian.ciocaltea@gmail.com, dan.j.williams@intel.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Converts the device tree bindings for the Actions Semi Owl SoCs DMA Controller over to YAML schemas. It also adds new compatible string "actions,s700-dma". Signed-off-by: Amit Singh Tomar Reviewed-by: Rob Herring --- Changes since v3: * No change. Changes since v2: * Addressed Rob's comments: - removed unnecessary description. - added unevaluatedProperties - added relevant information about dma-channels and dma-request * Added power-domain property. Change since v1: * Updated the description field to reflect only the necessary information. * replaced the maxItems field with description for each controller attribute(except interrupts). * Replaced the clock macro with number to keep the example as independent as possible. New patch, was not there in RFC. --- Documentation/devicetree/bindings/dma/owl-dma.txt | 47 ------------- Documentation/devicetree/bindings/dma/owl-dma.yaml | 79 ++++++++++++++++++++++ 2 files changed, 79 insertions(+), 47 deletions(-) delete mode 100644 Documentation/devicetree/bindings/dma/owl-dma.txt create mode 100644 Documentation/devicetree/bindings/dma/owl-dma.yaml diff --git a/Documentation/devicetree/bindings/dma/owl-dma.txt b/Documentation/devicetree/bindings/dma/owl-dma.txt deleted file mode 100644 index 03e9bb12b75f..000000000000 --- a/Documentation/devicetree/bindings/dma/owl-dma.txt +++ /dev/null @@ -1,47 +0,0 @@ -* Actions Semi Owl SoCs DMA controller - -This binding follows the generic DMA bindings defined in dma.txt. - -Required properties: -- compatible: Should be "actions,s900-dma". -- reg: Should contain DMA registers location and length. -- interrupts: Should contain 4 interrupts shared by all channel. -- #dma-cells: Must be <1>. Used to represent the number of integer - cells in the dmas property of client device. -- dma-channels: Physical channels supported. -- dma-requests: Number of DMA request signals supported by the controller. - Refer to Documentation/devicetree/bindings/dma/dma.txt -- clocks: Phandle and Specifier of the clock feeding the DMA controller. - -Example: - -Controller: - dma: dma-controller@e0260000 { - compatible = "actions,s900-dma"; - reg = <0x0 0xe0260000 0x0 0x1000>; - interrupts = , - , - , - ; - #dma-cells = <1>; - dma-channels = <12>; - dma-requests = <46>; - clocks = <&clock CLK_DMAC>; - }; - -Client: - -DMA clients connected to the Actions Semi Owl SoCs DMA controller must -use the format described in the dma.txt file, using a two-cell specifier -for each channel. - -The two cells in order are: -1. A phandle pointing to the DMA controller. -2. The channel id. - -uart5: serial@e012a000 { - ... - dma-names = "tx", "rx"; - dmas = <&dma 26>, <&dma 27>; - ... -}; diff --git a/Documentation/devicetree/bindings/dma/owl-dma.yaml b/Documentation/devicetree/bindings/dma/owl-dma.yaml new file mode 100644 index 000000000000..5577cd910781 --- /dev/null +++ b/Documentation/devicetree/bindings/dma/owl-dma.yaml @@ -0,0 +1,79 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/dma/owl-dma.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Actions Semi Owl SoCs DMA controller + +description: | + The OWL DMA is a general-purpose direct memory access controller capable of + supporting 10 and 12 independent DMA channels for S700 and S900 SoCs + respectively. + +maintainers: + - Manivannan Sadhasivam + +allOf: + - $ref: "dma-controller.yaml#" + +properties: + compatible: + enum: + - actions,s900-dma + - actions,s700-dma + + reg: + maxItems: 1 + + interrupts: + description: + controller supports 4 interrupts, which are freely assignable to the + DMA channels. + maxItems: 4 + + "#dma-cells": + const: 1 + + dma-channels: + maximum: 12 + + dma-requests: + maximum: 46 + + clocks: + maxItems: 1 + description: + Phandle and Specifier of the clock feeding the DMA controller. + + power-domains: + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - "#dma-cells" + - dma-channels + - dma-requests + - clocks + +unevaluatedProperties: false + +examples: + - | + #include + dma: dma-controller@e0260000 { + compatible = "actions,s900-dma"; + reg = <0x0 0xe0260000 0x0 0x1000>; + interrupts = , + , + , + ; + #dma-cells = <1>; + dma-channels = <12>; + dma-requests = <46>; + clocks = <&clock 22>; + }; + +... From patchwork Tue Jun 9 10:17:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Tomer X-Patchwork-Id: 11595043 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2059D138C for ; Tue, 9 Jun 2020 10:19:31 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DC7A52078D for ; Tue, 9 Jun 2020 10:19:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="CJbQFnXo"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bIqH0Ku/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC7A52078D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=hvj5wn411cIR0C0bTknJnHKqXtP+nH4xvdI6zihZeTA=; b=CJbQFnXoAPXVRDNAp8FfMj/fyE tr9O8U7/cahket2jCzBiOTa+C+ke9x5JzIWXOPGZRrOa6ai/CKPBbhd57QdRNWUI4S1294pA/6FbS u+DcFae0ILyd7GveFtScI5QIvwmhWqwGcHX/FGt2ugf5smivWW3fMx2KcxnbgxnsYn/bfFzzMsR9V mChpBy9RSfW17H8wxaWOsisPQ/ZwdPrWGtDeSSkNyQfBLUGLjY5THAGw3lrSg+EahdRXdK424A89Z 2F0eideeoxehf2X+yq/mEoxoxSSBThHDCIWau/I1H6XM0ev4Xq/66R/tmHQaNswAgqHtr8D0YqYsr RfXMxIdg==; 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 1jibLs-0006dl-MJ; Tue, 09 Jun 2020 10:19:28 +0000 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jibKU-0005PE-K2; Tue, 09 Jun 2020 10:18:11 +0000 Received: by mail-pl1-x641.google.com with SMTP id y18so7860821plr.4; Tue, 09 Jun 2020 03:18:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3ZU81gDLD05tzXgioqFPIFyl/4tbhqSTfVFHFtk6IdQ=; b=bIqH0Ku/BOXm3Pkhhqhlzm+QHO0b3jM1Xu5fvEw/1EhvAF/q/hD1zHYZe9vMy2YaKB CVgD/PJTz1wRw/cIZzRFpAzvE5ZGsPENuVoz68VaTTUX7QmcQSG6hXML9qcfdMugiSWV UTsZHDiAJokSKCdQz9Je8j+KH72RYxy2eKUAn72MMBkQuh9+HTM306XxMrBVR0Cd5uIl o7N3bzjbrElqRYfphghg9/STBE7Bbn4u2qZ3e559TMYlJ4g5x2xUs0xDAxo+c4cot5Q8 o5iNHy2IF+rJtlZXPyIrdRL6coqBVfKiCo2ob1mX1u0yQ8SGCFM11BB1D6YPV1cr4tVA h7tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3ZU81gDLD05tzXgioqFPIFyl/4tbhqSTfVFHFtk6IdQ=; b=iCddwCwaF8DQugu8a3Ve/27BIiIrXGG9iFptpEzPzQTRAtVIfycRWa4qiA+3cHMJ8j UYKcQrg8voHP7kGOBr4Rxweu/uTguYL27/DBgnpoe7OwdUfCTPT994isNcLNPf1jzr+d eT52J9WVoFGUXXDaVmYA/rDYEX4BUTZc9BNEKa8R06sSTcjDzIMPTRhqvCGlW5eya2HF V1dOZAbLJGmzHn82CO2kMJob7RaxSAtQ4fh3+G1//YM6Ps3OPojTwbebHqNQ15IdVWwD +30HVWePkZtWO74EiuS4H1LMq4j1zVzwhePntoKTi0hke9xUA1e7Iuy+hvNpq0Bp2kHX mO4A== X-Gm-Message-State: AOAM531F+GUpPhmXb+1Ju4jkS1N9zOp6aNt3CLg10sfJ7po/E6+mic7D fvW4LHxR8/mDQ1gtd/FwEaqlaEOt2w17kQ== X-Google-Smtp-Source: ABdhPJyoAWtyxCfMzgPci09grbLn2MVlv6EBn2AhJJ30ydBC/j2lx2PS2QWZ9Xo56JZvwp9PbWaMbw== X-Received: by 2002:a17:90a:a405:: with SMTP id y5mr3907791pjp.15.1591697881130; Tue, 09 Jun 2020 03:18:01 -0700 (PDT) Received: from localhost.localdomain ([223.190.87.90]) by smtp.gmail.com with ESMTPSA id d189sm9637253pfc.51.2020.06.09.03.17.56 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jun 2020 03:18:00 -0700 (PDT) From: Amit Singh Tomar To: andre.przywara@arm.com, afaerber@suse.de, vkoul@kernel.org, manivannan.sadhasivam@linaro.org, robh+dt@kernel.org Subject: [PATCH v4 06/10] arm64: dts: actions: Add DMA Controller for S700 Date: Tue, 9 Jun 2020 15:47:06 +0530 Message-Id: <1591697830-16311-7-git-send-email-amittomer25@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> References: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200609_031802_672086_F89173E5 X-CRM114-Status: UNSURE ( 9.58 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:641 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [amittomer25[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [amittomer25[at]gmail.com] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-actions@lists.infradead.org, linux-kernel@vger.kernel.org, cristian.ciocaltea@gmail.com, dan.j.williams@intel.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This commit adds DMA controller present on Actions S700, it differs from S900 in terms of number of dma channels and requests. Signed-off-by: Amit Singh Tomar --- Changes since v3: * Fixed typo in commit message. * Placed owl-s700-powergate.h in alphabetical order. Changes since v2: * added power-domain property as sps is enabled now and DMA needs it. Changes since v1: * No Change. Changes since RFC: * No Change. --- arch/arm64/boot/dts/actions/s700.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arm64/boot/dts/actions/s700.dtsi b/arch/arm64/boot/dts/actions/s700.dtsi index f8eb72bb4125..2c78caebf515 100644 --- a/arch/arm64/boot/dts/actions/s700.dtsi +++ b/arch/arm64/boot/dts/actions/s700.dtsi @@ -5,6 +5,7 @@ #include #include +#include #include / { @@ -244,5 +245,19 @@ , ; }; + + dma: dma-controller@e0230000 { + compatible = "actions,s700-dma"; + reg = <0x0 0xe0230000 0x0 0x1000>; + interrupts = , + , + , + ; + #dma-cells = <1>; + dma-channels = <10>; + dma-requests = <44>; + clocks = <&cmu CLK_DMAC>; + power-domains = <&sps S700_PD_DMA>; + }; }; }; From patchwork Tue Jun 9 10:17:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Tomer X-Patchwork-Id: 11595049 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7FA11618 for ; Tue, 9 Jun 2020 10:19:52 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5ADCF207F9 for ; Tue, 9 Jun 2020 10:19:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="uYca0/x7"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BzkKWAcS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5ADCF207F9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Iz2uRS5c1BWWVjwsU3G7bMbTO++rdv5jM5ycvU+0RLY=; b=uYca0/x7iR1tX3rm1lD19lr9Mt JmLPCa3T0dQkJRkaWaObkUbX2kZKq9uszoRKJfhm2DVFdccgA8W2Iy2EFpslJ0zPnkHhf0YksTeWp II2N6yaAjGeh2Xev7tpIB2rFoUjzMRgbM+CCsGMovPsujG9bdUi+ll2/+Em+9yeHaZc6zFkKSO6YA Zthg09TBe2koqJ3p+toRJkG+ZXAPXqAKeLAYOMahnYyqb5xnTqxSXm1lwEvceZEBda61+Ktls5c0s yWZ8rXFXglxY5NEko0YJAXXxGvd0h+9qaG6QT0U5G07+Khrb1XD6meUjSxtMed+z1JIpFVbmOOR8g 8yMLL55Q==; 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 1jibMD-0006tO-IU; Tue, 09 Jun 2020 10:19:49 +0000 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jibKZ-0005Sp-Ad; Tue, 09 Jun 2020 10:18:14 +0000 Received: by mail-pl1-x642.google.com with SMTP id bg4so7863018plb.3; Tue, 09 Jun 2020 03:18:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rwQBB3SQ45lNIAYQMElQim+hOPVHVp+Rp81J6MgbD0I=; b=BzkKWAcSP/q6sOnyq4AwirGqrIlB35JDTGq1wsCd3o9BKNuhKxNNsXIaceQA/AfuOR pbcgLOFMaxWDhWYHbP+etR4jTp419US6hhblVzcrns758do6cFzq8O17z3nydFfky2yt wZsL/RPm0A6ylUaCPLsp1U2flzilN5ROrpGu3HUFBRk+EHWN1fOMeTfwBxjpXVbuyd/R 3EEzZZ5nK6A0xAdTL2q0/vfEluRc0MtUJCauodAxA/y+dVL2T3NxapKyJULhyLAZ6BDE 6U+SGjKjKkWeP9dObhKGsg9wbaZICGrUYmACmp+XE+kbUFdSOjl7W6fCKW4gH4VBahNy IGHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rwQBB3SQ45lNIAYQMElQim+hOPVHVp+Rp81J6MgbD0I=; b=latL5RICq+GNye83i97Lv5epUMS+BJcS7V0UqCndtmYxW6IyCUipsYCU8iVPQaNQrk rdtKlds5wIwIIyD1WrDzgUygBNgp5c/y3XeTqdkHU+YjS25ukSUn5iIIHt62QtChvhlq mV30u/aNJUtBQqKZI9VSI0NQ9gIT3T1oxURlW7A3g81j7M0gM4myEpd+GuAfd83RoiiP X/TcqMRWsmc8hmtAu7qPVt56R2/pgZd+5ou+j7l9m5vHB/eLRZmUDU9JPtS0iN70Ge+Q NFP69hbRa7whculxWXDHsqce6qUxJcm2nh5FBTYzhdqEJk+c4Q2Ca4GXUkwofqjr5Lb+ NWlw== X-Gm-Message-State: AOAM531BUq60ZhFVdEIJPtMn7k1iVnwHPxDDviYpPHPWqmMjUIRf522k 8FE4IzK5mLf+VS3llVhIGgdZzVuHPJ7OEg== X-Google-Smtp-Source: ABdhPJyp+Ff7aKSbdfsIg9q+VMKOm3dyndijjSBn2liztrRerMuSn+XqLSxlfR+E2UiBJqxwg+TYDA== X-Received: by 2002:a17:902:bf48:: with SMTP id u8mr2540416pls.15.1591697886808; Tue, 09 Jun 2020 03:18:06 -0700 (PDT) Received: from localhost.localdomain ([223.190.87.90]) by smtp.gmail.com with ESMTPSA id d189sm9637253pfc.51.2020.06.09.03.18.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jun 2020 03:18:06 -0700 (PDT) From: Amit Singh Tomar To: andre.przywara@arm.com, afaerber@suse.de, manivannan.sadhasivam@linaro.org, robh+dt@kernel.org Subject: [PATCH v4 07/10] dt-bindings: reset: s700: Add binding constants for mmc Date: Tue, 9 Jun 2020 15:47:07 +0530 Message-Id: <1591697830-16311-8-git-send-email-amittomer25@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> References: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200609_031808_043712_018168D0 X-CRM114-Status: UNSURE ( 9.41 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:642 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [amittomer25[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [amittomer25[at]gmail.com] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-actions@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, cristian.ciocaltea@gmail.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This commit adds device tree binding reset constants for mmc controller present on Actions S700 Soc. Acked-by: Rob Herring Signed-off-by: Amit Singh Tomar --- Changes since v3: * No change. Changes since v2: * No change. Changes since v1: * No change. Changes since RFC: * added Rob's acked-by tag --- include/dt-bindings/reset/actions,s700-reset.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/dt-bindings/reset/actions,s700-reset.h b/include/dt-bindings/reset/actions,s700-reset.h index 5e3b16b8ef53..a3118de6d7aa 100644 --- a/include/dt-bindings/reset/actions,s700-reset.h +++ b/include/dt-bindings/reset/actions,s700-reset.h @@ -30,5 +30,8 @@ #define RESET_UART4 20 #define RESET_UART5 21 #define RESET_UART6 22 +#define RESET_SD0 23 +#define RESET_SD1 24 +#define RESET_SD2 25 #endif /* __DT_BINDINGS_ACTIONS_S700_RESET_H */ From patchwork Tue Jun 9 10:17:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Tomer X-Patchwork-Id: 11595053 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C8127138C for ; Tue, 9 Jun 2020 10:20:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9D8CE207ED for ; Tue, 9 Jun 2020 10:20:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Lx6+W8xo"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="l9BnxJDW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9D8CE207ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Dr9E859O6loCFKjo+RsFBVTKf/JCvnatK4s2nF37Kpw=; b=Lx6+W8xo1pHeT3vZveQQ89abtC VnAJCgfDFVvOf6NqudvR8W298P2VeZ8E/WSrZbtZOXUCuY7lh9qjwyk9BnGIPdBuAR2drrYK/J0Yr YAXsyM4dVaXRdCenE/nkNnwEsi2f63pG6Sv3k0zI4KwuAgwncokE3CT8rHqHbYlvjV3e5LZjsUdso ZM1KXSw9iveaKKgjSclszW3xhB4th9LmminRyWp+Lxq2I12qw9a66MrobKolYJzCT5EY/W+POqchU njE4wNxMXEgwrGiqBhTK8T/GzPVn9asJYwG3VySTXmmKSnCmquh/u/YsOFrv+fPjHMjQz8i8mYpqs t8dxeJFg==; 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 1jibMU-00079Q-MH; Tue, 09 Jun 2020 10:20:06 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jibKe-0005Wb-P7; Tue, 09 Jun 2020 10:18:24 +0000 Received: by mail-pf1-x441.google.com with SMTP id b201so9894096pfb.0; Tue, 09 Jun 2020 03:18:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qaHu+lOS4HqMUllo0B6KB/Pk6c1pWihOMSjOnZMBY2o=; b=l9BnxJDWnTVW0ldCRykjgn3+ZK5jr2hKHSQC3wuOOOq641E3KtzhoKiKXH4DNa/Mdq tir9iHBpkf/GSIa2iVepQFFm/DAG+CPrBLr2vzJe0bpg7DnK5tUFzxu9uw1UfJT1/WH2 v7hNmIGPHl7JNNaUXEzDaCWVBhNf6VtcLcus4u+UjQpVChbzcsPRMOuvShN5YiO1/Vuk eqBRwwvofY2VKAQ68vBFo8Jg+8prA6kzpXMfFC9yCc2vM/Z5+rXWSHgJF2LTFlDlWayl dYgKRrz8Mn3V2e3g1RVnHBMX0IfsVFcajWbJOiWuG8evaEvOgni4Q6K1p44ggSqpvg52 DgJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qaHu+lOS4HqMUllo0B6KB/Pk6c1pWihOMSjOnZMBY2o=; b=a6mVlSYgs37YYz+bu9hrDhQrBUBCjt3o25d10lCkiESXsKsaOSUR8r5HhJXCeo9rbM wb4OepUBmxJ/eQ7OK++lZSDqIxZB7HX4UHt0eU05uSd+bWzVIzgT/VNDqDg6cm4F5ldk qeFYwY+yS/tFAmVAaCbM+dkBx1+cp9DESq/rzJTnOLtK07VlexARtNxSEmfIrGby7cFp tPOURHYR7lmnw6j3jstnAx7CIHH7F3Cry5JlT65gXFqqnyntMO7jMifcXHNme3UrLfqT aPetJgzCyoiPTHFMDdtvGjlWkMEnFE6W68+cgCzT2Be2c5z7Tp5KxXorvcP7z6eQxp2h Zqtg== X-Gm-Message-State: AOAM530F9oFhQqLZtO7SFpFY0nbNRnO8eI/qqZ4kr94iIwKyCoM7gO/p GzwUkmAaV6dR/BTlAaxvIu4= X-Google-Smtp-Source: ABdhPJx27IQ3ZXDqGg5+M5DgRVC4TvnofbEo9tRZjpSBxaauw9aXPaH3TmIiJOC6henWCBEiB/LNdg== X-Received: by 2002:a63:f804:: with SMTP id n4mr9504183pgh.302.1591697891572; Tue, 09 Jun 2020 03:18:11 -0700 (PDT) Received: from localhost.localdomain ([223.190.87.90]) by smtp.gmail.com with ESMTPSA id d189sm9637253pfc.51.2020.06.09.03.18.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jun 2020 03:18:10 -0700 (PDT) From: Amit Singh Tomar To: andre.przywara@arm.com, afaerber@suse.de, manivannan.sadhasivam@linaro.org, robh+dt@kernel.org Subject: [PATCH v4 08/10] dt-bindings: mmc: owl: add compatible string actions, s700-mmc Date: Tue, 9 Jun 2020 15:47:08 +0530 Message-Id: <1591697830-16311-9-git-send-email-amittomer25@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> References: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200609_031812_869925_49EE5BB6 X-CRM114-Status: GOOD ( 10.30 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:441 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [amittomer25[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [amittomer25[at]gmail.com] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-actions@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, cristian.ciocaltea@gmail.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The commit adds a new SoC specific compatible string "actions,s700-mmc" in combination with more generic string "actions,owl-mmc". Placement order of these strings should abide by the principle of "from most specific to most general". Reviewed-by: Rob Herring Signed-off-by: Amit Singh Tomar --- Changes since v3: * No change. Changes since v2: * Added Rob's Reviewed-by tag * Newly added patch in v2. --- Documentation/devicetree/bindings/mmc/owl-mmc.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/mmc/owl-mmc.yaml b/Documentation/devicetree/bindings/mmc/owl-mmc.yaml index 1380501fb8f0..5eab25ccf7ae 100644 --- a/Documentation/devicetree/bindings/mmc/owl-mmc.yaml +++ b/Documentation/devicetree/bindings/mmc/owl-mmc.yaml @@ -14,7 +14,11 @@ maintainers: properties: compatible: - const: actions,owl-mmc + oneOf: + - const: actions,owl-mmc + - items: + - const: actions,s700-mmc + - const: actions,owl-mmc reg: maxItems: 1 From patchwork Tue Jun 9 10:17:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Tomer X-Patchwork-Id: 11595055 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EB91C138C for ; Tue, 9 Jun 2020 10:20:21 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B0010207ED for ; Tue, 9 Jun 2020 10:20:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="f8bW90ni"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QyiKk/+W" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B0010207ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=OL2h0rUx1WAnTuDUoioNraxYuygd6gMbv7OAbdSd49Y=; b=f8bW90nigye1ZYnGJsL2slDOUa thwLKOX+hyoPuydlYG2zwwO2ErnquO26s8W5GmsSxGZcYTnVFt8NQPQShYUkgSk+/UTKZDbmdAvXN mTcLeqIuuByzwQn0M9mIJyWCrGRAPLGxqHLzAGr8MegmexnJwf3tCiADLmF7DB/UbDhkLVsk+yWWI B3zZ0KB1ZBCE93hx41PThfilV/rvZTYQMfHVZiLfF4oHQF9kHseOO+ySOPfFI83/yQWleyUE3culs lpX+8b2HMkq+v2DGfEJzJ4tcQYvah7vC4FQh5yekxxUlnlb2ZCnpqvYq61G9WNA66dEB2lfS2Ua+m CyQZS9zw==; 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 1jibMd-0007KU-50; Tue, 09 Jun 2020 10:20:15 +0000 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jibKm-0005bt-5z; Tue, 09 Jun 2020 10:18:24 +0000 Received: by mail-pj1-x1044.google.com with SMTP id d6so1207527pjs.3; Tue, 09 Jun 2020 03:18:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=acQt2SkaRoRSIkj+Wwww9zFIV+WDcbOdsThKWoJ9LTo=; b=QyiKk/+W/t5VVEbt8B7jTiKYYdAF/9eeWmvLklcjqc87SPm5gzlP/2PXvOw3UIVCE6 9d/B5dtljk+oixS4JnwGwBZMH07RKPMFA7ll+fBRa3HWN5msS77cj1+sbwbmd6NGj8Av oZk71dLnwOteVznh5mUhygt9gPLfC2DX0KjNIcnutDhogavaqutXj78VYo2CZraj4zp5 nJVsufdjjhuRE0rJ4+9e8ZM1WDgAqJ2TmQOkYyjSPB+/xzpU/glLA/mz0y0M8X/ELkMr qAwd1iMn6fLmk4h0tmXVNGiF59+v/jE9/gSbOTcYxTEKUORuXYwkTb14o7QwvFz+xpaK RJzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=acQt2SkaRoRSIkj+Wwww9zFIV+WDcbOdsThKWoJ9LTo=; b=IO7vU2eG/0mO5zXDRlivcOWNaLOexIyxid+On2olp0EPEO1TB8BANJooGY9wvFWmRg nbxDot9aUMxlLo9b7DBQZQvfqrkK9MePGwnjRBAYEH5m2ad7NGmIBBXmGz5j9YLMLfR5 iOzIPJSV+cvZAogM/YhVOGFOz+fWwHqd5qQbM35K6pErogSd9ZwoW0WnKt+lIfFF6ceU g8ZEWaiMycQIsx9FEObuAIdlJQJAM8iSWEooYn7EnPT3ta8OLGDXKVp4Khg4tOfsLEUv wOS1yVrHy6er5Q3BYGbqPz7hGoX5lkd6u+k6Y1KC9lekXIvfSAxRURu4gY68PMXSnthE FPbw== X-Gm-Message-State: AOAM531s7tQKYWUOtvGVHkz7RhjxI49VtyOZHx4BKr2cCW8d/3+2+NOo opDR6TcfH8SYzz8JxCEF43M= X-Google-Smtp-Source: ABdhPJx9voH2sXqtHqYO+DI6O8uAoudvXBbpaYomU9v4iR44LTpKLBTSlNBXN6lLvbAQqha+Dp24aw== X-Received: by 2002:a17:90a:f3d6:: with SMTP id ha22mr3868718pjb.193.1591697899064; Tue, 09 Jun 2020 03:18:19 -0700 (PDT) Received: from localhost.localdomain ([223.190.87.90]) by smtp.gmail.com with ESMTPSA id d189sm9637253pfc.51.2020.06.09.03.18.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jun 2020 03:18:18 -0700 (PDT) From: Amit Singh Tomar To: andre.przywara@arm.com, afaerber@suse.de, manivannan.sadhasivam@linaro.org, robh+dt@kernel.org Subject: [PATCH v4 09/10] arm64: dts: actions: Add MMC controller support for S700 Date: Tue, 9 Jun 2020 15:47:09 +0530 Message-Id: <1591697830-16311-10-git-send-email-amittomer25@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> References: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200609_031820_476850_AB741336 X-CRM114-Status: GOOD ( 10.93 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1044 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [amittomer25[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [amittomer25[at]gmail.com] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-actions@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, cristian.ciocaltea@gmail.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This commits adds support for MMC controllers present on Actions S700 SoC, there are 3 MMC controllers in this SoC which can be used for accessing SD/EMMC/SDIO cards. Signed-off-by: Amit Singh Tomar --- Changes since v3: * No change. Changes since v2: * No change. Changes since v1: * Added SoC specific compatibe string. Changes since RFC: * No change --- arch/arm64/boot/dts/actions/s700.dtsi | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/arch/arm64/boot/dts/actions/s700.dtsi b/arch/arm64/boot/dts/actions/s700.dtsi index 2c78caebf515..9ed88aafc2da 100644 --- a/arch/arm64/boot/dts/actions/s700.dtsi +++ b/arch/arm64/boot/dts/actions/s700.dtsi @@ -259,5 +259,38 @@ clocks = <&cmu CLK_DMAC>; power-domains = <&sps S700_PD_DMA>; }; + + mmc0: mmc@e0210000 { + compatible = "actions,s700-mmc", "actions,owl-mmc"; + reg = <0x0 0xe0210000 0x0 0x4000>; + interrupts = ; + clocks = <&cmu CLK_SD0>; + resets = <&cmu RESET_SD0>; + dmas = <&dma 2>; + dma-names = "mmc"; + status = "disabled"; + }; + + mmc1: mmc@e0214000 { + compatible = "actions,s700-mmc", "actions,owl-mmc"; + reg = <0x0 0xe0214000 0x0 0x4000>; + interrupts = ; + clocks = <&cmu CLK_SD1>; + resets = <&cmu RESET_SD1>; + dmas = <&dma 3>; + dma-names = "mmc"; + status = "disabled"; + }; + + mmc2: mmc@e0218000 { + compatible = "actions,s700-mmc", "actions,owl-mmc"; + reg = <0x0 0xe0218000 0x0 0x4000>; + interrupts = ; + clocks = <&cmu CLK_SD2>; + resets = <&cmu RESET_SD2>; + dmas = <&dma 4>; + dma-names = "mmc"; + status = "disabled"; + }; }; }; From patchwork Tue Jun 9 10:17:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Tomer X-Patchwork-Id: 11595059 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 358211391 for ; Tue, 9 Jun 2020 10:20:46 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0F768207ED for ; Tue, 9 Jun 2020 10:20:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="bmf7M6YH"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AG/UsiXY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0F768207ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=SqTJRLTsoTCmoY/+TpE5XXbls1yapYtgh0C3lsYskh0=; b=bmf7M6YHb+YzeH5489EG48ZXVx 7GPoxw41vZtL+ymOnLNIDuxzgJcHTU4g+kPX6oyQ/VzmTblnqQYDjmHr2tHJC0gDAwwWP0YBNPmn2 tI0l4nreeeLiUS+9n0At9yeiKwxpKFF45xTt0+ppxzmxgugvNx6LMOfqAZPKZ644EruLyVZ4PP0Qe 6EE/GmAgrlPVd/5L9+zZ3dGVPFYy2Xq/kB8hj7AeTxWqyuLlLpmTa6VG2ugrRglvZX3oRqJGTo4as 8TAHcNCRkUcdikH4uWoSugcsoFSkfRr23iwCxnRot7+dZ855fDxm3713LhE7A00AAQQSoDvf05/pC i3bH11Eg==; 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 1jibN7-0001eH-KR; Tue, 09 Jun 2020 10:20:45 +0000 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jibKq-0005f1-CU; Tue, 09 Jun 2020 10:18:27 +0000 Received: by mail-pg1-x544.google.com with SMTP id w20so10099553pga.6; Tue, 09 Jun 2020 03:18:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/0d16ZSjZXDVB9XnoF7g8/C8LhZpWELESeA2tbYD7eQ=; b=AG/UsiXYoOJYlHtPerABlcHwszE5UoF6nbuNIqAJuXbLtI546Ko7bh9KoLmTyGYjSr tUWIgn1RMafwryN11ejY/TV7c8AX2NUCKaxRRjc57gcUjWf9bBi1WmE0vurTemfnsPas RZcBLC8PDd+sYXmjfuJ/0l/X4tsmNI/3f1U6jst0F/rUg+1dYxaHwem9J1Ik8tTi7CI6 fKMrt5lmS7hEVGIdEBwT4i27WGg5sBKfey9EeYkOy4HsMjolaZ+eKmtFFMkYy4E9Ffoc DThy8oQFum0fYYwxYy4WIaqdo20RLLLE2hl3OUyhFYWlL81LTO0YfRq0+v0bvylmIaSi DrVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/0d16ZSjZXDVB9XnoF7g8/C8LhZpWELESeA2tbYD7eQ=; b=KUCVcfAMu5AcB86SPI3KGgZg1atNXdvVZZEj8IBIGCvwUNCeRSu/nNdQrnImmdS+Ei /CjssOhMHwG8bzm7cyMCpDvxIcHm1/YrDL2iPHePTpENdMaXLH2s2CioV5bUNxzVcwYV 1/SjEzl8TYxsRf0L8s6kE6nbHQfF1EULd/Ah0vh/XB7xKgmMQEAXKJaY5rQWR2y7ojXn vxJcPUfp6WdElQl0Kv81HrwMQYVtp/zAIc0xQyEzwvJtgvN+Zkbwyk6rqUVIqaVQKcDE f0PwHYq7mGN8JH8mKol77f+PPd7bips8hg1TJ+Qh9AQrSQl8+9CG++VnPVq95mVX532h D9JA== X-Gm-Message-State: AOAM532SNHiSuGz/rs4Cad5nJj25C99rXeV4Qlr3Otx0xE6ejDeyjTAV ov5NdhtzFqx3Qd9MuBYbBj0= X-Google-Smtp-Source: ABdhPJxXx5Nq3IGHo7wWKQw5zUcrDvnpBG2qlLfjMRL4bSyiW6rcHZW18FEGdq1l+goPWwa1qW1StA== X-Received: by 2002:a63:af02:: with SMTP id w2mr23067058pge.116.1591697903285; Tue, 09 Jun 2020 03:18:23 -0700 (PDT) Received: from localhost.localdomain ([223.190.87.90]) by smtp.gmail.com with ESMTPSA id d189sm9637253pfc.51.2020.06.09.03.18.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jun 2020 03:18:22 -0700 (PDT) From: Amit Singh Tomar To: andre.przywara@arm.com, afaerber@suse.de, manivannan.sadhasivam@linaro.org, robh+dt@kernel.org Subject: [PATCH v4 10/10] arm64: dts: actions: Add uSD support for Cubieboard7 Date: Tue, 9 Jun 2020 15:47:10 +0530 Message-Id: <1591697830-16311-11-git-send-email-amittomer25@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> References: <1591697830-16311-1-git-send-email-amittomer25@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200609_031824_438141_1B4EE127 X-CRM114-Status: GOOD ( 12.53 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:544 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [amittomer25[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [amittomer25[at]gmail.com] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-actions@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, cristian.ciocaltea@gmail.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This commit adds uSD support for Cubieboard7 board based on Actions Semi S700 SoC. SD0 is connected to uSD slot. Since there is no PMIC support added yet, fixed regulator has been used as a regulator node. Signed-off-by: Amit Singh Tomar --- Changes since v3: * No change. Changes since v2: * No change. Changes since v1: * No change. Changes since RFC: * No change. --- arch/arm64/boot/dts/actions/s700-cubieboard7.dts | 41 ++++++++++++++++++++++++ arch/arm64/boot/dts/actions/s700.dtsi | 1 + 2 files changed, 42 insertions(+) diff --git a/arch/arm64/boot/dts/actions/s700-cubieboard7.dts b/arch/arm64/boot/dts/actions/s700-cubieboard7.dts index 63e375cd9eb4..ec117eb12f3a 100644 --- a/arch/arm64/boot/dts/actions/s700-cubieboard7.dts +++ b/arch/arm64/boot/dts/actions/s700-cubieboard7.dts @@ -13,6 +13,7 @@ aliases { serial3 = &uart3; + mmc0 = &mmc0; }; chosen { @@ -28,6 +29,23 @@ device_type = "memory"; reg = <0x1 0xe0000000 0x0 0x0>; }; + + /* Fixed regulator used in the absence of PMIC */ + vcc_3v1: vcc-3v1 { + compatible = "regulator-fixed"; + regulator-name = "fixed-3.1V"; + regulator-min-microvolt = <3100000>; + regulator-max-microvolt = <3100000>; + }; + + /* Fixed regulator used in the absence of PMIC */ + sd_vcc: sd-vcc { + compatible = "regulator-fixed"; + regulator-name = "fixed-3.1V"; + regulator-min-microvolt = <3100000>; + regulator-max-microvolt = <3100000>; + regulator-always-on; + }; }; &i2c0 { @@ -81,6 +99,14 @@ bias-pull-up; }; }; + + mmc0_default: mmc0_default { + pinmux { + groups = "sd0_d0_mfp", "sd0_d1_mfp", "sd0_d2_d3_mfp", + "sd0_cmd_mfp", "sd0_clk_mfp"; + function = "sd0"; + }; + }; }; &timer { @@ -90,3 +116,18 @@ &uart3 { status = "okay"; }; + +/* uSD */ +&mmc0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_default>; + cd-gpios = <&pinctrl 120 GPIO_ACTIVE_LOW>; + no-sdio; + no-mmc; + no-1-8-v; + bus-width = <4>; + vmmc-supply = <&sd_vcc>; + vqmmc-supply = <&sd_vcc>; +}; + diff --git a/arch/arm64/boot/dts/actions/s700.dtsi b/arch/arm64/boot/dts/actions/s700.dtsi index 9ed88aafc2da..ba498cf9217d 100644 --- a/arch/arm64/boot/dts/actions/s700.dtsi +++ b/arch/arm64/boot/dts/actions/s700.dtsi @@ -4,6 +4,7 @@ */ #include +#include #include #include #include