From patchwork Wed Feb 28 23:37:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 10250103 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AB78260211 for ; Wed, 28 Feb 2018 23:37:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A052928451 for ; Wed, 28 Feb 2018 23:37:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94AE42854F; Wed, 28 Feb 2018 23:37:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0159728451 for ; Wed, 28 Feb 2018 23:37:41 +0000 (UTC) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References: List-Owner; bh=+r8x5LCb+toHOJMUzceMCfEmyI5nBUg8cxrQoKY34aA=; b=AnXJRVdBEthbKs OV+RpIBz28gCP42FF8mKDwZXtnVrGhLSepVCLbZvpzmkSx52p/TIILaPaAGUXyazgaoREayCYIbE4 Ht9W6YK/7PzapzZ6KoyCoFTAyS3TQM0zOGBftjOH1Ayxp0OteW7/7mKpchagGlNhSmUGGsUkKApvZ ioAQ8QaahAMeh+UoEWAHXdilAyRzZHqkp0kujbR90QOU1wl9V+SMedYZaOUGGsA5sEC6AaiTCJHXV Yex090R7aRiPpAwqMBVXzS2R2y/oB2AaGpTpVxetUoDFoKzDwBf9pO5U/jO1SM9mTiyZ+89/24qm+ hxOHpquuVSf66+rfO2fg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1erBI0-0005ld-AI; Wed, 28 Feb 2018 23:37:36 +0000 Received: from mail.bootlin.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1erBHu-0005ja-Ob for linux-arm-kernel@lists.infradead.org; Wed, 28 Feb 2018 23:37:32 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id C841E207E4; Thu, 1 Mar 2018 00:37:16 +0100 (CET) Received: from localhost.localdomain (unknown [91.224.148.103]) by mail.bootlin.com (Postfix) with ESMTPSA id 25D4A20376; Thu, 1 Mar 2018 00:37:06 +0100 (CET) From: Miquel Raynal To: Eric Miao , Haojian Zhuang , Boris Brezillon Subject: [PATCH] arm: mmp: Fix build issue due to PXA NAND pdata structure changes Date: Thu, 1 Mar 2018 00:37:02 +0100 Message-Id: <20180228233702.20378-1-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.14.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180228_153731_054079_F953779B X-CRM114-Status: GOOD ( 14.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Russell King , linux-arm-kernel@lists.infradead.org, Miquel Raynal Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP A previous work removed a few useless fields in PXA NAND platform data. Changes have been reflected in all impacted files but the ones in the mach-mpp directory. Update these file to fix build issues like: arch/arm/mach-mmp/aspenite.c:175:3: error: 'struct pxa3xx_nand_platform_data' has no member named 'enable_arbiter' Fixes: 6e836cc71870 ("mtd: nand: remove useless fields from pxa3xx NAND platform data") Signed-off-by: Miquel Raynal --- Hello, This patch should fix the build issue raised today in linux-next, sorry for not spotting it earlier. The commit producing the build error with MMP files was introduced by myself in the MTD tree. Boris, the MTD maintainer for this release, is in copy. I don't know who should take the patch but it would probably be better to fix the build issue from the MTD tree also? Thank you, Miquèl arch/arm/mach-mmp/aspenite.c | 6 ++---- arch/arm/mach-mmp/ttc_dkb.c | 5 +---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c index d2283009a5ff..6c2ebf01893a 100644 --- a/arch/arm/mach-mmp/aspenite.c +++ b/arch/arm/mach-mmp/aspenite.c @@ -172,10 +172,8 @@ static struct mtd_partition aspenite_nand_partitions[] = { }; static struct pxa3xx_nand_platform_data aspenite_nand_info = { - .enable_arbiter = 1, - .num_cs = 1, - .parts[0] = aspenite_nand_partitions, - .nr_parts[0] = ARRAY_SIZE(aspenite_nand_partitions), + .parts = aspenite_nand_partitions, + .nr_parts = ARRAY_SIZE(aspenite_nand_partitions), }; static struct i2c_board_info aspenite_i2c_info[] __initdata = { diff --git a/arch/arm/mach-mmp/ttc_dkb.c b/arch/arm/mach-mmp/ttc_dkb.c index e0b6073c61a7..c7897fb2b6da 100644 --- a/arch/arm/mach-mmp/ttc_dkb.c +++ b/arch/arm/mach-mmp/ttc_dkb.c @@ -179,10 +179,7 @@ static struct mv_usb_platform_data ttc_usb_pdata = { #endif #if IS_ENABLED(CONFIG_MTD_NAND_MARVELL) -static struct pxa3xx_nand_platform_data dkb_nand_info = { - .enable_arbiter = 1, - .num_cs = 1, -}; +static struct pxa3xx_nand_platform_data dkb_nand_info = {}; #endif #if IS_ENABLED(CONFIG_MMP_DISP)