From patchwork Fri Jul 22 16:09:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2234 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 67F603F047 for ; Fri, 22 Jul 2022 18:11:14 +0200 (CEST) Received: by mail-ed1-f69.google.com with SMTP id y8-20020a056402358800b0043bcb538b85sf1876732edc.10 for ; Fri, 22 Jul 2022 09:11:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1658506274; cv=pass; d=google.com; s=arc-20160816; b=xJf59WWAa7orX7WK6CCJJIPgG7oSj/wS+eUzs9AQ3gwu7+cHu47Z/OSnoJt1KmeHFa 5EXu9+zFFI6RTAkvKFNzWJHwJtl+M4GN1/Biv6Bc4ToaH/pMk/idI5CPmesEZ71kA0ku NbWVOiuAhrMlR+1BqiNz9A7cng7M/5V9zo8AoCRAMDgNgKYYm/kUdRU7LR3+AUZBS3RX eRJHDrbRBaDV7tt7+qU9oJOKWDxvMdvaZKBazfI4lwdnXvEbszGwYA5qYsZO1+cvqvu7 ys0I5onlY0wZYfm2jEM9fiDA3pvA5LwmUPfiSvc2Ac5L4D1j9Wz4Z2JnKTcMs9VOzddK PnYA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=WdcYbpvc3Joc6Nr4Sk2cwsecjAtxdl0NTX1y430B5bY=; b=cq0r7Yx2oUREmtEE1+t2QWfMU9ZD/1xpANaXVZ9IfPFl262zQdxGoD+aBB/4/ZrUQH QvKr6cwmQCnbIAGzdQ40F4yNqqvqi4D69lcpwukdQAgWY2PT6zo1PaEvKG2Wwlh+BNCA bSXlFpX3AcUE+6Bw0AvVrwgdjd38aOGDiMujlY6Ro55CjN9JeeGC7n4IN1e+3VdYzaGd MyQkoj7dCqlMvX4bWMW3I/2qkV8bH9aTdM1BlQ/0BCooEnOfT6g2JgeMandaaTTRjYWe ZPhWFR/cwiA8Dr4A+RjQcyulBEX6nBINtfq6zSMrc1am+izSwYfOKpW158tSI1lOiLY6 km7w== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=TTl468oM; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=WdcYbpvc3Joc6Nr4Sk2cwsecjAtxdl0NTX1y430B5bY=; b=VUZf4XBxIs7BmfMcv+A9x1P4V0dK12f9Oih3TO9v/RdmSb3kZs3w5OLMgYy+BD13RX +L64m4DImZOAg40q8k2t087kDncFYQM3t8mlQW52zXmhH6WIGALCZ/H7ER4c/Jc73epF ajLxyxnt/oeqKa4CNAVNZY9YcZzoO56Z/Vvug= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=WdcYbpvc3Joc6Nr4Sk2cwsecjAtxdl0NTX1y430B5bY=; b=HNQW4UmG8L2AX3Wg/rpOANZFyolrQFZ0TaK4PX4M0/FVdgxPLoXkHADGOptvNe+3NR 9xgl+d1zmjgBZusuvA7wRxUSOb+pjdPGCf99rRzIFPpugVBykngP5e9UIw22isJgnG5z hlCrurL3b+S93+rx7V0jWqWWlGXtNolVcxWM8ir48Ti5S0xQth2gdxMyfEhFeYnLQ1aK RQiRk6PSCjfhfOOJFgWfK2Y5iEEKtZUQREqFCAgcBmMDqWhhgmIwZzZnw1r0hzoHklON sxPEWvK0Ymiz8IS5KOoMgtQH/TQY5y8hv0vEOR3M+kac22jKlbcIEStv0sqsew90Rf89 oahA== X-Gm-Message-State: AJIora8eUtVK4wvc66wVtnf52aeHXtheqo42rD74braNJDBLqI0lev1h G+Q13kmTVpZfwWBjikAKiP1WCrpb X-Google-Smtp-Source: AGRyM1v0lJ+ddfDdobB1H2hXlgJuPMm8mt46r4uXEb3NWATgDEm2GN64NyRKnLcmBCAcySxrzCiR/g== X-Received: by 2002:a05:6402:270d:b0:43a:d1e8:460b with SMTP id y13-20020a056402270d00b0043ad1e8460bmr652075edd.40.1658506274311; Fri, 22 Jul 2022 09:11:14 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:11cb:b0:43a:7c1c:8981 with SMTP id j11-20020a05640211cb00b0043a7c1c8981ls2106828edw.0.-pod-prod-gmail; Fri, 22 Jul 2022 09:11:13 -0700 (PDT) X-Received: by 2002:a05:6402:e93:b0:43b:6a49:7e88 with SMTP id h19-20020a0564020e9300b0043b6a497e88mr644098eda.132.1658506273293; Fri, 22 Jul 2022 09:11:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658506273; cv=none; d=google.com; s=arc-20160816; b=YSMydVbIIYjo1sSQy+g0/Fc5vK2IciYdIkPaCEqeeD2JERUiei7LoFrbFNub2x2LeT 3oRCEnxwEPCD6ozs3/szx1TAaHWaWjYW31ZTCsnO3k7C7bPLG218wqE6GeqKaDG+gDm1 77yNGwEbMogW8WQ6KYEsgWxGno3AlIpJkWwiYvQjwcQNrsDAndnWGDramUlxL1UVs6cv mGoIIaA/Iq1N1GVaj8CngWbCKTrE4a+eC8UDsedeuE7yoam8isgWMp3HHuRBHV1B9V6Q 359F9Rsi/ZUUcI441ZL6iTi3OyyGtyS+LF/lo85bJz63OQTGncBC2JnG4tiqoMSTSs5k BP6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=HG7NUDdxnSS97U4P5z2f21LFtdOJS/jfnwSZbkpZ31A=; b=MdD/o2t14/+YDGLvZPdJUaKc0kjOvYGlgJ8UpnmUfYZ2iSbnnY1WuLYlRCOo4h4E26 EUYWTUE2dEr6HRRNjzOsyiisKSJm0pVmps/ddTr59B32j9Ze6UJ+rqOyZmyximKfiNOc aMZlvai6vn4Hm/Z0+al7cgeNrbh3wMj7w7u/w5sjsJE+cStnOiZplmXfVKY75nojVrtI IyNiPAoRsX26rKXMVurKTT/6zQR1O2Of27KCJsU0he6atn3nogWGaK8qHmk2T3KpTaMd Sf2C96+8w3K92AduBh1AlAKmmiMLb5Sac4gXOopn2Fy5TSMmgJo+7Y3bIHl3jM772Oy7 REUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=TTl468oM; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id f10-20020a170906138a00b0072b1491d92bsor2096357ejc.3.2022.07.22.09.11.13 for (Google Transport Security); Fri, 22 Jul 2022 09:11:13 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a17:907:9608:b0:72f:4b13:c66c with SMTP id gb8-20020a170907960800b0072f4b13c66cmr456301ejc.531.1658506272946; Fri, 22 Jul 2022 09:11:12 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.pdxnet.pdxeng.ch (host-87-14-98-67.retail.telecomitalia.it. [87.14.98.67]) by smtp.gmail.com with ESMTPSA id d19-20020a170906305300b006fe8ac6bc69sm2174025ejd.140.2022.07.22.09.11.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jul 2022 09:11:12 -0700 (PDT) From: Dario Binacchi To: u-boot@lists.denx.de Cc: Amarula patchwork , michael@amarulasolutions.com, Dario Binacchi , GSS_MTK_Uboot_upstream , Weijie Gao Subject: [PATCH v4 05/14] mtd: nand: Fix MediaTek MT7621 SoC build Date: Fri, 22 Jul 2022 18:09:59 +0200 Message-Id: <20220722161009.2686504-6-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220722161009.2686504-1-dario.binacchi@amarulasolutions.com> References: <20220722161009.2686504-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=TTl468oM; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Michael Trimarchi nand_get_flash_type was reworked in commit 1ca6f9483e9ab5. This change break the Mediatek MT721. Fix it adjust the function call parameters +include/linux/mtd/rawnand.h:32:62: note: expected 'struct nand_chip *' but argument is of type 'struct mtd_info *' + 32 | struct nand_flash_dev *nand_get_flash_type(struct nand_chip *chip, + | ~~~~~~~~~~~~~~~~~~^~~~ +drivers/mtd/nand/raw/mt7621_nand.c:1189:48: error: passing argument 2 of 'nand_get_flash_type' from incompatible pointer type [-Werror=incompatible-pointer-types] + | ^~~~ + | | + | struct nand_chip * +include/linux/mtd/rawnand.h:33:49: note: expected 'int *' but argument is of type 'struct nand_chip *' + 33 | int *maf_id, int *dev_id, Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi Reviewed-by: Weijie Gao --- Changes in v4: - Add the patch to the series. drivers/mtd/nand/raw/mt7621_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/mt7621_nand.c b/drivers/mtd/nand/raw/mt7621_nand.c index 2fd89349392b..9763ae6dc51a 100644 --- a/drivers/mtd/nand/raw/mt7621_nand.c +++ b/drivers/mtd/nand/raw/mt7621_nand.c @@ -1186,7 +1186,7 @@ int mt7621_nfc_spl_post_init(struct mt7621_nfc *nfc) int nand_maf_id, nand_dev_id; struct nand_flash_dev *type; - type = nand_get_flash_type(&nand->mtd, nand, &nand_maf_id, + type = nand_get_flash_type(nand, &nand_maf_id, &nand_dev_id, NULL); if (IS_ERR(type))